From patchwork Mon Sep 19 15:17:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1679488 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=F6JzB6tz; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MWSww2zZzz1yq6 for ; Tue, 20 Sep 2022 01:18:07 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oaIX2-0008MQ-ED; Mon, 19 Sep 2022 15:18:00 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oaIX0-0008M2-OO for kernel-team@lists.ubuntu.com; Mon, 19 Sep 2022 15:17:58 +0000 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 8969B3F461 for ; Mon, 19 Sep 2022 15:17:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1663600678; bh=6f/RdWX+3w3I78QzA2mvKWqw7416qkZ6rzZ0BoiPi/I=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=F6JzB6tz952fP+7cZHzwqEiV+jzPX5a5v4WbNTncsjrcFrekWGo97ad5qI4opLNkR /MhAXo6RfPQqvgzIl4Ef4AbHUyQxmPwl7Cv8wGglfRwhn4jsFYezVUPmkq8rfMFjhX hdngSUY3heZerUJC2LtswyeyPG4RCzdAaXb+ASNSDwL/CVAZ3aUBikTLFWLhYpvvnf 805C0xqmv1xmzlida+EGt6knr3XIANkfNNSW9ONE3kSsCmGcZOv1xFpKNR2RSHlfD7 c8fIuge8Owa0mJBXB9gAL/h2Z28xQMcFtrP0k9J6F9D0S3x0t+DhdWs0OSUTVPzw/O rs3Sf8hWd82vA== Received: by mail-pg1-f200.google.com with SMTP id w1-20020a63d741000000b0042c254a4ccdso14174230pgi.15 for ; Mon, 19 Sep 2022 08:17:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=6f/RdWX+3w3I78QzA2mvKWqw7416qkZ6rzZ0BoiPi/I=; b=PGTAPauXattL4MOWss0x9LKnfDM7edETS5BjDcLra3wqQ33OJj1TvHxU2OSRIlWWjB jHE8dgORu5hob6e3A9Fly24j1QC0XPiItA6jQttJ3df3DDqqEtQ0niRS3Bq4PkorluJJ yoyxpykP36RJiBy0yQLDs7uFzcrePIWhuH8EvkMlLTcMImQ4xNc01IzvhClQIZhrr0Ws /lM2oxYHG03rbxTCNkSMzKVV4rEc7+kEzZTlGKh2SsLlq7/DK+l+7J+NM34oZB0d+lC6 gXRHpyYIOl7UL1ZWMpoAdaeaIOD/eUU2yvwxZUysc9e+3qp7aSZBCo9jLOB7wfwZ6lX/ 8Naw== X-Gm-Message-State: ACrzQf2hWs6FB6tUj2A/VGJPTAdC0CR8770Pm2zkZgAMWnPhdXEUtpuj smcvyueHj1y5DyzAxLmGNemfJz0M4Q2zVdvVyVJLZ/9eM1ERncXmn+1WkP/Pm1ZdHhwU9doU9Tb xRgSPXnoIa6JtGPsHvvnhyWo76sRPWyFW/tjVNiFDmA== X-Received: by 2002:a63:6ac8:0:b0:43a:18ce:f681 with SMTP id f191-20020a636ac8000000b0043a18cef681mr4951873pgc.244.1663600676990; Mon, 19 Sep 2022 08:17:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6NqRClcK1LhouuD02BeHre3GRdyyRR05X1qtiNpqrKS3h/7uLbDlYsKY+aTZqzm10AYJi+eA== X-Received: by 2002:a63:6ac8:0:b0:43a:18ce:f681 with SMTP id f191-20020a636ac8000000b0043a18cef681mr4951850pgc.244.1663600676598; Mon, 19 Sep 2022 08:17:56 -0700 (PDT) Received: from canonical.com (2001-b011-3815-3656-74a1-b5e8-4303-cb92.dynamic-ip6.hinet.net. [2001:b011:3815:3656:74a1:b5e8:4303:cb92]) by smtp.gmail.com with ESMTPSA id q8-20020a170902dac800b0017832c8cc85sm17027493plx.292.2022.09.19.08.17.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Sep 2022 08:17:56 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3][SRU][K/J/OEM-6.0/OEM-5.17] powercap: intel_rapl: Add support for RAPTORLAKE_P Date: Mon, 19 Sep 2022 23:17:50 +0800 Message-Id: <20220919151751.1686149-3-koba.ko@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220919151751.1686149-1-koba.ko@canonical.com> References: <20220919151751.1686149-1-koba.ko@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: George D Sworo BugLink: https://bugs.launchpad.net/bugs/1990161 Add RAPTORLAKE_P to the list of supported processor models in the Intel RAPL power capping driver. Signed-off-by: George D Sworo Acked-by: Zhang Rui Tested-by: Sumeet Pawnikar [ rjw: Minor changelog edits ] Signed-off-by: Rafael J. Wysocki (cherry picked from commit 2755714656d0f2f41adfe231f3865e72da2cbe39) Signed-off-by: Koba Ko --- 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 82d9ea0c0bfaa..ddb212f02a031 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1108,6 +1108,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &rapl_defaults_core), + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server), X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_defaults_core),