tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'tpmdd-next-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

Pull tpm fixes from Jarkko Sakkinen:
"The bug fix for tpm_tis_core_init() is not that critical but still
makes sense to get into release for the sake of better quality.

I included the Intel CPU model define change mainly to help Tony just
a bit, as for this subsystem it cannot realistically speaking cause
any possible harm"

* tag 'tpmdd-next-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
tpm: Switch to new Intel CPU model defines
tpm_tis: Do *not* flush uninitialized work

Linus Torvalds 208d9b65 71d7b52c

+4 -3
+1 -1
drivers/char/tpm/tpm.h
··· 28 28 #include <linux/tpm_eventlog.h> 29 29 30 30 #ifdef CONFIG_X86 31 - #include <asm/intel-family.h> 31 + #include <asm/cpu_device_id.h> 32 32 #endif 33 33 34 34 #define TPM_MINOR 224 /* officially assigned */
+2 -1
drivers/char/tpm/tpm_tis_core.c
··· 1020 1020 interrupt = 0; 1021 1021 1022 1022 tpm_tis_write32(priv, reg, ~TPM_GLOBAL_INT_ENABLE & interrupt); 1023 - flush_work(&priv->free_irq_work); 1023 + if (priv->free_irq_work.func) 1024 + flush_work(&priv->free_irq_work); 1024 1025 1025 1026 tpm_tis_clkrun_enable(chip, false); 1026 1027
+1 -1
drivers/char/tpm/tpm_tis_core.h
··· 210 210 static inline bool is_bsw(void) 211 211 { 212 212 #ifdef CONFIG_X86 213 - return ((boot_cpu_data.x86_model == INTEL_FAM6_ATOM_AIRMONT) ? 1 : 0); 213 + return (boot_cpu_data.x86_vfm == INTEL_ATOM_AIRMONT) ? 1 : 0; 214 214 #else 215 215 return false; 216 216 #endif