kevin/linux
1
Fork 0
Code

tpm: Switch to new Intel CPU model defines

Browse Source 
New CPU #defines encode vendor and family as well as model.

Link: https://lore.kernel.org/all/20240520224620.9480-4-tony.luck@intel.com/
Signed-off-by: Tony Luck <tony.luck@intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
This commit is contained in:
Tony Luck 2024-06-05 01:28:42 +03:00 committed by Jarkko Sakkinen
parent 0ea00e249c
commit f071d02eca
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/tpm/tpm.h
View File

@ -28,7 +28,7 @@
#include <linux/tpm_eventlog.h> #include <linux/tpm_eventlog.h>
#ifdef CONFIG_X86 #ifdef CONFIG_X86
#include <asm/intel-family.h> #include <asm/cpu_device_id.h>
#endif #endif
#define TPM_MINOR 224 /* officially assigned */ #define TPM_MINOR 224 /* officially assigned */

2
drivers/char/tpm/tpm_tis_core.h
View File

@ -210,7 +210,7 @@ static inline int tpm_tis_verify_crc(struct tpm_tis_data *data, size_t len,
static inline bool is_bsw(void) static inline bool is_bsw(void)
{ {
#ifdef CONFIG_X86 #ifdef CONFIG_X86
return ((boot_cpu_data.x86_model == INTEL_FAM6_ATOM_AIRMONT) ? 1 : 0); return (boot_cpu_data.x86_vfm == INTEL_ATOM_AIRMONT) ? 1 : 0;
#else #else
return false; return false;
#endif #endif