lkml.org 
[lkml]   [2020]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 012/114] bnxt_en: Improve AER slot reset.
    Date
    From: Michael Chan <michael.chan@broadcom.com>

    [ Upstream commit bae361c54fb6ac6eba3b4762f49ce14beb73ef13 ]

    Improve the slot reset sequence by disabling the device to prevent bad
    DMAs if slot reset fails. Return the proper result instead of always
    PCI_ERS_RESULT_RECOVERED to the caller.

    Fixes: 6316ea6db93d ("bnxt_en: Enable AER support.")
    Signed-off-by: Michael Chan <michael.chan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
    +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
    @@ -8423,8 +8423,11 @@ static pci_ers_result_t bnxt_io_slot_res
    }
    }

    - if (result != PCI_ERS_RESULT_RECOVERED && netif_running(netdev))
    - dev_close(netdev);
    + if (result != PCI_ERS_RESULT_RECOVERED) {
    + if (netif_running(netdev))
    + dev_close(netdev);
    + pci_disable_device(pdev);
    + }

    rtnl_unlock();

    @@ -8435,7 +8438,7 @@ static pci_ers_result_t bnxt_io_slot_res
    err); /* non-fatal, continue */
    }

    - return PCI_ERS_RESULT_RECOVERED;
    + return result;
    }

    /**

    \
     
     \ /
      Last update: 2020-05-18 19:46    [W:4.122 / U:0.852 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site