From patchwork Mon Nov 25 06:56:47 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: 1200260 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 47LyWs0f2yz9sPZ; Mon, 25 Nov 2019 17:57:13 +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 1iZ8J3-0004hQ-69; Mon, 25 Nov 2019 06:57:09 +0000 Received: from mail-pg1-f195.google.com ([209.85.215.195]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iZ8J0-0004dc-J6 for kernel-team@lists.ubuntu.com; Mon, 25 Nov 2019 06:57:06 +0000 Received: by mail-pg1-f195.google.com with SMTP id 6so2170429pgk.0 for ; Sun, 24 Nov 2019 22:57:06 -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=f7bvB7Vzo4lu7lHr6gO5T55A+lTkWYGPAdXPrRxAtzU=; b=ORY/RtUj4xWUfOGRKN6u0ckmbOLqb7JuMuQrXRq1hGcIBYe9SRKmPveLy/tiHkDUHO WzHf93s7rbmGgTf88H33dcDa8tmEYKFNOoKWX6iDEI1bwJnPNeWIp3vJ9BUzuD3uR+6N dNf9RJNYmqXGaD6IC3dHPtF1M3zsCTFzpPBzL67SwooaPceCuw2/hk1bLZLFIOw+7SVs g5/rftTtl7VyJU7g5ReonnTKYxH1tnHTdk/rBS3WFZutusSAKOb+loXSkpEZOP40vgNk 68lcy4juYtfgdFYUl7ctl7LvSsP4E0ySBKrogNjZVlFwlhXEMb4aEUqDuhgFOfJQfT/2 gQIQ== X-Gm-Message-State: APjAAAVxonKlTDiMUg/+b9SdODbCyfb79y1x9MiVGvFU74sOPgxiNfxZ vITjz6gBgzL8SErqj5VrlUY5EjaZ X-Google-Smtp-Source: APXvYqytAc3/0/xJPfSUdwPiH0oL/ONexnoldj8LY8XCrAWqdPTdbf41lMJWqTtcmzYsOh101f6+ow== X-Received: by 2002:a63:1013:: with SMTP id f19mr15641477pgl.289.1574665024539; Sun, 24 Nov 2019 22:57:04 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id e24sm7140145pjt.18.2019.11.24.22.57.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Nov 2019 22:57:03 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [SRU][E][PATCH 2/2] powercap/intel_rapl: add support for Cometlake desktop Date: Mon, 25 Nov 2019 14:56:47 +0800 Message-Id: <20191125065652.2073008-5-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_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 8e13d2380ad6..65cffbdc0a75 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -979,6 +979,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { INTEL_CPU_FAM6(ICELAKE_X, rapl_defaults_hsw_server), INTEL_CPU_FAM6(ICELAKE_XEON_D, rapl_defaults_hsw_server), 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),