Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   "Kammela, Gayatri" <gayatri.kammela@intel.com>
To:     "De Marchi, Lucas" <lucas.demarchi@intel.com>
CC:     "platform-driver-x86@vger.kernel.org" 
        <platform-driver-x86@vger.kernel.org>,
        "mgross@linux.intel.com" <mgross@linux.intel.com>,
        "hdegoede@redhat.com" <hdegoede@redhat.com>,
        "irenic.rajneesh@gmail.com" <irenic.rajneesh@gmail.com>,
        "andriy.shevchenko@linux.intel.com" 
        <andriy.shevchenko@linux.intel.com>,
        "vicamo.yang@canonical.com" <vicamo.yang@canonical.com>,
        "Pandruvada, Srinivas" <srinivas.pandruvada@intel.com>,
        "Box, David E" <david.e.box@intel.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "Mashiah, Tamar" <tamar.mashiah@intel.com>,
        "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
        "rajatja@google.com" <rajatja@google.com>,
        "Shyam-sundar.S-k@amd.com" <Shyam-sundar.S-k@amd.com>,
        "Alexander.Deucher@amd.com" <Alexander.Deucher@amd.com>,
        "mlimonci@amd.com" <mlimonci@amd.com>,
        "Andy Shevchenko" <andy.shevchenko@gmail.com>,
        "Dixit, Ashutosh" <ashutosh.dixit@intel.com>
Subject: RE: [PATCH v5 1/5] platform/x86/intel: intel_pmc_core: Move
 intel_pmc_core* files to pmc subfolder
Thread-Topic: [PATCH v5 1/5] platform/x86/intel: intel_pmc_core: Move
 intel_pmc_core* files to pmc subfolder
Thread-Index: AQHXenI9Mxf5qZez+Uqb+eZuFtjmaKt2lesAgAAcTfA=
Date:   Mon, 16 Aug 2021 19:23:21 +0000
Message-ID: <MW3PR11MB45230D40F51FAB5C5A4E0FCBF2FD9@MW3PR11MB4523.namprd11.prod.outlook.com>
References: <cover.1626459866.git.gayatri.kammela@intel.com>
 <b2cb6b10b75445acceab3030c3a9aa585e7c7b65.1626459866.git.gayatri.kammela@intel.com>
 <20210816173738.oxndqtq6uaql7sz7@ldmartin-desk2>
