lkml.org 
[lkml]   [2024]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [PATCH v3 42/74] x86/cpu/vfm: Update tpm files
    From
    On Wed Apr 17, 2024 at 12:22 AM EEST, Tony Luck wrote:
    > New CPU #defines encode vendor and family as well as model.
    >
    > Signed-off-by: Tony Luck <tony.luck@intel.com>
    > ---
    > drivers/char/tpm/tpm.h | 1 +
    > drivers/char/tpm/tpm_tis_core.h | 2 +-
    > 2 files changed, 2 insertions(+), 1 deletion(-)
    >
    > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
    > index 61445f1dc46d..895f2dba266c 100644
    > --- a/drivers/char/tpm/tpm.h
    > +++ b/drivers/char/tpm/tpm.h
    > @@ -28,6 +28,7 @@
    > #include <linux/tpm_eventlog.h>
    >
    > #ifdef CONFIG_X86
    > +#include <asm/cpu_device_id.h>
    > #include <asm/intel-family.h>
    > #endif
    >
    > diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h
    > index 13e99cf65efe..c940fd18988e 100644
    > --- a/drivers/char/tpm/tpm_tis_core.h
    > +++ b/drivers/char/tpm/tpm_tis_core.h
    > @@ -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)
    > {
    > #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
    > return false;
    > #endif

    Thanks!

    Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

    You want me to pick this?

    BR, Jarkko

    \
     
     \ /
      Last update: 2024-05-27 16:43    [W:6.205 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site