LinuxLists.cc - [PATCH v3 00/20] Intel platform driver code movement

2021-08-19 03:32:25

[permalink] [raw]

Subject: [PATCH v3 00/20] Intel platform driver code movement

v3 has some improvement and listed below.
kconfig typo correction.
commit message improvement.
Fix two kernel test robot fail issues.

Kate Hsuan (20):
platform/x86: intel_bxtwc_tmu: Move to intel sub-directory
platform/x86: intel_chtdc_ti_pwrbtn: Move to intel sub-directory
platform/x86: intel_mrfld_pwrbtn: Move to intel sub-directory
platform/x86: intel_punit_ipc: Move to intel sub-directory
platform/x86: intel_pmc_core: Move to intel sub-directory
platform/x86: intel_scu: Move to intel sub-directory
platform/x86: intel_telemetry: Move to intel sub-directory
platform/x86: intel_ips: Move to intel sub-directory
platform/x86: intel-rst: Move to intel sub-directory
platform/x86: intel-smartconnect: Move to intel sub-directory
platform/x86: intel_turbo_max_3: Move to intel sub-directory
platform/x86: intel-uncore-frequency: Move to intel sub-directory
platform/x86: intel_speed_select_if: Move to intel sub-directory
platform/x86: intel_atomisp2_led: Move to intel sub-directory
platform/x86: intel-hid: Move to intel sub-directory
platform/x86: intel_int0002_vgpio: Move to intel sub-directory
platform/x86: intel_oaktrail: Move to intel sub-directory
platform/x86: intel-vbtn: Move to intel sub-directory
platform/x86: intel-wmi-sbl-fw-updat: Move to intel sub-directory
platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory

drivers/platform/x86/Kconfig | 287 ------------------
drivers/platform/x86/Makefile | 34 +--
drivers/platform/x86/intel/Kconfig | 160 ++++++++++
drivers/platform/x86/intel/Makefile | 44 +++
drivers/platform/x86/intel/atomisp2/Kconfig | 38 +++
drivers/platform/x86/intel/atomisp2/Makefile | 9 +
.../atomisp2/led.c} | 0
.../atomisp2/pm.c} | 0
.../{intel_bxtwc_tmu.c => intel/bxtwc_tmu.c} | 0
.../chtdc_ti_pwrbtn.c} | 0
.../platform/x86/{intel-hid.c => intel/hid.c} | 2 +-
.../int0002_vgpio.c} | 0
.../platform/x86/{intel_ips.c => intel/ips.c} | 2 +-
.../mrfld_pwrbtn.c} | 0
.../{intel_oaktrail.c => intel/oaktrail.c} | 0
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
.../{intel_punit_ipc.c => intel/punit_ipc.c} | 0
.../platform/x86/{intel-rst.c => intel/rst.c} | 0
drivers/platform/x86/intel/scu/Kconfig | 52 ++++
drivers/platform/x86/intel/scu/Makefile | 13 +
.../x86/{intel_scu_ipc.c => intel/scu/ipc.c} | 0
.../scu/ipcutil.c} | 0
.../scu/pcidrv.c} | 0
.../scu/pltdrv.c} | 0
.../x86/{intel_scu_wdt.c => intel/scu/wdt.c} | 0
.../smartconnect.c} | 0
.../speed_select_if}/Kconfig | 0
.../speed_select_if}/Makefile | 0
.../speed_select_if}/isst_if_common.c | 0
.../speed_select_if}/isst_if_common.h | 0
.../speed_select_if}/isst_if_mbox_msr.c | 0
.../speed_select_if}/isst_if_mbox_pci.c | 0
.../speed_select_if}/isst_if_mmio.c | 0
drivers/platform/x86/intel/telemetry/Kconfig | 16 +
drivers/platform/x86/intel/telemetry/Makefile | 11 +
.../telemetry/core.c} | 0
.../telemetry/debugfs.c} | 0
.../telemetry/pltdrv.c} | 0
.../turbo_max_3.c} | 0
.../uncore-frequency.c} | 0
.../x86/{intel-vbtn.c => intel/vbtn.c} | 2 +-
drivers/platform/x86/intel/wmi/Kconfig | 26 ++
drivers/platform/x86/intel/wmi/Makefile | 9 +
.../wmi/sbl-fw-update.c} | 0
.../wmi/thunderbolt.c} | 0
49 files changed, 419 insertions(+), 321 deletions(-)
create mode 100644 drivers/platform/x86/intel/atomisp2/Kconfig
create mode 100644 drivers/platform/x86/intel/atomisp2/Makefile
rename drivers/platform/x86/{intel_atomisp2_led.c => intel/atomisp2/led.c} (100%)
rename drivers/platform/x86/{intel_atomisp2_pm.c => intel/atomisp2/pm.c} (100%)
rename drivers/platform/x86/{intel_bxtwc_tmu.c => intel/bxtwc_tmu.c} (100%)
rename drivers/platform/x86/{intel_chtdc_ti_pwrbtn.c => intel/chtdc_ti_pwrbtn.c} (100%)
rename drivers/platform/x86/{intel-hid.c => intel/hid.c} (99%)
rename drivers/platform/x86/{intel_int0002_vgpio.c => intel/int0002_vgpio.c} (100%)
rename drivers/platform/x86/{intel_ips.c => intel/ips.c} (99%)
rename drivers/platform/x86/{intel_mrfld_pwrbtn.c => intel/mrfld_pwrbtn.c} (100%)
rename drivers/platform/x86/{intel_oaktrail.c => intel/oaktrail.c} (100%)
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%)
rename drivers/platform/x86/{intel_punit_ipc.c => intel/punit_ipc.c} (100%)
rename drivers/platform/x86/{intel-rst.c => intel/rst.c} (100%)
create mode 100644 drivers/platform/x86/intel/scu/Kconfig
create mode 100644 drivers/platform/x86/intel/scu/Makefile
rename drivers/platform/x86/{intel_scu_ipc.c => intel/scu/ipc.c} (100%)
rename drivers/platform/x86/{intel_scu_ipcutil.c => intel/scu/ipcutil.c} (100%)
rename drivers/platform/x86/{intel_scu_pcidrv.c => intel/scu/pcidrv.c} (100%)
rename drivers/platform/x86/{intel_scu_pltdrv.c => intel/scu/pltdrv.c} (100%)
rename drivers/platform/x86/{intel_scu_wdt.c => intel/scu/wdt.c} (100%)
rename drivers/platform/x86/{intel-smartconnect.c => intel/smartconnect.c} (100%)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Kconfig (100%)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Makefile (100%)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.c (100%)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.h (100%)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_msr.c (100%)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_pci.c (100%)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mmio.c (100%)
create mode 100644 drivers/platform/x86/intel/telemetry/Kconfig
create mode 100644 drivers/platform/x86/intel/telemetry/Makefile
rename drivers/platform/x86/{intel_telemetry_core.c => intel/telemetry/core.c} (100%)
rename drivers/platform/x86/{intel_telemetry_debugfs.c => intel/telemetry/debugfs.c} (100%)
rename drivers/platform/x86/{intel_telemetry_pltdrv.c => intel/telemetry/pltdrv.c} (100%)
rename drivers/platform/x86/{intel_turbo_max_3.c => intel/turbo_max_3.c} (100%)
rename drivers/platform/x86/{intel-uncore-frequency.c => intel/uncore-frequency.c} (100%)
rename drivers/platform/x86/{intel-vbtn.c => intel/vbtn.c} (99%)
create mode 100644 drivers/platform/x86/intel/wmi/Kconfig
create mode 100644 drivers/platform/x86/intel/wmi/Makefile
rename drivers/platform/x86/{intel-wmi-sbl-fw-update.c => intel/wmi/sbl-fw-update.c} (100%)
rename drivers/platform/x86/{intel-wmi-thunderbolt.c => intel/wmi/thunderbolt.c} (100%)

--
2.31.1

2021-08-19 03:32:30

[permalink] [raw]

Subject: [PATCH v3 01/20] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory

