ath10k: fix unsupported chip reset debugs file write

Before this change, after writing "warm_hw_reset" debugfs file, host
will send chip reset command to FW even though FW do not support this
service getting a warning print.

Though there is no FW impact before this change, this patch restricts
chip reset command sent to FW only if FW advertises the support via WMI
service bit.

Removed the redundant check and ath10k_warn() print as well.

New version FW will report chip reset service bit to host. Host allow user
to trigger WLAN chip reset only when fw report this service bit.

For older NON-TLV FW, since it do not report chip reset service bit, host
will not send chip reset command. For older TLV FW, since it report chip
reset service bit, host will send chip reset command.

Tested HW:  QCA9984, WCN3990

QCA9984 FW version: WLAN.BL.3.9.0.2-00042-S-1

Signed-off-by: Yingying Tang <yintang@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index 3894b77db71da60ee573475de702fabb535d16c7..f811e6940fb010cc8a93e49a12f2695b45b53ef9 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -2373,9 +2373,6 @@ static ssize_t ath10k_write_warm_hw_reset(struct file *file,
                goto exit;
        }
 
-       if (!(test_bit(WMI_SERVICE_RESET_CHIP, ar->wmi.svc_map)))
-               ath10k_warn(ar, "wmi service for reset chip is not available\n");
-
        ret = ath10k_wmi_pdev_set_param(ar, ar->wmi.pdev_param->pdev_reset,
                                        WMI_RST_MODE_WARM_RESET);
 
@@ -2650,8 +2647,10 @@ int ath10k_debug_register(struct ath10k *ar)
                                    ar->debug.debugfs_phy, ar,
                                    &fops_tpc_stats_final);
 
-       debugfs_create_file("warm_hw_reset", 0600, ar->debug.debugfs_phy, ar,
-                           &fops_warm_hw_reset);
+       if (test_bit(WMI_SERVICE_RESET_CHIP, ar->wmi.svc_map))
+               debugfs_create_file("warm_hw_reset", 0600,
+                                   ar->debug.debugfs_phy, ar,
+                                   &fops_warm_hw_reset);
 
        debugfs_create_file("ps_state_enable", 0600, ar->debug.debugfs_phy, ar,
                            &fops_ps_state_enable);

diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index 972d53d77654d6aee4835dd31f2cdc50cc7725b4..6df415778374b20beb04a105f1f9f397ba3565e2 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -371,6 +371,11 @@ enum wmi_10_4_service {
        WMI_10_4_SERVICE_EXT_PEER_TID_CONFIGS_SUPPORT,
        WMI_10_4_SERVICE_REPORT_AIRTIME,
        WMI_10_4_SERVICE_TX_PWR_PER_PEER,
+       WMI_10_4_SERVICE_FETCH_PEER_TX_PN,
+       WMI_10_4_SERVICE_MULTIPLE_VDEV_RESTART,
+       WMI_10_4_SERVICE_ENHANCED_RADIO_COUNTERS,
+       WMI_10_4_SERVICE_QINQ_SUPPORT,
+       WMI_10_4_SERVICE_RESET_CHIP,
 };
 
 static inline char *wmi_service_name(enum wmi_service service_id)
@@ -827,6 +832,8 @@ static inline void wmi_10_4_svc_map(const __le32 *in, unsigned long *out,
               WMI_SERVICE_REPORT_AIRTIME, len);
        SVCMAP(WMI_10_4_SERVICE_TX_PWR_PER_PEER,
               WMI_SERVICE_TX_PWR_PER_PEER, len);
+       SVCMAP(WMI_10_4_SERVICE_RESET_CHIP,
+              WMI_SERVICE_RESET_CHIP, len);
 }
 
 #undef SVCMAP