kernel 5.19.4

1 files changed, 0 insertions, 1823 deletions

diff --git a/SOURCES/patch-5.18-redhat.patch b/SOURCES/patch-5.18-redhat.patch
deleted file mode 100644
index 3a17c97..0000000
--- a/SOURCES/patch-5.18-redhat.patch
+++ /dev/null
@@ -1,1823 +0,0 @@
- Makefile                                           |   4 +
- arch/arm/Kconfig                                   |   4 +-
- arch/arm64/Kconfig                                 |   3 +-
- arch/s390/include/asm/ipl.h                        |   1 +
- arch/s390/kernel/ipl.c                             |   5 +
- arch/s390/kernel/setup.c                           |   4 +
- arch/x86/boot/header.S                             |   4 +
- arch/x86/include/asm/efi.h                         |   5 +
- arch/x86/kernel/setup.c                            |  22 ++--
- drivers/acpi/apei/hest.c                           |   8 ++
- drivers/acpi/irq.c                                 |  17 ++-
- drivers/acpi/scan.c                                |   9 ++
- drivers/ata/libahci.c                              |  18 +++
- drivers/char/ipmi/ipmi_dmi.c                       |  15 +++
- drivers/char/ipmi/ipmi_msghandler.c                |  16 ++-
- drivers/firmware/efi/Kconfig                       |  12 ++
- drivers/firmware/efi/Makefile                      |   1 +
- drivers/firmware/efi/efi.c                         | 124 +++++++++++++++------
- drivers/firmware/efi/libstub/efistub.h             |  74 ++++++++++++
- drivers/firmware/efi/libstub/x86-stub.c            | 119 +++++++++++++++++++-
- drivers/firmware/efi/secureboot.c                  |  38 +++++++
- drivers/firmware/sysfb.c                           |  18 ++-
- drivers/gpu/drm/i915/display/intel_psr.c           |   9 ++
- drivers/hid/hid-rmi.c                              |  64 -----------
- drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 ++++
- drivers/input/rmi4/rmi_driver.c                    | 124 ++++++++++++---------
- drivers/iommu/iommu.c                              |  22 ++++
- drivers/nvme/host/core.c                           |  22 +++-
- drivers/nvme/host/multipath.c                      |  19 ++--
- drivers/nvme/host/nvme.h                           |   4 +
- drivers/pci/quirks.c                               |  24 ++++
- drivers/usb/core/hub.c                             |   7 ++
- include/linux/efi.h                                |  24 ++--
- include/linux/lsm_hook_defs.h                      |   2 +
- include/linux/lsm_hooks.h                          |   6 +
- include/linux/rmi.h                                |   1 +
- include/linux/security.h                           |   5 +
- init/Kconfig                                       |   2 +-
- kernel/module_signing.c                            |   9 +-
- net/bluetooth/hci_event.c                          |  20 ++++
- scripts/tags.sh                                    |   2 +
- security/integrity/platform_certs/load_uefi.c      |   6 +-
- security/lockdown/Kconfig                          |  13 +++
- security/lockdown/lockdown.c                       |   1 +
- security/security.c                                |   6 +
- 45 files changed, 741 insertions(+), 191 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index fc7efcdab0a2..bdaea37d0246 100644
---- a/Makefile
-+++ b/Makefile
-@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
- PHONY := __all
- __all:
-
-+# Set RHEL variables
-+# Use this spot to avoid future merge conflicts
-+include Makefile.rhelver
-+
- # We are using a recursive build, so we need to do a little thinking
- # to get the ordering right.
- #
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 2e8091e2d8a8..32e0403314b1 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -1486,9 +1486,9 @@ config HIGHMEM
- 	  If unsure, say n.
-
- config HIGHPTE
--	bool "Allocate 2nd-level pagetables from highmem" if EXPERT
-+	bool "Allocate 2nd-level pagetables from highmem"
- 	depends on HIGHMEM
--	default y
-+	default n
- 	help
- 	  The VM uses one page of physical memory for each page table.
- 	  For systems with a lot of processes, this can use a lot of
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 54cf6faf339c..c513485d3351 100644
---- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -1143,7 +1143,7 @@ endchoice
-
- config ARM64_FORCE_52BIT
- 	bool "Force 52-bit virtual addresses for userspace"
--	depends on ARM64_VA_BITS_52 && EXPERT
-+	depends on ARM64_VA_BITS_52
- 	help
- 	  For systems with 52-bit userspace VAs enabled, the kernel will attempt
- 	  to maintain compatibility with older software by providing 48-bit VAs
-@@ -1382,6 +1382,7 @@ config XEN
- config FORCE_MAX_ZONEORDER
- 	int
- 	default "14" if ARM64_64K_PAGES
-+	default "13" if (ARCH_THUNDER && !ARM64_64K_PAGES)
- 	default "12" if ARM64_16K_PAGES
- 	default "11"
- 	help
-diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
-index 3f8ee257f9aa..3ab92feb6241 100644
---- a/arch/s390/include/asm/ipl.h
-+++ b/arch/s390/include/asm/ipl.h
-@@ -128,6 +128,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf,
- 			     unsigned char flags, unsigned short cert);
- int ipl_report_add_certificate(struct ipl_report *report, void *key,
- 			       unsigned long addr, unsigned long len);
-+bool ipl_get_secureboot(void);
-
- /*
-  * DIAG 308 support
-diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
-index 1cc85b8ff42e..b7ee128c67ce 100644
---- a/arch/s390/kernel/ipl.c
-+++ b/arch/s390/kernel/ipl.c
-@@ -2216,3 +2216,8 @@ int ipl_report_free(struct ipl_report *report)
- }
-
- #endif
-+
-+bool ipl_get_secureboot(void)
-+{
-+	return !!ipl_secure_flag;
-+}
-diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index 2cef49983e9e..c50998b4b554 100644
---- a/arch/s390/kernel/setup.c
-+++ b/arch/s390/kernel/setup.c
-@@ -49,6 +49,7 @@
- #include <linux/memory.h>
- #include <linux/compat.h>
- #include <linux/start_kernel.h>
-+#include <linux/security.h>
- #include <linux/hugetlb.h>
- #include <linux/kmemleak.h>
-
-@@ -970,6 +971,9 @@ void __init setup_arch(char **cmdline_p)
-
- 	log_component_list();
-
-+	if (ipl_get_secureboot())
-+		security_lock_kernel_down("Secure IPL mode", LOCKDOWN_INTEGRITY_MAX);
-+
- 	/* Have one command line that is parsed and saved in /proc/cmdline */
- 	/* boot_command_line has been already set up in early.c */
- 	*cmdline_p = boot_command_line;
-diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
-index 6dbd7e9f74c9..0352e4589efa 100644
---- a/arch/x86/boot/header.S
-+++ b/arch/x86/boot/header.S
-@@ -163,7 +163,11 @@ extra_header_fields:
- 	.long	0x200				# SizeOfHeaders
- 	.long	0				# CheckSum
- 	.word	IMAGE_SUBSYSTEM_EFI_APPLICATION	# Subsystem (EFI application)
-+#ifdef CONFIG_DXE_MEM_ATTRIBUTES
-+	.word	IMAGE_DLL_CHARACTERISTICS_NX_COMPAT	# DllCharacteristics
-+#else
- 	.word	0				# DllCharacteristics
-+#endif
- #ifdef CONFIG_X86_32
- 	.long	0				# SizeOfStackReserve
- 	.long	0				# SizeOfStackCommit
-diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
-index 98938a68251c..bed74a0f2932 100644
---- a/arch/x86/include/asm/efi.h
-+++ b/arch/x86/include/asm/efi.h
-@@ -357,6 +357,11 @@ static inline u32 efi64_convert_status(efi_status_t status)
- 						   runtime),		\
- 				    func, __VA_ARGS__))
-
-+#define efi_dxe_call(func, ...)						\
-+	(efi_is_native()						\
-+		? efi_dxe_table->func(__VA_ARGS__)			\
-+		: __efi64_thunk_map(efi_dxe_table, func, __VA_ARGS__))
-+
- #else /* CONFIG_EFI_MIXED */
-
- static inline bool efi_is_64bit(void)
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index c95b9ac5a457..6640be279dae 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -20,6 +20,7 @@
- #include <linux/root_dev.h>
- #include <linux/hugetlb.h>
- #include <linux/tboot.h>
-+#include <linux/security.h>
- #include <linux/usb/xhci-dbgp.h>
- #include <linux/static_call.h>
- #include <linux/swiotlb.h>
-@@ -946,6 +947,13 @@ void __init setup_arch(char **cmdline_p)
- 	if (efi_enabled(EFI_BOOT))
- 		efi_init();
-
-+	efi_set_secure_boot(boot_params.secure_boot);
-+
-+#ifdef CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT
-+	if (efi_enabled(EFI_SECURE_BOOT))
-+		security_lock_kernel_down("EFI Secure Boot mode", LOCKDOWN_INTEGRITY_MAX);
-+#endif
-+
- 	dmi_setup();
-
- 	/*
-@@ -1115,19 +1123,7 @@ void __init setup_arch(char **cmdline_p)
- 	/* Allocate bigger log buffer */
- 	setup_log_buf(1);
-
--	if (efi_enabled(EFI_BOOT)) {
--		switch (boot_params.secure_boot) {
--		case efi_secureboot_mode_disabled:
--			pr_info("Secure boot disabled\n");
--			break;
--		case efi_secureboot_mode_enabled:
--			pr_info("Secure boot enabled\n");
--			break;
--		default:
--			pr_info("Secure boot could not be determined\n");
--			break;
--		}
--	}
-+	efi_set_secure_boot(boot_params.secure_boot);
-
- 	reserve_initrd();
-
-diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
-index 6aef1ee5e1bd..8f146b1b4972 100644
---- a/drivers/acpi/apei/hest.c
-+++ b/drivers/acpi/apei/hest.c
-@@ -96,6 +96,14 @@ static int apei_hest_parse(apei_hest_func_t func, void *data)
- 	if (hest_disable || !hest_tab)
- 		return -EINVAL;
-
-+#ifdef CONFIG_ARM64
-+	/* Ignore broken firmware */
-+	if (!strncmp(hest_tab->header.oem_id, "HPE   ", 6) &&
-+	    !strncmp(hest_tab->header.oem_table_id, "ProLiant", 8) &&
-+	    MIDR_IMPLEMENTOR(read_cpuid_id()) == ARM_CPU_IMP_APM)
-+		return -EINVAL;
-+#endif
-+
- 	hest_hdr = (struct acpi_hest_header *)(hest_tab + 1);
- 	for (i = 0; i < hest_tab->error_source_count; i++) {
- 		len = hest_esrc_len(hest_hdr);
-diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
-index c68e694fca26..146cba5ae5bc 100644
---- a/drivers/acpi/irq.c
-+++ b/drivers/acpi/irq.c
-@@ -130,6 +130,7 @@ struct acpi_irq_parse_one_ctx {
- 	unsigned int index;
- 	unsigned long *res_flags;
- 	struct irq_fwspec *fwspec;
-+	bool skip_producer_check;
- };
-
- /**
-@@ -201,7 +202,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
- 		return AE_CTRL_TERMINATE;
- 	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
- 		eirq = &ares->data.extended_irq;
--		if (eirq->producer_consumer == ACPI_PRODUCER)
-+		if (!ctx->skip_producer_check &&
-+		    eirq->producer_consumer == ACPI_PRODUCER)
- 			return AE_OK;
- 		if (ctx->index >= eirq->interrupt_count) {
- 			ctx->index -= eirq->interrupt_count;
-@@ -236,8 +238,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
- static int acpi_irq_parse_one(acpi_handle handle, unsigned int index,
- 			      struct irq_fwspec *fwspec, unsigned long *flags)
- {
--	struct acpi_irq_parse_one_ctx ctx = { -EINVAL, index, flags, fwspec };
-+	struct acpi_irq_parse_one_ctx ctx = { -EINVAL, index, flags, fwspec, false };
-
-+	/*
-+	 * Firmware on arm64-based HPE m400 platform incorrectly marks
-+	 * its UART interrupt as ACPI_PRODUCER rather than ACPI_CONSUMER.
-+	 * Don't do the producer/consumer check for that device.
-+	 */
-+	if (IS_ENABLED(CONFIG_ARM64)) {
-+		struct acpi_device *adev = acpi_bus_get_acpi_device(handle);
-+
-+		if (adev && !strcmp(acpi_device_hid(adev), "APMC0D08"))
-+			ctx.skip_producer_check = true;
-+	}
- 	acpi_walk_resources(handle, METHOD_NAME__CRS, acpi_irq_parse_one_cb, &ctx);
- 	return ctx.rc;
- }
-diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index 762b61f67e6c..3581d4898dc4 100644
---- a/drivers/acpi/scan.c
-+++ b/drivers/acpi/scan.c
-@@ -1766,6 +1766,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
- 	if (!acpi_match_device_ids(device, ignore_serial_bus_ids))
- 		return false;
-
-+	/*
-+	 * Firmware on some arm64 X-Gene platforms will make the UART
-+	 * device appear as both a UART and a slave of that UART. Just
-+	 * bail out here for X-Gene UARTs.
-+	 */
-+	if (IS_ENABLED(CONFIG_ARM64) &&
-+	    !strcmp(acpi_device_hid(device), "APMC0D08"))
-+		return false;
-+
- 	INIT_LIST_HEAD(&resource_list);
- 	acpi_dev_get_resources(device, &resource_list,
- 			       acpi_check_serial_bus_slave,
-diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
-index cf8c7fd59ada..28a8189be64f 100644
---- a/drivers/ata/libahci.c
-+++ b/drivers/ata/libahci.c
-@@ -690,6 +690,24 @@ int ahci_stop_engine(struct ata_port *ap)
- 	tmp &= ~PORT_CMD_START;
- 	writel(tmp, port_mmio + PORT_CMD);
-
-+#ifdef CONFIG_ARM64
-+	/* Rev Ax of Cavium CN99XX needs a hack for port stop */
-+	if (dev_is_pci(ap->host->dev) &&
-+	    to_pci_dev(ap->host->dev)->vendor == 0x14e4 &&
-+	    to_pci_dev(ap->host->dev)->device == 0x9027 &&
-+	    midr_is_cpu_model_range(read_cpuid_id(),
-+			MIDR_CPU_MODEL(ARM_CPU_IMP_BRCM, BRCM_CPU_PART_VULCAN),
-+			MIDR_CPU_VAR_REV(0, 0),
-+			MIDR_CPU_VAR_REV(0, MIDR_REVISION_MASK))) {
-+		tmp = readl(hpriv->mmio + 0x8000);
-+		udelay(100);
-+		writel(tmp | (1 << 26), hpriv->mmio + 0x8000);
-+		udelay(100);
-+		writel(tmp & ~(1 << 26), hpriv->mmio + 0x8000);
-+		dev_warn(ap->host->dev, "CN99XX SATA reset workaround applied\n");
-+	}
-+#endif
-+
- 	/* wait for engine to stop. This could be as long as 500 msec */
- 	tmp = ata_wait_register(ap, port_mmio + PORT_CMD,
- 				PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500);
-diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c
-index bbf7029e224b..cf7faa970dd6 100644
---- a/drivers/char/ipmi/ipmi_dmi.c
-+++ b/drivers/char/ipmi/ipmi_dmi.c
-@@ -215,6 +215,21 @@ static int __init scan_for_dmi_ipmi(void)
- {
- 	const struct dmi_device *dev = NULL;
-
-+#ifdef CONFIG_ARM64
-+	/* RHEL-only
-+	 * If this is ARM-based HPE m400, return now, because that platform
-+	 * reports the host-side ipmi address as intel port-io space, which
-+	 * does not exist in the ARM architecture.
-+	 */
-+	const char *dmistr = dmi_get_system_info(DMI_PRODUCT_NAME);
-+
-+	if (dmistr && (strcmp("ProLiant m400 Server", dmistr) == 0)) {
-+		pr_debug("%s does not support host ipmi\n", dmistr);
-+		return 0;
-+	}
-+	/* END RHEL-only */
-+#endif
-+
- 	while ((dev = dmi_find_device(DMI_DEV_TYPE_IPMI, NULL, dev)))
- 		dmi_decode_ipmi((const struct dmi_header *) dev->device_data);
-
-diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
-index 2610e809c802..4f04a6bcf2e9 100644
---- a/drivers/char/ipmi/ipmi_msghandler.c
-+++ b/drivers/char/ipmi/ipmi_msghandler.c
-@@ -35,6 +35,7 @@
- #include <linux/uuid.h>
- #include <linux/nospec.h>
- #include <linux/vmalloc.h>
-+#include <linux/dmi.h>
- #include <linux/delay.h>
-
- #define IPMI_DRIVER_VERSION "39.2"
-@@ -5427,8 +5428,21 @@ static int __init ipmi_init_msghandler_mod(void)
- {
- 	int rv;
-
--	pr_info("version " IPMI_DRIVER_VERSION "\n");
-+#ifdef CONFIG_ARM64
-+	/* RHEL-only
-+	 * If this is ARM-based HPE m400, return now, because that platform
-+	 * reports the host-side ipmi address as intel port-io space, which
-+	 * does not exist in the ARM architecture.
-+	 */
-+	const char *dmistr = dmi_get_system_info(DMI_PRODUCT_NAME);
-
-+	if (dmistr && (strcmp("ProLiant m400 Server", dmistr) == 0)) {
-+		pr_debug("%s does not support host ipmi\n", dmistr);
-+		return -ENOSYS;
-+	}
-+	/* END RHEL-only */
-+#endif
-+	pr_info("version " IPMI_DRIVER_VERSION "\n");
- 	mutex_lock(&ipmi_interfaces_mutex);
- 	rv = ipmi_register_driver();
- 	mutex_unlock(&ipmi_interfaces_mutex);
-diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
-index 243882f5e5f9..4a0fa81a563d 100644
---- a/drivers/firmware/efi/Kconfig
-+++ b/drivers/firmware/efi/Kconfig
-@@ -91,6 +91,18 @@ config EFI_SOFT_RESERVE
-
- 	  If unsure, say Y.
-
-+config EFI_DXE_MEM_ATTRIBUTES
-+	bool "Adjust memory attributes in EFISTUB"
-+	depends on EFI && EFI_STUB && X86
-+	default y
-+	help
-+	  UEFI specification does not guarantee all memory to be
-+	  accessible for both write and execute as the kernel expects
-+	  it to be.
-+	  Use DXE services to check and alter memory protection
-+	  attributes during boot via EFISTUB to ensure that memory
-+	  ranges used by the kernel are writable and executable.
-+
- config EFI_PARAMS_FROM_FDT
- 	bool
- 	help
-diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
-index c02ff25dd477..d860f8eb9a81 100644
---- a/drivers/firmware/efi/Makefile
-+++ b/drivers/firmware/efi/Makefile
-@@ -28,6 +28,7 @@ obj-$(CONFIG_EFI_FAKE_MEMMAP)		+= fake_map.o
- obj-$(CONFIG_EFI_BOOTLOADER_CONTROL)	+= efibc.o
- obj-$(CONFIG_EFI_TEST)			+= test/
- obj-$(CONFIG_EFI_DEV_PATH_PARSER)	+= dev-path-parser.o
-+obj-$(CONFIG_EFI)			+= secureboot.o
- obj-$(CONFIG_APPLE_PROPERTIES)		+= apple-properties.o
- obj-$(CONFIG_EFI_RCI2_TABLE)		+= rci2-table.o
- obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE)	+= embedded-firmware.o
-diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index ff57db8f8d05..d7dfde3260bf 100644
---- a/drivers/firmware/efi/efi.c
-+++ b/drivers/firmware/efi/efi.c
-@@ -31,6 +31,7 @@
- #include <linux/ucs2_string.h>
- #include <linux/memblock.h>
- #include <linux/security.h>
-+#include <linux/bsearch.h>
-
- #include <asm/early_ioremap.h>
-
-@@ -851,40 +852,101 @@ int efi_mem_type(unsigned long phys_addr)
- }
- #endif
-
-+struct efi_error_code {
-+	efi_status_t status;
-+	int errno;
-+	const char *description;
-+};
-+
-+static const struct efi_error_code efi_error_codes[] = {
-+	{ EFI_SUCCESS, 0, "Success"},
-+#if 0
-+	{ EFI_LOAD_ERROR, -EPICK_AN_ERRNO, "Load Error"},
-+#endif
-+	{ EFI_INVALID_PARAMETER, -EINVAL, "Invalid Parameter"},
-+	{ EFI_UNSUPPORTED, -ENOSYS, "Unsupported"},
-+	{ EFI_BAD_BUFFER_SIZE, -ENOSPC, "Bad Buffer Size"},
-+	{ EFI_BUFFER_TOO_SMALL, -ENOSPC, "Buffer Too Small"},
-+	{ EFI_NOT_READY, -EAGAIN, "Not Ready"},
-+	{ EFI_DEVICE_ERROR, -EIO, "Device Error"},
-+	{ EFI_WRITE_PROTECTED, -EROFS, "Write Protected"},
-+	{ EFI_OUT_OF_RESOURCES, -ENOMEM, "Out of Resources"},
-+#if 0
-+	{ EFI_VOLUME_CORRUPTED, -EPICK_AN_ERRNO, "Volume Corrupt"},
-+	{ EFI_VOLUME_FULL, -EPICK_AN_ERRNO, "Volume Full"},
-+	{ EFI_NO_MEDIA, -EPICK_AN_ERRNO, "No Media"},
-+	{ EFI_MEDIA_CHANGED, -EPICK_AN_ERRNO, "Media changed"},
-+#endif
-+	{ EFI_NOT_FOUND, -ENOENT, "Not Found"},
-+#if 0
-+	{ EFI_ACCESS_DENIED, -EPICK_AN_ERRNO, "Access Denied"},
-+	{ EFI_NO_RESPONSE, -EPICK_AN_ERRNO, "No Response"},
-+	{ EFI_NO_MAPPING, -EPICK_AN_ERRNO, "No mapping"},
-+	{ EFI_TIMEOUT, -EPICK_AN_ERRNO, "Time out"},
-+	{ EFI_NOT_STARTED, -EPICK_AN_ERRNO, "Not started"},
-+	{ EFI_ALREADY_STARTED, -EPICK_AN_ERRNO, "Already started"},
-+#endif
-+	{ EFI_ABORTED, -EINTR, "Aborted"},
-+#if 0
-+	{ EFI_ICMP_ERROR, -EPICK_AN_ERRNO, "ICMP Error"},
-+	{ EFI_TFTP_ERROR, -EPICK_AN_ERRNO, "TFTP Error"},
-+	{ EFI_PROTOCOL_ERROR, -EPICK_AN_ERRNO, "Protocol Error"},
-+	{ EFI_INCOMPATIBLE_VERSION, -EPICK_AN_ERRNO, "Incompatible Version"},
-+#endif
-+	{ EFI_SECURITY_VIOLATION, -EACCES, "Security Policy Violation"},
-+#if 0
-+	{ EFI_CRC_ERROR, -EPICK_AN_ERRNO, "CRC Error"},
-+	{ EFI_END_OF_MEDIA, -EPICK_AN_ERRNO, "End of Media"},
-+	{ EFI_END_OF_FILE, -EPICK_AN_ERRNO, "End of File"},
-+	{ EFI_INVALID_LANGUAGE, -EPICK_AN_ERRNO, "Invalid Languages"},
-+	{ EFI_COMPROMISED_DATA, -EPICK_AN_ERRNO, "Compromised Data"},
-+
-+	// warnings
-+	{ EFI_WARN_UNKOWN_GLYPH, -EPICK_AN_ERRNO, "Warning Unknown Glyph"},
-+	{ EFI_WARN_DELETE_FAILURE, -EPICK_AN_ERRNO, "Warning Delete Failure"},
-+	{ EFI_WARN_WRITE_FAILURE, -EPICK_AN_ERRNO, "Warning Write Failure"},
-+	{ EFI_WARN_BUFFER_TOO_SMALL, -EPICK_AN_ERRNO, "Warning Buffer Too Small"},
-+#endif
-+};
-+
-+static int
-+efi_status_cmp_bsearch(const void *key, const void *item)
-+{
-+	u64 status = (u64)(uintptr_t)key;
-+	struct efi_error_code *code = (struct efi_error_code *)item;
-+
-+	if (status < code->status)
-+		return -1;
-+	if (status > code->status)
-+		return 1;
-+	return 0;
-+}
-+
- int efi_status_to_err(efi_status_t status)
- {
--	int err;
--
--	switch (status) {
--	case EFI_SUCCESS:
--		err = 0;
--		break;
--	case EFI_INVALID_PARAMETER:
--		err = -EINVAL;
--		break;
--	case EFI_OUT_OF_RESOURCES:
--		err = -ENOSPC;
--		break;
--	case EFI_DEVICE_ERROR:
--		err = -EIO;
--		break;
--	case EFI_WRITE_PROTECTED:
--		err = -EROFS;
--		break;
--	case EFI_SECURITY_VIOLATION:
--		err = -EACCES;
--		break;
--	case EFI_NOT_FOUND:
--		err = -ENOENT;
--		break;
--	case EFI_ABORTED:
--		err = -EINTR;
--		break;
--	default:
--		err = -EINVAL;
--	}
-+	struct efi_error_code *found;
-+	size_t num = sizeof(efi_error_codes) / sizeof(struct efi_error_code);
-
--	return err;
-+	found = bsearch((void *)(uintptr_t)status, efi_error_codes,
-+			sizeof(struct efi_error_code), num,
-+			efi_status_cmp_bsearch);
-+	if (!found)
-+		return -EINVAL;
-+	return found->errno;
-+}
-+
-+const char *
-+efi_status_to_str(efi_status_t status)
-+{
-+	struct efi_error_code *found;
-+	size_t num = sizeof(efi_error_codes) / sizeof(struct efi_error_code);
-+
-+	found = bsearch((void *)(uintptr_t)status, efi_error_codes,
-+			sizeof(struct efi_error_code), num,
-+			efi_status_cmp_bsearch);
-+	if (!found)
-+		return "Unknown error code";
-+	return found->description;
- }
-
- static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock);
-diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h
-index edb77b0621ea..2dc24776899a 100644
---- a/drivers/firmware/efi/libstub/efistub.h
-+++ b/drivers/firmware/efi/libstub/efistub.h
-@@ -36,6 +36,9 @@ extern bool efi_novamap;
-
- extern const efi_system_table_t *efi_system_table;
-
-+typedef union efi_dxe_services_table efi_dxe_services_table_t;
-+extern const efi_dxe_services_table_t *efi_dxe_table;
-+
- efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
- 				   efi_system_table_t *sys_table_arg);
-
-@@ -44,6 +47,7 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
- #define efi_is_native()		(true)
- #define efi_bs_call(func, ...)	efi_system_table->boottime->func(__VA_ARGS__)
- #define efi_rt_call(func, ...)	efi_system_table->runtime->func(__VA_ARGS__)
-+#define efi_dxe_call(func, ...)	efi_dxe_table->func(__VA_ARGS__)
- #define efi_table_attr(inst, attr)	(inst->attr)
- #define efi_call_proto(inst, func, ...) inst->func(inst, ##__VA_ARGS__)
-
-@@ -329,6 +333,76 @@ union efi_boot_services {
- 	} mixed_mode;
- };
-
-+typedef enum {
-+	EfiGcdMemoryTypeNonExistent,
-+	EfiGcdMemoryTypeReserved,
-+	EfiGcdMemoryTypeSystemMemory,
-+	EfiGcdMemoryTypeMemoryMappedIo,
-+	EfiGcdMemoryTypePersistent,
-+	EfiGcdMemoryTypeMoreReliable,
-+	EfiGcdMemoryTypeMaximum
-+} efi_gcd_memory_type_t;
-+
-+typedef struct {
-+	efi_physical_addr_t base_address;
-+	u64 length;
-+	u64 capabilities;
-+	u64 attributes;
-+	efi_gcd_memory_type_t gcd_memory_type;
-+	void *image_handle;
-+	void *device_handle;
-+} efi_gcd_memory_space_desc_t;
-+
-+/*
-+ * EFI DXE Services table
-+ */
-+union efi_dxe_services_table {
-+	struct {
-+		efi_table_hdr_t hdr;
-+		void *add_memory_space;
-+		void *allocate_memory_space;
-+		void *free_memory_space;
-+		void *remove_memory_space;
-+		efi_status_t (__efiapi *get_memory_space_descriptor)(efi_physical_addr_t,
-+								     efi_gcd_memory_space_desc_t *);
-+		efi_status_t (__efiapi *set_memory_space_attributes)(efi_physical_addr_t,
-+								     u64, u64);
-+		void *get_memory_space_map;
-+		void *add_io_space;
-+		void *allocate_io_space;
-+		void *free_io_space;
-+		void *remove_io_space;
-+		void *get_io_space_descriptor;
-+		void *get_io_space_map;
-+		void *dispatch;
-+		void *schedule;
-+		void *trust;
-+		void *process_firmware_volume;
-+		void *set_memory_space_capabilities;
-+	};
-+	struct {
-+		efi_table_hdr_t hdr;
-+		u32 add_memory_space;
-+		u32 allocate_memory_space;
-+		u32 free_memory_space;
-+		u32 remove_memory_space;
-+		u32 get_memory_space_descriptor;
-+		u32 set_memory_space_attributes;
-+		u32 get_memory_space_map;
-+		u32 add_io_space;
-+		u32 allocate_io_space;
-+		u32 free_io_space;
-+		u32 remove_io_space;
-+		u32 get_io_space_descriptor;
-+		u32 get_io_space_map;
-+		u32 dispatch;
-+		u32 schedule;
-+		u32 trust;
-+		u32 process_firmware_volume;
-+		u32 set_memory_space_capabilities;
-+	} mixed_mode;
-+};
-+
- typedef union efi_uga_draw_protocol efi_uga_draw_protocol_t;
-
- union efi_uga_draw_protocol {
-diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
-index 01ddd4502e28..b14e88ccefca 100644
---- a/drivers/firmware/efi/libstub/x86-stub.c
-+++ b/drivers/firmware/efi/libstub/x86-stub.c
-@@ -22,6 +22,7 @@
- #define MAXMEM_X86_64_4LEVEL (1ull << 46)
-
- const efi_system_table_t *efi_system_table;
-+const efi_dxe_services_table_t *efi_dxe_table;
- extern u32 image_offset;
- static efi_loaded_image_t *image = NULL;
-
-@@ -211,9 +212,110 @@ static void retrieve_apple_device_properties(struct boot_params *boot_params)
- 	}
- }
-
-+static void
-+adjust_memory_range_protection(unsigned long start, unsigned long size)
-+{
-+	efi_status_t status;
-+	efi_gcd_memory_space_desc_t desc;
-+	unsigned long end, next;
-+	unsigned long rounded_start, rounded_end;
-+	unsigned long unprotect_start, unprotect_size;
-+	int has_system_memory = 0;
-+
-+	if (efi_dxe_table == NULL)
-+		return;
-+
-+	rounded_start = rounddown(start, EFI_PAGE_SIZE);
-+	rounded_end = roundup(start + size, EFI_PAGE_SIZE);
-+
-+	/*
-+	 * Don't modify memory region attributes, they are
-+	 * already suitable, to lower the possibility to
-+	 * encounter firmware bugs.
-+	 */
-+
-+	for (end = start + size; start < end; start = next) {
-+
-+		status = efi_dxe_call(get_memory_space_descriptor, start, &desc);
-+
-+		if (status != EFI_SUCCESS)
-+			return;
-+
-+		next = desc.base_address + desc.length;
-+
-+		/*
-+		 * Only system memory is suitable for trampoline/kernel image placement,
-+		 * so only this type of memory needs its attributes to be modified.
-+		 */
-+
-+		if (desc.gcd_memory_type != EfiGcdMemoryTypeSystemMemory ||
-+		    (desc.attributes & (EFI_MEMORY_RO | EFI_MEMORY_XP)) == 0)
-+			continue;
-+
-+		unprotect_start = max(rounded_start, (unsigned long)desc.base_address);
-+		unprotect_size = min(rounded_end, next) - unprotect_start;
-+
-+		status = efi_dxe_call(set_memory_space_attributes,
-+				      unprotect_start, unprotect_size,
-+				      EFI_MEMORY_WB);
-+
-+		if (status != EFI_SUCCESS) {
-+			efi_warn("Unable to unprotect memory range [%08lx,%08lx]: %d\n",
-+				 unprotect_start,
-+				 unprotect_start + unprotect_size,
-+				 (int)status);
-+		}
-+	}
-+}
-+
-+/*
-+ * Trampoline takes 2 pages and can be loaded in first megabyte of memory
-+ * with its end placed between 128k and 640k where BIOS might start.
-+ * (see arch/x86/boot/compressed/pgtable_64.c)
-+ *
-+ * We cannot find exact trampoline placement since memory map
-+ * can be modified by UEFI, and it can alter the computed address.
-+ */
-+
-+#define TRAMPOLINE_PLACEMENT_BASE ((128 - 8)*1024)
-+#define TRAMPOLINE_PLACEMENT_SIZE (640*1024 - (128 - 8)*1024)
-+
-+void startup_32(struct boot_params *boot_params);
-+
-+static void
-+setup_memory_protection(unsigned long image_base, unsigned long image_size)
-+{
-+	/*
-+	 * Allow execution of possible trampoline used
-+	 * for switching between 4- and 5-level page tables
-+	 * and relocated kernel image.
-+	 */
-+
-+	adjust_memory_range_protection(TRAMPOLINE_PLACEMENT_BASE,
-+				       TRAMPOLINE_PLACEMENT_SIZE);
-+
-+#ifdef CONFIG_64BIT
-+	if (image_base != (unsigned long)startup_32)
-+		adjust_memory_range_protection(image_base, image_size);
-+#else
-+	/*
-+	 * Clear protection flags on a whole range of possible
-+	 * addresses used for KASLR. We don't need to do that
-+	 * on x86_64, since KASLR/extraction is performed after
-+	 * dedicated identity page tables are built and we only
-+	 * need to remove possible protection on relocated image
-+	 * itself disregarding further relocations.
-+	 */
-+	adjust_memory_range_protection(LOAD_PHYSICAL_ADDR,
-+				       KERNEL_IMAGE_SIZE - LOAD_PHYSICAL_ADDR);
-+#endif
-+}
-+
- static const efi_char16_t apple[] = L"Apple";
-
--static void setup_quirks(struct boot_params *boot_params)
-+static void setup_quirks(struct boot_params *boot_params,
-+			 unsigned long image_base,
-+			 unsigned long image_size)
- {
- 	efi_char16_t *fw_vendor = (efi_char16_t *)(unsigned long)
- 		efi_table_attr(efi_system_table, fw_vendor);
-@@ -222,6 +324,9 @@ static void setup_quirks(struct boot_params *boot_params)
- 		if (IS_ENABLED(CONFIG_APPLE_PROPERTIES))
- 			retrieve_apple_device_properties(boot_params);
- 	}
-+
-+	if (IS_ENABLED(CONFIG_EFI_DXE_MEM_ATTRIBUTES))
-+		setup_memory_protection(image_base, image_size);
- }
-
- /*
-@@ -341,8 +446,6 @@ static void __noreturn efi_exit(efi_handle_t handle, efi_status_t status)
- 		asm("hlt");
- }
-
--void startup_32(struct boot_params *boot_params);
--
- void __noreturn efi_stub_entry(efi_handle_t handle,
- 			       efi_system_table_t *sys_table_arg,
- 			       struct boot_params *boot_params);
-@@ -677,11 +780,17 @@ unsigned long efi_main(efi_handle_t handle,
- 	efi_status_t status;
-
- 	efi_system_table = sys_table_arg;
--
- 	/* Check if we were booted by the EFI firmware */
- 	if (efi_system_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)
- 		efi_exit(handle, EFI_INVALID_PARAMETER);
-
-+	efi_dxe_table = get_efi_config_table(EFI_DXE_SERVICES_TABLE_GUID);
-+	if (efi_dxe_table &&
-+	    efi_dxe_table->hdr.signature != EFI_DXE_SERVICES_TABLE_SIGNATURE) {
-+		efi_warn("Ignoring DXE services table: invalid signature\n");
-+		efi_dxe_table = NULL;
-+	}
-+
- 	/*
- 	 * If the kernel isn't already loaded at a suitable address,
- 	 * relocate it.
-@@ -791,7 +900,7 @@ unsigned long efi_main(efi_handle_t handle,
-
- 	setup_efi_pci(boot_params);
-
--	setup_quirks(boot_params);
-+	setup_quirks(boot_params, bzimage_addr, buffer_end - buffer_start);
-
- 	status = exit_boot(boot_params, handle);
- 	if (status != EFI_SUCCESS) {
-diff --git a/drivers/firmware/efi/secureboot.c b/drivers/firmware/efi/secureboot.c
-new file mode 100644
-index 000000000000..de0a3714a5d4
---- /dev/null
-+++ b/drivers/firmware/efi/secureboot.c
-@@ -0,0 +1,38 @@
-+/* Core kernel secure boot support.
-+ *
-+ * Copyright (C) 2017 Red Hat, Inc. All Rights Reserved.
-+ * Written by David Howells (dhowells@redhat.com)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public Licence
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the Licence, or (at your option) any later version.
-+ */
-+
-+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-+
-+#include <linux/efi.h>
-+#include <linux/kernel.h>
-+#include <linux/printk.h>
-+
-+/*
-+ * Decide what to do when UEFI secure boot mode is enabled.
-+ */
-+void __init efi_set_secure_boot(enum efi_secureboot_mode mode)
-+{
-+	if (efi_enabled(EFI_BOOT)) {
-+		switch (mode) {
-+		case efi_secureboot_mode_disabled:
-+			pr_info("Secure boot disabled\n");
-+			break;
-+		case efi_secureboot_mode_enabled:
-+			set_bit(EFI_SECURE_BOOT, &efi.flags);
-+			pr_info("Secure boot enabled\n");
-+			break;
-+		default:
-+			pr_warn("Secure boot could not be determined (mode %u)\n",
-+				   mode);
-+			break;
-+		}
-+	}
-+}
-diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c
-index 1f276f108cc9..7039ad9bdf7f 100644
---- a/drivers/firmware/sysfb.c
-+++ b/drivers/firmware/sysfb.c
-@@ -34,6 +34,22 @@
- #include <linux/screen_info.h>
- #include <linux/sysfb.h>
-
-+static int skip_simpledrm;
-+
-+static int __init simpledrm_disable(char *opt)
-+{
-+	if (!opt)
-+                return -EINVAL;
-+
-+	get_option(&opt, &skip_simpledrm);
-+
-+	if (skip_simpledrm)
-+		pr_info("The simpledrm driver will not be probed\n");
-+
-+	return 0;
-+}
-+early_param("nvidia-drm.modeset", simpledrm_disable);
-+
- static struct platform_device *pd;
- static DEFINE_MUTEX(disable_lock);
- static bool disabled;
-@@ -83,7 +99,7 @@ static __init int sysfb_init(void)
-
- 	/* try to create a simple-framebuffer device */
- 	compatible = sysfb_parse_mode(si, &mode);
--	if (compatible) {
-+	if (compatible && !skip_simpledrm) {
- 		pd = sysfb_create_simplefb(si, &mode);
- 		if (!IS_ERR(pd))
- 			goto unlock_mutex;
-diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
-index 6c9e6e7f0afd..f0ff2f1f5fcb 100644
---- a/drivers/gpu/drm/i915/display/intel_psr.c
-+++ b/drivers/gpu/drm/i915/display/intel_psr.c
-@@ -744,6 +744,15 @@ static bool intel_psr2_sel_fetch_config_valid(struct intel_dp *intel_dp,
- 		return false;
- 	}
-
-+	/* Temporary workaround for Lenovo's issues with the X1 Carbon 10th Gen
-+	 * See: https://bugzilla.redhat.com/show_bug.cgi?id=2065794
-+	 */
-+	if (IS_ALDERLAKE_P(dev_priv)) {
-+		drm_dbg_kms(&dev_priv->drm,
-+			    "PSR2 sel fetch disabled on ADL-P, see rhbz2065794\n");
-+		return false;
-+	}
-+
- 	return crtc_state->enable_psr2_sel_fetch = true;
- }
-
-diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
-index 311eee599ce9..2460c6bd46f8 100644
---- a/drivers/hid/hid-rmi.c
-+++ b/drivers/hid/hid-rmi.c
-@@ -322,19 +322,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size)
- {
- 	struct rmi_data *hdata = hid_get_drvdata(hdev);
- 	struct rmi_device *rmi_dev = hdata->xport.rmi_dev;
--	unsigned long flags;
-
- 	if (!(test_bit(RMI_STARTED, &hdata->flags)))
- 		return 0;
-
--	local_irq_save(flags);
--
- 	rmi_set_attn_data(rmi_dev, data[1], &data[2], size - 2);
-
--	generic_handle_irq(hdata->rmi_irq);
--
--	local_irq_restore(flags);
--
- 	return 1;
- }
-
-@@ -591,56 +584,6 @@ static const struct rmi_transport_ops hid_rmi_ops = {
- 	.reset		= rmi_hid_reset,
- };
-
--static void rmi_irq_teardown(void *data)
--{
--	struct rmi_data *hdata = data;
--	struct irq_domain *domain = hdata->domain;
--
--	if (!domain)
--		return;
--
--	irq_dispose_mapping(irq_find_mapping(domain, 0));
--
--	irq_domain_remove(domain);
--	hdata->domain = NULL;
--	hdata->rmi_irq = 0;
--}
--
--static int rmi_irq_map(struct irq_domain *h, unsigned int virq,
--		       irq_hw_number_t hw_irq_num)
--{
--	irq_set_chip_and_handler(virq, &dummy_irq_chip, handle_simple_irq);
--
--	return 0;
--}
--
--static const struct irq_domain_ops rmi_irq_ops = {
--	.map = rmi_irq_map,
--};
--
--static int rmi_setup_irq_domain(struct hid_device *hdev)
--{
--	struct rmi_data *hdata = hid_get_drvdata(hdev);
--	int ret;
--
--	hdata->domain = irq_domain_create_linear(hdev->dev.fwnode, 1,
--						 &rmi_irq_ops, hdata);
--	if (!hdata->domain)
--		return -ENOMEM;
--
--	ret = devm_add_action_or_reset(&hdev->dev, &rmi_irq_teardown, hdata);
--	if (ret)
--		return ret;
--
--	hdata->rmi_irq = irq_create_mapping(hdata->domain, 0);
--	if (hdata->rmi_irq <= 0) {
--		hid_err(hdev, "Can't allocate an IRQ\n");
--		return hdata->rmi_irq < 0 ? hdata->rmi_irq : -ENXIO;
--	}
--
--	return 0;
--}
--
- static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
- {
- 	struct rmi_data *data = NULL;
-@@ -713,18 +656,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
-
- 	mutex_init(&data->page_mutex);
-
--	ret = rmi_setup_irq_domain(hdev);
--	if (ret) {
--		hid_err(hdev, "failed to allocate IRQ domain\n");
--		return ret;
--	}
--
- 	if (data->device_flags & RMI_DEVICE_HAS_PHYS_BUTTONS)
- 		rmi_hid_pdata.gpio_data.disable = true;
-
- 	data->xport.dev = hdev->dev.parent;
- 	data->xport.pdata = rmi_hid_pdata;
--	data->xport.pdata.irq = data->rmi_irq;
- 	data->xport.proto_name = "hid";
- 	data->xport.ops = &hid_rmi_ops;
-
-diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
-index 7f416a12000e..68be4afaa58a 100644
---- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
-+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
-@@ -9,6 +9,7 @@
- #include <linux/init.h>
- #include <linux/types.h>
- #include <linux/device.h>
-+#include <linux/dmi.h>
- #include <linux/io.h>
- #include <linux/err.h>
- #include <linux/fs.h>
-@@ -2171,6 +2172,16 @@ static const struct amba_id etm4_ids[] = {
- 	{},
- };
-
-+static const struct dmi_system_id broken_coresight[] = {
-+	{
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "HPE"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "Apollo 70"),
-+		},
-+	},
-+	{ }	/* terminating entry */
-+};
-+
- MODULE_DEVICE_TABLE(amba, etm4_ids);
-
- static struct amba_driver etm4x_amba_driver = {
-@@ -2204,6 +2215,11 @@ static int __init etm4x_init(void)
- {
- 	int ret;
-
-+	if (dmi_check_system(broken_coresight)) {
-+		pr_info("ETM4 disabled due to firmware bug\n");
-+		return 0;
-+	}
-+
- 	ret = etm4_pm_setup();
-
- 	/* etm4_pm_setup() does its own cleanup - exit on error */
-@@ -2230,6 +2246,9 @@ static int __init etm4x_init(void)
-
- static void __exit etm4x_exit(void)
- {
-+	if (dmi_check_system(broken_coresight))
-+		return;
-+
- 	amba_driver_unregister(&etm4x_amba_driver);
- 	platform_driver_unregister(&etm4_platform_driver);
- 	etm4_pm_clear();
-diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
-index 258d5fe3d395..f7298e3dc8f3 100644
---- a/drivers/input/rmi4/rmi_driver.c
-+++ b/drivers/input/rmi4/rmi_driver.c
-@@ -182,34 +182,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status,
- 	attn_data.data = fifo_data;
-
- 	kfifo_put(&drvdata->attn_fifo, attn_data);
-+
-+	schedule_work(&drvdata->attn_work);
- }
- EXPORT_SYMBOL_GPL(rmi_set_attn_data);
-
--static irqreturn_t rmi_irq_fn(int irq, void *dev_id)
-+static void attn_callback(struct work_struct *work)
- {
--	struct rmi_device *rmi_dev = dev_id;
--	struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev);
-+	struct rmi_driver_data *drvdata = container_of(work,
-+							struct rmi_driver_data,
-+							attn_work);
- 	struct rmi4_attn_data attn_data = {0};
- 	int ret, count;
-
- 	count = kfifo_get(&drvdata->attn_fifo, &attn_data);
--	if (count) {
--		*(drvdata->irq_status) = attn_data.irq_status;
--		drvdata->attn_data = attn_data;
--	}
-+	if (!count)
-+		return;
-
--	ret = rmi_process_interrupt_requests(rmi_dev);
-+	*(drvdata->irq_status) = attn_data.irq_status;
-+	drvdata->attn_data = attn_data;
-+
-+	ret = rmi_process_interrupt_requests(drvdata->rmi_dev);
- 	if (ret)
--		rmi_dbg(RMI_DEBUG_CORE, &rmi_dev->dev,
-+		rmi_dbg(RMI_DEBUG_CORE, &drvdata->rmi_dev->dev,
- 			"Failed to process interrupt request: %d\n", ret);
-
--	if (count) {
--		kfree(attn_data.data);
--		drvdata->attn_data.data = NULL;
--	}
-+	kfree(attn_data.data);
-+	drvdata->attn_data.data = NULL;
-
- 	if (!kfifo_is_empty(&drvdata->attn_fifo))
--		return rmi_irq_fn(irq, dev_id);
-+		schedule_work(&drvdata->attn_work);
-+}
-+
-+static irqreturn_t rmi_irq_fn(int irq, void *dev_id)
-+{
-+	struct rmi_device *rmi_dev = dev_id;
-+	int ret;
-+
-+	ret = rmi_process_interrupt_requests(rmi_dev);
-+	if (ret)
-+		rmi_dbg(RMI_DEBUG_CORE, &rmi_dev->dev,
-+			"Failed to process interrupt request: %d\n", ret);
-
- 	return IRQ_HANDLED;
- }
-@@ -217,7 +230,6 @@ static irqreturn_t rmi_irq_fn(int irq, void *dev_id)
- static int rmi_irq_init(struct rmi_device *rmi_dev)
- {
- 	struct rmi_device_platform_data *pdata = rmi_get_platform_data(rmi_dev);
--	struct rmi_driver_data *data = dev_get_drvdata(&rmi_dev->dev);
- 	int irq_flags = irq_get_trigger_type(pdata->irq);
- 	int ret;
-
-@@ -235,8 +247,6 @@ static int rmi_irq_init(struct rmi_device *rmi_dev)
- 		return ret;
- 	}
-
--	data->enabled = true;
--
- 	return 0;
- }
-
-@@ -886,23 +896,27 @@ void rmi_enable_irq(struct rmi_device *rmi_dev, bool clear_wake)
- 	if (data->enabled)
- 		goto out;
-
--	enable_irq(irq);
--	data->enabled = true;
--	if (clear_wake && device_may_wakeup(rmi_dev->xport->dev)) {
--		retval = disable_irq_wake(irq);
--		if (retval)
--			dev_warn(&rmi_dev->dev,
--				 "Failed to disable irq for wake: %d\n",
--				 retval);
--	}
-+	if (irq) {
-+		enable_irq(irq);
-+		data->enabled = true;
-+		if (clear_wake && device_may_wakeup(rmi_dev->xport->dev)) {
-+			retval = disable_irq_wake(irq);
-+			if (retval)
-+				dev_warn(&rmi_dev->dev,
-+					 "Failed to disable irq for wake: %d\n",
-+					 retval);
-+		}
-
--	/*
--	 * Call rmi_process_interrupt_requests() after enabling irq,
--	 * otherwise we may lose interrupt on edge-triggered systems.
--	 */
--	irq_flags = irq_get_trigger_type(pdata->irq);
--	if (irq_flags & IRQ_TYPE_EDGE_BOTH)
--		rmi_process_interrupt_requests(rmi_dev);
-+		/*
-+		 * Call rmi_process_interrupt_requests() after enabling irq,
-+		 * otherwise we may lose interrupt on edge-triggered systems.
-+		 */
-+		irq_flags = irq_get_trigger_type(pdata->irq);
-+		if (irq_flags & IRQ_TYPE_EDGE_BOTH)
-+			rmi_process_interrupt_requests(rmi_dev);
-+	} else {
-+		data->enabled = true;
-+	}
-
- out:
- 	mutex_unlock(&data->enabled_mutex);
-@@ -922,20 +936,22 @@ void rmi_disable_irq(struct rmi_device *rmi_dev, bool enable_wake)
- 		goto out;
-
- 	data->enabled = false;
--	disable_irq(irq);
--	if (enable_wake && device_may_wakeup(rmi_dev->xport->dev)) {
--		retval = enable_irq_wake(irq);
--		if (retval)
--			dev_warn(&rmi_dev->dev,
--				 "Failed to enable irq for wake: %d\n",
--				 retval);
--	}
--
--	/* make sure the fifo is clean */
--	while (!kfifo_is_empty(&data->attn_fifo)) {
--		count = kfifo_get(&data->attn_fifo, &attn_data);
--		if (count)
--			kfree(attn_data.data);
-+	if (irq) {
-+		disable_irq(irq);
-+		if (enable_wake && device_may_wakeup(rmi_dev->xport->dev)) {
-+			retval = enable_irq_wake(irq);
-+			if (retval)
-+				dev_warn(&rmi_dev->dev,
-+					 "Failed to enable irq for wake: %d\n",
-+					 retval);
-+		}
-+	} else {
-+		/* make sure the fifo is clean */
-+		while (!kfifo_is_empty(&data->attn_fifo)) {
-+			count = kfifo_get(&data->attn_fifo, &attn_data);
-+			if (count)
-+				kfree(attn_data.data);
-+		}
- 	}
-
- out:
-@@ -981,6 +997,8 @@ static int rmi_driver_remove(struct device *dev)
- 	irq_domain_remove(data->irqdomain);
- 	data->irqdomain = NULL;
-
-+	cancel_work_sync(&data->attn_work);
-+
- 	rmi_f34_remove_sysfs(rmi_dev);
- 	rmi_free_function_list(rmi_dev);
-
-@@ -1219,9 +1237,15 @@ static int rmi_driver_probe(struct device *dev)
- 		}
- 	}
-
--	retval = rmi_irq_init(rmi_dev);
--	if (retval < 0)
--		goto err_destroy_functions;
-+	if (pdata->irq) {
-+		retval = rmi_irq_init(rmi_dev);
-+		if (retval < 0)
-+			goto err_destroy_functions;
-+	}
-+
-+	data->enabled = true;
-+
-+	INIT_WORK(&data->attn_work, attn_callback);
-
- 	if (data->f01_container->dev.driver) {
- 		/* Driver already bound, so enable ATTN now. */
-diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
-index 857d4c2fd1a2..9353941f3a97 100644
---- a/drivers/iommu/iommu.c
-+++ b/drivers/iommu/iommu.c
-@@ -7,6 +7,7 @@
- #define pr_fmt(fmt)    "iommu: " fmt
-
- #include <linux/device.h>
-+#include <linux/dmi.h>
- #include <linux/dma-iommu.h>
- #include <linux/kernel.h>
- #include <linux/bits.h>
-@@ -2870,6 +2871,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle)
- }
- EXPORT_SYMBOL_GPL(iommu_sva_get_pasid);
-
-+#ifdef CONFIG_ARM64
-+static int __init iommu_quirks(void)
-+{
-+	const char *vendor, *name;
-+
-+	vendor = dmi_get_system_info(DMI_SYS_VENDOR);
-+	name = dmi_get_system_info(DMI_PRODUCT_NAME);
-+
-+	if (vendor &&
-+	    (strncmp(vendor, "GIGABYTE", 8) == 0 && name &&
-+	     (strncmp(name, "R120", 4) == 0 ||
-+	      strncmp(name, "R270", 4) == 0))) {
-+		pr_warn("Gigabyte %s detected, force iommu passthrough mode", name);
-+		iommu_def_domain_type = IOMMU_DOMAIN_IDENTITY;
-+	}
-+
-+	return 0;
-+}
-+arch_initcall(iommu_quirks);
-+#endif
-+
- /*
-  * Changes the default domain of an iommu group that has *only* one device
-  *
-diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index a58a69999dbc..bf2a917f12b4 100644
---- a/drivers/nvme/host/core.c
-+++ b/drivers/nvme/host/core.c
-@@ -240,6 +240,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
-
- static blk_status_t nvme_error_status(u16 status)
- {
-+	if (unlikely(status & NVME_SC_DNR))
-+		return BLK_STS_TARGET;
-+
- 	switch (status & 0x7ff) {
- 	case NVME_SC_SUCCESS:
- 		return BLK_STS_OK;
-@@ -330,6 +333,7 @@ enum nvme_disposition {
- 	COMPLETE,
- 	RETRY,
- 	FAILOVER,
-+	FAILUP,
- };
-
- static inline enum nvme_disposition nvme_decide_disposition(struct request *req)
-@@ -337,15 +341,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req)
- 	if (likely(nvme_req(req)->status == 0))
- 		return COMPLETE;
-
--	if (blk_noretry_request(req) ||
-+	if ((req->cmd_flags & (REQ_FAILFAST_DEV | REQ_FAILFAST_DRIVER)) ||
- 	    (nvme_req(req)->status & NVME_SC_DNR) ||
- 	    nvme_req(req)->retries >= nvme_max_retries)
- 		return COMPLETE;
-
--	if (req->cmd_flags & REQ_NVME_MPATH) {
-+	if (req->cmd_flags & (REQ_NVME_MPATH | REQ_FAILFAST_TRANSPORT)) {
- 		if (nvme_is_path_error(nvme_req(req)->status) ||
- 		    blk_queue_dying(req->q))
--			return FAILOVER;
-+			return (req->cmd_flags & REQ_NVME_MPATH) ?
-+				FAILOVER : FAILUP;
- 	} else {
- 		if (blk_queue_dying(req->q))
- 			return COMPLETE;
-@@ -373,6 +378,14 @@ static inline void nvme_end_req(struct request *req)
- 	blk_mq_end_request(req, status);
- }
-
-+static inline void nvme_failup_req(struct request *req)
-+{
-+	nvme_update_ana(req);
-+
-+	nvme_req(req)->status = NVME_SC_HOST_PATH_ERROR;
-+	nvme_end_req(req);
-+}
-+
- void nvme_complete_rq(struct request *req)
- {
- 	trace_nvme_complete_rq(req);
-@@ -391,6 +404,9 @@ void nvme_complete_rq(struct request *req)
- 	case FAILOVER:
- 		nvme_failover_req(req);
- 		return;
-+	case FAILUP:
-+		nvme_failup_req(req);
-+		return;
- 	}
- }
- EXPORT_SYMBOL_GPL(nvme_complete_rq);
-diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index b0fe23439c4a..65aa285034f7 100644
---- a/drivers/nvme/host/multipath.c
-+++ b/drivers/nvme/host/multipath.c
-@@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
- 			blk_freeze_queue_start(h->disk->queue);
- }
-
--void nvme_failover_req(struct request *req)
-+void nvme_update_ana(struct request *req)
- {
- 	struct nvme_ns *ns = req->q->queuedata;
- 	u16 status = nvme_req(req)->status & 0x7ff;
--	unsigned long flags;
--	struct bio *bio;
--
--	nvme_mpath_clear_current_path(ns);
-
- 	/*
- 	 * If we got back an ANA error, we know the controller is alive but not
-@@ -98,6 +94,16 @@ void nvme_failover_req(struct request *req)
- 		set_bit(NVME_NS_ANA_PENDING, &ns->flags);
- 		queue_work(nvme_wq, &ns->ctrl->ana_work);
- 	}
-+}
-+
-+void nvme_failover_req(struct request *req)
-+{
-+	struct nvme_ns *ns = req->q->queuedata;
-+	unsigned long flags;
-+	struct bio *bio;
-+
-+	nvme_mpath_clear_current_path(ns);
-+	nvme_update_ana(req);
-
- 	spin_lock_irqsave(&ns->head->requeue_lock, flags);
- 	for (bio = req->bio; bio; bio = bio->bi_next) {
-@@ -870,8 +876,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
- 	int error = 0;
-
- 	/* check if multipath is enabled and we have the capability */
--	if (!multipath || !ctrl->subsys ||
--	    !(ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA))
-+	if (!ctrl->subsys || !(ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA))
- 		return 0;
-
- 	if (!ctrl->max_namespaces ||
-diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index 337ae1e3ad25..727cc7fb542e 100644
---- a/drivers/nvme/host/nvme.h
-+++ b/drivers/nvme/host/nvme.h
-@@ -801,6 +801,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
- void nvme_mpath_start_freeze(struct nvme_subsystem *subsys);
- void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys);
- void nvme_failover_req(struct request *req);
-+void nvme_update_ana(struct request *req);
- void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl);
- int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head);
- void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id);
-@@ -837,6 +838,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl)
- static inline void nvme_failover_req(struct request *req)
- {
- }
-+static inline void nvme_update_ana(struct request *req)
-+{
-+}
- static inline void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl)
- {
- }
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 41aeaa235132..e8137d31cc93 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -4285,6 +4285,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084,
- 				quirk_bridge_cavm_thrx2_pcie_root);
-
-+/*
-+ * PCI BAR 5 is not setup correctly for the on-board AHCI controller
-+ * on Broadcom's Vulcan processor. Added a quirk to fix BAR 5 by
-+ * using BAR 4's resources which are populated correctly and NOT
-+ * actually used by the AHCI controller.
-+ */
-+static void quirk_fix_vulcan_ahci_bars(struct pci_dev *dev)
-+{
-+	struct resource *r =  &dev->resource[4];
-+
-+	if (!(r->flags & IORESOURCE_MEM) || (r->start == 0))
-+		return;
-+
-+	/* Set BAR5 resource to BAR4 */
-+	dev->resource[5] = *r;
-+
-+	/* Update BAR5 in pci config space */
-+	pci_write_config_dword(dev, PCI_BASE_ADDRESS_5, r->start);
-+
-+	/* Clear BAR4's resource */
-+	memset(r, 0, sizeof(*r));
-+}
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9027, quirk_fix_vulcan_ahci_bars);
-+
- /*
-  * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
-  * class code.  Fix it.
-diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 1460857026e0..7e1964891089 100644
---- a/drivers/usb/core/hub.c
-+++ b/drivers/usb/core/hub.c
-@@ -5688,6 +5688,13 @@ static void hub_event(struct work_struct *work)
- 			(u16) hub->change_bits[0],
- 			(u16) hub->event_bits[0]);
-
-+	/* Don't disconnect USB-SATA on TrimSlice */
-+	if (strcmp(dev_name(hdev->bus->controller), "tegra-ehci.0") == 0) {
-+		if ((hdev->state == 7) && (hub->change_bits[0] == 0) &&
-+				(hub->event_bits[0] == 0x2))
-+			hub->event_bits[0] = 0;
-+	}
-+
- 	/* Lock the device, then check to see if we were
- 	 * disconnected while waiting for the lock to succeed. */
- 	usb_lock_device(hdev);
-diff --git a/include/linux/efi.h b/include/linux/efi.h
-index cc6d2be2ffd5..418d814d2eb7 100644
---- a/include/linux/efi.h
-+++ b/include/linux/efi.h
-@@ -43,6 +43,8 @@
- #define EFI_ABORTED		(21 | (1UL << (BITS_PER_LONG-1)))
- #define EFI_SECURITY_VIOLATION	(26 | (1UL << (BITS_PER_LONG-1)))
-
-+#define EFI_IS_ERROR(x)		((x) & (1UL << (BITS_PER_LONG-1)))
-+
- typedef unsigned long efi_status_t;
- typedef u8 efi_bool_t;
- typedef u16 efi_char16_t;		/* UNICODE character */
-@@ -385,6 +387,7 @@ void efi_native_runtime_setup(void);
- #define EFI_LOAD_FILE_PROTOCOL_GUID		EFI_GUID(0x56ec3091, 0x954c, 0x11d2,  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
- #define EFI_LOAD_FILE2_PROTOCOL_GUID		EFI_GUID(0x4006c0c1, 0xfcb3, 0x403e,  0x99, 0x6d, 0x4a, 0x6c, 0x87, 0x24, 0xe0, 0x6d)
- #define EFI_RT_PROPERTIES_TABLE_GUID		EFI_GUID(0xeb66918a, 0x7eef, 0x402a,  0x84, 0x2e, 0x93, 0x1d, 0x21, 0xc3, 0x8a, 0xe9)
-+#define EFI_DXE_SERVICES_TABLE_GUID		EFI_GUID(0x05ad34ba, 0x6f02, 0x4214,  0x95, 0x2e, 0x4d, 0xa0, 0x39, 0x8e, 0x2b, 0xb9)
-
- #define EFI_IMAGE_SECURITY_DATABASE_GUID	EFI_GUID(0xd719b2cb, 0x3d3a, 0x4596,  0xa3, 0xbc, 0xda, 0xd0, 0x0e, 0x67, 0x65, 0x6f)
- #define EFI_SHIM_LOCK_GUID			EFI_GUID(0x605dab50, 0xe046, 0x4300,  0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23)
-@@ -437,6 +440,7 @@ typedef struct {
- } efi_config_table_type_t;
-
- #define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL)
-+#define EFI_DXE_SERVICES_TABLE_SIGNATURE ((u64)0x565245535f455844ULL)
-
- #define EFI_2_30_SYSTEM_TABLE_REVISION  ((2 << 16) | (30))
- #define EFI_2_20_SYSTEM_TABLE_REVISION  ((2 << 16) | (20))
-@@ -831,6 +835,14 @@ extern int __init efi_setup_pcdp_console(char *);
- #define EFI_MEM_ATTR		10	/* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */
- #define EFI_MEM_NO_SOFT_RESERVE	11	/* Is the kernel configured to ignore soft reservations? */
- #define EFI_PRESERVE_BS_REGIONS	12	/* Are EFI boot-services memory segments available? */
-+#define EFI_SECURE_BOOT		13	/* Are we in Secure Boot mode? */
-+
-+enum efi_secureboot_mode {
-+	efi_secureboot_mode_unset,
-+	efi_secureboot_mode_unknown,
-+	efi_secureboot_mode_disabled,
-+	efi_secureboot_mode_enabled,
-+};
-
- #ifdef CONFIG_EFI
- /*
-@@ -842,6 +854,8 @@ static inline bool efi_enabled(int feature)
- }
- extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
-
-+extern void __init efi_set_secure_boot(enum efi_secureboot_mode mode);
-+
- bool __pure __efi_soft_reserve_enabled(void);
-
- static inline bool __pure efi_soft_reserve_enabled(void)
-@@ -862,6 +876,8 @@ static inline bool efi_enabled(int feature)
- static inline void
- efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {}
-
-+static inline void efi_set_secure_boot(enum efi_secureboot_mode mode) {}
-+
- static inline bool efi_soft_reserve_enabled(void)
- {
- 	return false;
-@@ -874,6 +890,7 @@ static inline bool efi_rt_services_supported(unsigned int mask)
- #endif
-
- extern int efi_status_to_err(efi_status_t status);
-+extern const char *efi_status_to_str(efi_status_t status);
-
- /*
-  * Variable Attributes
-@@ -1126,13 +1143,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
- extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
- extern unsigned long efi_call_virt_save_flags(void);
-
--enum efi_secureboot_mode {
--	efi_secureboot_mode_unset,
--	efi_secureboot_mode_unknown,
--	efi_secureboot_mode_disabled,
--	efi_secureboot_mode_enabled,
--};
--
- static inline
- enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var)
- {
-diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
-index db924fe379c9..1169d78af2de 100644
---- a/include/linux/lsm_hook_defs.h
-+++ b/include/linux/lsm_hook_defs.h
-@@ -394,6 +394,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux)
- #endif /* CONFIG_BPF_SYSCALL */
-
- LSM_HOOK(int, 0, locked_down, enum lockdown_reason what)
-+LSM_HOOK(int, 0, lock_kernel_down, const char *where, enum lockdown_reason level)
-+
-
- #ifdef CONFIG_PERF_EVENTS
- LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type)
-diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
-index 419b5febc3ca..491323dfe4e0 100644
---- a/include/linux/lsm_hooks.h
-+++ b/include/linux/lsm_hooks.h
-@@ -1549,6 +1549,12 @@
-  *
-  *     @what: kernel feature being accessed
-  *
-+ * @lock_kernel_down
-+ * 	Put the kernel into lock-down mode.
-+ *
-+ * 	@where: Where the lock-down is originating from (e.g. command line option)
-+ * 	@level: The lock-down level (can only increase)
-+ *
-  * Security hooks for perf events
-  *
-  * @perf_event_open:
-diff --git a/include/linux/rmi.h b/include/linux/rmi.h
-index ab7eea01ab42..fff7c5f737fc 100644
---- a/include/linux/rmi.h
-+++ b/include/linux/rmi.h
-@@ -364,6 +364,7 @@ struct rmi_driver_data {
-
- 	struct rmi4_attn_data attn_data;
- 	DECLARE_KFIFO(attn_fifo, struct rmi4_attn_data, 16);
-+	struct work_struct attn_work;
- };
-
- int rmi_register_transport_device(struct rmi_transport_dev *xport);
-diff --git a/include/linux/security.h b/include/linux/security.h
-index 7fc4e9f49f54..6f0b0b2dc73d 100644
---- a/include/linux/security.h
-+++ b/include/linux/security.h
-@@ -473,6 +473,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
- int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen);
- int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen);
- int security_locked_down(enum lockdown_reason what);
-+int security_lock_kernel_down(const char *where, enum lockdown_reason level);
- #else /* CONFIG_SECURITY */
-
- static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data)
-@@ -1349,6 +1350,10 @@ static inline int security_locked_down(enum lockdown_reason what)
- {
- 	return 0;
- }
-+static inline int security_lock_kernel_down(const char *where, enum lockdown_reason level)
-+{
-+	return 0;
-+}
- #endif	/* CONFIG_SECURITY */
-
- #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
-diff --git a/init/Kconfig b/init/Kconfig
-index fa63cc019ebf..8643b5cef9f1 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1663,7 +1663,7 @@ config AIO
- 	  this option saves about 7k.
-
- config IO_URING
--	bool "Enable IO uring support" if EXPERT
-+	bool "Enable IO uring support"
- 	select IO_WQ
- 	default y
- 	help
-diff --git a/kernel/module_signing.c b/kernel/module_signing.c
-index 8723ae70ea1f..fb2d773498c2 100644
---- a/kernel/module_signing.c
-+++ b/kernel/module_signing.c
-@@ -38,8 +38,15 @@ int mod_verify_sig(const void *mod, struct load_info *info)
- 	modlen -= sig_len + sizeof(ms);
- 	info->len = modlen;
-
--	return verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len,
-+	ret = verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len,
- 				      VERIFY_USE_SECONDARY_KEYRING,
- 				      VERIFYING_MODULE_SIGNATURE,
- 				      NULL, NULL);
-+	if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) {
-+		ret = verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len,
-+				VERIFY_USE_PLATFORM_KEYRING,
-+				VERIFYING_MODULE_SIGNATURE,
-+				NULL, NULL);
-+	}
-+	return ret;
- }
-diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
-index 7cb956d3abb2..12df96177187 100644
---- a/net/bluetooth/hci_event.c
-+++ b/net/bluetooth/hci_event.c
-@@ -3997,6 +3997,26 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, void *data,
- 			break;
- 		}
- 	}
-+	if (i == ARRAY_SIZE(hci_cc_table)) {
-+		/* Unknown opcode, assume byte 0 contains the status, so
-+		 * that e.g. __hci_cmd_sync() properly returns errors
-+		 * for vendor specific commands send by HCI drivers.
-+		 *
-+		 * Note that the specification does not specify that
-+		 * byte 0 is the status:
-+		 *
-+		 * BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E
-+		 * page 2189:
-+		 *
-+		 * Return_Parameters:
-+		 * Size: Depends on command
-+		 *
-+		 * For now using byte 0 seems to work fine, but in the future
-+		 * this may need to be updated so that drivers using vendor
-+		 * commands can specify their own completion handler.
-+		 */
-+		*status = skb->data[0];
-+	}
-
- 	handle_cmd_cnt_and_timer(hdev, ev->ncmd);
-
-diff --git a/scripts/tags.sh b/scripts/tags.sh
-index 16d475b3e203..4e333f14b84e 100755
---- a/scripts/tags.sh
-+++ b/scripts/tags.sh
-@@ -16,6 +16,8 @@ fi
- ignore="$(echo "$RCS_FIND_IGNORE" | sed 's|\\||g' )"
- # tags and cscope files should also ignore MODVERSION *.mod.c files
- ignore="$ignore ( -name *.mod.c ) -prune -o"
-+# RHEL tags and cscope should also ignore redhat/rpm
-+ignore="$ignore ( -path redhat/rpm ) -prune -o"
-
- # Use make KBUILD_ABS_SRCTREE=1 {tags|cscope}
- # to force full paths for a non-O= build
-diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c
-index 093894a640dc..1c43a9462b4b 100644
---- a/security/integrity/platform_certs/load_uefi.c
-+++ b/security/integrity/platform_certs/load_uefi.c
-@@ -73,7 +73,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid,
- 		return NULL;
-
- 	if (*status != EFI_BUFFER_TOO_SMALL) {
--		pr_err("Couldn't get size: 0x%lx\n", *status);
-+		pr_err("Couldn't get size: %s (0x%lx)\n",
-+		       efi_status_to_str(*status), *status);
- 		return NULL;
- 	}
-
-@@ -84,7 +85,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid,
- 	*status = efi.get_variable(name, guid, NULL, &lsize, db);
- 	if (*status != EFI_SUCCESS) {
- 		kfree(db);
--		pr_err("Error reading db var: 0x%lx\n", *status);
-+		pr_err("Error reading db var: %s (0x%lx)\n",
-+		       efi_status_to_str(*status), *status);
- 		return NULL;
- 	}
-
-diff --git a/security/lockdown/Kconfig b/security/lockdown/Kconfig
-index e84ddf484010..d0501353a4b9 100644
---- a/security/lockdown/Kconfig
-+++ b/security/lockdown/Kconfig
-@@ -16,6 +16,19 @@ config SECURITY_LOCKDOWN_LSM_EARLY
- 	  subsystem is fully initialised. If enabled, lockdown will
- 	  unconditionally be called before any other LSMs.
-
-+config LOCK_DOWN_IN_EFI_SECURE_BOOT
-+	bool "Lock down the kernel in EFI Secure Boot mode"
-+	default n
-+	depends on EFI && SECURITY_LOCKDOWN_LSM_EARLY
-+	help
-+	  UEFI Secure Boot provides a mechanism for ensuring that the firmware
-+	  will only load signed bootloaders and kernels.  Secure boot mode may
-+	  be determined from EFI variables provided by the system firmware if
-+	  not indicated by the boot parameters.
-+
-+	  Enabling this option results in kernel lockdown being triggered if
-+	  EFI Secure Boot is set.
-+
- choice
- 	prompt "Kernel default lockdown mode"
- 	default LOCK_DOWN_KERNEL_FORCE_NONE
-diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c
-index 87cbdc64d272..18555cf18da7 100644
---- a/security/lockdown/lockdown.c
-+++ b/security/lockdown/lockdown.c
-@@ -73,6 +73,7 @@ static int lockdown_is_locked_down(enum lockdown_reason what)
-
- static struct security_hook_list lockdown_hooks[] __lsm_ro_after_init = {
- 	LSM_HOOK_INIT(locked_down, lockdown_is_locked_down),
-+	LSM_HOOK_INIT(lock_kernel_down, lock_kernel_down),
- };
-
- static int __init lockdown_lsm_init(void)
-diff --git a/security/security.c b/security/security.c
-index aaf6566deb9f..86926966c15d 100644
---- a/security/security.c
-+++ b/security/security.c
-@@ -2625,6 +2625,12 @@ int security_locked_down(enum lockdown_reason what)
- }
- EXPORT_SYMBOL(security_locked_down);
-
-+int security_lock_kernel_down(const char *where, enum lockdown_reason level)
-+{
-+	return call_int_hook(lock_kernel_down, 0, where, level);
-+}
-+EXPORT_SYMBOL(security_lock_kernel_down);
-+
- #ifdef CONFIG_PERF_EVENTS
- int security_perf_event_open(struct perf_event_attr *attr, int type)
- {