Skip to contentSkip to conversation

platform/x86/intel: Move Intel PMT drivers to new subfolder

PATCH Superseded David E. Box 2 participants 3 messages Jul 24, 2021 – Jul 26, 2021

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

David E. Box

author maintainer
#0 lore raw

PATCH 1/1 platform/x86/intel: Move Intel PMT drivers to new subfolder

Move all Intel Platform Monitoring Technology drivers to drivers/platform/x86/intel/pmt.

---
 MAINTAINERS                                   |  2 +-
 drivers/platform/x86/Kconfig                  | 36 -----------------
 drivers/platform/x86/Makefile                 |  3 --
 drivers/platform/x86/intel/Kconfig            |  1 +
 drivers/platform/x86/intel/Makefile           |  1 +
 drivers/platform/x86/intel/pmt/Kconfig        | 40 +++++++++++++++++++
 drivers/platform/x86/intel/pmt/Makefile       |  9 +++++
 .../pmt/pmt_class.c}                          |  2 +-
 .../pmt/pmt_class.h}                          |  0
 .../pmt/pmt_crashlog.c}                       |  2 +-
 .../pmt/pmt_telemetry.c}                      |  2 +-
 11 files changed, 55 insertions(+), 43 deletions(-)
 create mode 100644 drivers/platform/x86/intel/pmt/Kconfig
 create mode 100644 drivers/platform/x86/intel/pmt/Makefile
 rename drivers/platform/x86/{intel_pmt_class.c => intel/pmt/pmt_class.c} (99%)
 rename drivers/platform/x86/{intel_pmt_class.h => intel/pmt/pmt_class.h} (100%)
 rename drivers/platform/x86/{intel_pmt_crashlog.c => intel/pmt/pmt_crashlog.c} (99%)
 rename drivers/platform/x86/{intel_pmt_telemetry.c => intel/pmt/pmt_telemetry.c} (99%)
MAINTAINERS +1 -1
index ffed30dc86b0..ffd741306dcf 100644
@@ -9494,7 +9494,7 @@ INTEL PMT DRIVER
 M:	"David E. Box" <[email protected]>
 S:	Maintained
 F:	drivers/mfd/intel_pmt.c
-F:	drivers/platform/x86/intel_pmt_*
+F:	drivers/platform/x86/intel/pmt/pmt_*
 
 INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
 M:	Stanislav Yakovlev <[email protected]>
drivers/platform/x86/Kconfig +0 -36
index cae72922f448..f06ccd00f6c4 100644
@@ -1184,42 +1184,6 @@ config INTEL_MRFLD_PWRBTN
 	  To compile this driver as a module, choose M here: the module
 	  will be called intel_mrfld_pwrbtn.
 
-config INTEL_PMT_CLASS
-	tristate
-	help
-	  The Intel Platform Monitoring Technology (PMT) class driver provides
-	  the basic sysfs interface and file hierarchy used by PMT devices.
-
-	  For more information, see:
-	  <file:Documentation/ABI/testing/sysfs-class-intel_pmt>
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called intel_pmt_class.
-
-config INTEL_PMT_TELEMETRY
-	tristate "Intel Platform Monitoring Technology (PMT) Telemetry driver"
-	depends on MFD_INTEL_PMT
-	select INTEL_PMT_CLASS
-	help
-	  The Intel Platform Monitory Technology (PMT) Telemetry driver provides
-	  access to hardware telemetry metrics on devices that support the
-	  feature.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called intel_pmt_telemetry.
-
-config INTEL_PMT_CRASHLOG
-	tristate "Intel Platform Monitoring Technology (PMT) Crashlog driver"
-	depends on MFD_INTEL_PMT
-	select INTEL_PMT_CLASS
-	help
-	  The Intel Platform Monitoring Technology (PMT) crashlog driver provides
-	  access to hardware crashlog capabilities on devices that support the
-	  feature.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called intel_pmt_crashlog.
-
 config INTEL_PUNIT_IPC
 	tristate "Intel P-Unit IPC Driver"
 	help
drivers/platform/x86/Makefile +0 -3
index 43d36f8c36f1..d517d5cbc9ca 100644
@@ -128,9 +128,6 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
 obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+= intel_bxtwc_tmu.o
 obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN)	+= intel_chtdc_ti_pwrbtn.o
 obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= intel_mrfld_pwrbtn.o
-obj-$(CONFIG_INTEL_PMT_CLASS)		+= intel_pmt_class.o
-obj-$(CONFIG_INTEL_PMT_TELEMETRY)	+= intel_pmt_telemetry.o
-obj-$(CONFIG_INTEL_PMT_CRASHLOG)	+= intel_pmt_crashlog.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
drivers/platform/x86/intel/Kconfig +1 -0
index 8ca021785f67..0b238026c082 100644
@@ -19,5 +19,6 @@ if X86_PLATFORM_DRIVERS_INTEL
 source "drivers/platform/x86/intel/int33fe/Kconfig"
 source "drivers/platform/x86/intel/int3472/Kconfig"
 source "drivers/platform/x86/intel/pmc/Kconfig"
+source "drivers/platform/x86/intel/pmt/Kconfig"
 
 endif # X86_PLATFORM_DRIVERS_INTEL
drivers/platform/x86/intel/Makefile +1 -0
index 49962f4dfdec..93026884ae03 100644
@@ -7,3 +7,4 @@
 obj-$(CONFIG_INTEL_CHT_INT33FE)		+= int33fe/
 obj-$(CONFIG_INTEL_SKL_INT3472)		+= int3472/
 obj-$(CONFIG_INTEL_PMC_CORE)		+= pmc/
+obj-y					+= pmt/
drivers/platform/x86/intel/pmt/Kconfig new file +40 -0
new file mode 100644
index 000000000000..d630f883a717
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel Platform Monitoring Technology drivers
+#
+
+config INTEL_PMT_CLASS
+	tristate
+	help
+	  The Intel Platform Monitoring Technology (PMT) class driver provides
+	  the basic sysfs interface and file hierarchy used by PMT devices.
+
+	  For more information, see:
+	  <file:Documentation/ABI/testing/sysfs-class-intel_pmt>
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called intel_pmt_class.
+
+config INTEL_PMT_TELEMETRY
+	tristate "Intel Platform Monitoring Technology (PMT) Telemetry driver"
+	depends on MFD_INTEL_PMT
+	select INTEL_PMT_CLASS
+	help
+	  The Intel Platform Monitory Technology (PMT) Telemetry driver provides
+	  access to hardware telemetry metrics on devices that support the
+	  feature.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called intel_pmt_telemetry.
+
+config INTEL_PMT_CRASHLOG
+	tristate "Intel Platform Monitoring Technology (PMT) Crashlog driver"
+	depends on MFD_INTEL_PMT
+	select INTEL_PMT_CLASS
+	help
+	  The Intel Platform Monitoring Technology (PMT) crashlog driver provides
+	  access to hardware crashlog capabilities on devices that support the
+	  feature.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called intel_pmt_crashlog.
drivers/platform/x86/intel/pmt/Makefile new file +9 -0
new file mode 100644
index 000000000000..5c95cdbb57b1
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for linux/drivers/platform/x86/intel/pmt
+# Intel Platform Monitoring Technology Drivers
+#
+
+obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt_class.o
+obj-$(CONFIG_INTEL_PMT_TELEMETRY)	+= pmt_telemetry.o
+obj-$(CONFIG_INTEL_PMT_CRASHLOG)	+= pmt_crashlog.o
drivers/platform/x86/intel/pmt/pmt_class.c renamed from drivers/platform/x86/intel_pmt_class.c +1 -1
similarity index 99%
rename from drivers/platform/x86/intel_pmt_class.c
rename to drivers/platform/x86/intel/pmt/pmt_class.c
index c86ff15b1ed5..05c16a812e00 100644
@@ -13,7 +13,7 @@
 #include <linux/mm.h>
 #include <linux/pci.h>
 
-#include "intel_pmt_class.h"
+#include "pmt_class.h"
 
 #define PMT_XA_START		0
 #define PMT_XA_MAX		INT_MAX
drivers/platform/x86/intel/pmt/pmt_class.h renamed from drivers/platform/x86/intel_pmt_class.h +0 -0
similarity index 100%
rename from drivers/platform/x86/intel_pmt_class.h
rename to drivers/platform/x86/intel/pmt/pmt_class.h
drivers/platform/x86/intel/pmt/pmt_crashlog.c renamed from drivers/platform/x86/intel_pmt_crashlog.c +1 -1
similarity index 99%
rename from drivers/platform/x86/intel_pmt_crashlog.c
rename to drivers/platform/x86/intel/pmt/pmt_crashlog.c
index 56963ceb6345..e869dfcdce31 100644
@@ -15,7 +15,7 @@
 #include <linux/uaccess.h>
 #include <linux/overflow.h>
 
