From patchwork Wed Jan 4 14:36:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 639185 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 964F5C4332F for ; Wed, 4 Jan 2023 14:29:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231418AbjADO3P (ORCPT ); Wed, 4 Jan 2023 09:29:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233142AbjADO3J (ORCPT ); Wed, 4 Jan 2023 09:29:09 -0500 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68BFE1743A; Wed, 4 Jan 2023 06:29:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672842548; x=1704378548; h=from:to:cc:subject:date:message-id; bh=LjoN4gPM2Xqx189nas75Dz8thY4msPK/MRpkF+8Sm0w=; b=EroMluxrM0S4a6LWbRiVdkBK/rnVocJG5BTDc+SQKTFH3ydf3YnNmU20 wdu7RfEE1r+oSC8fQ96mYFYqzQ6R4bCWZ3D1Zc218sDa5R85BNIZT2gJK i6OwiSqAFc+XYCRLdurBTASHCWd9+YZ9aFkSHaJtVMMd4lIf8gCfz33L/ dj++vSwwC7KnqyfOt/RJkbdMm707oisxeP5J5IZJj0X7AxDjZlgdlKr4I VwH8KwxGSIjyj5lluHSz4s1/IFbxxaD8AtSvDrmasKkOsRFAXsNQ8I2hE +O8Nky3Dxrk/2f1CHMbQs4qWJ+B/f0kHA70BYrqME1KdQ3L7KLkct0eii w==; X-IronPort-AV: E=McAfee;i="6500,9779,10580"; a="319652435" X-IronPort-AV: E=Sophos;i="5.96,300,1665471600"; d="scan'208";a="319652435" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2023 06:29:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10580"; a="762684935" X-IronPort-AV: E=Sophos;i="5.96,300,1665471600"; d="scan'208";a="762684935" Received: from power-sh.sh.intel.com ([10.239.183.7]) by fmsmga002.fm.intel.com with ESMTP; 04 Jan 2023 06:29:06 -0800 From: Zhang Rui To: linux-pm@vger.kernel.org, rafael.j.wysocki@intel.com, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 1/2] powercap: intel_rapl: add support for METEORLAKE Date: Wed, 4 Jan 2023 22:36:01 +0800 Message-Id: <20230104143602.23792-1-rui.zhang@intel.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Add METEORLAKE to the list of supported processor models in the Intel RAPL power capping driver. Signed-off-by: Zhang Rui --- drivers/powercap/intel_rapl_common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index 26d00b1853b4..ca6ff27b4384 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1113,6 +1113,8 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &rapl_defaults_core), + X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, &rapl_defaults_core), + X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server), X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_defaults_core), From patchwork Wed Jan 4 14:36:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 639958 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90ECBC46467 for ; Wed, 4 Jan 2023 14:29:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234103AbjADO3Q (ORCPT ); Wed, 4 Jan 2023 09:29:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230225AbjADO3K (ORCPT ); Wed, 4 Jan 2023 09:29:10 -0500 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE9A712AE1; Wed, 4 Jan 2023 06:29:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672842549; x=1704378549; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=hdFrVFJWV/kkaBDSXJkUe7wBua0nhiEPIaDdE0DhSK0=; b=R3vH3BinS88mzJTjI4cvFQfB+FVVJEoSWjIyYjn1PBmB+vmwCmqj68mA RMiSjbrPcbB2pH2ctoiuL90e23hfd7jSCAOzd5dQ1PG8aeYW0Hid7umfd W8HfqNXvYouYrZXYLyN09wnn5Def3tRks9f35quccNJWBBrurG++PwtcM 84lW9PmnFEAIHpDUS0TMntm/luUzhf8zCyT+5v+ADwmEbBab8d4hG2tgq WmAsqrYiU1B6+Ze9VLVo5nwRnXiZDAJrhI8+DOuW2vBWXr3qLh6uADZhO a1tgN9sCNAIcZQ+Y2+tks9UZ2DL+SGX1rimCwedIhYcJPLWHXF68A6wYn w==; X-IronPort-AV: E=McAfee;i="6500,9779,10580"; a="319652440" X-IronPort-AV: E=Sophos;i="5.96,300,1665471600"; d="scan'208";a="319652440" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2023 06:29:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10580"; a="762684939" X-IronPort-AV: E=Sophos;i="5.96,300,1665471600"; d="scan'208";a="762684939" Received: from power-sh.sh.intel.com ([10.239.183.7]) by fmsmga002.fm.intel.com with ESMTP; 04 Jan 2023 06:29:08 -0800 From: Zhang Rui To: linux-pm@vger.kernel.org, rafael.j.wysocki@intel.com, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/2] powercap: intel_rapl: add support for EMERALDRAPIDS Date: Wed, 4 Jan 2023 22:36:02 +0800 Message-Id: <20230104143602.23792-2-rui.zhang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230104143602.23792-1-rui.zhang@intel.com> References: <20230104143602.23792-1-rui.zhang@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Add EMERALDRAPIDS to the list of supported processor models in the Intel RAPL power capping driver. Signed-off-by: Zhang Rui --- drivers/powercap/intel_rapl_common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index ca6ff27b4384..9a9192fc8391 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1116,6 +1116,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server), + X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, &rapl_defaults_spr_server), X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &rapl_defaults_byt),