Commit 4f77c55c authored by Gavin Shan's avatar Gavin Shan Committed by Greg Kroah-Hartman

drivers/pci/hotplug: Fix initial state for empty slot

commit d0c42497 upstream.

In PowerNV PCI hotplug driver, the initial PCI slot's state is set
to PNV_PHP_STATE_POPULATED if no PCI devices are connected to the
slot. The PCI devices that are hot added to the slot won't be probed
and populated because of the check in pnv_php_enable():

        /* Check if the slot has been configured */
        if (php_slot->state != PNV_PHP_STATE_REGISTERED)
                return 0;

This fixes the issue by leaving the slot in PNV_PHP_STATE_REGISTERED
state initially if nothing is connected to the slot.

Fixes: 360aebd8 ("drivers/pci/hotplug: Support surprise hotplug in powernv driver")
Reported-by: default avatarHank Chang <hankmax0000@gmail.com>
Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Tested-by: default avatarWillie Liauw <williel@supermicro.com.tw>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1afe7b4a
...@@ -436,9 +436,21 @@ static int pnv_php_enable(struct pnv_php_slot *php_slot, bool rescan) ...@@ -436,9 +436,21 @@ static int pnv_php_enable(struct pnv_php_slot *php_slot, bool rescan)
if (ret) if (ret)
return ret; return ret;
/* Proceed if there have nothing behind the slot */ /*
if (presence == OPAL_PCI_SLOT_EMPTY) * Proceed if there have nothing behind the slot. However,
* we should leave the slot in registered state at the
* beginning. Otherwise, the PCI devices inserted afterwards
* won't be probed and populated.
*/
if (presence == OPAL_PCI_SLOT_EMPTY) {
if (!php_slot->power_state_check) {
php_slot->power_state_check = true;
return 0;
}
goto scan; goto scan;
}
/* /*
* If the power supply to the slot is off, we can't detect * If the power supply to the slot is off, we can't detect
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment