From patchwork Wed Jun 15 08:29:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1643514 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=fpGkphNz; dkim-atps=neutral Authentication-Results: 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=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LNJQK5rjPz9vFw for ; Wed, 15 Jun 2022 18:30:00 +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 1o1OPN-0001c7-GG; Wed, 15 Jun 2022 08:29:49 +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 1o1OPM-0001bX-9e for kernel-team@lists.ubuntu.com; Wed, 15 Jun 2022 08:29:48 +0000 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.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-0.canonical.com (Postfix) with ESMTPS id 04E4F3F1A3 for ; Wed, 15 Jun 2022 08:29:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1655281788; bh=xYmcKj1xnTv1a9ufW2PwVEcY0PjLh7P7yV04VHoXbK4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fpGkphNzvVTotkRKg+B5hLf3aqfFaDdobZyZhxSGZdc7dQeKJMO8E1xIBNUxF7ZFq ATiquXY5V8lIMJ/sZPhKuU8eHERCUejKN9bKDIHQDZx8G1ig42gQQJuF1P3FWJkik+ DCvcBFGJroDIY0b2h18mv796kp9HXWhgC+wKdGt/rm1ih33fCpjLSdNOP3F3o5sb7J 9FvQlfGQtiG56Aial3Gi5gcn7KVvxekNiLSFaaGQSFPoHXVrYRtCS+WMQzsuM4eCCv YGV/zmgQWt1RNeCbpJEd6GE+E9SrkeU3/HzVkvWhWZcKrB8sjGh3JnAPF8ogm8Nhc8 uXMcbk6VApCog== Received: by mail-pl1-f197.google.com with SMTP id t1-20020a170902e84100b001689cab0be3so6239135plg.11 for ; Wed, 15 Jun 2022 01:29:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xYmcKj1xnTv1a9ufW2PwVEcY0PjLh7P7yV04VHoXbK4=; b=3020G21+emT1Sa9cWiTaAu+8kAwNTFejj6VSTGiFsLQ8pjVZwW0O8QGprjRLrmW/UU AwGwOq6Br5aHZd3G+zqdZj3e5wjwxg+g1uYl2iLshpuqctjqVDrYBRvsW0cFwte6ddlf zr5wmVgNIRsBSf4yxnT0bVGfYgNsvnziH3DvkgN+lsZL9a0tt4//dGkOnW404whIA0LT NegsrBFRdqzlhWL899wIMKrz3V4PrxE779j2L0cC4fSdG6xoFv3Lwcb1Eizo3airPotf vg2WaiXUVK1UTs4m25FzkFHorW725Z0EMk3l6OAIS4i2wOvDuQlmAGzRX9lvexyRV9q6 QyaA== X-Gm-Message-State: AJIora/DLKmb3ptnTBSz7FmkE9vhxtWkrCeDxP6fVefSyahZCKrjYEE8 W6zqwIGk9IMsKnDSltdo2+65NI6n7TdStjSumPDC5h0+OfjW0z1/3XUaqH8fZGnW0sNHV4dW4Tw gqcDplXPv4WnqXpnm08ixNr0X4tWWdGbGZIe8fTY8GQ== X-Received: by 2002:a17:902:e80b:b0:168:b645:849e with SMTP id u11-20020a170902e80b00b00168b645849emr8214822plg.26.1655281786416; Wed, 15 Jun 2022 01:29:46 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uehcurMyEfYv6FwyXsLoicc+936hPBgoPQiRqwEUV5QRm9XjULLqf4WtTwyPBw3l5cNLkgPQ== X-Received: by 2002:a17:902:e80b:b0:168:b645:849e with SMTP id u11-20020a170902e80b00b00168b645849emr8214792plg.26.1655281785928; Wed, 15 Jun 2022 01:29:45 -0700 (PDT) Received: from canonical.com (2001-b011-3815-3eb1-fbbb-4d66-1ffd-7b1d.dynamic-ip6.hinet.net. [2001:b011:3815:3eb1:fbbb:4d66:1ffd:7b1d]) by smtp.gmail.com with ESMTPSA id mj11-20020a17090b368b00b001df4c5cab51sm1095703pjb.15.2022.06.15.01.29.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 01:29:45 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 02/13][SRU][OEM-5.17] powercap: intel_rapl: add support for RaptorLake Date: Wed, 15 Jun 2022 16:29:28 +0800 Message-Id: <20220615082939.278128-3-koba.ko@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220615082939.278128-1-koba.ko@canonical.com> References: <20220615082939.278128-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/1978794 Add intel_rapl support for the RaptorLake platform. Signed-off-by: Zhang Rui Signed-off-by: Rafael J. Wysocki (cherry picked from commit ae0dc7ed1a7c713ee9ba563a328d3b4d59223d7c) 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 4031d810def57..82d9ea0c0bfaa 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1107,6 +1107,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, &rapl_defaults_core), 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(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server), X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_defaults_core),