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 6A9C217F390 for ; Tue, 30 Apr 2024 16:51:35 +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=1714495897; cv=none; b=e6w9q7iojl2vmIzm/5p1OZtIDkBwg7lDfftUqWXFFSCqQ8KAHUnXDtEvHTzgwDbpW6mD5vBOWUW4OA9eghKJ2xo+9erLBS4o8T+RrZktsbfGJ/4CxWgWAs0hs5aLK3lFJ35sj8KFx2vQKdBbR8lgZmzC9+1mH2Ppu/Dd042tClw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714495897; c=relaxed/simple; bh=ljYYX+5RyEwARkxEi545qAS3MvJiGaPOJYML2NIcM9A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EO1zNikuaFFCW8XXPYWyI0PHq+++549n3N2oJ71FlfQDvkREpIxma0Nf9KAAn4yGirxwjdnAm0MgFR0XYl76uhwOJnuzdhpe78MkExmNA3QuoblaT+zawCpATOHyvwbvkNRIAG2j8IJ/x2nzvMl68JTzj2gzGTwXEg0JpzOGkWU= 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=CNRh5kt7; 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="CNRh5kt7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714495896; x=1746031896; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ljYYX+5RyEwARkxEi545qAS3MvJiGaPOJYML2NIcM9A=; b=CNRh5kt73jACdY1IFlMUIBHWJ9ESEG2GKn9vOcs8o3ZBMf0ZMRQvUviY g/kkoct5XRMsred8DcZmeMpEmjmhClBmzDBClODAg1ljB2Vz8HzKne+4E L5ZgcltDDKFiItsXmN4CDmlZChd/wQTkXByhFKPfIhzSLDasY+sh8kCUd gQpC0rhoaPgQ3mSX6WuwJQGt8LbkLarahI9zx0WvPvLyryasxLJuDOqsN Nyj21gW0789/WI7yONy8HFkPgoON/6g78tdxRqS071aU4QEDCrlXutnEQ NRsC6uhANqv/zCH3mZjEAt1b/axYGFiz5nBW4JmZZWJceocRjvpBc4fdX g==; X-CSE-ConnectionGUID: Au0kJXyTTr2AAKXxIIXcnA== X-CSE-MsgGUID: UnV01ADmTUKDXHll+Nb4dg== X-IronPort-AV: E=McAfee;i="6600,9927,11060"; a="10075640" X-IronPort-AV: E=Sophos;i="6.07,242,1708416000"; d="scan'208";a="10075640" 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:21 -0700 X-CSE-ConnectionGUID: 8beofqT0SWaetbc58QqkhA== X-CSE-MsgGUID: Zn8NZumORj6cclvgyIhn4Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,242,1708416000"; d="scan'208";a="26515430" 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:12 -0700 From: Tony Luck To: Borislav Petkov Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck , "Rafael J . Wysocki" Subject: [PATCH v5 11/47] powercap: intel_rapl: Switch to new Intel CPU model defines Date: Tue, 30 Apr 2024 09:50:24 -0700 Message-ID: <20240430165100.73491-11-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: linux-kernel@vger.kernel.org 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 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_rapl_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_action *ra) /* List of verified CPUs. */ static const struct x86_cpu_id pl4_support_ids[] = { - 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), {} }; -- 2.44.0