wifi: ath12k: restore ASPM for supported hardwares only

During PCI based hardware device start up, ASPM is disabled for all. And
once firmware is ready, it is restored back. However, not all hardwares
(for example QCN9274) supports ASPM. Hence there is a need to conditionally
restore ASPM back. Or else, for such hardwares, issue can be seen during
sending and receiving packets.

Introduce a new hardware param supports_aspm which identifies whether a
given hardware supports ASPM or not and then accordingly restore it.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1

Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20240709055817.3371406-1-quic_adisi@quicinc.com

diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 2e11ea7635740ce289ee7d248e71caf3d6d9c78f..76c0e07a88de79bafa43979ca589601ba9cdc497 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -924,6 +924,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
 
                .acpi_guid = NULL,
                .supports_dynamic_smps_6ghz = true,
+
+               .supports_aspm = false,
        },
        {
                .name = "wcn7850 hw2.0",
@@ -1000,6 +1002,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
 
                .acpi_guid = &wcn7850_uuid,
                .supports_dynamic_smps_6ghz = false,
+
+               .supports_aspm = true,
        },
        {
                .name = "qcn9274 hw2.0",
@@ -1072,6 +1076,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
 
                .acpi_guid = NULL,
                .supports_dynamic_smps_6ghz = true,
+
+               .supports_aspm = false,
        },
 };
 

diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index e792eb6b249b41db7aebba59ec2f3fbc9dcb152b..4cfbb240bbf4308994024c83830e65253184af0e 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -187,6 +187,7 @@ struct ath12k_hw_params {
        bool tcl_ring_retry:1;
        bool reoq_lut_support:1;
        bool supports_shadow_regs:1;
+       bool supports_aspm:1;
 
        u32 num_tcl_banks;
        u32 max_tx_ring;

diff --git a/drivers/net/wireless/ath/ath12k/pci.c b/drivers/net/wireless/ath/ath12k/pci.c
index 876c029f58f62c3d9644dc44c80eabae8b084739..ff2199f7754c0aa952673aec73e33c6bcd3b52c2 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/pci.c
+++ b/drivers/net/wireless/ath/ath12k/pci.c
@@ -953,7 +953,8 @@ static void ath12k_pci_update_qrtr_node_id(struct ath12k_base *ab)
 
 static void ath12k_pci_aspm_restore(struct ath12k_pci *ab_pci)
 {
-       if (test_and_clear_bit(ATH12K_PCI_ASPM_RESTORE, &ab_pci->flags))
+       if (ab_pci->ab->hw_params->supports_aspm &&
+           test_and_clear_bit(ATH12K_PCI_ASPM_RESTORE, &ab_pci->flags))
                pcie_capability_clear_and_set_word(ab_pci->pdev, PCI_EXP_LNKCTL,
                                                   PCI_EXP_LNKCTL_ASPMC,
                                                   ab_pci->link_ctl &