Merge tag 'tpmdd-next-v5.10-rc4' of... (28ced768) · Commits · 戴 / test

drivers/char/tpm/eventlog/efi.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,11 @@ int tpm_read_log_efi(struct tpm_chip *chip)
		log_size = log_tbl->size;
		memunmap(log_tbl);

		if (!log_size) {
		pr_warn("UEFI TPM log area empty\n");
		return -EIO;
		}

		log_tbl = memremap(efi.tpm_log, sizeof(*log_tbl) + log_size,
		MEMREMAP_WB);
		if (!log_tbl) {

+27 −2

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#include <linux/of.h>
		#include <linux/of_device.h>
		#include <linux/kernel.h>
		#include <linux/dmi.h>
		#include "tpm.h"
		#include "tpm_tis_core.h"

		@@ -49,8 +50,8 @@ static inline struct tpm_tis_tcg_phy to_tpm_tis_tcg_phy(struct tpm_tis_data da
		return container_of(data, struct tpm_tis_tcg_phy, priv);
		}

		static bool interrupts = true;
		module_param(interrupts, bool, 0444);
		static int interrupts = -1;
		module_param(interrupts, int, 0444);
		MODULE_PARM_DESC(interrupts, "Enable interrupts");

		static bool itpm;
		@@ -63,6 +64,28 @@ module_param(force, bool, 0444);
		MODULE_PARM_DESC(force, "Force device probe rather than using ACPI entry");
		#endif

		static int tpm_tis_disable_irq(const struct dmi_system_id *d)
		{
		if (interrupts == -1) {
		pr_notice("tpm_tis: %s detected: disabling interrupts.\n", d->ident);
		interrupts = 0;
		}

		return 0;
		}

		static const struct dmi_system_id tpm_tis_dmi_table[] = {
		{
		.callback = tpm_tis_disable_irq,
		.ident = "ThinkPad T490s",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T490s"),
		},
		},
		{}
		};

		#if defined(CONFIG_PNP) && defined(CONFIG_ACPI)
		static int has_hid(struct acpi_device dev, const char hid)
		{
		@@ -192,6 +215,8 @@ static int tpm_tis_init(struct device dev, struct tpm_info tpm_info)
		int irq = -1;
		int rc;

		dmi_check_system(tpm_tis_dmi_table);

		rc = check_acpi_tpm2(dev);
		if (rc)
		return rc;