Move intel_bxtwc_tmu to intel sub-directory to
improve readability.

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 10 ----------
drivers/platform/x86/Makefile | 1 -
drivers/platform/x86/intel/Kconfig | 10 ++++++++++
drivers/platform/x86/intel/Makefile | 4 ++++
.../x86/{intel_bxtwc_tmu.c => intel/bxtwc_tmu.c} | 0
5 files changed, 14 insertions(+), 11 deletions(-)
rename drivers/platform/x86/{intel_bxtwc_tmu.c => intel/bxtwc_tmu.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index a87a4960256d..4e164e564d2f 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1158,16 +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_BXTWC_PMIC_TMU
- tristate "Intel BXT Whiskey Cove TMU Driver"
- depends on REGMAP
- depends on MFD_INTEL_PMC_BXT
- depends on INTEL_SOC_PMIC_BXTWC
- help
- Select this driver to use Intel BXT Whiskey Cove PMIC TMU feature.
- This driver enables the alarm wakeup functionality in the TMU unit
- of Whiskey Cove PMIC.
-
config INTEL_CHTDC_TI_PWRBTN
tristate "Intel Cherry Trail Dollar Cove TI power button driver"
depends on INTEL_SOC_PMIC_CHTDC_TI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 03a1fc20bba5..bcdd75a48a80 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -127,7 +127,6 @@ obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o
obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o

# Intel PMIC / PMC / P-Unit devices
-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
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 6eec084d9bf9..b274ff4192b2 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -20,4 +20,14 @@ source "drivers/platform/x86/intel/int33fe/Kconfig"
source "drivers/platform/x86/intel/int3472/Kconfig"
source "drivers/platform/x86/intel/pmt/Kconfig"

+config INTEL_BXTWC_PMIC_TMU
+ tristate "Intel BXT Whiskey Cove TMU Driver"
+ depends on REGMAP
+ depends on MFD_INTEL_PMC_BXT
+ depends on INTEL_SOC_PMIC_BXTWC
+ help
+ Select this driver to use Intel BXT Whiskey Cove PMIC TMU feature.
+ This driver enables the alarm wakeup functionality in the TMU unit
+ of Whiskey Cove PMIC.
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index ca0ec2c85b05..22f669192d56 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -7,3 +7,7 @@
obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/
obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/
obj-$(CONFIG_INTEL_PMT_CLASS) += pmt/
+
+# Intel PMIC / PMC / P-Unit devices
+intel_bxtwc_tmu-y := bxtwc_tmu.o
+obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o
diff --git a/drivers/platform/x86/intel_bxtwc_tmu.c b/drivers/platform/x86/intel/bxtwc_tmu.c
similarity index 100%
rename from drivers/platform/x86/intel_bxtwc_tmu.c
rename to drivers/platform/x86/intel/bxtwc_tmu.c
--
2.31.1

2021-08-19 03:32:54

[permalink] [raw]

Subject: [PATCH v3 03/20] platform/x86: intel_mrfld_pwrbtn: Move to intel sub-directory

Move intel_mrfld_pwrbtn to intel sub-directory
to improve readability.

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 11 -----------
drivers/platform/x86/Makefile | 1 -
drivers/platform/x86/intel/Kconfig | 11 +++++++++++
drivers/platform/x86/intel/Makefile | 2 ++
.../{intel_mrfld_pwrbtn.c => intel/mrfld_pwrbtn.c} | 0
5 files changed, 13 insertions(+), 12 deletions(-)
rename drivers/platform/x86/{intel_mrfld_pwrbtn.c => intel/mrfld_pwrbtn.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 7bccbfc417f7..cb8cb75d3a31 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1158,17 +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_MRFLD_PWRBTN
- tristate "Intel Merrifield Basin Cove power button driver"
- depends on INTEL_SOC_PMIC_MRFLD
- depends on INPUT
- help
- This option adds a power button driver for Basin Cove PMIC
- on Intel Merrifield devices.
-
- 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
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 21fd8cb0a1b7..6e6436b6b441 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

# Intel PMIC / PMC / P-Unit devices

-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_PUNIT_IPC) += intel_punit_ipc.o
obj-$(CONFIG_INTEL_SCU_IPC) += intel_scu_ipc.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index ea1f85e49bab..2e76d479b0f3 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -41,4 +41,15 @@ config INTEL_CHTDC_TI_PWRBTN
To compile this driver as a module, choose M here: the module
will be called intel_chtdc_ti_pwrbtn.

+config INTEL_MRFLD_PWRBTN
+ tristate "Intel Merrifield Basin Cove power button driver"
+ depends on INTEL_SOC_PMIC_MRFLD
+ depends on INPUT
+ help
+ This option adds a power button driver for Basin Cove PMIC
+ on Intel Merrifield devices.
+
+ To compile this driver as a module, choose M here: the module
+ will be called intel_mrfld_pwrbtn.
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index cc826a4dd69c..cfdaa01e5610 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -13,3 +13,5 @@ intel_bxtwc_tmu-y := bxtwc_tmu.o
obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o
intel_chtdc_ti_pwrbtn-y := chtdc_ti_pwrbtn.o
obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += intel_chtdc_ti_pwrbtn.o
+intel_mrfld_pwrbtn-y := mrfld_pwrbtn.o
+obj-$(CONFIG_INTEL_MRFLD_PWRBTN) += intel_mrfld_pwrbtn.o
diff --git a/drivers/platform/x86/intel_mrfld_pwrbtn.c b/drivers/platform/x86/intel/mrfld_pwrbtn.c
similarity index 100%
rename from drivers/platform/x86/intel_mrfld_pwrbtn.c
rename to drivers/platform/x86/intel/mrfld_pwrbtn.c
--
2.31.1

2021-08-19 03:33:04

[permalink] [raw]

Subject: [PATCH v3 04/20] platform/x86: intel_punit_ipc: Move to intel sub-directory

Move intel_punit_ipc to intel sub-directory
to improve readability.

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 6 ------
drivers/platform/x86/Makefile | 2 +-
drivers/platform/x86/intel/Kconfig | 6 ++++++
drivers/platform/x86/intel/Makefile | 2 ++
.../platform/x86/{intel_punit_ipc.c => intel/punit_ipc.c} | 0
5 files changed, 9 insertions(+), 7 deletions(-)
rename drivers/platform/x86/{intel_punit_ipc.c => intel/punit_ipc.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index cb8cb75d3a31..019a625f1fa3 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1179,12 +1179,6 @@ config INTEL_PMC_CORE
- Low Power Mode registers (Tigerlake and beyond)
- PMC quirks as needed to enable SLPS0/S0ix

-config INTEL_PUNIT_IPC
- tristate "Intel P-Unit IPC Driver"
- help
- This driver provides support for Intel P-Unit Mailbox IPC mechanism,
- which is used to bridge the communications between kernel and P-Unit.
-
config INTEL_SCU_IPC
bool

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 6e6436b6b441..344d7a4a33f0 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -129,7 +129,7 @@ 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_PUNIT_IPC) += intel_punit_ipc.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 2e76d479b0f3..78314ca39786 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -52,4 +52,10 @@ config INTEL_MRFLD_PWRBTN
To compile this driver as a module, choose M here: the module
will be called intel_mrfld_pwrbtn.

+config INTEL_PUNIT_IPC
+ tristate "Intel P-Unit IPC Driver"
+ help
+ This driver provides support for Intel P-Unit Mailbox IPC mechanism,
+ which is used to bridge the communications between kernel and P-Unit.
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index cfdaa01e5610..a9aa5e15e8bd 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -15,3 +15,5 @@ intel_chtdc_ti_pwrbtn-y := chtdc_ti_pwrbtn.o
obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += intel_chtdc_ti_pwrbtn.o
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
diff --git a/drivers/platform/x86/intel_punit_ipc.c b/drivers/platform/x86/intel/punit_ipc.c
similarity index 100%
rename from drivers/platform/x86/intel_punit_ipc.c
rename to drivers/platform/x86/intel/punit_ipc.c
--
2.31.1

2021-08-19 03:33:17

[permalink] [raw]

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

Move intel_pmc_core to intel sub-directory
to improve readability.

Signed-off-by: Kate Hsuan <[email protected]>
---
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/
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
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
--
2.31.1

2021-08-19 03:33:24

[permalink] [raw]

Subject: [PATCH v3 07/20] platform/x86: intel_telemetry: Move to intel sub-directory

Move intel_telemetry to intel sub-directory to improve readability.

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 13 -------------
drivers/platform/x86/Makefile | 5 -----
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 1 +
drivers/platform/x86/intel/telemetry/Kconfig | 16 ++++++++++++++++
drivers/platform/x86/intel/telemetry/Makefile | 11 +++++++++++
.../telemetry/core.c} | 0
.../telemetry/debugfs.c} | 0
.../telemetry/pltdrv.c} | 0
9 files changed, 29 insertions(+), 18 deletions(-)
create mode 100644 drivers/platform/x86/intel/telemetry/Kconfig
create mode 100644 drivers/platform/x86/intel/telemetry/Makefile
rename drivers/platform/x86/{intel_telemetry_core.c => intel/telemetry/core.c} (100%)
rename drivers/platform/x86/{intel_telemetry_debugfs.c => intel/telemetry/debugfs.c} (100%)
rename drivers/platform/x86/{intel_telemetry_pltdrv.c => intel/telemetry/pltdrv.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index baad2c2bdf5f..4750ce36c4d5 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1158,19 +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_TELEMETRY
- tristate "Intel SoC Telemetry Driver"
- depends on X86_64
- depends on MFD_INTEL_PMC_BXT
- depends on INTEL_PUNIT_IPC
- help
- This driver provides interfaces to configure and use
- telemetry for INTEL SoC from APL onwards. It is also
- used to get various SoC events and parameters
- directly via debugfs files. Various tools may use
- this interface for SoC state monitoring.
-
endif # X86_PLATFORM_DEVICES

config PMC_ATOM
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index e6667008fc56..6210833289a1 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -126,10 +126,5 @@ obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/
obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o
obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o

-# Intel PMIC / PMC / P-Unit devices

-
-obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \
- intel_telemetry_pltdrv.o \
- intel_telemetry_debugfs.o
obj-$(CONFIG_PMC_ATOM) += pmc_atom.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 7ad715f65c01..b1b89cd14efc 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -60,5 +60,6 @@ config INTEL_PUNIT_IPC

source "drivers/platform/x86/intel/pmc/Kconfig"
source "drivers/platform/x86/intel/scu/Kconfig"
+source "drivers/platform/x86/intel/telemetry/Kconfig"

endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 71ae5db00864..834c9ff2e1f6 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -23,4 +23,5 @@ obj-$(CONFIG_INTEL_SCU_PCI) += scu/
obj-$(CONFIG_INTEL_SCU_PLATFORM) += scu/
obj-$(CONFIG_INTEL_SCU_WDT) += scu/
obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += scu/
+obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/

diff --git a/drivers/platform/x86/intel/telemetry/Kconfig b/drivers/platform/x86/intel/telemetry/Kconfig
new file mode 100644
index 000000000000..9fbc06dc4593
--- /dev/null
+++ b/drivers/platform/x86/intel/telemetry/Kconfig
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_TELEMETRY
+ tristate "Intel SoC Telemetry Driver"
+ depends on X86_64
+ depends on MFD_INTEL_PMC_BXT
+ depends on INTEL_PUNIT_IPC
+ help
+ This driver provides interfaces to configure and use
+ telemetry for INTEL SoC from APL onwards. It is also
+ used to get various SoC events and parameters
+ directly via debugfs files. Various tools may use
+ this interface for SoC state monitoring.
diff --git a/drivers/platform/x86/intel/telemetry/Makefile b/drivers/platform/x86/intel/telemetry/Makefile
new file mode 100644
index 000000000000..8561064c6ce5
--- /dev/null
+++ b/drivers/platform/x86/intel/telemetry/Makefile
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+intel_telemetry_core-y := core.o
+intel_telemetry_pltdrv-y := pltdrv.o
+intel_telemetry_debugfs-y := debugfs.o
+obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \
+ intel_telemetry_pltdrv.o \
+ intel_telemetry_debugfs.o
diff --git a/drivers/platform/x86/intel_telemetry_core.c b/drivers/platform/x86/intel/telemetry/core.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_core.c
rename to drivers/platform/x86/intel/telemetry/core.c
diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel/telemetry/debugfs.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_debugfs.c
rename to drivers/platform/x86/intel/telemetry/debugfs.c
diff --git a/drivers/platform/x86/intel_telemetry_pltdrv.c b/drivers/platform/x86/intel/telemetry/pltdrv.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_pltdrv.c
rename to drivers/platform/x86/intel/telemetry/pltdrv.c
--
2.31.1

2021-08-19 03:33:34

[permalink] [raw]

Subject: [PATCH v3 08/20] platform/x86: intel_ips: Move to intel sub-directory

Move intel_ips to intel sub-directory to improve readability
and rename it from intel_ips.c to ips.c

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 10 ----------
drivers/platform/x86/Makefile | 2 +-
drivers/platform/x86/intel/Kconfig | 10 ++++++++++
drivers/platform/x86/intel/Makefile | 6 ++++++
drivers/platform/x86/{intel_ips.c => intel/ips.c} | 2 +-
5 files changed, 18 insertions(+), 12 deletions(-)
rename drivers/platform/x86/{intel_ips.c => intel/ips.c} (99%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 4750ce36c4d5..5201a0e95b58 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1099,16 +1099,6 @@ config INTEL_IMR

If you are running on a Galileo/Quark say Y here.

-config INTEL_IPS
- tristate "Intel Intelligent Power Sharing"
- depends on ACPI && PCI
- help
- Intel Calpella platforms support dynamic power sharing between the
- CPU and GPU, maximizing performance in a given TDP. This driver,
- along with the CPU frequency and i915 drivers, provides that
- functionality. If in doubt, say Y here; it will only load on
- supported platforms.
-
config INTEL_RST
tristate "Intel Rapid Start Technology Driver"
depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 6210833289a1..9c5b7bf63187 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -119,7 +119,7 @@ obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o

# Intel uncore drivers
-obj-$(CONFIG_INTEL_IPS) += intel_ips.o
+
obj-$(CONFIG_INTEL_RST) += intel-rst.o
obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o
obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index b1b89cd14efc..388e669c9eb9 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -62,4 +62,14 @@ source "drivers/platform/x86/intel/pmc/Kconfig"
source "drivers/platform/x86/intel/scu/Kconfig"
source "drivers/platform/x86/intel/telemetry/Kconfig"

+config INTEL_IPS
+ tristate "Intel Intelligent Power Sharing"
+ depends on ACPI && PCI
+ help
+ Intel Calpella platforms support dynamic power sharing between the
+ CPU and GPU, maximizing performance in a given TDP. This driver,
+ along with the CPU frequency and i915 drivers, provides that
+ functionality. If in doubt, say Y here; it will only load on
+ supported platforms.
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 834c9ff2e1f6..59cb6be2703e 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -25,3 +25,9 @@ obj-$(CONFIG_INTEL_SCU_WDT) += scu/
obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += scu/
obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/

+# Intel uncore drivers
+intel_ips-y := ips.o
+obj-$(CONFIG_INTEL_IPS) += intel_ips.o
+
+
+
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel/ips.c
similarity index 99%
rename from drivers/platform/x86/intel_ips.c
rename to drivers/platform/x86/intel/ips.c
index 4dfdbfca6841..15254cd9042f 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel/ips.c
@@ -62,7 +62,7 @@
#include <drm/i915_drm.h>
#include <asm/msr.h>
#include <asm/processor.h>
-#include "intel_ips.h"
+#include "../intel_ips.h"

#include <linux/io-64-nonatomic-lo-hi.h>

--
2.31.1

2021-08-19 03:33:35

[permalink] [raw]

Subject: [PATCH v3 10/20] platform/x86: intel-smartconnect: Move to intel sub-directory

Move intel-smartconnect to intel sub-directory to improve readability
and rename it from intel-smartconnect.c to smartconnect.c

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 14 --------------
drivers/platform/x86/Makefile | 1 -
drivers/platform/x86/intel/Kconfig | 15 +++++++++++++++
drivers/platform/x86/intel/Makefile | 6 ++++--
.../smartconnect.c} | 0
5 files changed, 19 insertions(+), 17 deletions(-)
rename drivers/platform/x86/{intel-smartconnect.c => intel/smartconnect.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 81e793a752bb..0edd59ffb6b6 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1099,20 +1099,6 @@ config INTEL_IMR

If you are running on a Galileo/Quark say Y here.

-config INTEL_SMARTCONNECT
- tristate "Intel Smart Connect disabling driver"
- depends on ACPI
- help
- Intel Smart Connect is a technology intended to permit devices to
- update state by resuming for a short period of time at regular
- intervals. If a user enables this functionality under Windows and
- then reboots into Linux, the system may remain configured to resume
- on suspend. In the absence of any userspace to support it, the system
- will then remain awake until something triggers another suspend.
-
- This driver checks to determine whether the device has Intel Smart
- Connect enabled, and if so disables it.
-
source "drivers/platform/x86/intel_speed_select_if/Kconfig"

config INTEL_TURBO_MAX_3
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index c3631ebbdbb0..6082d4d1dad8 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -121,7 +121,6 @@ obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o
# Intel uncore drivers

-obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o
obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/
obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o
obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 6e673c104330..481811ea4bf8 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -84,4 +84,19 @@ config INTEL_RST
firmware will copy the memory contents back to RAM and resume the OS
as usual.

+config INTEL_SMARTCONNECT
+ tristate "Intel Smart Connect disabling driver"
+ depends on ACPI
+ help
+ Intel Smart Connect is a technology intended to permit devices to
+ update state by resuming for a short period of time at regular
+ intervals. If a user enables this functionality under Windows and
+ then reboots into Linux, the system may remain configured to resume
+ on suspend. In the absence of any userspace to support it, the system
+ will then remain awake until something triggers another suspend.
+
+ This driver checks to determine whether the device has Intel Smart
+ Connect enabled, and if so disables it.
+
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index e04efb799b4a..53d55a9b17b9 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -28,7 +28,9 @@ obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/
# Intel uncore drivers
intel_ips-y := ips.o
obj-$(CONFIG_INTEL_IPS) += intel_ips.o
-intel-rst-y := rst.o
-obj-$(CONFIG_INTEL_RST) += intel-rst.o
+intel-rst-y := rst.o
+obj-$(CONFIG_INTEL_RST) += intel-rst.o
+intel-smartconnect-y := smartconnect.o
+obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o

diff --git a/drivers/platform/x86/intel-smartconnect.c b/drivers/platform/x86/intel/smartconnect.c
similarity index 100%
rename from drivers/platform/x86/intel-smartconnect.c
rename to drivers/platform/x86/intel/smartconnect.c
--
2.31.1

2021-08-19 03:33:58

[permalink] [raw]

Subject: [PATCH v3 12/20] platform/x86: intel-uncore-frequency: Move to intel sub-directory

Move intel-uncore-frequency to intel sub-directory to improve
readability and rename it from intel-uncore-frequency.c to uncore-frequency.c

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 10 ----------
drivers/platform/x86/Makefile | 5 -----
drivers/platform/x86/intel/Kconfig | 12 +++++++++++-
drivers/platform/x86/intel/Makefile | 2 ++
.../uncore-frequency.c} | 0
5 files changed, 13 insertions(+), 16 deletions(-)
rename drivers/platform/x86/{intel-uncore-frequency.c => intel/uncore-frequency.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index b34bfa5c5748..9d57a2860c5a 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1101,16 +1101,6 @@ config INTEL_IMR

source "drivers/platform/x86/intel_speed_select_if/Kconfig"

-config INTEL_UNCORE_FREQ_CONTROL
- tristate "Intel Uncore frequency control driver"
- depends on X86_64
- help
- This driver allows control of uncore frequency limits on
- supported server platforms.
- Uncore frequency controls RING/LLC (last-level cache) clocks.
-
- To compile this driver as a module, choose M here: the module
- will be called intel-uncore-frequency.

endif # X86_PLATFORM_DEVICES

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index a57fbf26646a..80e75115a7bb 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -119,11 +119,6 @@ obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o

# Intel uncore drivers
-
-
obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/

-obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o
-
-
obj-$(CONFIG_PMC_ATOM) += pmc_atom.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 2943619d9018..2bec3b2c3af3 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -98,7 +98,6 @@ config INTEL_SMARTCONNECT
This driver checks to determine whether the device has Intel Smart
Connect enabled, and if so disables it.

-
config INTEL_TURBO_MAX_3
bool "Intel Turbo Boost Max Technology 3.0 enumeration driver"
depends on X86_64 && SCHED_MC_PRIO
@@ -109,4 +108,15 @@ config INTEL_TURBO_MAX_3
This driver is only required when the system is not using Hardware
P-States (HWP). In HWP mode, priority can be read from ACPI tables.

+config INTEL_UNCORE_FREQ_CONTROL
+ tristate "Intel Uncore frequency control driver"
+ depends on X86_64
+ help
+ This driver allows control of uncore frequency limits on
+ supported server platforms.
+ Uncore frequency controls RING/LLC (last-level cache) clocks.
+
+ To compile this driver as a module, choose M here: the module
+ will be called intel-uncore-frequency.
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 58ccb1f8cbd0..73d7c624fda8 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -34,3 +34,5 @@ intel-smartconnect-y := smartconnect.o
obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o
intel_turbo_max_3-y := turbo_max_3.o
obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o
+intel-uncore-frequency-y := uncore-frequency.o
+obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o
diff --git a/drivers/platform/x86/intel-uncore-frequency.c b/drivers/platform/x86/intel/uncore-frequency.c
similarity index 100%
rename from drivers/platform/x86/intel-uncore-frequency.c
rename to drivers/platform/x86/intel/uncore-frequency.c
--
2.31.1

2021-08-19 03:34:16

[permalink] [raw]

Subject: [PATCH v3 14/20] platform/x86: intel_atomisp2_led: Move to intel sub-directory

Move intel_atomisp2_led to intel sub-directory to improve
readability.

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 34 -----------------
drivers/platform/x86/Makefile | 4 +-
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 2 +
drivers/platform/x86/intel/atomisp2/Kconfig | 38 +++++++++++++++++++
drivers/platform/x86/intel/atomisp2/Makefile | 9 +++++
.../atomisp2/led.c} | 0
.../atomisp2/pm.c} | 0
8 files changed, 52 insertions(+), 36 deletions(-)
create mode 100644 drivers/platform/x86/intel/atomisp2/Kconfig
create mode 100644 drivers/platform/x86/intel/atomisp2/Makefile
rename drivers/platform/x86/{intel_atomisp2_led.c => intel/atomisp2/led.c} (100%)
rename drivers/platform/x86/{intel_atomisp2_pm.c => intel/atomisp2/pm.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 163dc73f3f95..196e70a8b264 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -667,40 +667,6 @@ config THINKPAD_LMI

source "drivers/platform/x86/intel/Kconfig"

-config INTEL_ATOMISP2_LED
- tristate "Intel AtomISP2 camera LED driver"
- depends on GPIOLIB && LEDS_GPIO
- help
- Many Bay Trail and Cherry Trail devices come with a camera attached
- to Intel's Image Signal Processor. Linux currently does not have a
- driver for these, so they do not work as a camera. Some of these
- camera's have a LED which is controlled through a GPIO.
-
- Some of these devices have a firmware issue where the LED gets turned
- on at boot. This driver will turn the LED off at boot and also allows
- controlling the LED (repurposing it) through the sysfs LED interface.
-
- Which GPIO is attached to the LED is usually not described in the
- ACPI tables, so this driver contains per-system info about the GPIO
- inside the driver, this means that this driver only works on systems
- the driver knows about.
-
- To compile this driver as a module, choose M here: the module
- will be called intel_atomisp2_led.
-
-config INTEL_ATOMISP2_PM
- tristate "Intel AtomISP2 dummy / power-management driver"
- depends on PCI && IOSF_MBI && PM
- depends on !INTEL_ATOMISP
- help
- Power-management driver for Intel's Image Signal Processor found on
- Bay Trail and Cherry Trail devices. This dummy driver's sole purpose
- is to turn the ISP off (put it in D3) to save power and to allow
- entering of S0ix modes.
-
- To compile this driver as a module, choose M here: the module
- will be called intel_atomisp2_pm.
-
config INTEL_HID_EVENT
tristate "INTEL HID Event"
depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 3d25ba595d4f..2a48171c11c1 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -61,6 +61,8 @@ obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o
# Hewlett Packard Enterprise
obj-$(CONFIG_UV_SYSFS) += uv_sysfs.o

+
+
# IBM Thinkpad and Lenovo
obj-$(CONFIG_IBM_RTL) += ibm_rtl.o
obj-$(CONFIG_IDEAPAD_LAPTOP) += ideapad-laptop.o
@@ -71,8 +73,6 @@ obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o
# Intel
obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/

-obj-$(CONFIG_INTEL_ATOMISP2_LED) += intel_atomisp2_led.o
-obj-$(CONFIG_INTEL_ATOMISP2_PM) += intel_atomisp2_pm.o
obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o
obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o
obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index f4f21c2f9230..01db66ec1462 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -19,6 +19,7 @@ if X86_PLATFORM_DRIVERS_INTEL
source "drivers/platform/x86/intel/int33fe/Kconfig"
source "drivers/platform/x86/intel/int3472/Kconfig"
source "drivers/platform/x86/intel/pmt/Kconfig"
+source "drivers/platform/x86/intel/atomisp2/Kconfig"

config INTEL_BXTWC_PMIC_TMU
tristate "Intel BXT Whiskey Cove TMU Driver"
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 317e8f8d144a..05a012118ea1 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -7,6 +7,8 @@
obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/
obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/
obj-$(CONFIG_INTEL_PMT_CLASS) += pmt/
+obj-$(CONFIG_INTEL_ATOMISP2_LED) += atomisp2/
+obj-$(CONFIG_INTEL_ATOMISP2_PM) += atomisp2/

# Intel PMIC / PMC / P-Unit devices
intel_bxtwc_tmu-y := bxtwc_tmu.o
diff --git a/drivers/platform/x86/intel/atomisp2/Kconfig b/drivers/platform/x86/intel/atomisp2/Kconfig
new file mode 100644
index 000000000000..e5851d8c33eb
--- /dev/null
+++ b/drivers/platform/x86/intel/atomisp2/Kconfig
@@ -0,0 +1,38 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_ATOMISP2_LED
+ tristate "Intel AtomISP2 camera LED driver"
+ depends on GPIOLIB && LEDS_GPIO
+ help
+ Many Bay Trail and Cherry Trail devices come with a camera attached
+ to Intel's Image Signal Processor. Linux currently does not have a
+ driver for these, so they do not work as a camera. Some of these
+ camera's have a LED which is controlled through a GPIO.
+
+ Some of these devices have a firmware issue where the LED gets turned
+ on at boot. This driver will turn the LED off at boot and also allows
+ controlling the LED (repurposing it) through the sysfs LED interface.
+
+ Which GPIO is attached to the LED is usually not described in the
+ ACPI tables, so this driver contains per-system info about the GPIO
+ inside the driver, this means that this driver only works on systems
+ the driver knows about.
+
+ To compile this driver as a module, choose M here: the module
+ will be called intel_atomisp2_led.
+
+config INTEL_ATOMISP2_PM
+ tristate "Intel AtomISP2 dummy / power-management driver"
+ depends on PCI && IOSF_MBI && PM
+ depends on !INTEL_ATOMISP
+ help
+ Power-management driver for Intel's Image Signal Processor found on
+ Bay Trail and Cherry Trail devices. This dummy driver's sole purpose
+ is to turn the ISP off (put it in D3) to save power and to allow
+ entering of S0ix modes.
+
+ To compile this driver as a module, choose M here: the module
+ will be called intel_atomisp2_pm.
diff --git a/drivers/platform/x86/intel/atomisp2/Makefile b/drivers/platform/x86/intel/atomisp2/Makefile
new file mode 100644
index 000000000000..96b1e877d1f1
--- /dev/null
+++ b/drivers/platform/x86/intel/atomisp2/Makefile
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+intel_atomisp2_led-y := led.o
+obj-$(CONFIG_INTEL_ATOMISP2_LED) += intel_atomisp2_led.o
+intel_atomisp2_pm-y += pm.o
+obj-$(CONFIG_INTEL_ATOMISP2_PM) += intel_atomisp2_pm.o
diff --git a/drivers/platform/x86/intel_atomisp2_led.c b/drivers/platform/x86/intel/atomisp2/led.c
similarity index 100%
rename from drivers/platform/x86/intel_atomisp2_led.c
rename to drivers/platform/x86/intel/atomisp2/led.c
diff --git a/drivers/platform/x86/intel_atomisp2_pm.c b/drivers/platform/x86/intel/atomisp2/pm.c
similarity index 100%
rename from drivers/platform/x86/intel_atomisp2_pm.c
rename to drivers/platform/x86/intel/atomisp2/pm.c
--
2.31.1

2021-08-19 03:34:27

[permalink] [raw]

Subject: [PATCH v3 16/20] platform/x86: intel_int0002_vgpio: Move to intel sub-directory

Move intel_int0002_vgpio to intel sub-directory to improve
readability.

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 19 -------------------
drivers/platform/x86/Makefile | 1 -
drivers/platform/x86/intel/Kconfig | 19 +++++++++++++++++++
drivers/platform/x86/intel/Makefile | 6 ++++--
.../int0002_vgpio.c} | 0
5 files changed, 23 insertions(+), 22 deletions(-)
rename drivers/platform/x86/{intel_int0002_vgpio.c => intel/int0002_vgpio.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 70cd67703f8f..90eb653131ab 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -667,25 +667,6 @@ config THINKPAD_LMI

source "drivers/platform/x86/intel/Kconfig"

-config INTEL_INT0002_VGPIO
- tristate "Intel ACPI INT0002 Virtual GPIO driver"
- depends on GPIOLIB && ACPI && PM_SLEEP
- select GPIOLIB_IRQCHIP
- help
- Some peripherals on Bay Trail and Cherry Trail platforms signal a
- Power Management Event (PME) to the Power Management Controller (PMC)
- to wakeup the system. When this happens software needs to explicitly
- clear the PME bus 0 status bit in the GPE0a_STS register to avoid an
- IRQ storm on IRQ 9.
-
- This is modelled in ACPI through the INT0002 ACPI device, which is
- called a "Virtual GPIO controller" in ACPI because it defines the
- event handler to call when the PME triggers through _AEI and _L02
- methods as would be done for a real GPIO interrupt in ACPI.
-
- To compile this driver as a module, choose M here: the module will
- be called intel_int0002_vgpio.
-
config INTEL_OAKTRAIL
tristate "Intel Oaktrail Platform Extras"
depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 62494618f890..1bbcc2900a84 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -72,7 +72,6 @@ obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o
# Intel
obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/

-obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o
obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 2241d47dbee7..fe9f84357eaf 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -34,6 +34,25 @@ config INTEL_HID_EVENT
To compile this driver as a module, choose M here: the module will
be called intel_hid.

+config INTEL_INT0002_VGPIO
+ tristate "Intel ACPI INT0002 Virtual GPIO driver"
+ depends on GPIOLIB && ACPI && PM_SLEEP
+ select GPIOLIB_IRQCHIP
+ help
+ Some peripherals on Bay Trail and Cherry Trail platforms signal a
+ Power Management Event (PME) to the Power Management Controller (PMC)
+ to wakeup the system. When this happens software needs to explicitly
+ clear the PME bus 0 status bit in the GPE0a_STS register to avoid an
+ IRQ storm on IRQ 9.
+
+ This is modelled in ACPI through the INT0002 ACPI device, which is
+ called a "Virtual GPIO controller" in ACPI because it defines the
+ event handler to call when the PME triggers through _AEI and _L02
+ methods as would be done for a real GPIO interrupt in ACPI.
+
+ To compile this driver as a module, choose M here: the module will
+ be called intel_int0002_vgpio.
+
config INTEL_BXTWC_PMIC_TMU
tristate "Intel BXT Whiskey Cove TMU Driver"
depends on REGMAP
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index ade6dddd0306..f52288b3edc2 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -9,8 +9,10 @@ obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/
obj-$(CONFIG_INTEL_PMT_CLASS) += pmt/
obj-$(CONFIG_INTEL_ATOMISP2_LED) += atomisp2/
obj-$(CONFIG_INTEL_ATOMISP2_PM) += atomisp2/
-intel-hid-y := hid.o
-obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o
+intel-hid-y := hid.o
+obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o
+intel_int0002_vgpio-y := int0002_vgpio.o
+obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o

# Intel PMIC / PMC / P-Unit devices
intel_bxtwc_tmu-y := bxtwc_tmu.o
diff --git a/drivers/platform/x86/intel_int0002_vgpio.c b/drivers/platform/x86/intel/int0002_vgpio.c
similarity index 100%
rename from drivers/platform/x86/intel_int0002_vgpio.c
rename to drivers/platform/x86/intel/int0002_vgpio.c
--
2.31.1

2021-08-19 03:34:38

[permalink] [raw]

Subject: [PATCH v3 02/20] platform/x86: intel_chtdc_ti_pwrbtn: Move to intel sub-directory

Move intel_chtdc_ti_pwrbtn to intel sub-directory
to improve readability.

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 11 -----------
drivers/platform/x86/Makefile | 2 +-
drivers/platform/x86/intel/Kconfig | 11 +++++++++++
drivers/platform/x86/intel/Makefile | 2 ++
.../chtdc_ti_pwrbtn.c} | 0
5 files changed, 14 insertions(+), 12 deletions(-)
rename drivers/platform/x86/{intel_chtdc_ti_pwrbtn.c => intel/chtdc_ti_pwrbtn.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 4e164e564d2f..7bccbfc417f7 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1158,17 +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_CHTDC_TI_PWRBTN
- tristate "Intel Cherry Trail Dollar Cove TI power button driver"
- depends on INTEL_SOC_PMIC_CHTDC_TI
- depends on INPUT
- help
- This option adds a power button driver driver for Dollar Cove TI
- PMIC on Intel Cherry Trail devices.
-
- To compile this driver as a module, choose M here: the module
- will be called intel_chtdc_ti_pwrbtn.
-
config INTEL_MRFLD_PWRBTN
tristate "Intel Merrifield Basin Cove power button driver"
depends on INTEL_SOC_PMIC_MRFLD
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index bcdd75a48a80..21fd8cb0a1b7 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -127,7 +127,7 @@ obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o
obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o

# Intel PMIC / PMC / P-Unit devices
-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_PUNIT_IPC) += intel_punit_ipc.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index b274ff4192b2..ea1f85e49bab 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -30,4 +30,15 @@ config INTEL_BXTWC_PMIC_TMU
This driver enables the alarm wakeup functionality in the TMU unit
of Whiskey Cove PMIC.

+config INTEL_CHTDC_TI_PWRBTN
+ tristate "Intel Cherry Trail Dollar Cove TI power button driver"
+ depends on INTEL_SOC_PMIC_CHTDC_TI
+ depends on INPUT
+ help
+ This option adds a power button driver for Dollar Cove TI
+ PMIC on Intel Cherry Trail devices.
+
+ To compile this driver as a module, choose M here: the module
+ will be called intel_chtdc_ti_pwrbtn.
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 22f669192d56..cc826a4dd69c 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -11,3 +11,5 @@ obj-$(CONFIG_INTEL_PMT_CLASS) += pmt/
# Intel PMIC / PMC / P-Unit devices
intel_bxtwc_tmu-y := bxtwc_tmu.o
obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o
+intel_chtdc_ti_pwrbtn-y := chtdc_ti_pwrbtn.o
+obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += intel_chtdc_ti_pwrbtn.o
diff --git a/drivers/platform/x86/intel_chtdc_ti_pwrbtn.c b/drivers/platform/x86/intel/chtdc_ti_pwrbtn.c
similarity index 100%
rename from drivers/platform/x86/intel_chtdc_ti_pwrbtn.c
rename to drivers/platform/x86/intel/chtdc_ti_pwrbtn.c
--
2.31.1

2021-08-19 03:34:47

[permalink] [raw]

Subject: [PATCH v3 11/20] platform/x86: intel_turbo_max_3: Move to intel sub-directory

Move intel_turbo_max_3 to intel sub-directory to improve readability
and rename it from intel_turbo_max_3.c to turbo_max_3.c

