History

Merge branch 'pci/misc'

- Constify struct bin_attribute for sysfs, VPD, P2PDMA, and the IBM ACPI hotplug driver (Thomas Weißschuh) - Update PCI_EXP_LNKCAP_SLS comment (Lukas Wunner) - Drop superfluous pm_wakeup.h include (Wolfram Sang) - Remove redundant PCI_VSEC_HDR and PCI_VSEC_HDR_LEN_SHIFT (Dongdong Zhang) - Correct documentation of the 'config_acs=' kernel parameter (Akihiko Odaki) * pci/misc: Documentation: Fix pci=config_acs= example PCI: Remove redundant PCI_VSEC_HDR and PCI_VSEC_HDR_LEN_SHIFT PCI: Don't include 'pm_wakeup.h' directly PCI: Update code comment on PCI_EXP_LNKCAP_SLS for PCIe r3.0 PCI/ACPI: Constify 'struct bin_attribute' PCI/P2PDMA: Constify 'struct bin_attribute' PCI/VPD: Constify 'struct bin_attribute' PCI/sysfs: Constify 'struct bin_attribute'

Bjorn Helgaas committed 1 year ago

Commit 10ff5bb2 parents 4d3bf4e b388fac8 files · +39 −42Browse files

Showing the changes to include/uapi (1 of 8 files). Show all

Unified · Split

include/uapi/linux/pci_regs.h+1−4
@@ -533,7 +533,7 @@ · 532 unmodified lines
533533 #define PCI_EXP_DEVSTA_TRPND 0x0020 /* Transactions Pending */
534534 #define PCI_CAP_EXP_RC_ENDPOINT_SIZEOF_V1 12 /* v1 endpoints without link end here */
535535 #define PCI_EXP_LNKCAP 0x0c /* Link Capabilities */
536−#define PCI_EXP_LNKCAP_SLS 0x0000000f /* Supported Link Speeds */
536+#define PCI_EXP_LNKCAP_SLS 0x0000000f /* Max Link Speed (prior to PCIe r3.0: Supported Link Speeds) */
537537 #define PCI_EXP_LNKCAP_SLS_2_5GB 0x00000001 /* LNKCAP2 SLS Vector bit 0 */
538538 #define PCI_EXP_LNKCAP_SLS_5_0GB 0x00000002 /* LNKCAP2 SLS Vector bit 1 */
539539 #define PCI_EXP_LNKCAP_SLS_8_0GB 0x00000003 /* LNKCAP2 SLS Vector bit 2 */
@@ -1004,9 +1004,6 @@ · 464 unmodified lines
10041004 #define PCI_ACS_CTRL 0x06 /* ACS Control Register */
10051005 #define PCI_ACS_EGRESS_CTL_V 0x08 /* ACS Egress Control Vector */
10061006
1007−#define PCI_VSEC_HDR 4 /* extended cap - vendor-specific */
1008−#define PCI_VSEC_HDR_LEN_SHIFT 20 /* shift for length field */
1009−
10101007 /* SATA capability */
10111008 #define PCI_SATA_REGS 4 /* SATA REGs specifier */
10121009 #define PCI_SATA_REGS_MASK 0xF /* location - BAR#/inline */