| Message ID | 20231030071832.2217118-5-Jun.Ma2@amd.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | Enable Wifi RFI interference mitigation feature support | expand |
On Mon, 30 Oct 2023, Ma Jun wrote: > From: Evan Quan <quanliangl@hotmail.com> > > To support the WBRF mechanism, Wifi adapters utilized in the system must > register the frequencies in use (or unregister those frequencies no longer > used) via the dedicated calls. So that, other drivers responding to the > frequencies can take proper actions to mitigate possible interference. > > Co-developed-by: Mario Limonciello <mario.limonciello@amd.com> > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> > Co-developed-by: Evan Quan <quanliangl@hotmail.com> > Signed-off-by: Evan Quan <quanliangl@hotmail.com> > Signed-off-by: Ma Jun <Jun.Ma2@amd.com> > -- > v1->v2: > - place the new added member(`wbrf_supported`) in > ieee80211_local(Johannes) > - handle chandefs change scenario properly(Johannes) > - some minor fixes around code sharing and possible invalid input > checks(Johannes) > v2->v3: > - drop unnecessary input checks and intermediate APIs(Mario) > - Separate some mac80211 common code(Mario, Johannes) > v3->v4: > - some minor fixes around return values(Johannes) > v9->v10: > - get ranges_in->num_of_ranges set and passed in(Johannes) > v12: > - use acpi_amd_wbrf_add_remove to replace the acpi_amd_wbrf_add_exclusion > acpi_amd_wbrf_remove_exclusion > v13: > - Fix the format issue (IIpo Jarvinen) > - Remove KHZ_TO_HZ and use HZ_PER_KHZ in linux/units.h (IIpo Jarvinen) > --- > net/mac80211/Makefile | 2 + > net/mac80211/chan.c | 9 ++++ > net/mac80211/ieee80211_i.h | 7 +++ > net/mac80211/main.c | 2 + > net/mac80211/wbrf.c | 95 ++++++++++++++++++++++++++++++++++++++ > 5 files changed, 115 insertions(+) > create mode 100644 net/mac80211/wbrf.c > > diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile > index b8de44da1fb8..d46c36f55fd3 100644 > --- a/net/mac80211/Makefile > +++ b/net/mac80211/Makefile > @@ -65,4 +65,6 @@ rc80211_minstrel-$(CONFIG_MAC80211_DEBUGFS) += \ > > mac80211-$(CONFIG_MAC80211_RC_MINSTREL) += $(rc80211_minstrel-y) > > +mac80211-y += wbrf.o > + > ccflags-y += -DDEBUG > diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c > index 68952752b599..458469c224ae 100644 > --- a/net/mac80211/chan.c > +++ b/net/mac80211/chan.c > @@ -506,11 +506,16 @@ static void _ieee80211_change_chanctx(struct ieee80211_local *local, > > WARN_ON(!cfg80211_chandef_compatible(&ctx->conf.def, chandef)); > > + ieee80211_remove_wbrf(local, &ctx->conf.def); > + > ctx->conf.def = *chandef; > > /* check if min chanctx also changed */ > changed = IEEE80211_CHANCTX_CHANGE_WIDTH | > _ieee80211_recalc_chanctx_min_def(local, ctx, rsvd_for); > + > + ieee80211_add_wbrf(local, &ctx->conf.def); > + > drv_change_chanctx(local, ctx, changed); > > if (!local->use_chanctx) { > @@ -668,6 +673,8 @@ static int ieee80211_add_chanctx(struct ieee80211_local *local, > lockdep_assert_held(&local->mtx); > lockdep_assert_held(&local->chanctx_mtx); > > + ieee80211_add_wbrf(local, &ctx->conf.def); > + > if (!local->use_chanctx) > local->hw.conf.radar_enabled = ctx->conf.radar_enabled; > > @@ -748,6 +755,8 @@ static void ieee80211_del_chanctx(struct ieee80211_local *local, > } > > ieee80211_recalc_idle(local); > + > + ieee80211_remove_wbrf(local, &ctx->conf.def); > } > > static void ieee80211_free_chanctx(struct ieee80211_local *local, > diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h > index 98ef1fe1226e..1172554bd831 100644 > --- a/net/mac80211/ieee80211_i.h > +++ b/net/mac80211/ieee80211_i.h > @@ -1600,6 +1600,8 @@ struct ieee80211_local { > > /* extended capabilities provided by mac80211 */ > u8 ext_capa[8]; > + > + bool wbrf_supported; > }; > > static inline struct ieee80211_sub_if_data * > @@ -2637,4 +2639,9 @@ ieee80211_eht_cap_ie_to_sta_eht_cap(struct ieee80211_sub_if_data *sdata, > const struct ieee80211_eht_cap_elem *eht_cap_ie_elem, > u8 eht_cap_len, > struct link_sta_info *link_sta); > + > +void ieee80211_check_wbrf_support(struct ieee80211_local *local); > +void ieee80211_add_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef); > +void ieee80211_remove_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef); > + > #endif /* IEEE80211_I_H */ > diff --git a/net/mac80211/main.c b/net/mac80211/main.c > index 24315d7b3126..b20bdaac84db 100644 > --- a/net/mac80211/main.c > +++ b/net/mac80211/main.c > @@ -1396,6 +1396,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) > debugfs_hw_add(local); > rate_control_add_debugfs(local); > > + ieee80211_check_wbrf_support(local); > + > rtnl_lock(); > wiphy_lock(hw->wiphy); > > diff --git a/net/mac80211/wbrf.c b/net/mac80211/wbrf.c > new file mode 100644 > index 000000000000..ca3f30b58476 > --- /dev/null > +++ b/net/mac80211/wbrf.c > @@ -0,0 +1,95 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Wifi Band Exclusion Interface for WLAN > + * Copyright (C) 2023 Advanced Micro Devices > + * > + */ > + > +#include <linux/acpi_amd_wbrf.h> > +#include <linux/units.h> > +#include <net/cfg80211.h> > +#include "ieee80211_i.h" > + > +void ieee80211_check_wbrf_support(struct ieee80211_local *local) > +{ > + struct wiphy *wiphy = local->hw.wiphy; > + struct device *dev; > + > + if (!wiphy) > + return; > + > + dev = wiphy->dev.parent; > + if (!dev) > + return; > + > + local->wbrf_supported = acpi_amd_wbrf_supported_producer(dev); > + dev_dbg(dev, "WBRF is %s supported\n", > + local->wbrf_supported ? "" : "not"); > +} > + > +static void get_chan_freq_boundary(u32 center_freq, u32 bandwidth, u64 *start, u64 *end) > +{ > + bandwidth = MHZ_TO_KHZ(bandwidth); > + center_freq = MHZ_TO_KHZ(center_freq); Please use include/linux/units.h ones for these too.
On Thu, 2023-11-02 at 13:55 +0200, Ilpo Järvinen wrote: [please trim your quotes] > > +static void get_chan_freq_boundary(u32 center_freq, u32 bandwidth, u64 *start, u64 *end) > > +{ > > + bandwidth = MHZ_TO_KHZ(bandwidth); > > + center_freq = MHZ_TO_KHZ(center_freq); > > Please use include/linux/units.h ones for these too. Now we're feature creeping though - this has existed for *years* in the wireless stack with many instances? We can convert them over, I guess, but not sure that makes much sense here - we'd want to add such macros to units.h, but ... moving them can be independent of this patch? johannes
On Thu, 2 Nov 2023, Johannes Berg wrote: > On Thu, 2023-11-02 at 13:55 +0200, Ilpo Järvinen wrote: > > > > +static void get_chan_freq_boundary(u32 center_freq, u32 bandwidth, u64 *start, u64 *end) > > > +{ > > > + bandwidth = MHZ_TO_KHZ(bandwidth); > > > + center_freq = MHZ_TO_KHZ(center_freq); > > > > Please use include/linux/units.h ones for these too. > > Now we're feature creeping though - this has existed for *years* in the > wireless stack with many instances? We can convert them over, I guess, > but not sure that makes much sense here - we'd want to add such macros > to units.h, but ... moving them can be independent of this patch? What new macros you're talking about? Nothing new needs to be added as there's already KHZ_PER_MHZ so these would just be: bandwidth *= KHZ_PER_MHZ; center_freq *= KHZ_PER_MHZ; Everything can of course be postponed by the argument that some subsystem specific mechanism has been there before the generic one but the end of that road won't be pretty... What I was trying to do here was to point out the new stuff introduced by this series into the direction of the generic thing.
On Thu, 2023-11-02 at 14:24 +0200, Ilpo Järvinen wrote: > On Thu, 2 Nov 2023, Johannes Berg wrote: > > On Thu, 2023-11-02 at 13:55 +0200, Ilpo Järvinen wrote: > > > > > > +static void get_chan_freq_boundary(u32 center_freq, u32 bandwidth, u64 *start, u64 *end) > > > > +{ > > > > + bandwidth = MHZ_TO_KHZ(bandwidth); > > > > + center_freq = MHZ_TO_KHZ(center_freq); > > > > > > Please use include/linux/units.h ones for these too. > > > > Now we're feature creeping though - this has existed for *years* in the > > wireless stack with many instances? We can convert them over, I guess, > > but not sure that makes much sense here - we'd want to add such macros > > to units.h, but ... moving them can be independent of this patch? > > What new macros you're talking about? Sorry, I got confused - for some reason I was pretty sure something here was already being added to units.h in this patchset. > Nothing new needs to be added > as there's already KHZ_PER_MHZ so these would just be: > > bandwidth *= KHZ_PER_MHZ; > center_freq *= KHZ_PER_MHZ; Sure, and in this case that's probably pretty much equivalent. But having a MHZ_TO_KHZ() macro isn't inherently *bad*, and I'm not sure you're objection to it on anything other than "it's not defined in units.h". > Everything can of course be postponed by the argument that some > subsystem specific mechanism has been there before the generic one > but the end of that road won't be pretty... What I was trying to do > here was to point out the new stuff introduced by this series into the > direction of the generic thing. I just think that the better course of action would be to eventually move MHZ_TO_KHZ() to units.h ... johannes
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile index b8de44da1fb8..d46c36f55fd3 100644 --- a/net/mac80211/Makefile +++ b/net/mac80211/Makefile @@ -65,4 +65,6 @@ rc80211_minstrel-$(CONFIG_MAC80211_DEBUGFS) += \ mac80211-$(CONFIG_MAC80211_RC_MINSTREL) += $(rc80211_minstrel-y) +mac80211-y += wbrf.o + ccflags-y += -DDEBUG diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index 68952752b599..458469c224ae 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -506,11 +506,16 @@ static void _ieee80211_change_chanctx(struct ieee80211_local *local, WARN_ON(!cfg80211_chandef_compatible(&ctx->conf.def, chandef)); + ieee80211_remove_wbrf(local, &ctx->conf.def); + ctx->conf.def = *chandef; /* check if min chanctx also changed */ changed = IEEE80211_CHANCTX_CHANGE_WIDTH | _ieee80211_recalc_chanctx_min_def(local, ctx, rsvd_for); + + ieee80211_add_wbrf(local, &ctx->conf.def); + drv_change_chanctx(local, ctx, changed); if (!local->use_chanctx) { @@ -668,6 +673,8 @@ static int ieee80211_add_chanctx(struct ieee80211_local *local, lockdep_assert_held(&local->mtx); lockdep_assert_held(&local->chanctx_mtx); + ieee80211_add_wbrf(local, &ctx->conf.def); + if (!local->use_chanctx) local->hw.conf.radar_enabled = ctx->conf.radar_enabled; @@ -748,6 +755,8 @@ static void ieee80211_del_chanctx(struct ieee80211_local *local, } ieee80211_recalc_idle(local); + + ieee80211_remove_wbrf(local, &ctx->conf.def); } static void ieee80211_free_chanctx(struct ieee80211_local *local, diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 98ef1fe1226e..1172554bd831 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1600,6 +1600,8 @@ struct ieee80211_local { /* extended capabilities provided by mac80211 */ u8 ext_capa[8]; + + bool wbrf_supported; }; static inline struct ieee80211_sub_if_data * @@ -2637,4 +2639,9 @@ ieee80211_eht_cap_ie_to_sta_eht_cap(struct ieee80211_sub_if_data *sdata, const struct ieee80211_eht_cap_elem *eht_cap_ie_elem, u8 eht_cap_len, struct link_sta_info *link_sta); + +void ieee80211_check_wbrf_support(struct ieee80211_local *local); +void ieee80211_add_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef); +void ieee80211_remove_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef); + #endif /* IEEE80211_I_H */ diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 24315d7b3126..b20bdaac84db 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1396,6 +1396,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) debugfs_hw_add(local); rate_control_add_debugfs(local); + ieee80211_check_wbrf_support(local); + rtnl_lock(); wiphy_lock(hw->wiphy); diff --git a/net/mac80211/wbrf.c b/net/mac80211/wbrf.c new file mode 100644 index 000000000000..ca3f30b58476 --- /dev/null +++ b/net/mac80211/wbrf.c @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Wifi Band Exclusion Interface for WLAN + * Copyright (C) 2023 Advanced Micro Devices + * + */ + +#include <linux/acpi_amd_wbrf.h> +#include <linux/units.h> +#include <net/cfg80211.h> +#include "ieee80211_i.h" + +void ieee80211_check_wbrf_support(struct ieee80211_local *local) +{ + struct wiphy *wiphy = local->hw.wiphy; + struct device *dev; + + if (!wiphy) + return; + + dev = wiphy->dev.parent; + if (!dev) + return; + + local->wbrf_supported = acpi_amd_wbrf_supported_producer(dev); + dev_dbg(dev, "WBRF is %s supported\n", + local->wbrf_supported ? "" : "not"); +} + +static void get_chan_freq_boundary(u32 center_freq, u32 bandwidth, u64 *start, u64 *end) +{ + bandwidth = MHZ_TO_KHZ(bandwidth); + center_freq = MHZ_TO_KHZ(center_freq); + + *start = center_freq - bandwidth / 2; + *end = center_freq + bandwidth / 2; + + /* Frequency in Hz is expected */ + *start = *start * HZ_PER_KHZ; + *end = *end * HZ_PER_KHZ; +} + +static void get_ranges_from_chandef(struct cfg80211_chan_def *chandef, + struct wbrf_ranges_in_out *ranges_in) +{ + u64 start_freq1, end_freq1; + u64 start_freq2, end_freq2; + int bandwidth; + + bandwidth = nl80211_chan_width_to_mhz(chandef->width); + + get_chan_freq_boundary(chandef->center_freq1, bandwidth, &start_freq1, &end_freq1); + + ranges_in->band_list[0].start = start_freq1; + ranges_in->band_list[0].end = end_freq1; + ranges_in->num_of_ranges = 1; + + if (chandef->width == NL80211_CHAN_WIDTH_80P80) { + get_chan_freq_boundary(chandef->center_freq2, bandwidth, &start_freq2, &end_freq2); + + ranges_in->band_list[1].start = start_freq2; + ranges_in->band_list[1].end = end_freq2; + ranges_in->num_of_ranges++; + } +} + +void ieee80211_add_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef) +{ + struct wbrf_ranges_in_out ranges_in = {0}; + struct device *dev; + + if (!local->wbrf_supported) + return; + + dev = local->hw.wiphy->dev.parent; + + get_ranges_from_chandef(chandef, &ranges_in); + + acpi_amd_wbrf_add_remove(dev, WBRF_RECORD_ADD, &ranges_in); +} + +void ieee80211_remove_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef) +{ + struct wbrf_ranges_in_out ranges_in = {0}; + struct device *dev; + + if (!local->wbrf_supported) + return; + + dev = local->hw.wiphy->dev.parent; + + get_ranges_from_chandef(chandef, &ranges_in); + + acpi_amd_wbrf_add_remove(dev, WBRF_RECORD_REMOVE, &ranges_in); +}