From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BADAC4338F for ; Mon, 16 Aug 2021 17:37:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3CD4A60C3F for ; Mon, 16 Aug 2021 17:37:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229613AbhHPRiM (ORCPT ); Mon, 16 Aug 2021 13:38:12 -0400 Received: from mga17.intel.com ([192.55.52.151]:48212 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229590AbhHPRiL (ORCPT ); Mon, 16 Aug 2021 13:38:11 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10078"; a="196170656" X-IronPort-AV: E=Sophos;i="5.84,326,1620716400"; d="scan'208";a="196170656" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2021 10:37:39 -0700 X-IronPort-AV: E=Sophos;i="5.84,326,1620716400"; d="scan'208";a="462119781" Received: from xzhu13-mobl.amr.corp.intel.com (HELO ldmartin-desk2) ([10.209.7.115]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2021 10:37:38 -0700 Date: Mon, 16 Aug 2021 10:37:38 -0700 From: Lucas De Marchi To: Gayatri Kammela 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, srinivas.pandruvada@intel.com, david.e.box@intel.com, linux-kernel@vger.kernel.org, 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 Subject: Re: [PATCH v5 1/5] platform/x86/intel: intel_pmc_core: Move intel_pmc_core* files to pmc subfolder Message-ID: <20210816173738.oxndqtq6uaql7sz7@ldmartin-desk2> X-Patchwork-Hint: comment References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org 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 >Cc: David Box >Cc: You-Sheng Yang >Cc: Hans de Goede >Suggested-by: Andy Shevchenko >Acked-by: Rajneesh Bhardwaj >Reviewed-by: Andy Shevchenko >Signed-off-by: Gayatri Kammela >--- > 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%) > >diff --git a/MAINTAINERS b/MAINTAINERS >index 6c8be735cc91..c5d610885bf2 100644 >--- a/MAINTAINERS >+++ b/MAINTAINERS >@@ -9477,7 +9477,7 @@ M: David E Box > 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 >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..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) += 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<------ 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 # -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 >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 > #include > >-#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 >