wifi: ath12k: save power spectral density(PSD) of regulatory rule

Currently the power spectral density (PSD) report from firmware is ignored.
Since it is needed by cfg80211, report it in struct ieee80211_reg_rule such
that cfg80211 can use it.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20250418-ath12k-6g-lp-vlp-v1-10-c869c86cad60@quicinc.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/reg.c b/drivers/net/wireless/ath/ath12k/reg.c
index dbd7d956dd52ad91cf1c0bae0a243afd3bd26a61..62936d518b1d767a198958150a13bb9ac8b73009 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/reg.c
+++ b/drivers/net/wireless/ath/ath12k/reg.c
@@ -516,6 +516,11 @@ static void ath12k_reg_intersect_rules(struct ieee80211_reg_rule *rule1,
        /* Use the flags of both the rules */
        new_rule->flags = rule1->flags | rule2->flags;
 
+       if ((rule1->flags & NL80211_RRF_PSD) && (rule2->flags & NL80211_RRF_PSD))
+               new_rule->psd = min_t(s8, rule1->psd, rule2->psd);
+       else
+               new_rule->flags &= ~NL80211_RRF_PSD;
+
        /* To be safe, lts use the max cac timeout of both rules */
        new_rule->dfs_cac_ms = max_t(u32, rule1->dfs_cac_ms,
                                     rule2->dfs_cac_ms);
@@ -613,13 +618,14 @@ ath12k_reg_adjust_bw(u16 start_freq, u16 end_freq, u16 max_bw)
 static void
 ath12k_reg_update_rule(struct ieee80211_reg_rule *reg_rule, u32 start_freq,
                       u32 end_freq, u32 bw, u32 ant_gain, u32 reg_pwr,
-                      u32 reg_flags)
+                      s8 psd, u32 reg_flags)
 {
        reg_rule->freq_range.start_freq_khz = MHZ_TO_KHZ(start_freq);
        reg_rule->freq_range.end_freq_khz = MHZ_TO_KHZ(end_freq);
        reg_rule->freq_range.max_bandwidth_khz = MHZ_TO_KHZ(bw);
        reg_rule->power_rule.max_antenna_gain = DBI_TO_MBI(ant_gain);
        reg_rule->power_rule.max_eirp = DBM_TO_MBM(reg_pwr);
+       reg_rule->psd = psd;
        reg_rule->flags = reg_flags;
 }
 
@@ -641,7 +647,7 @@ ath12k_reg_update_weather_radar_band(struct ath12k_base *ab,
        ath12k_reg_update_rule(regd->reg_rules + i, reg_rule->start_freq,
                               ETSI_WEATHER_RADAR_BAND_LOW, bw,
                               reg_rule->ant_gain, reg_rule->reg_power,
-                              flags);
+                              reg_rule->psd_eirp, flags);
 
        ath12k_dbg(ab, ATH12K_DBG_REG,
                   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",
@@ -663,7 +669,7 @@ ath12k_reg_update_weather_radar_band(struct ath12k_base *ab,
        ath12k_reg_update_rule(regd->reg_rules + i,
                               ETSI_WEATHER_RADAR_BAND_LOW, end_freq, bw,
                               reg_rule->ant_gain, reg_rule->reg_power,
-                              flags);
+                              reg_rule->psd_eirp, flags);
 
        regd->reg_rules[i].dfs_cac_ms = ETSI_WEATHER_RADAR_BAND_CAC_TIMEOUT;
 
@@ -688,7 +694,7 @@ ath12k_reg_update_weather_radar_band(struct ath12k_base *ab,
        ath12k_reg_update_rule(regd->reg_rules + i, ETSI_WEATHER_RADAR_BAND_HIGH,
                               reg_rule->end_freq, bw,
                               reg_rule->ant_gain, reg_rule->reg_power,
-                              flags);
+                              reg_rule->psd_eirp, flags);
 
        ath12k_dbg(ab, ATH12K_DBG_REG,
                   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",
@@ -840,6 +846,8 @@ ath12k_reg_build_regd(struct ath12k_base *ab,
                        reg_rule = reg_rule_6ghz + k++;
                        max_bw = min_t(u16, reg_rule->max_bw, max_bw_6ghz);
                        flags = NL80211_RRF_AUTO_BW;
+                       if (reg_rule->psd_flag)
+                               flags |= NL80211_RRF_PSD;
                        ath12k_reg_update_freq_range(&ab->reg_freq_6ghz, reg_rule);
                } else {
                        break;
@@ -852,7 +860,7 @@ ath12k_reg_build_regd(struct ath12k_base *ab,
                                       reg_rule->start_freq,
                                       reg_rule->end_freq, max_bw,
                                       reg_rule->ant_gain, reg_rule->reg_power,
-                                      flags);
+                                      reg_rule->psd_eirp, flags);
 
                /* Update dfs cac timeout if the dfs domain is ETSI and the
                 * new rule covers weather radar band.