Received-SPF: pass (google.com: domain of linux-kernel+bounces-158006-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Precedence: bulk
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Thu, 25 Apr 2024 07:50:05 +0300
Message-Id: <D0SXLFYAGQVS.1HPM5FELWRYRT@kernel.org>
Cc: "Jason Gunthorpe" <jgg@ziepe.ca>, <linux-integrity@vger.kernel.org>,
 <linux-kernel@vger.kernel.org>, <patches@lists.linux.dev>
Subject: Re: [PATCH v4 01/71] tpm: Switch to new Intel CPU model defines
From: "Jarkko Sakkinen" <jarkko@kernel.org>
To: "Jarkko Sakkinen" <jarkko@kernel.org>, "Tony Luck"
 <tony.luck@intel.com>, "Borislav Petkov" <bp@alien8.de>, "Peter Huewe"
 <peterhuewe@gmx.de>
References: <20240424181245.41141-1-tony.luck@intel.com>
 <20240424181444.41174-1-tony.luck@intel.com>
 <D0SXK2EUPF4G.M74BAD7ZDET9@kernel.org>
In-Reply-To: <D0SXK2EUPF4G.M74BAD7ZDET9@kernel.org>

On Thu Apr 25, 2024 at 7:48 AM EEST, Jarkko Sakkinen wrote:
> On Wed Apr 24, 2024 at 9:14 PM EEST, Tony Luck wrote:
> > New CPU #defines encode vendor and family as well as model.
> >
> > Signed-off-by: Tony Luck <tony.luck@intel.com>
> > Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
> > ---
> >  drivers/char/tpm/tpm.h          | 2 +-
> >  drivers/char/tpm/tpm_tis_core.h | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> > index 61445f1dc46d..7b38ce007bdc 100644
> > --- a/drivers/char/tpm/tpm.h
> > +++ b/drivers/char/tpm/tpm.h
> > @@ -28,7 +28,7 @@
> >  #include <linux/tpm_eventlog.h>
> > =20
> >  #ifdef CONFIG_X86
> > -#include <asm/intel-family.h>
> > +#include <asm/cpu_device_id.h>
> >  #endif
> > =20
> >  #define TPM_MINOR		224	/* officially assigned */
> > 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 =3D=3D INTEL_FAM6_ATOM_AIRMONT) ? 1 =
: 0);
> > +	return ((boot_cpu_data.x86_vfm =3D=3D INTEL_ATOM_AIRMONT) ? 1 : 0);

Umh I guess one could complain about extra parentheses ;-)

Not sure if I care, if no other updates needed, probably don't.

> >  #else
> >  	return false;
> >  #endif
>
> +1
>
> BR, Jarkko

BR, Jarkko