Get rid of some RHEL patches

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

4 files changed, 0 insertions, 460 deletions

diff --git a/0001-Add-support-for-deprecating-processors.patch b/0001-Add-support-for-deprecating-processors.patch
deleted file mode 100644
index 8eaf00d7c..000000000
--- a/0001-Add-support-for-deprecating-processors.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Wed, 13 Nov 2019 14:44:30 -0500
-Subject: [PATCH] Add support for deprecating processors
-
-Message-id: <20191113144431.9403-4-labbott@redhat.com>
-Patchwork-id: 286081
-O-Subject: [ARK INTERNAL PATCHv2 3/4] [redhat] Add support for deprecating processors
-Bugzilla:
-RH-Acked-by: Don Zickus <dzickus@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-
-This is the squashed version of the following patches
-modifed to use the new CONFIG_RH_DISABLE_DEPRECATED option
-
-add rh_check_supported
-
-Message-id: <1525313397-75200-1-git-send-email-darcari@redhat.com>
-Patchwork-id: 212189
-O-Subject: [RHEL8.0 BZ 1565717 v2] x86: add rh_check_supported
-Bugzilla: 1565717
-RH-Acked-by: Steve Best <sbest@redhat.com>
-RH-Acked-by: Mikulas Patocka <mpatocka@redhat.com>
-
-Description:
-
-Add code to verify that the booted x86 processor is supported by
-Red Hat.  In cases where the processor is not supported a critical
-message is logged.
-
-Initially the supported set of processors for RHEL8 remains the same
-as RHEL7.
-
-Bugzilla: http://bugzilla.redhat.com/1565717
-Brew: https://brewweb.devel.redhat.com/taskinfo?taskID=15966242
-
-Test: Booted brew build on supported (Haswell) and unsupported processor (CNL)
-      and achieved desired results.
-
-Upstream: RHEL Only
-
-Cc: David Arcari <darcari@redhat.com>
-Cc: Mikulas Patocka <mpatocka@redhat.com>
-Cc: Dave Young <dyoung@redhat.com>
-Cc: Josh Poimboeuf <jpoimboe@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-update rh_check_supported processor list
-
-Message-id: <1530618602-17477-1-git-send-email-darcari@redhat.com>
-Patchwork-id: 223452
-O-Subject: [RHEL8.0 BZ 1595918] x86: update rh_check_supported processor list
-Bugzilla: 1595918
-RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-RH-Acked-by: Steve Best <sbest@redhat.com>
-
-Bugzilla: http://bugzilla.redhat.com/1595918
-Upstream Status: RHEL_only
-Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16916208
-Tested: Verified on a varity of supported and unsupported Intel and AMD systems.
-	Results as expected.
-
-In RHEL8, we are marking some of the older processors as unsupported. No code
-is being removed; however, the older processors are not supported and as such
-are not candidates for certification.
-
-Cc: David Arcari <darcari@redhat.com>
-Cc: Prarit Bhargava <prarit@redhat.com>
-Cc: Steve Best <sbest@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-Signed-off-by: Jakub Racek <jracek@redhat.com>
-refresh: rename FAM6_ATOM again, see f2c4db1bd
-
-mark whiskey-lake processor supported
-
-Message-id: <1533125629-12870-1-git-send-email-darcari@redhat.com>
-Patchwork-id: 225809
-O-Subject: [ BZ 1609604] mark whiskey-lake processor supported
-Bugzilla: 1609604
-RH-Acked-by: Steve Best <sbest@redhat.com>
-RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-
-Bugzilla: http://bugzilla.redhat.com/1609604
-Build Info: https://brewweb.devel.redhat.com/taskinfo?taskID=17474338
-Upstream Status: RHEL Only
-Tested: Successful excecution of platform-test suite.
-
-Whiskey Lake is cpu model 142 with stepping 11.  Stepping > 11 for cpu model
-142 is not supported.
-
-For model 158, the highest supported stepping is 10.
-
-Cc: Prarit Bhargava <prarit@redhat.com>
-Cc: David Arcari <darcari@redhat.com>
-Cc: Dave Young <dyoung@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-mark intel knights landing and knights mill unsupported
-
-Message-id: <1533580277-126323-1-git-send-email-darcari@redhat.com>
-Patchwork-id: 226187
-O-Subject: [RHEL8.0 BZ 1610493] mark intel knights landing and knights mill unsupported
-Bugzilla: 1610493
-RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-RH-Acked-by: Steve Best <sbest@redhat.com>
-
-Bugzilla: http://bugzilla.redhat.com/1610493
-Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=17625348
-
-Tested: verified on KNL/KNM system
-Upstream Status: RHEL Only
-Depends: http://bugzilla.redhat.com/1609604
-
-We are marking KNL/KNM processors as unsupported. No code is being removed;
-however, the older processors are not supported and as such are not
-candidates for certification.
-
-Upstream Status: RHEL only
-Cc: Prarit Bhargava <prarit@redhat.com>
-Cc: David Arcari <darcari@redhat.com>
-Cc: Dave Young <dyoung@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- arch/x86/kernel/cpu/common.c |   1 +
- arch/x86/kernel/setup.c      | 132 ++++++++++++++++++++++++++++++++++-
- 2 files changed, 132 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index bed0cb83fe24..a15622e0d79f 100644
---- a/arch/x86/kernel/cpu/common.c
-+++ b/arch/x86/kernel/cpu/common.c
-@@ -1205,6 +1205,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
- 		cpu_detect(c);
- 		get_cpu_vendor(c);
- 		get_cpu_cap(c);
-+		get_model_name(c); /* RHEL: get model name for unsupported check */
- 		get_cpu_address_sizes(c);
- 		setup_force_cpu_cap(X86_FEATURE_CPUID);
-
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 4b3fa6cd3106..e39ec0f88d28 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -44,6 +44,7 @@
- #include <asm/unwind.h>
- #include <asm/vsyscall.h>
- #include <linux/vmalloc.h>
-+#include <asm/intel-family.h>
-
- /*
-  * max_low_pfn_mapped: highest directly mapped pfn < 4 GB
-@@ -747,7 +748,132 @@ static void __init trim_low_memory_range(void)
- {
- 	memblock_reserve(0, ALIGN(reserve_low, PAGE_SIZE));
- }
--	
-+
-+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)
-+{
-+	bool guest;
-+
-+	guest = (x86_hyper_type != X86_HYPER_NATIVE || boot_cpu_has(X86_FEATURE_HYPERVISOR));
-+
-+	/* RHEL supports single cpu on guests only */
-+	if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) &&
-+	    !guest && is_kdump_kernel()) {
-+		pr_crit("Detected single cpu native boot.\n");
-+		pr_crit("Important:  In this kernel, single threaded, single CPU 64-bit physical systems are unsupported.");
-+	}
-+
-+	/*
-+	 * If the RHEL kernel does not support this hardware, the kernel will
-+	 * attempt to boot, but no support is provided for this hardware
-+	 */
-+	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,
-+			boot_cpu_data.x86_model_id);
-+		mark_hardware_unsupported("Processor");
-+		break;
-+	}
-+
-+	/*
-+	 * Due to the complexity of x86 lapic & ioapic enumeration, and PCI IRQ
-+	 * routing, ACPI is required for x86.  acpi=off is a valid debug kernel
-+	 * parameter, so just print out a loud warning in case something
-+	 * goes wrong (which is most of the time).
-+	 */
-+	if (acpi_disabled && !guest)
-+		pr_crit("ACPI has been disabled or is not available on this hardware.  This may result in a single cpu boot, incorrect PCI IRQ routing, or boot failure.\n");
-+}
-+
- /*
-  * Dump out kernel offset information on panic.
-  */
-@@ -1244,6 +1370,10 @@ void __init setup_arch(char **cmdline_p)
- 		efi_apply_memmap_quirks();
- #endif
-
-+#ifdef CONFIG_RH_DISABLE_DEPRECATED
-+	rh_check_supported();
-+#endif
-+
- 	unwind_init();
- }
-
--- 
-2.26.2
-
diff --git a/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch b/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch
deleted file mode 100644
index cb5344d98..000000000
--- a/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Don Dutile <ddutile@redhat.com>
-Date: Tue, 24 Jul 2018 22:29:16 -0400
-Subject: [PATCH] IB/rxe: Mark Soft-RoCE Transport driver as tech-preview
-
-Message-id: <20180724222916.19362-1-ddutile@redhat.com>
-Patchwork-id: 225418
-O-Subject: [PATCH RHEL-8.0] IB/rxe: Mark Soft-RoCE Transport driver as tech-preview.
-Bugzilla: 1605216
-RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
-RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-RH-Acked-by: Honggang Li <honli@redhat.com>
-
-The Soft-RoCE driver implements the InfiniBand RDMA transport
-over the Linux network stack. It enables a system with a
-standard Ethernet adapter to interoperate with a RoCE
-adapter or with another system running the RXE driver.
-
-Unfortunately, a wide range of tests and/or use-cases have shown
-that the driver is not ready for enterprise use, and upstream bug
-fixing may not be complete for RHEL-8.0.
-Thus, recommendation from driver maintainer is to mark it as
-tech-preview.  It is expected that future bug fixes will enable it
-to be upgraded to fully supported.  In the mean time, it works
-in a number of use cases, and can be used to demonstrate upstream
-fixes on failing cases.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1605216
-Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=17344161
-
-Testing:
-Simple boot test, and loading of rxe driver to show tech-preview
-msg is generated in dmesg log.
-
-Upstream Status: RHEL only
-Signed-off-by: Donald Dutile <ddutile@redhat.com
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- drivers/infiniband/sw/rxe/rxe.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
-index 4afdd2e20883..05e637aa0e3d 100644
---- a/drivers/infiniband/sw/rxe/rxe.c
-+++ b/drivers/infiniband/sw/rxe/rxe.c
-@@ -335,6 +335,8 @@ static int __init rxe_module_init(void)
- {
- 	int err;
-
-+	mark_tech_preview("Soft-RoCE Transport Driver", THIS_MODULE);
-+
- 	/* initialize slab caches for managed objects */
- 	err = rxe_cache_init();
- 	if (err) {
--- 
-2.26.2
-
diff --git a/0001-add-pci_hw_vendor_status.patch b/0001-add-pci_hw_vendor_status.patch
deleted file mode 100644
index ebd330296..000000000
--- a/0001-add-pci_hw_vendor_status.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Maurizio Lombardi <mlombard@redhat.com>
-Date: Mon, 18 Jun 2018 12:51:25 -0400
-Subject: [PATCH] add pci_hw_vendor_status()
-
-Message-id: <1529326285-28560-1-git-send-email-mlombard@redhat.com>
-Patchwork-id: 222337
-O-Subject: [RHEL8 PATCH] pci: add pci_hw_vendor_status()
-Bugzilla: 1590829
-RH-Acked-by: Tomas Henzl <thenzl@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-
-This patch adds pci_hw_vendor_status() like in RHEL7 which should be called
-during the driver's probe to identify deprecated devices.
-
-BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1590829
-Brew: https://brewweb.devel.redhat.com/taskinfo?taskID=16761315
-
-See RHEL7 commits e0dddd9a63403ec82077ed410074fc6485873d4b and
-3fcddde5ddf4b190c84ce9d83d56a75137513bd7
-
-RHEL_only.
-
-Upstream Status: RHEL only
-Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- drivers/pci/pci-driver.c | 29 +++++++++++++++++++++++++++++
- include/linux/pci.h      |  4 ++++
- 2 files changed, 33 insertions(+)
-
-diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
-index 0454ca0e4e3f..5cc490b821be 100644
---- a/drivers/pci/pci-driver.c
-+++ b/drivers/pci/pci-driver.c
-@@ -18,6 +18,7 @@
- #include <linux/kexec.h>
- #include <linux/of_device.h>
- #include <linux/acpi.h>
-+#include <linux/kernel.h>
- #include "pci.h"
- #include "pcie/portdrv.h"
-
-@@ -278,6 +279,34 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv,
- 	return found_id;
- }
-
-+/**
-+ * pci_hw_vendor_status - Tell if a PCI device is supported by the HW vendor
-+ * @ids: array of PCI device id structures to search in
-+ * @dev: the PCI device structure to match against
-+ *
-+ * Used by a driver to check whether this device is in its list of unsupported
-+ * devices.  Returns the matching pci_device_id structure or %NULL if there is
-+ * no match.
-+ *
-+ * Reserved for Internal Red Hat use only.
-+ */
-+const struct pci_device_id *pci_hw_vendor_status(
-+						const struct pci_device_id *ids,
-+						struct pci_dev *dev)
-+{
-+	char devinfo[64];
-+	const struct pci_device_id *ret = pci_match_id(ids, dev);
-+
-+	if (ret) {
-+		snprintf(devinfo, sizeof(devinfo), "%s %s",
-+			 dev_driver_string(&dev->dev), dev_name(&dev->dev));
-+		mark_hardware_deprecated(devinfo);
-+	}
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL(pci_hw_vendor_status);
-+
- struct drv_dev_and_id {
- 	struct pci_driver *drv;
- 	struct pci_dev *dev;
-diff --git a/include/linux/pci.h b/include/linux/pci.h
-index 83ce1cdf5676..88397dd562d9 100644
---- a/include/linux/pci.h
-+++ b/include/linux/pci.h
-@@ -1397,6 +1397,10 @@ int pci_add_dynid(struct pci_driver *drv,
- 		  unsigned long driver_data);
- const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
- 					 struct pci_dev *dev);
-+/* Reserved for Internal Red Hat use only */
-+const struct pci_device_id *pci_hw_vendor_status(
-+						const struct pci_device_id *ids,
-+						struct pci_dev *dev);
- int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
- 		    int pass);
-
--- 
-2.26.2
-
diff --git a/kernel.spec b/kernel.spec
index 4ccf64855..564cb8e83 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -800,13 +800,10 @@ Patch12: 0001-kdump-add-support-for-crashkernel-auto.patch
 Patch15: 0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch
 Patch19: 0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch
 Patch20: 0001-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch
-Patch21: 0001-add-pci_hw_vendor_status.patch
 Patch24: 0001-scsi-smartpqi-add-inspur-advantech-ids.patch
-Patch25: 0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch
 Patch26: 0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch
 Patch28: 0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch
 Patch29: 0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch
-Patch30: 0001-Add-support-for-deprecating-processors.patch
 Patch31: 0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch
 Patch32: 0001-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch
 Patch33: 0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch