On Thu, Jul 8, 2021 at 5:10 AM Gayatri Kammela
<gayatri.kammela@xxxxxxxxx> wrote:
>
> As part of collecting Intel x86 specific drivers in their own
> folder, move intel_pmc_core* files to its own subfolder there.
I'm fine with this, it is also possible I think to drop intel_pmc_
prefix from the file names (core.c, core.h, pltdrv.c). In any case it
may be done later on.
Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
> Cc: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxx>
> Cc: David Box <david.e.box@xxxxxxxxx>
> Cc: You-Sheng Yang <vicamo.yang@xxxxxxxxxxxxx>
> Cc: Hans de Goede <hdegoede@xxxxxxxxxx>
> Suggested-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Signed-off-by: Gayatri Kammela <gayatri.kammela@xxxxxxxxx>
> ---
> 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 +++++
> .../x86/{ => intel/pmc}/intel_pmc_core.c | 0
> .../x86/{ => intel/pmc}/intel_pmc_core.h | 0
> .../{ => intel/pmc}/intel_pmc_core_pltdrv.c | 0
> 9 files changed, 29 insertions(+), 22 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}/intel_pmc_core.c (100%)
> rename drivers/platform/x86/{ => intel/pmc}/intel_pmc_core.h (100%)
> rename drivers/platform/x86/{ => intel/pmc}/intel_pmc_core_pltdrv.c (100%)
>
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 7d385c3b2239..cae72922f448 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -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
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 7ee369aab10d..43d36f8c36f1 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -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
> diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
> index f2eef337eb98..8ca021785f67 100644
> --- a/drivers/platform/x86/intel/Kconfig
> +++ b/drivers/platform/x86/intel/Kconfig
> @@ -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
> diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
> index 0653055942d5..49962f4dfdec 100644
> --- a/drivers/platform/x86/intel/Makefile
> +++ b/drivers/platform/x86/intel/Makefile
> @@ -6,3 +6,4 @@
>
> obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/
> obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/
> +obj-$(CONFIG_INTEL_PMC_CORE) += pmc/
> diff --git a/drivers/platform/x86/intel/pmc/Kconfig b/drivers/platform/x86/intel/pmc/Kconfig
> new file mode 100644
> index 000000000000..b4c955a35674
> --- /dev/null
> +++ b/drivers/platform/x86/intel/pmc/Kconfig
> @@ -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
> diff --git a/drivers/platform/x86/intel/pmc/Makefile b/drivers/platform/x86/intel/pmc/Makefile
> new file mode 100644
> index 000000000000..633a7598d6d6
> --- /dev/null
> +++ b/drivers/platform/x86/intel/pmc/Makefile
> @@ -0,0 +1,5 @@
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +
> +obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o
> +obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core_pltdrv.o
> diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel/pmc/intel_pmc_core.c
> similarity index 100%
> rename from drivers/platform/x86/intel_pmc_core.c
> rename to drivers/platform/x86/intel/pmc/intel_pmc_core.c
> diff --git a/drivers/platform/x86/intel_pmc_core.h b/drivers/platform/x86/intel/pmc/intel_pmc_core.h
> similarity index 100%
> rename from drivers/platform/x86/intel_pmc_core.h
> rename to drivers/platform/x86/intel/pmc/intel_pmc_core.h
> diff --git a/drivers/platform/x86/intel_pmc_core_pltdrv.c b/drivers/platform/x86/intel/pmc/intel_pmc_core_pltdrv.c
> similarity index 100%
> rename from drivers/platform/x86/intel_pmc_core_pltdrv.c
> rename to drivers/platform/x86/intel/pmc/intel_pmc_core_pltdrv.c
> --
> 2.25.1
>
--
With Best Regards,
Andy Shevchenko
