Received-SPF: pass (google.com: domain of linux-kernel+bounces-158526-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <eafd7f1dd4fd3c86ffd97cf7f5c8a0f1de87f214.camel@linux.intel.com>
Subject: Re: [PATCH v4 60/71] platform/x86: ISST: Switch to new Intel CPU
 model defines
From: srinivas pandruvada <srinivas.pandruvada@linux.intel.com>
To: Tony Luck <tony.luck@intel.com>, Borislav Petkov <bp@alien8.de>, Hans de
 Goede <hdegoede@redhat.com>, Ilpo =?ISO-8859-1?Q?J=E4rvinen?=
 <ilpo.jarvinen@linux.intel.com>
Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, 
	patches@lists.linux.dev
Date: Thu, 25 Apr 2024 05:32:51 -0700
In-Reply-To: <20240424181539.42311-1-tony.luck@intel.com>
References: <20240424181245.41141-1-tony.luck@intel.com>
	 <20240424181539.42311-1-tony.luck@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.4 (3.44.4-3.fc36) 
Precedence: bulk
MIME-Version: 1.0

On Wed, 2024-04-24 at 11:15 -0700, Tony Luck wrote:
> New CPU #defines encode vendor and family as well as model.
>=20
> Signed-off-by: Tony Luck <tony.luck@intel.com>

Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>

But we added new CPU model here, which is targeted for 6.10-rc1. So
there will be merge issues.

> ---
> =C2=A0drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 4 ++-=
-
> =C2=A01 file changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git
> a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
> b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
> index 08df9494603c..96f3b221b6c8 100644
> --- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
> +++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
> @@ -719,8 +719,8 @@ static struct miscdevice isst_if_char_driver =3D {
> =C2=A0};
> =C2=A0
> =C2=A0static const struct x86_cpu_id hpm_cpu_ids[] =3D {
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0X86_MATCH_INTEL_FAM6_MODEL(GRA=
NITERAPIDS_X,=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0NULL),
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0X86_MATCH_INTEL_FAM6_MODEL(ATO=
M_CRESTMONT_X,=C2=A0=C2=A0=C2=A0=C2=A0NULL),
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0X86_MATCH_VFM(INTEL_GRANITERAP=
IDS_X,=C2=A0=C2=A0=C2=A0=C2=A0NULL),
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0X86_MATCH_VFM(INTEL_ATOM_CREST=
MONT_X,=C2=A0=C2=A0=C2=A0NULL),
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0{}
> =C2=A0};
> =C2=A0