Signed-off-by: Kate Hsuan <[email protected]>
Acked-by: Srinivas Pandruvada <[email protected]>
---
drivers/platform/x86/Kconfig | 10 ----------
drivers/platform/x86/Makefile | 2 +-
drivers/platform/x86/intel/Kconfig | 10 ++++++++++
drivers/platform/x86/intel/Makefile | 4 ++--
.../x86/{intel_turbo_max_3.c => intel/turbo_max_3.c} | 0
5 files changed, 13 insertions(+), 13 deletions(-)
rename drivers/platform/x86/{intel_turbo_max_3.c => intel/turbo_max_3.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 0edd59ffb6b6..b34bfa5c5748 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1101,16 +1101,6 @@ config INTEL_IMR

source "drivers/platform/x86/intel_speed_select_if/Kconfig"

-config INTEL_TURBO_MAX_3
- bool "Intel Turbo Boost Max Technology 3.0 enumeration driver"
- depends on X86_64 && SCHED_MC_PRIO
- help
- This driver reads maximum performance ratio of each CPU and set up
- the scheduler priority metrics. In this way scheduler can prefer
- CPU with higher performance to schedule tasks.
- This driver is only required when the system is not using Hardware
- P-States (HWP). In HWP mode, priority can be read from ACPI tables.
-
config INTEL_UNCORE_FREQ_CONTROL
tristate "Intel Uncore frequency control driver"
depends on X86_64
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 6082d4d1dad8..a57fbf26646a 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -122,7 +122,7 @@ obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o

obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/
-obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o
+
obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 481811ea4bf8..2943619d9018 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -99,4 +99,14 @@ config INTEL_SMARTCONNECT
Connect enabled, and if so disables it.

+config INTEL_TURBO_MAX_3
+ bool "Intel Turbo Boost Max Technology 3.0 enumeration driver"
+ depends on X86_64 && SCHED_MC_PRIO
+ help
+ This driver reads maximum performance ratio of each CPU and set up
+ the scheduler priority metrics. In this way scheduler can prefer
+ CPU with higher performance to schedule tasks.
+ This driver is only required when the system is not using Hardware
+ P-States (HWP). In HWP mode, priority can be read from ACPI tables.
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 53d55a9b17b9..58ccb1f8cbd0 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -32,5 +32,5 @@ intel-rst-y := rst.o
obj-$(CONFIG_INTEL_RST) += intel-rst.o
intel-smartconnect-y := smartconnect.o
obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o
-
-
+intel_turbo_max_3-y := turbo_max_3.o
+obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o
diff --git a/drivers/platform/x86/intel_turbo_max_3.c b/drivers/platform/x86/intel/turbo_max_3.c
similarity index 100%
rename from drivers/platform/x86/intel_turbo_max_3.c
rename to drivers/platform/x86/intel/turbo_max_3.c
--
2.31.1

2021-08-19 03:34:57

[permalink] [raw]

Subject: [PATCH v3 20/20] platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory

Move intel-wmi-thunderbolt to intel sub-directory to improve
readability.

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 12 ------------
drivers/platform/x86/Makefile | 2 --
drivers/platform/x86/intel/Makefile | 1 +
drivers/platform/x86/intel/wmi/Kconfig | 12 ++++++++++++
drivers/platform/x86/intel/wmi/Makefile | 2 ++
.../wmi/thunderbolt.c} | 0
6 files changed, 15 insertions(+), 14 deletions(-)
rename drivers/platform/x86/{intel-wmi-thunderbolt.c => intel/wmi/thunderbolt.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 611930985b1d..adecdc0d4748 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -77,18 +77,6 @@ config UV_SYSFS
To compile this driver as a module, choose M here: the module will
be called uv_sysfs.

-config INTEL_WMI_THUNDERBOLT
- tristate "Intel WMI thunderbolt force power driver"
- depends on ACPI_WMI
- help
- Say Y here if you want to be able to use the WMI interface on select
- systems to force the power control of Intel Thunderbolt controllers.
- This is useful for updating the firmware when devices are not plugged
- into the controller.
-
- To compile this driver as a module, choose M here: the module will
- be called intel-wmi-thunderbolt.
-
config MXM_WMI
tristate "WMI support for MXM Laptop Graphics"
depends on ACPI_WMI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 0a6dca068d5a..56cff979428b 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -10,8 +10,6 @@ obj-$(CONFIG_WMI_BMOF) += wmi-bmof.o

# WMI drivers
obj-$(CONFIG_HUAWEI_WMI) += huawei-wmi.o
-
-obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += intel-wmi-thunderbolt.o
obj-$(CONFIG_MXM_WMI) += mxm-wmi.o
obj-$(CONFIG_PEAQ_WMI) += peaq-wmi.o
obj-$(CONFIG_XIAOMI_WMI) += xiaomi-wmi.o
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 0b27be3b9334..2c1bab610499 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -50,3 +50,4 @@ obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/

#WMI drivers
obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += wmi/
+obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += wmi/
diff --git a/drivers/platform/x86/intel/wmi/Kconfig b/drivers/platform/x86/intel/wmi/Kconfig
index fc70728e0f1f..0d65fc90f5b1 100644
--- a/drivers/platform/x86/intel/wmi/Kconfig
+++ b/drivers/platform/x86/intel/wmi/Kconfig
@@ -12,3 +12,15 @@ config INTEL_WMI_SBL_FW_UPDATE

To compile this driver as a module, choose M here: the module will
be called intel-wmi-sbl-fw-update.
+
+config INTEL_WMI_THUNDERBOLT
+ tristate "Intel WMI thunderbolt force power driver"
+ depends on ACPI_WMI
+ help
+ Say Y here if you want to be able to use the WMI interface on select
+ systems to force the power control of Intel Thunderbolt controllers.
+ This is useful for updating the firmware when devices are not plugged
+ into the controller.
+
+ To compile this driver as a module, choose M here: the module will
+ be called intel-wmi-thunderbolt.
diff --git a/drivers/platform/x86/intel/wmi/Makefile b/drivers/platform/x86/intel/wmi/Makefile
index bf1f118b6839..c2d56d25dea0 100644
--- a/drivers/platform/x86/intel/wmi/Makefile
+++ b/drivers/platform/x86/intel/wmi/Makefile
@@ -5,3 +5,5 @@

intel-wmi-sbl-fw-update-y := sbl-fw-update.o
obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += intel-wmi-sbl-fw-update.o
+intel-wmi-thunderbolt-y := thunderbolt.o
+obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += intel-wmi-thunderbolt.o
diff --git a/drivers/platform/x86/intel-wmi-thunderbolt.c b/drivers/platform/x86/intel/wmi/thunderbolt.c
similarity index 100%
rename from drivers/platform/x86/intel-wmi-thunderbolt.c
rename to drivers/platform/x86/intel/wmi/thunderbolt.c
--
2.31.1

2021-08-19 03:35:16

[permalink] [raw]

Subject: [PATCH v3 06/20] platform/x86: intel_scu: Move to intel sub-directory

Move intel_scu to intel sub-directory to improve readability.

Signed-off-by: Kate Hsuan <[email protected]>
Acked-by: Mika Westerberg <[email protected]>
---
drivers/platform/x86/Kconfig | 46 ----------------
drivers/platform/x86/Makefile | 6 +--
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 6 +++
drivers/platform/x86/intel/scu/Kconfig | 52 +++++++++++++++++++
drivers/platform/x86/intel/scu/Makefile | 13 +++++
.../x86/{intel_scu_ipc.c => intel/scu/ipc.c} | 0
.../scu/ipcutil.c} | 0
.../scu/pcidrv.c} | 0
.../scu/pltdrv.c} | 0
.../x86/{intel_scu_wdt.c => intel/scu/wdt.c} | 0
11 files changed, 73 insertions(+), 51 deletions(-)
create mode 100644 drivers/platform/x86/intel/scu/Kconfig
create mode 100644 drivers/platform/x86/intel/scu/Makefile
rename drivers/platform/x86/{intel_scu_ipc.c => intel/scu/ipc.c} (100%)
rename drivers/platform/x86/{intel_scu_ipcutil.c => intel/scu/ipcutil.c} (100%)
rename drivers/platform/x86/{intel_scu_pcidrv.c => intel/scu/pcidrv.c} (100%)
rename drivers/platform/x86/{intel_scu_pltdrv.c => intel/scu/pltdrv.c} (100%)
rename drivers/platform/x86/{intel_scu_wdt.c => intel/scu/wdt.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 79b6e0abc2ab..baad2c2bdf5f 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1158,52 +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_SCU_IPC
- bool
-
-config INTEL_SCU
- bool
- select INTEL_SCU_IPC
-
-config INTEL_SCU_PCI
- bool "Intel SCU PCI driver"
- depends on PCI
- select INTEL_SCU
- help
- This driver is used to bridge the communications between kernel
- and SCU on some embedded Intel x86 platforms. It also creates
- devices that are connected to the SoC through the SCU.
- Platforms supported:
- Medfield
- Clovertrail
- Merrifield
- Broxton
- Apollo Lake
-
-config INTEL_SCU_PLATFORM
- tristate "Intel SCU platform driver"
- depends on ACPI
- select INTEL_SCU
- help
- This driver is used to bridge the communications between kernel
- and SCU (sometimes called PMC as well). The driver currently
- supports Intel Elkhart Lake and compatible platforms.
-
-config INTEL_SCU_WDT
- bool
- default INTEL_SCU_PCI
- depends on INTEL_MID_WATCHDOG
- help
- This is a specific platform code to instantiate watchdog device
- on ACPI-based Intel MID platforms.
-
-config INTEL_SCU_IPC_UTIL
- tristate "Intel SCU IPC utility driver"
- depends on INTEL_SCU
- help
- The IPC Util driver provides an interface with the SCU enabling
- low level access for debug work and updating the firmware. Say
- N unless you will be doing this on an Intel MID platform.

config INTEL_TELEMETRY
tristate "Intel SoC Telemetry Driver"
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 37ad6a436dda..e6667008fc56 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -128,11 +128,7 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o

# Intel PMIC / PMC / P-Unit devices

-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
-obj-$(CONFIG_INTEL_SCU_WDT) += intel_scu_wdt.o
-obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o
+
obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \
intel_telemetry_pltdrv.o \
intel_telemetry_debugfs.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index e59ff836b592..7ad715f65c01 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -59,5 +59,6 @@ config INTEL_PUNIT_IPC
which is used to bridge the communications between kernel and P-Unit.

source "drivers/platform/x86/intel/pmc/Kconfig"
+source "drivers/platform/x86/intel/scu/Kconfig"

endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 1f343ee7c9b4..71ae5db00864 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -18,3 +18,9 @@ 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/
+obj-$(CONFIG_INTEL_SCU_IPC) += scu/
+obj-$(CONFIG_INTEL_SCU_PCI) += scu/
+obj-$(CONFIG_INTEL_SCU_PLATFORM) += scu/
+obj-$(CONFIG_INTEL_SCU_WDT) += scu/
+obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += scu/
+
diff --git a/drivers/platform/x86/intel/scu/Kconfig b/drivers/platform/x86/intel/scu/Kconfig
new file mode 100644
index 000000000000..9e9910ef5349
--- /dev/null
+++ b/drivers/platform/x86/intel/scu/Kconfig
@@ -0,0 +1,52 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for drivers/platform/x86/intel
+# Intel x86 Platform-Specific Drivers
+#
+
+config INTEL_SCU_IPC
+ bool
+
+config INTEL_SCU
+ bool
+ select INTEL_SCU_IPC
+
+config INTEL_SCU_PCI
+ bool "Intel SCU PCI driver"
+ depends on PCI
+ select INTEL_SCU
+ help
+ This driver is used to bridge the communications between kernel
+ and SCU on some embedded Intel x86 platforms. It also creates
+ devices that are connected to the SoC through the SCU.
+ Platforms supported:
+ Medfield
+ Clovertrail
+ Merrifield
+ Broxton
+ Apollo Lake
+
+config INTEL_SCU_PLATFORM
+ tristate "Intel SCU platform driver"
+ depends on ACPI
+ select INTEL_SCU
+ help
+ This driver is used to bridge the communications between kernel
+ and SCU (sometimes called PMC as well). The driver currently
+ supports Intel Elkhart Lake and compatible platforms.
+
+config INTEL_SCU_WDT
+ bool
+ default INTEL_SCU_PCI
+ depends on INTEL_MID_WATCHDOG
+ help
+ This is a specific platform code to instantiate watchdog device
+ on ACPI-based Intel MID platforms.
+
+config INTEL_SCU_IPC_UTIL
+ tristate "Intel SCU IPC utility driver"
+ depends on INTEL_SCU
+ help
+ The IPC Util driver provides an interface with the SCU enabling
+ low level access for debug work and updating the firmware. Say
+ N unless you will be doing this on an Intel MID platform.
diff --git a/drivers/platform/x86/intel/scu/Makefile b/drivers/platform/x86/intel/scu/Makefile
new file mode 100644
index 000000000000..27af4ba3be89
--- /dev/null
+++ b/drivers/platform/x86/intel/scu/Makefile
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for drivers/platform/x86/intel
+# Intel x86 Platform-Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_SCU_IPC) += ipc.o
+obj-$(CONFIG_INTEL_SCU_PCI) += pcidrv.o
+obj-$(CONFIG_INTEL_SCU_WDT) += wdt.o
+intel_scu_pltdrv-y := pltdrv.o
+obj-$(CONFIG_INTEL_SCU_PLATFORM) += intel_scu_pltdrv.o
+intel_scu_ipcutil-y := ipcutil.o
+obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel/scu/ipc.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_ipc.c
rename to drivers/platform/x86/intel/scu/ipc.c
diff --git a/drivers/platform/x86/intel_scu_ipcutil.c b/drivers/platform/x86/intel/scu/ipcutil.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_ipcutil.c
rename to drivers/platform/x86/intel/scu/ipcutil.c
diff --git a/drivers/platform/x86/intel_scu_pcidrv.c b/drivers/platform/x86/intel/scu/pcidrv.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_pcidrv.c
rename to drivers/platform/x86/intel/scu/pcidrv.c
diff --git a/drivers/platform/x86/intel_scu_pltdrv.c b/drivers/platform/x86/intel/scu/pltdrv.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_pltdrv.c
rename to drivers/platform/x86/intel/scu/pltdrv.c
diff --git a/drivers/platform/x86/intel_scu_wdt.c b/drivers/platform/x86/intel/scu/wdt.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_wdt.c
rename to drivers/platform/x86/intel/scu/wdt.c
--
2.31.1

2021-08-19 03:35:55

[permalink] [raw]

Subject: [PATCH v3 18/20] platform/x86: intel-vbtn: Move to intel sub-directory

Move intel-vbtn to intel sub-directory to improve
readability.

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 13 -------------
drivers/platform/x86/Makefile | 3 +--
drivers/platform/x86/intel/Kconfig | 13 +++++++++++++
drivers/platform/x86/intel/Makefile | 2 ++
drivers/platform/x86/{intel-vbtn.c => intel/vbtn.c} | 2 +-
5 files changed, 17 insertions(+), 16 deletions(-)
rename drivers/platform/x86/{intel-vbtn.c => intel/vbtn.c} (99%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 6ed05e5faac1..b8ce4e6d90dd 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -667,19 +667,6 @@ config THINKPAD_LMI

source "drivers/platform/x86/intel/Kconfig"

-config INTEL_VBTN
- tristate "INTEL VIRTUAL BUTTON"
- depends on ACPI
- depends on INPUT
- depends on I2C
- select INPUT_SPARSEKMAP
- help
- This driver provides support for the Intel Virtual Button interface.
- Some laptops require this driver for power button support.
-
- To compile this driver as a module, choose M here: the module will
- be called intel_vbtn.
-
config MSI_LAPTOP
tristate "MSI Laptop Extras"
depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index afeea9ce34b8..d8b193e910bd 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -69,11 +69,10 @@ obj-$(CONFIG_IDEAPAD_LAPTOP) += ideapad-laptop.o
obj-$(CONFIG_SENSORS_HDAPS) += hdaps.o
obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o
obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o
+
# Intel
obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/

-obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o
-
# MSI
obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
obj-$(CONFIG_MSI_WMI) += msi-wmi.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 5ca3c36ac187..3a13f7a6da4d 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -53,6 +53,19 @@ config INTEL_INT0002_VGPIO
To compile this driver as a module, choose M here: the module will
be called intel_int0002_vgpio.

+config INTEL_VBTN
+ tristate "INTEL VIRTUAL BUTTON"
+ depends on ACPI
+ depends on INPUT
+ depends on I2C
+ select INPUT_SPARSEKMAP
+ help
+ This driver provides support for the Intel Virtual Button interface.
+ Some laptops require this driver for power button support.
+
+ To compile this driver as a module, choose M here: the module will
+ be called intel_vbtn.
+
config INTEL_OAKTRAIL
tristate "Intel Oaktrail Platform Extras"
depends on ACPI
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index da238e2e352d..4211c683315f 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -15,6 +15,8 @@ intel_int0002_vgpio-y := int0002_vgpio.o
obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o
intel_oaktrail-y := oaktrail.o
obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
+intel-vbtn-y := vbtn.o
+obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o

# Intel PMIC / PMC / P-Unit devices
intel_bxtwc_tmu-y := bxtwc_tmu.o
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel/vbtn.c
similarity index 99%
rename from drivers/platform/x86/intel-vbtn.c
rename to drivers/platform/x86/intel/vbtn.c
index 309166431063..15f013af9e62 100644
--- a/drivers/platform/x86/intel-vbtn.c
+++ b/drivers/platform/x86/intel/vbtn.c
@@ -14,7 +14,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/suspend.h>
-#include "dual_accel_detect.h"
+#include "../dual_accel_detect.h"

/* Returned when NOT in tablet mode on some HP Stream x360 11 models */
#define VGBS_TABLET_MODE_FLAG_ALT 0x10
--
2.31.1

2021-08-19 03:35:57

[permalink] [raw]

Subject: [PATCH v3 13/20] platform/x86: intel_speed_select_if: Move to intel sub-directory

Move intel_speed_select_if to intel sub-directory to improve
readability and rename it from intel_speed_select_if to speed_select_if

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 2 --
drivers/platform/x86/Makefile | 2 --
drivers/platform/x86/intel/Kconfig | 2 ++
drivers/platform/x86/intel/Makefile | 3 ++-
.../{intel_speed_select_if => intel/speed_select_if}/Kconfig | 0
.../{intel_speed_select_if => intel/speed_select_if}/Makefile | 0
.../speed_select_if}/isst_if_common.c | 0
.../speed_select_if}/isst_if_common.h | 0
.../speed_select_if}/isst_if_mbox_msr.c | 0
.../speed_select_if}/isst_if_mbox_pci.c | 0
.../speed_select_if}/isst_if_mmio.c | 0
11 files changed, 4 insertions(+), 5 deletions(-)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Kconfig (100%)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Makefile (100%)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.c (100%)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.h (100%)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_msr.c (100%)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_pci.c (100%)
rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mmio.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 9d57a2860c5a..163dc73f3f95 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1099,8 +1099,6 @@ config INTEL_IMR

