lkml.org 
[lkml]   [2017]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.10 38/75] drivers/pci/hotplug: Fix initial state for empty slot
    Date
    4.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Gavin Shan <gwshan@linux.vnet.ibm.com>

    commit d0c424971f70501ec0a0364117b9934db039c9cc 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: 360aebd85a4 ("drivers/pci/hotplug: Support surprise hotplug in powernv driver")
    Reported-by: Hank Chang <hankmax0000@gmail.com>
    Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
    Tested-by: Willie Liauw <williel@supermicro.com.tw>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/pci/hotplug/pnv_php.c | 16 ++++++++++++++--
    1 file changed, 14 insertions(+), 2 deletions(-)

    --- a/drivers/pci/hotplug/pnv_php.c
    +++ b/drivers/pci/hotplug/pnv_php.c
    @@ -436,9 +436,21 @@ static int pnv_php_enable(struct pnv_php
    if (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;
    + }

    /*
    * If the power supply to the slot is off, we can't detect

    \
     
     \ /
      Last update: 2017-03-13 09:49    [W:4.134 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site