pci/hotplug/pnv-php: Relax check when disabling slot

The driver only allows to disable a slot in the POPULATED
state. However, if an error occurs while enabling the slot, say
because the link couldn't be trained, then the POPULATED state may not
be reached, yet the power state of the slot is on. So allow to disable
a slot in the REGISTERED state. Removing the devices will do nothing
since it's not populated, and we'll set the power state of the slot
back to off.

Reviewed-by: Alastair D'Silva <alastair@d-silva.org>
Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com>
Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20191121134918.7155-10-fbarrat@linux.ibm.com

diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
index 0cb6a48979050765c0988c10de6f21f5dd431971..f2de76390afffbf480cfea36c7a017cb303e9217 100644 (file)
--- a/drivers/pci/hotplug/pnv_php.c
+++ b/drivers/pci/hotplug/pnv_php.c
@@ -566,7 +566,13 @@ static int pnv_php_disable_slot(struct hotplug_slot *slot)
        struct pnv_php_slot *php_slot = to_pnv_php_slot(slot);
        int ret;
 
-       if (php_slot->state != PNV_PHP_STATE_POPULATED)
+       /*
+        * Allow to disable a slot already in the registered state to
+        * cover cases where the slot couldn't be enabled and never
+        * reached the populated state
+        */
+       if (php_slot->state != PNV_PHP_STATE_POPULATED &&
+           php_slot->state != PNV_PHP_STATE_REGISTERED)
                return 0;
 
        /* Remove all devices behind the slot */