From patchwork Wed Apr 24 18:14:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 791836 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 A042116DEAC; Wed, 24 Apr 2024 18:15:07 +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=1713982510; cv=none; b=iNiwGMwUnN3M0r1ewbggvULA4eyRfXH3LaSlBO3oAWPj8v1MMmPSIZZM8s8PI8hiUW+lrVr1z0pGuSP7YDmHLMtAwN+SHQnOAL7Fea2EyoYMGxdmFAcXrIiVYP2fJI6bwM1sgRAWuqade7gqbR0K3yvaluzs5o+sK/3s2oZYyk8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982510; c=relaxed/simple; bh=ljYYX+5RyEwARkxEi545qAS3MvJiGaPOJYML2NIcM9A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cw+AVIIWywFTryqoV5eBh3gtZgOaoy4MTILZX3j936ljjlRM5zc3VVy3DPfRhdT1y1A1Rtc9z6cnIeL7Ul0XUVSiS8Abbth3peRFDwEgbnRj2wluSKsFB7bQZyKqX/BvZs/cTzyTjle9+CB2ikCLSRsgQpCATrg84YXSYwwaRlg= 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=fpoyioJh; 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="fpoyioJh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982507; x=1745518507; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ljYYX+5RyEwARkxEi545qAS3MvJiGaPOJYML2NIcM9A=; b=fpoyioJhrKOM5jIcC0n0uGrhfkmgX01UQxsmEZ5XNxkJHQ9Tz/WctCuz WxTbxiqhanm4LPrAoDFNU8kF2QCzO+T8dschBGFWJ6wKNF++FM4FcnpTG xlbl9l8BD0gaR+h42PEqhxwVncNqrs0S4jZJawyzQdtx4tx4R68ST+LhP O1FLj5HA5e3b1PJOwB2fUMRpaFRk1ns+nW1GwEA+s6kWwAzweMSi57vVH EnO2G5gRhyTp3Xo8DiT6MdghNfKTIM0aO9F3TofxWkttK05Uri8UY5h5T SUg7SNLTx0SjcdG6iYPtgaaYo+kwgfre01TVpwxsCkG7BYdE7ztcqKh1W g==; X-CSE-ConnectionGUID: hRHXFlvWRUawSNqxmd+Rvg== X-CSE-MsgGUID: 61Qtk9lwTOeUMStgeJOJDg== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9481797" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9481797" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:14:54 -0700 X-CSE-ConnectionGUID: wIyDnPmwTt2Z7zyczF/3LQ== X-CSE-MsgGUID: OvHxs7oUSmyRwoiBU4H5Yg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="29262591" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:14:54 -0700 From: Tony Luck To: Borislav Petkov , linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , linux-pm@vger.kernel.org, patches@lists.linux.dev, Tony Luck , "Rafael J . Wysocki" Subject: [PATCH v4 12/71] powercap: intel_rapl: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:14:53 -0700 Message-ID: <20240424181453.41384-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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), {} };