From patchwork Tue Nov 26 11:08:18 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: 1200972 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 47Mh3V30Rvz9sPW; Tue, 26 Nov 2019 22:08:38 +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 1iZYhu-0001IE-BN; Tue, 26 Nov 2019 11:08:34 +0000 Received: from mail-pg1-f196.google.com ([209.85.215.196]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iZYhs-0001HF-GU for kernel-team@lists.ubuntu.com; Tue, 26 Nov 2019 11:08:32 +0000 Received: by mail-pg1-f196.google.com with SMTP id k1so462665pga.13 for ; Tue, 26 Nov 2019 03:08:32 -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=lU+6VOLA2MpEvOQm1PhZzm95H6uMQW8ne6/bNWa8Rog=; b=b8uUZLfiC4u24/TVpLQ95Zp/QI5NucQE9/3E9oUD5HN6SyL35eeIfxh4LhnHU905wb RrAKJwPJqIgjd78Mw9MZ/+9CcE4Od5AoTblY8ZHQi5duOhAcbhhnGxcNb3ktfMYQ89+2 JIhjFeI6Qqk53PFzoFCA36di0nKxg3dSdzzTRir7k7Ho0lvbHxVtm795MD60SZp+QXWn l2tjsWyZE//n8JQe6Iq+WJKzS7KvscI/uyrHeUkZQQeQTEkgrK3j0u3SAIChdboIvPCb d3kJo/AacAIb93BTd6mH9QvcBEULHlndsts/PQwafPuEkaor+0/8TqCw0BLS4CpAZrMJ QNSA== X-Gm-Message-State: APjAAAVQCsafwzNWgGLOrHwvum0TdMnSEaVpgLPCdTMokhW18pHbm4Zc q/29IJw+0d7G6TqgELBx9/5MKfahncE= X-Google-Smtp-Source: APXvYqzKKKC4cnCjI4/Xq9aJAzYlQUZj27poAcFqzeVR0iIJvMtD1KAKBMzIOgAK7IMKlN/OlOp/vQ== X-Received: by 2002:a63:644:: with SMTP id 65mr38516736pgg.306.1574766510293; Tue, 26 Nov 2019 03:08:30 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id l65sm11952646pfl.86.2019.11.26.03.08.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 03:08:29 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [SRU][OEM-OSP1-B][PATCH RESEND 1/1] UBUNTU: SAUCE: platform/x86: intel_pmc_core: Add Comet Lake (CML) platform support to intel_pmc_core driver Date: Tue, 26 Nov 2019 19:08:18 +0800 Message-Id: <20191126110819.1721961-4-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191126110819.1721961-1-vicamo.yang@canonical.com> References: <20191126110819.1721961-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: Gayatri Kammela BugLink: https://bugs.launchpad.net/bugs/1847450 Add Comet Lake to the list of the platforms that intel_pmc_core driver supports for pmc_core device. Just like Ice Lake, Comet Lake can also reuse all the Cannon Lake PCH IPs. No additional effort is needed to enable but to simply reuse them. Cc: Mario Limonciello Cc: Peter Zijlstra Cc: Srinivas Pandruvada Cc: Andy Shevchenko Cc: Kan Liang Cc: David E. Box Cc: Rajneesh Bhardwaj Cc: Tony Luck (backported from https://lkml.org/lkml/2019/11/18/713) Signed-off-by: Gayatri Kammela --- drivers/platform/x86/intel_pmc_core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c index 5e32e8dd6f3b..27d58b6f1047 100644 --- a/drivers/platform/x86/intel_pmc_core.c +++ b/drivers/platform/x86/intel_pmc_core.c @@ -159,6 +159,7 @@ static const struct pmc_reg_map spt_reg_map = { /* Cannonlake: PGD PFET Enable Ack Status Register(s) bitmap */ static const struct pmc_bit_map cnp_pfear_map[] = { + /* Reserved for Cannon Lake but valid for Comet Lake */ {"PMC", BIT(0)}, {"OPI-DMI", BIT(1)}, {"SPI/eSPI", BIT(2)}, @@ -184,7 +185,7 @@ static const struct pmc_bit_map cnp_pfear_map[] = { {"SDX", BIT(4)}, {"SPE", BIT(5)}, {"Fuse", BIT(6)}, - /* Reserved for Cannonlake but valid for Icelake */ + /* Reserved for Cannon Lake but valid for Ice Lake and Comet Lake */ {"SBR8", BIT(7)}, {"CSME_FSC", BIT(0)}, @@ -228,7 +229,7 @@ static const struct pmc_bit_map cnp_pfear_map[] = { {"HDA_PGD4", BIT(2)}, {"HDA_PGD5", BIT(3)}, {"HDA_PGD6", BIT(4)}, - /* Reserved for Cannonlake but valid for Icelake */ + /* Reserved for Cannon Lake but valid for Ice Lake and Comet Lake */ {"PSF6", BIT(5)}, {"PSF7", BIT(6)}, {"PSF8", BIT(7)}, @@ -815,6 +816,8 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = { INTEL_CPU_FAM6(KABYLAKE_DESKTOP, spt_reg_map), INTEL_CPU_FAM6(CANNONLAKE_MOBILE, cnp_reg_map), INTEL_CPU_FAM6(ICELAKE_MOBILE, icl_reg_map), + INTEL_CPU_FAM6(COMETLAKE, cnp_reg_map), + INTEL_CPU_FAM6(COMETLAKE_L, cnp_reg_map), {} };