aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Luck <[email protected]>2024-05-31 13:37:02 -0700
committerIlpo Järvinen <[email protected]>2024-06-03 09:49:07 +0300
commit12929ac3ef8d24f8931020135786e0b8a773e7c9 (patch)
tree4f2f030d753eb3a5086d628f9e6f043b3ea3d999
parent70a4fa3f4fc14599aae7af22d649420ab0ac7d23 (diff)
platform/x86: intel_ips: Switch to new Intel CPU model defines
New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck <[email protected]> Acked-by: Hans de Goede <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Ilpo Järvinen <[email protected]> Signed-off-by: Ilpo Järvinen <[email protected]>
-rw-r--r--drivers/platform/x86/intel_ips.c3
1 files changed, 2 insertions, 1 deletions
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;
}