* [PATCH v3 1/5] x86/cpu: Add Icelake to Intel family
2019-02-14 11:57 [PATCH v3 0/5] ICL support and other enhancements for PMC Core Rajneesh Bhardwaj
@ 2019-02-14 11:57 ` Rajneesh Bhardwaj
2019-02-14 12:25 ` [tip:x86/urgent] x86/CPU: Add Icelake model number tip-bot for Rajneesh Bhardwaj
2019-02-14 11:57 ` [PATCH v3 2/5] platform/x86: intel_pmc_core: Convert to INTEL_CPU_FAM6 macro Rajneesh Bhardwaj
` (4 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Rajneesh Bhardwaj @ 2019-02-14 11:57 UTC (permalink / raw)
To: platform-driver-x86
Cc: dvhart, andy, linux-kernel, Rajneesh Bhardwaj, x86,
Borislav Petkov, Peter Zijlstra, Thomas Gleixner, Dave Hansen,
David E. Box, Srinivas Pandruvada
Add CPUID of Icelake (ICL) mobile processors to Intel family list.
Icelake U/Y series uses model no 0x7E. Public documentation related to
it is not available yet but this information is correct as per my
understanding.
Cc: x86@kernel.org
Cc: Borislav Petkov <bp@alien8.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "David E. Box" <david.e.box@intel.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
---
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 0dd6b0f4000e..058b1a1994c4 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -52,6 +52,8 @@
#define INTEL_FAM6_CANNONLAKE_MOBILE 0x66
+#define INTEL_FAM6_ICELAKE_MOBILE 0x7E
+
/* "Small Core" Processors (Atom) */
#define INTEL_FAM6_ATOM_BONNELL 0x1C /* Diamondville, Pineview */
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [tip:x86/urgent] x86/CPU: Add Icelake model number
2019-02-14 11:57 ` [PATCH v3 1/5] x86/cpu: Add Icelake to Intel family Rajneesh Bhardwaj
@ 2019-02-14 12:25 ` tip-bot for Rajneesh Bhardwaj
0 siblings, 0 replies; 9+ messages in thread
From: tip-bot for Rajneesh Bhardwaj @ 2019-02-14 12:25 UTC (permalink / raw)
To: linux-tip-commits
Cc: kan.liang, dave.hansen, x86, tglx, mingo, mingo,
andriy.shevchenko, bp, peterz, qiuxu.zhuo, linux-kernel, hpa,
srinivas.pandruvada, david.e.box, rajneesh.bhardwaj
Commit-ID: 8cd8f0ce0d6aafe661cb3d6781c8b82bc696c04d
Gitweb: https://git.kernel.org/tip/8cd8f0ce0d6aafe661cb3d6781c8b82bc696c04d
Author: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
AuthorDate: Thu, 14 Feb 2019 17:27:08 +0530
Committer: Borislav Petkov <bp@suse.de>
CommitDate: Thu, 14 Feb 2019 13:18:30 +0100
x86/CPU: Add Icelake model number
Add the CPUID model number of Icelake (ICL) mobile processors to the
Intel family list. Icelake U/Y series uses model number 0x7E.
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "David E. Box" <david.e.box@intel.com>
Cc: dvhart@infradead.org
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: platform-driver-x86@vger.kernel.org
Cc: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190214115712.19642-2-rajneesh.bhardwaj@linux.intel.com
---
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 d9a9993af882..9f15384c504a 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -52,6 +52,8 @@
#define INTEL_FAM6_CANNONLAKE_MOBILE 0x66
+#define INTEL_FAM6_ICELAKE_MOBILE 0x7E
+
/* "Small Core" Processors (Atom) */
#define INTEL_FAM6_ATOM_BONNELL 0x1C /* Diamondville, Pineview */
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 2/5] platform/x86: intel_pmc_core: Convert to INTEL_CPU_FAM6 macro
2019-02-14 11:57 [PATCH v3 0/5] ICL support and other enhancements for PMC Core Rajneesh Bhardwaj
2019-02-14 11:57 ` [PATCH v3 1/5] x86/cpu: Add Icelake to Intel family Rajneesh Bhardwaj
@ 2019-02-14 11:57 ` Rajneesh Bhardwaj
2019-02-14 11:57 ` [PATCH v3 3/5] platform/x86: intel_pmc_core: Add ICL platform support Rajneesh Bhardwaj
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Rajneesh Bhardwaj @ 2019-02-14 11:57 UTC (permalink / raw)
To: platform-driver-x86; +Cc: dvhart, andy, linux-kernel, Rajneesh Bhardwaj
INTEL_CPU_FAM6() macro provides better abstraction and reduces code size
so use it instead of custom grown ICPU().
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
---
drivers/platform/x86/intel_pmc_core.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index 835ed6d333bf..d3752d75075b 100644
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -25,9 +25,6 @@
#include "intel_pmc_core.h"
-#define ICPU(model, data) \
- { X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT, (kernel_ulong_t)data }
-
static struct pmc_dev pmc;
static const struct pmc_bit_map spt_pll_map[] = {
@@ -738,11 +735,11 @@ static inline void pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev)
#endif /* CONFIG_DEBUG_FS */
static const struct x86_cpu_id intel_pmc_core_ids[] = {
- ICPU(INTEL_FAM6_SKYLAKE_MOBILE, &spt_reg_map),
- ICPU(INTEL_FAM6_SKYLAKE_DESKTOP, &spt_reg_map),
- ICPU(INTEL_FAM6_KABYLAKE_MOBILE, &spt_reg_map),
- ICPU(INTEL_FAM6_KABYLAKE_DESKTOP, &spt_reg_map),
- ICPU(INTEL_FAM6_CANNONLAKE_MOBILE, &cnp_reg_map),
+ INTEL_CPU_FAM6(SKYLAKE_MOBILE, spt_reg_map),
+ INTEL_CPU_FAM6(SKYLAKE_DESKTOP, spt_reg_map),
+ INTEL_CPU_FAM6(KABYLAKE_MOBILE, spt_reg_map),
+ INTEL_CPU_FAM6(KABYLAKE_DESKTOP, spt_reg_map),
+ INTEL_CPU_FAM6(CANNONLAKE_MOBILE, cnp_reg_map),
{}
};
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v3 3/5] platform/x86: intel_pmc_core: Add ICL platform support
2019-02-14 11:57 [PATCH v3 0/5] ICL support and other enhancements for PMC Core Rajneesh Bhardwaj
2019-02-14 11:57 ` [PATCH v3 1/5] x86/cpu: Add Icelake to Intel family Rajneesh Bhardwaj
2019-02-14 11:57 ` [PATCH v3 2/5] platform/x86: intel_pmc_core: Convert to INTEL_CPU_FAM6 macro Rajneesh Bhardwaj
@ 2019-02-14 11:57 ` Rajneesh Bhardwaj
2019-02-14 11:57 ` [PATCH v3 4/5] platform/x86: intel_pmc_core: Add Package cstates residency info Rajneesh Bhardwaj
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Rajneesh Bhardwaj @ 2019-02-14 11:57 UTC (permalink / raw)
To: platform-driver-x86
Cc: dvhart, andy, linux-kernel, Rajneesh Bhardwaj, David E. Box,
Srinivas Pandruvada
Icelake can resue most of the CNL PCH IPs as they are mostly similar.
This patch enables the PMC Core driver for ICL family.
It also addresses few other minor issues like upper case conversions and
some tab alignments.
Cc: "David E. Box" <david.e.box@intel.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Acked-and-tested-by: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
---
drivers/platform/x86/intel_pmc_core.c | 59 +++++++++++++++++++++------
drivers/platform/x86/intel_pmc_core.h | 4 ++
2 files changed, 50 insertions(+), 13 deletions(-)
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index d3752d75075b..400946b7a3b5 100644
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -166,25 +166,26 @@ static const struct pmc_bit_map cnp_pfear_map[] = {
{"SDX", BIT(4)},
{"SPE", BIT(5)},
{"Fuse", BIT(6)},
- {"Res_23", BIT(7)},
+ /* Reserved for Cannonlake but valid for Icelake */
+ {"SBR8", BIT(7)},
{"CSME_FSC", BIT(0)},
{"USB3_OTG", BIT(1)},
{"EXI", BIT(2)},
{"CSE", BIT(3)},
- {"csme_kvm", BIT(4)},
- {"csme_pmt", BIT(5)},
- {"csme_clink", BIT(6)},
- {"csme_ptio", BIT(7)},
-
- {"csme_usbr", BIT(0)},
- {"csme_susram", BIT(1)},
- {"csme_smt1", BIT(2)},
+ {"CSME_KVM", BIT(4)},
+ {"CSME_PMT", BIT(5)},
+ {"CSME_CLINK", BIT(6)},
+ {"CSME_PTIO", BIT(7)},
+
+ {"CSME_USBR", BIT(0)},
+ {"CSME_SUSRAM", BIT(1)},
+ {"CSME_SMT1", BIT(2)},
{"CSME_SMT4", BIT(3)},
- {"csme_sms2", BIT(4)},
- {"csme_sms1", BIT(5)},
- {"csme_rtc", BIT(6)},
- {"csme_psf", BIT(7)},
+ {"CSME_SMS2", BIT(4)},
+ {"CSME_SMS1", BIT(5)},
+ {"CSME_RTC", BIT(6)},
+ {"CSME_PSF", BIT(7)},
{"SBR0", BIT(0)},
{"SBR1", BIT(1)},
@@ -209,6 +210,20 @@ 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 */
+ {"PSF6", BIT(5)},
+ {"PSF7", BIT(6)},
+ {"PSF8", BIT(7)},
+
+ /* Icelake generation onwards only */
+ {"RES_65", BIT(0)},
+ {"RES_66", BIT(1)},
+ {"RES_67", BIT(2)},
+ {"TAM", BIT(3)},
+ {"GBETSN", BIT(4)},
+ {"TBTLSX", BIT(5)},
+ {"RES_71", BIT(6)},
+ {"RES_72", BIT(7)},
{}
};
@@ -290,6 +305,8 @@ static const struct pmc_bit_map cnp_ltr_show_map[] = {
{"ISH", CNP_PMC_LTR_ISH},
{"UFSX2", CNP_PMC_LTR_UFSX2},
{"EMMC", CNP_PMC_LTR_EMMC},
+ /* Reserved for Cannonlake but valid for Icelake */
+ {"WIGIG", ICL_PMC_LTR_WIGIG},
/* Below two cannot be used for LTR_IGNORE */
{"CURRENT_PLATFORM", CNP_PMC_LTR_CUR_PLT},
{"AGGREGATED_SYSTEM", CNP_PMC_LTR_CUR_ASLT},
@@ -311,6 +328,21 @@ static const struct pmc_reg_map cnp_reg_map = {
.ltr_ignore_max = CNP_NUM_IP_IGN_ALLOWED,
};
+static const struct pmc_reg_map icl_reg_map = {
+ .pfear_sts = cnp_pfear_map,
+ .slp_s0_offset = CNP_PMC_SLP_S0_RES_COUNTER_OFFSET,
+ .slps0_dbg_maps = cnp_slps0_dbg_maps,
+ .ltr_show_sts = cnp_ltr_show_map,
+ .slps0_dbg_offset = CNP_PMC_SLPS0_DBG_OFFSET,
+ .ltr_ignore_offset = CNP_PMC_LTR_IGNORE_OFFSET,
+ .regmap_length = CNP_PMC_MMIO_REG_LEN,
+ .ppfear0_offset = CNP_PMC_HOST_PPFEAR0A,
+ .ppfear_buckets = ICL_PPFEAR_NUM_ENTRIES,
+ .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET,
+ .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT,
+ .ltr_ignore_max = ICL_NUM_IP_IGN_ALLOWED,
+};
+
static inline u8 pmc_core_reg_read_byte(struct pmc_dev *pmcdev, int offset)
{
return readb(pmcdev->regbase + offset);
@@ -740,6 +772,7 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = {
INTEL_CPU_FAM6(KABYLAKE_MOBILE, spt_reg_map),
INTEL_CPU_FAM6(KABYLAKE_DESKTOP, spt_reg_map),
INTEL_CPU_FAM6(CANNONLAKE_MOBILE, cnp_reg_map),
+ INTEL_CPU_FAM6(ICELAKE_MOBILE, icl_reg_map),
{}
};
diff --git a/drivers/platform/x86/intel_pmc_core.h b/drivers/platform/x86/intel_pmc_core.h
index 0680ca397b57..78dd4229489d 100644
--- a/drivers/platform/x86/intel_pmc_core.h
+++ b/drivers/platform/x86/intel_pmc_core.h
@@ -178,6 +178,10 @@ enum ppfear_regs {
#define LTR_REQ_SNOOP BIT(15)
#define LTR_REQ_NONSNOOP BIT(31)
+#define ICL_PPFEAR_NUM_ENTRIES 9
+#define ICL_NUM_IP_IGN_ALLOWED 20
+#define ICL_PMC_LTR_WIGIG 0x1BFC
+
struct pmc_bit_map {
const char *name;
u32 bit_mask;
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v3 4/5] platform/x86: intel_pmc_core: Add Package cstates residency info
2019-02-14 11:57 [PATCH v3 0/5] ICL support and other enhancements for PMC Core Rajneesh Bhardwaj
` (2 preceding siblings ...)
2019-02-14 11:57 ` [PATCH v3 3/5] platform/x86: intel_pmc_core: Add ICL platform support Rajneesh Bhardwaj
@ 2019-02-14 11:57 ` Rajneesh Bhardwaj
2019-02-14 11:57 ` [PATCH v3 5/5] platform/x86: intel_pmc_core: Quirk to ignore XTAL shutdown Rajneesh Bhardwaj
2019-02-21 14:25 ` [PATCH v3 0/5] ICL support and other enhancements for PMC Core Andy Shevchenko
5 siblings, 0 replies; 9+ messages in thread
From: Rajneesh Bhardwaj @ 2019-02-14 11:57 UTC (permalink / raw)
To: platform-driver-x86
Cc: dvhart, andy, linux-kernel, Rajneesh Bhardwaj, Arjan van de Ven,
David E. Box, Srinivas Pandruvada, Anshuman Gupta, Len Brown,
Rafael J . Wysocki
This patch introduces a new debugfs entry to read current Package
cstate residency counters. A similar variant of this patch was discussed
earlier "https://patchwork.kernel.org/patch/9908563/" but didn't make it
into mainline for various reasons. Current version only adds debugfs
entry which is quite useful for S0ix debug but excludes the exported API
that was there in initial version. Though there are tools like turbostat
and socwatch which can also show this info but sometimes its more
practical to have it here as it's hard to switch between various tools for
S0ix debug when pmc_core driver is the primary debug tool. Internal and
external customers have requested for this patch to be included in the
PMC driver on many occasions and Google Chrome OS team has already included
it in their builds. This becomes handy when requesting logs from external
customers who may not always have above mentioned tools in their integrated
kernel builds.
Package cstate residency MSRs provide useful debug information about
system idle states. In idle states system must enter deeper Package
cstates. Package cstates depend not only on Core cstates but also on
various IP block's power gating status and LTR values.
For Intel Core SoCs Package C10 entry is a must for deeper sleep states
such as S0ix. "Suspend-to-idle" should ideally take this path:
PC0 -> PC10 -> S0ix. For S0ix debug, its logical to check for
Package C10 residency first if for some reason system fails to enter S0ix.
Please refer to this link for MSR details:
https://software.intel.com/sites/default/files/managed/22/0d/335592-sdm-vol-4.pdf
Usage:
cat /sys/kernel/debug/pmc_core/package_cstate_show
Package C2 : 0xec2e21735f
Package C3 : 0xc30113ba4
Package C6 : 0x9ef4be15c5
Package C7 : 0x1e011904
Package C8 : 0x3c5653cfe5a
Package C9 : 0x0
Package C10 : 0x16fff4289
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: "David E. Box" <david.e.box@intel.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-and-tested-by: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
---
drivers/platform/x86/intel_pmc_core.c | 38 +++++++++++++++++++++++++++
drivers/platform/x86/intel_pmc_core.h | 1 +
2 files changed, 39 insertions(+)
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index 400946b7a3b5..4e7aa1711148 100644
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -22,11 +22,24 @@
#include <asm/cpu_device_id.h>
#include <asm/intel-family.h>
+#include <asm/msr.h>
#include "intel_pmc_core.h"
static struct pmc_dev pmc;
+/* PKGC MSRs are common across Intel Core SoCs */
+static const struct pmc_bit_map msr_map[] = {
+ {"Package C2", MSR_PKG_C2_RESIDENCY},
+ {"Package C3", MSR_PKG_C3_RESIDENCY},
+ {"Package C6", MSR_PKG_C6_RESIDENCY},
+ {"Package C7", MSR_PKG_C7_RESIDENCY},
+ {"Package C8", MSR_PKG_C8_RESIDENCY},
+ {"Package C9", MSR_PKG_C9_RESIDENCY},
+ {"Package C10", MSR_PKG_C10_RESIDENCY},
+ {}
+};
+
static const struct pmc_bit_map spt_pll_map[] = {
{"MIPI PLL", SPT_PMC_BIT_MPHY_CMN_LANE0},
{"GEN2 USB2PCIE2 PLL", SPT_PMC_BIT_MPHY_CMN_LANE1},
@@ -129,6 +142,7 @@ static const struct pmc_reg_map spt_reg_map = {
.mphy_sts = spt_mphy_map,
.pll_sts = spt_pll_map,
.ltr_show_sts = spt_ltr_show_map,
+ .msr_sts = msr_map,
.slp_s0_offset = SPT_PMC_SLP_S0_RES_COUNTER_OFFSET,
.ltr_ignore_offset = SPT_PMC_LTR_IGNORE_OFFSET,
.regmap_length = SPT_PMC_MMIO_REG_LEN,
@@ -318,6 +332,7 @@ static const struct pmc_reg_map cnp_reg_map = {
.slp_s0_offset = CNP_PMC_SLP_S0_RES_COUNTER_OFFSET,
.slps0_dbg_maps = cnp_slps0_dbg_maps,
.ltr_show_sts = cnp_ltr_show_map,
+ .msr_sts = msr_map,
.slps0_dbg_offset = CNP_PMC_SLPS0_DBG_OFFSET,
.ltr_ignore_offset = CNP_PMC_LTR_IGNORE_OFFSET,
.regmap_length = CNP_PMC_MMIO_REG_LEN,
@@ -333,6 +348,7 @@ static const struct pmc_reg_map icl_reg_map = {
.slp_s0_offset = CNP_PMC_SLP_S0_RES_COUNTER_OFFSET,
.slps0_dbg_maps = cnp_slps0_dbg_maps,
.ltr_show_sts = cnp_ltr_show_map,
+ .msr_sts = msr_map,
.slps0_dbg_offset = CNP_PMC_SLPS0_DBG_OFFSET,
.ltr_ignore_offset = CNP_PMC_LTR_IGNORE_OFFSET,
.regmap_length = CNP_PMC_MMIO_REG_LEN,
@@ -709,6 +725,25 @@ static int pmc_core_ltr_show(struct seq_file *s, void *unused)
}
DEFINE_SHOW_ATTRIBUTE(pmc_core_ltr);
+static int pmc_core_pkgc_show(struct seq_file *s, void *unused)
+{
+ struct pmc_dev *pmcdev = s->private;
+ const struct pmc_bit_map *map = pmcdev->map->msr_sts;
+ u64 pcstate_count;
+ int index;
+
+ for (index = 0; map[index].name ; index++) {
+ if (rdmsrl_safe(map[index].bit_mask, &pcstate_count))
+ continue;
+
+ seq_printf(s, "%-8s : 0x%llx\n", map[index].name,
+ pcstate_count);
+ }
+
+ return 0;
+}
+DEFINE_SHOW_ATTRIBUTE(pmc_core_pkgc);
+
static void pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev)
{
debugfs_remove_recursive(pmcdev->dbgfs_dir);
@@ -735,6 +770,9 @@ static int pmc_core_dbgfs_register(struct pmc_dev *pmcdev)
debugfs_create_file("ltr_show", 0444, dir, pmcdev, &pmc_core_ltr_fops);
+ debugfs_create_file("package_cstate_show", 0444, dir, pmcdev,
+ &pmc_core_pkgc_fops);
+
if (pmcdev->map->pll_sts)
debugfs_create_file("pll_status", 0444, dir, pmcdev,
&pmc_core_pll_fops);
diff --git a/drivers/platform/x86/intel_pmc_core.h b/drivers/platform/x86/intel_pmc_core.h
index 78dd4229489d..6f1b64808075 100644
--- a/drivers/platform/x86/intel_pmc_core.h
+++ b/drivers/platform/x86/intel_pmc_core.h
@@ -214,6 +214,7 @@ struct pmc_reg_map {
const struct pmc_bit_map *pll_sts;
const struct pmc_bit_map **slps0_dbg_maps;
const struct pmc_bit_map *ltr_show_sts;
+ const struct pmc_bit_map *msr_sts;
const u32 slp_s0_offset;
const u32 ltr_ignore_offset;
const int regmap_length;
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v3 5/5] platform/x86: intel_pmc_core: Quirk to ignore XTAL shutdown
2019-02-14 11:57 [PATCH v3 0/5] ICL support and other enhancements for PMC Core Rajneesh Bhardwaj
` (3 preceding siblings ...)
2019-02-14 11:57 ` [PATCH v3 4/5] platform/x86: intel_pmc_core: Add Package cstates residency info Rajneesh Bhardwaj
@ 2019-02-14 11:57 ` Rajneesh Bhardwaj
2019-02-21 14:25 ` [PATCH v3 0/5] ICL support and other enhancements for PMC Core Andy Shevchenko
5 siblings, 0 replies; 9+ messages in thread
From: Rajneesh Bhardwaj @ 2019-02-14 11:57 UTC (permalink / raw)
To: platform-driver-x86; +Cc: dvhart, andy, linux-kernel, Rajneesh Bhardwaj
On some platforms such as HP Elite-x2-1013-g3, the platform BIOS
enforces XTAL to remain off before S0ix state can be achieved. This may
not be optimum when we want to enable use cases like Low Power Audio,
Wake on Voice etc which always need 24mhz clock.
This introduces a new quirk to allow S0ix entry when all other
conditions except for XTAL clock are good on a given platform. The extra
power consumed by XTAL clock is about 2mw but it saves much more
platform power compared to the system that remains in just PC10.
Link: https://bit.ly/2UmnrFf
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=201579
Tested-by: "David E. Box" <david.e.box@linux.intel.com>
Reported-and-tested-by: russianneuromancer <russianneuromancer@ya.ru>
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
---
drivers/platform/x86/intel_pmc_core.c | 34 +++++++++++++++++++++++++++
drivers/platform/x86/intel_pmc_core.h | 5 ++++
2 files changed, 39 insertions(+)
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index 4e7aa1711148..a27574e3e868 100644
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -15,6 +15,7 @@
#include <linux/bitfield.h>
#include <linux/debugfs.h>
#include <linux/delay.h>
+#include <linux/dmi.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/pci.h>
@@ -151,6 +152,7 @@ static const struct pmc_reg_map spt_reg_map = {
.pm_cfg_offset = SPT_PMC_PM_CFG_OFFSET,
.pm_read_disable_bit = SPT_PMC_READ_DISABLE_BIT,
.ltr_ignore_max = SPT_NUM_IP_IGN_ALLOWED,
+ .pm_vric1_offset = SPT_PMC_VRIC1_OFFSET,
};
/* Cannonlake: PGD PFET Enable Ack Status Register(s) bitmap */
@@ -821,6 +823,37 @@ static const struct pci_device_id pmc_pci_ids[] = {
{ 0, },
};
+/*
+ * This quirk can be used on those platforms where
+ * the platform BIOS enforces 24Mhx Crystal to shutdown
+ * before PMC can assert SLP_S0#.
+ */
+int quirk_xtal_ignore(const struct dmi_system_id *id)
+{
+ struct pmc_dev *pmcdev = &pmc;
+ u32 value;
+
+ value = pmc_core_reg_read(pmcdev, pmcdev->map->pm_vric1_offset);
+ /* 24MHz Crystal Shutdown Qualification Disable */
+ value |= SPT_PMC_VRIC1_XTALSDQDIS;
+ /* Low Voltage Mode Enable */
+ value &= ~SPT_PMC_VRIC1_SLPS0LVEN;
+ pmc_core_reg_write(pmcdev, pmcdev->map->pm_vric1_offset, value);
+ return 0;
+}
+
+static const struct dmi_system_id pmc_core_dmi_table[] = {
+ {
+ .callback = quirk_xtal_ignore,
+ .ident = "HP Elite x2 1013 G3",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "HP"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "HP Elite x2 1013 G3"),
+ },
+ },
+ {}
+};
+
static int __init pmc_core_probe(void)
{
struct pmc_dev *pmcdev = &pmc;
@@ -862,6 +895,7 @@ static int __init pmc_core_probe(void)
return err;
}
+ dmi_check_system(pmc_core_dmi_table);
pr_info(" initialized\n");
return 0;
}
diff --git a/drivers/platform/x86/intel_pmc_core.h b/drivers/platform/x86/intel_pmc_core.h
index 6f1b64808075..88d9c0653a5f 100644
--- a/drivers/platform/x86/intel_pmc_core.h
+++ b/drivers/platform/x86/intel_pmc_core.h
@@ -25,6 +25,7 @@
#define SPT_PMC_MTPMC_OFFSET 0x20
#define SPT_PMC_MFPMC_OFFSET 0x38
#define SPT_PMC_LTR_IGNORE_OFFSET 0x30C
+#define SPT_PMC_VRIC1_OFFSET 0x31c
#define SPT_PMC_MPHY_CORE_STS_0 0x1143
#define SPT_PMC_MPHY_CORE_STS_1 0x1142
#define SPT_PMC_MPHY_COM_STS_0 0x1155
@@ -136,6 +137,9 @@ enum ppfear_regs {
#define SPT_PMC_BIT_MPHY_CMN_LANE2 BIT(2)
#define SPT_PMC_BIT_MPHY_CMN_LANE3 BIT(3)
+#define SPT_PMC_VRIC1_SLPS0LVEN BIT(13)
+#define SPT_PMC_VRIC1_XTALSDQDIS BIT(22)
+
/* Cannonlake Power Management Controller register offsets */
#define CNP_PMC_SLPS0_DBG_OFFSET 0x10B4
#define CNP_PMC_PM_CFG_OFFSET 0x1818
@@ -224,6 +228,7 @@ struct pmc_reg_map {
const int pm_read_disable_bit;
const u32 slps0_dbg_offset;
const u32 ltr_ignore_max;
+ const u32 pm_vric1_offset;
};
/**
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v3 0/5] ICL support and other enhancements for PMC Core
2019-02-14 11:57 [PATCH v3 0/5] ICL support and other enhancements for PMC Core Rajneesh Bhardwaj
` (4 preceding siblings ...)
2019-02-14 11:57 ` [PATCH v3 5/5] platform/x86: intel_pmc_core: Quirk to ignore XTAL shutdown Rajneesh Bhardwaj
@ 2019-02-21 14:25 ` Andy Shevchenko
2019-02-22 3:43 ` Bhardwaj, Rajneesh
5 siblings, 1 reply; 9+ messages in thread
From: Andy Shevchenko @ 2019-02-21 14:25 UTC (permalink / raw)
To: Rajneesh Bhardwaj
Cc: Platform Driver, Darren Hart, Andy Shevchenko, Linux Kernel Mailing List
On Thu, Feb 14, 2019 at 1:56 PM Rajneesh Bhardwaj
<rajneesh.bhardwaj@linux.intel.com> wrote:
>
> Changes in v3:
> * Dropped reference to coreboot project as suggested by Thomas and Boris.
> * Rebased onto "for-next" branch of pdx86 tree and dropped previously
> accepted five patches from v2 of this series since they are already
> present there.
> * Fixed checkpatch complains about 75 char limit for commit messages.
>
> Changes in v2:
> * Addressed review comments from Thomas
> * Added tags revieved
> * Folded in SHA1 suggestions from Stephen Rothwell, though Andy might
> want to fix it via rebasing
> * Rebased and tested with Linux v5.0.0-rc6
>
> This series:
> - Adds ICL U/Y CPUID to intel-family.h
> - Enables PMC driver for ICL
> - Introduces a new "package cstate show" feature
> - Fixes a customer issue related to S0ix on latest HP laptops
> - Fixes some minor bugs
>
>
Pushed to my review and testing queue, thanks!
> Rajneesh Bhardwaj (5):
> x86/cpu: Add Icelake to Intel family
> platform/x86: intel_pmc_core: Convert to INTEL_CPU_FAM6 macro
> platform/x86: intel_pmc_core: Add ICL platform support
> platform/x86: intel_pmc_core: Add Package cstates residency info
> platform/x86: intel_pmc_core: Quirk to ignore XTAL shutdown
>
> arch/x86/include/asm/intel-family.h | 2 +
> drivers/platform/x86/intel_pmc_core.c | 144 ++++++++++++++++++++++----
> drivers/platform/x86/intel_pmc_core.h | 10 ++
> 3 files changed, 135 insertions(+), 21 deletions(-)
>
> --
> 2.17.1
>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v3 0/5] ICL support and other enhancements for PMC Core
2019-02-21 14:25 ` [PATCH v3 0/5] ICL support and other enhancements for PMC Core Andy Shevchenko
@ 2019-02-22 3:43 ` Bhardwaj, Rajneesh
0 siblings, 0 replies; 9+ messages in thread
From: Bhardwaj, Rajneesh @ 2019-02-22 3:43 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Platform Driver, Darren Hart, Andy Shevchenko, Linux Kernel Mailing List
On 21-Feb-19 7:55 PM, Andy Shevchenko wrote:
> On Thu, Feb 14, 2019 at 1:56 PM Rajneesh Bhardwaj
> <rajneesh.bhardwaj@linux.intel.com> wrote:
>> Changes in v3:
>> * Dropped reference to coreboot project as suggested by Thomas and Boris.
>> * Rebased onto "for-next" branch of pdx86 tree and dropped previously
>> accepted five patches from v2 of this series since they are already
>> present there.
>> * Fixed checkpatch complains about 75 char limit for commit messages.
>>
>> Changes in v2:
>> * Addressed review comments from Thomas
>> * Added tags revieved
>> * Folded in SHA1 suggestions from Stephen Rothwell, though Andy might
>> want to fix it via rebasing
>> * Rebased and tested with Linux v5.0.0-rc6
>>
>> This series:
>> - Adds ICL U/Y CPUID to intel-family.h
>> - Enables PMC driver for ICL
>> - Introduces a new "package cstate show" feature
>> - Fixes a customer issue related to S0ix on latest HP laptops
>> - Fixes some minor bugs
>>
>>
> Pushed to my review and testing queue, thanks!
Thank you!
>
>
>> Rajneesh Bhardwaj (5):
>> x86/cpu: Add Icelake to Intel family
>> platform/x86: intel_pmc_core: Convert to INTEL_CPU_FAM6 macro
>> platform/x86: intel_pmc_core: Add ICL platform support
>> platform/x86: intel_pmc_core: Add Package cstates residency info
>> platform/x86: intel_pmc_core: Quirk to ignore XTAL shutdown
>>
>> arch/x86/include/asm/intel-family.h | 2 +
>> drivers/platform/x86/intel_pmc_core.c | 144 ++++++++++++++++++++++----
>> drivers/platform/x86/intel_pmc_core.h | 10 ++
>> 3 files changed, 135 insertions(+), 21 deletions(-)
>>
>> --
>> 2.17.1
>>
>
^ permalink raw reply [flat|nested] 9+ messages in thread