lkml.org 
[lkml]   [2020]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 021/309] bnxt_en: Fix logic that disables Bus Master during firmware reset.
    Date
    From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>

    [ Upstream commit d407302895d3f3ca3a333c711744a95e0b1b0150 ]

    The current logic that calls pci_disable_device() in __bnxt_close_nic()
    during firmware reset is flawed. If firmware is still alive, we're
    disabling the device too early, causing some firmware commands to
    not reach the firmware.

    Fix it by moving the logic to bnxt_reset_close(). If firmware is
    in fatal condition, we call pci_disable_device() before we free
    any of the rings to prevent DMA corruption of the freed rings. If
    firmware is still alive, we call pci_disable_device() after the
    last firmware message has been sent.

    Fixes: 3bc7d4a352ef ("bnxt_en: Add BNXT_STATE_IN_FW_RESET state.")
    Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
    Signed-off-by: Michael Chan <michael.chan@broadcom.com>
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/broadcom/bnxt/bnxt.c | 11 +++++++----
    1 file changed, 7 insertions(+), 4 deletions(-)

    --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
    +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
    @@ -9273,10 +9273,6 @@ static void __bnxt_close_nic(struct bnxt
    bnxt_debug_dev_exit(bp);
    bnxt_disable_napi(bp);
    del_timer_sync(&bp->timer);
    - if (test_bit(BNXT_STATE_IN_FW_RESET, &bp->state) &&
    - pci_is_enabled(bp->pdev))
    - pci_disable_device(bp->pdev);
    -
    bnxt_free_skbs(bp);

    /* Save ring stats before shutdown */
    @@ -10052,8 +10048,15 @@ static void bnxt_fw_reset_close(struct b
    {
    __bnxt_close_nic(bp, true, false);
    bnxt_ulp_irq_stop(bp);
    + /* When firmware is fatal state, disable PCI device to prevent
    + * any potential bad DMAs before freeing kernel memory.
    + */
    + if (test_bit(BNXT_STATE_FW_FATAL_COND, &bp->state))
    + pci_disable_device(bp->pdev);
    bnxt_clear_int_mode(bp);
    bnxt_hwrm_func_drv_unrgtr(bp);
    + if (pci_is_enabled(bp->pdev))
    + pci_disable_device(bp->pdev);
    bnxt_free_ctx_mem(bp);
    kfree(bp->ctx);
    bp->ctx = NULL;

    \
     
     \ /
      Last update: 2020-02-10 14:27    [W:4.022 / U:0.596 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site