diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-17 20:47:27 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-17 20:47:27 +0200 |
commit | 5daed91aed43281f3039cd4349fb3480d27453c3 (patch) | |
tree | b718a98310421d3cad642efe3aa30a3672a0e224 /0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch | |
parent | cd333b495c682a084bc86a29da91a82943c5af32 (diff) | |
parent | fc8ee97867fcb71ae2344b8009608dfda7917c2c (diff) | |
download | kernel-5daed91aed43281f3039cd4349fb3480d27453c3.tar.gz kernel-5daed91aed43281f3039cd4349fb3480d27453c3.tar.xz kernel-5daed91aed43281f3039cd4349fb3480d27453c3.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc5.20200717git07a56bb875af.1.vanilla.1.fc33kernel-5.8.0-0.rc5.20200717git07a56bb875af.1.vanilla.1.fc32kernel-5.8.0-0.rc5.20200717git07a56bb875af.1.vanilla.1.fc31
Diffstat (limited to '0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch')
-rw-r--r-- | 0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch | 128 |
1 files changed, 128 insertions, 0 deletions
diff --git a/0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch b/0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch new file mode 100644 index 000000000..924c4393d --- /dev/null +++ b/0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch @@ -0,0 +1,128 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Prarit Bhargava <prarit@redhat.com> +Date: Thu, 11 Jun 2020 21:03:36 -0400 +Subject: [PATCH] arch/x86: Remove vendor specific CPU ID checks + +Upstream Status: RHEL only + +After discussions with Devel, QE, Support, and Certification we have +decided to drop the CPU specific checks in rh_check_supported(). +Certification is adopting a new process in which CPU certifications will +be tracked on https://catalog.redhat.com. + +Remove the vendor specific CPU ID checks from rh_check_supported(). + +Signed-off-by: Prarit Bhargava <prarit@redhat.com> +Cc: David Arcari <darcari@redhat.com> +--- + arch/x86/kernel/setup.c | 85 ----------------------------------------- + 1 file changed, 85 deletions(-) + +diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c +index 6d31895c8e92..4e43f6957621 100644 +--- a/arch/x86/kernel/setup.c ++++ b/arch/x86/kernel/setup.c +@@ -757,72 +757,6 @@ static void __init trim_low_memory_range(void) + } + + #ifdef CONFIG_RHEL_DIFFERENCES +-static bool valid_amd_processor(__u8 family, const char *model_id) +-{ +- bool valid; +- +- switch(family) { +- case 0x15: +- valid = true; +- break; +- +- case 0x17: +- valid = strstr(model_id, "AMD EPYC 7"); +- break; +- +- default: +- valid = false; +- break; +- } +- +- return valid; +-} +- +-static bool valid_intel_processor(__u8 family, __u8 model, __u8 stepping) +-{ +- bool valid; +- +- if (family != 6) +- return false; +- +- switch(model) { +- case INTEL_FAM6_ATOM_GOLDMONT_D: +- case INTEL_FAM6_ATOM_GOLDMONT_PLUS: +- +- case INTEL_FAM6_BROADWELL: +- case INTEL_FAM6_BROADWELL_G: +- case INTEL_FAM6_BROADWELL_X: +- case INTEL_FAM6_BROADWELL_D: +- +- case INTEL_FAM6_HASWELL: +- case INTEL_FAM6_HASWELL_G: +- case INTEL_FAM6_HASWELL_L: +- case INTEL_FAM6_HASWELL_X: +- valid = true; +- break; +- +- case INTEL_FAM6_KABYLAKE: +- valid = (stepping <= 10); +- break; +- +- case INTEL_FAM6_KABYLAKE_L: +- valid = (stepping <= 11); +- break; +- +- case INTEL_FAM6_SKYLAKE_L: +- case INTEL_FAM6_SKYLAKE: +- case INTEL_FAM6_SKYLAKE_X: +- /* stepping > 4 is Cascade Lake and is not supported */ +- valid = (stepping <= 4); +- break; +- +- default: +- valid = false; +- break; +- } +- +- return valid; +-} + + static void rh_check_supported(void) + { +@@ -843,27 +777,8 @@ static void rh_check_supported(void) + */ + switch (boot_cpu_data.x86_vendor) { + case X86_VENDOR_AMD: +- if (!valid_amd_processor(boot_cpu_data.x86, +- boot_cpu_data.x86_model_id)) { +- pr_crit("Detected CPU family %xh model %d\n", +- boot_cpu_data.x86, +- boot_cpu_data.x86_model); +- mark_hardware_unsupported("AMD Processor"); +- } +- break; +- + case X86_VENDOR_INTEL: +- if (!valid_intel_processor(boot_cpu_data.x86, +- boot_cpu_data.x86_model, +- boot_cpu_data.x86_stepping)) { +- pr_crit("Detected CPU family %d model %d stepping %d\n", +- boot_cpu_data.x86, +- boot_cpu_data.x86_model, +- boot_cpu_data.x86_stepping); +- mark_hardware_unsupported("Intel Processor"); +- } + break; +- + default: + pr_crit("Detected processor %s %s\n", + boot_cpu_data.x86_vendor_id, +-- +2.26.2 + |