-#include "intel_pmt_class.h"
+#include "pmt_class.h"
 
 #define DRV_NAME		"pmt_crashlog"
 
drivers/platform/x86/intel/pmt/pmt_telemetry.c renamed from drivers/platform/x86/intel_pmt_telemetry.c +1 -1
similarity index 99%
rename from drivers/platform/x86/intel_pmt_telemetry.c
rename to drivers/platform/x86/intel/pmt/pmt_telemetry.c
index 9b95ef050457..b90ae25caba5 100644
@@ -15,7 +15,7 @@
 #include <linux/uaccess.h>
 #include <linux/overflow.h>
 
-#include "intel_pmt_class.h"
+#include "pmt_class.h"
 
 #define TELEM_DEV_NAME		"pmt_telemetry"
 
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · David E. Box

Move all Intel Platform Monitoring Technology drivers to drivers/platform/x86/intel/pmt.

Not sure we need the pmt part in the file names (dup with a folder name). If you have module parameters just keep the module / driver name to be the same.

Either way up to Hans, I'm fine with this

Quoted 231 lines
---
 MAINTAINERS                                   |  2 +-
 drivers/platform/x86/Kconfig                  | 36 -----------------
 drivers/platform/x86/Makefile                 |  3 --
 drivers/platform/x86/intel/Kconfig            |  1 +
 drivers/platform/x86/intel/Makefile           |  1 +
 drivers/platform/x86/intel/pmt/Kconfig        | 40 +++++++++++++++++++
 drivers/platform/x86/intel/pmt/Makefile       |  9 +++++
 .../pmt/pmt_class.c}                          |  2 +-
 .../pmt/pmt_class.h}                          |  0
 .../pmt/pmt_crashlog.c}                       |  2 +-
 .../pmt/pmt_telemetry.c}                      |  2 +-
 11 files changed, 55 insertions(+), 43 deletions(-)
 create mode 100644 drivers/platform/x86/intel/pmt/Kconfig
 create mode 100644 drivers/platform/x86/intel/pmt/Makefile
 rename drivers/platform/x86/{intel_pmt_class.c => intel/pmt/pmt_class.c} (99%)
 rename drivers/platform/x86/{intel_pmt_class.h => intel/pmt/pmt_class.h} (100%)
 rename drivers/platform/x86/{intel_pmt_crashlog.c => intel/pmt/pmt_crashlog.c} (99%)
 rename drivers/platform/x86/{intel_pmt_telemetry.c => intel/pmt/pmt_telemetry.c} (99%)
MAINTAINERS +1 -1
index ffed30dc86b0..ffd741306dcf 100644
@@ -9494,7 +9494,7 @@ INTEL PMT DRIVER
 M:	"David E. Box" <[email protected]>
 S:	Maintained
 F:	drivers/mfd/intel_pmt.c
-F:	drivers/platform/x86/intel_pmt_*
+F:	drivers/platform/x86/intel/pmt/pmt_*
 
 INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
 M:	Stanislav Yakovlev <[email protected]>
drivers/platform/x86/Kconfig +0 -36
index cae72922f448..f06ccd00f6c4 100644
@@ -1184,42 +1184,6 @@ config INTEL_MRFLD_PWRBTN
 	  To compile this driver as a module, choose M here: the module
 	  will be called intel_mrfld_pwrbtn.
 
-config INTEL_PMT_CLASS
-	tristate
-	help
-	  The Intel Platform Monitoring Technology (PMT) class driver provides
-	  the basic sysfs interface and file hierarchy used by PMT devices.
-
-	  For more information, see:
-	  <file:Documentation/ABI/testing/sysfs-class-intel_pmt>
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called intel_pmt_class.
-
-config INTEL_PMT_TELEMETRY
-	tristate "Intel Platform Monitoring Technology (PMT) Telemetry driver"
-	depends on MFD_INTEL_PMT
-	select INTEL_PMT_CLASS
-	help
-	  The Intel Platform Monitory Technology (PMT) Telemetry driver provides
-	  access to hardware telemetry metrics on devices that support the
-	  feature.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called intel_pmt_telemetry.
-
-config INTEL_PMT_CRASHLOG
-	tristate "Intel Platform Monitoring Technology (PMT) Crashlog driver"
-	depends on MFD_INTEL_PMT
-	select INTEL_PMT_CLASS
-	help
-	  The Intel Platform Monitoring Technology (PMT) crashlog driver provides
-	  access to hardware crashlog capabilities on devices that support the
-	  feature.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called intel_pmt_crashlog.
-
 config INTEL_PUNIT_IPC
 	tristate "Intel P-Unit IPC Driver"
 	help
