From nobody Fri Dec 19 00:34:43 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 E6CD413A3E9 for ; Mon, 20 May 2024 22:46:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716245203; cv=none; b=Ig+W4EtKUg+GWZXMpCpvXg/0FoDgftgz3m0g7oty1otxfzK54y4MIZGnUhZFG+0vfNoyHhu6mC9t/FCYab4scZjW7JZaE1sWDDK2MLYQqBQPWhsTj8GiKYNClEpS93aB/frPjoZwwQmlW8zukjkHKvuZJvnH+70onAvycH2tM5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716245203; c=relaxed/simple; bh=gCPJaBoIddAMPrycAKcstPhp40qC+YN7SQoPWeSGRBc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XQHQ1IRWToe9BhCpf7IbOcUyvlqtCFGSDy8li9wt8tUhqYLYwSPTJgvX0F3TUXWXl+LYyVouDCWwR7zXXhMwILeS49Np79xqhOYDGirzWMNBPuhgNxDI1zbTPgurRScF/6NR9S0oRvwGfbXAtZ7sz1Wdq3J9xj2hldhAKiggd7o= 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=V6o/XHv6; arc=none smtp.client-ip=192.198.163.18 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="V6o/XHv6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716245202; x=1747781202; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gCPJaBoIddAMPrycAKcstPhp40qC+YN7SQoPWeSGRBc=; b=V6o/XHv6/8iGpFR0QXktZHu9c21PfnGOfI+smT3g1Q0AliAj7o4AYtfv Mhv9zFphp5oNfa9hUojyXqQE80ZsX+693Y1fAfelLQq61WQsdHlurLnDs m/OQdVtxED7ygOct0+Dhtq33ajXOLKpD+0d5xBgvMLuhKnq5dhoVwrFym olgqgg2DVvpiVStP9y28YpSGzoTB4C+UYxxb2vQhnyZ4I5GXmEn+9FbQb wCeO0X60XuplH8i4OrOj01Ra8EhvYSTxlvqwprK9mPDLdKaFQ/FMtDov0 tDAvOKs5S1gub+sMjk0DdX8m0rLE3IxQYj8jeT4DA0dUb1Psh0xxYskJY A==; X-CSE-ConnectionGUID: weFrZSItRfSX2wj1cgV4Bw== X-CSE-MsgGUID: VVU6+xGDRD61Hskis5qmWQ== X-IronPort-AV: E=McAfee;i="6600,9927,11078"; a="12199645" X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="12199645" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 15:46:36 -0700 X-CSE-ConnectionGUID: Y+S+tpEZRcaK5LA1dWLKEg== X-CSE-MsgGUID: h1PduYHHRTeAZ9n4hCwW6Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="32593421" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 15:46:36 -0700 From: Tony Luck To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "H. Peter Anvin" , "Peter Zijlstra (Intel)" , Uros Bizjak , Rick Edgecombe , Arnd Bergmann , Tony Luck , Mateusz Guzik , Thomas Renninger , Andi Kleen , linux-kernel@vger.kernel.org, patches@lists.linux.dev, "Rafael J . Wysocki" Subject: [PATCH v6 13/49] powercap: intel_rapl: Switch to new Intel CPU model defines Date: Mon, 20 May 2024 15:45:44 -0700 Message-ID: <20240520224620.9480-14-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240520224620.9480-1-tony.luck@intel.com> References: <20240520224620.9480-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck Acked-by: Rafael J. Wysocki --- drivers/powercap/intel_rapl_msr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/powercap/intel_rapl_msr.c b/drivers/powercap/intel_rap= l_msr.c index 35cb152fa9aa..733a36f67fbc 100644 --- a/drivers/powercap/intel_rapl_msr.c +++ b/drivers/powercap/intel_rapl_msr.c @@ -139,14 +139,14 @@ static int rapl_msr_write_raw(int cpu, struct reg_act= ion *ra) =20 /* List of verified CPUs. */ static const struct x86_cpu_id pl4_support_ids[] =3D { - X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, NULL), - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, NULL), - X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, NULL), + X86_MATCH_VFM(INTEL_TIGERLAKE_L, NULL), + X86_MATCH_VFM(INTEL_ALDERLAKE, NULL), + X86_MATCH_VFM(INTEL_ALDERLAKE_L, NULL), + X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, NULL), + X86_MATCH_VFM(INTEL_RAPTORLAKE, NULL), + X86_MATCH_VFM(INTEL_RAPTORLAKE_P, NULL), + X86_MATCH_VFM(INTEL_METEORLAKE, NULL), + X86_MATCH_VFM(INTEL_METEORLAKE_L, NULL), {} }; =20 --=20 2.45.0