wifi: ath12k: avoid repeated hw access from ar

Currently, the helper functions are accessing mac80211 hw data from the
radio (ar) structure repeatedly. So optimize these helper functions by
storing mac80211 hw data locally and accessing it directly.

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

Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20231120235812.2602198-3-quic_periyasa@quicinc.com

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index d6728103c58e71bdf81566ade1c31f091c7827fd..556013f8c6096f943cf0e26b24e16b3e02bd24b3 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -6266,10 +6266,11 @@ ath12k_mac_update_active_vif_chan(struct ath12k *ar,
                                  struct ieee80211_chanctx_conf *ctx)
 {
        struct ath12k_mac_change_chanctx_arg arg = { .ctx = ctx };
+       struct ieee80211_hw *hw = ar->hw;
 
        lockdep_assert_held(&ar->conf_mutex);
 
-       ieee80211_iterate_active_interfaces_atomic(ar->hw,
+       ieee80211_iterate_active_interfaces_atomic(hw,
                                                   IEEE80211_IFACE_ITER_NORMAL,
                                                   ath12k_mac_change_chanctx_cnt_iter,
                                                   &arg);
@@ -6280,7 +6281,7 @@ ath12k_mac_update_active_vif_chan(struct ath12k *ar,
        if (!arg.vifs)
                return;
 
-       ieee80211_iterate_active_interfaces_atomic(ar->hw,
+       ieee80211_iterate_active_interfaces_atomic(hw,
                                                   IEEE80211_IFACE_ITER_NORMAL,
                                                   ath12k_mac_change_chanctx_fill_iter,
                                                   &arg);
@@ -7159,6 +7160,7 @@ static u32 ath12k_get_phy_id(struct ath12k *ar, u32 band)
 static int ath12k_mac_setup_channels_rates(struct ath12k *ar,
                                           u32 supported_bands)
 {
+       struct ieee80211_hw *hw = ar->hw;
        struct ieee80211_supported_band *band;
        struct ath12k_wmi_hal_reg_capabilities_ext_arg *reg_cap;
        void *channels;
@@ -7184,7 +7186,7 @@ static int ath12k_mac_setup_channels_rates(struct ath12k *ar,
                band->channels = channels;
                band->n_bitrates = ath12k_g_rates_size;
                band->bitrates = ath12k_g_rates;
-               ar->hw->wiphy->bands[NL80211_BAND_2GHZ] = band;
+               hw->wiphy->bands[NL80211_BAND_2GHZ] = band;
 
                if (ar->ab->hw_params->single_pdev_only) {
                        phy_id = ath12k_get_phy_id(ar, WMI_HOST_WLAN_2G_CAP);
@@ -7211,7 +7213,7 @@ static int ath12k_mac_setup_channels_rates(struct ath12k *ar,
                        band->channels = channels;
                        band->n_bitrates = ath12k_a_rates_size;
                        band->bitrates = ath12k_a_rates;
-                       ar->hw->wiphy->bands[NL80211_BAND_6GHZ] = band;
+                       hw->wiphy->bands[NL80211_BAND_6GHZ] = band;
                        ath12k_mac_update_ch_list(ar, band,
                                                  reg_cap->low_5ghz_chan,
                                                  reg_cap->high_5ghz_chan);
@@ -7233,7 +7235,7 @@ static int ath12k_mac_setup_channels_rates(struct ath12k *ar,
                        band->channels = channels;
                        band->n_bitrates = ath12k_a_rates_size;
                        band->bitrates = ath12k_a_rates;
-                       ar->hw->wiphy->bands[NL80211_BAND_5GHZ] = band;
+                       hw->wiphy->bands[NL80211_BAND_5GHZ] = band;
 
                        if (ar->ab->hw_params->single_pdev_only) {
                                phy_id = ath12k_get_phy_id(ar, WMI_HOST_WLAN_5G_CAP);
@@ -7252,6 +7254,7 @@ static int ath12k_mac_setup_channels_rates(struct ath12k *ar,
 static int ath12k_mac_setup_iface_combinations(struct ath12k *ar)
 {
        struct ath12k_base *ab = ar->ab;
+       struct ieee80211_hw *hw = ar->hw;
        struct ieee80211_iface_combination *combinations;
        struct ieee80211_iface_limit *limits;
        int n_limits, max_interfaces;
@@ -7302,8 +7305,8 @@ static int ath12k_mac_setup_iface_combinations(struct ath12k *ar)
                                                BIT(NL80211_CHAN_WIDTH_40) |
                                                BIT(NL80211_CHAN_WIDTH_80);
 
-       ar->hw->wiphy->iface_combinations = combinations;
-       ar->hw->wiphy->n_iface_combinations = 1;
+       hw->wiphy->iface_combinations = combinations;
+       hw->wiphy->n_iface_combinations = 1;
 
        return 0;
 }
@@ -7347,9 +7350,11 @@ static const struct wiphy_iftype_ext_capab ath12k_iftypes_ext_capa[] = {
 
 static void __ath12k_mac_unregister(struct ath12k *ar)
 {
+       struct ieee80211_hw *hw = ar->hw;
+
        cancel_work_sync(&ar->regd_update_work);
 
-       ieee80211_unregister_hw(ar->hw);
+       ieee80211_unregister_hw(hw);
 
        idr_for_each(&ar->txmgmt_idr, ath12k_mac_tx_mgmt_pending_free, ar);
        idr_destroy(&ar->txmgmt_idr);
@@ -7358,10 +7363,10 @@ static void __ath12k_mac_unregister(struct ath12k *ar)
        kfree(ar->mac.sbands[NL80211_BAND_5GHZ].channels);
        kfree(ar->mac.sbands[NL80211_BAND_6GHZ].channels);
 
-       kfree(ar->hw->wiphy->iface_combinations[0].limits);
-       kfree(ar->hw->wiphy->iface_combinations);
+       kfree(hw->wiphy->iface_combinations[0].limits);
+       kfree(hw->wiphy->iface_combinations);
 
-       SET_IEEE80211_DEV(ar->hw, NULL);
+       SET_IEEE80211_DEV(hw, NULL);
 }
 
 void ath12k_mac_unregister(struct ath12k_base *ab)
@@ -7383,6 +7388,7 @@ void ath12k_mac_unregister(struct ath12k_base *ab)
 static int __ath12k_mac_register(struct ath12k *ar)
 {
        struct ath12k_base *ab = ar->ab;
+       struct ieee80211_hw *hw = ar->hw;
        struct ath12k_pdev_cap *cap = &ar->pdev->cap;
        static const u32 cipher_suites[] = {
                WLAN_CIPHER_SUITE_TKIP,
@@ -7400,9 +7406,9 @@ static int __ath12k_mac_register(struct ath12k *ar)
 
        ath12k_pdev_caps_update(ar);
 
-       SET_IEEE80211_PERM_ADDR(ar->hw, ar->mac_addr);
+       SET_IEEE80211_PERM_ADDR(hw, ar->mac_addr);
 
-       SET_IEEE80211_DEV(ar->hw, ab->dev);
+       SET_IEEE80211_DEV(hw, ab->dev);
 
        ret = ath12k_mac_setup_channels_rates(ar,
                                              cap->supported_bands);
@@ -7418,103 +7424,103 @@ static int __ath12k_mac_register(struct ath12k *ar)
                goto err_free_channels;
        }
 
-       ar->hw->wiphy->available_antennas_rx = cap->rx_chain_mask;
-       ar->hw->wiphy->available_antennas_tx = cap->tx_chain_mask;
+       hw->wiphy->available_antennas_rx = cap->rx_chain_mask;
+       hw->wiphy->available_antennas_tx = cap->tx_chain_mask;
 
-       ar->hw->wiphy->interface_modes = ab->hw_params->interface_modes;
+       hw->wiphy->interface_modes = ab->hw_params->interface_modes;
 
-       if (ar->hw->wiphy->bands[NL80211_BAND_2GHZ] &&
-           ar->hw->wiphy->bands[NL80211_BAND_5GHZ] &&
-           ar->hw->wiphy->bands[NL80211_BAND_6GHZ])
-               ieee80211_hw_set(ar->hw, SINGLE_SCAN_ON_ALL_BANDS);
+       if (hw->wiphy->bands[NL80211_BAND_2GHZ] &&
+           hw->wiphy->bands[NL80211_BAND_5GHZ] &&
+           hw->wiphy->bands[NL80211_BAND_6GHZ])
+               ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS);
 
-       ieee80211_hw_set(ar->hw, SIGNAL_DBM);
-       ieee80211_hw_set(ar->hw, SUPPORTS_PS);
-       ieee80211_hw_set(ar->hw, SUPPORTS_DYNAMIC_PS);
-       ieee80211_hw_set(ar->hw, MFP_CAPABLE);
-       ieee80211_hw_set(ar->hw, REPORTS_TX_ACK_STATUS);
-       ieee80211_hw_set(ar->hw, HAS_RATE_CONTROL);
-       ieee80211_hw_set(ar->hw, AP_LINK_PS);
-       ieee80211_hw_set(ar->hw, SPECTRUM_MGMT);
-       ieee80211_hw_set(ar->hw, CONNECTION_MONITOR);
-       ieee80211_hw_set(ar->hw, SUPPORTS_PER_STA_GTK);
-       ieee80211_hw_set(ar->hw, CHANCTX_STA_CSA);
-       ieee80211_hw_set(ar->hw, QUEUE_CONTROL);
-       ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG);
-       ieee80211_hw_set(ar->hw, REPORTS_LOW_ACK);
+       ieee80211_hw_set(hw, SIGNAL_DBM);
+       ieee80211_hw_set(hw, SUPPORTS_PS);
+       ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS);
+       ieee80211_hw_set(hw, MFP_CAPABLE);
+       ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS);
+       ieee80211_hw_set(hw, HAS_RATE_CONTROL);
+       ieee80211_hw_set(hw, AP_LINK_PS);
+       ieee80211_hw_set(hw, SPECTRUM_MGMT);
+       ieee80211_hw_set(hw, CONNECTION_MONITOR);
+       ieee80211_hw_set(hw, SUPPORTS_PER_STA_GTK);
+       ieee80211_hw_set(hw, CHANCTX_STA_CSA);
+       ieee80211_hw_set(hw, QUEUE_CONTROL);
+       ieee80211_hw_set(hw, SUPPORTS_TX_FRAG);
+       ieee80211_hw_set(hw, REPORTS_LOW_ACK);
 
        if (ht_cap & WMI_HT_CAP_ENABLED) {
-               ieee80211_hw_set(ar->hw, AMPDU_AGGREGATION);
-               ieee80211_hw_set(ar->hw, TX_AMPDU_SETUP_IN_HW);
-               ieee80211_hw_set(ar->hw, SUPPORTS_REORDERING_BUFFER);
-               ieee80211_hw_set(ar->hw, SUPPORTS_AMSDU_IN_AMPDU);
-               ieee80211_hw_set(ar->hw, USES_RSS);
+               ieee80211_hw_set(hw, AMPDU_AGGREGATION);
+               ieee80211_hw_set(hw, TX_AMPDU_SETUP_IN_HW);
+               ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER);
+               ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU);
+               ieee80211_hw_set(hw, USES_RSS);
        }
 
-       ar->hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS;
-       ar->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+       hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS;
+       hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
 
        /* TODO: Check if HT capability advertised from firmware is different
         * for each band for a dual band capable radio. It will be tricky to
         * handle it when the ht capability different for each band.
         */
        if (ht_cap & WMI_HT_CAP_DYNAMIC_SMPS)
-               ar->hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS;
+               hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS;
 
-       ar->hw->wiphy->max_scan_ssids = WLAN_SCAN_PARAMS_MAX_SSID;
-       ar->hw->wiphy->max_scan_ie_len = WLAN_SCAN_PARAMS_MAX_IE_LEN;
+       hw->wiphy->max_scan_ssids = WLAN_SCAN_PARAMS_MAX_SSID;
+       hw->wiphy->max_scan_ie_len = WLAN_SCAN_PARAMS_MAX_IE_LEN;
 
-       ar->hw->max_listen_interval = ATH12K_MAX_HW_LISTEN_INTERVAL;
+       hw->max_listen_interval = ATH12K_MAX_HW_LISTEN_INTERVAL;
 
-       ar->hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
-       ar->hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
-       ar->hw->wiphy->max_remain_on_channel_duration = 5000;
+       hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
+       hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
+       hw->wiphy->max_remain_on_channel_duration = 5000;
 
-       ar->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;
-       ar->hw->wiphy->features |= NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE |
+       hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;
+       hw->wiphy->features |= NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE |
                                   NL80211_FEATURE_AP_SCAN;
 
        ar->max_num_stations = TARGET_NUM_STATIONS;
        ar->max_num_peers = TARGET_NUM_PEERS_PDEV;
 
-       ar->hw->wiphy->max_ap_assoc_sta = ar->max_num_stations;
+       hw->wiphy->max_ap_assoc_sta = ar->max_num_stations;
 
-       ar->hw->queues = ATH12K_HW_MAX_QUEUES;
-       ar->hw->wiphy->tx_queue_len = ATH12K_QUEUE_LEN;
-       ar->hw->offchannel_tx_hw_queue = ATH12K_HW_MAX_QUEUES - 1;
-       ar->hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE;
+       hw->queues = ATH12K_HW_MAX_QUEUES;
+       hw->wiphy->tx_queue_len = ATH12K_QUEUE_LEN;
+       hw->offchannel_tx_hw_queue = ATH12K_HW_MAX_QUEUES - 1;
+       hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE;
 
-       ar->hw->vif_data_size = sizeof(struct ath12k_vif);
-       ar->hw->sta_data_size = sizeof(struct ath12k_sta);
+       hw->vif_data_size = sizeof(struct ath12k_vif);
+       hw->sta_data_size = sizeof(struct ath12k_sta);
 
-       wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
-       wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);
+       wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
+       wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);
 
-       ar->hw->wiphy->cipher_suites = cipher_suites;
-       ar->hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
+       hw->wiphy->cipher_suites = cipher_suites;
+       hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
 
-       ar->hw->wiphy->iftype_ext_capab = ath12k_iftypes_ext_capa;
-       ar->hw->wiphy->num_iftype_ext_capab =
+       hw->wiphy->iftype_ext_capab = ath12k_iftypes_ext_capa;
+       hw->wiphy->num_iftype_ext_capab =
                ARRAY_SIZE(ath12k_iftypes_ext_capa);
 
        if (ar->supports_6ghz) {
-               wiphy_ext_feature_set(ar->hw->wiphy,
+               wiphy_ext_feature_set(hw->wiphy,
                                      NL80211_EXT_FEATURE_FILS_DISCOVERY);
-               wiphy_ext_feature_set(ar->hw->wiphy,
+               wiphy_ext_feature_set(hw->wiphy,
                                      NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP);
        }
 
-       wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_PUNCT);
+       wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_PUNCT);
 
-       ath12k_reg_init(ar);
+       ath12k_reg_init(hw);
 
        if (!test_bit(ATH12K_FLAG_RAW_MODE, &ab->dev_flags)) {
-               ar->hw->netdev_features = NETIF_F_HW_CSUM;
-               ieee80211_hw_set(ar->hw, SW_CRYPTO_CONTROL);
-               ieee80211_hw_set(ar->hw, SUPPORT_FAST_XMIT);
+               hw->netdev_features = NETIF_F_HW_CSUM;
+               ieee80211_hw_set(hw, SW_CRYPTO_CONTROL);
+               ieee80211_hw_set(hw, SUPPORT_FAST_XMIT);
        }
 
-       ret = ieee80211_register_hw(ar->hw);
+       ret = ieee80211_register_hw(hw);
        if (ret) {
                ath12k_err(ar->ab, "ieee80211 registration failed: %d\n", ret);
                goto err_free_if_combs;
@@ -7526,7 +7532,7 @@ static int __ath12k_mac_register(struct ath12k *ar)
                 * while. But that time is so short and in practise it make
                 * a difference in real life.
                 */
-               ar->hw->wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MONITOR);
+               hw->wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MONITOR);
 
        /* Apply the regd received during initialization */
        ret = ath12k_regd_update(ar, true);
@@ -7538,11 +7544,11 @@ static int __ath12k_mac_register(struct ath12k *ar)
        return 0;
 
 err_unregister_hw:
-       ieee80211_unregister_hw(ar->hw);
+       ieee80211_unregister_hw(hw);
 
 err_free_if_combs:
-       kfree(ar->hw->wiphy->iface_combinations[0].limits);
-       kfree(ar->hw->wiphy->iface_combinations);
+       kfree(hw->wiphy->iface_combinations[0].limits);
+       kfree(hw->wiphy->iface_combinations);
 
 err_free_channels:
        kfree(ar->mac.sbands[NL80211_BAND_2GHZ].channels);
@@ -7550,7 +7556,7 @@ err_free_channels:
        kfree(ar->mac.sbands[NL80211_BAND_6GHZ].channels);
 
 err:
-       SET_IEEE80211_DEV(ar->hw, NULL);
+       SET_IEEE80211_DEV(hw, NULL);
        return ret;
 }
 

diff --git a/drivers/net/wireless/ath/ath12k/reg.c b/drivers/net/wireless/ath/ath12k/reg.c
index 6e98277b5ec89e0ee2bec47ece84f5859a847a9a..f924bc13ccff5f1f85e47965084473b602319cab 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/reg.c
+++ b/drivers/net/wireless/ath/ath12k/reg.c
@@ -199,6 +199,7 @@ static void ath12k_copy_regd(struct ieee80211_regdomain *regd_orig,
 
 int ath12k_regd_update(struct ath12k *ar, bool init)
 {
+       struct ieee80211_hw *hw = ar->hw;
        struct ieee80211_regdomain *regd, *regd_copy = NULL;
        int ret, regd_len, pdev_id;
        struct ath12k_base *ab;
@@ -246,9 +247,9 @@ int ath12k_regd_update(struct ath12k *ar, bool init)
        }
 
        rtnl_lock();
-       wiphy_lock(ar->hw->wiphy);
-       ret = regulatory_set_wiphy_regd_sync(ar->hw->wiphy, regd_copy);
-       wiphy_unlock(ar->hw->wiphy);
+       wiphy_lock(hw->wiphy);
+       ret = regulatory_set_wiphy_regd_sync(hw->wiphy, regd_copy);
+       wiphy_unlock(hw->wiphy);
        rtnl_unlock();
 
        kfree(regd_copy);
@@ -729,10 +730,10 @@ void ath12k_regd_update_work(struct work_struct *work)
        }
 }
 
-void ath12k_reg_init(struct ath12k *ar)
+void ath12k_reg_init(struct ieee80211_hw *hw)
 {
-       ar->hw->wiphy->regulatory_flags = REGULATORY_WIPHY_SELF_MANAGED;
-       ar->hw->wiphy->reg_notifier = ath12k_reg_notifier;
+       hw->wiphy->regulatory_flags = REGULATORY_WIPHY_SELF_MANAGED;
+       hw->wiphy->reg_notifier = ath12k_reg_notifier;
 }
 
 void ath12k_reg_free(struct ath12k_base *ab)

diff --git a/drivers/net/wireless/ath/ath12k/reg.h b/drivers/net/wireless/ath/ath12k/reg.h
index d4a0776e10341fcbd669b20e981d06e89b846035..29c7ec3260dafe34ffe202b39d105294e93c817a 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/reg.h
+++ b/drivers/net/wireless/ath/ath12k/reg.h
@@ -89,7 +89,7 @@ enum ath12k_reg_phy_bitmap {
        ATH12K_REG_PHY_BITMAP_NO11BE    = BIT(6),
 };
 
-void ath12k_reg_init(struct ath12k *ar);
+void ath12k_reg_init(struct ieee80211_hw *hw);
 void ath12k_reg_free(struct ath12k_base *ab);
 void ath12k_regd_update_work(struct work_struct *work);
 struct ieee80211_regdomain *ath12k_reg_build_regd(struct ath12k_base *ab,