drivers/platform/x86/Makefile +0 -3
index 43d36f8c36f1..d517d5cbc9ca 100644
@@ -128,9 +128,6 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
 obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+= intel_bxtwc_tmu.o
 obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN)	+= intel_chtdc_ti_pwrbtn.o
 obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= intel_mrfld_pwrbtn.o
-obj-$(CONFIG_INTEL_PMT_CLASS)		+= intel_pmt_class.o
-obj-$(CONFIG_INTEL_PMT_TELEMETRY)	+= intel_pmt_telemetry.o
-obj-$(CONFIG_INTEL_PMT_CRASHLOG)	+= intel_pmt_crashlog.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
drivers/platform/x86/intel/Kconfig +1 -0
index 8ca021785f67..0b238026c082 100644
@@ -19,5 +19,6 @@ if X86_PLATFORM_DRIVERS_INTEL
 source "drivers/platform/x86/intel/int33fe/Kconfig"
 source "drivers/platform/x86/intel/int3472/Kconfig"
 source "drivers/platform/x86/intel/pmc/Kconfig"
+source "drivers/platform/x86/intel/pmt/Kconfig"
 
 endif # X86_PLATFORM_DRIVERS_INTEL
drivers/platform/x86/intel/Makefile +1 -0
index 49962f4dfdec..93026884ae03 100644
@@ -7,3 +7,4 @@
 obj-$(CONFIG_INTEL_CHT_INT33FE)		+= int33fe/
 obj-$(CONFIG_INTEL_SKL_INT3472)		+= int3472/
 obj-$(CONFIG_INTEL_PMC_CORE)		+= pmc/
+obj-y					+= pmt/
drivers/platform/x86/intel/pmt/Kconfig new file +40 -0
new file mode 100644
index 000000000000..d630f883a717
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel Platform Monitoring Technology drivers
+#
+
+config INTEL_PMT_CLASS
+	tristate
+	help
+	  The Intel Platform Monitoring Technology (PMT) class driver provides
+	  the basic sysfs interface and file hierarchy used by PMT devices.
+
+	  For more information, see:
+	  <file:Documentation/ABI/testing/sysfs-class-intel_pmt>
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called intel_pmt_class.
+
+config INTEL_PMT_TELEMETRY
+	tristate "Intel Platform Monitoring Technology (PMT) Telemetry driver"
+	depends on MFD_INTEL_PMT
+	select INTEL_PMT_CLASS
+	help
+	  The Intel Platform Monitory Technology (PMT) Telemetry driver provides
+	  access to hardware telemetry metrics on devices that support the
+	  feature.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called intel_pmt_telemetry.
+
+config INTEL_PMT_CRASHLOG
+	tristate "Intel Platform Monitoring Technology (PMT) Crashlog driver"
+	depends on MFD_INTEL_PMT
+	select INTEL_PMT_CLASS
+	help
+	  The Intel Platform Monitoring Technology (PMT) crashlog driver provides
+	  access to hardware crashlog capabilities on devices that support the
+	  feature.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called intel_pmt_crashlog.
drivers/platform/x86/intel/pmt/Makefile new file +9 -0
new file mode 100644
index 000000000000..5c95cdbb57b1
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for linux/drivers/platform/x86/intel/pmt
+# Intel Platform Monitoring Technology Drivers
+#
+
+obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt_class.o
+obj-$(CONFIG_INTEL_PMT_TELEMETRY)	+= pmt_telemetry.o
+obj-$(CONFIG_INTEL_PMT_CRASHLOG)	+= pmt_crashlog.o
drivers/platform/x86/intel/pmt/pmt_class.c renamed from drivers/platform/x86/intel_pmt_class.c +1 -1
similarity index 99%
rename from drivers/platform/x86/intel_pmt_class.c
rename to drivers/platform/x86/intel/pmt/pmt_class.c
index c86ff15b1ed5..05c16a812e00 100644
@@ -13,7 +13,7 @@
 #include <linux/mm.h>
 #include <linux/pci.h>
 