If you are running on a Galileo/Quark say Y here.

-source "drivers/platform/x86/intel_speed_select_if/Kconfig"
-

endif # X86_PLATFORM_DEVICES

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 80e75115a7bb..3d25ba595d4f 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -118,7 +118,5 @@ obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o
obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o

-# Intel uncore drivers
-obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/

obj-$(CONFIG_PMC_ATOM) += pmc_atom.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 2bec3b2c3af3..f4f21c2f9230 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -98,6 +98,8 @@ config INTEL_SMARTCONNECT
This driver checks to determine whether the device has Intel Smart
Connect enabled, and if so disables it.

+source "drivers/platform/x86/intel/speed_select_if/Kconfig"
+
config INTEL_TURBO_MAX_3
bool "Intel Turbo Boost Max Technology 3.0 enumeration driver"
depends on X86_64 && SCHED_MC_PRIO
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 73d7c624fda8..317e8f8d144a 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -34,5 +34,6 @@ intel-smartconnect-y := smartconnect.o
obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o
intel_turbo_max_3-y := turbo_max_3.o
obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o
-intel-uncore-frequency-y := uncore-frequency.o
+intel-uncore-frequency-y := uncore-frequency.o
obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o
+obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/
diff --git a/drivers/platform/x86/intel_speed_select_if/Kconfig b/drivers/platform/x86/intel/speed_select_if/Kconfig
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/Kconfig
rename to drivers/platform/x86/intel/speed_select_if/Kconfig
diff --git a/drivers/platform/x86/intel_speed_select_if/Makefile b/drivers/platform/x86/intel/speed_select_if/Makefile
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/Makefile
rename to drivers/platform/x86/intel/speed_select_if/Makefile
diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_common.c b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/isst_if_common.c
rename to drivers/platform/x86/intel/speed_select_if/isst_if_common.c
diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_common.h b/drivers/platform/x86/intel/speed_select_if/isst_if_common.h
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/isst_if_common.h
rename to drivers/platform/x86/intel/speed_select_if/isst_if_common.h
diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c b/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c
rename to drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c
diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_mbox_pci.c b/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_pci.c
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/isst_if_mbox_pci.c
rename to drivers/platform/x86/intel/speed_select_if/isst_if_mbox_pci.c
diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c b/drivers/platform/x86/intel/speed_select_if/isst_if_mmio.c
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c
rename to drivers/platform/x86/intel/speed_select_if/isst_if_mmio.c
--
2.31.1

2021-08-19 03:36:19

[permalink] [raw]

Subject: [PATCH v3 15/20] platform/x86: intel-hid: Move to intel sub-directory

Move intel-hid to intel sub-directory to improve
readability. Also, add CFLAGS to tweak the including path
of dual_accel_detect.

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 13 -------------
drivers/platform/x86/Makefile | 2 --
drivers/platform/x86/intel/Kconfig | 13 +++++++++++++
drivers/platform/x86/intel/Makefile | 2 ++
drivers/platform/x86/{intel-hid.c => intel/hid.c} | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
rename drivers/platform/x86/{intel-hid.c => intel/hid.c} (99%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 196e70a8b264..70cd67703f8f 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -667,19 +667,6 @@ config THINKPAD_LMI

source "drivers/platform/x86/intel/Kconfig"

-config INTEL_HID_EVENT
- tristate "INTEL HID Event"
- depends on ACPI
- depends on INPUT
- depends on I2C
- select INPUT_SPARSEKMAP
- help
- This driver provides support for the Intel HID Event hotkey interface.
- Some laptops require this driver for hotkey support.
-
- To compile this driver as a module, choose M here: the module will
- be called intel_hid.
-
config INTEL_INT0002_VGPIO
tristate "Intel ACPI INT0002 Virtual GPIO driver"
depends on GPIOLIB && ACPI && PM_SLEEP
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 2a48171c11c1..62494618f890 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -69,11 +69,9 @@ obj-$(CONFIG_IDEAPAD_LAPTOP) += ideapad-laptop.o
obj-$(CONFIG_SENSORS_HDAPS) += hdaps.o
obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o
obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o
-
# Intel
obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/

-obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o
obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o
obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 01db66ec1462..2241d47dbee7 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -21,6 +21,19 @@ source "drivers/platform/x86/intel/int3472/Kconfig"
source "drivers/platform/x86/intel/pmt/Kconfig"
source "drivers/platform/x86/intel/atomisp2/Kconfig"

+config INTEL_HID_EVENT
+ tristate "INTEL HID Event"
+ depends on ACPI
+ depends on INPUT
+ depends on I2C
+ select INPUT_SPARSEKMAP
+ help
+ This driver provides support for the Intel HID Event hotkey interface.
+ Some laptops require this driver for hotkey support.
+
+ To compile this driver as a module, choose M here: the module will
+ be called intel_hid.
+
config INTEL_BXTWC_PMIC_TMU
tristate "Intel BXT Whiskey Cove TMU Driver"
depends on REGMAP
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 05a012118ea1..ade6dddd0306 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -9,6 +9,8 @@ obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/
obj-$(CONFIG_INTEL_PMT_CLASS) += pmt/
obj-$(CONFIG_INTEL_ATOMISP2_LED) += atomisp2/
obj-$(CONFIG_INTEL_ATOMISP2_PM) += atomisp2/
+intel-hid-y := hid.o
+obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o

# Intel PMIC / PMC / P-Unit devices
intel_bxtwc_tmu-y := bxtwc_tmu.o
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel/hid.c
similarity index 99%
rename from drivers/platform/x86/intel-hid.c
rename to drivers/platform/x86/intel/hid.c
index 2e4e97a626a5..a33a5826e81a 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel/hid.c
@@ -14,7 +14,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/suspend.h>
-#include "dual_accel_detect.h"
+#include "../dual_accel_detect.h"

/* When NOT in tablet mode, VGBS returns with the flag 0x40 */
#define TABLET_MODE_FLAG BIT(6)
--
2.31.1

2021-08-19 03:36:30

[permalink] [raw]

Subject: [PATCH v3 17/20] platform/x86: intel_oaktrail: Move to intel sub-directory

Move intel_oaktrail to intel sub-directory to improve
readability.

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 10 ----------
drivers/platform/x86/Makefile | 1 -
drivers/platform/x86/intel/Kconfig | 10 ++++++++++
drivers/platform/x86/intel/Makefile | 2 ++
.../x86/{intel_oaktrail.c => intel/oaktrail.c} | 0
5 files changed, 12 insertions(+), 11 deletions(-)
rename drivers/platform/x86/{intel_oaktrail.c => intel/oaktrail.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 90eb653131ab..6ed05e5faac1 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -667,16 +667,6 @@ config THINKPAD_LMI

source "drivers/platform/x86/intel/Kconfig"

-config INTEL_OAKTRAIL
- tristate "Intel Oaktrail Platform Extras"
- depends on ACPI
- depends on ACPI_VIDEO || ACPI_VIDEO = n
- depends on RFKILL && BACKLIGHT_CLASS_DEVICE && ACPI
- help
- Intel Oaktrail platform need this driver to provide interfaces to
- enable/disable the Camera, WiFi, BT etc. devices. If in doubt, say Y
- here; it will only load on supported platforms.
-
config INTEL_VBTN
tristate "INTEL VIRTUAL BUTTON"
depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 1bbcc2900a84..afeea9ce34b8 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -72,7 +72,6 @@ obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o
# Intel
obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/

-obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o

# MSI
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index fe9f84357eaf..5ca3c36ac187 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -53,6 +53,16 @@ config INTEL_INT0002_VGPIO
To compile this driver as a module, choose M here: the module will
be called intel_int0002_vgpio.

+config INTEL_OAKTRAIL
+ tristate "Intel Oaktrail Platform Extras"
+ depends on ACPI
+ depends on ACPI_VIDEO || ACPI_VIDEO = n
+ depends on RFKILL && BACKLIGHT_CLASS_DEVICE && ACPI
+ help
+ Intel Oaktrail platform need this driver to provide interfaces to
+ enable/disable the Camera, WiFi, BT etc. devices. If in doubt, say Y
+ here; it will only load on supported platforms.
+
config INTEL_BXTWC_PMIC_TMU
tristate "Intel BXT Whiskey Cove TMU Driver"
depends on REGMAP
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index f52288b3edc2..da238e2e352d 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -13,6 +13,8 @@ intel-hid-y := hid.o
obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o
intel_int0002_vgpio-y := int0002_vgpio.o
obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o
+intel_oaktrail-y := oaktrail.o
+obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o

# Intel PMIC / PMC / P-Unit devices
intel_bxtwc_tmu-y := bxtwc_tmu.o
diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel/oaktrail.c
similarity index 100%
rename from drivers/platform/x86/intel_oaktrail.c
rename to drivers/platform/x86/intel/oaktrail.c
--
2.31.1

2021-08-19 03:36:42

[permalink] [raw]

Subject: [PATCH v3 09/20] platform/x86: intel-rst: Move to intel sub-directory

Move intel-rst to intel sub-directory to improve readability
and rename it from intel-rst.c to ips.c

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 12 ------------
drivers/platform/x86/Makefile | 2 +-
drivers/platform/x86/intel/Kconfig | 12 ++++++++++++
drivers/platform/x86/intel/Makefile | 3 ++-
drivers/platform/x86/{intel-rst.c => intel/rst.c} | 0
5 files changed, 15 insertions(+), 14 deletions(-)
rename drivers/platform/x86/{intel-rst.c => intel/rst.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 5201a0e95b58..81e793a752bb 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1099,18 +1099,6 @@ config INTEL_IMR

If you are running on a Galileo/Quark say Y here.

-config INTEL_RST
- tristate "Intel Rapid Start Technology Driver"
- depends on ACPI
- help
- This driver provides support for modifying parameters on systems
- equipped with Intel's Rapid Start Technology. When put in an ACPI
- sleep state, these devices will wake after either a configured
- timeout or when the system battery reaches a critical state,
- automatically copying memory contents to disk. On resume, the
- firmware will copy the memory contents back to RAM and resume the OS
- as usual.
-
config INTEL_SMARTCONNECT
tristate "Intel Smart Connect disabling driver"
depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 9c5b7bf63187..c3631ebbdbb0 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -120,7 +120,7 @@ obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o

# Intel uncore drivers

-obj-$(CONFIG_INTEL_RST) += intel-rst.o
+
obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o
obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/
obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 388e669c9eb9..6e673c104330 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -72,4 +72,16 @@ config INTEL_IPS
functionality. If in doubt, say Y here; it will only load on
supported platforms.

+config INTEL_RST
+ tristate "Intel Rapid Start Technology Driver"
+ depends on ACPI
+ help
+ This driver provides support for modifying parameters on systems
+ equipped with Intel's Rapid Start Technology. When put in an ACPI
+ sleep state, these devices will wake after either a configured
+ timeout or when the system battery reaches a critical state,
+ automatically copying memory contents to disk. On resume, the
+ firmware will copy the memory contents back to RAM and resume the OS
+ as usual.
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 59cb6be2703e..e04efb799b4a 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/
# Intel uncore drivers
intel_ips-y := ips.o
obj-$(CONFIG_INTEL_IPS) += intel_ips.o
-
+intel-rst-y := rst.o
+obj-$(CONFIG_INTEL_RST) += intel-rst.o

diff --git a/drivers/platform/x86/intel-rst.c b/drivers/platform/x86/intel/rst.c
similarity index 100%
rename from drivers/platform/x86/intel-rst.c
rename to drivers/platform/x86/intel/rst.c
--
2.31.1

2021-08-19 03:36:44

[permalink] [raw]

Subject: [PATCH v3 19/20] platform/x86: intel-wmi-sbl-fw-updat: Move to intel sub-directory

Move intel-wmi-sbl-fw-updat to intel sub-directory to improve
readability.

Signed-off-by: Kate Hsuan <[email protected]>
---
drivers/platform/x86/Kconfig | 10 ----------
drivers/platform/x86/Makefile | 2 +-
drivers/platform/x86/intel/Kconfig | 3 +++
drivers/platform/x86/intel/Makefile | 3 +++
drivers/platform/x86/intel/wmi/Kconfig | 14 ++++++++++++++
drivers/platform/x86/intel/wmi/Makefile | 7 +++++++
.../wmi/sbl-fw-update.c} | 0
7 files changed, 28 insertions(+), 11 deletions(-)
create mode 100644 drivers/platform/x86/intel/wmi/Kconfig
create mode 100644 drivers/platform/x86/intel/wmi/Makefile
rename drivers/platform/x86/{intel-wmi-sbl-fw-update.c => intel/wmi/sbl-fw-update.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index b8ce4e6d90dd..611930985b1d 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -77,16 +77,6 @@ config UV_SYSFS
To compile this driver as a module, choose M here: the module will
be called uv_sysfs.

-config INTEL_WMI_SBL_FW_UPDATE
- tristate "Intel WMI Slim Bootloader firmware update signaling driver"
- depends on ACPI_WMI
- help
- Say Y here if you want to be able to use the WMI interface to signal
- Slim Bootloader to trigger update on next reboot.
-
- To compile this driver as a module, choose M here: the module will
- be called intel-wmi-sbl-fw-update.
-
config INTEL_WMI_THUNDERBOLT
tristate "Intel WMI thunderbolt force power driver"
depends on ACPI_WMI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index d8b193e910bd..0a6dca068d5a 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_WMI_BMOF) += wmi-bmof.o

# WMI drivers
obj-$(CONFIG_HUAWEI_WMI) += huawei-wmi.o
-obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += intel-wmi-sbl-fw-update.o
+
obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += intel-wmi-thunderbolt.o
obj-$(CONFIG_MXM_WMI) += mxm-wmi.o
obj-$(CONFIG_PEAQ_WMI) += peaq-wmi.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 3a13f7a6da4d..665146ac65e9 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -177,4 +177,7 @@ config INTEL_UNCORE_FREQ_CONTROL
To compile this driver as a module, choose M here: the module
will be called intel-uncore-frequency.

+source "drivers/platform/x86/intel/wmi/Kconfig"
+
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 4211c683315f..0b27be3b9334 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -47,3 +47,6 @@ obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o
intel-uncore-frequency-y := uncore-frequency.o
obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o
obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/
+
+#WMI drivers
+obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += wmi/
diff --git a/drivers/platform/x86/intel/wmi/Kconfig b/drivers/platform/x86/intel/wmi/Kconfig
new file mode 100644
index 000000000000..fc70728e0f1f
--- /dev/null
+++ b/drivers/platform/x86/intel/wmi/Kconfig
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_WMI_SBL_FW_UPDATE
+ tristate "Intel WMI Slim Bootloader firmware update signaling driver"
+ depends on ACPI_WMI
+ help
+ Say Y here if you want to be able to use the WMI interface to signal
+ Slim Bootloader to trigger update on next reboot.
+
+ To compile this driver as a module, choose M here: the module will
+ be called intel-wmi-sbl-fw-update.
diff --git a/drivers/platform/x86/intel/wmi/Makefile b/drivers/platform/x86/intel/wmi/Makefile
new file mode 100644
index 000000000000..bf1f118b6839
--- /dev/null
+++ b/drivers/platform/x86/intel/wmi/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+intel-wmi-sbl-fw-update-y := sbl-fw-update.o
+obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += intel-wmi-sbl-fw-update.o
diff --git a/drivers/platform/x86/intel-wmi-sbl-fw-update.c b/drivers/platform/x86/intel/wmi/sbl-fw-update.c
similarity index 100%
rename from drivers/platform/x86/intel-wmi-sbl-fw-update.c
rename to drivers/platform/x86/intel/wmi/sbl-fw-update.c
--
2.31.1

2021-08-19 08:39:01

by Hans de Goede

[permalink] [raw]

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

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 <[email protected]>
> ---
> 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
>

2021-08-19 08:51:17

by Hans de Goede

[permalink] [raw]

Subject: Re: [PATCH v3 06/20] platform/x86: intel_scu: Move to intel sub-directory

Hi,

On 8/19/21 5:29 AM, Kate Hsuan wrote:
> Move intel_scu to intel sub-directory to improve readability.
>
> Signed-off-by: Kate Hsuan <[email protected]>
> Acked-by: Mika Westerberg <[email protected]>
> ---
> drivers/platform/x86/Kconfig | 46 ----------------
> drivers/platform/x86/Makefile | 6 +--
> drivers/platform/x86/intel/Kconfig | 1 +
> drivers/platform/x86/intel/Makefile | 6 +++
> drivers/platform/x86/intel/scu/Kconfig | 52 +++++++++++++++++++
> drivers/platform/x86/intel/scu/Makefile | 13 +++++
> .../x86/{intel_scu_ipc.c => intel/scu/ipc.c} | 0
> .../scu/ipcutil.c} | 0
> .../scu/pcidrv.c} | 0
> .../scu/pltdrv.c} | 0
> .../x86/{intel_scu_wdt.c => intel/scu/wdt.c} | 0
> 11 files changed, 73 insertions(+), 51 deletions(-)
> create mode 100644 drivers/platform/x86/intel/scu/Kconfig
> create mode 100644 drivers/platform/x86/intel/scu/Makefile
> rename drivers/platform/x86/{intel_scu_ipc.c => intel/scu/ipc.c} (100%)
> rename drivers/platform/x86/{intel_scu_ipcutil.c => intel/scu/ipcutil.c} (100%)
> rename drivers/platform/x86/{intel_scu_pcidrv.c => intel/scu/pcidrv.c} (100%)
> rename drivers/platform/x86/{intel_scu_pltdrv.c => intel/scu/pltdrv.c} (100%)
> rename drivers/platform/x86/{intel_scu_wdt.c => intel/scu/wdt.c} (100%)
>
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 79b6e0abc2ab..baad2c2bdf5f 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -1158,52 +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_SCU_IPC
> - bool
> -
> -config INTEL_SCU
> - bool
> - select INTEL_SCU_IPC
> -
> -config INTEL_SCU_PCI
> - bool "Intel SCU PCI driver"
> - depends on PCI
> - select INTEL_SCU
> - help
> - This driver is used to bridge the communications between kernel
> - and SCU on some embedded Intel x86 platforms. It also creates
> - devices that are connected to the SoC through the SCU.
> - Platforms supported:
> - Medfield
> - Clovertrail
> - Merrifield
> - Broxton
> - Apollo Lake
> -
> -config INTEL_SCU_PLATFORM
> - tristate "Intel SCU platform driver"
> - depends on ACPI
> - select INTEL_SCU
> - help
> - This driver is used to bridge the communications between kernel
> - and SCU (sometimes called PMC as well). The driver currently
> - supports Intel Elkhart Lake and compatible platforms.
> -
> -config INTEL_SCU_WDT
> - bool
> - default INTEL_SCU_PCI
> - depends on INTEL_MID_WATCHDOG
> - help
> - This is a specific platform code to instantiate watchdog device
> - on ACPI-based Intel MID platforms.
> -
> -config INTEL_SCU_IPC_UTIL
> - tristate "Intel SCU IPC utility driver"
> - depends on INTEL_SCU
> - help
> - The IPC Util driver provides an interface with the SCU enabling
> - low level access for debug work and updating the firmware. Say
> - N unless you will be doing this on an Intel MID platform.
>
> config INTEL_TELEMETRY
> tristate "Intel SoC Telemetry Driver"
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 37ad6a436dda..e6667008fc56 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -128,11 +128,7 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o
>
> # Intel PMIC / PMC / P-Unit devices
>
> -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
> -obj-$(CONFIG_INTEL_SCU_WDT) += intel_scu_wdt.o
> -obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o
> +
> obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \
> intel_telemetry_pltdrv.o \
> intel_telemetry_debugfs.o
> diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
> index e59ff836b592..7ad715f65c01 100644
> --- a/drivers/platform/x86/intel/Kconfig
> +++ b/drivers/platform/x86/intel/Kconfig
> @@ -59,5 +59,6 @@ config INTEL_PUNIT_IPC
> which is used to bridge the communications between kernel and P-Unit.
>
> source "drivers/platform/x86/intel/pmc/Kconfig"
> +source "drivers/platform/x86/intel/scu/Kconfig"
>
> endif # X86_PLATFORM_DRIVERS_INTEL
> diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
> index 1f343ee7c9b4..71ae5db00864 100644
> --- a/drivers/platform/x86/intel/Makefile
> +++ b/drivers/platform/x86/intel/Makefile
> @@ -18,3 +18,9 @@ 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/
> +obj-$(CONFIG_INTEL_SCU_IPC) += scu/
> +obj-$(CONFIG_INTEL_SCU_PCI) += scu/
> +obj-$(CONFIG_INTEL_SCU_PLATFORM) += scu/
> +obj-$(CONFIG_INTEL_SCU_WDT) += scu/
> +obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += scu/

