* [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
@ 2023-12-11 11:02 Hans de Goede
2023-12-11 11:41 ` Johannes Berg
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Hans de Goede @ 2023-12-11 11:02 UTC (permalink / raw)
To: Johannes Berg, Alex Deucher, Christian König, Ma Jun,
Limonciello, Mario, platform-driver-x86@vger.kernel.org
Cc: linux-wireless, amd-gfx list, Ilpo Järvinen
Hi Wifi and AMDGPU maintainers,
Here is a pull-request for the platform-drivers-x86 parts of:
https://lore.kernel.org/platform-driver-x86/20231211100630.2170152-1-Jun.Ma2@amd.com/
From my pov the pdx86 bits are ready and the platform-drivers-x86-amd-wbrf-v6.8-1 tag can be merged by you to merge the wifi-subsys resp. the amdgpu driver changes on top.
This only adds kernel internal API, so if in the future the API needs work that can be done.
I've not merged this branch into pdx86/for-next yet, since I see little use in merging it without any users. I'll merge it once either the wifi or amdgpu changes are also merged
(and if some blocking issues get identified before either are merged I can prepare a new pull-request fixing the issues).
Regards,
Hans
The following changes since commit b85ea95d086471afb4ad062012a4d73cd328fa86:
Linux 6.7-rc1 (2023-11-12 16:19:07 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git tags/platform-drivers-x86-amd-wbrf-v6.8-1
for you to fetch changes up to 58e82a62669da52e688f4a8b89922c1839bf1001:
platform/x86/amd: Add support for AMD ACPI based Wifi band RFI mitigation feature (2023-12-11 11:33:44 +0100)
----------------------------------------------------------------
Immutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
platform-drivers-x86-amd-wbrf-v6.8-1: v6.7-rc1 + AMD WBRF support
for merging into the wifi subsys and amdgpu driver for 6.8.
----------------------------------------------------------------
Ma Jun (2):
Documentation/driver-api: Add document about WBRF mechanism
platform/x86/amd: Add support for AMD ACPI based Wifi band RFI mitigation feature
Documentation/driver-api/index.rst | 1 +
Documentation/driver-api/wbrf.rst | 78 +++++++++
drivers/platform/x86/amd/Kconfig | 14 ++
drivers/platform/x86/amd/Makefile | 1 +
drivers/platform/x86/amd/wbrf.c | 317 +++++++++++++++++++++++++++++++++++++
include/linux/acpi_amd_wbrf.h | 91 +++++++++++
6 files changed, 502 insertions(+)
create mode 100644 Documentation/driver-api/wbrf.rst
create mode 100644 drivers/platform/x86/amd/wbrf.c
create mode 100644 include/linux/acpi_amd_wbrf.h
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
2023-12-11 11:02 [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window Hans de Goede
@ 2023-12-11 11:41 ` Johannes Berg
2023-12-11 11:45 ` Hans de Goede
2023-12-11 14:47 ` Christian König
` (2 subsequent siblings)
3 siblings, 1 reply; 13+ messages in thread
From: Johannes Berg @ 2023-12-11 11:41 UTC (permalink / raw)
To: Hans de Goede, Alex Deucher, Christian König, Ma Jun,
Limonciello, Mario, platform-driver-x86@vger.kernel.org
Cc: linux-wireless, amd-gfx list, Ilpo Järvinen
Hi,
> Here is a pull-request for the platform-drivers-x86 parts of:
>
> https://lore.kernel.org/platform-driver-x86/20231211100630.2170152-1-Jun.Ma2@amd.com/
>
> From my pov the pdx86 bits are ready and the platform-drivers-x86-amd-wbrf-v6.8-1 tag can be merged by you to merge the wifi-subsys resp. the amdgpu driver changes on top.
>
> This only adds kernel internal API, so if in the future the API needs work that can be done.
I've been fine with the wifi bits since around v3 of the patchset ;-)
So the idea is that I'll pull this into wireless-next and then apply the
two wireless patches on top, right?
AFAICT, since the other patches don't depend on wireless for
compilation, this is the only thing I need to do, i.e. no need to have
another separate branch to send it further on, right?
johannes
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
2023-12-11 11:41 ` Johannes Berg
@ 2023-12-11 11:45 ` Hans de Goede
0 siblings, 0 replies; 13+ messages in thread
From: Hans de Goede @ 2023-12-11 11:45 UTC (permalink / raw)
To: Johannes Berg, Alex Deucher, Christian König, Ma Jun,
Limonciello, Mario, platform-driver-x86@vger.kernel.org
Cc: linux-wireless, amd-gfx list, Ilpo Järvinen
Hi Johannes,
On 12/11/23 12:41, Johannes Berg wrote:
> Hi,
>
>> Here is a pull-request for the platform-drivers-x86 parts of:
>>
>> https://lore.kernel.org/platform-driver-x86/20231211100630.2170152-1-Jun.Ma2@amd.com/
>>
>> From my pov the pdx86 bits are ready and the platform-drivers-x86-amd-wbrf-v6.8-1 tag can be merged by you to merge the wifi-subsys resp. the amdgpu driver changes on top.
>>
>> This only adds kernel internal API, so if in the future the API needs work that can be done.
>
> I've been fine with the wifi bits since around v3 of the patchset ;-)
>
> So the idea is that I'll pull this into wireless-next and then apply the
> two wireless patches on top, right?
Right.
> AFAICT, since the other patches don't depend on wireless for
> compilation, this is the only thing I need to do, i.e. no need to have
> another separate branch to send it further on, right?
Right / correct.
Regards,
Hans
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
2023-12-11 11:02 [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window Hans de Goede
2023-12-11 11:41 ` Johannes Berg
@ 2023-12-11 14:47 ` Christian König
2023-12-11 15:03 ` Mario Limonciello
2023-12-12 9:46 ` Johannes Berg
2023-12-14 16:36 ` Kalle Valo
3 siblings, 1 reply; 13+ messages in thread
From: Christian König @ 2023-12-11 14:47 UTC (permalink / raw)
To: Hans de Goede, Johannes Berg, Alex Deucher, Christian König,
Ma Jun, Limonciello, Mario, platform-driver-x86@vger.kernel.org
Cc: Ilpo Järvinen, linux-wireless, amd-gfx list
Am 11.12.23 um 12:02 schrieb Hans de Goede:
> Hi Wifi and AMDGPU maintainers,
>
> Here is a pull-request for the platform-drivers-x86 parts of:
>
> https://lore.kernel.org/platform-driver-x86/20231211100630.2170152-1-Jun.Ma2@amd.com/
>
> From my pov the pdx86 bits are ready and the platform-drivers-x86-amd-wbrf-v6.8-1 tag can be merged by you to merge the wifi-subsys resp. the amdgpu driver changes on top.
The few comments I had for the amdgpu patches were addressed and I
honestly don't have time to take a detailed look at the general framework.
So perfectly fine to merge that stuff from my side. Alex or Mario might
have some additional comments, but I think they will give their go as well.
Regards,
Christian.
>
> This only adds kernel internal API, so if in the future the API needs work that can be done.
>
> I've not merged this branch into pdx86/for-next yet, since I see little use in merging it without any users. I'll merge it once either the wifi or amdgpu changes are also merged
> (and if some blocking issues get identified before either are merged I can prepare a new pull-request fixing the issues).
>
> Regards,
>
> Hans
>
>
>
> The following changes since commit b85ea95d086471afb4ad062012a4d73cd328fa86:
>
> Linux 6.7-rc1 (2023-11-12 16:19:07 -0800)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git tags/platform-drivers-x86-amd-wbrf-v6.8-1
>
> for you to fetch changes up to 58e82a62669da52e688f4a8b89922c1839bf1001:
>
> platform/x86/amd: Add support for AMD ACPI based Wifi band RFI mitigation feature (2023-12-11 11:33:44 +0100)
>
> ----------------------------------------------------------------
> Immutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
>
> platform-drivers-x86-amd-wbrf-v6.8-1: v6.7-rc1 + AMD WBRF support
> for merging into the wifi subsys and amdgpu driver for 6.8.
>
> ----------------------------------------------------------------
> Ma Jun (2):
> Documentation/driver-api: Add document about WBRF mechanism
> platform/x86/amd: Add support for AMD ACPI based Wifi band RFI mitigation feature
>
> Documentation/driver-api/index.rst | 1 +
> Documentation/driver-api/wbrf.rst | 78 +++++++++
> drivers/platform/x86/amd/Kconfig | 14 ++
> drivers/platform/x86/amd/Makefile | 1 +
> drivers/platform/x86/amd/wbrf.c | 317 +++++++++++++++++++++++++++++++++++++
> include/linux/acpi_amd_wbrf.h | 91 +++++++++++
> 6 files changed, 502 insertions(+)
> create mode 100644 Documentation/driver-api/wbrf.rst
> create mode 100644 drivers/platform/x86/amd/wbrf.c
> create mode 100644 include/linux/acpi_amd_wbrf.h
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
2023-12-11 14:47 ` Christian König
@ 2023-12-11 15:03 ` Mario Limonciello
2023-12-11 15:27 ` Alex Deucher
0 siblings, 1 reply; 13+ messages in thread
From: Mario Limonciello @ 2023-12-11 15:03 UTC (permalink / raw)
To: Christian König, Hans de Goede, Johannes Berg, Alex Deucher,
Christian König, Ma Jun, platform-driver-x86@vger.kernel.org
Cc: Ilpo Järvinen, linux-wireless, amd-gfx list
On 12/11/2023 08:47, Christian König wrote:
> Am 11.12.23 um 12:02 schrieb Hans de Goede:
>> Hi Wifi and AMDGPU maintainers,
>>
>> Here is a pull-request for the platform-drivers-x86 parts of:
>>
>> https://lore.kernel.org/platform-driver-x86/20231211100630.2170152-1-Jun.Ma2@amd.com/
>>
>> From my pov the pdx86 bits are ready and the
>> platform-drivers-x86-amd-wbrf-v6.8-1 tag can be merged by you to merge
>> the wifi-subsys resp. the amdgpu driver changes on top.
>
> The few comments I had for the amdgpu patches were addressed and I
> honestly don't have time to take a detailed look at the general framework.
>
> So perfectly fine to merge that stuff from my side. Alex or Mario might
> have some additional comments, but I think they will give their go as well.
My feedback has been taken into account already, I'm happy with the
series now.
I'm a bit confused how exactly the drm/amd patches get applied though.
Is it like this:
1) immutable branch for platform-x86
2) immutable branch for platform-x86 merged into wlan-next
3) immutable branch for platform-x86 merged into drm-next?
4) wlan-next and drm-next come together for 6.8
Normally stuff from amd-staging-drm-next is put into the drm-next branch
and then merge through the drm.
amd-staging-drm-next tracks a much older tree so I'm thinking merging
the immutable branch for platform-x86 won't work.
Maybe the right answer is that the "immutable branch gets merged into
drm-next" and we just have some cherry-picks for all the commits into
amd-staging-drm-next so we can compile but Alex doesn't put them as part
of the next PR to drm-next. When ASDN rebased to 6.8 or newer they
would drop off.
>
> Regards,
> Christian.
>
>>
>> This only adds kernel internal API, so if in the future the API needs
>> work that can be done.
>>
>> I've not merged this branch into pdx86/for-next yet, since I see
>> little use in merging it without any users. I'll merge it once either
>> the wifi or amdgpu changes are also merged
>> (and if some blocking issues get identified before either are merged I
>> can prepare a new pull-request fixing the issues).
>>
>> Regards,
>>
>> Hans
>>
>>
>>
>> The following changes since commit
>> b85ea95d086471afb4ad062012a4d73cd328fa86:
>>
>> Linux 6.7-rc1 (2023-11-12 16:19:07 -0800)
>>
>> are available in the Git repository at:
>>
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git tags/platform-drivers-x86-amd-wbrf-v6.8-1
>>
>> for you to fetch changes up to 58e82a62669da52e688f4a8b89922c1839bf1001:
>>
>> platform/x86/amd: Add support for AMD ACPI based Wifi band RFI
>> mitigation feature (2023-12-11 11:33:44 +0100)
>>
>> ----------------------------------------------------------------
>> Immutable branch between pdx86 amd wbrf branch and wifi / amdgpu due
>> for the v6.8 merge window
>>
>> platform-drivers-x86-amd-wbrf-v6.8-1: v6.7-rc1 + AMD WBRF support
>> for merging into the wifi subsys and amdgpu driver for 6.8.
>>
>> ----------------------------------------------------------------
>> Ma Jun (2):
>> Documentation/driver-api: Add document about WBRF mechanism
>> platform/x86/amd: Add support for AMD ACPI based Wifi band RFI
>> mitigation feature
>>
>> Documentation/driver-api/index.rst | 1 +
>> Documentation/driver-api/wbrf.rst | 78 +++++++++
>> drivers/platform/x86/amd/Kconfig | 14 ++
>> drivers/platform/x86/amd/Makefile | 1 +
>> drivers/platform/x86/amd/wbrf.c | 317
>> +++++++++++++++++++++++++++++++++++++
>> include/linux/acpi_amd_wbrf.h | 91 +++++++++++
>> 6 files changed, 502 insertions(+)
>> create mode 100644 Documentation/driver-api/wbrf.rst
>> create mode 100644 drivers/platform/x86/amd/wbrf.c
>> create mode 100644 include/linux/acpi_amd_wbrf.h
>>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
2023-12-11 15:03 ` Mario Limonciello
@ 2023-12-11 15:27 ` Alex Deucher
2023-12-11 21:46 ` Mario Limonciello
0 siblings, 1 reply; 13+ messages in thread
From: Alex Deucher @ 2023-12-11 15:27 UTC (permalink / raw)
To: Mario Limonciello
Cc: Christian König, Hans de Goede, Johannes Berg, Alex Deucher,
Christian König, Ma Jun, platform-driver-x86@vger.kernel.org,
Ilpo Järvinen, linux-wireless, amd-gfx list
On Mon, Dec 11, 2023 at 10:20 AM Mario Limonciello
<mario.limonciello@amd.com> wrote:
>
> On 12/11/2023 08:47, Christian König wrote:
> > Am 11.12.23 um 12:02 schrieb Hans de Goede:
> >> Hi Wifi and AMDGPU maintainers,
> >>
> >> Here is a pull-request for the platform-drivers-x86 parts of:
> >>
> >> https://lore.kernel.org/platform-driver-x86/20231211100630.2170152-1-Jun.Ma2@amd.com/
> >>
> >> From my pov the pdx86 bits are ready and the
> >> platform-drivers-x86-amd-wbrf-v6.8-1 tag can be merged by you to merge
> >> the wifi-subsys resp. the amdgpu driver changes on top.
> >
> > The few comments I had for the amdgpu patches were addressed and I
> > honestly don't have time to take a detailed look at the general framework.
> >
> > So perfectly fine to merge that stuff from my side. Alex or Mario might
> > have some additional comments, but I think they will give their go as well.
>
> My feedback has been taken into account already, I'm happy with the
> series now.
>
> I'm a bit confused how exactly the drm/amd patches get applied though.
> Is it like this:
> 1) immutable branch for platform-x86
> 2) immutable branch for platform-x86 merged into wlan-next
> 3) immutable branch for platform-x86 merged into drm-next?
> 4) wlan-next and drm-next come together for 6.8
>
> Normally stuff from amd-staging-drm-next is put into the drm-next branch
> and then merge through the drm.
>
> amd-staging-drm-next tracks a much older tree so I'm thinking merging
> the immutable branch for platform-x86 won't work.
>
> Maybe the right answer is that the "immutable branch gets merged into
> drm-next" and we just have some cherry-picks for all the commits into
> amd-staging-drm-next so we can compile but Alex doesn't put them as part
> of the next PR to drm-next. When ASDN rebased to 6.8 or newer they
> would drop off.
amd-staging-drm-next is just our development branch, the actual
amdgpu-next branch is:
https://gitlab.freedesktop.org/agd5f/linux/-/commits/drm-next
I'll merge the platform branch there and then apply the amdgpu patches on top.
For amd-staging-drm-next, we can just apply the whole set since that
branch is just for development so there won't be any conflicts with
upstream.
Alex
>
> >
> > Regards,
> > Christian.
> >
> >>
> >> This only adds kernel internal API, so if in the future the API needs
> >> work that can be done.
> >>
> >> I've not merged this branch into pdx86/for-next yet, since I see
> >> little use in merging it without any users. I'll merge it once either
> >> the wifi or amdgpu changes are also merged
> >> (and if some blocking issues get identified before either are merged I
> >> can prepare a new pull-request fixing the issues).
> >>
> >> Regards,
> >>
> >> Hans
> >>
> >>
> >>
> >> The following changes since commit
> >> b85ea95d086471afb4ad062012a4d73cd328fa86:
> >>
> >> Linux 6.7-rc1 (2023-11-12 16:19:07 -0800)
> >>
> >> are available in the Git repository at:
> >>
> >>
> >> git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git tags/platform-drivers-x86-amd-wbrf-v6.8-1
> >>
> >> for you to fetch changes up to 58e82a62669da52e688f4a8b89922c1839bf1001:
> >>
> >> platform/x86/amd: Add support for AMD ACPI based Wifi band RFI
> >> mitigation feature (2023-12-11 11:33:44 +0100)
> >>
> >> ----------------------------------------------------------------
> >> Immutable branch between pdx86 amd wbrf branch and wifi / amdgpu due
> >> for the v6.8 merge window
> >>
> >> platform-drivers-x86-amd-wbrf-v6.8-1: v6.7-rc1 + AMD WBRF support
> >> for merging into the wifi subsys and amdgpu driver for 6.8.
> >>
> >> ----------------------------------------------------------------
> >> Ma Jun (2):
> >> Documentation/driver-api: Add document about WBRF mechanism
> >> platform/x86/amd: Add support for AMD ACPI based Wifi band RFI
> >> mitigation feature
> >>
> >> Documentation/driver-api/index.rst | 1 +
> >> Documentation/driver-api/wbrf.rst | 78 +++++++++
> >> drivers/platform/x86/amd/Kconfig | 14 ++
> >> drivers/platform/x86/amd/Makefile | 1 +
> >> drivers/platform/x86/amd/wbrf.c | 317
> >> +++++++++++++++++++++++++++++++++++++
> >> include/linux/acpi_amd_wbrf.h | 91 +++++++++++
> >> 6 files changed, 502 insertions(+)
> >> create mode 100644 Documentation/driver-api/wbrf.rst
> >> create mode 100644 drivers/platform/x86/amd/wbrf.c
> >> create mode 100644 include/linux/acpi_amd_wbrf.h
> >>
> >
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
2023-12-11 15:27 ` Alex Deucher
@ 2023-12-11 21:46 ` Mario Limonciello
0 siblings, 0 replies; 13+ messages in thread
From: Mario Limonciello @ 2023-12-11 21:46 UTC (permalink / raw)
To: Alex Deucher
Cc: Christian König, Hans de Goede, Johannes Berg, Alex Deucher,
Christian König, Ma Jun, platform-driver-x86@vger.kernel.org,
Ilpo Järvinen, linux-wireless, amd-gfx list
On 12/11/2023 09:27, Alex Deucher wrote:
> On Mon, Dec 11, 2023 at 10:20 AM Mario Limonciello
> <mario.limonciello@amd.com> wrote:
>>
>> On 12/11/2023 08:47, Christian König wrote:
>>> Am 11.12.23 um 12:02 schrieb Hans de Goede:
>>>> Hi Wifi and AMDGPU maintainers,
>>>>
>>>> Here is a pull-request for the platform-drivers-x86 parts of:
>>>>
>>>> https://lore.kernel.org/platform-driver-x86/20231211100630.2170152-1-Jun.Ma2@amd.com/
>>>>
>>>> From my pov the pdx86 bits are ready and the
>>>> platform-drivers-x86-amd-wbrf-v6.8-1 tag can be merged by you to merge
>>>> the wifi-subsys resp. the amdgpu driver changes on top.
>>>
>>> The few comments I had for the amdgpu patches were addressed and I
>>> honestly don't have time to take a detailed look at the general framework.
>>>
>>> So perfectly fine to merge that stuff from my side. Alex or Mario might
>>> have some additional comments, but I think they will give their go as well.
>>
>> My feedback has been taken into account already, I'm happy with the
>> series now.
>>
>> I'm a bit confused how exactly the drm/amd patches get applied though.
>> Is it like this:
>> 1) immutable branch for platform-x86
>> 2) immutable branch for platform-x86 merged into wlan-next
>> 3) immutable branch for platform-x86 merged into drm-next?
>> 4) wlan-next and drm-next come together for 6.8
>>
>> Normally stuff from amd-staging-drm-next is put into the drm-next branch
>> and then merge through the drm.
>>
>> amd-staging-drm-next tracks a much older tree so I'm thinking merging
>> the immutable branch for platform-x86 won't work.
>>
>> Maybe the right answer is that the "immutable branch gets merged into
>> drm-next" and we just have some cherry-picks for all the commits into
>> amd-staging-drm-next so we can compile but Alex doesn't put them as part
>> of the next PR to drm-next. When ASDN rebased to 6.8 or newer they
>> would drop off.
>
> amd-staging-drm-next is just our development branch, the actual
> amdgpu-next branch is:
> https://gitlab.freedesktop.org/agd5f/linux/-/commits/drm-next
> I'll merge the platform branch there and then apply the amdgpu patches on top.
> For amd-staging-drm-next, we can just apply the whole set since that
> branch is just for development so there won't be any conflicts with
> upstream.
>
Got it, thanks.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
2023-12-11 11:02 [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window Hans de Goede
2023-12-11 11:41 ` Johannes Berg
2023-12-11 14:47 ` Christian König
@ 2023-12-12 9:46 ` Johannes Berg
2023-12-12 16:12 ` Mario Limonciello
2023-12-14 16:36 ` Kalle Valo
3 siblings, 1 reply; 13+ messages in thread
From: Johannes Berg @ 2023-12-12 9:46 UTC (permalink / raw)
To: Hans de Goede, Alex Deucher, Christian König, Ma Jun,
Limonciello, Mario, platform-driver-x86@vger.kernel.org
Cc: linux-wireless, amd-gfx list, Ilpo Järvinen
On Mon, 2023-12-11 at 12:02 +0100, Hans de Goede wrote:
> Hi Wifi and AMDGPU maintainers,
>
> Here is a pull-request for the platform-drivers-x86 parts of:
>
> https://lore.kernel.org/platform-driver-x86/20231211100630.2170152-1-Jun.Ma2@amd.com/
>
> From my pov the pdx86 bits are ready and the platform-drivers-x86-amd-wbrf-v6.8-1 tag can be merged by you to merge the wifi-subsys resp. the amdgpu driver changes on top.
>
> This only adds kernel internal API, so if in the future the API needs work that can be done.
OK, thanks! I've pulled this into wireless-next, and applied the two
wireless related patches on top.
I guess if AMDGPU does the same, it will combine nicely in 6.8.
johannes
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
2023-12-12 9:46 ` Johannes Berg
@ 2023-12-12 16:12 ` Mario Limonciello
2023-12-12 16:41 ` Alex Deucher
0 siblings, 1 reply; 13+ messages in thread
From: Mario Limonciello @ 2023-12-12 16:12 UTC (permalink / raw)
To: Johannes Berg, Hans de Goede, Alex Deucher, Christian König,
Ma Jun, platform-driver-x86@vger.kernel.org
Cc: linux-wireless, amd-gfx list, Ilpo Järvinen
On 12/12/2023 03:46, Johannes Berg wrote:
> On Mon, 2023-12-11 at 12:02 +0100, Hans de Goede wrote:
>> Hi Wifi and AMDGPU maintainers,
>>
>> Here is a pull-request for the platform-drivers-x86 parts of:
>>
>> https://lore.kernel.org/platform-driver-x86/20231211100630.2170152-1-Jun.Ma2@amd.com/
>>
>> From my pov the pdx86 bits are ready and the platform-drivers-x86-amd-wbrf-v6.8-1 tag can be merged by you to merge the wifi-subsys resp. the amdgpu driver changes on top.
>>
>> This only adds kernel internal API, so if in the future the API needs work that can be done.
>
> OK, thanks! I've pulled this into wireless-next, and applied the two
> wireless related patches on top.
>
> I guess if AMDGPU does the same, it will combine nicely in 6.8.
>
> johannes
Yup, I've pulled the whole series into amd-staging-drm-next for now and
I expect as long as we have no problems with it reported under our
testing Alex or Christian will do the same include drm/amd portions of
it in an upcoming drm-next pull request.
Thanks!
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
2023-12-12 16:12 ` Mario Limonciello
@ 2023-12-12 16:41 ` Alex Deucher
0 siblings, 0 replies; 13+ messages in thread
From: Alex Deucher @ 2023-12-12 16:41 UTC (permalink / raw)
To: Mario Limonciello
Cc: Johannes Berg, Hans de Goede, Alex Deucher, Christian König,
Ma Jun, platform-driver-x86@vger.kernel.org, Ilpo Järvinen,
linux-wireless, amd-gfx list
On Tue, Dec 12, 2023 at 11:25 AM Mario Limonciello
<mario.limonciello@amd.com> wrote:
>
> On 12/12/2023 03:46, Johannes Berg wrote:
> > On Mon, 2023-12-11 at 12:02 +0100, Hans de Goede wrote:
> >> Hi Wifi and AMDGPU maintainers,
> >>
> >> Here is a pull-request for the platform-drivers-x86 parts of:
> >>
> >> https://lore.kernel.org/platform-driver-x86/20231211100630.2170152-1-Jun.Ma2@amd.com/
> >>
> >> From my pov the pdx86 bits are ready and the platform-drivers-x86-amd-wbrf-v6.8-1 tag can be merged by you to merge the wifi-subsys resp. the amdgpu driver changes on top.
> >>
> >> This only adds kernel internal API, so if in the future the API needs work that can be done.
> >
> > OK, thanks! I've pulled this into wireless-next, and applied the two
> > wireless related patches on top.
> >
> > I guess if AMDGPU does the same, it will combine nicely in 6.8.
> >
> > johannes
>
> Yup, I've pulled the whole series into amd-staging-drm-next for now and
> I expect as long as we have no problems with it reported under our
> testing Alex or Christian will do the same include drm/amd portions of
> it in an upcoming drm-next pull request.
I've pushed out an updated -next branch as well:
https://gitlab.freedesktop.org/agd5f/linux/-/commits/drm-next
Alex
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
2023-12-11 11:02 [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window Hans de Goede
` (2 preceding siblings ...)
2023-12-12 9:46 ` Johannes Berg
@ 2023-12-14 16:36 ` Kalle Valo
2023-12-14 16:47 ` Mario Limonciello
3 siblings, 1 reply; 13+ messages in thread
From: Kalle Valo @ 2023-12-14 16:36 UTC (permalink / raw)
To: Hans de Goede
Cc: Johannes Berg, Alex Deucher, Christian König, Ma Jun,
Limonciello, Mario, platform-driver-x86@vger.kernel.org,
linux-wireless, amd-gfx list, Ilpo Järvinen
Hans de Goede <hdegoede@redhat.com> writes:
> Hi Wifi and AMDGPU maintainers,
>
> Here is a pull-request for the platform-drivers-x86 parts of:
>
> https://lore.kernel.org/platform-driver-x86/20231211100630.2170152-1-Jun.Ma2@amd.com/
>
> From my pov the pdx86 bits are ready and the
> platform-drivers-x86-amd-wbrf-v6.8-1 tag can be merged by you to merge
> the wifi-subsys resp. the amdgpu driver changes on top.
>
> This only adds kernel internal API, so if in the future the API needs work that can be done.
>
> I've not merged this branch into pdx86/for-next yet, since I see
> little use in merging it without any users. I'll merge it once either
> the wifi or amdgpu changes are also merged (and if some blocking
> issues get identified before either are merged I can prepare a new
> pull-request fixing the issues).
I was testing latest wireless-testing with ath11k and noticed this:
[ 370.796884] ath11k_pci 0000:06:00.0: WBRF is not supported
I think that's just spam and not really necessary. Could someone remove
that or change to a debug message, please?
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
2023-12-14 16:36 ` Kalle Valo
@ 2023-12-14 16:47 ` Mario Limonciello
2023-12-15 6:35 ` Kalle Valo
0 siblings, 1 reply; 13+ messages in thread
From: Mario Limonciello @ 2023-12-14 16:47 UTC (permalink / raw)
To: Kalle Valo, Hans de Goede
Cc: Johannes Berg, Alex Deucher, Christian König, Ma Jun,
platform-driver-x86@vger.kernel.org, linux-wireless, amd-gfx list,
Ilpo Järvinen
On 12/14/2023 10:36, Kalle Valo wrote:
> Hans de Goede <hdegoede@redhat.com> writes:
>
>> Hi Wifi and AMDGPU maintainers,
>>
>> Here is a pull-request for the platform-drivers-x86 parts of:
>>
>> https://lore.kernel.org/platform-driver-x86/20231211100630.2170152-1-Jun.Ma2@amd.com/
>>
>> From my pov the pdx86 bits are ready and the
>> platform-drivers-x86-amd-wbrf-v6.8-1 tag can be merged by you to merge
>> the wifi-subsys resp. the amdgpu driver changes on top.
>>
>> This only adds kernel internal API, so if in the future the API needs work that can be done.
>>
>> I've not merged this branch into pdx86/for-next yet, since I see
>> little use in merging it without any users. I'll merge it once either
>> the wifi or amdgpu changes are also merged (and if some blocking
>> issues get identified before either are merged I can prepare a new
>> pull-request fixing the issues).
>
> I was testing latest wireless-testing with ath11k and noticed this:
>
> [ 370.796884] ath11k_pci 0000:06:00.0: WBRF is not supported
>
> I think that's just spam and not really necessary. Could someone remove
> that or change to a debug message, please?
>
Do you have dynamic debug turned up perhaps? It's already supposed to
be a dbg message.
+ dev_dbg(dev, "WBRF is %s supported\n",
+ local->wbrf_supported ? "" : "not");
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window
2023-12-14 16:47 ` Mario Limonciello
@ 2023-12-15 6:35 ` Kalle Valo
0 siblings, 0 replies; 13+ messages in thread
From: Kalle Valo @ 2023-12-15 6:35 UTC (permalink / raw)
To: Mario Limonciello
Cc: Hans de Goede, Johannes Berg, Alex Deucher, Christian König,
Ma Jun, platform-driver-x86@vger.kernel.org, linux-wireless,
amd-gfx list, Ilpo Järvinen
Mario Limonciello <mario.limonciello@amd.com> writes:
> On 12/14/2023 10:36, Kalle Valo wrote:
>
>> Hans de Goede <hdegoede@redhat.com> writes:
>>
>>> Hi Wifi and AMDGPU maintainers,
>>>
>>> Here is a pull-request for the platform-drivers-x86 parts of:
>>>
>>> https://lore.kernel.org/platform-driver-x86/20231211100630.2170152-1-Jun.Ma2@amd.com/
>>>
>>> From my pov the pdx86 bits are ready and the
>>> platform-drivers-x86-amd-wbrf-v6.8-1 tag can be merged by you to merge
>>> the wifi-subsys resp. the amdgpu driver changes on top.
>>>
>>> This only adds kernel internal API, so if in the future the API
>>> needs work that can be done.
>>>
>>> I've not merged this branch into pdx86/for-next yet, since I see
>>> little use in merging it without any users. I'll merge it once either
>>> the wifi or amdgpu changes are also merged (and if some blocking
>>> issues get identified before either are merged I can prepare a new
>>> pull-request fixing the issues).
>> I was testing latest wireless-testing with ath11k and noticed this:
>> [ 370.796884] ath11k_pci 0000:06:00.0: WBRF is not supported
>> I think that's just spam and not really necessary. Could someone
>> remove
>> that or change to a debug message, please?
>>
>
> Do you have dynamic debug turned up perhaps? It's already supposed to
> be a dbg message.
>
> + dev_dbg(dev, "WBRF is %s supported\n",
> + local->wbrf_supported ? "" : "not");
Oh, I should have checked that. I do have it enabled:
CONFIG_DYNAMIC_DEBUG=y
CONFIG_DYNAMIC_DEBUG_CORE=y
But that shouldn't enable the debug message unless I specifically enable
it via debugfs, right? But then I noticed this in net/mac80211/Makefile:
ccflags-y += -DDEBUG
I'm guessing this is the reason why the debug message is always printed?
It looks like wbrf.c has the only dev_dbg() call in mac80211, all others
use the macros from net/mac80211/debug.h. I think wbrf.c should also use
one of the macros from debug.h and not dev_dbg().
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2023-12-15 6:35 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-11 11:02 [GIT PULL] mmutable branch between pdx86 amd wbrf branch and wifi / amdgpu due for the v6.8 merge window Hans de Goede
2023-12-11 11:41 ` Johannes Berg
2023-12-11 11:45 ` Hans de Goede
2023-12-11 14:47 ` Christian König
2023-12-11 15:03 ` Mario Limonciello
2023-12-11 15:27 ` Alex Deucher
2023-12-11 21:46 ` Mario Limonciello
2023-12-12 9:46 ` Johannes Berg
2023-12-12 16:12 ` Mario Limonciello
2023-12-12 16:41 ` Alex Deucher
2023-12-14 16:36 ` Kalle Valo
2023-12-14 16:47 ` Mario Limonciello
2023-12-15 6:35 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox