Add Alder Lake PCH-S support to PMC core driver
Subsystems (2)
v5 cover Add Alder Lake PCH-S support to PMC core driver
Hi,
The patch series move intel_pmc_core* files to pmc subfolder as well as add Alder Lake PCH-S support to PMC core driver.
Patch 1: Move intel_pmc_core* files to pmc subfolder Patch 2: Add Alderlake support to pmc core driver
Patch 3: Add Latency Tolerance Reporting (LTR) support to Alder Lake Patch 4: Add Alder Lake low power mode support for pmc core Patch 5: Add GBE Package C10 fix for Alder Lake
Changes since v1:
1) Add patch 1 to v2 i.e., Move intel_pmc_core* files to pmc subfolder.
2) Modify commit message for patch 2.
Changes since v2:
1) Dropped intel_pmc_ prefix from the file names.
Changes since v3:
1) Fixed an error reported by lkp.
Changes since v4:
1) Updated MAINTAINERS
David E. Box (1):
platform/x86/intel: pmc/core: Add GBE Package C10 fix for Alder Lake
PCH
Gayatri Kammela (4):
platform/x86/intel: intel_pmc_core: Move intel_pmc_core* files to pmc
subfolder
platform/x86/intel: pmc/core: Add Alderlake support to pmc core driver platform/x86/intel: pmc/core: Add Latency Tolerance Reporting (LTR)
support to Alder Lake
platform/x86/intel: pmc/core: Add Alder Lake low power mode support
for pmc core
MAINTAINERS | 2 +-
drivers/platform/x86/Kconfig | 21 --
drivers/platform/x86/Makefile | 1 -
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 1 +
drivers/platform/x86/intel/pmc/Kconfig | 22 ++
drivers/platform/x86/intel/pmc/Makefile | 5 +
.../{intel_pmc_core.c => intel/pmc/core.c} | 309 +++++++++++++++++-
.../{intel_pmc_core.h => intel/pmc/core.h} | 17 +
.../pmc/pltdrv.c} | 0
10 files changed, 352 insertions(+), 27 deletions(-)
create mode 100644 drivers/platform/x86/intel/pmc/Kconfig
create mode 100644 drivers/platform/x86/intel/pmc/Makefile
rename drivers/platform/x86/{intel_pmc_core.c => intel/pmc/core.c} (85%)
rename drivers/platform/x86/{intel_pmc_core.h => intel/pmc/core.h} (95%)
rename drivers/platform/x86/{intel_pmc_core_pltdrv.c => intel/pmc/pltdrv.c} (100%)base-commit: d936eb23874433caa3e3d841cfa16f5434b85dcf
Signature · 1 line
2.25.1
PATCH v5 1/5 platform/x86/intel: intel_pmc_core: Move intel_pmc_core* files to pmc subfolder
As part of collecting Intel x86 specific drivers in their own folder, move intel_pmc_core* files to its own subfolder there.
---
MAINTAINERS | 2 +-
drivers/platform/x86/Kconfig | 21 ------------------
drivers/platform/x86/Makefile | 1 -
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 1 +
drivers/platform/x86/intel/pmc/Kconfig | 22 +++++++++++++++++++
drivers/platform/x86/intel/pmc/Makefile | 5 +++++
.../{intel_pmc_core.c => intel/pmc/core.c} | 2 +-
.../{intel_pmc_core.h => intel/pmc/core.h} | 0
.../pmc/pltdrv.c} | 0
10 files changed, 31 insertions(+), 24 deletions(-)
create mode 100644 drivers/platform/x86/intel/pmc/Kconfig
create mode 100644 drivers/platform/x86/intel/pmc/Makefile
rename drivers/platform/x86/{intel_pmc_core.c => intel/pmc/core.c} (99%)
rename drivers/platform/x86/{intel_pmc_core.h => intel/pmc/core.h} (100%)
rename drivers/platform/x86/{intel_pmc_core_pltdrv.c => intel/pmc/pltdrv.c} (100%)MAINTAINERS +1 -1
@@ -9477,7 +9477,7 @@ M: David E Box <[email protected]> L: [email protected] S: Maintained F: Documentation/ABI/testing/sysfs-platform-intel-pmc -F: drivers/platform/x86/intel_pmc_core* +F: drivers/platform/x86/intel/pmc/core* INTEL PMIC GPIO DRIVERS M: Andy Shevchenko <[email protected]>
drivers/platform/x86/Kconfig +0 -21
@@ -1184,27 +1184,6 @@ config INTEL_MRFLD_PWRBTN To compile this driver as a module, choose M here: the module will be called intel_mrfld_pwrbtn. -config INTEL_PMC_CORE - tristate "Intel PMC Core driver" - depends on PCI - depends on ACPI - help - The Intel Platform Controller Hub for Intel Core SoCs provides access - to Power Management Controller registers via various interfaces. This - driver can utilize debugging capabilities and supported features as - exposed by the Power Management Controller. It also may perform some - tasks in the PMC in order to enable transition into the SLPS0 state. - It should be selected on all Intel platforms supported by the driver. - - Supported features: - - SLP_S0_RESIDENCY counter - - PCH IP Power Gating status - - LTR Ignore / LTR Show - - MPHY/PLL gating status (Sunrisepoint PCH only) - - SLPS0 Debug registers (Cannonlake/Icelake PCH) - - Low Power Mode registers (Tigerlake and beyond) - - PMC quirks as needed to enable SLPS0/S0ix - config INTEL_PMT_CLASS tristate help
drivers/platform/x86/Makefile +0 -1
@@ -128,7 +128,6 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += intel_chtdc_ti_pwrbtn.o obj-$(CONFIG_INTEL_MRFLD_PWRBTN) += intel_mrfld_pwrbtn.o -obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o intel_pmc_core_pltdrv.o obj-$(CONFIG_INTEL_PMT_CLASS) += intel_pmt_class.o obj-$(CONFIG_INTEL_PMT_TELEMETRY) += intel_pmt_telemetry.o obj-$(CONFIG_INTEL_PMT_CRASHLOG) += intel_pmt_crashlog.o
drivers/platform/x86/intel/Kconfig +1 -0
@@ -18,5 +18,6 @@ if X86_PLATFORM_DRIVERS_INTEL source "drivers/platform/x86/intel/int33fe/Kconfig" source "drivers/platform/x86/intel/int3472/Kconfig" +source "drivers/platform/x86/intel/pmc/Kconfig" endif # X86_PLATFORM_DRIVERS_INTEL
drivers/platform/x86/intel/Makefile +1 -0
@@ -6,3 +6,4 @@ obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/ obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/ +obj-$(CONFIG_INTEL_PMC_CORE) += pmc/
drivers/platform/x86/intel/pmc/Kconfig new file +22 -0
@@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config INTEL_PMC_CORE + tristate "Intel PMC Core driver" + depends on PCI + depends on ACPI + help + The Intel Platform Controller Hub for Intel Core SoCs provides access + to Power Management Controller registers via various interfaces. This + driver can utilize debugging capabilities and supported features as + exposed by the Power Management Controller. It also may perform some + tasks in the PMC in order to enable transition into the SLPS0 state. + It should be selected on all Intel platforms supported by the driver. + + Supported features: + - SLP_S0_RESIDENCY counter + - PCH IP Power Gating status + - LTR Ignore / LTR Show + - MPHY/PLL gating status (Sunrisepoint PCH only) + - SLPS0 Debug registers (Cannonlake/Icelake PCH) + - Low Power Mode registers (Tigerlake and beyond) + - PMC quirks as needed to enable SLPS0/S0ix
drivers/platform/x86/intel/pmc/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 +# + +obj-$(CONFIG_INTEL_PMC_CORE) += core.o +obj-$(CONFIG_INTEL_PMC_CORE) += pltdrv.o
drivers/platform/x86/intel/pmc/core.c renamed from drivers/platform/x86/intel_pmc_core.c +1 -1
@@ -31,7 +31,7 @@#include <asm/msr.h> #include <asm/tsc.h> -#include "intel_pmc_core.h" +#include "core.h" #define ACPI_S0IX_DSM_UUID "57a6512e-3979-4e9d-9708-ff13b2508972"#define ACPI_GET_LOW_MODE_REGISTERS 1
drivers/platform/x86/intel/pmc/core.h renamed from drivers/platform/x86/intel_pmc_core.h +0 -0
drivers/platform/x86/intel/pmc/pltdrv.c renamed from drivers/platform/x86/intel_pmc_core_pltdrv.c +0 -0
Signature · 1 line
2.25.1
Re: [PATCH v5 1/5] platform/x86/intel: intel_pmc_core: Move intel_pmc_core* files to pmc subfolder
Quoted 140 lines · Gayatri Kammela
As part of collecting Intel x86 specific drivers in their own folder, move intel_pmc_core* files to its own subfolder there.
Cc Srinivas Pandruvada <[email protected]>Cc David Box <[email protected]>Cc You-Sheng Yang <[email protected]>Cc Hans de Goede <[email protected]>Suggested-by Andy Shevchenko <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Signed-off-by Gayatri Kammela <[email protected]>---
MAINTAINERS | 2 +- drivers/platform/x86/Kconfig | 21 ------------------ drivers/platform/x86/Makefile | 1 - drivers/platform/x86/intel/Kconfig | 1 + drivers/platform/x86/intel/Makefile | 1 + drivers/platform/x86/intel/pmc/Kconfig | 22 +++++++++++++++++++ drivers/platform/x86/intel/pmc/Makefile | 5 +++++ .../{intel_pmc_core.c => intel/pmc/core.c} | 2 +- .../{intel_pmc_core.h => intel/pmc/core.h} | 0 .../pmc/pltdrv.c} | 0 10 files changed, 31 insertions(+), 24 deletions(-)create mode 100644
drivers/platform/x86/intel/pmc/Kconfig
create mode 100644drivers/platform/x86/intel/pmc/Makefile
renamedrivers/platform/x86/{intel_pmc_core.c=>intel/pmc/core.c} (99%) renamedrivers/platform/x86/{intel_pmc_core.h=>intel/pmc/core.h} (100%) renamedrivers/platform/x86/{intel_pmc_core_pltdrv.c=>intel/pmc/pltdrv.c} (100%)MAINTAINERS +0
-0@@ -9477,7 +9477,7 @@ M: David E Box <[email protected]>L: [email protected]
S: Maintained
F:Documentation/ABI/testing/sysfs-platform-intel-pmcMAINTAINERS +1
-1-F: drivers/platform/x86/intel_pmc_core* +F: drivers/platform/x86/intel/pmc/core*INTEL PMIC GPIO DRIVERS
M: Andy Shevchenko <[email protected]>drivers/platform/x86/Kconfig +0
-21@@ -1184,27 +1184,6 @@ config INTEL_MRFLD_PWRBTN To compile this driver as a module, choose M here: the module will be called intel_mrfld_pwrbtn. -config INTEL_PMC_CORE - tristate "Intel PMC Core driver" - depends on PCI - depends on ACPI - help - The Intel Platform Controller Hub for Intel Core SoCs provides access - to Power Management Controller registers via various interfaces. This - driver can utilize debugging capabilities and supported features as - exposed by the Power Management Controller. It also may perform some - tasks in the PMC in order to enable transition into the SLPS0 state. - It should be selected on all Intel platforms supported by the driver. - - Supported features: - - SLP_S0_RESIDENCY counter - - PCH IP Power Gating status - - LTR Ignore / LTR Show - - MPHY/PLL gating status (Sunrisepoint PCH only) - - SLPS0 Debug registers (Cannonlake/Icelake PCH) - - Low Power Mode registers (Tigerlake and beyond) - - PMC quirks as needed to enable SLPS0/S0ix -config
INTEL_PMT_CLASS
tristate
helpdrivers/platform/x86/Makefile +0
-0@@ -128,7 +128,6 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.oobj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o
obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += intel_chtdc_ti_pwrbtn.o
obj-$(CONFIG_INTEL_MRFLD_PWRBTN) += intel_mrfld_pwrbtn.o
-obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o intel_pmc_core_pltdrv.o
obj-$(CONFIG_INTEL_PMT_CLASS) += intel_pmt_class.o
obj-$(CONFIG_INTEL_PMT_TELEMETRY) += intel_pmt_telemetry.o
obj-$(CONFIG_INTEL_PMT_CRASHLOG) += intel_pmt_crashlog.odrivers/platform/x86/intel/Kconfig +0
-0@@ -18,5 +18,6 @@ if X86_PLATFORM_DRIVERS_INTELsource "
drivers/platform/x86/intel/int33fe/Kconfig" source "drivers/platform/x86/intel/int3472/Kconfig" +source "drivers/platform/x86/intel/pmc/Kconfig"endif #
X86_PLATFORM_DRIVERS_INTELdrivers/platform/x86/intel/Makefile +0
-0@@ -6,3 +6,4 @@obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/
obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/drivers/platform/x86/intel/Makefile +1
-0+obj-$(CONFIG_INTEL_PMC_CORE) += pmc/drivers/platform/x86/intel/pmc/Kconfig new file +22
-0@@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config INTEL_PMC_CORE + tristate "Intel PMC Core driver" + depends on PCI + depends on ACPI + help + The Intel Platform Controller Hub for Intel Core SoCs provides access + to Power Management Controller registers via various interfaces. This + driver can utilize debugging capabilities and supported features as + exposed by the Power Management Controller. It also may perform some + tasks in the PMC in order to enable transition into the SLPS0 state. + It should be selected on all Intel platforms supported by the driver. + + Supported features: + - SLP_S0_RESIDENCY counter + - PCH IP Power Gating status + - LTR Ignore / LTR Show + - MPHY/PLL gating status (Sunrisepoint PCH only) + - SLPS0 Debug registers (Cannonlake/Icelake PCH) + - Low Power Mode registers (Tigerlake and beyond) + - PMC quirks as needed to enable SLPS0/S0ixdrivers/platform/x86/intel/pmc/Makefile new file +0
-0
drivers/platform/x86/intel/pmc/Makefile line 5
Quoted 5 lines
drivers/platform/x86/intel/pmc/Makefile new file +5
-0@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 +# + +obj-$(CONFIG_INTEL_PMC_CORE) += core.o +obj-$(CONFIG_INTEL_PMC_CORE) += pltdrv.o
is the module rename really intentional? If so, it needs to be renamed to something else as just calling it core may conflict with other equally badly named modules.
error: the following would cause module name conflict:
GEN .version
drivers/misc/c2port/core.ko drivers/platform/x86/intel/pmc/core.ko
make[2]: *** [Makefile:1417: modules_check] Error 1 make[2]: *** Waiting for unfinished jobs....
This builds for me by restoring the previous module names
-----8<------
drivers/platform/x86/intel/pmc/Makefile +5 -2
@@ -1,5 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 # -obj-$(CONFIG_INTEL_PMC_CORE) += core.o -obj-$(CONFIG_INTEL_PMC_CORE) += pltdrv.o +obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o +obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core_pltdrv.o + +intel_pmc_core-y += core.o +intel_pmc_core_pltdrv-y += pltdrv.o
-----8<------
Lucas De Marchi
Quoted 27 lines
drivers/platform/x86/intel/pmc/core.c renamed from drivers/platform/x86/intel_pmc_core.c +1
-1@@ -31,7 +31,7 @@#include <asm/msr.h> #include <asm/tsc.h> -#include "intel_pmc_core.h" +#include "core.h" #define ACPI_S0IX_DSM_UUID "57a6512e-3979-4e9d-9708-ff13b2508972"#define ACPI_GET_LOW_MODE_REGISTERS 1drivers/platform/x86/intel/pmc/core.h renamed from drivers/platform/x86/intel_pmc_core.h +0
-0drivers/platform/x86/intel/pmc/pltdrv.c renamed from drivers/platform/x86/intel_pmc_core_pltdrv.c +0
-0Signature · 1 line
2.25.1
RE: [PATCH v5 1/5] platform/x86/intel: intel_pmc_core: Move intel_pmc_core* files to pmc subfolder
Quoted 173 lines
-----Original Message-----
From: De Marchi, Lucas <[email protected]>
Sent: Monday, August 16, 2021 10:38 AM
To: Kammela, Gayatri <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Pandruvada, Srinivas <[email protected]>; Box, David E <[email protected]>; [email protected]; Mashiah, Tamar <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Andy Shevchenko <[email protected]>
Subject: Re: [PATCH v5 1/5] platform/x86/intel:intel_pmc_core: Move intel_pmc_core* files to pmc subfolderQuoted 49 lines · Gayatri Kammela
As part of collecting Intel x86 specific drivers in their own folder, move intel_pmc_core* files to its own subfolder there.
Cc Srinivas Pandruvada <[email protected]>Cc David Box <[email protected]>Cc You-Sheng Yang <[email protected]>Cc Hans de Goede <[email protected]>Suggested-by Andy Shevchenko <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Signed-off-by Gayatri Kammela <[email protected]>---
MAINTAINERS | 2 +- drivers/platform/x86/Kconfig | 21 ------------------ drivers/platform/x86/Makefile | 1 - drivers/platform/x86/intel/Kconfig | 1 + drivers/platform/x86/intel/Makefile | 1 + drivers/platform/x86/intel/pmc/Kconfig | 22 +++++++++++++++++++ drivers/platform/x86/intel/pmc/Makefile | 5 +++++ .../{intel_pmc_core.c => intel/pmc/core.c} | 2 +- .../{intel_pmc_core.h => intel/pmc/core.h} | 0 .../pmc/pltdrv.c} | 0 10 files changed, 31 insertions(+), 24 deletions(-) create mode100644
drivers/platform/x86/intel/pmc/Kconfig
create mode 100644drivers/platform/x86/intel/pmc/Makefilerenamedrivers/platform/x86/{intel_pmc_core.c=>intel/pmc/core.c} (99%) renamedrivers/platform/x86/{intel_pmc_core.h=>intel/pmc/core.h} (100%) renamedrivers/platform/x86/{intel_pmc_core_pltdrv.c=>intel/pmc/pltdrv.c} (100%)MAINTAINERS +0
-0@@ -9477,7 +9477,7 @@ M: David E Box <[email protected]>L: [email protected]
S: Maintained
F:Documentation/ABI/testing/sysfs-platform-intel-pmcMAINTAINERS +1
-1-F: drivers/platform/x86/intel_pmc_core* +F: drivers/platform/x86/intel/pmc/core*INTEL PMIC GPIO DRIVERS
M: Andy Shevchenko <[email protected]>(quoted diff) +0
-0b/drivers/platform/x86/Kconfig index
7d385c3b2239..cae72922f448100644drivers/platform/x86/Kconfig config INTEL_MRFLD_PWRBTN · line 1192
Quoted 9 lines
drivers/platform/x86/Kconfig +0
-6@@ -1184,27 +1184,6 @@ config INTEL_MRFLD_PWRBTN To compile this driver as a module, choose M here: the module will be called intel_mrfld_pwrbtn. -config INTEL_PMC_CORE - tristate "Intel PMC Core driver" - depends on PCI - depends on ACPI - help - The Intel Platform Controller Hub for Intel Core SoCs providesaccess
drivers/platform/x86/Kconfig config INTEL_MRFLD_PWRBTN · line 1193
Quoted 1 line
drivers/platform/x86/Kconfig +0
-1- to Power Management Controller registers via various interfaces.This
drivers/platform/x86/Kconfig config INTEL_MRFLD_PWRBTN · line 1195
Quoted 2 lines
drivers/platform/x86/Kconfig +0
-2- driver can utilize debugging capabilities and supported features as - exposed by the Power Management Controller. It also may performsome
Quoted 15 lines
drivers/platform/x86/Kconfig +0
-12- tasks in the PMC in order to enable transition into the SLPS0 state. - It should be selected on all Intel platforms supported by the driver. - - Supported features: - - SLP_S0_RESIDENCY counter - - PCH IP Power Gating status - - LTR Ignore / LTR Show - - MPHY/PLL gating status (Sunrisepoint PCH only) - - SLPS0 Debug registers (Cannonlake/Icelake PCH) - - Low Power Mode registers (Tigerlake and beyond) - - PMC quirks as needed to enable SLPS0/S0ix -config
INTEL_PMT_CLASS
tristate
helpQuoted 2 lines
(quoted diff) +0
-0b/drivers/platform/x86/Makefile index
7ee369aab10d..43d36f8c36f1100644
drivers/platform/x86/Makefile obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)
Quoted 3 lines
drivers/platform/x86/Makefile +0
-0@@ -128,7 +128,6 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)+= intel-uncore-frequency.oQuoted 4 lines
obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o
obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += intel_chtdc_ti_pwrbtn.o
obj-$(CONFIG_INTEL_MRFLD_PWRBTN) += intel_mrfld_pwrbtn.o
-obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.ointel_pmc_core_pltdrv.o
Quoted 32 lines
obj-$(CONFIG_INTEL_PMT_CLASS) += intel_pmt_class.o
obj-$(CONFIG_INTEL_PMT_TELEMETRY) += intel_pmt_telemetry.o
obj-$(CONFIG_INTEL_PMT_CRASHLOG) += intel_pmt_crashlog.odrivers/platform/x86/intel/Kconfig +0
-0@@ -18,5 +18,6 @@ if X86_PLATFORM_DRIVERS_INTELsource "
drivers/platform/x86/intel/int33fe/Kconfig" source "drivers/platform/x86/intel/int3472/Kconfig" +source "drivers/platform/x86/intel/pmc/Kconfig"endif #
X86_PLATFORM_DRIVERS_INTELdrivers/platform/x86/intel/Makefile +0
-0@@ -6,3 +6,4 @@obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/
obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/drivers/platform/x86/intel/Makefile +1
-0+obj-$(CONFIG_INTEL_PMC_CORE) += pmc/drivers/platform/x86/intel/pmc/Kconfig new file +0
-0drivers/platform/x86/intel/pmc/Kconfig line 8
Quoted 8 lines
drivers/platform/x86/intel/pmc/Kconfig new file +8
-0@@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config INTEL_PMC_CORE + tristate "Intel PMC Core driver" + depends on PCI + depends on ACPI + help + The Intel Platform Controller Hub for Intel Core SoCs providesaccess
drivers/platform/x86/intel/pmc/Kconfig line 9
Quoted 1 line
drivers/platform/x86/intel/pmc/Kconfig new file +1
-0+ to Power Management Controller registers via various interfaces.This
drivers/platform/x86/intel/pmc/Kconfig line 11
Quoted 2 lines
drivers/platform/x86/intel/pmc/Kconfig new file +2
-0+ driver can utilize debugging capabilities and supported features as + exposed by the Power Management Controller. It also may performsome
Quoted 19 lines
drivers/platform/x86/intel/pmc/Kconfig new file +11
-0+ tasks in the PMC in order to enable transition into the SLPS0 state. + It should be selected on all Intel platforms supported by the driver. + + Supported features: + - SLP_S0_RESIDENCY counter + - PCH IP Power Gating status + - LTR Ignore / LTR Show + - MPHY/PLL gating status (Sunrisepoint PCH only) + - SLPS0 Debug registers (Cannonlake/Icelake PCH) + - Low Power Mode registers (Tigerlake and beyond) + - PMC quirks as needed to enable SLPS0/S0ixdrivers/platform/x86/intel/pmc/Makefile new file +1
-0@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0
Quoted 8 lines
drivers/platform/x86/intel/pmc/Makefile line 5
Quoted 4 lines
drivers/platform/x86/intel/pmc/Makefile new file +4
-0+# + +obj-$(CONFIG_INTEL_PMC_CORE) += core.o +obj-$(CONFIG_INTEL_PMC_CORE) += pltdrv.ois the module rename really intentional? If so, it needs to be renamed to something else as just calling it core may conflict with other equally badly named modules.
Hi Lucas! Yes, the module rename is intentional. Thanks for reporting the issue. This issue has been addressed in V6. I have just sent the V7 https://patchwork.kernel.org/project/platform-driver-x86/list/
Quoted 63 lines
error: the following would cause module name conflict:
GEN .version
drivers/misc/c2port/core.kodrivers/platform/x86/intel/pmc/core.ko
make[2]: *** [Makefile:1417:modules_check] Error 1 make[2]: *** Waiting for unfinished jobs....This builds for me by restoring the previous module names
-----8<------
drivers/platform/x86/intel/pmc/Makefile +5
-3@@ -1,5 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 # -obj-$(CONFIG_INTEL_PMC_CORE) += core.o -obj-$(CONFIG_INTEL_PMC_CORE) += pltdrv.o +obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o +obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core_pltdrv.o + +intel_pmc_core-y += core.o +intel_pmc_core_pltdrv-y += pltdrv.o -----8<------Lucas De Marchi
Quoted 9 lines
drivers/platform/x86/intel/pmc/core.c renamed from drivers/platform/x86/intel_pmc_core.c +0
-0drivers/platform/x86/intel/pmc/core.c line 36
Quoted 7 lines
drivers/platform/x86/intel/pmc/core.c renamed from drivers/platform/x86/intel_pmc_core.c +1
-1@@ -31,7 +31,7 @@#include <asm/msr.h> #include <asm/tsc.h> -#include "intel_pmc_core.h" +#include "core.h" #define ACPI_S0IX_DSM_UUID "57a6512e-3979-4e9d-9708-
ff13b2508972"Quoted 14 lines
drivers/platform/x86/intel/pmc/core.c renamed from drivers/platform/x86/intel_pmc_core.c +0
-0#define ACPI_GET_LOW_MODE_REGISTERS 1drivers/platform/x86/intel/pmc/core.h renamed from drivers/platform/x86/intel_pmc_core.h +0
-0drivers/platform/x86/intel/pmc/pltdrv.c renamed from drivers/platform/x86/intel_pmc_core_pltdrv.c +0
-1--2.25.1
Re: [PATCH v5 1/5] platform/x86/intel: intel_pmc_core: Move intel_pmc_core* files to pmc subfolder
Quoted 181 lines · Gayatri
Quoted 173 lines
-----Original Message-----
From: De Marchi, Lucas <[email protected]>
Sent: Monday, August 16, 2021 10:38 AM
To: Kammela, Gayatri <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Pandruvada, Srinivas <[email protected]>; Box, David E <[email protected]>; [email protected]; Mashiah, Tamar <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Andy Shevchenko <[email protected]>
Subject: Re: [PATCH v5 1/5] platform/x86/intel:intel_pmc_core: Move intel_pmc_core* files to pmc subfolderQuoted 49 lines · Gayatri Kammela
As part of collecting Intel x86 specific drivers in their own folder, move intel_pmc_core* files to its own subfolder there.
Cc Srinivas Pandruvada <[email protected]>Cc David Box <[email protected]>Cc You-Sheng Yang <[email protected]>Cc Hans de Goede <[email protected]>Suggested-by Andy Shevchenko <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Signed-off-by Gayatri Kammela <[email protected]>---
MAINTAINERS | 2 +- drivers/platform/x86/Kconfig | 21 ------------------ drivers/platform/x86/Makefile | 1 - drivers/platform/x86/intel/Kconfig | 1 + drivers/platform/x86/intel/Makefile | 1 + drivers/platform/x86/intel/pmc/Kconfig | 22 +++++++++++++++++++ drivers/platform/x86/intel/pmc/Makefile | 5 +++++ .../{intel_pmc_core.c => intel/pmc/core.c} | 2 +- .../{intel_pmc_core.h => intel/pmc/core.h} | 0 .../pmc/pltdrv.c} | 0 10 files changed, 31 insertions(+), 24 deletions(-) create mode100644
drivers/platform/x86/intel/pmc/Kconfig
create mode 100644drivers/platform/x86/intel/pmc/Makefilerenamedrivers/platform/x86/{intel_pmc_core.c=>intel/pmc/core.c} (99%) renamedrivers/platform/x86/{intel_pmc_core.h=>intel/pmc/core.h} (100%) renamedrivers/platform/x86/{intel_pmc_core_pltdrv.c=>intel/pmc/pltdrv.c} (100%)MAINTAINERS +0
-0@@ -9477,7 +9477,7 @@ M: David E Box <[email protected]>L: [email protected] S: Maintained F: Documentation/ABI/testing/sysfs-platform-intel-pmcMAINTAINERS +1
-1-F: drivers/platform/x86/intel_pmc_core* +F: drivers/platform/x86/intel/pmc/core*INTEL PMIC GPIO DRIVERS
M: Andy Shevchenko <[email protected]>(quoted diff) +0
-0b/drivers/platform/x86/Kconfig index
7d385c3b2239..cae72922f448100644drivers/platform/x86/Kconfig config INTEL_MRFLD_PWRBTN · line 1192
Quoted 9 lines
drivers/platform/x86/Kconfig +0
-6@@ -1184,27 +1184,6 @@ config INTEL_MRFLD_PWRBTN To compile this driver as a module, choose M here: the module will be called intel_mrfld_pwrbtn. -config INTEL_PMC_CORE - tristate "Intel PMC Core driver" - depends on PCI - depends on ACPI - help - The Intel Platform Controller Hub for Intel Core SoCs providesaccess
drivers/platform/x86/Kconfig config INTEL_MRFLD_PWRBTN · line 1193
Quoted 1 line
drivers/platform/x86/Kconfig +0
-1- to Power Management Controller registers via various interfaces.This
drivers/platform/x86/Kconfig config INTEL_MRFLD_PWRBTN · line 1195
Quoted 2 lines
drivers/platform/x86/Kconfig +0
-2- driver can utilize debugging capabilities and supported features as - exposed by the Power Management Controller. It also may performsome
Quoted 15 lines
drivers/platform/x86/Kconfig +0
-12- tasks in the PMC in order to enable transition into the SLPS0 state. - It should be selected on all Intel platforms supported by the driver. - - Supported features: - - SLP_S0_RESIDENCY counter - - PCH IP Power Gating status - - LTR Ignore / LTR Show - - MPHY/PLL gating status (Sunrisepoint PCH only) - - SLPS0 Debug registers (Cannonlake/Icelake PCH) - - Low Power Mode registers (Tigerlake and beyond) - - PMC quirks as needed to enable SLPS0/S0ix -config
INTEL_PMT_CLASS
tristate
helpQuoted 2 lines
(quoted diff) +0
-0b/drivers/platform/x86/Makefile index
7ee369aab10d..43d36f8c36f1100644
drivers/platform/x86/Makefile obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)
Quoted 3 lines
drivers/platform/x86/Makefile +0
-0@@ -128,7 +128,6 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)+= intel-uncore-frequency.o > obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.oQuoted 3 lines
obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += intel_chtdc_ti_pwrbtn.o
obj-$(CONFIG_INTEL_MRFLD_PWRBTN) += intel_mrfld_pwrbtn.o
-obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.ointel_pmc_core_pltdrv.o
Quoted 32 lines
obj-$(CONFIG_INTEL_PMT_CLASS) += intel_pmt_class.o
obj-$(CONFIG_INTEL_PMT_TELEMETRY) += intel_pmt_telemetry.o
obj-$(CONFIG_INTEL_PMT_CRASHLOG) += intel_pmt_crashlog.odrivers/platform/x86/intel/Kconfig +0
-0@@ -18,5 +18,6 @@ if X86_PLATFORM_DRIVERS_INTELsource "
drivers/platform/x86/intel/int33fe/Kconfig" source "drivers/platform/x86/intel/int3472/Kconfig" +source "drivers/platform/x86/intel/pmc/Kconfig"endif #
X86_PLATFORM_DRIVERS_INTELdrivers/platform/x86/intel/Makefile +0
-0@@ -6,3 +6,4 @@obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/
obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/drivers/platform/x86/intel/Makefile +1
-0+obj-$(CONFIG_INTEL_PMC_CORE) += pmc/drivers/platform/x86/intel/pmc/Kconfig new file +0
-0drivers/platform/x86/intel/pmc/Kconfig line 8
Quoted 8 lines
drivers/platform/x86/intel/pmc/Kconfig new file +8
-0@@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config INTEL_PMC_CORE + tristate "Intel PMC Core driver" + depends on PCI + depends on ACPI + help + The Intel Platform Controller Hub for Intel Core SoCs providesaccess
drivers/platform/x86/intel/pmc/Kconfig line 9
Quoted 1 line
drivers/platform/x86/intel/pmc/Kconfig new file +1
-0+ to Power Management Controller registers via various interfaces.This
drivers/platform/x86/intel/pmc/Kconfig line 11
Quoted 2 lines
drivers/platform/x86/intel/pmc/Kconfig new file +2
-0+ driver can utilize debugging capabilities and supported features as + exposed by the Power Management Controller. It also may performsome
Quoted 19 lines
drivers/platform/x86/intel/pmc/Kconfig new file +11
-0+ tasks in the PMC in order to enable transition into the SLPS0 state. + It should be selected on all Intel platforms supported by the driver. + + Supported features: + - SLP_S0_RESIDENCY counter + - PCH IP Power Gating status + - LTR Ignore / LTR Show + - MPHY/PLL gating status (Sunrisepoint PCH only) + - SLPS0 Debug registers (Cannonlake/Icelake PCH) + - Low Power Mode registers (Tigerlake and beyond) + - PMC quirks as needed to enable SLPS0/S0ixdrivers/platform/x86/intel/pmc/Makefile new file +1
-0@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0Quoted 8 lines
drivers/platform/x86/intel/pmc/Makefile line 5
Quoted 4 lines
drivers/platform/x86/intel/pmc/Makefile new file +4
-0+# + +obj-$(CONFIG_INTEL_PMC_CORE) += core.o +obj-$(CONFIG_INTEL_PMC_CORE) += pltdrv.ois the module rename really intentional? If so, it needs to be renamed to something else as just calling it core may conflict with other equally badly named modules.
Quoted 1 line
Hi Lucas! Yes, the module rename is intentional. Thanks for reporting the issue. This issue has been addressed in V6. I have just sent the V7 https://patchwork.kernel.org/project/platform-driver-x86/list/
ok, thanks! I guess I forgot the -c flag to b4, that correctly downloads v7:
b4 am -c b2cb6b10b75445acceab3030c3a9aa585e7c7b65.1626459866.git.gayatri.kammela@intel.com ... New revision: [PATCH v7 0/5] Add Alder Lake PCH-S support to PMC core driver
Lucas De Marchi
PATCH v5 2/5 platform/x86/intel: pmc/core: Add Alderlake support to pmc core driver
In reply to Gayatri KammelaAdd Alder Lake client and mobile support to pmc core driver.
--- drivers/platform/x86/intel/pmc/core.c | 68 +++++++++++++++++++++++++++ drivers/platform/x86/intel/pmc/core.h | 2 + 2 files changed, 70 insertions(+)
drivers/platform/x86/intel/pmc/core.c +68 -0
@@ -645,6 +645,73 @@ static void pmc_core_get_tgl_lpm_reqs(struct platform_device *pdev)ACPI_FREE (out_obj); } +/* Alder Lake: PGD PFET Enable Ack Status Register(s) bitmap */ +static const struct pmc_bit_map adl_pfear_map[] = { + {"SPI/eSPI" ,BIT (2 )}, + {"XHCI" ,BIT (3 )}, + {"SPA" ,BIT (4 )}, + {"SPB" ,BIT (5 )}, + {"SPC" ,BIT (6 )}, + {"GBE" ,BIT (7 )}, + + {"SATA" ,BIT (0 )}, + {"HDA_PGD0" ,BIT (1 )}, + {"HDA_PGD1" ,BIT (2 )}, + {"HDA_PGD2" ,BIT (3 )}, + {"HDA_PGD3" ,BIT (4 )}, + {"SPD" ,BIT (5 )}, + {"LPSS" ,BIT (6 )}, + + {"SMB" ,BIT (0 )}, + {"ISH" ,BIT (1 )}, + {"ITH" ,BIT (3 )}, + + {"XDCI" ,BIT (1 )}, + {"DCI" ,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_SMS2" ,BIT (4 )}, + {"CSME_SMS1" ,BIT (5 )}, + {"CSME_RTC" ,BIT (6 )}, + {"CSME_PSF" ,BIT (7 )}, + + {"CNVI" ,BIT (3 )}, + + {"HDA_PGD4" ,BIT (2 )}, + {"HDA_PGD5" ,BIT (3 )}, + {"HDA_PGD6" ,BIT (4 )}, + {} +}; + +static const struct pmc_bit_map *ext_adl_pfear_map[] = { +/* +* Check intel_pmc_core_ids[] users of cnp_reg_map for +* a list of core SoCs using this. +*/ + adl_pfear_map, +NULL +}; + +static const struct pmc_reg_map adl_reg_map = { + .pfear_sts = ext_adl_pfear_map, + .slp_s0_offset =ADL_PMC_SLP_S0_RES_COUNTER_OFFSET , + .slp_s0_res_counter_step =TGL_PMC_SLP_S0_RES_COUNTER_STEP , + .msr_sts = msr_map, + .ltr_ignore_offset =CNP_PMC_LTR_IGNORE_OFFSET , + .regmap_length =CNP_PMC_MMIO_REG_LEN , + .ppfear0_offset =CNP_PMC_HOST_PPFEAR0A , + .ppfear_buckets =CNP_PPFEAR_NUM_ENTRIES , + .pm_cfg_offset =CNP_PMC_PM_CFG_OFFSET , + .pm_read_disable_bit =CNP_PMC_READ_DISABLE_BIT , +}; +static inline u32 pmc_core_reg_read (struct pmc_dev *pmcdev,int reg_offset) {return readl (pmcdev->regbase + reg_offset);
@@ -1574,6 +1641,7 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = {X86_MATCH_INTEL_FAM6_MODEL (ATOM_TREMONT_L , &icl_reg_map),X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &tgl_reg_map),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &tgl_reg_map), + X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &adl_reg_map), {} };
drivers/platform/x86/intel/pmc/core.h +2 -0
@@ -197,6 +197,8 @@ enum ppfear_regs {#define TGL_NUM_IP_IGN_ALLOWED 23#define TGL_PMC_LPM_RES_COUNTER_STEP_X2 61/* 30.5us * 2 */ +#define ADL_PMC_SLP_S0_RES_COUNTER_OFFSET 0x1098 +/* * Tigerlake Power Management Controller register offsets */
Signature · 1 line
2.25.1
PATCH v5 3/5 platform/x86/intel: pmc/core: Add Latency Tolerance Reporting (LTR) support to Alder Lake
In reply to Gayatri KammelaAdd support to show the Latency Tolerance Reporting for the IPs on the Alder Lake PCH as reported by the PMC. This LTR support on Alder Lake is slightly different from the Cannon lake PCH that is being reused by all platforms till Tiger Lake.
--- drivers/platform/x86/intel/pmc/core.c | 39 +++++++++++++++++++++++++++ drivers/platform/x86/intel/pmc/core.h | 2 ++ 2 files changed, 41 insertions(+)
drivers/platform/x86/intel/pmc/core.c +39 -0
@@ -699,10 +699,48 @@ static const struct pmc_bit_map *ext_adl_pfear_map[] = {NULL }; +static const struct pmc_bit_map adl_ltr_show_map[] = { + {"SOUTHPORT_A" ,CNP_PMC_LTR_SPA }, + {"SOUTHPORT_B" ,CNP_PMC_LTR_SPB }, + {"SATA" ,CNP_PMC_LTR_SATA }, + {"GIGABIT_ETHERNET" ,CNP_PMC_LTR_GBE }, + {"XHCI" ,CNP_PMC_LTR_XHCI }, + {"SOUTHPORT_F" ,ADL_PMC_LTR_SPF }, + {"ME" ,CNP_PMC_LTR_ME }, +/* EVA is Enterprise Value Add, doesn't really exist on PCH */ + {"SATA1" ,CNP_PMC_LTR_EVA }, + {"SOUTHPORT_C" ,CNP_PMC_LTR_SPC }, + {"HD_AUDIO" ,CNP_PMC_LTR_AZ }, + {"CNV" ,CNP_PMC_LTR_CNV }, + {"LPSS" ,CNP_PMC_LTR_LPSS }, + {"SOUTHPORT_D" ,CNP_PMC_LTR_SPD }, + {"SOUTHPORT_E" ,CNP_PMC_LTR_SPE }, + {"SATA2" ,CNP_PMC_LTR_CAM }, + {"ESPI" ,CNP_PMC_LTR_ESPI }, + {"SCC" ,CNP_PMC_LTR_SCC }, + {"ISH" ,CNP_PMC_LTR_ISH }, + {"UFSX2" ,CNP_PMC_LTR_UFSX2 }, + {"EMMC" ,CNP_PMC_LTR_EMMC }, +/* +* Check intel_pmc_core_ids[] users of cnp_reg_map for +* a list of core SoCs using this. +*/ + {"WIGIG" ,ICL_PMC_LTR_WIGIG }, + {"THC0" ,TGL_PMC_LTR_THC0 }, + {"THC1" ,TGL_PMC_LTR_THC1 }, + {"SOUTHPORT_G" ,CNP_PMC_LTR_RESERVED }, + +/* Below two cannot be used for LTR_IGNORE */ + {"CURRENT_PLATFORM" ,CNP_PMC_LTR_CUR_PLT }, + {"AGGREGATED_SYSTEM" ,CNP_PMC_LTR_CUR_ASLT }, + {} +}; +static const struct pmc_reg_map adl_reg_map = { .pfear_sts = ext_adl_pfear_map, .slp_s0_offset =ADL_PMC_SLP_S0_RES_COUNTER_OFFSET , .slp_s0_res_counter_step =TGL_PMC_SLP_S0_RES_COUNTER_STEP , + .ltr_show_sts = adl_ltr_show_map, .msr_sts = msr_map, .ltr_ignore_offset =CNP_PMC_LTR_IGNORE_OFFSET , .regmap_length =CNP_PMC_MMIO_REG_LEN ,
@@ -710,6 +748,7 @@ static const struct pmc_reg_map adl_reg_map = { .ppfear_buckets = CNP_PPFEAR_NUM_ENTRIES, .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT, + .ltr_ignore_max = ADL_NUM_IP_IGN_ALLOWED, };static inline u32 pmc_core_reg_read (struct pmc_dev *pmcdev,int reg_offset)
drivers/platform/x86/intel/pmc/core.h +2 -0
@@ -197,6 +197,8 @@ enum ppfear_regs {#define TGL_NUM_IP_IGN_ALLOWED 23#define TGL_PMC_LPM_RES_COUNTER_STEP_X2 61/* 30.5us * 2 */ +#define ADL_PMC_LTR_SPF 0x1C00 +#define ADL_NUM_IP_IGN_ALLOWED 23#define ADL_PMC_SLP_S0_RES_COUNTER_OFFSET 0x1098/*
Signature · 1 line
2.25.1
PATCH v5 4/5 platform/x86/intel: pmc/core: Add Alder Lake low power mode support for pmc core
In reply to Gayatri KammelaAlder Lake has 14 status registers that are memory mapped. These registers show the status of the low power mode requirements. The registers are latched on every C10 entry or exit and on every s0ix.y entry/exit. Accessing these registers is useful for debugging any low power related activities.
Thus, add debugfs entry to access low power mode status registers.
--- drivers/platform/x86/intel/pmc/core.c | 194 ++++++++++++++++++++++++++ drivers/platform/x86/intel/pmc/core.h | 13 ++ 2 files changed, 207 insertions(+)
drivers/platform/x86/intel/pmc/core.c +194 -0
@@ -736,6 +736,189 @@ static const struct pmc_bit_map adl_ltr_show_map[] = { {} }; +static const struct pmc_bit_map adl_clocksource_status_map[] = { + {"CLKPART1_OFF_STS" ,BIT (0 )}, + {"CLKPART2_OFF_STS" ,BIT (1 )}, + {"CLKPART3_OFF_STS" ,BIT (2 )}, + {"CLKPART4_OFF_STS" ,BIT (3 )}, + {"CLKPART5_OFF_STS" ,BIT (4 )}, + {"CLKPART6_OFF_STS" ,BIT (5 )}, + {"CLKPART7_OFF_STS" ,BIT (6 )}, + {"CLKPART8_OFF_STS" ,BIT (7 )}, + {"PCIE0PLL_OFF_STS" ,BIT (10 )}, + {"PCIE1PLL_OFF_STS" ,BIT (11 )}, + {"PCIE2PLL_OFF_STS" ,BIT (12 )}, + {"PCIE3PLL_OFF_STS" ,BIT (13 )}, + {"PCIE4PLL_OFF_STS" ,BIT (14 )}, + {"PCIE5PLL_OFF_STS" ,BIT (15 )}, + {"PCIE6PLL_OFF_STS" ,BIT (16 )}, + {"USB2PLL_OFF_STS" ,BIT (18 )}, + {"OCPLL_OFF_STS" ,BIT (22 )}, + {"AUDIOPLL_OFF_STS" ,BIT (23 )}, + {"GBEPLL_OFF_STS" ,BIT (24 )}, + {"Fast_XTAL_Osc_OFF_STS" ,BIT (25 )}, + {"AC_Ring_Osc_OFF_STS" ,BIT (26 )}, + {"MC_Ring_Osc_OFF_STS" ,BIT (27 )}, + {"SATAPLL_OFF_STS" ,BIT (29 )}, + {"USB3PLL_OFF_STS" ,BIT (31 )}, + {} +}; + +static const struct pmc_bit_map adl_power_gating_status_0_map[] = { + {"PMC_PGD0_PG_STS" ,BIT (0 )}, + {"DMI_PGD0_PG_STS" ,BIT (1 )}, + {"ESPISPI_PGD0_PG_STS" ,BIT (2 )}, + {"XHCI_PGD0_PG_STS" ,BIT (3 )}, + {"SPA_PGD0_PG_STS" ,BIT (4 )}, + {"SPB_PGD0_PG_STS" ,BIT (5 )}, + {"SPC_PGD0_PG_STS" ,BIT (6 )}, + {"GBE_PGD0_PG_STS" ,BIT (7 )}, + {"SATA_PGD0_PG_STS" ,BIT (8 )}, + {"DSP_PGD0_PG_STS" ,BIT (9 )}, + {"DSP_PGD1_PG_STS" ,BIT (10 )}, + {"DSP_PGD2_PG_STS" ,BIT (11 )}, + {"DSP_PGD3_PG_STS" ,BIT (12 )}, + {"SPD_PGD0_PG_STS" ,BIT (13 )}, + {"LPSS_PGD0_PG_STS" ,BIT (14 )}, + {"SMB_PGD0_PG_STS" ,BIT (16 )}, + {"ISH_PGD0_PG_STS" ,BIT (17 )}, + {"NPK_PGD0_PG_STS" ,BIT (19 )}, + {"PECI_PGD0_PG_STS" ,BIT (21 )}, + {"XDCI_PGD0_PG_STS" ,BIT (25 )}, + {"EXI_PGD0_PG_STS" ,BIT (26 )}, + {"CSE_PGD0_PG_STS" ,BIT (27 )}, + {"KVMCC_PGD0_PG_STS" ,BIT (28 )}, + {"PMT_PGD0_PG_STS" ,BIT (29 )}, + {"CLINK_PGD0_PG_STS" ,BIT (30 )}, + {"PTIO_PGD0_PG_STS" ,BIT (31 )}, + {} +}; + +static const struct pmc_bit_map adl_power_gating_status_1_map[] = { + {"USBR0_PGD0_PG_STS" ,BIT (0 )}, + {"SMT1_PGD0_PG_STS" ,BIT (2 )}, + {"CSMERTC_PGD0_PG_STS" ,BIT (6 )}, + {"CSMEPSF_PGD0_PG_STS" ,BIT (7 )}, + {"CNVI_PGD0_PG_STS" ,BIT (19 )}, + {"DSP_PGD4_PG_STS" ,BIT (26 )}, + {"SPG_PGD0_PG_STS" ,BIT (27 )}, + {"SPE_PGD0_PG_STS" ,BIT (28 )}, + {} +}; + +static const struct pmc_bit_map adl_power_gating_status_2_map[] = { + {"THC0_PGD0_PG_STS" ,BIT (7 )}, + {"THC1_PGD0_PG_STS" ,BIT (8 )}, + {"SPF_PGD0_PG_STS" ,BIT (14 )}, + {} +}; + +static const struct pmc_bit_map adl_d3_status_0_map[] = { + {"ISH_D3_STS" ,BIT (2 )}, + {"LPSS_D3_STS" ,BIT (3 )}, + {"XDCI_D3_STS" ,BIT (4 )}, + {"XHCI_D3_STS" ,BIT (5 )}, + {"SPA_D3_STS" ,BIT (12 )}, + {"SPB_D3_STS" ,BIT (13 )}, + {"SPC_D3_STS" ,BIT (14 )}, + {"SPD_D3_STS" ,BIT (15 )}, + {"SPE_D3_STS" ,BIT (16 )}, + {"DSP_D3_STS" ,BIT (19 )}, + {"SATA_D3_STS" ,BIT (20 )}, + {"DMI_D3_STS" ,BIT (22 )}, + {} +}; + +static const struct pmc_bit_map adl_d3_status_1_map[] = { + {"GBE_D3_STS" ,BIT (19 )}, + {"CNVI_D3_STS" ,BIT (27 )}, + {} +}; + +static const struct pmc_bit_map adl_d3_status_2_map[] = { + {"CSMERTC_D3_STS" ,BIT (1 )}, + {"CSE_D3_STS" ,BIT (4 )}, + {"KVMCC_D3_STS" ,BIT (5 )}, + {"USBR0_D3_STS" ,BIT (6 )}, + {"SMT1_D3_STS" ,BIT (8 )}, + {"PTIO_D3_STS" ,BIT (16 )}, + {"PMT_D3_STS" ,BIT (17 )}, + {} +}; + +static const struct pmc_bit_map adl_d3_status_3_map[] = { + {"THC0_D3_STS" ,BIT (14 )}, + {"THC1_D3_STS" ,BIT (15 )}, + {} +}; + +static const struct pmc_bit_map adl_vnn_req_status_0_map[] = { + {"ISH_VNN_REQ_STS" ,BIT (2 )}, + {"ESPISPI_VNN_REQ_STS" ,BIT (18 )}, + {"DSP_VNN_REQ_STS" ,BIT (19 )}, + {} +}; + +static const struct pmc_bit_map adl_vnn_req_status_1_map[] = { + {"NPK_VNN_REQ_STS" ,BIT (4 )}, + {"EXI_VNN_REQ_STS" ,BIT (9 )}, + {"GBE_VNN_REQ_STS" ,BIT (19 )}, + {"SMB_VNN_REQ_STS" ,BIT (25 )}, + {"CNVI_VNN_REQ_STS" ,BIT (27 )}, + {} +}; + +static const struct pmc_bit_map adl_vnn_req_status_2_map[] = { + {"CSMERTC_VNN_REQ_STS" ,BIT (1 )}, + {"CSE_VNN_REQ_STS" ,BIT (4 )}, + {"SMT1_VNN_REQ_STS" ,BIT (8 )}, + {"CLINK_VNN_REQ_STS" ,BIT (14 )}, + {"GPIOCOM4_VNN_REQ_STS" ,BIT (20 )}, + {"GPIOCOM3_VNN_REQ_STS" ,BIT (21 )}, + {"GPIOCOM2_VNN_REQ_STS" ,BIT (22 )}, + {"GPIOCOM1_VNN_REQ_STS" ,BIT (23 )}, + {"GPIOCOM0_VNN_REQ_STS" ,BIT (24 )}, + {} +}; + +static const struct pmc_bit_map adl_vnn_req_status_3_map[] = { + {"GPIOCOM5_VNN_REQ_STS" ,BIT (11 )}, + {} +}; + +static const struct pmc_bit_map adl_vnn_misc_status_map[] = { + {"CPU_C10_REQ_STS" ,BIT (0 )}, + {"PCIe_LPM_En_REQ_STS" ,BIT (3 )}, + {"ITH_REQ_STS" ,BIT (5 )}, + {"CNVI_REQ_STS" ,BIT (6 )}, + {"ISH_REQ_STS" ,BIT (7 )}, + {"USB2_SUS_PG_Sys_REQ_STS" ,BIT (10 )}, + {"PCIe_Clk_REQ_STS" ,BIT (12 )}, + {"MPHY_Core_DL_REQ_STS" ,BIT (16 )}, + {"Break-even_En_REQ_STS" ,BIT (17 )}, + {"MPHY_SUS_REQ_STS" ,BIT (22 )}, + {"xDCI_attached_REQ_STS" ,BIT (24 )}, + {} +}; + +static const struct pmc_bit_map *adl_lpm_maps[] = { + adl_clocksource_status_map, + adl_power_gating_status_0_map, + adl_power_gating_status_1_map, + adl_power_gating_status_2_map, + adl_d3_status_0_map, + adl_d3_status_1_map, + adl_d3_status_2_map, + adl_d3_status_3_map, + adl_vnn_req_status_0_map, + adl_vnn_req_status_1_map, + adl_vnn_req_status_2_map, + adl_vnn_req_status_3_map, + adl_vnn_misc_status_map, + tgl_signal_status_map, +NULL +}; +static const struct pmc_reg_map adl_reg_map = { .pfear_sts = ext_adl_pfear_map, .slp_s0_offset =ADL_PMC_SLP_S0_RES_COUNTER_OFFSET ,
@@ -749,6 +932,17 @@ static const struct pmc_reg_map adl_reg_map = { .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT, .ltr_ignore_max = ADL_NUM_IP_IGN_ALLOWED, + .lpm_num_modes = ADL_LPM_NUM_MODES, + .lpm_num_maps = ADL_LPM_NUM_MAPS, + .lpm_res_counter_step_x2 = TGL_PMC_LPM_RES_COUNTER_STEP_X2, + .etr3_offset = ETR3_OFFSET, + .lpm_sts_latch_en_offset = ADL_LPM_STATUS_LATCH_EN_OFFSET, + .lpm_priority_offset = ADL_LPM_PRI_OFFSET, + .lpm_en_offset = ADL_LPM_EN_OFFSET, + .lpm_residency_offset = ADL_LPM_RESIDENCY_OFFSET, + .lpm_sts = adl_lpm_maps, + .lpm_status_offset = ADL_LPM_STATUS_OFFSET, + .lpm_live_status_offset = ADL_LPM_LIVE_STATUS_OFFSET, };static inline u32 pmc_core_reg_read (struct pmc_dev *pmcdev,int reg_offset)
drivers/platform/x86/intel/pmc/core.h +13 -0
@@ -222,6 +222,18 @@ enum ppfear_regs {/* Extended Test Mode Register LPM bits (TGL and later */ #define ETR3_CLEAR_LPM_EVENTS BIT(28) +/* Alder Lake Power Management Controller register offsets */ +#define ADL_LPM_EN_OFFSET 0x179C +#define ADL_LPM_RESIDENCY_OFFSET 0x17A4 +#define ADL_LPM_NUM_MODES 2 +#define ADL_LPM_NUM_MAPS 14 + +/* Alder Lake Low Power Mode debug registers */ +#define ADL_LPM_STATUS_OFFSET 0x170C +#define ADL_LPM_PRI_OFFSET 0x17A0 +#define ADL_LPM_STATUS_LATCH_EN_OFFSET 0x1704 +#define ADL_LPM_LIVE_STATUS_OFFSET 0x1764 +const char *pmc_lpm_modes[] = {"S0i2.0" ,"S0i2.1" ,
@@ -281,6 +293,7 @@ struct pmc_reg_map {const u32 pm_vric1_offset;/* Low Power Mode registers */ const int lpm_num_maps; +const int lpm_num_modes;const int lpm_res_counter_step_x2;const u32 lpm_sts_latch_en_offset;const u32 lpm_en_offset;
Signature · 1 line
2.25.1
PATCH v5 5/5 platform/x86/intel: pmc/core: Add GBE Package C10 fix for Alder Lake PCH
In reply to Gayatri KammelaFrom: "David E. Box" <[email protected]>
Alder PCH uses the same Gigabit Ethernet (GBE) device as Tiger Lake PCH which cannot achieve PC10 without ignoring the PMC GBE LTR. Add this work around for Alder Lake PCH as well.
--- drivers/platform/x86/intel/pmc/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/platform/x86/intel/pmc/core.c +3 -3
@@ -1983,10 +1983,10 @@ static int pmc_core_probe(struct platform_device *pdev)pmc_core_get_tgl_lpm_reqs (pdev);/* -* On TGL, due to a hardware limitation, the GBE LTR blocks PC10 when -* a cable is attached. Tell the PMC to ignore it. +* On TGL and ADL, due to a hardware limitation, the GBE LTR blocks PC10 +* when a cable is attached. Tell the PMC to ignore it. */ -if (pmcdev->map == &tgl_reg_map) { +if (pmcdev->map == &tgl_reg_map || pmcdev->map == &adl_reg_map) {dev_dbg (&pdev->dev,"ignoring GBE LTR\n" );pmc_core_send_ltr_ignore (pmcdev,3 ); }
Signature · 1 line
2.25.1
Hi,
Quoted 54 lines · Gayatri Kammela
Hi,
The patch series move intel_pmc_core* files to pmc subfolder as well as add Alder Lake PCH-S support to PMC core driver.Patch 1: Move intel_pmc_core* files to pmc subfolder Patch 2: Add Alderlake support to pmc core driver
Patch 3: Add Latency Tolerance Reporting (LTR) support to Alder Lake Patch 4: Add Alder Lake low power mode support for pmc core Patch 5: Add GBE Package C10 fix for Alder LakeChanges since v1:
1) Add patch 1 to v2 i.e., Move intel_pmc_core* files to pmc subfolder.
2) Modify commit message for patch 2.Changes since v2:
1) Droppedintel_pmc_prefix from the file names.Changes since v3:
1) Fixed an error reported by lkp.Changes since v4:
1) UpdatedMAINTAINERSDavid E. Box (1):
platform/x86/intel: pmc/core: Add GBE Package C10 fix for Alder Lake
PCHGayatri Kammela (4):
platform/x86/intel:intel_pmc_core: Move intel_pmc_core* files to pmc
subfolder
platform/x86/intel: pmc/core: Add Alderlake support to pmc core driver platform/x86/intel: pmc/core: Add Latency Tolerance Reporting (LTR)
support to Alder Lake
platform/x86/intel: pmc/core: Add Alder Lake low power mode support
for pmc coreMAINTAINERS | 2 +- drivers/platform/x86/Kconfig | 21 -- drivers/platform/x86/Makefile | 1 - drivers/platform/x86/intel/Kconfig | 1 + drivers/platform/x86/intel/Makefile | 1 + drivers/platform/x86/intel/pmc/Kconfig | 22 ++ drivers/platform/x86/intel/pmc/Makefile | 5 + .../{intel_pmc_core.c => intel/pmc/core.c} | 309 +++++++++++++++++- .../{intel_pmc_core.h => intel/pmc/core.h} | 17 + .../pmc/pltdrv.c} | 0 10 files changed, 352 insertions(+), 27 deletions(-) create mode 100644 drivers/platform/x86/intel/pmc/Kconfig create mode 100644 drivers/platform/x86/intel/pmc/Makefile rename drivers/platform/x86/{intel_pmc_core.c => intel/pmc/core.c} (85%) rename drivers/platform/x86/{intel_pmc_core.h => intel/pmc/core.h} (95%) rename drivers/platform/x86/{intel_pmc_core_pltdrv.c => intel/pmc/pltdrv.c} (100%)
Quoted 8 lines
Cc Srinivas Pandruvada <[email protected]>Cc Andy Shevchenko <[email protected]>Cc David Box <[email protected]>Cc You-Sheng Yang <[email protected]>Cc Hans de Goede <[email protected]>Cc Rajneesh Bhardwaj <[email protected]>base-commit:
d936eb23874433caa3e3d841cfa16f5434b85dcf
Thank you for your patch-series, I've applied the series to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while.
Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.
Regards,
Hans
Quoted 87 lines
-----Original Message-----
From: Hans de Goede <[email protected]>
Sent: Saturday, July 17, 2021 8:33 AM
To: Kammela, Gayatri <[email protected]>; platform-driver- [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Pandruvada, Srinivas <[email protected]>; Box, David E <[email protected]>; [email protected]; Mashiah, Tamar <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v5 0/5] Add Alder Lake PCH-S support to PMC core driverHi,
Quoted 56 lines · Gayatri Kammela
Hi,
The patch series move intel_pmc_core* files to pmc subfolder as well as add Alder Lake PCH-S support to PMC core driver.Patch 1: Move intel_pmc_core* files to pmc subfolder Patch 2: Add Alderlake support to pmc core driver Patch 3: Add Latency Tolerance Reporting (LTR) support to Alder Lake Patch 4: Add Alder Lake low power mode support for pmc core Patch 5: Add GBE Package C10 fix for Alder Lake
Changes since v1:
1) Add patch 1 to v2 i.e., Move intel_pmc_core* files to pmc subfolder.
2) Modify commit message for patch 2.Changes since v2:
1) Droppedintel_pmc_prefix from the file names.Changes since v3:
1) Fixed an error reported by lkp.Changes since v4:
1) UpdatedMAINTAINERSDavid E. Box (1):
platform/x86/intel: pmc/core: Add GBE Package C10 fix for Alder Lake
PCHGayatri Kammela (4):
platform/x86/intel:intel_pmc_core: Move intel_pmc_core* files to pmc
subfolder
platform/x86/intel: pmc/core: Add Alderlake support to pmc core driver platform/x86/intel: pmc/core: Add Latency Tolerance Reporting (LTR)
support to Alder Lake
platform/x86/intel: pmc/core: Add Alder Lake low power mode support
for pmc coreMAINTAINERS | 2 +- drivers/platform/x86/Kconfig | 21 -- drivers/platform/x86/Makefile | 1 - drivers/platform/x86/intel/Kconfig | 1 + drivers/platform/x86/intel/Makefile | 1 + drivers/platform/x86/intel/pmc/Kconfig | 22 ++ drivers/platform/x86/intel/pmc/Makefile | 5 + .../{intel_pmc_core.c => intel/pmc/core.c} | 309 +++++++++++++++++- .../{intel_pmc_core.h => intel/pmc/core.h} | 17 + .../pmc/pltdrv.c} | 0 10 files changed, 352 insertions(+), 27 deletions(-) create mode 100644 drivers/platform/x86/intel/pmc/Kconfig create mode 100644 drivers/platform/x86/intel/pmc/Makefile rename drivers/platform/x86/{intel_pmc_core.c => intel/pmc/core.c}(85%) rename
drivers/platform/x86/{intel_pmc_core.h=>intel/pmc/core.h} (95%) renamedrivers/platform/x86/{intel_pmc_core_pltdrv.c=>intel/pmc/pltdrv.c} (100%)Quoted 8 lines
Cc Srinivas Pandruvada <[email protected]>Cc Andy Shevchenko <[email protected]>Cc David Box <[email protected]>Cc You-Sheng Yang <[email protected]>Cc Hans de Goede <[email protected]>Cc Rajneesh Bhardwaj <[email protected]>base-commit:
d936eb23874433caa3e3d841cfa16f5434b85dcfThank you for your patch-series, I've applied the series to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-
x86.git/log/?h=review-hans
Quoted 6 lines
Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while.
Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.
Thank you Hans!
Quoted 4 lines
Regards,
Hans