This will cause make to dive into the scu subdir multiple times.

All CONFIG_INTEL_SCU* symbols either select or depend on CONFIG_INTEL_SCU, so we
can dive into the subdir only once based on this.

Also the Makefile line for diving into subdirs should be kept together.

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/scu/Kconfig b/drivers/platform/x86/intel/scu/Kconfig
> new file mode 100644
> index 000000000000..9e9910ef5349
> --- /dev/null
> +++ b/drivers/platform/x86/intel/scu/Kconfig
> @@ -0,0 +1,52 @@
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# Makefile for drivers/platform/x86/intel
> +# Intel x86 Platform-Specific Drivers
> +#
> +
> +config INTEL_SCU_IPC
> + bool
> +
> +config INTEL_SCU
> + bool
> + select INTEL_SCU_IPC
> +
> +config INTEL_SCU_PCI
> + bool "Intel SCU PCI driver"
> + depends on PCI
> + select INTEL_SCU
> + help
> + This driver is used to bridge the communications between kernel
> + and SCU on some embedded Intel x86 platforms. It also creates
> + devices that are connected to the SoC through the SCU.
> + Platforms supported:
> + Medfield
> + Clovertrail
> + Merrifield
> + Broxton
> + Apollo Lake
> +
> +config INTEL_SCU_PLATFORM
> + tristate "Intel SCU platform driver"
> + depends on ACPI
> + select INTEL_SCU
> + help
> + This driver is used to bridge the communications between kernel
> + and SCU (sometimes called PMC as well). The driver currently
> + supports Intel Elkhart Lake and compatible platforms.
> +
> +config INTEL_SCU_WDT
> + bool
> + default INTEL_SCU_PCI
> + depends on INTEL_MID_WATCHDOG
> + help
> + This is a specific platform code to instantiate watchdog device
> + on ACPI-based Intel MID platforms.
> +
> +config INTEL_SCU_IPC_UTIL
> + tristate "Intel SCU IPC utility driver"
> + depends on INTEL_SCU
> + help
> + The IPC Util driver provides an interface with the SCU enabling
> + low level access for debug work and updating the firmware. Say
> + N unless you will be doing this on an Intel MID platform.
> diff --git a/drivers/platform/x86/intel/scu/Makefile b/drivers/platform/x86/intel/scu/Makefile
> new file mode 100644
> index 000000000000..27af4ba3be89
> --- /dev/null
> +++ b/drivers/platform/x86/intel/scu/Makefile
> @@ -0,0 +1,13 @@
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# Makefile for drivers/platform/x86/intel
> +# Intel x86 Platform-Specific Drivers
> +#
> +
> +obj-$(CONFIG_INTEL_SCU_IPC) += ipc.o
> +obj-$(CONFIG_INTEL_SCU_PCI) += pcidrv.o
> +obj-$(CONFIG_INTEL_SCU_WDT) += wdt.o
> +intel_scu_pltdrv-y := pltdrv.o
> +obj-$(CONFIG_INTEL_SCU_PLATFORM) += intel_scu_pltdrv.o
> +intel_scu_ipcutil-y := ipcutil.o
> +obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o
> diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel/scu/ipc.c
> similarity index 100%
> rename from drivers/platform/x86/intel_scu_ipc.c
> rename to drivers/platform/x86/intel/scu/ipc.c
> diff --git a/drivers/platform/x86/intel_scu_ipcutil.c b/drivers/platform/x86/intel/scu/ipcutil.c
> similarity index 100%
> rename from drivers/platform/x86/intel_scu_ipcutil.c
> rename to drivers/platform/x86/intel/scu/ipcutil.c
> diff --git a/drivers/platform/x86/intel_scu_pcidrv.c b/drivers/platform/x86/intel/scu/pcidrv.c
> similarity index 100%
> rename from drivers/platform/x86/intel_scu_pcidrv.c
> rename to drivers/platform/x86/intel/scu/pcidrv.c
> diff --git a/drivers/platform/x86/intel_scu_pltdrv.c b/drivers/platform/x86/intel/scu/pltdrv.c
> similarity index 100%
> rename from drivers/platform/x86/intel_scu_pltdrv.c
> rename to drivers/platform/x86/intel/scu/pltdrv.c
> diff --git a/drivers/platform/x86/intel_scu_wdt.c b/drivers/platform/x86/intel/scu/wdt.c
> similarity index 100%
> rename from drivers/platform/x86/intel_scu_wdt.c
> rename to drivers/platform/x86/intel/scu/wdt.c
>

2021-08-19 09:10:47

by Hans de Goede

[permalink] [raw]

Subject: Re: [PATCH v3 14/20] platform/x86: intel_atomisp2_led: Move to intel sub-directory

Hi,

On 8/19/21 5:29 AM, Kate Hsuan wrote:
> Move intel_atomisp2_led to intel sub-directory to improve
> readability.
>
> Signed-off-by: Kate Hsuan <[email protected]>
> ---
> drivers/platform/x86/Kconfig | 34 -----------------
> drivers/platform/x86/Makefile | 4 +-
> drivers/platform/x86/intel/Kconfig | 1 +
> drivers/platform/x86/intel/Makefile | 2 +
> drivers/platform/x86/intel/atomisp2/Kconfig | 38 +++++++++++++++++++
> drivers/platform/x86/intel/atomisp2/Makefile | 9 +++++
> .../atomisp2/led.c} | 0
> .../atomisp2/pm.c} | 0
> 8 files changed, 52 insertions(+), 36 deletions(-)
> create mode 100644 drivers/platform/x86/intel/atomisp2/Kconfig
> create mode 100644 drivers/platform/x86/intel/atomisp2/Makefile
> rename drivers/platform/x86/{intel_atomisp2_led.c => intel/atomisp2/led.c} (100%)
> rename drivers/platform/x86/{intel_atomisp2_pm.c => intel/atomisp2/pm.c} (100%)
>
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 163dc73f3f95..196e70a8b264 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -667,40 +667,6 @@ config THINKPAD_LMI
>
> source "drivers/platform/x86/intel/Kconfig"
>
> -config INTEL_ATOMISP2_LED
> - tristate "Intel AtomISP2 camera LED driver"
> - depends on GPIOLIB && LEDS_GPIO
> - help
> - Many Bay Trail and Cherry Trail devices come with a camera attached
> - to Intel's Image Signal Processor. Linux currently does not have a
> - driver for these, so they do not work as a camera. Some of these
> - camera's have a LED which is controlled through a GPIO.
> -
> - Some of these devices have a firmware issue where the LED gets turned
> - on at boot. This driver will turn the LED off at boot and also allows
> - controlling the LED (repurposing it) through the sysfs LED interface.
> -
> - Which GPIO is attached to the LED is usually not described in the
> - ACPI tables, so this driver contains per-system info about the GPIO
> - inside the driver, this means that this driver only works on systems
> - the driver knows about.
> -
> - To compile this driver as a module, choose M here: the module
> - will be called intel_atomisp2_led.
> -
> -config INTEL_ATOMISP2_PM
> - tristate "Intel AtomISP2 dummy / power-management driver"
> - depends on PCI && IOSF_MBI && PM
> - depends on !INTEL_ATOMISP
> - help
> - Power-management driver for Intel's Image Signal Processor found on
> - Bay Trail and Cherry Trail devices. This dummy driver's sole purpose
> - is to turn the ISP off (put it in D3) to save power and to allow
> - entering of S0ix modes.
> -
> - To compile this driver as a module, choose M here: the module
> - will be called intel_atomisp2_pm.
> -
> config INTEL_HID_EVENT
> tristate "INTEL HID Event"
> depends on ACPI
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 3d25ba595d4f..2a48171c11c1 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -61,6 +61,8 @@ obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o
> # Hewlett Packard Enterprise
> obj-$(CONFIG_UV_SYSFS) += uv_sysfs.o
>
> +
> +
> # IBM Thinkpad and Lenovo
> obj-$(CONFIG_IBM_RTL) += ibm_rtl.o
> obj-$(CONFIG_IDEAPAD_LAPTOP) += ideapad-laptop.o
> @@ -71,8 +73,6 @@ obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o
> # Intel
> obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/
>
> -obj-$(CONFIG_INTEL_ATOMISP2_LED) += intel_atomisp2_led.o
> -obj-$(CONFIG_INTEL_ATOMISP2_PM) += intel_atomisp2_pm.o
> obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o
> obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o
> obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
> diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
> index f4f21c2f9230..01db66ec1462 100644
> --- a/drivers/platform/x86/intel/Kconfig
> +++ b/drivers/platform/x86/intel/Kconfig
> @@ -19,6 +19,7 @@ if X86_PLATFORM_DRIVERS_INTEL
> source "drivers/platform/x86/intel/int33fe/Kconfig"
> source "drivers/platform/x86/intel/int3472/Kconfig"
> source "drivers/platform/x86/intel/pmt/Kconfig"
> +source "drivers/platform/x86/intel/atomisp2/Kconfig"
>
> config INTEL_BXTWC_PMIC_TMU
> tristate "Intel BXT Whiskey Cove TMU Driver"
> diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
> index 317e8f8d144a..05a012118ea1 100644
> --- a/drivers/platform/x86/intel/Makefile
> +++ b/drivers/platform/x86/intel/Makefile
> @@ -7,6 +7,8 @@
> obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/
> obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/
> obj-$(CONFIG_INTEL_PMT_CLASS) += pmt/
> +obj-$(CONFIG_INTEL_ATOMISP2_LED) += atomisp2/
> +obj-$(CONFIG_INTEL_ATOMISP2_PM) += atomisp2/

Here is the issue of entering into the subdir twice if both
options are enabled again (and also the indent is wrong
and seems to be using spaces).

I've fixed this by adding making some changes to:
drivers/platform/x86/intel/atomisp2/Kconfig

I added:

config INTEL_ATOMISP2_PDX86
bool

Which is basically a hidden (not user selectable) bool option,
defaulting to N (which is the default default)

And then I added:

select INTEL_ATOMISP2_PDX86

The the config bits for both CONFIG_INTEL_ATOMISP2_LED and CONFIG_INTEL_ATOMISP2_PM
and then used the new CONFIG_INTEL_ATOMISP2_PDX86 in the Makefile to dive into
the subdir.

I have made these changes while merging the series there is no need for
a new version.

Regards,

Hans

>
> # Intel PMIC / PMC / P-Unit devices
> intel_bxtwc_tmu-y := bxtwc_tmu.o
> diff --git a/drivers/platform/x86/intel/atomisp2/Kconfig b/drivers/platform/x86/intel/atomisp2/Kconfig
> new file mode 100644
> index 000000000000..e5851d8c33eb
> --- /dev/null
> +++ b/drivers/platform/x86/intel/atomisp2/Kconfig
> @@ -0,0 +1,38 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# Intel x86 Platform Specific Drivers
> +#
> +
> +config INTEL_ATOMISP2_LED
> + tristate "Intel AtomISP2 camera LED driver"
> + depends on GPIOLIB && LEDS_GPIO
> + help
> + Many Bay Trail and Cherry Trail devices come with a camera attached
> + to Intel's Image Signal Processor. Linux currently does not have a
> + driver for these, so they do not work as a camera. Some of these
> + camera's have a LED which is controlled through a GPIO.
> +
> + Some of these devices have a firmware issue where the LED gets turned
> + on at boot. This driver will turn the LED off at boot and also allows
> + controlling the LED (repurposing it) through the sysfs LED interface.
> +
> + Which GPIO is attached to the LED is usually not described in the
> + ACPI tables, so this driver contains per-system info about the GPIO
> + inside the driver, this means that this driver only works on systems
> + the driver knows about.
> +
> + To compile this driver as a module, choose M here: the module
> + will be called intel_atomisp2_led.
> +
> +config INTEL_ATOMISP2_PM
> + tristate "Intel AtomISP2 dummy / power-management driver"
> + depends on PCI && IOSF_MBI && PM
> + depends on !INTEL_ATOMISP
> + help
> + Power-management driver for Intel's Image Signal Processor found on
> + Bay Trail and Cherry Trail devices. This dummy driver's sole purpose
> + is to turn the ISP off (put it in D3) to save power and to allow
> + entering of S0ix modes.
> +
> + To compile this driver as a module, choose M here: the module
> + will be called intel_atomisp2_pm.
> diff --git a/drivers/platform/x86/intel/atomisp2/Makefile b/drivers/platform/x86/intel/atomisp2/Makefile
> new file mode 100644
> index 000000000000..96b1e877d1f1
> --- /dev/null
> +++ b/drivers/platform/x86/intel/atomisp2/Makefile
> @@ -0,0 +1,9 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# Intel x86 Platform Specific Drivers
> +#
> +
> +intel_atomisp2_led-y := led.o
> +obj-$(CONFIG_INTEL_ATOMISP2_LED) += intel_atomisp2_led.o
> +intel_atomisp2_pm-y += pm.o
> +obj-$(CONFIG_INTEL_ATOMISP2_PM) += intel_atomisp2_pm.o
> diff --git a/drivers/platform/x86/intel_atomisp2_led.c b/drivers/platform/x86/intel/atomisp2/led.c
> similarity index 100%
> rename from drivers/platform/x86/intel_atomisp2_led.c
> rename to drivers/platform/x86/intel/atomisp2/led.c
> diff --git a/drivers/platform/x86/intel_atomisp2_pm.c b/drivers/platform/x86/intel/atomisp2/pm.c
> similarity index 100%
> rename from drivers/platform/x86/intel_atomisp2_pm.c
> rename to drivers/platform/x86/intel/atomisp2/pm.c
>

2021-08-19 09:32:10

by Hans de Goede

[permalink] [raw]

Subject: Re: [PATCH v3 20/20] platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory

Hi,

On 8/19/21 5:30 AM, Kate Hsuan wrote:
> Move intel-wmi-thunderbolt to intel sub-directory to improve
> readability.
>
> Signed-off-by: Kate Hsuan <[email protected]>
> ---
> drivers/platform/x86/Kconfig | 12 ------------
> drivers/platform/x86/Makefile | 2 --
> drivers/platform/x86/intel/Makefile | 1 +
> drivers/platform/x86/intel/wmi/Kconfig | 12 ++++++++++++
> drivers/platform/x86/intel/wmi/Makefile | 2 ++
> .../wmi/thunderbolt.c} | 0
> 6 files changed, 15 insertions(+), 14 deletions(-)
> rename drivers/platform/x86/{intel-wmi-thunderbolt.c => intel/wmi/thunderbolt.c} (100%)
>
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 611930985b1d..adecdc0d4748 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -77,18 +77,6 @@ config UV_SYSFS
> To compile this driver as a module, choose M here: the module will
> be called uv_sysfs.
>
> -config INTEL_WMI_THUNDERBOLT
> - tristate "Intel WMI thunderbolt force power driver"
> - depends on ACPI_WMI
> - help
> - Say Y here if you want to be able to use the WMI interface on select
> - systems to force the power control of Intel Thunderbolt controllers.
> - This is useful for updating the firmware when devices are not plugged
> - into the controller.
> -
> - To compile this driver as a module, choose M here: the module will
> - be called intel-wmi-thunderbolt.
> -
> config MXM_WMI
> tristate "WMI support for MXM Laptop Graphics"
> depends on ACPI_WMI
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 0a6dca068d5a..56cff979428b 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -10,8 +10,6 @@ obj-$(CONFIG_WMI_BMOF) += wmi-bmof.o
>
> # WMI drivers
> obj-$(CONFIG_HUAWEI_WMI) += huawei-wmi.o
> -
> -obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += intel-wmi-thunderbolt.o
> obj-$(CONFIG_MXM_WMI) += mxm-wmi.o
> obj-$(CONFIG_PEAQ_WMI) += peaq-wmi.o
> obj-$(CONFIG_XIAOMI_WMI) += xiaomi-wmi.o
> diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
> index 0b27be3b9334..2c1bab610499 100644
> --- a/drivers/platform/x86/intel/Makefile
> +++ b/drivers/platform/x86/intel/Makefile
> @@ -50,3 +50,4 @@ obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/
>
> #WMI drivers
> obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += wmi/
> +obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += wmi/

Here we have the issue of sending "make" twice into the same subdir again.

I've fixed this by adding a CONFIG_INTEL_WMI, similar to how I fixed
the same issue for the atomisp2 drivers.

I have made these changes while merging the series there is no need for
a new version.

Regards,

Hans

> diff --git a/drivers/platform/x86/intel/wmi/Kconfig b/drivers/platform/x86/intel/wmi/Kconfig
> index fc70728e0f1f..0d65fc90f5b1 100644
> --- a/drivers/platform/x86/intel/wmi/Kconfig
> +++ b/drivers/platform/x86/intel/wmi/Kconfig
> @@ -12,3 +12,15 @@ config INTEL_WMI_SBL_FW_UPDATE
>
> To compile this driver as a module, choose M here: the module will
> be called intel-wmi-sbl-fw-update.
> +
> +config INTEL_WMI_THUNDERBOLT
> + tristate "Intel WMI thunderbolt force power driver"
> + depends on ACPI_WMI
> + help
> + Say Y here if you want to be able to use the WMI interface on select
> + systems to force the power control of Intel Thunderbolt controllers.
> + This is useful for updating the firmware when devices are not plugged
> + into the controller.
> +
> + To compile this driver as a module, choose M here: the module will
> + be called intel-wmi-thunderbolt.
> diff --git a/drivers/platform/x86/intel/wmi/Makefile b/drivers/platform/x86/intel/wmi/Makefile
> index bf1f118b6839..c2d56d25dea0 100644
> --- a/drivers/platform/x86/intel/wmi/Makefile
> +++ b/drivers/platform/x86/intel/wmi/Makefile
> @@ -5,3 +5,5 @@
>
> intel-wmi-sbl-fw-update-y := sbl-fw-update.o
> obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += intel-wmi-sbl-fw-update.o
> +intel-wmi-thunderbolt-y := thunderbolt.o
> +obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += intel-wmi-thunderbolt.o
> diff --git a/drivers/platform/x86/intel-wmi-thunderbolt.c b/drivers/platform/x86/intel/wmi/thunderbolt.c
> similarity index 100%
> rename from drivers/platform/x86/intel-wmi-thunderbolt.c
> rename to drivers/platform/x86/intel/wmi/thunderbolt.c
>

2021-08-19 10:49:59

by Hans de Goede

[permalink] [raw]

Subject: Re: [PATCH v3 00/20] Intel platform driver code movement

Hi,

On 8/19/21 5:29 AM, Kate Hsuan wrote:
> v3 has some improvement and listed below.
> kconfig typo correction.
> commit message improvement.
> Fix two kernel test robot fail issues.
>
> Kate Hsuan (20):
> platform/x86: intel_bxtwc_tmu: Move to intel sub-directory
> platform/x86: intel_chtdc_ti_pwrbtn: Move to intel sub-directory
> platform/x86: intel_mrfld_pwrbtn: Move to intel sub-directory
> platform/x86: intel_punit_ipc: Move to intel sub-directory
> platform/x86: intel_pmc_core: Move to intel sub-directory
> platform/x86: intel_scu: Move to intel sub-directory
> platform/x86: intel_telemetry: Move to intel sub-directory
> platform/x86: intel_ips: Move to intel sub-directory
> platform/x86: intel-rst: Move to intel sub-directory
> platform/x86: intel-smartconnect: Move to intel sub-directory
> platform/x86: intel_turbo_max_3: Move to intel sub-directory
> platform/x86: intel-uncore-frequency: Move to intel sub-directory
> platform/x86: intel_speed_select_if: Move to intel sub-directory
> platform/x86: intel_atomisp2_led: Move to intel sub-directory
> platform/x86: intel-hid: Move to intel sub-directory
> platform/x86: intel_int0002_vgpio: Move to intel sub-directory
> platform/x86: intel_oaktrail: Move to intel sub-directory
> platform/x86: intel-vbtn: Move to intel sub-directory
> platform/x86: intel-wmi-sbl-fw-updat: Move to intel sub-directory
> platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory

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

With the changes mentioned in replies to individual patches.

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

