From e3f67245327edb9119f6f50dd25e2b09effcc2f4 Mon Sep 17 00:00:00 2001 From: Werner Sembach Date: Tue, 18 Apr 2023 14:52:41 +0200 Subject: [PATCH] Whitelist AMD Zen 3 instead of blacklisting Zen 4 --- src/tuxedo_keyboard.c | 40 ++++++---------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/src/tuxedo_keyboard.c b/src/tuxedo_keyboard.c index d755269..55181e0 100644 --- a/src/tuxedo_keyboard.c +++ b/src/tuxedo_keyboard.c @@ -243,44 +243,16 @@ static const struct x86_cpu_id skip_tuxedo_dmi_string_check_match[] __initconst X86_MATCH_VENDOR_FAM(AMD, 22, NULL), X86_MATCH_VENDOR_FAM(AMD, 23, NULL), // Zen, Zen+, Zen 2 X86_MATCH_VENDOR_FAM(AMD, 24, NULL), // Zen - X86_MATCH_VENDOR_FAM(AMD, 25, NULL), // Zen 3, Zen 4 + X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x01, NULL), // Zen 3 Epyc + X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x08, NULL), // Zen 3 Threadripper + X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x21, NULL), // Zen 3 Vermeer + X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x40, NULL), // Zen 3+ Rembrandt + X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x44, NULL), // Zen 3+ Rembrandt + X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x50, NULL), // Zen 3 Cezanne { } }; static const struct x86_cpu_id force_tuxedo_dmi_string_check_match[] __initconst = { - // Zen 4 model numbers - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x60, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x61, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x62, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x63, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x64, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x65, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x66, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x67, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x68, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x69, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x6a, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x6b, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x6c, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x6d, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x6e, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x6f, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x70, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x71, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x72, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x73, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x74, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x75, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x76, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x77, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x78, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x79, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x7a, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x7b, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x7c, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x7d, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x7e, NULL), - X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 0x7f, NULL), { } };