On Thu, Jan 25, 2024 at 07:06:54PM +0100, Maciej S. Szmigiero wrote: > From: "Maciej S. Szmigiero" <maciej.szmigiero@xxxxxxxxxx> > > The stable kernel version backport of the patch disabling XSAVES on AMD > Zen family 0x17 applied this change to the wrong function (init_amd_k6()), > one which isn't called for Zen CPUs. > > Move the erratum to the init_amd_zn() function instead. > > Add an explicit family 0x17 check to the erratum so nothing will break if > someone naively makes this kernel version call init_amd_zn() also for > family 0x19 in the future (as the current upstream code does). > > Fixes: f028a7db9824 ("x86/CPU/AMD: Disable XSAVES on AMD family 0x17") > Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@xxxxxxxxxx> > --- > arch/x86/kernel/cpu/amd.c | 20 +++++++++++--------- > 1 file changed, 11 insertions(+), 9 deletions(-) > Both fixes now queued up, thanks. greg k-h