Pull x86 fixes from Ingo Molnar: - Add more AMD Zen6 models (Pratik Vishwakarma) - Avoid confusing bootup message by the Intel resctl enumeration code when running on certain AMD systems (Tony Luck) * tag 'x86-urgent-2026-06-07' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/resctrl: Only check Intel systems for SNC x86/CPU/AMD: Add more Zen6 models
Unified · Split
| @@ -518,7 +518,7 @@ static void bsp_init_amd(struct cpuinfo_x86 *c) · 517 unmodified lines | |||
| 518 | break; | 518 | break; |
| 519 | case 0x50 ... 0x5f: | 519 | case 0x50 ... 0x5f: |
| 520 | case 0x80 ... 0xaf: | 520 | case 0x80 ... 0xaf: |
| 521 | case 0xc0 ... 0xcf: | 521 | case 0xc0 ... 0xef: |
| 522 | setup_force_cpu_cap(X86_FEATURE_ZEN6); | 522 | setup_force_cpu_cap(X86_FEATURE_ZEN6); |
| 523 | break; | 523 | break; |
| 524 | default: | 524 | default: |
| @@ -377,7 +377,12 @@ static const struct x86_cpu_id snc_cpu_ids[] __initconst = { · 376 unmodified lines | |||
| 377 | 377 | ||
| 378 | static __init int snc_get_config(void) | 378 | static __init int snc_get_config(void) |
| 379 | { | 379 | { |
| 380 | int ret = topology_num_nodes_per_package(); | 380 | int ret; |
| 381 | |||
| 382 | if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) | ||
| 383 | return 1; | ||
| 384 | |||
| 385 | ret = topology_num_nodes_per_package(); | ||
| 381 | 386 | ||
| 382 | if (ret > 1 && !x86_match_cpu(snc_cpu_ids)) { | 387 | if (ret > 1 && !x86_match_cpu(snc_cpu_ids)) { |
| 383 | pr_warn("CoD enabled system? Resctrl not supported\n"); | 388 | pr_warn("CoD enabled system? Resctrl not supported\n"); |