Auxiliary bus driver support for Intel PCIe VSEC/DVSEC
Subsystems (8)
David E. Box
maintainerv3 cover Auxiliary bus driver support for Intel PCIe VSEC/DVSEC
This series makes changes to the current intel_pmt driver to give it broader support for Intel defined PCIe VSEC and DVSEC features. It moves the implementation from MFD to the auxiliary bus and creates a generic framework for enumerating the extended capabilities. It also adds support for a new VSEC, Software Defined Silicon (SDSi).
David E. Box (6):
PCI: Add #defines for accessing PCIe DVSEC fields driver core: auxiliary bus: Add driver data helpers platform/x86/intel: Move intel_pmt from MFD to Auxiliary Bus platform/x86: Add Intel Software Defined Silicon driver tools arch x86: Add Intel SDSi provisiong tool
selftests: sdsi: test sysfs setup
.../ABI/testing/sysfs-driver-intel_sdsi | 77 +++ MAINTAINERS | 19 +- drivers/mfd/Kconfig | 10 - drivers/mfd/Makefile | 1 - drivers/mfd/intel_pmt.c | 261 -------- drivers/platform/x86/intel/Kconfig | 23 + drivers/platform/x86/intel/Makefile | 4 + drivers/platform/x86/intel/pmt/Kconfig | 4 +- drivers/platform/x86/intel/pmt/class.c | 21 +- drivers/platform/x86/intel/pmt/class.h | 5 +- drivers/platform/x86/intel/pmt/crashlog.c | 47 +- drivers/platform/x86/intel/pmt/telemetry.c | 46 +- drivers/platform/x86/intel/sdsi.c | 571 ++++++++++++++++++ drivers/platform/x86/intel/vsec.c | 422 +++++++++++++ drivers/platform/x86/intel/vsec.h | 43 ++ include/linux/auxiliary_bus.h | 10 + include/uapi/linux/pci_regs.h | 4 + tools/arch/x86/intel_sdsi/Makefile | 9 + tools/arch/x86/intel_sdsi/sdsi.c | 540 +++++++++++++++++ tools/testing/selftests/drivers/sdsi/sdsi.sh | 18 + .../selftests/drivers/sdsi/sdsi_test.py | 226 +++++++ 21 files changed, 2026 insertions(+), 335 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-intel_sdsi delete mode 100644 drivers/mfd/intel_pmt.c create mode 100644 drivers/platform/x86/intel/sdsi.c create mode 100644 drivers/platform/x86/intel/vsec.c create mode 100644 drivers/platform/x86/intel/vsec.h create mode 100644 tools/arch/x86/intel_sdsi/Makefile create mode 100644 tools/arch/x86/intel_sdsi/sdsi.c create mode 100755 tools/testing/selftests/drivers/sdsi/sdsi.sh create mode 100644 tools/testing/selftests/drivers/sdsi/sdsi_test.py
Signature · 1 line
2.25.1
David E. Box
maintainerPATCH v3 1/6 PCI: Add #defines for accessing PCIe DVSEC fields
Add #defines for accessing Vendor ID, Revision, Length, and ID offsets in the Designated Vendor Specific Extended Capability (DVSEC). Defined in PCIe r5.0, sec 7.9.6.
---
V3
- No changes
V2
- No changes
include/uapi/linux/pci_regs.h | 4 ++++ 1 file changed, 4 insertions(+)
include/uapi/linux/pci_regs.h +4 -0
@@ -1086,7 +1086,11 @@/* Designated Vendor-Specific (DVSEC, PCI_EXT_CAP_ID_DVSEC) */ #define PCI_DVSEC_HEADER1 0x4/* Designated Vendor-Specific Header1 */ +#define PCI_DVSEC_HEADER1_VID (x) ((x) & 0xffff) +#define PCI_DVSEC_HEADER1_REV (x) (((x) >> 16) & 0xf) +#define PCI_DVSEC_HEADER1_LEN (x) (((x) >> 20) & 0xfff)#define PCI_DVSEC_HEADER2 0x8/* Designated Vendor-Specific Header2 */ +#define PCI_DVSEC_HEADER2_ID (x) ((x) & 0xffff)/* Data Link Feature */ #define PCI_DLF_CAP 0x04/* Capabilities Register */
Signature · 1 line
2.25.1
David E. Box
maintainerPATCH v3 2/6 driver core: auxiliary bus: Add driver data helpers
In reply to David E. BoxAdds get/set driver data helpers for auxiliary devices.
---
V3
- No changes
V2
- No changes
include/linux/auxiliary_bus.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/linux/auxiliary_bus.h +10 -0
@@ -28,6 +28,16 @@ struct auxiliary_driver {const struct auxiliary_device_id *id_table; }; +static inline void *auxiliary_get_drvdata (struct auxiliary_device *auxdev) +{ +return dev_get_drvdata (&auxdev->dev); +} + +static inline void auxiliary_set_drvdata (struct auxiliary_device *auxdev,void *data) +{ +dev_set_drvdata (&auxdev->dev, data); +} +static inline struct auxiliary_device *to_auxiliary_dev (struct device *dev) { return container_of(dev, struct auxiliary_device, dev);
Signature · 1 line
2.25.1
Re: [PATCH V3 2/6] driver core: auxiliary bus: Add driver data helpers
Quoted 1 line · David E. Box
Adds get/set driver data helpers for auxiliary devices.
I though I gave you a tag... Hint: use b4 am ... against previous version and you won't lose the individual tags.
Anyway,
Quoted 35 lines
Signed-off-by David E. Box <[email protected]>Reviewed-by Mark Gross <[email protected]>---
V3
- No changes
V2
- No changesinclude/linux/auxiliary_bus.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/linux/auxiliary_bus.h +10
-0@@ -28,6 +28,16 @@ struct auxiliary_driver {const struct auxiliary_device_id *id_table; }; +static inline void *auxiliary_get_drvdata (struct auxiliary_device *auxdev) +{ +return dev_get_drvdata (&auxdev->dev); +} + +static inline void auxiliary_set_drvdata (struct auxiliary_device *auxdev,void *data) +{ +dev_set_drvdata (&auxdev->dev, data); +} +static inline struct auxiliary_device *to_auxiliary_dev (struct device *dev) { return container_of(dev, struct auxiliary_device, dev);Signature · 1 line
2.25.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
David E. Box
maintainerRe: [PATCH V3 2/6] driver core: auxiliary bus: Add driver data helpers
Quoted 6 lines · Andy Shevchenko
Quoted 1 line · David E. Box
Adds get/set driver data helpers for auxiliary devices.
I though I gave you a tag... Hint: use
b4 am ...against previous version and
you won't lose the individual tags.
Sorry I did drop it. Thanks for the tip.
David
Quoted 40 lines
Anyway,
Reviewed-by Andy Shevchenko <[email protected]>Quoted 36 lines
Signed-off-by David E. Box <[email protected]>Reviewed-by Mark Gross <[email protected]>---
V3
- No changes
V2
- No changesinclude/linux/auxiliary_bus.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/linux/auxiliary_bus.h +10
-0@@ -28,6 +28,16 @@ struct auxiliary_driver {const struct auxiliary_device_id *id_table; }; +static inline void *auxiliary_get_drvdata (struct auxiliary_device *auxdev) +{ +return dev_get_drvdata (&auxdev->dev); +} + +static inline void auxiliary_set_drvdata (struct auxiliary_device *auxdev,void *data) +{ +dev_set_drvdata (&auxdev->dev, data); +} +static inline struct auxiliary_device *to_auxiliary_dev (struct device *dev) {return
container_of(dev, struct auxiliary_device, dev);Signature · 1 line
2.25.1
David E. Box
maintainerPATCH v3 3/6 platform/x86/intel: Move intel_pmt from MFD to Auxiliary Bus
In reply to David E. BoxIntel Platform Monitoring Technology (PMT) support is indicated by presence of an Intel defined PCIe Designated Vendor Specific Extended Capabilities (DVSEC) structure with a PMT specific ID. The current MFD implementation creates child devices for each PMT feature, currently telemetry, watcher, and crashlog. However DVSEC structures may also be used by Intel to indicate support for other features. The Out Of Band Management Services Module (OOBMSM) uses DVSEC to enumerate several features, including PMT. In order to support them it is necessary to modify the intel_pmt driver to handle the creation of the child devices more generically. To that end, modify the driver to create child devices for any VSEC/DVSEC features on supported devices (indicated by PCI ID). Additionally, move the implementation from MFD to the Auxiliary bus. VSEC/DVSEC features are really multifunctional PCI devices, not platform devices as MFD was designed for. Auxiliary bus gives more flexibility by allowing the definition of custom structures that can be shared between associated auxiliary devices and the parent device. Also, rename the driver from intel_pmt to intel_vsec to better reflect the purpose.
This series also removes the current runtime pm support which was not complete to begin with. None of the current devices require runtime pm. However the support will be replaced when a device is added that requires it.
---
V3
- Add comment clarifying how driver cleanup is handled without remove()
V2
- Clarify status of missing pm support in commit message
- Clarify why auxiliary bus is preferred in commit message
MAINTAINERS | 12 +- drivers/mfd/Kconfig | 10 - drivers/mfd/Makefile | 1 - drivers/mfd/intel_pmt.c | 261 ------------- drivers/platform/x86/intel/Kconfig | 11 + drivers/platform/x86/intel/Makefile | 2 + drivers/platform/x86/intel/pmt/Kconfig | 4 +- drivers/platform/x86/intel/pmt/class.c | 21 +- drivers/platform/x86/intel/pmt/class.h | 5 +- drivers/platform/x86/intel/pmt/crashlog.c | 47 +-- drivers/platform/x86/intel/pmt/telemetry.c | 46 +-- drivers/platform/x86/intel/vsec.c | 412 +++++++++++++++++++++ drivers/platform/x86/intel/vsec.h | 43 +++ 13 files changed, 540 insertions(+), 335 deletions(-) delete mode 100644 drivers/mfd/intel_pmt.c create mode 100644 drivers/platform/x86/intel/vsec.c create mode 100644 drivers/platform/x86/intel/vsec.h
MAINTAINERS +8 -4
@@ -9752,10 +9752,9 @@ S: Maintained F: drivers/mfd/intel_soc_pmic* F: include/linux/mfd/intel_soc_pmic* -INTEL PMT DRIVER -M: "David E. Box" <[email protected]> -S: Maintained -F: drivers/mfd/intel_pmt.c +INTEL PMT DRIVERS +M: David E. Box <[email protected]> +S: Supported F: drivers/platform/x86/intel/pmt/ INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
@@ -9822,6 +9821,11 @@ L: [email protected] S: Maintained F: drivers/platform/x86/intel/uncore-frequency.c +INTEL VENDOR SPECIFIC EXTENDED CAPABILITIES DRIVER +M: David E. Box <[email protected]> +S: Supported +F: drivers/platform/x86/intel/vsec.* + INTEL VIRTUAL BUTTON DRIVER M: AceLan Kao <[email protected]> L: [email protected]
drivers/mfd/Kconfig +0 -10
@@ -692,16 +692,6 @@ config MFD_INTEL_PMC_BXT Register and P-unit access. In addition this creates devices for iTCO watchdog and telemetry that are part of the PMC. -config MFD_INTEL_PMT - tristate "Intel Platform Monitoring Technology (PMT) support" - depends on X86 && PCI - select MFD_CORE - help - The Intel Platform Monitoring Technology (PMT) is an interface that - provides access to hardware monitor registers. This driver supports - Telemetry, Watcher, and Crashlog PMT capabilities/devices for - platforms starting from Tiger Lake. - config MFD_IPAQ_MICRO bool "Atmel Micro ASIC (iPAQ h3100/h3600/h3700) Support" depends on SA1100_H3100 || SA1100_H3600
drivers/mfd/Makefile +0 -1
@@ -211,7 +211,6 @@ obj-$(CONFIG_MFD_INTEL_LPSS) += intel-lpss.o obj-$(CONFIG_MFD_INTEL_LPSS_PCI) += intel-lpss-pci.o obj-$(CONFIG_MFD_INTEL_LPSS_ACPI) += intel-lpss-acpi.o obj-$(CONFIG_MFD_INTEL_PMC_BXT) += intel_pmc_bxt.o -obj-$(CONFIG_MFD_INTEL_PMT) += intel_pmt.o obj-$(CONFIG_MFD_PALMAS) += palmas.o obj-$(CONFIG_MFD_VIPERBOARD) += viperboard.o obj-$(CONFIG_MFD_NTXEC) += ntxec.o
drivers/mfd/intel_pmt.c deleted +0 -261
261 lines not on this page · raw message
drivers/platform/x86/intel/Kconfig +11 -0
@@ -184,4 +184,15 @@ 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_VSEC + tristate "Intel Vendor Specific Extended Capabilities Driver" + depends on PCI + select AUXILIARY_BUS + help + Adds support for feature drivers exposed using Intel PCIe VSEC and + DVSEC. + + To compile this driver as a module, choose M here: the module will + be called intel_vsec. + endif # X86_PLATFORM_DRIVERS_INTEL
drivers/platform/x86/intel/Makefile +2 -0
@@ -26,6 +26,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_vsec-y := vsec.o +obj-$(CONFIG_INTEL_VSEC) += intel_vsec.o # Intel PMIC / PMC / P-Unit drivers intel_bxtwc_tmu-y := bxtwc_tmu.o
drivers/platform/x86/intel/pmt/Kconfig +2 -2
@@ -17,7 +17,7 @@ config INTEL_PMT_CLASS config INTEL_PMT_TELEMETRY tristate "Intel Platform Monitoring Technology (PMT) Telemetry driver" - depends on MFD_INTEL_PMT + depends on INTEL_VSEC select INTEL_PMT_CLASS help The Intel Platform Monitory Technology (PMT) Telemetry driver provides
@@ -29,7 +29,7 @@ config INTEL_PMT_TELEMETRY config INTEL_PMT_CRASHLOG tristate "Intel Platform Monitoring Technology (PMT) Crashlog driver" - depends on MFD_INTEL_PMT + depends on INTEL_VSEC select INTEL_PMT_CLASS help The Intel Platform Monitoring Technology (PMT) crashlog driver provides
drivers/platform/x86/intel/pmt/class.c +10 -11
@@ -13,6 +13,7 @@#include <linux/mm.h> #include <linux/pci.h> +#include "../vsec.h" #include "class.h" #define PMT_XA_START 0
@@ -281,31 +282,29 @@ static int intel_pmt_dev_register(struct intel_pmt_entry *entry,return ret; } -int intel_pmt_dev_create (struct intel_pmt_entry *entry, -struct intel_pmt_namespace *ns, -struct platform_device *pdev,int idx) +int intel_pmt_dev_create (struct intel_pmt_entry *entry,struct intel_pmt_namespace *ns, +struct intel_vsec_device *intel_vsec_dev,int idx) { +struct device *dev = &intel_vsec_dev->auxdev.dev;struct intel_pmt_header header;struct resource *disc_res; -int ret = -ENODEV ; +int ret; - disc_res =platform_get_resource (pdev,IORESOURCE_MEM , idx); -if (!disc_res) -return ret; + disc_res = &intel_vsec_dev->resource[idx]; - entry->disc_table =devm_platform_ioremap_resource (pdev, idx); + entry->disc_table =devm_ioremap_resource (dev, disc_res);if (IS_ERR (entry->disc_table))return PTR_ERR (entry->disc_table); - ret = ns->pmt_header_decode (entry, &header, &pdev->dev); + ret = ns->pmt_header_decode (entry, &header, dev);if (ret)return ret; - ret =intel_pmt_populate_entry (entry, &header, &pdev->dev, disc_res); + ret =intel_pmt_populate_entry (entry, &header, dev, disc_res);if (ret)return ret; -return intel_pmt_dev_register (entry, ns, &pdev->dev); +return intel_pmt_dev_register (entry, ns, dev); }EXPORT_SYMBOL_GPL (intel_pmt_dev_create);
drivers/platform/x86/intel/pmt/class.h +3 -2
@@ -2,13 +2,14 @@#ifndef _INTEL_PMT_CLASS_H#define _INTEL_PMT_CLASS_H -#include <linux/platform_device.h> #include <linux/xarray.h> #include <linux/types.h> #include <linux/bits.h> #include <linux/err.h> #include <linux/io.h> +#include "../vsec.h" +/* PMT access types */ #define ACCESS_BARID 2#define ACCESS_LOCAL 3
@@ -47,7 +48,7 @@ struct intel_pmt_namespace {bool intel_pmt_is_early_client_hw (struct device *dev);int intel_pmt_dev_create (struct intel_pmt_entry *entry,struct intel_pmt_namespace *ns, -struct platform_device *pdev,int idx); +struct intel_vsec_device *dev,int idx);void intel_pmt_dev_destroy (struct intel_pmt_entry *entry,struct intel_pmt_namespace *ns);#endif
drivers/platform/x86/intel/pmt/crashlog.c +25 -22
106 lines not on this page · raw message
drivers/platform/x86/intel/pmt/telemetry.c +24 -22
106 lines not on this page · raw message
drivers/platform/x86/intel/vsec.c new file +412 -0
412 lines not on this page · raw message
drivers/platform/x86/intel/vsec.h new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH V3 3/6] platform/x86/intel: Move intel_pmt from MFD to Auxiliary Bus
Quoted 22 lines · David E. Box
Intel Platform Monitoring Technology (PMT) support is indicated by presence of an Intel defined PCIe Designated Vendor Specific Extended Capabilities (DVSEC) structure with a PMT specific ID. The current MFD implementation creates child devices for each PMT feature, currently telemetry, watcher, and crashlog. However DVSEC structures may also be used by Intel to indicate support for other features. The Out Of Band Management Services Module (OOBMSM) uses DVSEC to enumerate several features, including PMT. In order to support them it is necessary to modify the
intel_pmtdriver to handle the creation of the child devices more generically. To that end, modify the driver to create child devices for any VSEC/DVSEC features on supported devices (indicated by PCI ID). Additionally, move the implementation from MFD to the Auxiliary bus. VSEC/DVSEC features are really multifunctional PCI devices, not platform devices as MFD was designed for. Auxiliary bus gives more flexibility by allowing the definition of custom structures that can be shared between associated auxiliary devices and the parent device. Also, rename the driver fromintel_pmttointel_vsecto better reflect the purpose.This series also removes the current runtime pm support which was not complete to begin with. None of the current devices require runtime pm. However the support will be replaced when a device is added that requires it.
...
Quoted 82 lines
drivers/platform/x86/intel/vsec.c new file +82
-0+static bool intel_vsec_walk_dvsec (struct pci_dev *pdev,unsigned long quirks) +{ +bool have_devices = false; +int pos =0 ; + +do { +struct intel_vsec_header header; +u32 table, hdr; +u16 vid; +int ret; + + pos =pci_find_next_ext_capability (pdev, pos,PCI_EXT_CAP_ID_DVSEC ); +if (!pos) +break ; + +pci_read_config_dword (pdev, pos +PCI_DVSEC_HEADER1 , &hdr); + vid =PCI_DVSEC_HEADER1_VID (hdr); +if (vid !=PCI_VENDOR_ID_INTEL ) +continue ; + +/* Support only revision 1 */ + header.rev =PCI_DVSEC_HEADER1_REV (hdr); +if (header.rev !=1 ) { +dev_info (&pdev->dev,"Unsupported DVSEC revision %d\n" , header.rev); +continue ; + } + + header.length =PCI_DVSEC_HEADER1_LEN (hdr); + +pci_read_config_byte (pdev, pos +INTEL_DVSEC_ENTRIES , &header.num_entries); +pci_read_config_byte (pdev, pos +INTEL_DVSEC_SIZE , &header.entry_size); +pci_read_config_dword (pdev, pos +INTEL_DVSEC_TABLE , &table); + + header.tbir =INTEL_DVSEC_TABLE_BAR (table); + header.offset =INTEL_DVSEC_TABLE_OFFSET (table); + +pci_read_config_dword (pdev, pos +PCI_DVSEC_HEADER2 , &hdr); + header.id =PCI_DVSEC_HEADER2_ID (hdr); + + ret =intel_vsec_add_dev (pdev, &header, quirks); +if (ret) +continue ; + + have_devices = true; + }while (true); + +return have_devices; +} + +static bool intel_vsec_walk_vsec (struct pci_dev *pdev,unsigned long quirks) +{ +bool have_devices = false; +int pos =0 ; + + do { + struct intel_vsec_header header; + u32 table, hdr; + int ret; + + pos = pci_find_next_ext_capability(pdev, pos, PCI_EXT_CAP_ID_VNDR); + if (!pos) + break; + + pci_read_config_dword(pdev, pos + PCI_VNDR_HEADER, &hdr); + + /* Support only revision 1 */ + header.rev = PCI_VNDR_HEADER_REV(hdr); + if (header.rev != 1) { + dev_info(&pdev->dev, "Unsupported VSEC revision %d\n", header.rev); + continue; + } + + header.id = PCI_VNDR_HEADER_ID(hdr); + header.length = PCI_VNDR_HEADER_LEN(hdr); + + /* entry, size, and table offset are the same as DVSEC */ + pci_read_config_byte(pdev, pos + INTEL_DVSEC_ENTRIES, &header.num_entries); + pci_read_config_byte(pdev, pos + INTEL_DVSEC_SIZE, &header.entry_size); + pci_read_config_dword(pdev, pos + INTEL_DVSEC_TABLE, &table); + + header.tbir = INTEL_DVSEC_TABLE_BAR(table); + header.offset = INTEL_DVSEC_TABLE_OFFSET(table);
drivers/platform/x86/intel/vsec.c line 328
Quoted 10 lines
drivers/platform/x86/intel/vsec.c new file +10
-0+ + ret =intel_vsec_add_dev (pdev, &header, quirks); +if (ret) +continue ; + + have_devices = true; + }while (true); + +return have_devices; +}
I'm wondering if it makes sense to refactor each of the above to something like
int intel_vsec_extract_vsec(...)
{
...
}static bool intel_vsec_walk_dvsec(struct pci_dev *pdev, unsigned long quirks)
{
bool have_devices = false;
int pos;
while ((pos = pci_find_next_ext_capability(pdev, pos, PCI_EXT_CAP_ID_DVSEC))) {
if (intel_vsec_extract_vsec())
continue;
have_devices = true;
}
return have_devices;
}Either way, it may be worth to convert infinite loops to ones with the clear exit condition.
...
drivers/platform/x86/intel/vsec.c line 405
Quoted 3 lines
drivers/platform/x86/intel/vsec.c new file +3
-0+/* +* Driver cleanup handled by intel_vsec_remove_aux() which is added +* to the pci device as a devm action
PCI
Grammatical period at the end.
Quoted 1 line
(quoted diff) +1
-0+ */
Signature · 2 lines
With Best Regards, Andy Shevchenko
David E. Box
maintainerRe: [PATCH V3 3/6] platform/x86/intel: Move intel_pmt from MFD to Auxiliary Bus
Quoted 138 lines · Andy Shevchenko
Quoted 22 lines · David E. Box
Intel Platform Monitoring Technology (PMT) support is indicated by presence of an Intel defined PCIe Designated Vendor Specific Extended Capabilities (DVSEC) structure with a PMT specific ID. The current MFD implementation creates child devices for each PMT feature, currently telemetry, watcher, and crashlog. However DVSEC structures may also be used by Intel to indicate support for other features. The Out Of Band Management Services Module (OOBMSM) uses DVSEC to enumerate several features, including PMT. In order to support them it is necessary to modify the
intel_pmtdriver to handle the creation of the child devices more generically. To that end, modify the driver to create child devices for any VSEC/DVSEC features on supported devices (indicated by PCI ID). Additionally, move the implementation from MFD to the Auxiliary bus. VSEC/DVSEC features are really multifunctional PCI devices, not platform devices as MFD was designed for. Auxiliary bus gives more flexibility by allowing the definition of custom structures that can be shared between associated auxiliary devices and the parent device. Also, rename the driver fromintel_pmttointel_vsecto better reflect the purpose.This series also removes the current runtime pm support which was not complete to begin with. None of the current devices require runtime pm. However the support will be replaced when a device is added that requires it.
...
Quoted 92 lines
+static bool
intel_vsec_walk_dvsec(struct pci_dev *pdev, unsigned long quirks)drivers/platform/x86/intel/vsec.c new file +11
-0+{ + bool have_devices = false; + int pos = 0; + + do { + struct intel_vsec_header header; + u32 table, hdr; + u16 vid; + int ret; + + pos = pci_find_next_ext_capability(pdev, pos,
PCI_EXT_CAP_ID_DVSEC);drivers/platform/x86/intel/vsec.c new file +12
-0+if (!pos) +break ; + +pci_read_config_dword (pdev, pos +PCI_DVSEC_HEADER1 , &hdr); + vid =PCI_DVSEC_HEADER1_VID (hdr); +if (vid !=PCI_VENDOR_ID_INTEL ) +continue ; + +/* Support only revision 1 */ + header.rev =PCI_DVSEC_HEADER1_REV (hdr); +if (header.rev !=1 ) { + dev_info(&pdev->dev, "Unsupported DVSEC revision %d\n",header.rev);
drivers/platform/x86/intel/vsec.c new file +6
-0+continue ; + } + + header.length =PCI_DVSEC_HEADER1_LEN (hdr); + + pci_read_config_byte(pdev, pos + INTEL_DVSEC_ENTRIES,&header.num_entries);
(quoted diff) +1
-0+ pci_read_config_byte(pdev, pos + INTEL_DVSEC_SIZE,&header.entry_size);
drivers/platform/x86/intel/vsec.c new file +19
-0+pci_read_config_dword (pdev, pos +INTEL_DVSEC_TABLE , &table); + + header.tbir =INTEL_DVSEC_TABLE_BAR (table); + header.offset =INTEL_DVSEC_TABLE_OFFSET (table); + +pci_read_config_dword (pdev, pos +PCI_DVSEC_HEADER2 , &hdr); + header.id =PCI_DVSEC_HEADER2_ID (hdr); + + ret =intel_vsec_add_dev (pdev, &header, quirks); +if (ret) +continue ; + + have_devices = true; + }while (true); + +return have_devices; +} + +static bool intel_vsec_walk_vsec(struct pci_dev *pdev, unsigned longquirks)
drivers/platform/x86/intel/vsec.c new file +10
-0+{ + bool have_devices = false; + int pos = 0; + + do { + struct intel_vsec_header header; + u32 table, hdr; + int ret; + + pos = pci_find_next_ext_capability(pdev, pos,
PCI_EXT_CAP_ID_VNDR);drivers/platform/x86/intel/vsec.c new file +9
-0+if (!pos) +break ; + +pci_read_config_dword (pdev, pos +PCI_VNDR_HEADER , &hdr); + +/* Support only revision 1 */ + header.rev =PCI_VNDR_HEADER_REV (hdr); +if (header.rev !=1 ) { + dev_info(&pdev->dev, "Unsupported VSEC revision %d\n",header.rev);
drivers/platform/x86/intel/vsec.c new file +8
-0+continue ; + } + + header.id =PCI_VNDR_HEADER_ID (hdr); + header.length =PCI_VNDR_HEADER_LEN (hdr); + +/* entry, size, and table offset are the same as DVSEC */ + pci_read_config_byte(pdev, pos + INTEL_DVSEC_ENTRIES,&header.num_entries);
(quoted diff) +1
-0+ pci_read_config_byte(pdev, pos + INTEL_DVSEC_SIZE,&header.entry_size);
drivers/platform/x86/intel/vsec.c new file +4
-0+pci_read_config_dword (pdev, pos +INTEL_DVSEC_TABLE , &table); + + header.tbir =INTEL_DVSEC_TABLE_BAR (table); + header.offset =INTEL_DVSEC_TABLE_OFFSET (table);drivers/platform/x86/intel/vsec.c line 284
Quoted 10 lines
drivers/platform/x86/intel/vsec.c new file +10
-0+ + ret =intel_vsec_add_dev (pdev, &header, quirks); +if (ret) +continue ; + + have_devices = true; + }while (true); + +return have_devices; +}I'm wondering if it makes sense to refactor each of the above to something like
int
intel_vsec_extract_vsec(...){ ... }static bool
intel_vsec_walk_dvsec(struct pci_dev *pdev, unsigned long quirks)
Quoted 14 lines
{
bool have_devices = false;
int pos;
while ((pos = pci_find_next_ext_capability(pdev, pos,
PCI_EXT_CAP_ID_DVSEC))) {
if (intel_vsec_extract_vsec())
continue;
have_devices = true;
}
return have_devices;
}Sure.
Quoted 7 lines
Either way, it may be worth to convert infinite loops to ones with the clear exit condition.
...
Quoted 7 lines
drivers/platform/x86/intel/vsec.c line 405
Quoted 3 lines
drivers/platform/x86/intel/vsec.c new file +3
-0+/* +* Driver cleanup handled by intel_vsec_remove_aux() which is added +* to the pci device as a devm action PCI
Grammatical period at the end.
Ack
Thanks
Quoted 2 lines
Quoted 2 lines
(quoted diff) +1
-0+ */
David E. Box
maintainerPATCH v3 4/6 platform/x86: Add Intel Software Defined Silicon driver
In reply to David E. BoxIntel Software Defined Silicon (SDSi) is a post manufacturing mechanism for activating additional silicon features. Features are enabled through a license activation process. The SDSi driver provides a per socket, sysfs attribute interface for applications to perform 3 main provisioning functions:
1. Provision an Authentication Key Certificate (AKC), a key written to internal NVRAM that is used to authenticate a capability specific activation payload.
2. Provision a Capability Activation Payload (CAP), a token authenticated using the AKC and applied to the CPU configuration to activate a new feature.
3. Read the SDSi State Certificate, containing the CPU configuration state.
The operations perform function specific mailbox commands that forward the requests to SDSi hardware to perform authentication of the payloads and enable the silicon configuration (to be made available after power cycling).
The SDSi device itself is enumerated as an auxiliary device from the intel_vsec driver and as such has a build dependency on CONFIG_INTEL_VSEC.
---
V3
- In state_certificate_read(), return the actual size instead of the requested count. Return 0 if offset is non-zero so that subsequent calls attempting to read the rest of the count end.
- s/folder/directory in ABI documentation
- Add comment that all driver resources are devm managed so remove() is not needed.
V2
- Use sysfs_emit() in guid_show()
- Fix language in ABI, suggested by Bjorn
- Fix wrong directory name in ABI doc
.../ABI/testing/sysfs-driver-intel_sdsi | 77 +++ MAINTAINERS | 5 + drivers/platform/x86/intel/Kconfig | 12 + drivers/platform/x86/intel/Makefile | 2 + drivers/platform/x86/intel/sdsi.c | 571 ++++++++++++++++++ drivers/platform/x86/intel/vsec.c | 12 +- 6 files changed, 678 insertions(+), 1 deletion(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-intel_sdsi create mode 100644 drivers/platform/x86/intel/sdsi.c
Documentation/ABI/testing/sysfs-driver-intel_sdsi new file +77 -0
@@ -0,0 +1,77 @@ +What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X +Date: Dec 2021 +KernelVersion: 5.17 +Contact: "David E. Box" <[email protected]> +Description: + This directory contains interface files for accessing Intel + Software Defined Silicon (SDSi) features on a CPU. X + represents the socket instance (though not the socket ID). + The socket ID is determined by reading the registers file + and decoding it per the specification. + + Some files communicate with SDSi hardware through a mailbox. + Should the operation fail, one of the following error codes + may be returned: + + Error Code Cause + ---------- ----- + EIO General mailbox failure. Log may indicate cause. + EBUSY Mailbox is owned by another agent. + EPERM SDSI capability is not enabled in hardware. + EPROTO Failure in mailbox protocol detected by driver. + See log for details. + EOVERFLOW For provision commands, the size of the data + exceeds what may be written. + ESPIPE Seeking is not allowed. + ETIMEDOUT Failure to complete mailbox transaction in time. + +What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/guid +Date: Dec 2021 +KernelVersion: 5.17 +Contact: "David E. Box" <[email protected]> +Description: + (RO) The GUID for the registers file. The GUID identifies + the layout of the registers file in this directory. + Information about the register layouts for a particular GUID + is available at http://github.com/intel/intel-sdsi + +What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/registers +Date: Dec 2021 +KernelVersion: 5.17 +Contact: "David E. Box" <[email protected]> +Description: + (RO) Contains information needed by applications to provision + a CPU and monitor status information. The layout of this file + is determined by the GUID in this directory. Information about + the layout for a particular GUID is available at + http://github.com/intel/intel-sdsi + +What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/provision_akc +Date: Dec 2021 +KernelVersion: 5.17 +Contact: "David E. Box" <[email protected]> +Description: + (WO) Used to write an Authentication Key Certificate (AKC) to + the SDSi NVRAM for the CPU. The AKC is used to authenticate a + Capability Activation Payload. Mailbox command. + +What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/provision_cap +Date: Dec 2021 +KernelVersion: 5.17 +Contact: "David E. Box" <[email protected]> +Description: + (WO) Used to write a Capability Activation Payload (CAP) to the + SDSi NVRAM for the CPU. CAPs are used to activate a given CPU + feature. A CAP is validated by SDSi hardware using a previously + provisioned AKC file. Upon successful authentication, the CPU + configuration is updated. A cold reboot is required to fully + activate the feature. Mailbox command. + +What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/state_certificate +Date: Dec 2021 +KernelVersion: 5.17 +Contact: "David E. Box" <[email protected]> +Description: + (RO) Used to read back the current State Certificate for the CPU + from SDSi hardware. The State Certificate contains information + about the current licenses on the CPU. Mailbox command.
MAINTAINERS +5 -0
@@ -9783,6 +9783,11 @@ S: Maintained F: arch/x86/include/asm/intel_scu_ipc.h F: drivers/platform/x86/intel_scu_* +INTEL SDSI DRIVER +M: David E. Box <[email protected]> +S: Supported +F: drivers/platform/x86/intel/sdsi.c + INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER M: Daniel Scally <[email protected]> S: Maintained
drivers/platform/x86/intel/Kconfig +12 -0
@@ -147,6 +147,18 @@ config INTEL_RST firmware will copy the memory contents back to RAM and resume the OS as usual. +config INTEL_SDSI + tristate "Intel Software Defined Silicon Driver" + depends on INTEL_VSEC + depends on X86_64 + help + This driver enables access to the Intel Software Defined Silicon + interface used to provision silicon features with an authentication + certificate and capability license. + + To compile this driver as a module, choose M here: the module will + be called intel_sdsi. + config INTEL_SMARTCONNECT tristate "Intel Smart Connect disabling driver" depends on ACPI
drivers/platform/x86/intel/Makefile +2 -0
@@ -26,6 +26,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_sdsi-y := sdsi.o +obj-$(CONFIG_INTEL_SDSI) += intel_sdsi.o intel_vsec-y := vsec.o obj-$(CONFIG_INTEL_VSEC) += intel_vsec.o
drivers/platform/x86/intel/sdsi.c new file +571 -0
571 lines not on this page · raw message
drivers/platform/x86/intel/vsec.c +11 -1
@@ -32,6 +32,7 @@#define TABLE_OFFSET_SHIFT 3static DEFINE_IDA (intel_vsec_ida); +static DEFINE_IDA (intel_vsec_sdsi_ida);/** * struct intel_vsec_header - Common fields of Intel VSEC and DVSEC registers.
@@ -63,12 +64,14 @@ enum intel_vsec_id {VSEC_ID_TELEMETRY =2 ,VSEC_ID_WATCHER =3 ,VSEC_ID_CRASHLOG =4 , + VSEC_ID_SDSI = 65, };static enum intel_vsec_id intel_vsec_allow_list[] = {VSEC_ID_TELEMETRY ,VSEC_ID_WATCHER ,VSEC_ID_CRASHLOG , +VSEC_ID_SDSI , };static const char *intel_vsec_name (enum intel_vsec_id id)
@@ -83,6 +86,9 @@ static const char *intel_vsec_name(enum intel_vsec_id id)case VSEC_ID_CRASHLOG :return "crashlog" ; +case VSEC_ID_SDSI : +return "sdsi" ; +default :return NULL ; }
@@ -211,7 +217,11 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he intel_vsec_dev->resource = res; intel_vsec_dev->num_resources = header->num_entries; intel_vsec_dev->quirks = quirks; - intel_vsec_dev->ida = &intel_vsec_ida; + +if (header->id ==VSEC_ID_SDSI ) + intel_vsec_dev->ida = &intel_vsec_sdsi_ida; +else + intel_vsec_dev->ida = &intel_vsec_ida;return intel_vsec_add_aux (pdev, intel_vsec_dev,intel_vsec_name (header->id)); }
Signature · 1 line
2.25.1
kernel test robot
build botRe: [PATCH V3 4/6] platform/x86: Add Intel Software Defined Silicon driver
I love your patch! Yet something to improve:
Hi "David,
I love your patch! Yet something to improve:
[auto build test ERROR on lee-mfd/for-mfd-next]
[also build test ERROR on helgaas-pci/next shuah-kselftest/next linus/master v5.16-rc5 next-20211214] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/David-E-Box/Auxiliary-bus-driver-support-for-Intel-PCIe-VSEC-DVSEC/20211214-020016 base: https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git for-mfd-next config: x86_64-randconfig-r013-20211214 (https://download.01.org/0day-ci/archive/20211215/202112151420.ZVi8YXOl-lkp(a)intel.com/config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project b6a2ddb6c8ac29412b1361810972e15221fa021c)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/405984bb2427331f6e97ffef42244a5d2d090da3
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review David-E-Box/Auxiliary-bus-driver-support-for-Intel-PCIe-VSEC-DVSEC/20211214-020016 git checkout 405984bb2427331f6e97ffef42244a5d2d090da3
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/platform/x86/intel/sdsi.c:566:2: error: expected ';' after top level declarator
}
^
;1 error generated.
vim +566 drivers/platform/x86/intel/sdsi.c
558
559 static struct auxiliary_driver sdsi_aux_driver = {
560 .driver = {
561 .dev_groups = sdsi_groups,
562 },
563 .id_table = sdsi_aux_id_table,
564 .probe = sdsi_probe,
565 /* No remove. All resources are handled under devm */
> 566 }
567 module_auxiliary_driver(sdsi_aux_driver);
568
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
David E. Box
maintainerPATCH v3 5/6 tools arch x86: Add Intel SDSi provisioning tool
In reply to David E. BoxAdd tool for key certificate and activation payload provisioning on Intel CPUs supporting Software Defined Silicon (SDSi).
---
V3
- Move from samples to tools.
- Fix bit fields in availability structure
- Check provisioning availability before issuing command
V2
- New patch
MAINTAINERS | 1 + tools/arch/x86/intel_sdsi/Makefile | 9 + tools/arch/x86/intel_sdsi/sdsi.c | 540 +++++++++++++++++++++++++++++ 3 files changed, 550 insertions(+) create mode 100644 tools/arch/x86/intel_sdsi/Makefile create mode 100644 tools/arch/x86/intel_sdsi/sdsi.c
MAINTAINERS +1 -0
@@ -9787,6 +9787,7 @@ INTEL SDSI DRIVER M: David E. Box <[email protected]> S: Supported F: drivers/platform/x86/intel/sdsi.c +F: tools/arch/x86/intel_sdsi/ INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER M: Daniel Scally <[email protected]>
tools/arch/x86/intel_sdsi/Makefile new file +9 -0
@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 + +.PHONY: sdsi + +sdsi: sdsi.o + $(CC) -Wall $^ -o $@ + +clean: + rm *.o sdsi
tools/arch/x86/intel_sdsi/sdsi.c new file +540 -0
540 lines not on this page · raw message
Signature · 1 line
2.25.1
David E. Box
maintainerPATCH v3 6/6 selftests: sdsi: test sysfs setup
In reply to David E. BoxTests file configuration and error handling of the Intel Software Defined Silicon sysfs ABI.
---
V3
- Add tests to check PCI device removal handling and to check for driver memory leaks.
V2
- new patch
MAINTAINERS | 1 + tools/testing/selftests/drivers/sdsi/sdsi.sh | 18 ++ .../selftests/drivers/sdsi/sdsi_test.py | 226 ++++++++++++++++++ 3 files changed, 245 insertions(+) create mode 100755 tools/testing/selftests/drivers/sdsi/sdsi.sh create mode 100644 tools/testing/selftests/drivers/sdsi/sdsi_test.py
MAINTAINERS +1 -0
@@ -9788,6 +9788,7 @@ M: David E. Box <[email protected]> S: Supported F: drivers/platform/x86/intel/sdsi.c F: tools/arch/x86/intel_sdsi/ +F: tools/testing/selftests/drivers/sdsi/ INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER M: Daniel Scally <[email protected]>
tools/testing/selftests/drivers/sdsi/sdsi.sh new file +18 -0
@@ -0,0 +1,18 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# Runs tests for the intel_sdsi driver + +if ! /sbin/modprobe -q -r intel_sdsi; then + echo "drivers/sdsi: [SKIP]" + exit 77 +fi + +if /sbin/modprobe -q intel_sdsi; then + python3 -m pytest sdsi_test.py + /sbin/modprobe -q -r intel_sdsi + + echo "drivers/sdsi: ok" +else + echo "drivers/sdsi: [FAIL]" + exit 1 +fi
tools/testing/selftests/drivers/sdsi/sdsi_test.py new file +226 -0
226 lines not on this page · raw message
Signature · 1 line
2.25.1