lkml.org 
[lkml]   [2019]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.2 164/249] ath10k: fix fw crash by moving chip reset after napi disabled
    Date
    From: Miaoqing Pan <miaoqing@codeaurora.org>

    [ Upstream commit 08d80e4cd27ba19f9bee9e5f788f9a9fc440a22f ]

    On SMP platform, when continuously running wifi up/down, the napi
    poll can be scheduled during chip reset, which will call
    ath10k_pci_has_fw_crashed() to check the fw status. But in the reset
    period, the value from FW_INDICATOR_ADDRESS register will return
    0xdeadbeef, which also be treated as fw crash. Fix the issue by
    moving chip reset after napi disabled.

    ath10k_pci 0000:01:00.0: firmware crashed! (guid 73b30611-5b1e-4bdd-90b4-64c81eb947b6)
    ath10k_pci 0000:01:00.0: qca9984/qca9994 hw1.0 target 0x01000000 chip_id 0x00000000 sub 168c:cafe
    ath10k_pci 0000:01:00.0: htt-ver 2.2 wmi-op 6 htt-op 4 cal otp max-sta 512 raw 0 hwcrypto 1
    ath10k_pci 0000:01:00.0: failed to get memcpy hi address for firmware address 4: -16
    ath10k_pci 0000:01:00.0: failed to read firmware dump area: -16
    ath10k_pci 0000:01:00.0: Copy Engine register dump:
    ath10k_pci 0000:01:00.0: [00]: 0x0004a000 0 0 0 0
    ath10k_pci 0000:01:00.0: [01]: 0x0004a400 0 0 0 0
    ath10k_pci 0000:01:00.0: [02]: 0x0004a800 0 0 0 0
    ath10k_pci 0000:01:00.0: [03]: 0x0004ac00 0 0 0 0
    ath10k_pci 0000:01:00.0: [04]: 0x0004b000 0 0 0 0
    ath10k_pci 0000:01:00.0: [05]: 0x0004b400 0 0 0 0
    ath10k_pci 0000:01:00.0: [06]: 0x0004b800 0 0 0 0
    ath10k_pci 0000:01:00.0: [07]: 0x0004bc00 1 0 1 0
    ath10k_pci 0000:01:00.0: [08]: 0x0004c000 0 0 0 0
    ath10k_pci 0000:01:00.0: [09]: 0x0004c400 0 0 0 0
    ath10k_pci 0000:01:00.0: [10]: 0x0004c800 0 0 0 0
    ath10k_pci 0000:01:00.0: [11]: 0x0004cc00 0 0 0 0

    Tested HW: QCA9984,QCA9887,WCN3990

    Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/ath/ath10k/pci.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
    index 2c27f407a851..6e5f7ae00253 100644
    --- a/drivers/net/wireless/ath/ath10k/pci.c
    +++ b/drivers/net/wireless/ath/ath10k/pci.c
    @@ -2059,6 +2059,11 @@ static void ath10k_pci_hif_stop(struct ath10k *ar)

    ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot hif stop\n");

    + ath10k_pci_irq_disable(ar);
    + ath10k_pci_irq_sync(ar);
    + napi_synchronize(&ar->napi);
    + napi_disable(&ar->napi);
    +
    /* Most likely the device has HTT Rx ring configured. The only way to
    * prevent the device from accessing (and possible corrupting) host
    * memory is to reset the chip now.
    @@ -2072,10 +2077,6 @@ static void ath10k_pci_hif_stop(struct ath10k *ar)
    */
    ath10k_pci_safe_chip_reset(ar);

    - ath10k_pci_irq_disable(ar);
    - ath10k_pci_irq_sync(ar);
    - napi_synchronize(&ar->napi);
    - napi_disable(&ar->napi);
    ath10k_pci_flush(ar);

    spin_lock_irqsave(&ar_pci->ps_lock, flags);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-07-15 17:46    [W:3.020 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site