diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-09-19 14:25:26 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-09-19 14:25:26 -0500 |
| commit | 9d4f1c0747e2937c830d135a460d727002caed3d (patch) | |
| tree | d7b5634e79a228a73b7c3356c215943310683282 /include/linux/pci.h | |
| parent | e642aa6b38762a2af3a7e0c5e6dac5841c15dea0 (diff) | |
| parent | 759ec28242894f2006a1606c1d6e9aca48cecfcf (diff) | |
| download | linux-9d4f1c0747e2937c830d135a460d727002caed3d.tar.gz linux-9d4f1c0747e2937c830d135a460d727002caed3d.tar.bz2 linux-9d4f1c0747e2937c830d135a460d727002caed3d.zip | |
Merge branch 'pci/npem'
- Initialize leds class earlier (with an unfortunate Makefile ordering
change) so the PCI NPEM driver can use it (Mariusz Tkaczyk)
- Add Native PCIe Enclosure Management (NPEM) support for sysfs control of
NVMe RAID storage indicators (ok/fail/locate/rebuild/etc) (Mariusz
Tkaczyk)
- Add support for the ACPI _DSM PCIe SSD status LED management, which is
functionally similar to NPEM but mediated by platform firmware (Mariusz
Tkaczyk)
* pci/npem:
PCI/NPEM: Add _DSM PCIe SSD status LED management
PCI/NPEM: Add Native PCIe Enclosure Management support
leds: Init leds class earlier
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 995353a4489e..925c55606cfa 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -518,6 +518,9 @@ struct pci_dev { #ifdef CONFIG_PCI_DOE struct xarray doe_mbs; /* Data Object Exchange mailboxes */ #endif +#ifdef CONFIG_PCI_NPEM + struct npem *npem; /* Native PCIe Enclosure Management */ +#endif u16 acs_cap; /* ACS Capability offset */ phys_addr_t rom; /* Physical address if not from BAR */ size_t romlen; /* Length if not from BAR */ |