Re: [PATCH v3 05/20] platform/x86: intel_pmc_core: Move to intel sub-directory

[Hans de Goede]

Hi,

On 8/19/21 5:29 AM, Kate Hsuan wrote:
> Move intel_pmc_core to intel sub-directory
> to improve readability.
> 
> Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
> ---
>  drivers/platform/x86/Kconfig                  | 21 ---------------
>  drivers/platform/x86/Makefile                 |  2 --
>  drivers/platform/x86/intel/Kconfig            |  2 ++
>  drivers/platform/x86/intel/Makefile           |  1 +
>  drivers/platform/x86/intel/pmc/Kconfig        | 26 +++++++++++++++++++
>  drivers/platform/x86/intel/pmc/Makefile       |  9 +++++++
>  .../x86/{ => intel/pmc}/intel_pmc_core.h      |  0
>  .../pmc/pmc_core.c}                           |  0
>  .../pmc/pmc_core_pltdrv.c}                    |  0
>  9 files changed, 38 insertions(+), 23 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.h (100%)
>  rename drivers/platform/x86/{intel_pmc_core.c => intel/pmc/pmc_core.c} (100%)
>  rename drivers/platform/x86/{intel_pmc_core_pltdrv.c => intel/pmc/pmc_core_pltdrv.c} (100%)
> 
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 019a625f1fa3..79b6e0abc2ab 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -1158,27 +1158,6 @@ config INTEL_UNCORE_FREQ_CONTROL
>  	  To compile this driver as a module, choose M here: the module
>  	  will be called intel-uncore-frequency.
>  
> -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_SCU_IPC
>  	bool
>  
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 344d7a4a33f0..37ad6a436dda 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -128,8 +128,6 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
>  
>  # Intel PMIC / PMC / P-Unit devices
>  
> -obj-$(CONFIG_INTEL_PMC_CORE)		+= intel_pmc_core.o intel_pmc_core_pltdrv.o
> -
>  obj-$(CONFIG_INTEL_SCU_IPC)		+= intel_scu_ipc.o
>  obj-$(CONFIG_INTEL_SCU_PCI)		+= intel_scu_pcidrv.o
>  obj-$(CONFIG_INTEL_SCU_PLATFORM)	+= intel_scu_pltdrv.o
> diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
> index 78314ca39786..e59ff836b592 100644
> --- a/drivers/platform/x86/intel/Kconfig
> +++ b/drivers/platform/x86/intel/Kconfig
> @@ -58,4 +58,6 @@ config INTEL_PUNIT_IPC
>  	  This driver provides support for Intel P-Unit Mailbox IPC mechanism,
>  	  which is used to bridge the communications between kernel and P-Unit.
>  
> +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 a9aa5e15e8bd..1f343ee7c9b4 100644
> --- a/drivers/platform/x86/intel/Makefile
> +++ b/drivers/platform/x86/intel/Makefile
> @@ -17,3 +17,4 @@ intel_mrfld_pwrbtn-y			:= mrfld_pwrbtn.o
>  obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= intel_mrfld_pwrbtn.o
>  intel_punit_ipc-y			:= punit_ipc.o
>  obj-$(CONFIG_INTEL_PUNIT_IPC)		+= intel_punit_ipc.o
> +obj-$(CONFIG_INTEL_PMC_CORE)		+= pmc/

Please keep the Makefile line for diving into subdirs together at the top.

> diff --git a/drivers/platform/x86/intel/pmc/Kconfig b/drivers/platform/x86/intel/pmc/Kconfig
> new file mode 100644
> index 000000000000..d44a3e34210f
> --- /dev/null
> +++ b/drivers/platform/x86/intel/pmc/Kconfig
> @@ -0,0 +1,26 @@
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# Makefile for linux/drivers/platform/x86
> +# x86 Platform-Specific Drivers
> +#
> +
> +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..db305c9e5f37
> --- /dev/null
> +++ b/drivers/platform/x86/intel/pmc/Makefile
> @@ -0,0 +1,9 @@
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# Makefile for linux/drivers/platform/x86
> +# x86 Platform-Specific Drivers
> +#
> +
> +intel_pmc_core-y			:= pmc_core.o
> +intel_pmc_core_pltdrv-y			:= pmc_core_pltdrv.o
> +obj-$(CONFIG_INTEL_PMC_CORE)		+= intel_pmc_core_pltdrv.o intel_pmc_core.o
> 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

You did not drop the intel prefix on the intel_pmc_core.h file.

I'll fix both up while merging the series there is no need for
a new version.

Regards,

Hans


> diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel/pmc/pmc_core.c
> similarity index 100%
> rename from drivers/platform/x86/intel_pmc_core.c
> rename to drivers/platform/x86/intel/pmc/pmc_core.c
> diff --git a/drivers/platform/x86/intel_pmc_core_pltdrv.c b/drivers/platform/x86/intel/pmc/pmc_core_pltdrv.c
> similarity index 100%
> rename from drivers/platform/x86/intel_pmc_core_pltdrv.c
> rename to drivers/platform/x86/intel/pmc/pmc_core_pltdrv.c
>