-#include "intel_pmt_class.h"
+#include "pmt_class.h"
 
 #define PMT_XA_START		0
 #define PMT_XA_MAX		INT_MAX
drivers/platform/x86/intel/pmt/pmt_class.h renamed from drivers/platform/x86/intel_pmt_class.h +0 -0
similarity index 100%
rename from drivers/platform/x86/intel_pmt_class.h
rename to drivers/platform/x86/intel/pmt/pmt_class.h
drivers/platform/x86/intel/pmt/pmt_crashlog.c renamed from drivers/platform/x86/intel_pmt_crashlog.c +1 -1
similarity index 99%
rename from drivers/platform/x86/intel_pmt_crashlog.c
rename to drivers/platform/x86/intel/pmt/pmt_crashlog.c
index 56963ceb6345..e869dfcdce31 100644
@@ -15,7 +15,7 @@
 #include <linux/uaccess.h>
 #include <linux/overflow.h>
 
-#include "intel_pmt_class.h"
+#include "pmt_class.h"
 
 #define DRV_NAME		"pmt_crashlog"
 
drivers/platform/x86/intel/pmt/pmt_telemetry.c renamed from drivers/platform/x86/intel_pmt_telemetry.c +1 -1
similarity index 99%
rename from drivers/platform/x86/intel_pmt_telemetry.c
rename to drivers/platform/x86/intel/pmt/pmt_telemetry.c
index 9b95ef050457..b90ae25caba5 100644
@@ -15,7 +15,7 @@
 #include <linux/uaccess.h>
 #include <linux/overflow.h>
 
-#include "intel_pmt_class.h"
+#include "pmt_class.h"
 
 #define TELEM_DEV_NAME		"pmt_telemetry"
 
Signature · 1 line
2.25.1
Signature · 2 lines
With Best Regards,
Andy Shevchenko
author maintainer
#2 lore raw
Quoted 8 lines · Andy Shevchenko
Quoted 2 lines · David E. Box

Move all Intel Platform Monitoring Technology drivers to drivers/platform/x86/intel/pmt.

Not sure we need the pmt part in the file names (dup with a folder name). If
you have module parameters just keep the module / driver name to be the same.

No parameters. I'll send out a V2 with the prefix removed. Thanks.

David

Quoted 278 lines

Either way up to Hans, I'm fine with this

Quoted 273 lines

---
 MAINTAINERS                                   |  2 +- drivers/platform/x86/Kconfig                  | 36 --------------- --
 drivers/platform/x86/Makefile                 |  3 -- drivers/platform/x86/intel/Kconfig            |  1 + drivers/platform/x86/intel/Makefile           |  1 + drivers/platform/x86/intel/pmt/Kconfig        | 40
+++++++++++++++++++
 drivers/platform/x86/intel/pmt/Makefile       |  9 +++++ .../pmt/pmt_class.c}                          |  2 +- .../pmt/pmt_class.h}                          |  0 .../pmt/pmt_crashlog.c}                       |  2 +- .../pmt/pmt_telemetry.c}                      |  2 +-

 11 files changed, 55 insertions(+), 43 deletions(-)

 create mode 100644 drivers/platform/x86/intel/pmt/Kconfig create mode 100644 drivers/platform/x86/intel/pmt/Makefile rename drivers/platform/x86/{intel_pmt_class.c => intel/pmt/pmt_class.c} (99%)
 rename drivers/platform/x86/{intel_pmt_class.h => intel/pmt/pmt_class.h} (100%)
 rename drivers/platform/x86/{intel_pmt_crashlog.c => intel/pmt/pmt_crashlog.c} (99%)
 rename drivers/platform/x86/{intel_pmt_telemetry.c => intel/pmt/pmt_telemetry.c} (99%)

MAINTAINERS +0 -0
index ffed30dc86b0..ffd741306dcf 100644
@@ -9494,7 +9494,7 @@ INTEL PMT DRIVER

 M:     "David E. Box" <[email protected]> S:     Maintained
 F:     drivers/mfd/intel_pmt.c

MAINTAINERS +1 -1
-F:     drivers/platform/x86/intel_pmt_*
+F:     drivers/platform/x86/intel/pmt/pmt_*


 INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
 M:     Stanislav Yakovlev <[email protected]>