In-Reply-To: <20210816173738.oxndqtq6uaql7sz7@ldmartin-desk2>
Accept-Language: en-US
Content-Language: en-US
dlp-version: 11.6.100.41
dlp-reaction: no-action
dlp-product: dlpe-windows
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?++GoxoKTMmdgIn/GO2Qe9Z98KD9yirK24xWt7iMWiV6VNQ0s7yrTAaSWzgFp?=
 =?us-ascii?Q?jHICQ84OpbUgUQgsnSlqhLi5hVeqK06e+oQf2T0hgPlHOVd3TfW0QdyZpi2J?=
 =?us-ascii?Q?eV73XkZRZA6Mt40hjzXaBRuyf9I4BWex+ydvjIO+vCq0+fHeoSg3IwRc+a5f?=
 =?us-ascii?Q?o4gMqaJxzLhwvWl14VaLxfFfUOBklOd6LMwes3MmQww0rCnInrJ+Gf2FxKBE?=
 =?us-ascii?Q?sTrOXo5L669THS+Mg2dsxHkAnOBFXvaKPOjf8i8p/O8JOl/hgbo30T7hf+u3?=
 =?us-ascii?Q?J1UWTgmSgNKH6LbQ3GlXdL7OEE+I+8wwDxUXsQn+gRDEu/8dEBvl7/0gAUar?=
 =?us-ascii?Q?GkuKbVaLi0SKsCBfHpBeh05RdfMDCcMGapC0prgCHJu7/IoGTTIGp0hqy0ww?=
 =?us-ascii?Q?2v7suNf46LWgB1PKkCxOFYZ9nPnkBO7dkbhKpEatTVVjT0uyomtO3Ne/s25z?=
 =?us-ascii?Q?9k/nHDOI1ifiUII46ZFXGdTBkxnzlfMgc6LdBqdZsBRmlztNo/cUgrIuv1Qc?=
 =?us-ascii?Q?woDN3/f5PPbNhfSmDQFdUp4bOK0Ub3LltXBP1Cc888CZdy253pkH2PQ8OMgA?=
 =?us-ascii?Q?K9oCVofqTbglbjYEQpR4/A49aW/a81TJtpQGlFNGyCm+5kLYkTbjkLqpKEux?=
 =?us-ascii?Q?iZ8VgvkHao6zhEIAG0JAcsBfQS+ogymI+5jFS75fuVZPv7PxBzPgoeJyu2Lv?=
 =?us-ascii?Q?BzThakt3kcSD6VWHPAemkagBI0S9be675WDlYL+l3TpQZMvK2vAhFjD9yr4d?=
 =?us-ascii?Q?Kqh8IvlkBbaXJEuPtLbr5iRLp02crWx/8sbQNAmX/BISGrw2t+kLY02lYfOk?=
 =?us-ascii?Q?F8EVkxbHNixgWqSLecbPzm6HuYPQ8Xh393BwngZS7I/pIiD4BJfCCZijyfjR?=
 =?us-ascii?Q?QeyanB103fupWW5hJCrLuEgkEmr/JJ3tmzxvqjYotEzzAhlB4bzbq2F27nc2?=
 =?us-ascii?Q?dcsWAk4clCL+lNrNKD3nMm1jAkJBizC6hGKnMetnqvpgHR27WeoI8c2ppZ16?=
 =?us-ascii?Q?8VtWi5mNNXApH4t9tM24hlnBTZ+fR3TiWYSUAksPLDAuC8C+Ax/Jkxgdc9WQ?=
 =?us-ascii?Q?SgyD8MjmQbDraXV37M1iT5O2rbuEfxRxGrarglyTT5aVeRUn61PiPwaRlGuJ?=
 =?us-ascii?Q?UcEFfUsaxpKts6SwsQf/qLtyG7pgnLy9UNmsXHbozXL96hlQlbGQOazSQh23?=
 =?us-ascii?Q?lk8epb1wjxCpzMcbWq6490Fh6F8m5dVKD5IVD8nka8dh9i2j4Ed5crWHEYEQ?=
 =?us-ascii?Q?rH2JOaBI6qN4j8Ea1tdiKNTjg71S8NMe6f9oi8aNF8TlmuNQ66Q/KTVNt0dc?=
 =?us-ascii?Q?baI=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MW3PR11MB4523.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1fa5cc58-3f86-46a6-192c-08d960eb4f3b
