From: Tony Luck <tony.luck@intel.com>
To: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Hans de Goede" <hdegoede@redhat.com>
Cc: platform-driver-x86@vger.kernel.org, x86@kernel.org,
linux-kernel@vger.kernel.org, patches@lists.linux.dev,
Tony Luck <tony.luck@intel.com>
Subject: [PATCH 06/11] platform/x86: intel_ips: Switch to new Intel CPU model defines
Date: Fri, 31 May 2024 13:37:02 -0700 [thread overview]
Message-ID: <20240531203706.233365-7-tony.luck@intel.com> (raw)
In-Reply-To: <20240531203706.233365-1-tony.luck@intel.com>
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/platform/x86/intel_ips.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index 73ec4460a151..c62c3c4ec20a 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -62,6 +62,7 @@
#include <drm/i915_drm.h>
#include <asm/msr.h>
#include <asm/processor.h>
+#include <asm/cpu_device_id.h>
#include "intel_ips.h"
#include <linux/io-64-nonatomic-lo-hi.h>
@@ -1284,7 +1285,7 @@ static struct ips_mcp_limits *ips_detect_cpu(struct ips_driver *ips)
struct ips_mcp_limits *limits = NULL;
u16 tdp;
- if (!(boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 37)) {
+ if (!(boot_cpu_data.x86_vfm == INTEL_WESTMERE)) {
dev_info(ips->dev, "Non-IPS CPU detected.\n");
return NULL;
}
--
2.45.0
next prev parent reply other threads:[~2024-05-31 20:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-31 20:36 [PATCH 00/11] New Intel CPU model defines for x86/platform Tony Luck
2024-05-31 20:36 ` [PATCH 01/11] platform/x86/intel/pmc: Switch to new Intel CPU model defines Tony Luck
2024-05-31 20:36 ` [PATCH 02/11] platform/x86: intel_telemetry: " Tony Luck
2024-05-31 20:36 ` [PATCH 03/11] x86/platform/atom: " Tony Luck
2024-05-31 20:37 ` [PATCH 04/11] platform/x86: p2sb: " Tony Luck
2024-05-31 20:37 ` [PATCH 05/11] platform/x86: intel_turbo_max_3: " Tony Luck
2024-05-31 20:37 ` Tony Luck [this message]
2024-05-31 20:37 ` [PATCH 07/11] platform/x86: intel-uncore-freq: " Tony Luck
2024-05-31 20:37 ` [PATCH 08/11] platform/x86: intel_speed_select_if: " Tony Luck
2024-05-31 20:37 ` [PATCH 09/11] platform/x86: intel_scu_wdt: " Tony Luck
2024-06-03 6:51 ` [PATCH 00/11] New Intel CPU model defines for x86/platform Ilpo Järvinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240531203706.233365-7-tony.luck@intel.com \
--to=tony.luck@intel.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@lists.linux.dev \
--cc=platform-driver-x86@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox