ath11k: add hw_param for wakeup_mhi

Wakeup mhi is needed before pci_read/write only for QCA6390 and WCN6855. Since
wakeup & release mhi is enabled for all hardwares, below mhi assert is seen in
QCN9074 when doing 'rmmod ath11k_pci':

	Kernel panic - not syncing: dev_wake != 0
	CPU: 2 PID: 13535 Comm: procd Not tainted 4.4.60 #1
	Hardware name: Generic DT based system
	[<80316dac>] (unwind_backtrace) from [<80313700>] (show_stack+0x10/0x14)
	[<80313700>] (show_stack) from [<805135dc>] (dump_stack+0x7c/0x9c)
	[<805135dc>] (dump_stack) from [<8032136c>] (panic+0x84/0x1f8)
	[<8032136c>] (panic) from [<80549b24>] (mhi_pm_disable_transition+0x3b8/0x5b8)
	[<80549b24>] (mhi_pm_disable_transition) from [<80549ddc>] (mhi_power_down+0xb8/0x100)
	[<80549ddc>] (mhi_power_down) from [<7f5242b0>] (ath11k_mhi_op_status_cb+0x284/0x3ac [ath11k_pci])
	[E][__mhi_device_get_sync] Did not enter M0 state, cur_state:RESET pm_state:SHUTDOWN Process
	[E][__mhi_device_get_sync] Did not enter M0 state, cur_state:RESET pm_state:SHUTDOWN Process
	[E][__mhi_device_get_sync] Did not enter M0 state, cur_state:RESET pm_state:SHUTDOWN Process
	[<7f5242b0>] (ath11k_mhi_op_status_cb [ath11k_pci]) from [<7f524878>] (ath11k_mhi_stop+0x10/0x20 [ath11k_pci])
	[<7f524878>] (ath11k_mhi_stop [ath11k_pci]) from [<7f525b94>] (ath11k_pci_power_down+0x54/0x90 [ath11k_pci])
	[<7f525b94>] (ath11k_pci_power_down [ath11k_pci]) from [<8056b2a8>] (pci_device_shutdown+0x30/0x44)
	[<8056b2a8>] (pci_device_shutdown) from [<805cfa0c>] (device_shutdown+0x124/0x174)
	[<805cfa0c>] (device_shutdown) from [<8033aaa4>] (kernel_restart+0xc/0x50)
	[<8033aaa4>] (kernel_restart) from [<8033ada8>] (SyS_reboot+0x178/0x1ec)
	[<8033ada8>] (SyS_reboot) from [<80301b80>] (ret_fast_syscall+0x0/0x34)

Hence, disable wakeup/release mhi using hw_param for other hardwares.

Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.0.1-01060-QCAHKSWPL_SILICONZ-1

Fixes: a05bd8513335 ("ath11k: read and write registers below unwindowed address")
Signed-off-by: Seevalamuthu Mariappan <quic_seevalam@quicinc.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1636702019-26142-1-git-send-email-quic_seevalam@quicinc.com

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index a40bbca3e9afd52275da8881b4a59df1a9bddf56..dd1a1bb078c39be0467252a628935ab9dfa7e8d9 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -86,6 +86,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .hal_params = &ath11k_hw_hal_params_ipq8074,
                .supports_dynamic_smps_6ghz = false,
                .alloc_cacheable_memory = true,
+               .wakeup_mhi = false,
        },
        {
                .hw_rev = ATH11K_HW_IPQ6018_HW10,
@@ -139,6 +140,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .hal_params = &ath11k_hw_hal_params_ipq8074,
                .supports_dynamic_smps_6ghz = false,
                .alloc_cacheable_memory = true,
+               .wakeup_mhi = false,
        },
        {
                .name = "qca6390 hw2.0",
@@ -191,6 +193,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .hal_params = &ath11k_hw_hal_params_qca6390,
                .supports_dynamic_smps_6ghz = false,
                .alloc_cacheable_memory = false,
+               .wakeup_mhi = true,
        },
        {
                .name = "qcn9074 hw1.0",
@@ -243,6 +246,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .hal_params = &ath11k_hw_hal_params_ipq8074,
                .supports_dynamic_smps_6ghz = true,
                .alloc_cacheable_memory = true,
+               .wakeup_mhi = false,
        },
        {
                .name = "wcn6855 hw2.0",
@@ -295,6 +299,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .hal_params = &ath11k_hw_hal_params_qca6390,
                .supports_dynamic_smps_6ghz = false,
                .alloc_cacheable_memory = false,
+               .wakeup_mhi = true,
        },
 };
 