>
> drivers/platform/x86/Kconfig | 287 ------------------
> drivers/platform/x86/Makefile | 34 +--
> drivers/platform/x86/intel/Kconfig | 160 ++++++++++
> drivers/platform/x86/intel/Makefile | 44 +++
> drivers/platform/x86/intel/atomisp2/Kconfig | 38 +++
> drivers/platform/x86/intel/atomisp2/Makefile | 9 +
> .../atomisp2/led.c} | 0
> .../atomisp2/pm.c} | 0
> .../{intel_bxtwc_tmu.c => intel/bxtwc_tmu.c} | 0
> .../chtdc_ti_pwrbtn.c} | 0
> .../platform/x86/{intel-hid.c => intel/hid.c} | 2 +-
> .../int0002_vgpio.c} | 0
> .../platform/x86/{intel_ips.c => intel/ips.c} | 2 +-
> .../mrfld_pwrbtn.c} | 0
> .../{intel_oaktrail.c => intel/oaktrail.c} | 0
> 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
> .../{intel_punit_ipc.c => intel/punit_ipc.c} | 0
> .../platform/x86/{intel-rst.c => intel/rst.c} | 0
> drivers/platform/x86/intel/scu/Kconfig | 52 ++++
> drivers/platform/x86/intel/scu/Makefile | 13 +
> .../x86/{intel_scu_ipc.c => intel/scu/ipc.c} | 0
> .../scu/ipcutil.c} | 0
> .../scu/pcidrv.c} | 0
> .../scu/pltdrv.c} | 0
> .../x86/{intel_scu_wdt.c => intel/scu/wdt.c} | 0
> .../smartconnect.c} | 0
> .../speed_select_if}/Kconfig | 0
> .../speed_select_if}/Makefile | 0
> .../speed_select_if}/isst_if_common.c | 0
> .../speed_select_if}/isst_if_common.h | 0
> .../speed_select_if}/isst_if_mbox_msr.c | 0
> .../speed_select_if}/isst_if_mbox_pci.c | 0
> .../speed_select_if}/isst_if_mmio.c | 0
> drivers/platform/x86/intel/telemetry/Kconfig | 16 +
> drivers/platform/x86/intel/telemetry/Makefile | 11 +
> .../telemetry/core.c} | 0
> .../telemetry/debugfs.c} | 0
> .../telemetry/pltdrv.c} | 0
> .../turbo_max_3.c} | 0
> .../uncore-frequency.c} | 0
> .../x86/{intel-vbtn.c => intel/vbtn.c} | 2 +-
> drivers/platform/x86/intel/wmi/Kconfig | 26 ++
> drivers/platform/x86/intel/wmi/Makefile | 9 +
> .../wmi/sbl-fw-update.c} | 0
> .../wmi/thunderbolt.c} | 0
> 49 files changed, 419 insertions(+), 321 deletions(-)
> create mode 100644 drivers/platform/x86/intel/atomisp2/Kconfig
> create mode 100644 drivers/platform/x86/intel/atomisp2/Makefile
> rename drivers/platform/x86/{intel_atomisp2_led.c => intel/atomisp2/led.c} (100%)
> rename drivers/platform/x86/{intel_atomisp2_pm.c => intel/atomisp2/pm.c} (100%)
> rename drivers/platform/x86/{intel_bxtwc_tmu.c => intel/bxtwc_tmu.c} (100%)
> rename drivers/platform/x86/{intel_chtdc_ti_pwrbtn.c => intel/chtdc_ti_pwrbtn.c} (100%)
> rename drivers/platform/x86/{intel-hid.c => intel/hid.c} (99%)
> rename drivers/platform/x86/{intel_int0002_vgpio.c => intel/int0002_vgpio.c} (100%)
> rename drivers/platform/x86/{intel_ips.c => intel/ips.c} (99%)
> rename drivers/platform/x86/{intel_mrfld_pwrbtn.c => intel/mrfld_pwrbtn.c} (100%)
> rename drivers/platform/x86/{intel_oaktrail.c => intel/oaktrail.c} (100%)
> 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%)
> rename drivers/platform/x86/{intel_punit_ipc.c => intel/punit_ipc.c} (100%)
> rename drivers/platform/x86/{intel-rst.c => intel/rst.c} (100%)
> create mode 100644 drivers/platform/x86/intel/scu/Kconfig
> create mode 100644 drivers/platform/x86/intel/scu/Makefile
> rename drivers/platform/x86/{intel_scu_ipc.c => intel/scu/ipc.c} (100%)
> rename drivers/platform/x86/{intel_scu_ipcutil.c => intel/scu/ipcutil.c} (100%)
> rename drivers/platform/x86/{intel_scu_pcidrv.c => intel/scu/pcidrv.c} (100%)
> rename drivers/platform/x86/{intel_scu_pltdrv.c => intel/scu/pltdrv.c} (100%)
> rename drivers/platform/x86/{intel_scu_wdt.c => intel/scu/wdt.c} (100%)
> rename drivers/platform/x86/{intel-smartconnect.c => intel/smartconnect.c} (100%)
> rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Kconfig (100%)
> rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Makefile (100%)
> rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.c (100%)
> rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.h (100%)
> rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_msr.c (100%)
> rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_pci.c (100%)
> rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mmio.c (100%)
> create mode 100644 drivers/platform/x86/intel/telemetry/Kconfig
> create mode 100644 drivers/platform/x86/intel/telemetry/Makefile
> rename drivers/platform/x86/{intel_telemetry_core.c => intel/telemetry/core.c} (100%)
> rename drivers/platform/x86/{intel_telemetry_debugfs.c => intel/telemetry/debugfs.c} (100%)
> rename drivers/platform/x86/{intel_telemetry_pltdrv.c => intel/telemetry/pltdrv.c} (100%)
> rename drivers/platform/x86/{intel_turbo_max_3.c => intel/turbo_max_3.c} (100%)
> rename drivers/platform/x86/{intel-uncore-frequency.c => intel/uncore-frequency.c} (100%)
> rename drivers/platform/x86/{intel-vbtn.c => intel/vbtn.c} (99%)
> create mode 100644 drivers/platform/x86/intel/wmi/Kconfig
> create mode 100644 drivers/platform/x86/intel/wmi/Makefile
> rename drivers/platform/x86/{intel-wmi-sbl-fw-update.c => intel/wmi/sbl-fw-update.c} (100%)
> rename drivers/platform/x86/{intel-wmi-thunderbolt.c => intel/wmi/thunderbolt.c} (100%)
>

2021-08-19 12:07:15

by Andy Shevchenko

[permalink] [raw]

Subject: Re: [PATCH v3 00/20] Intel platform driver code movement

On Thu, Aug 19, 2021 at 1:48 PM Hans de Goede <[email protected]> wrote:

> 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
>
> With the changes mentioned in replies to individual patches.

Can we postpone this a bit, please?

I have a few comments here and there. I'll send asap.

--
With Best Regards,
Andy Shevchenko

2021-08-19 12:10:43

by Andy Shevchenko

[permalink] [raw]

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

On Thu, Aug 19, 2021 at 6:32 AM Kate Hsuan <[email protected]> wrote:
>
> Move intel_pmc_core to intel sub-directory
> to improve readability.

> .../pmc/pmc_core.c} | 0
> .../pmc/pmc_core_pltdrv.c} | 0

As per SCU patch this can be done as

pmc_core -> core
pmc_core_pltdrv -> pltdrv

--
With Best Regards,
Andy Shevchenko

2021-08-19 12:12:50

by Andy Shevchenko

[permalink] [raw]

Subject: Re: [PATCH v3 06/20] platform/x86: intel_scu: Move to intel sub-directory

On Thu, Aug 19, 2021 at 6:33 AM Kate Hsuan <[email protected]> wrote:
>
> Move intel_scu to intel sub-directory to improve readability.

Intel SCU

...

> -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
> -obj-$(CONFIG_INTEL_SCU_WDT) += intel_scu_wdt.o
> -obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o

> +

Stray change?

...

> +obj-$(CONFIG_INTEL_SCU_IPC) += scu/
> +obj-$(CONFIG_INTEL_SCU_PCI) += scu/
> +obj-$(CONFIG_INTEL_SCU_PLATFORM) += scu/
> +obj-$(CONFIG_INTEL_SCU_WDT) += scu/
> +obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += scu/

One entry is enough.

...

> +obj-$(CONFIG_INTEL_SCU_IPC) += ipc.o
> +obj-$(CONFIG_INTEL_SCU_PCI) += pcidrv.o
> +obj-$(CONFIG_INTEL_SCU_WDT) += wdt.o

This is not an equivalent. Please, use the same approach as below.

> +intel_scu_pltdrv-y := pltdrv.o
> +obj-$(CONFIG_INTEL_SCU_PLATFORM) += intel_scu_pltdrv.o
> +intel_scu_ipcutil-y := ipcutil.o
> +obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o

--
With Best Regards,
Andy Shevchenko

2021-08-19 12:15:31

by Andy Shevchenko

[permalink] [raw]

Subject: Re: [PATCH v3 09/20] platform/x86: intel-rst: Move to intel sub-directory

On Thu, Aug 19, 2021 at 6:34 AM Kate Hsuan <[email protected]> wrote:
>
> Move intel-rst to intel sub-directory to improve readability
> and rename it from intel-rst.c to ips.c

> # Intel uncore drivers
>
> -obj-$(CONFIG_INTEL_RST) += intel-rst.o
> +

Stray change.

...

> -

Ditto.

> +intel-rst-y := rst.o
> +obj-$(CONFIG_INTEL_RST) += intel-rst.o

--
With Best Regards,
Andy Shevchenko

2021-08-19 12:16:39

by Andy Shevchenko

[permalink] [raw]

Subject: Re: [PATCH v3 00/20] Intel platform driver code movement

On Thu, Aug 19, 2021 at 3:03 PM Andy Shevchenko
<[email protected]> wrote:
> On Thu, Aug 19, 2021 at 1:48 PM Hans de Goede <[email protected]> wrote:
>
>
> > 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
> >
> > With the changes mentioned in replies to individual patches.
>
> Can we postpone this a bit, please?
>
> I have a few comments here and there. I'll send asap.

Hmm... It seems it will take less time if I simply take what you have
in your repo and produce a v4.
Would it work?

--
With Best Regards,
Andy Shevchenko

2021-08-19 12:17:06

by Andy Shevchenko

[permalink] [raw]

Subject: Re: [PATCH v3 07/20] platform/x86: intel_telemetry: Move to intel sub-directory

On Thu, Aug 19, 2021 at 6:32 AM Kate Hsuan <[email protected]> wrote:
> Move intel_telemetry to intel sub-directory to improve readability.

> +intel_telemetry_core-y := core.o
> +intel_telemetry_pltdrv-y := pltdrv.o
> +intel_telemetry_debugfs-y := debugfs.o

> +obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \
> + intel_telemetry_pltdrv.o \
> + intel_telemetry_debugfs.o

I know it is in the original, but we make take a chance to split this
per three separate lines

intel_telemetry_core-y := core.o
obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o
intel_telemetry_pltdrv-y := pltdrv.o
obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_pltdrv.o
intel_telemetry_debugfs-y := debugfs.o
obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_debugfs.o

--
With Best Regards,
Andy Shevchenko

2021-08-19 12:49:24

by Andy Shevchenko

[permalink] [raw]

Subject: Re: [PATCH v3 00/20] Intel platform driver code movement

On Thu, Aug 19, 2021 at 3:14 PM Andy Shevchenko
<[email protected]> wrote:
> On Thu, Aug 19, 2021 at 3:03 PM Andy Shevchenko
> <[email protected]> wrote:
> > On Thu, Aug 19, 2021 at 1:48 PM Hans de Goede <[email protected]> wrote:
> >
> >
> > > 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
> > >
> > > With the changes mentioned in replies to individual patches.
> >
> > Can we postpone this a bit, please?
> >
> > I have a few comments here and there. I'll send asap.
>
> Hmm... It seems it will take less time if I simply take what you have
> in your repo and produce a v4.
> Would it work?

Oh, there are more issues with the patches. Kconfigs have copy'n'paste
text from Makefiles.
Anyway, it seems I will do a v4.

--
With Best Regards,
Andy Shevchenko

2021-08-19 13:34:33

by Hans de Goede

[permalink] [raw]

Subject: Re: [PATCH v3 00/20] Intel platform driver code movement

Hi,

On 8/19/21 2:14 PM, Andy Shevchenko wrote:
> On Thu, Aug 19, 2021 at 3:03 PM Andy Shevchenko
> <[email protected]> wrote:
>> On Thu, Aug 19, 2021 at 1:48 PM Hans de Goede <[email protected]> wrote:
>>
>>
>>> 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
>>>
>>> With the changes mentioned in replies to individual patches.
>>
>> Can we postpone this a bit, please?
>>
>> I have a few comments here and there. I'll send asap.
>
> Hmm... It seems it will take less time if I simply take what you have
> in your repo and produce a v4.
> Would it work?

That is fine by me, I might be better to just do a small follow-up patch
though, given that you seem to only have a few small remarks.

But if you prefer to do a v4 that is fine too. I was planning on
keeping this in review-hans for a while anyways.

I did notice the couple of stray changes which you pointed out but
they get corrected by other commits (or are removal of extra whitespace
left-over from other commits), so I decided that they were harmless
since the end-result Makefile / Kconfig files were good.

Regards,

Hans

2021-08-19 13:37:04

by Hans de Goede

[permalink] [raw]

Subject: Re: [PATCH v3 00/20] Intel platform driver code movement

Hi,

On 8/19/21 3:31 PM, Hans de Goede wrote:
> Hi,
>
> On 8/19/21 2:14 PM, Andy Shevchenko wrote:
>> On Thu, Aug 19, 2021 at 3:03 PM Andy Shevchenko
>> <[email protected]> wrote:
>>> On Thu, Aug 19, 2021 at 1:48 PM Hans de Goede <[email protected]> wrote:
>>>
>>>
>>>> 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
>>>>
>>>> With the changes mentioned in replies to individual patches.
>>>
>>> Can we postpone this a bit, please?
>>>
>>> I have a few comments here and there. I'll send asap.
>>
>> Hmm... It seems it will take less time if I simply take what you have
>> in your repo and produce a v4.
>> Would it work?
>
> That is fine by me, I might be better to just do a small follow-up patch
> though, given that you seem to only have a few small remarks.
>
> But if you prefer to do a v4 that is fine too. I was planning on
> keeping this in review-hans for a while anyways.
>
> I did notice the couple of stray changes which you pointed out but
> they get corrected by other commits (or are removal of extra whitespace
> left-over from other commits), so I decided that they were harmless
> since the end-result Makefile / Kconfig files were good.

p.s.

Note that drivers/platform/x86/intel_ips.h is deliberately not moved
(for now) since it is also used by the i915 driver.

My plan is to merge a follow-up patch moving that through drm-intel-next
once 5.15-rc1 is out.

Regards,

Hans

2021-08-19 14:04:31

by Andy Shevchenko

[permalink] [raw]

Subject: Re: [PATCH v3 00/20] Intel platform driver code movement

On Thu, Aug 19, 2021 at 4:34 PM Hans de Goede <[email protected]> wrote:
> On 8/19/21 3:31 PM, Hans de Goede wrote:

...

> Note that drivers/platform/x86/intel_ips.h is deliberately not moved
> (for now) since it is also used by the i915 driver.
>
> My plan is to merge a follow-up patch moving that through drm-intel-next
> once 5.15-rc1 is out.

Why we can't do it in the same patch?

--
With Best Regards,
Andy Shevchenko

2021-08-19 14:12:42

by Hans de Goede

[permalink] [raw]

Subject: Re: [PATCH v3 00/20] Intel platform driver code movement

Hi,

On 8/19/21 4:01 PM, Andy Shevchenko wrote:
> On Thu, Aug 19, 2021 at 4:34 PM Hans de Goede <[email protected]> wrote:
>> On 8/19/21 3:31 PM, Hans de Goede wrote:
>
> ...
>
>> Note that drivers/platform/x86/intel_ips.h is deliberately not moved
>> (for now) since it is also used by the i915 driver.
>>
>> My plan is to merge a follow-up patch moving that through drm-intel-next
>> once 5.15-rc1 is out.
>
> Why we can't do it in the same patch?

Because the intel-drm code is seeing a lot of churn, so that will
cause conflicts. It will be a lot easier to do the move of that
last file through the drm-intel-next tree once this rename series
has landed in 5.15-rc1

Regards,

Hans