kernel 6.10.3

1 files changed, 0 insertions, 1775 deletions

diff --git a/SOURCES/patch-6.9-redhat.patch b/SOURCES/patch-6.9-redhat.patch
deleted file mode 100644
index d311b03..0000000
--- a/SOURCES/patch-6.9-redhat.patch
+++ /dev/null
@@ -1,1775 +0,0 @@
- Kconfig                                            |   2 +
- Kconfig.redhat                                     |  17 +++
- Makefile                                           |  12 ++
- arch/s390/include/asm/ipl.h                        |   1 +
- arch/s390/kernel/ipl.c                             |   5 +
- arch/s390/kernel/setup.c                           |   4 +
- arch/x86/kernel/setup.c                            |  22 ++-
- crypto/drbg.c                                      |  18 ++-
- crypto/rng.c                                       | 149 ++++++++++++++++++---
- 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/char/random.c                              | 122 +++++++++++++++++
- drivers/firmware/efi/Makefile                      |   1 +
- drivers/firmware/efi/efi.c                         | 124 ++++++++++++-----
- drivers/firmware/efi/secureboot.c                  |  38 ++++++
- drivers/hid/hid-rmi.c                              |  66 ---------
- drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 +++
- drivers/input/rmi4/rmi_driver.c                    | 124 ++++++++++-------
- drivers/iommu/iommu.c                              |  22 +++
- drivers/pci/quirks.c                               |  24 ++++
- drivers/scsi/sd.c                                  |  10 ++
- drivers/usb/core/hub.c                             |   7 +
- include/linux/crypto.h                             |   1 +
- include/linux/efi.h                                |  22 ++-
- include/linux/lsm_hook_defs.h                      |   2 +
- include/linux/random.h                             |  10 ++
- include/linux/rmi.h                                |   1 +
- include/linux/security.h                           |   5 +
- kernel/module/signing.c                            |   9 +-
- scripts/tags.sh                                    |   2 +
- security/integrity/platform_certs/load_uefi.c      |   6 +-
- security/lockdown/Kconfig                          |  13 ++
- security/lockdown/lockdown.c                       |   1 +
- security/security.c                                |  12 ++
- 38 files changed, 762 insertions(+), 192 deletions(-)
-
-diff --git a/Kconfig b/Kconfig
-index 745bc773f567..f57ff40109d7 100644
---- a/Kconfig
-+++ b/Kconfig
-@@ -30,3 +30,5 @@ source "lib/Kconfig"
- source "lib/Kconfig.debug"
- 
- source "Documentation/Kconfig"
-+
-+source "Kconfig.redhat"
-diff --git a/Kconfig.redhat b/Kconfig.redhat
-new file mode 100644
-index 000000000000..733a26bd887a
---- /dev/null
-+++ b/Kconfig.redhat
-@@ -0,0 +1,17 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+#
-+# Red Hat specific options
-+#
-+
-+menu "Red Hat options"
-+
-+config RH_DISABLE_DEPRECATED
-+	bool "Remove support for deprecated features"
-+	help
-+	  Red Hat may choose to deprecate certain features in its kernels.
-+	  Enable this option to remove support for hardware that is no
-+	  longer supported.
-+
-+	  Unless you want a restricted kernel, say N here.
-+
-+endmenu
-diff --git a/Makefile b/Makefile
-index d9243ad053f9..bc887a5bce4c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
- PHONY := __all
- __all:
- 
-+# Set RHEL variables
-+# Note that this ifdef'ery is required to handle when building with
-+# the O= mechanism (relocate the object file results) due to upstream
-+# commit 67d7c302 which broke our RHEL include file
-+ifneq ($(realpath source),)
-+include $(realpath source)/Makefile.rhelver
-+else
-+ifneq ($(realpath Makefile.rhelver),)
-+include Makefile.rhelver
-+endif
-+endif
-+
- # We are using a recursive build, so we need to do a little thinking
- # to get the ordering right.
- #
-diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
-index b0d00032479d..afb9544fb007 100644
---- a/arch/s390/include/asm/ipl.h
-+++ b/arch/s390/include/asm/ipl.h
-@@ -139,6 +139,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 469e8d3fbfbf..3ce742cd61c3 100644
---- a/arch/s390/kernel/ipl.c
-+++ b/arch/s390/kernel/ipl.c
-@@ -2519,3 +2519,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 7ecd27c62d56..cad68dfba646 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>
- 
-@@ -891,6 +892,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/kernel/setup.c b/arch/x86/kernel/setup.c
-index e125e059e2c4..9cfd28e580e0 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>
-@@ -901,6 +902,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
-+
- 	reserve_ibft_region();
- 	x86_init.resources.dmi_setup();
- 
-@@ -1063,19 +1071,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/crypto/drbg.c b/crypto/drbg.c
-index 3addce90930c..730b03de596a 100644
---- a/crypto/drbg.c
-+++ b/crypto/drbg.c
-@@ -1494,13 +1494,14 @@ static int drbg_generate(struct drbg_state *drbg,
-  * Wrapper around drbg_generate which can pull arbitrary long strings
-  * from the DRBG without hitting the maximum request limitation.
-  *
-- * Parameters: see drbg_generate
-+ * Parameters: see drbg_generate, except @reseed, which triggers reseeding
-  * Return codes: see drbg_generate -- if one drbg_generate request fails,
-  *		 the entire drbg_generate_long request fails
-  */
- static int drbg_generate_long(struct drbg_state *drbg,
- 			      unsigned char *buf, unsigned int buflen,
--			      struct drbg_string *addtl)
-+			      struct drbg_string *addtl,
-+			      bool reseed)
- {
- 	unsigned int len = 0;
- 	unsigned int slice = 0;
-@@ -1510,6 +1511,8 @@ static int drbg_generate_long(struct drbg_state *drbg,
- 		slice = ((buflen - len) / drbg_max_request_bytes(drbg));
- 		chunk = slice ? drbg_max_request_bytes(drbg) : (buflen - len);
- 		mutex_lock(&drbg->drbg_mutex);
-+		if (reseed)
-+			drbg->seeded = DRBG_SEED_STATE_UNSEEDED;
- 		err = drbg_generate(drbg, buf + len, chunk, addtl);
- 		mutex_unlock(&drbg->drbg_mutex);
- 		if (0 > err)
-@@ -1936,6 +1939,7 @@ static int drbg_kcapi_random(struct crypto_rng *tfm,
- 	struct drbg_state *drbg = crypto_rng_ctx(tfm);
- 	struct drbg_string *addtl = NULL;
- 	struct drbg_string string;
-+	int err;
- 
- 	if (slen) {
- 		/* linked list variable is now local to allow modification */
-@@ -1943,7 +1947,15 @@ static int drbg_kcapi_random(struct crypto_rng *tfm,
- 		addtl = &string;
- 	}
- 
--	return drbg_generate_long(drbg, dst, dlen, addtl);
-+	err = drbg_generate_long(drbg, dst, dlen, addtl,
-+				 (crypto_tfm_get_flags(crypto_rng_tfm(tfm)) &
-+				  CRYPTO_TFM_REQ_NEED_RESEED) ==
-+				 CRYPTO_TFM_REQ_NEED_RESEED);
-+
-+	crypto_tfm_clear_flags(crypto_rng_tfm(tfm),
-+			       CRYPTO_TFM_REQ_NEED_RESEED);
-+
-+	return err;
- }
- 
- /*
-diff --git a/crypto/rng.c b/crypto/rng.c
-index 279dffdebf59..d24dd37205cd 100644
---- a/crypto/rng.c
-+++ b/crypto/rng.c
-@@ -12,10 +12,13 @@
- #include <linux/atomic.h>
- #include <linux/cryptouser.h>
- #include <linux/err.h>
-+#include <linux/fips.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/mutex.h>
- #include <linux/random.h>
-+#include <linux/sched.h>
-+#include <linux/sched/signal.h>
- #include <linux/seq_file.h>
- #include <linux/slab.h>
- #include <linux/string.h>
-@@ -23,7 +26,9 @@
- 
- #include "internal.h"
- 
--static DEFINE_MUTEX(crypto_default_rng_lock);
-+static ____cacheline_aligned_in_smp DEFINE_MUTEX(crypto_reseed_rng_lock);
-+static struct crypto_rng *crypto_reseed_rng;
-+static ____cacheline_aligned_in_smp DEFINE_MUTEX(crypto_default_rng_lock);
- struct crypto_rng *crypto_default_rng;
- EXPORT_SYMBOL_GPL(crypto_default_rng);
- static int crypto_default_rng_refcnt;
-@@ -136,31 +141,37 @@ struct crypto_rng *crypto_alloc_rng(const char *alg_name, u32 type, u32 mask)
- }
- EXPORT_SYMBOL_GPL(crypto_alloc_rng);
- 
--int crypto_get_default_rng(void)
-+static int crypto_get_rng(struct crypto_rng **rngp)
- {
- 	struct crypto_rng *rng;
- 	int err;
- 
--	mutex_lock(&crypto_default_rng_lock);
--	if (!crypto_default_rng) {
-+	if (!*rngp) {
- 		rng = crypto_alloc_rng("stdrng", 0, 0);
- 		err = PTR_ERR(rng);
- 		if (IS_ERR(rng))
--			goto unlock;
-+			return err;
- 
- 		err = crypto_rng_reset(rng, NULL, crypto_rng_seedsize(rng));
- 		if (err) {
- 			crypto_free_rng(rng);
--			goto unlock;
-+			return err;
- 		}
- 
--		crypto_default_rng = rng;
-+		*rngp = rng;
- 	}
- 
--	crypto_default_rng_refcnt++;
--	err = 0;
-+	return 0;
-+}
-+
-+int crypto_get_default_rng(void)
-+{
-+	int err;
- 
--unlock:
-+	mutex_lock(&crypto_default_rng_lock);
-+	err = crypto_get_rng(&crypto_default_rng);
-+	if (!err)
-+		crypto_default_rng_refcnt++;
- 	mutex_unlock(&crypto_default_rng_lock);
- 
- 	return err;
-@@ -176,24 +187,33 @@ void crypto_put_default_rng(void)
- EXPORT_SYMBOL_GPL(crypto_put_default_rng);
- 
- #if defined(CONFIG_CRYPTO_RNG) || defined(CONFIG_CRYPTO_RNG_MODULE)
--int crypto_del_default_rng(void)
-+static int crypto_del_rng(struct crypto_rng **rngp, int *refcntp,
-+		      struct mutex *lock)
- {
- 	int err = -EBUSY;
- 
--	mutex_lock(&crypto_default_rng_lock);
--	if (crypto_default_rng_refcnt)
-+	mutex_lock(lock);
-+	if (refcntp && *refcntp)
- 		goto out;
- 
--	crypto_free_rng(crypto_default_rng);
--	crypto_default_rng = NULL;
-+	crypto_free_rng(*rngp);
-+	*rngp = NULL;
- 
- 	err = 0;
- 
- out:
--	mutex_unlock(&crypto_default_rng_lock);
-+	mutex_unlock(lock);
- 
- 	return err;
- }
-+
-+int crypto_del_default_rng(void)
-+{
-+	return crypto_del_rng(&crypto_default_rng, &crypto_default_rng_refcnt,
-+			      &crypto_default_rng_lock) ?:
-+	       crypto_del_rng(&crypto_reseed_rng, NULL,
-+			      &crypto_reseed_rng_lock);
-+}
- EXPORT_SYMBOL_GPL(crypto_del_default_rng);
- #endif
- 
-@@ -251,5 +271,102 @@ void crypto_unregister_rngs(struct rng_alg *algs, int count)
- }
- EXPORT_SYMBOL_GPL(crypto_unregister_rngs);
- 
-+static ssize_t crypto_devrandom_read_iter(struct iov_iter *iter, bool reseed)
-+{
-+	struct crypto_rng *rng;
-+	u8 tmp[256];
-+	ssize_t ret;
-+
-+	if (unlikely(!iov_iter_count(iter)))
-+		return 0;
-+
-+	if (reseed) {
-+		u32 flags = 0;
-+
-+		/* If reseeding is requested, acquire a lock on
-+		 * crypto_reseed_rng so it is not swapped out until
-+		 * the initial random bytes are generated.
-+		 *
-+		 * The algorithm implementation is also protected with
-+		 * a separate mutex (drbg->drbg_mutex) around the
-+		 * reseed-and-generate operation.
-+		 */
-+		mutex_lock(&crypto_reseed_rng_lock);
-+
-+		/* If crypto_default_rng is not set, it will be seeded
-+		 * at creation in __crypto_get_default_rng and thus no
-+		 * reseeding is needed.
-+		 */
-+		if (crypto_reseed_rng)
-+			flags |= CRYPTO_TFM_REQ_NEED_RESEED;
-+
-+		ret = crypto_get_rng(&crypto_reseed_rng);
-+		if (ret) {
-+			mutex_unlock(&crypto_reseed_rng_lock);
-+			return ret;
-+		}
-+
-+		rng = crypto_reseed_rng;
-+		crypto_tfm_set_flags(crypto_rng_tfm(rng), flags);
-+	} else {
-+		ret = crypto_get_default_rng();
-+		if (ret)
-+			return ret;
-+		rng = crypto_default_rng;
-+	}
-+
-+	for (;;) {
-+		size_t i, copied;
-+		int err;
-+
-+		i = min_t(size_t, iov_iter_count(iter), sizeof(tmp));
-+		err = crypto_rng_get_bytes(rng, tmp, i);
-+		if (err) {
-+			ret = err;
-+			break;
-+		}
-+
-+		copied = copy_to_iter(tmp, i, iter);
-+		ret += copied;
-+
-+		if (!iov_iter_count(iter))
-+			break;
-+
-+		if (need_resched()) {
-+			if (signal_pending(current))
-+				break;
-+			schedule();
-+		}
-+	}
-+
-+	if (reseed)
-+		mutex_unlock(&crypto_reseed_rng_lock);
-+	else
-+		crypto_put_default_rng();
-+	memzero_explicit(tmp, sizeof(tmp));
-+
-+	return ret;
-+}
-+
-+static const struct random_extrng crypto_devrandom_rng = {
-+	.extrng_read_iter = crypto_devrandom_read_iter,
-+	.owner = THIS_MODULE,
-+};
-+
-+static int __init crypto_rng_init(void)
-+{
-+	if (fips_enabled)
-+		random_register_extrng(&crypto_devrandom_rng);
-+	return 0;
-+}
-+
-+static void __exit crypto_rng_exit(void)
-+{
-+	random_unregister_extrng();
-+}
-+
-+late_initcall(crypto_rng_init);
-+module_exit(crypto_rng_exit);
-+
- MODULE_LICENSE("GPL");
- MODULE_DESCRIPTION("Random Number Generator");
-diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
-index 20d757687e3d..90a13f20f052 100644
---- a/drivers/acpi/apei/hest.c
-+++ b/drivers/acpi/apei/hest.c
-@@ -142,6 +142,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 1687483ff319..390b67f19181 100644
---- a/drivers/acpi/irq.c
-+++ b/drivers/acpi/irq.c
-@@ -143,6 +143,7 @@ struct acpi_irq_parse_one_ctx {
- 	unsigned int index;
- 	unsigned long *res_flags;
- 	struct irq_fwspec *fwspec;
-+	bool skip_producer_check;
- };
- 
- /**
-@@ -216,7 +217,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;
-@@ -252,8 +254,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_get_acpi_dev(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 d1464324de95..a3b2f99a2d78 100644
---- a/drivers/acpi/scan.c
-+++ b/drivers/acpi/scan.c
-@@ -1798,6 +1798,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 83431aae74d8..f2a9c0d644af 100644
---- a/drivers/ata/libahci.c
-+++ b/drivers/ata/libahci.c
-@@ -729,6 +729,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 b0eedc4595b3..a9024c1dd68a 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"
-@@ -5511,8 +5512,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/char/random.c b/drivers/char/random.c
-index 2597cb43f438..d860f4f6ba2c 100644
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -51,6 +51,7 @@
- #include <linux/completion.h>
- #include <linux/uuid.h>
- #include <linux/uaccess.h>
-+#include <linux/rcupdate.h>
- #include <linux/suspend.h>
- #include <linux/siphash.h>
- #include <linux/sched/isolation.h>
-@@ -309,6 +310,11 @@ static void crng_fast_key_erasure(u8 key[CHACHA_KEY_SIZE],
- 	memzero_explicit(first_block, sizeof(first_block));
- }
- 
-+/*
-+ * Hook for external RNG.
-+ */
-+static const struct random_extrng __rcu *extrng;
-+
- /*
-  * This function returns a ChaCha state that you may use for generating
-  * random data. It also returns up to 32 bytes on its own of random data
-@@ -739,6 +745,9 @@ static void __cold _credit_init_bits(size_t bits)
- }
- 
- 
-+static const struct file_operations extrng_random_fops;
-+static const struct file_operations extrng_urandom_fops;
-+
- /**********************************************************************
-  *
-  * Entropy collection routines.
-@@ -956,6 +965,19 @@ void __init add_bootloader_randomness(const void *buf, size_t len)
- 		credit_init_bits(len * 8);
- }
- 
-+void random_register_extrng(const struct random_extrng *rng)
-+{
-+	rcu_assign_pointer(extrng, rng);
-+}
-+EXPORT_SYMBOL_GPL(random_register_extrng);
-+
-+void random_unregister_extrng(void)
-+{
-+	RCU_INIT_POINTER(extrng, NULL);
-+	synchronize_rcu();
-+}
-+EXPORT_SYMBOL_GPL(random_unregister_extrng);
-+
- #if IS_ENABLED(CONFIG_VMGENID)
- static BLOCKING_NOTIFIER_HEAD(vmfork_chain);
- 
-@@ -1365,6 +1387,7 @@ SYSCALL_DEFINE3(getrandom, char __user *, ubuf, size_t, len, unsigned int, flags
- {
- 	struct iov_iter iter;
- 	int ret;
-+	const struct random_extrng *rng;
- 
- 	if (flags & ~(GRND_NONBLOCK | GRND_RANDOM | GRND_INSECURE))
- 		return -EINVAL;
-@@ -1376,6 +1399,21 @@ SYSCALL_DEFINE3(getrandom, char __user *, ubuf, size_t, len, unsigned int, flags
- 	if ((flags & (GRND_INSECURE | GRND_RANDOM)) == (GRND_INSECURE | GRND_RANDOM))
- 		return -EINVAL;
- 
-+	rcu_read_lock();
-+	rng = rcu_dereference(extrng);
-+	if (rng && !try_module_get(rng->owner))
-+		rng = NULL;
-+	rcu_read_unlock();
-+
-+	if (rng) {
-+		ret = import_ubuf(ITER_DEST, ubuf, len, &iter);
-+		if (unlikely(ret))
-+			return ret;
-+		ret = rng->extrng_read_iter(&iter, !!(flags & GRND_RANDOM));
-+		module_put(rng->owner);
-+		return ret;
-+	}
-+
- 	if (!crng_ready() && !(flags & GRND_INSECURE)) {
- 		if (flags & GRND_NONBLOCK)
- 			return -EAGAIN;
-@@ -1396,6 +1434,12 @@ static __poll_t random_poll(struct file *file, poll_table *wait)
- 	return crng_ready() ? EPOLLIN | EPOLLRDNORM : EPOLLOUT | EPOLLWRNORM;
- }
- 
-+static __poll_t extrng_poll(struct file *file, poll_table * wait)
-+{
-+	/* extrng pool is always full, always read, no writes */
-+	return EPOLLIN | EPOLLRDNORM;
-+}
-+
- static ssize_t write_pool_user(struct iov_iter *iter)
- {
- 	u8 block[BLAKE2S_BLOCK_SIZE];
-@@ -1536,7 +1580,58 @@ static int random_fasync(int fd, struct file *filp, int on)
- 	return fasync_helper(fd, filp, on, &fasync);
- }
- 
-+static int random_open(struct inode *inode, struct file *filp)
-+{
-+	const struct random_extrng *rng;
-+
-+	rcu_read_lock();
-+	rng = rcu_dereference(extrng);
-+	if (rng && !try_module_get(rng->owner))
-+		rng = NULL;
-+	rcu_read_unlock();
-+
-+	if (!rng)
-+		return 0;
-+
-+	filp->f_op = &extrng_random_fops;
-+	filp->private_data = rng->owner;
-+
-+	return 0;
-+}
-+
-+static int urandom_open(struct inode *inode, struct file *filp)
-+{
-+	const struct random_extrng *rng;
-+
-+	rcu_read_lock();
-+	rng = rcu_dereference(extrng);
-+	if (rng && !try_module_get(rng->owner))
-+		rng = NULL;
-+	rcu_read_unlock();
-+
-+	if (!rng)
-+		return 0;
-+
-+	filp->f_op = &extrng_urandom_fops;
-+	filp->private_data = rng->owner;
-+
-+	return 0;
-+}
-+
-+static int extrng_release(struct inode *inode, struct file *filp)
-+{
-+	module_put(filp->private_data);
-+	return 0;
-+}
-+
-+static ssize_t
-+extrng_read_iter(struct kiocb *kiocb, struct iov_iter *iter)
-+{
-+	return rcu_dereference_raw(extrng)->extrng_read_iter(iter, false);
-+}
-+
- const struct file_operations random_fops = {
-+	.open  = random_open,
- 	.read_iter = random_read_iter,
- 	.write_iter = random_write_iter,
- 	.poll = random_poll,
-@@ -1549,6 +1644,7 @@ const struct file_operations random_fops = {
- };
- 
- const struct file_operations urandom_fops = {
-+	.open  = urandom_open,
- 	.read_iter = urandom_read_iter,
- 	.write_iter = random_write_iter,
- 	.unlocked_ioctl = random_ioctl,
-@@ -1559,6 +1655,32 @@ const struct file_operations urandom_fops = {
- 	.splice_write = iter_file_splice_write,
- };
- 
-+static const struct file_operations extrng_random_fops = {
-+	.open  = random_open,
-+	.read_iter  = extrng_read_iter,
-+	.write_iter = random_write_iter,
-+	.poll  = extrng_poll,
-+	.unlocked_ioctl = random_ioctl,
-+	.compat_ioctl = compat_ptr_ioctl,
-+	.fasync = random_fasync,
-+	.llseek = noop_llseek,
-+	.release = extrng_release,
-+	.splice_read = copy_splice_read,
-+	.splice_write = iter_file_splice_write,
-+};
-+
-+static const struct file_operations extrng_urandom_fops = {
-+	.open  = urandom_open,
-+	.read_iter  = extrng_read_iter,
-+	.write_iter = random_write_iter,
-+	.unlocked_ioctl = random_ioctl,
-+	.compat_ioctl = compat_ptr_ioctl,
-+	.fasync = random_fasync,
-+	.llseek = noop_llseek,
-+	.release = extrng_release,
-+	.splice_read = copy_splice_read,
-+	.splice_write = iter_file_splice_write,
-+};
- 
- /********************************************************************
-  *
-diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
-index a2d0009560d0..4f3486e6a84b 100644
---- a/drivers/firmware/efi/Makefile
-+++ b/drivers/firmware/efi/Makefile
-@@ -25,6 +25,7 @@ subdir-$(CONFIG_EFI_STUB)		+= libstub
- 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 fdf07dd6f459..cfd2b58a3494 100644
---- a/drivers/firmware/efi/efi.c
-+++ b/drivers/firmware/efi/efi.c
-@@ -33,6 +33,7 @@
- #include <linux/memblock.h>
- #include <linux/security.h>
- #include <linux/notifier.h>
-+#include <linux/bsearch.h>
- 
- #include <asm/early_ioremap.h>
- 
-@@ -993,40 +994,101 @@ int efi_mem_type(unsigned long phys_addr)
- 	return -EINVAL;
- }
- 
-+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;
- }
- EXPORT_SYMBOL_GPL(efi_status_to_err);
- 
-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/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
-index d4af17fdba46..154f0403cbf4 100644
---- a/drivers/hid/hid-rmi.c
-+++ b/drivers/hid/hid-rmi.c
-@@ -321,21 +321,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;
- 
--	pm_wakeup_event(hdev->dev.parent, 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;
- }
- 
-@@ -589,56 +580,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;
-@@ -711,18 +652,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 a0bdfabddbc6..cd824ceebd0f 100644
---- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
-+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
-@@ -10,6 +10,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>
-@@ -2344,6 +2345,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 = {
-@@ -2413,6 +2424,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 */
-@@ -2439,6 +2455,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 ef9ea295f9e0..0103334e8f32 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:
-@@ -978,6 +994,8 @@ static int rmi_driver_remove(struct device *dev)
- 
- 	rmi_disable_irq(rmi_dev, false);
- 
-+	cancel_work_sync(&data->attn_work);
-+
- 	rmi_f34_remove_sysfs(rmi_dev);
- 	rmi_free_function_list(rmi_dev);
- 
-@@ -1223,9 +1241,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 659a77f7bb83..e8dc1fd50e21 100644
---- a/drivers/iommu/iommu.c
-+++ b/drivers/iommu/iommu.c
-@@ -8,6 +8,7 @@
- 
- #include <linux/amba/bus.h>
- #include <linux/device.h>
-+#include <linux/dmi.h>
- #include <linux/kernel.h>
- #include <linux/bits.h>
- #include <linux/bug.h>
-@@ -2913,6 +2914,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat)
- }
- EXPORT_SYMBOL_GPL(iommu_dev_disable_feature);
- 
-+#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
-+
- /**
-  * iommu_setup_default_domain - Set the default_domain for the group
-  * @group: Group to change
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index eff7f5df08e2..b58145ce7775 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -4433,6 +4433,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/scsi/sd.c b/drivers/scsi/sd.c
-index a4638ea92571..aff13cdce015 100644
---- a/drivers/scsi/sd.c
-+++ b/drivers/scsi/sd.c
-@@ -120,6 +120,14 @@ static const char *sd_cache_types[] = {
- 	"write back, no read (daft)"
- };
- 
-+static const char *sd_probe_types[] = { "async", "sync" };
-+
-+static char sd_probe_type[6] = "async";
-+module_param_string(probe, sd_probe_type, sizeof(sd_probe_type),
-+		    S_IRUGO|S_IWUSR);
-+MODULE_PARM_DESC(probe, "async or sync. Setting to 'sync' disables asynchronous "
-+		 "device number assignments (sda, sdb, ...).");
-+
- static void sd_set_flush_flag(struct scsi_disk *sdkp)
- {
- 	bool wc = false, fua = false;
-@@ -4262,6 +4270,8 @@ static int __init init_sd(void)
- 		goto err_out_class;
- 	}
- 
-+	if (!strcmp(sd_probe_type, "sync"))
-+		sd_template.gendrv.probe_type = PROBE_FORCE_SYNCHRONOUS;
- 	err = scsi_register_driver(&sd_template.gendrv);
- 	if (err)
- 		goto err_out_driver;
-diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 008053039875..f948a5c96006 100644
---- a/drivers/usb/core/hub.c
-+++ b/drivers/usb/core/hub.c
-@@ -5845,6 +5845,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/crypto.h b/include/linux/crypto.h
-index b164da5e129e..59021b8609a7 100644
---- a/include/linux/crypto.h
-+++ b/include/linux/crypto.h
-@@ -133,6 +133,7 @@
- #define CRYPTO_TFM_REQ_FORBID_WEAK_KEYS	0x00000100
- #define CRYPTO_TFM_REQ_MAY_SLEEP	0x00000200
- #define CRYPTO_TFM_REQ_MAY_BACKLOG	0x00000400
-+#define CRYPTO_TFM_REQ_NEED_RESEED	0x00000800
- 
- /*
-  * Miscellaneous stuff.
-diff --git a/include/linux/efi.h b/include/linux/efi.h
-index d59b0947fba0..8b1e2e71d485 100644
---- a/include/linux/efi.h
-+++ b/include/linux/efi.h
-@@ -45,6 +45,8 @@ struct screen_info;
- #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 */
-@@ -872,6 +874,14 @@ static inline int efi_range_is_wc(unsigned long start, unsigned long len)
- #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
- /*
-@@ -883,6 +893,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)
-@@ -904,6 +916,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;
-@@ -918,6 +932,7 @@ static inline void efi_find_mirror(void) {}
- #endif
- 
- extern int efi_status_to_err(efi_status_t status);
-+extern const char *efi_status_to_str(efi_status_t status);
- 
- /*
-  * Variable Attributes
-@@ -1134,13 +1149,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
- extern void efi_call_virt_check_flags(unsigned long flags, const void *caller);
- 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 7e539f6f8c67..3c3e56566457 100644
---- a/include/linux/lsm_hook_defs.h
-+++ b/include/linux/lsm_hook_defs.h
-@@ -436,6 +436,8 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap)
- #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/random.h b/include/linux/random.h
-index b0a940af4fff..8a52424fd0d5 100644
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -9,6 +9,13 @@
- 
- #include <uapi/linux/random.h>
- 
-+struct iov_iter;
-+
-+struct random_extrng {
-+	ssize_t (*extrng_read_iter)(struct iov_iter *iter, bool reseed);
-+	struct module *owner;
-+};
-+
- struct notifier_block;
- 
- void add_device_randomness(const void *buf, size_t len);
-@@ -157,6 +164,9 @@ int random_prepare_cpu(unsigned int cpu);
- int random_online_cpu(unsigned int cpu);
- #endif
- 
-+void random_register_extrng(const struct random_extrng *rng);
-+void random_unregister_extrng(void);
-+
- #ifndef MODULE
- extern const struct file_operations random_fops, urandom_fops;
- #endif
-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 5122e3ad83b1..b5f0081bc894 100644
---- a/include/linux/security.h
-+++ b/include/linux/security.h
-@@ -507,6 +507,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);
- int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, u32 *uctx_len,
- 		      void *val, size_t val_len, u64 id, u64 flags);
- #else /* CONFIG_SECURITY */
-@@ -1477,6 +1478,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;
-+}
- static inline int lsm_fill_user_ctx(struct lsm_ctx __user *uctx,
- 				    u32 *uctx_len, void *val, size_t val_len,
- 				    u64 id, u64 flags)
-diff --git a/kernel/module/signing.c b/kernel/module/signing.c
-index a2ff4242e623..f0d2be1ee4f1 100644
---- a/kernel/module/signing.c
-+++ b/kernel/module/signing.c
-@@ -61,10 +61,17 @@ 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;
- }
- 
- int module_sig_check(struct load_info *info, int flags)
-diff --git a/scripts/tags.sh b/scripts/tags.sh
-index 191e0461d6d5..e6f418b3e948 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"
- 
- # ignore arbitrary directories
- if [ -n "${IGNORE_DIRS}" ]; then
-diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c
-index d1fdd113450a..182e8090cfe8 100644
---- a/security/integrity/platform_certs/load_uefi.c
-+++ b/security/integrity/platform_certs/load_uefi.c
-@@ -74,7 +74,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;
- 	}
- 
-@@ -85,7 +86,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 cd84d8ea1dfb..e4c70a0312bc 100644
---- a/security/lockdown/lockdown.c
-+++ b/security/lockdown/lockdown.c
-@@ -74,6 +74,7 @@ static int lockdown_is_locked_down(enum lockdown_reason what)
- 
- static struct security_hook_list lockdown_hooks[] __ro_after_init = {
- 	LSM_HOOK_INIT(locked_down, lockdown_is_locked_down),
-+	LSM_HOOK_INIT(lock_kernel_down, lock_kernel_down),
- };
- 
- const struct lsm_id lockdown_lsmid = {
-diff --git a/security/security.c b/security/security.c
-index 4fd3c839353e..d52cb3bb720d 100644
---- a/security/security.c
-+++ b/security/security.c
-@@ -5569,6 +5569,18 @@ int security_locked_down(enum lockdown_reason what)
- }
- EXPORT_SYMBOL(security_locked_down);
- 
-+/**
-+ * security_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)
-+ */
-+int security_lock_kernel_down(const char *where, enum lockdown_reason level)
-+{
-+	return call_int_hook(lock_kernel_down, where, level);
-+}
-+EXPORT_SYMBOL(security_lock_kernel_down);
-+
- #ifdef CONFIG_PERF_EVENTS
- /**
-  * security_perf_event_open() - Check if a perf event open is allowed