diff --git a/drivers/net/wireless/ath/ath11k/hw.h b/drivers/net/wireless/ath/ath11k/hw.h
index dd2202f23b99c647417a118c626648fb8830c829..2c9d232ebfedf4911aa4a6e0f49385fa3142a615 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/hw.h
+++ b/drivers/net/wireless/ath/ath11k/hw.h
@@ -180,6 +180,7 @@ struct ath11k_hw_params {
        const struct ath11k_hw_hal_params *hal_params;
        bool supports_dynamic_smps_6ghz;
        bool alloc_cacheable_memory;
+       bool wakeup_mhi;
 };
 
 struct ath11k_hw_ops {

diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c
index 958c2b2c5b3e6f629262f921ac27f44e58713856..c2af8184e4a2f4817bbf3735c7fd4f7e7d73f66d 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/pci.c
+++ b/drivers/net/wireless/ath/ath11k/pci.c
@@ -182,7 +182,8 @@ void ath11k_pci_write32(struct ath11k_base *ab, u32 offset, u32 value)
        /* for offset beyond BAR + 4K - 32, may
         * need to wakeup MHI to access.
         */
-       if (test_bit(ATH11K_PCI_FLAG_INIT_DONE, &ab_pci->flags) &&
+       if (ab->hw_params.wakeup_mhi &&
+           test_bit(ATH11K_PCI_FLAG_INIT_DONE, &ab_pci->flags) &&
            offset >= ACCESS_ALWAYS_OFF)
                mhi_device_get_sync(ab_pci->mhi_ctrl->mhi_dev);
 
@@ -206,7 +207,8 @@ void ath11k_pci_write32(struct ath11k_base *ab, u32 offset, u32 value)
                }
        }
 
-       if (test_bit(ATH11K_PCI_FLAG_INIT_DONE, &ab_pci->flags) &&
+       if (ab->hw_params.wakeup_mhi &&
+           test_bit(ATH11K_PCI_FLAG_INIT_DONE, &ab_pci->flags) &&
            offset >= ACCESS_ALWAYS_OFF)
                mhi_device_put(ab_pci->mhi_ctrl->mhi_dev);
 }
@@ -219,7 +221,8 @@ u32 ath11k_pci_read32(struct ath11k_base *ab, u32 offset)
        /* for offset beyond BAR + 4K - 32, may
         * need to wakeup MHI to access.
         */
-       if (test_bit(ATH11K_PCI_FLAG_INIT_DONE, &ab_pci->flags) &&
+       if (ab->hw_params.wakeup_mhi &&
+           test_bit(ATH11K_PCI_FLAG_INIT_DONE, &ab_pci->flags) &&
            offset >= ACCESS_ALWAYS_OFF)
                mhi_device_get_sync(ab_pci->mhi_ctrl->mhi_dev);
 
@@ -243,7 +246,8 @@ u32 ath11k_pci_read32(struct ath11k_base *ab, u32 offset)
                }
        }
 
-       if (test_bit(ATH11K_PCI_FLAG_INIT_DONE, &ab_pci->flags) &&
+       if (ab->hw_params.wakeup_mhi &&
+           test_bit(ATH11K_PCI_FLAG_INIT_DONE, &ab_pci->flags) &&
            offset >= ACCESS_ALWAYS_OFF)
                mhi_device_put(ab_pci->mhi_ctrl->mhi_dev);