X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Aug 2021 19:23:21.0468
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: V4mXo2kXN784RtnzqIFk+8yRH4nObFZm09+Kr9z+z2G0SRUvyDgJkNGdPfobne1sKNW6bvfjuThN1AbVjzbnbSaNPxTzL7utlsbidErxybo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5185
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> -----Original Message-----
> From: De Marchi, Lucas <lucas.demarchi@intel.com>
> Sent: Monday, August 16, 2021 10:38 AM
> To: Kammela, Gayatri <gayatri.kammela@intel.com>
> Cc: platform-driver-x86@vger.kernel.org; mgross@linux.intel.com;
> hdegoede@redhat.com; irenic.rajneesh@gmail.com;
> andriy.shevchenko@linux.intel.com; vicamo.yang@canonical.com;
> Pandruvada, Srinivas <srinivas.pandruvada@intel.com>; Box, David E
> <david.e.box@intel.com>; linux-kernel@vger.kernel.org; Mashiah, Tamar
> <tamar.mashiah@intel.com>; gregkh@linuxfoundation.org;
> rajatja@google.com; Shyam-sundar.S-k@amd.com;
> Alexander.Deucher@amd.com; mlimonci@amd.com; Andy Shevchenko
> <andy.shevchenko@gmail.com>
> Subject: Re: [PATCH v5 1/5] platform/x86/intel: intel_pmc_core: Move
> intel_pmc_core* files to pmc subfolder
>=20
> On Fri, Jul 16, 2021 at 11:38:33AM -0700, Gayatri Kammela wrote:
> >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 <srinivas.pandruvada@intel.com>
> >Cc: David Box <david.e.box@intel.com>
> >Cc: You-Sheng Yang <vicamo.yang@canonical.com>
> >Cc: Hans de Goede <hdegoede@redhat.com>
> >Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> >Acked-by: Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
> >Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> >Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
> >---
> > 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 =3D> intel/pmc/core.c}    |  2 +-
> > .../{intel_pmc_core.h =3D> 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 =3D> intel/pmc/core.c}
> >(99%)  rename drivers/platform/x86/{intel_pmc_core.h =3D>
> >intel/pmc/core.h} (100%)  rename
> >drivers/platform/x86/{intel_pmc_core_pltdrv.c =3D> intel/pmc/pltdrv.c}
> >(100%)
> >
> >diff --git a/MAINTAINERS b/MAINTAINERS
> >index 6c8be735cc91..c5d610885bf2 100644
> >--- a/MAINTAINERS
> >+++ b/MAINTAINERS
> >@@ -9477,7 +9477,7 @@ M:	David E Box <david.e.box@intel.com>
> > L:	platform-driver-x86@vger.kernel.org
> > 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 <andy@kernel.org>
> >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)
> 		+=3D intel-uncore-frequency.o
> > obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+=3D intel_bxtwc_tmu.o
> > obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN)	+=3D intel_chtdc_ti_pwrbtn.o
> > obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+=3D intel_mrfld_pwrbtn.o
> >-obj-$(CONFIG_INTEL_PMC_CORE)		+=3D intel_pmc_core.o
> intel_pmc_core_pltdrv.o
> > obj-$(CONFIG_INTEL_PMT_CLASS)		+=3D intel_pmt_class.o
> > obj-$(CONFIG_INTEL_PMT_TELEMETRY)	+=3D intel_pmt_telemetry.o
> > obj-$(CONFIG_INTEL_PMT_CRASHLOG)	+=3D 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)		+=3D int33fe/
> > obj-$(CONFIG_INTEL_SKL_INT3472)		+=3D int3472/
> >+obj-$(CONFIG_INTEL_PMC_CORE)		+=3D 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..e0182e10a035
> >--- /dev/null
> >+++ b/drivers/platform/x86/intel/pmc/Makefile
> >@@ -0,0 +1,5 @@
> >+# SPDX-License-Identifier: GPL-2.0
> >+#
> >+
> >+obj-$(CONFIG_INTEL_PMC_CORE)	+=3D core.o
> >+obj-$(CONFIG_INTEL_PMC_CORE)	+=3D pltdrv.o
>=20
> 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 ba=
dly
> named modules.
Hi Lucas! Yes, the module rename is intentional. Thanks for reporting the i=
ssue. This issue has been addressed in V6. I have just sent the V7 https://=
patchwork.kernel.org/project/platform-driver-x86/list/
>=20
> 	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....
>=20
> This builds for me by restoring the previous module names
>=20
> -----8<------
> diff --git a/drivers/platform/x86/intel/pmc/Makefile
> b/drivers/platform/x86/intel/pmc/Makefile
> index e0182e10a035..9bfe8ab8fd64 100644
> --- a/drivers/platform/x86/intel/pmc/Makefile
> +++ b/drivers/platform/x86/intel/pmc/Makefile
> @@ -1,5 +1,8 @@
>   # SPDX-License-Identifier: GPL-2.0
>   #
>=20
> -obj-$(CONFIG_INTEL_PMC_CORE)	+=3D core.o
> -obj-$(CONFIG_INTEL_PMC_CORE)	+=3D pltdrv.o
> +obj-$(CONFIG_INTEL_PMC_CORE)	+=3D intel_pmc_core.o
> +obj-$(CONFIG_INTEL_PMC_CORE)	+=3D intel_pmc_core_pltdrv.o
> +
> +intel_pmc_core-y		+=3D core.o
> +intel_pmc_core_pltdrv-y		+=3D pltdrv.o
> -----8<------
>=20
>=20
> Lucas De Marchi
>=20
> >diff --git a/drivers/platform/x86/intel_pmc_core.c
> >b/drivers/platform/x86/intel/pmc/core.c
> >similarity index 99%
> >rename from drivers/platform/x86/intel_pmc_core.c
> >rename to drivers/platform/x86/intel/pmc/core.c
> >index b0e486a6bdfb..f9de78b08e5d 100644
> >--- a/drivers/platform/x86/intel_pmc_core.c
> >+++ b/drivers/platform/x86/intel/pmc/core.c
> >@@ -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
> >diff --git a/drivers/platform/x86/intel_pmc_core.h
> >b/drivers/platform/x86/intel/pmc/core.h
> >similarity index 100%
> >rename from drivers/platform/x86/intel_pmc_core.h
> >rename to drivers/platform/x86/intel/pmc/core.h
> >diff --git a/drivers/platform/x86/intel_pmc_core_pltdrv.c
> >b/drivers/platform/x86/intel/pmc/pltdrv.c
> >similarity index 100%
> >rename from drivers/platform/x86/intel_pmc_core_pltdrv.c
> >rename to drivers/platform/x86/intel/pmc/pltdrv.c
> >--
> >2.25.1
> >