| Message ID | 20231215145439.57286-1-mario.limonciello@amd.com |
|---|---|
| State | New |
| Headers | show |
| Series | wifi: mac80211: Use subsystem appropriate debug call | expand |
Mario Limonciello <mario.limonciello@amd.com> writes: > mac80211 doesn't use dev_dbg() but instead various macros from > net/mac80211/debug.h. Adjust wbrf code to use wiphy_dbg() instead. > > Cc: Jun Ma <Jun.ma2@amd.com> > Reported-by: kvalo@kernel.org > Closes: > https://lore.kernel.org/amd-gfx/8bd60010-7534-4c22-9337-c4219946d8d6@amd.com/T/#mfe2f29372c45130d27745912faf33d9f7ce50118 > Fixes: d34be4310cbe ("wifi: mac80211: Add support for WBRF features") > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> > --- > net/mac80211/wbrf.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/mac80211/wbrf.c b/net/mac80211/wbrf.c > index a05c5b971789..12c23e14f884 100644 > --- a/net/mac80211/wbrf.c > +++ b/net/mac80211/wbrf.c > @@ -23,8 +23,8 @@ void ieee80211_check_wbrf_support(struct ieee80211_local *local) > return; > > local->wbrf_supported = acpi_amd_wbrf_supported_producer(dev); > - dev_dbg(dev, "WBRF is %s supported\n", > - local->wbrf_supported ? "" : "not"); > + wiphy_dbg(wiphy, "WBRF is %s supported\n", > + local->wbrf_supported ? "" : "not"); > } This won't work, I still see the debug message: [ 333.765867] ieee80211 phy0: WBRF is not supported The issue seems to be that mac80211 defines DEBUG in net/mac80211/Makefile: ccflags-y += -DDEBUG That -DDEBUG should be cleaned up, but I think separately. It's just that I cannot come up with any good proposal, all the macros in net/mac80211/debug.h require sdata and we don't have that in this stage. Any ideas?
Hi, On 12/18/2023 11:17 PM, Kalle Valo wrote: > Mario Limonciello <mario.limonciello@amd.com> writes: > >> mac80211 doesn't use dev_dbg() but instead various macros from >> net/mac80211/debug.h. Adjust wbrf code to use wiphy_dbg() instead. >> >> Cc: Jun Ma <Jun.ma2@amd.com> >> Reported-by: kvalo@kernel.org >> Closes: >> https://lore.kernel.org/amd-gfx/8bd60010-7534-4c22-9337-c4219946d8d6@amd.com/T/#mfe2f29372c45130d27745912faf33d9f7ce50118 >> Fixes: d34be4310cbe ("wifi: mac80211: Add support for WBRF features") >> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> >> --- >> net/mac80211/wbrf.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/net/mac80211/wbrf.c b/net/mac80211/wbrf.c >> index a05c5b971789..12c23e14f884 100644 >> --- a/net/mac80211/wbrf.c >> +++ b/net/mac80211/wbrf.c >> @@ -23,8 +23,8 @@ void ieee80211_check_wbrf_support(struct ieee80211_local *local) >> return; >> >> local->wbrf_supported = acpi_amd_wbrf_supported_producer(dev); >> - dev_dbg(dev, "WBRF is %s supported\n", >> - local->wbrf_supported ? "" : "not"); >> + wiphy_dbg(wiphy, "WBRF is %s supported\n", >> + local->wbrf_supported ? "" : "not"); >> } > > This won't work, I still see the debug message: > > [ 333.765867] ieee80211 phy0: WBRF is not supported > > The issue seems to be that mac80211 defines DEBUG in > net/mac80211/Makefile: > > ccflags-y += -DDEBUG > > That -DDEBUG should be cleaned up, but I think separately. It's just > that I cannot come up with any good proposal, all the macros in > net/mac80211/debug.h require sdata and we don't have that in this stage. > Any ideas? I will submit a patch that only compiles wbrf.c when CONFIG_AMD_WBRF=y Regards, Ma Jun >
"Ma, Jun" <majun@amd.com> writes: > Hi, > > On 12/18/2023 11:17 PM, Kalle Valo wrote: >> Mario Limonciello <mario.limonciello@amd.com> writes: >> >>> mac80211 doesn't use dev_dbg() but instead various macros from >>> net/mac80211/debug.h. Adjust wbrf code to use wiphy_dbg() instead. >>> >>> Cc: Jun Ma <Jun.ma2@amd.com> >>> Reported-by: kvalo@kernel.org >>> Closes: >>> https://lore.kernel.org/amd-gfx/8bd60010-7534-4c22-9337-c4219946d8d6@amd.com/T/#mfe2f29372c45130d27745912faf33d9f7ce50118 >>> Fixes: d34be4310cbe ("wifi: mac80211: Add support for WBRF features") >>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> >>> --- >>> net/mac80211/wbrf.c | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/net/mac80211/wbrf.c b/net/mac80211/wbrf.c >>> index a05c5b971789..12c23e14f884 100644 >>> --- a/net/mac80211/wbrf.c >>> +++ b/net/mac80211/wbrf.c >>> @@ -23,8 +23,8 @@ void ieee80211_check_wbrf_support(struct ieee80211_local *local) >>> return; >>> >>> local->wbrf_supported = acpi_amd_wbrf_supported_producer(dev); >>> - dev_dbg(dev, "WBRF is %s supported\n", >>> - local->wbrf_supported ? "" : "not"); >>> + wiphy_dbg(wiphy, "WBRF is %s supported\n", >>> + local->wbrf_supported ? "" : "not"); >>> } >> >> This won't work, I still see the debug message: >> >> [ 333.765867] ieee80211 phy0: WBRF is not supported >> >> The issue seems to be that mac80211 defines DEBUG in >> net/mac80211/Makefile: >> >> ccflags-y += -DDEBUG >> >> That -DDEBUG should be cleaned up, but I think separately. It's just >> that I cannot come up with any good proposal, all the macros in >> net/mac80211/debug.h require sdata and we don't have that in this stage. >> Any ideas? > > I will submit a patch that only compiles wbrf.c when CONFIG_AMD_WBRF=y But does this mean that the debug is still printed when CONFIG_AMD_WBRF is enabled? And I would assume all distros enable that, right?
On 12/21/2023 00:38, Kalle Valo wrote: > "Ma, Jun" <majun@amd.com> writes: > >> Hi, >> >> On 12/18/2023 11:17 PM, Kalle Valo wrote: >>> Mario Limonciello <mario.limonciello@amd.com> writes: >>> >>>> mac80211 doesn't use dev_dbg() but instead various macros from >>>> net/mac80211/debug.h. Adjust wbrf code to use wiphy_dbg() instead. >>>> >>>> Cc: Jun Ma <Jun.ma2@amd.com> >>>> Reported-by: kvalo@kernel.org >>>> Closes: >>>> https://lore.kernel.org/amd-gfx/8bd60010-7534-4c22-9337-c4219946d8d6@amd.com/T/#mfe2f29372c45130d27745912faf33d9f7ce50118 >>>> Fixes: d34be4310cbe ("wifi: mac80211: Add support for WBRF features") >>>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> >>>> --- >>>> net/mac80211/wbrf.c | 4 ++-- >>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/net/mac80211/wbrf.c b/net/mac80211/wbrf.c >>>> index a05c5b971789..12c23e14f884 100644 >>>> --- a/net/mac80211/wbrf.c >>>> +++ b/net/mac80211/wbrf.c >>>> @@ -23,8 +23,8 @@ void ieee80211_check_wbrf_support(struct ieee80211_local *local) >>>> return; >>>> >>>> local->wbrf_supported = acpi_amd_wbrf_supported_producer(dev); >>>> - dev_dbg(dev, "WBRF is %s supported\n", >>>> - local->wbrf_supported ? "" : "not"); >>>> + wiphy_dbg(wiphy, "WBRF is %s supported\n", >>>> + local->wbrf_supported ? "" : "not"); >>>> } >>> >>> This won't work, I still see the debug message: >>> >>> [ 333.765867] ieee80211 phy0: WBRF is not supported >>> >>> The issue seems to be that mac80211 defines DEBUG in >>> net/mac80211/Makefile: >>> >>> ccflags-y += -DDEBUG >>> >>> That -DDEBUG should be cleaned up, but I think separately. It's just >>> that I cannot come up with any good proposal, all the macros in >>> net/mac80211/debug.h require sdata and we don't have that in this stage. >>> Any ideas? >> >> I will submit a patch that only compiles wbrf.c when CONFIG_AMD_WBRF=y > > But does this mean that the debug is still printed when CONFIG_AMD_WBRF > is enabled? And I would assume all distros enable that, right? > Maybe just discard the debug message instead of have to deal with this. We'll be able to tell from the consumer (amdgpu right now) when WBRF is being used and if we need to debug an issue knowing that it's supported or not supported from the producer side is the least of our worries.
Mario Limonciello <mario.limonciello@amd.com> writes: > On 12/21/2023 00:38, Kalle Valo wrote: > >> "Ma, Jun" <majun@amd.com> writes: >> >>> Hi, >>> >>> On 12/18/2023 11:17 PM, Kalle Valo wrote: >>>> Mario Limonciello <mario.limonciello@amd.com> writes: >>>> >>>>> mac80211 doesn't use dev_dbg() but instead various macros from >>>>> net/mac80211/debug.h. Adjust wbrf code to use wiphy_dbg() instead. >>>>> >>>>> Cc: Jun Ma <Jun.ma2@amd.com> >>>>> Reported-by: kvalo@kernel.org >>>>> Closes: >>>>> https://lore.kernel.org/amd-gfx/8bd60010-7534-4c22-9337-c4219946d8d6@amd.com/T/#mfe2f29372c45130d27745912faf33d9f7ce50118 >>>>> Fixes: d34be4310cbe ("wifi: mac80211: Add support for WBRF features") >>>>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> >>>>> --- >>>>> net/mac80211/wbrf.c | 4 ++-- >>>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>>> >>>>> diff --git a/net/mac80211/wbrf.c b/net/mac80211/wbrf.c >>>>> index a05c5b971789..12c23e14f884 100644 >>>>> --- a/net/mac80211/wbrf.c >>>>> +++ b/net/mac80211/wbrf.c >>>>> @@ -23,8 +23,8 @@ void ieee80211_check_wbrf_support(struct ieee80211_local *local) >>>>> return; >>>>> local->wbrf_supported = >>>>> acpi_amd_wbrf_supported_producer(dev); >>>>> - dev_dbg(dev, "WBRF is %s supported\n", >>>>> - local->wbrf_supported ? "" : "not"); >>>>> + wiphy_dbg(wiphy, "WBRF is %s supported\n", >>>>> + local->wbrf_supported ? "" : "not"); >>>>> } >>>> >>>> This won't work, I still see the debug message: >>>> >>>> [ 333.765867] ieee80211 phy0: WBRF is not supported >>>> >>>> The issue seems to be that mac80211 defines DEBUG in >>>> net/mac80211/Makefile: >>>> >>>> ccflags-y += -DDEBUG >>>> >>>> That -DDEBUG should be cleaned up, but I think separately. It's just >>>> that I cannot come up with any good proposal, all the macros in >>>> net/mac80211/debug.h require sdata and we don't have that in this stage. >>>> Any ideas? >>> >>> I will submit a patch that only compiles wbrf.c when CONFIG_AMD_WBRF=y >> But does this mean that the debug is still printed when >> CONFIG_AMD_WBRF >> is enabled? And I would assume all distros enable that, right? >> > > Maybe just discard the debug message instead of have to deal with this. > > We'll be able to tell from the consumer (amdgpu right now) when WBRF > is being used and if we need to debug an issue knowing that it's > supported or not supported from the producer side is the least of our > worries. Yeah, removing the message for now is the best solution. It can be added later after we have improved mac80211 logging.
diff --git a/net/mac80211/wbrf.c b/net/mac80211/wbrf.c index a05c5b971789..12c23e14f884 100644 --- a/net/mac80211/wbrf.c +++ b/net/mac80211/wbrf.c @@ -23,8 +23,8 @@ void ieee80211_check_wbrf_support(struct ieee80211_local *local) return; local->wbrf_supported = acpi_amd_wbrf_supported_producer(dev); - dev_dbg(dev, "WBRF is %s supported\n", - local->wbrf_supported ? "" : "not"); + wiphy_dbg(wiphy, "WBRF is %s supported\n", + local->wbrf_supported ? "" : "not"); } static void get_chan_freq_boundary(u32 center_freq, u32 bandwidth, u64 *start, u64 *end)
mac80211 doesn't use dev_dbg() but instead various macros from net/mac80211/debug.h. Adjust wbrf code to use wiphy_dbg() instead. Cc: Jun Ma <Jun.ma2@amd.com> Reported-by: kvalo@kernel.org Closes: https://lore.kernel.org/amd-gfx/8bd60010-7534-4c22-9337-c4219946d8d6@amd.com/T/#mfe2f29372c45130d27745912faf33d9f7ce50118 Fixes: d34be4310cbe ("wifi: mac80211: Add support for WBRF features") Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> --- net/mac80211/wbrf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)