Re: [PATCH V4 3/8] wifi: mac80211: Add support for ACPI WBRF

Limonciello, Mario
2023-06-21T14:13:56Z

On 6/21/2023 5:22 AM, Johannes Berg wrote:
> On Wed, 2023-06-21 at 13:45 +0800, Evan Quan wrote:
>> To support AMD's WBRF interference mitigation mechanism, Wifi adapters
>> utilized in the system must register the frequencies in use(or unregister
>> those frequencies no longer used) via the dedicated APCI calls. So that,
>> other drivers responding to the frequencies can take proper actions to
>> mitigate possible interference.
>>
>> To make WBRF feature functional, the kernel needs to be configured with
>> CONFIG_ACPI_WBRF and the platform is equipped with WBRF support(from
>> BIOS and drivers).
>>
>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>> Co-developed-by: Evan Quan <evan.quan@amd.com>
>> Signed-off-by: Evan Quan <evan.quan@amd.com>
> I was going to say this looks good ... but still have a few nits, sorry.
>
> But then the next question anyway is how we merge this? The wifi parts
> sort of depend on the first patch, although technically I guess I could
> merge them since it's all hidden behind the CONFIG_ symbol, assuming you
> get that in via some other tree it can combine upstream.
>
> I'd also say you can merge those parts elsewhere but I'm planning to
> also land some locking rework that I've been working on, so it will
> probably conflict somewhere.
Since it's all gated by CONFIG_ACPI_WBRF for each subsystem that it touches,
my take is that we should merge like this:

1) Get A-b/R-b on patch 1 (ACPI patch) from Rafael.
2) Merge mac80211 bits through WLAN trees
3) Merge AMDGPU bits *and* ACPI bits through amd-staging-drm-next
followed by drm tree

Since WLAN and AMDGPU bits are using the exported ACPI functions from
patch 1, we need to make sure that it is accepted and won't change
interface before merging other bits.

Everything can come together in the upstream tree and the bots
will be able to test linux-next as well this way.

By bringing ACPI bits through amd-staging-drm-next we can also enable
the new Kconfig
option in AMD's CI system to make sure that all the amdgpu bits are
going through CI
testing too earlier before it even hits linux-next.

>> +++ 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);
> You ignore the return value here.
>
>
>> @@ -668,6 +673,10 @@ static int ieee80211_add_chanctx(struct ieee80211_local *local,
>> lockdep_assert_held(&local->mtx);
>> lockdep_assert_held(&local->chanctx_mtx);
>>
>> + err = ieee80211_add_wbrf(local, &ctx->conf.def);
>> + if (err)
>> + return err;
> But not here.
>
> In the code, there are basically two error paths:
>
>> +int ieee80211_add_wbrf(struct ieee80211_local *local,
>> + struct cfg80211_chan_def *chandef)
>> +{
>> + struct device *dev = local->hw.wiphy->dev.parent;
>> + struct wbrf_ranges_in ranges_in = {0};
>> + int ret;
>> +
>> + if (!local->wbrf_supported)
>> + return 0;
>> +
>> + ret = wbrf_get_ranges_from_chandef(chandef, &ranges_in);
>> + if (ret)
>> + return ret;
> This really won't fail, just if the bandwidth calculation was bad, but
> that's an internal error that WARNs anyway and we can ignore it.
>
>> + return wbrf_add_exclusion(ACPI_COMPANION(dev), &ranges_in);
> This I find a bit confusing, why do we even propagate the error? If the
> platform has some issue with it, should we really fail the connection?
>
>
> I think it seems better to me to just make this void, and have it be
> only a notification interface?
>
> johannes