From patchwork Mon Nov 25 06:56:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1200264 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 ozlabs.org (Postfix) with ESMTPS id 47LyX513hvz9sPT; Mon, 25 Nov 2019 17:57:25 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iZ8JE-0004rO-Bn; Mon, 25 Nov 2019 06:57:20 +0000 Received: from mail-pf1-f194.google.com ([209.85.210.194]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iZ8JC-0004p6-A6 for kernel-team@lists.ubuntu.com; Mon, 25 Nov 2019 06:57:18 +0000 Received: by mail-pf1-f194.google.com with SMTP id n13so6908619pff.1 for ; Sun, 24 Nov 2019 22:57:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=suDXrOEfvg5Qqqn2mE4cWfbVF8AiQeaxGzTCoicrATw=; b=RET9bX4pwQox19N/raGeCbaBGiYSZJNQZ3mb9hn2L9ufBHYKPWR/JNbO8evUUsGZLO zy1icpLAtBL+vrKiOssTguhg9LXFImglcBv4NaNVCQ71xpciwh7keqdlthGi7Ga+pEKd 3/rD8/PUy/Kdym+guFlSg37E+Xo1ChbsSgmL6e7CpNWY+eBKX1c2k6uCtXiD3fuIo1fd gFoTnZYaaPpVclVFvOJ3PQHxQs3LJcMC1lRVvrC4GM0Xmcztkf7TeAYiIi+ITFOXxU5w D6u4dLw2Yy1Lc70FQxGPowZdZBnGaL2IqzxhHtupxc4RlSRwR/JVQc/B3m0M4YpE/23t 8g8Q== X-Gm-Message-State: APjAAAWD7TuAN4ORGpYKejoPhxRnOhSx3JBc+mUKIkHyAzHc8ii1x0zL WRS31pP60P74kuADYCAwogJE5dM/ X-Google-Smtp-Source: APXvYqysTS0Q6OMLyQ9+k5WwdrPC8TgmejDZerJKAKIpeiVPENoXWaC4OdHHv1HU5wNzUF20hWc70g== X-Received: by 2002:a62:ab0e:: with SMTP id p14mr31310417pff.253.1574665036275; Sun, 24 Nov 2019 22:57:16 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id t8sm6643519pjr.25.2019.11.24.22.57.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Nov 2019 22:57:15 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [SRU][OEM-OSP1-B][PATCH 2/2] powercap/intel_rapl: add support for Cometlake desktop Date: Mon, 25 Nov 2019 14:56:52 +0800 Message-Id: <20191125065652.2073008-10-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191125065652.2073008-1-vicamo.yang@canonical.com> References: <20191125065652.2073008-1-vicamo.yang@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/1847454 Add CometLake desktop support in intel_rapl driver Signed-off-by: Zhang Rui Signed-off-by: Rafael J. Wysocki (backported from commit f84fdcbc8ec02ea34bbc641359c2a69d0d1242d4 linux-next) Signed-off-by: You-Sheng Yang --- drivers/powercap/intel_rapl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c index 9cb9f5aab434..b2d19bf8e884 100644 --- a/drivers/powercap/intel_rapl.c +++ b/drivers/powercap/intel_rapl.c @@ -1158,6 +1158,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { INTEL_CPU_FAM6(CANNONLAKE_MOBILE, rapl_defaults_core), INTEL_CPU_FAM6(ICELAKE_MOBILE, rapl_defaults_core), INTEL_CPU_FAM6(COMETLAKE_L, rapl_defaults_core), + INTEL_CPU_FAM6(COMETLAKE, rapl_defaults_core), INTEL_CPU_FAM6(ATOM_SILVERMONT, rapl_defaults_byt), INTEL_CPU_FAM6(ATOM_AIRMONT, rapl_defaults_cht),