drivers/platform/x86/Kconfig +0 -0
index cae72922f448..f06ccd00f6c4 100644
@@ -1184,42 +1184,6 @@ config INTEL_MRFLD_PWRBTN

          To compile this driver as a module, choose M here: the module
          will be called intel_mrfld_pwrbtn.

-config INTEL_PMT_CLASS
-       tristate
-       help
-         The Intel Platform Monitoring Technology (PMT) class driver provides
-         the basic sysfs interface and file hierarchy used by PMT devices.

drivers/platform/x86/Kconfig +0 -5
-
-         For more information, see:
-         <file:Documentation/ABI/testing/sysfs-class-intel_pmt>
-
-         To compile this driver as a module, choose M here: the

module
-         will be called intel_pmt_class.

drivers/platform/x86/Kconfig +0 -3
-
-config INTEL_PMT_TELEMETRY
-       tristate "Intel Platform Monitoring Technology (PMT)

Telemetry driver"
-       depends on MFD_INTEL_PMT
-       select INTEL_PMT_CLASS
-       help
-         The Intel Platform Monitory Technology (PMT) Telemetry driver provides
-         access to hardware telemetry metrics on devices that support the
-         feature.
-
-         To compile this driver as a module, choose M here: the module
-         will be called intel_pmt_telemetry.

drivers/platform/x86/Kconfig +0 -3
-
-config INTEL_PMT_CRASHLOG
-       tristate "Intel Platform Monitoring Technology (PMT)

Crashlog driver"
-       depends on MFD_INTEL_PMT
-       select INTEL_PMT_CLASS
-       help
-         The Intel Platform Monitoring Technology (PMT) crashlog driver provides
-         access to hardware crashlog capabilities on devices that support the
-         feature.
-
-         To compile this driver as a module, choose M here: the module
-         will be called intel_pmt_crashlog.
-
 config INTEL_PUNIT_IPC
        tristate "Intel P-Unit IPC Driver"
        help

drivers/platform/x86/Makefile +0 -0
index 43d36f8c36f1..d517d5cbc9ca 100644
@@ -128,9 +128,6 @@ obj-

$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)             += intel-uncore- frequency.o
 obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)     += intel_bxtwc_tmu.o obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN)    += intel_chtdc_ti_pwrbtn.o obj-$(CONFIG_INTEL_MRFLD_PWRBTN)       += intel_mrfld_pwrbtn.o

drivers/platform/x86/Makefile +0 -3
-obj-$(CONFIG_INTEL_PMT_CLASS)          += intel_pmt_class.o
-obj-$(CONFIG_INTEL_PMT_TELEMETRY)      += intel_pmt_telemetry.o
-obj-$(CONFIG_INTEL_PMT_CRASHLOG)       += intel_pmt_crashlog.o

 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

drivers/platform/x86/intel/Kconfig +0 -0
index 8ca021785f67..0b238026c082 100644
@@ -19,5 +19,6 @@ if X86_PLATFORM_DRIVERS_INTEL

 source "drivers/platform/x86/intel/int33fe/Kconfig" source "drivers/platform/x86/intel/int3472/Kconfig" source "drivers/platform/x86/intel/pmc/Kconfig" +source "drivers/platform/x86/intel/pmt/Kconfig"
 endif # X86_PLATFORM_DRIVERS_INTEL

drivers/platform/x86/intel/Makefile +0 -0
index 49962f4dfdec..93026884ae03 100644
@@ -7,3 +7,4 @@

 obj-$(CONFIG_INTEL_CHT_INT33FE)                += int33fe/ obj-$(CONFIG_INTEL_SKL_INT3472)                += int3472/ obj-$(CONFIG_INTEL_PMC_CORE)           += pmc/

drivers/platform/x86/intel/Makefile +1 -0
+obj-y                                  += pmt/
drivers/platform/x86/intel/pmt/Kconfig new file +9 -0
new file mode 100644
index 000000000000..d630f883a717
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel Platform Monitoring Technology drivers
+#
+
+config INTEL_PMT_CLASS
+       tristate
+       help
+         The Intel Platform Monitoring Technology (PMT) class

driver provides
+         the basic sysfs interface and file hierarchy used by PMT devices.

drivers/platform/x86/intel/pmt/Kconfig new file +5 -0
+
+         For more information, see:
+         <file:Documentation/ABI/testing/sysfs-class-intel_pmt>
+
+         To compile this driver as a module, choose M here: the

