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: 38953 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5171654wrt; Wed, 4 Jan 2023 06:29:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXsGtPaDS6YwyFN9U9diU5F6+op1GzzO5CC9E7BaVJbLj7ekEdbmHa70GPePkUc2J6Xvs2LH X-Received: by 2002:a17:907:d68b:b0:7c1:691a:6d2c with SMTP id wf11-20020a170907d68b00b007c1691a6d2cmr55597016ejc.7.1672842593256; Wed, 04 Jan 2023 06:29:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672842593; cv=none; d=google.com; s=arc-20160816; b=qTI9gVr4L9EVG7aUzEi0lsVZ+lkbHNlFzQj7M76N1y6LqM7/Wn+CLN64V6r00pf63b NGbR3oW6mo4E/bAmXMupl6nu/Xio0c1z0LXO0/JBfdZGVAqNDBOL2QmJ00CT6pZVD9g4 06meOIo2XkCoFHwWkVW4Ua4RPEy79mJNfvqDGCymxraJA1og+UUC+TjOGUWoJd9hvwdH 4Uz3pk/Uvjd4zECOAHw+6Cqs30Iju9aFxdaEdcIe2GgNeBYektChQCtSx1sMfxQLtpGN BMPHPGkpQZ52n4gnzfaA+J3uFboZ9f8lwol5Y8Z/7hqFwcXfK9hDUvnssYQBFwNe+/rE R3/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=BUHalicmNsefJaYaR2cclMSfP9Eb2XzO5PwN9/sRiBY=; b=usITkgHzc0Qkv8OnOQtGgtOnY9TQtsERNiJe0DNX9Uug4sRmmwp2QAgt0k6NcWIJYs hML3IBOy/OOtKUF0yNgl3EG2SwnuFQeVpFU0DtHwl/Ppc/57yI0lzMIUaPTfQf6lm9hb xz5DjgdXOHR424mkrpCh/7ftCeh5f2PCpjgHAG0L9M1YiSjJr8uh3DUYWGPfvTPeUIYc IDcRxBg6x5+dtsphktmySwJIvkEK5+wKmqRksImMNgUNalFLN6lM4t4e1N6QyIc8l2E7 Rs6DQFbjlCMXy3/5YKwKlwGEnKNVYvRiGfzw6kcrzioEEqmY07gEDnPKSVcMBfc5ojwY 3kYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EroMluxr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id wz2-20020a170906fe4200b007adb868f102si1872655ejb.476.2023.01.04.06.29.29; Wed, 04 Jan 2023 06:29:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EroMluxr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234719AbjADO3S (ORCPT + 99 others); Wed, 4 Jan 2023 09:29:18 -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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754102594891399259?= X-GMAIL-MSGID: =?utf-8?q?1754102594891399259?= 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: 38954 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5172161wrt; Wed, 4 Jan 2023 06:30:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXvqEo8atJye7ZZr0+tIYP4xbkLxC3C/143gY75b8HUHVL6JlE/HgQqT66vwDcBB122Fsv80 X-Received: by 2002:a17:906:185b:b0:841:e5b3:c95d with SMTP id w27-20020a170906185b00b00841e5b3c95dmr44461235eje.30.1672842644299; Wed, 04 Jan 2023 06:30:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672842644; cv=none; d=google.com; s=arc-20160816; b=LMbv2RSRGVIwzr3MBDnQrsQP4HfZPRa4hCC6LDzM/28ywA5qvWDk5xI1lT+jRxehvj PGrkgZyrmO0bvHzD+n8+DU/xd3Il9VrVyznj5FSZuaBvir3EeqQXgtETowqj+mPMjyBb Z71uJZAEsbZDpfDnEakwa+dClSwpp40X/7uFQa5KHDFj8Qb8yg/uWDaSHDWU3OY+mQjy JWGVa6TYWaASHO7lSsMiwPgNNEcsQXbCm0xw1gEnbxk+dB3hzYwWsE4GfyN0hsa0FHFr 9O1YchScsQoWBM25v/OZTFGrVsQMMQADqZz2LfQcBkuVyKMNHo97WSEzrEPUje77Q18w NLxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=kQufSc5z7w5IGRB740vxfqIdRclF4fLn0tPMsIP1cJU=; b=VLrVV6tMmiB4LN7YNS+mR9+LHq2/ZI77xffxMNoMlmHCMKbaY6K4RAOo2Wzl4YskHy vcttgrx9Jzm7t7eXJvELg79ysocLodCT6ngi4oMQ3ePRnezqBxjMpoh4dkeJwz4EgX0O dqb3N+b1b1lW46xgD6PXFpUkvRnEzhbFDdorso93kAFhYLNpvmd0M18NUY+7xXAKM8Wq 7cRZrYFDjfaTKpdd0CGVs5Ots1025DbO152FCX0Lq8XKHKytjF0XCNI8S0BOiXQFe3P3 lrkp7mK0ImTWHc5/f1CeSaNXtzL5S2LnazNgFjE8TdXeobelmhu3f2j5vJoiQOEMsmr7 6ZRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=R3vH3Bin; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ww6-20020a170907084600b007c1946d08b3si22870968ejb.989.2023.01.04.06.30.19; Wed, 04 Jan 2023 06:30:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=R3vH3Bin; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234930AbjADO3X (ORCPT + 99 others); Wed, 4 Jan 2023 09:29:23 -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> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754102648285693883?= X-GMAIL-MSGID: =?utf-8?q?1754102648285693883?= 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),