From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 880A017BB0F for ; Tue, 30 Apr 2024 16:51:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714495896; cv=none; b=FMYrXn9+tfua+iavQ+Awh8fl6a40WY7l4xG1ZWGmkSTeFn/RKwRZwwLKd4LuDR565p6PIlLRTAJ+CHpxo18u3DnuJP/YJsOlpN5EC/wWsAzDlvkw3qTc3eeivypUPPCm9gdVYzugiXlejgwLnjYmyP/AWPrQAPwTki3Go/jDOtM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714495896; c=relaxed/simple; bh=jo++POGDkJ0iaXLFXLmreRUhlhBEdY5sKB13LHFpdWE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LpY6pUI8GmyqZzxYaE079Fd1gXseasgprPObzyRU5//QAmSnkJywzwN98vDcnLGmSvVo/7KR4rQFElpQQWj9c5cJDRrH/STjB/krUQJvJESbsAQ7wdoiPCPTyeZG2PfGDmctnkhM5LxrQvwPJFAFRIkxfhjlN/av1f6fF4svQD0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=B14TJtJ0; arc=none smtp.client-ip=198.175.65.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="B14TJtJ0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714495895; x=1746031895; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jo++POGDkJ0iaXLFXLmreRUhlhBEdY5sKB13LHFpdWE=; b=B14TJtJ0EOrAk/OCECqn6qBLEHeG4itsW2CB4zE6kAkAgMJpyle/wGMA 7ykbue+K34WTmkdwV2kdO01lCkvRX8gzaHJpbmroPjSvx+N1yl898Jwsw +nrv3FvYd97dv5b/xqIgW/1iftxskFamGmxb5fF53lnQaBEBzZUg+ymRD /hQC3WuKXjDLYjv9pHfPaNlxSx+FTFw1sMCjs5ZLcBp1WIxB0d2gEJCTf bcokqql3yptdkNmZJNd5fwiykjDuqLujY/vkY8lrJXccXjbHL1QfpM+YI LdZM5/lwWDKUXtFtPs3hBLAQ3Cx847xDSCEtuq8Z0ZloJVvMZ9uZtRoGy A==; X-CSE-ConnectionGUID: FAfHIbm/QeO34m6cJxKF3g== X-CSE-MsgGUID: Vs7EejlGQJmN4jwecqN/7A== X-IronPort-AV: E=McAfee;i="6600,9927,11060"; a="10075605" X-IronPort-AV: E=Sophos;i="6.07,242,1708416000"; d="scan'208";a="10075605" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2024 09:51:20 -0700 X-CSE-ConnectionGUID: bFd93eraSY+BgwNbeuNM5w== X-CSE-MsgGUID: J4b7pbRsTfiOVnW5F48FJg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,242,1708416000"; d="scan'208";a="26515410" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2024 09:51:11 -0700 From: Tony Luck To: Borislav Petkov Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck , Jithu Joseph , Kuppuswamy Sathyanarayanan , Hans de Goede Subject: [PATCH v5 02/47] platform/x86/intel/ifs: Switch to new Intel CPU model defines Date: Tue, 30 Apr 2024 09:50:15 -0700 Message-ID: <20240430165100.73491-2-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430165100.73491-1-tony.luck@intel.com> References: <20240430164913.73473-1-tony.luck@intel.com> <20240430165100.73491-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck Reviewed-by: Jithu Joseph Reviewed-by: Kuppuswamy Sathyanarayanan Acked-by: Hans de Goede --- drivers/platform/x86/intel/ifs/core.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/intel/ifs/core.c b/drivers/platform/x86/intel/ifs/core.c index 7b11198d85a1..33412a584836 100644 --- a/drivers/platform/x86/intel/ifs/core.c +++ b/drivers/platform/x86/intel/ifs/core.c @@ -11,16 +11,15 @@ #include "ifs.h" -#define X86_MATCH(model, array_gen) \ - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, \ - INTEL_FAM6_##model, X86_FEATURE_CORE_CAPABILITIES, array_gen) +#define X86_MATCH(vfm, array_gen) \ + X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_CORE_CAPABILITIES, array_gen) static const struct x86_cpu_id ifs_cpu_ids[] __initconst = { - X86_MATCH(SAPPHIRERAPIDS_X, ARRAY_GEN0), - X86_MATCH(EMERALDRAPIDS_X, ARRAY_GEN0), - X86_MATCH(GRANITERAPIDS_X, ARRAY_GEN0), - X86_MATCH(GRANITERAPIDS_D, ARRAY_GEN0), - X86_MATCH(ATOM_CRESTMONT_X, ARRAY_GEN1), + X86_MATCH(INTEL_SAPPHIRERAPIDS_X, ARRAY_GEN0), + X86_MATCH(INTEL_EMERALDRAPIDS_X, ARRAY_GEN0), + X86_MATCH(INTEL_GRANITERAPIDS_X, ARRAY_GEN0), + X86_MATCH(INTEL_GRANITERAPIDS_D, ARRAY_GEN0), + X86_MATCH(INTEL_ATOM_CRESTMONT_X, ARRAY_GEN1), {} }; MODULE_DEVICE_TABLE(x86cpu, ifs_cpu_ids); -- 2.44.0