Commit 28f64d36 authored by Wen Gong's avatar Wen Gong Committed by Kalle Valo
Browse files

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



Save the power spectral density (PSD) report from firmware to struct
ieee80211_reg_rule.

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23

Signed-off-by: default avatarWen Gong <quic_wgong@quicinc.com>
Acked-by: default avatarJeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: default avatarBaochen Qiang <quic_bqiang@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20231218085844.2658-7-quic_bqiang@quicinc.com
parent 1329beb5

drivers/net/wireless/ath/ath11k/reg.c

+13 −5
Original line number Diff line number Diff line
@@ -425,6 +425,11 @@ static void ath11k_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);
@@ -527,13 +532,14 @@ ath11k_reg_adjust_bw(u16 start_freq, u16 end_freq, u16 max_bw) 
static void

ath11k_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;

}
@@ -563,7 +569,7 @@ ath11k_reg_update_weather_radar_band(struct ath11k_base *ab, 
				       reg_rule->start_freq,

				       ETSI_WEATHER_RADAR_BAND_LOW, bw,

				       reg_rule->ant_gain, reg_rule->reg_power,

				       flags);

				       reg_rule->psd_eirp, flags);



		ath11k_dbg(ab, ATH11K_DBG_REG,

			   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",
@@ -584,7 +590,7 @@ ath11k_reg_update_weather_radar_band(struct ath11k_base *ab, 


		ath11k_reg_update_rule(regd->reg_rules + i, start_freq,

				       end_freq, bw, reg_rule->ant_gain,

				       reg_rule->reg_power, flags);

				       reg_rule->reg_power, reg_rule->psd_eirp, flags);



		regd->reg_rules[i].dfs_cac_ms = ETSI_WEATHER_RADAR_BAND_CAC_TIMEOUT;
@@ -605,7 +611,7 @@ ath11k_reg_update_weather_radar_band(struct ath11k_base *ab, 
				       ETSI_WEATHER_RADAR_BAND_HIGH,

				       reg_rule->end_freq, bw,

				       reg_rule->ant_gain, reg_rule->reg_power,

				       flags);

				       reg_rule->psd_eirp, flags);



		ath11k_dbg(ab, ATH11K_DBG_REG,

			   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",
@@ -731,6 +737,8 @@ ath11k_reg_build_regd(struct ath11k_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;

		} else {

			break;

		}
@@ -742,7 +750,7 @@ ath11k_reg_build_regd(struct ath11k_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.