On Mon, Dec 11, 2023 at 10:20 AM Mario Limonciello <mario.limonciello@xxxxxxx> 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@xxxxxxx/ > >> > >> 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 > >> > > >