module
+         will be called intel_pmt_class.

drivers/platform/x86/intel/pmt/Kconfig new file +3 -0
+
+config INTEL_PMT_TELEMETRY
+       tristate "Intel Platform Monitoring Technology (PMT)

Telemetry driver"
+       depends on MFD_INTEL_PMT
+       select INTEL_PMT_CLASS
+       help
+         The Intel Platform Monitory Technology (PMT) Telemetry driver provides
+         access to hardware telemetry metrics on devices that support the
+         feature.
+
+         To compile this driver as a module, choose M here: the module
+         will be called intel_pmt_telemetry.

drivers/platform/x86/intel/pmt/Kconfig new file +3 -0
+
+config INTEL_PMT_CRASHLOG
+       tristate "Intel Platform Monitoring Technology (PMT)

Crashlog driver"
+       depends on MFD_INTEL_PMT
+       select INTEL_PMT_CLASS
+       help
+         The Intel Platform Monitoring Technology (PMT) crashlog driver provides
+         access to hardware crashlog capabilities on devices that support the
+         feature.
+
+         To compile this driver as a module, choose M here: the module
+         will be called intel_pmt_crashlog.

drivers/platform/x86/intel/pmt/Makefile new file +9 -0
new file mode 100644
index 000000000000..5c95cdbb57b1
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for linux/drivers/platform/x86/intel/pmt
+# Intel Platform Monitoring Technology Drivers
+#
+
+obj-$(CONFIG_INTEL_PMT_CLASS)          += pmt_class.o
+obj-$(CONFIG_INTEL_PMT_TELEMETRY)      += pmt_telemetry.o
+obj-$(CONFIG_INTEL_PMT_CRASHLOG)       += pmt_crashlog.o
drivers/platform/x86/intel/pmt/pmt_class.c renamed from drivers/platform/x86/intel_pmt_class.c +0 -0
similarity index 99%
rename from drivers/platform/x86/intel_pmt_class.c
rename to drivers/platform/x86/intel/pmt/pmt_class.c
index c86ff15b1ed5..05c16a812e00 100644
@@ -13,7 +13,7 @@
  #include <linux/mm.h>
  #include <linux/pci.h>

drivers/platform/x86/intel/pmt/pmt_class.c renamed from drivers/platform/x86/intel_pmt_class.c +1 -1
-#include "intel_pmt_class.h"
+#include "pmt_class.h"


 #define PMT_XA_START           0
 #define PMT_XA_MAX             INT_MAX

drivers/platform/x86/intel/pmt/pmt_class.h renamed from drivers/platform/x86/intel_pmt_class.h +0 -0
similarity index 100%
rename from drivers/platform/x86/intel_pmt_class.h
rename to drivers/platform/x86/intel/pmt/pmt_class.h
drivers/platform/x86/intel/pmt/pmt_crashlog.c renamed from drivers/platform/x86/intel_pmt_crashlog.c +0 -0
similarity index 99%
rename from drivers/platform/x86/intel_pmt_crashlog.c
rename to drivers/platform/x86/intel/pmt/pmt_crashlog.c
index 56963ceb6345..e869dfcdce31 100644
@@ -15,7 +15,7 @@
  #include <linux/uaccess.h>
  #include <linux/overflow.h>

drivers/platform/x86/intel/pmt/pmt_crashlog.c renamed from drivers/platform/x86/intel_pmt_crashlog.c +1 -1
-#include "intel_pmt_class.h"
+#include "pmt_class.h"


 #define DRV_NAME               "pmt_crashlog"

drivers/platform/x86/intel/pmt/pmt_telemetry.c renamed from drivers/platform/x86/intel_pmt_telemetry.c +0 -0
similarity index 99%
rename from drivers/platform/x86/intel_pmt_telemetry.c
rename to drivers/platform/x86/intel/pmt/pmt_telemetry.c
index 9b95ef050457..b90ae25caba5 100644
@@ -15,7 +15,7 @@
  #include <linux/uaccess.h>
  #include <linux/overflow.h>

drivers/platform/x86/intel/pmt/pmt_telemetry.c renamed from drivers/platform/x86/intel_pmt_telemetry.c +1 -1
-#include "intel_pmt_class.h"
+#include "pmt_class.h"


 #define TELEM_DEV_NAME         "pmt_telemetry"

Signature · 1 line
2.25.1