From patchwork Mon Sep 19 15:17:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1679491 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=ZP1ulfiK; 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 4MWSwz0thXz1yp7 for ; Tue, 20 Sep 2022 01:18:10 +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 1oaIX4-0008P7-Pp; Mon, 19 Sep 2022 15:18:02 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oaIWz-0008La-Lf for kernel-team@lists.ubuntu.com; Mon, 19 Sep 2022 15:17:57 +0000 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) (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-1.canonical.com (Postfix) with ESMTPS id 267353F1A5 for ; Mon, 19 Sep 2022 15:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1663600677; bh=Cu14j/kM2O8bnYinvVf6DPK2Nm3uoYS6oC9zqS6WRgs=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZP1ulfiKeHd/p+Upz5APUCRE9TGSZPUwZfOVkuWwNaWMxQxi/AnQoOT5VnIjPskUt e7VxjtIWl4pRe7ozVvgvNLqUeKD/4VkGv482jy+FsNdWZGqguFUpbWlgUp+BItkQzo 4dUW5qCAckumIygZAqaueHplzKrIh+1ywcDH0IsF3CVUqXie1LZJXLs8eTsbiEpJa7 kaf/nHH/R3ldukyr4S0zIqPXR7dyESAcn0FyBGhtJ6fOTlnO4+295eFvWLeZv8XUeT nxgvSNa1Z3J8DcXkLJAiYRPFKHxYpsl4MfM8shEYXZtVR0XHqKi/KWzU9+UB8NHMnE A17GYxogFWtZg== Received: by mail-pg1-f197.google.com with SMTP id 128-20020a630486000000b00435b18f71b3so14093849pge.19 for ; Mon, 19 Sep 2022 08:17:57 -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=Cu14j/kM2O8bnYinvVf6DPK2Nm3uoYS6oC9zqS6WRgs=; b=u/nIn/Hl+cD3o+rIemEBGJGd3QDJnc05O7MU6cb6xTsnzxrQOjGo+zfCqCt+Qr8S7e PBZanQGFTB9tz97i8lRjkDO0dUoLMHNsl00UPGiYpbPUStq21V7yHvExVOWgmBGu6Aoe MH0XGvuuvWKgE+aZS/VgIPAciX5/Js+J2s7ZvzoWN0UT8XRbLDjaB0ftKXuWfRK8SH0U ahbVSeyJtvKe4jSzV+adn4Ha8yC5LPO6/OX7hLJG5f8QX2Vw1jBAwG5YU3+hNkUzbMx2 G3ASvNRUqzvgdYQ/EKm0/NlvcQB8+48GFp8tL6jwhxNa2OY4p0Cu1ng4s5x8EgezUp6C oBrg== X-Gm-Message-State: ACrzQf1PpTn51CzAIWF5QqGycy7SwlVW2AlNJrc2kngl02Ah5qouqfOx j0KcG//8Ooidl4HK5f7wrbCt4tPpCRmzKW4LYQz7eNb70vowJaLzosn1s2v9O1x2eClw5cTnxV2 F9YWf10Tjy/bpcPl/gLRud7dFV5IngIiF9uuk55iWkQ== X-Received: by 2002:a63:ec0d:0:b0:439:5dcd:2a3c with SMTP id j13-20020a63ec0d000000b004395dcd2a3cmr16299805pgh.358.1663600675414; Mon, 19 Sep 2022 08:17:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4lmeczxt+zr5q7Du3A9qJ+2ZMjxNXJcXy9dW5lzGR840VWohXVONjdEQ8F5Lrmfiilv/vIfg== X-Received: by 2002:a63:ec0d:0:b0:439:5dcd:2a3c with SMTP id j13-20020a63ec0d000000b004395dcd2a3cmr16299768pgh.358.1663600674908; Mon, 19 Sep 2022 08:17:54 -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 q67-20020a17090a1b4900b00200461cfa99sm6713574pjq.11.2022.09.19.08.17.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Sep 2022 08:17:54 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3][SRU][K/J/OEM-6.0/OEM-5.17] x86/cpu: Add new Raptor Lake CPU model number Date: Mon, 19 Sep 2022 23:17:49 +0800 Message-Id: <20220919151751.1686149-2-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: Tony Luck BugLink: https://bugs.launchpad.net/bugs/1990161 Note1: Model 0xB7 already claimed the "no suffix" #define for a regular client part, so add (yet another) suffix "S" to distinguish this new part from the earlier one. Note2: the RAPTORLAKE* and ALDERLAKE* processors are very similar from a software enabling point of view. There are no known features that have model-specific enabling and also differ between the two. In other words, every single place that list *one* or more RAPTORLAKE* or ALDERLAKE* processors should list all of them. Note3: This is being merged before there is an in-tree user. Merging this provides an "anchor" so that the different folks can update their subsystems (like perf) in parallel to use this define and test it. [ dhansen: add a note about why this has no in-tree users yet ] Signed-off-by: Tony Luck Signed-off-by: Dave Hansen Link: https://lkml.kernel.org/r/20220823174819.223941-1-tony.luck@intel.com (cherry picked from commit ea902bcc1943f7539200ec464de3f54335588774 linux-next) Signed-off-by: Koba Ko --- arch/x86/include/asm/intel-family.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index def6ca121111c..aeb38023a7039 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -27,6 +27,7 @@ * _X - regular server parts * _D - micro server parts * _N,_P - other mobile parts + * _S - other client parts * * Historical OPTDIFFs: * @@ -112,6 +113,7 @@ #define INTEL_FAM6_RAPTORLAKE 0xB7 #define INTEL_FAM6_RAPTORLAKE_P 0xBA +#define INTEL_FAM6_RAPTORLAKE_S 0xBF /* "Small Core" Processors (Atom) */ 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), From patchwork Mon Sep 19 15:17:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1679490 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=lvIuGSls; 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 4MWSww6WVtz1yq9 for ; Tue, 20 Sep 2022 01:18:08 +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 1oaIX3-0008NP-J8; Mon, 19 Sep 2022 15:18:01 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oaIX2-0008MU-HO for kernel-team@lists.ubuntu.com; Mon, 19 Sep 2022 15:18:00 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (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-1.canonical.com (Postfix) with ESMTPS id 5074F3F1A5 for ; Mon, 19 Sep 2022 15:18:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1663600680; bh=xH1ZJAa3njExoEpBN4BFta0Xe3Y8/YjV7UdE3f0yxs8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lvIuGSlsQJylUzg2+Ddmmzqr/Th2CufjwRB/ZdDs+LPC0VQ87CUiKcxTr2BSHZsg+ W6CiAINcn7R66/74dMxv2KMXXzjwUm4tQvopcVzVKoxmNHA2h8WTAROqPRtJOnJtuR YmqgiHjF4Bly0fr4w5Ry3QCJlxl4oeiXC0b/FFtmfXjf6Mr+wOA9ubOnlmxzBSR+hH /nJOOjEzZaOxXotkmfcj7exoRj8dtaj3lCtSPTMfW2r0fKaTo60Iheuc+nJZ+vkAwL cl72qQv7GBXb0K08mhMRt6M89pJu2bX3bi5cCa8FQYudgiNW9RnF75SyQqSnn9hVPz ChzU6lj5QByAg== Received: by mail-pj1-f71.google.com with SMTP id js4-20020a17090b148400b0020061aa46d7so13566505pjb.9 for ; Mon, 19 Sep 2022 08:18:00 -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=xH1ZJAa3njExoEpBN4BFta0Xe3Y8/YjV7UdE3f0yxs8=; b=cxFOTvksd/b59rcpFCAupsvQ2q4ut1ens76RSKKzswGDVsZE/mW0FWcOayzMlrX5BF 5AmRun1hTW1Wnpl14eMJfocCCM/lwe9zs8DqlvIV8xZMAdVOuzMaLL0Lwn5UL7F7oDuM T9+wjCgSJGo6xpyfnMnzagxdC/K2fdrYRLDAKoOFl8dEN9SdoWpY+ZS8NqgVDZBfcJBe 2CXR5IExk6z+I8ZI43X1z7fvdHgfuKO6tbuadGRU7jl5T+EQk/fWcONfW4grDe0Gqi0i I6aG6uKbzQjFgNMD7Hk9LYYtJXQgIjG1WNbVV5814CEs0rNwE6siEvUy56TdRcyU31dZ 22vA== X-Gm-Message-State: ACrzQf0n+z+z8/7qTli/jEZ9rSlteIWpW6TK9bzu4RbueQwwp22OMJLy BAHrcCvLWCrRbLOFVN7sXDQe3fTsLzlNlgcbDOzbK5t/E3H13r8WsbRd0iSeXsPv1Odxw6cql9x Y2vrnrxP9DjdL9N6yyZ9KGryyP6LJzwVVWdYPprsKJg== X-Received: by 2002:a17:903:189:b0:178:3df7:f32e with SMTP id z9-20020a170903018900b001783df7f32emr235612plg.47.1663600678665; Mon, 19 Sep 2022 08:17:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM577dqEw34ZABRmkfO/vkhrISko3zy8qUjdtXsRouHOiJvXRD3zkyTJ6yAII6rr6W1Gw7IlFA== X-Received: by 2002:a17:903:189:b0:178:3df7:f32e with SMTP id z9-20020a170903018900b001783df7f32emr235576plg.47.1663600678280; Mon, 19 Sep 2022 08:17:58 -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 a29-20020a630b5d000000b0043954df3162sm11533481pgl.10.2022.09.19.08.17.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Sep 2022 08:17:57 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/3][SRU][U/K/J/OEM-6.0/OEM-5.17] powercap: intel_rapl: Add support for RAPTORLAKE_S Date: Mon, 19 Sep 2022 23:17:51 +0800 Message-Id: <20220919151751.1686149-4-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: Zhang Rui BugLink: https://bugs.launchpad.net/bugs/1990161 Add intel_rapl support for RAPTORLAKE_S platform, which behaves the same as RAPTORLAKE and RAPTORLAKE_P platforms. Signed-off-by: Zhang Rui Signed-off-by: Rafael J. Wysocki (cherry picked from commit 0d7a23b5f8e162bf2c5caab06f5df4aee2619073) 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 ddb212f02a031..418bd3453fc61 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1109,6 +1109,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { 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(RAPTORLAKE_S, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server), X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_defaults_core),