Pull PCI updates from Bjorn Helgaas: "Resource management: - Improve resource assignment for hot-added nested bridges, e.g., Thunderbolt (Nicholas Johnson) Power management: - Optionally print config space of devices before suspend (Chen Yu) - Increase D3 delay for AMD Ryzen5/7 XHCI controllers (Daniel Drake) Virtualization: - Generalize DMA alias quirks (James Sewart) - Add DMA alias quirk for PLX PEX NTB (James Sewart) - Fix IOV memory leak (Navid Emamdoost) AER: - Log which device prevents error recovery (Yicong Yang) Peer-to-peer DMA: - Whitelist Intel SkyLake-E (Armen Baloyan) Broadcom iProc host bridge driver: - Apply PAXC quirk whether driver is built-in or module (Wei Liu) Broadcom STB host bridge driver: - Add Broadcom STB PCIe host controller driver (Jim Quinlan) Intel Gateway SoC host bridge driver: - Add driver for Intel Gateway SoC (Dilip Kota) Intel VMD host bridge driver: - Add support for DMA aliases on other buses (Jon Derrick) - Remove dma_map_ops overrides (Jon Derrick) - Remove now-unused X86_DEV_DMA_OPS (Christoph Hellwig) NVIDIA Tegra host bridge driver: - Fix Tegra30 afi_pex2_ctrl register offset (Marcel Ziswiler) Panasonic UniPhier host bridge driver: - Remove module code since driver can't be built as a module (Masahiro Yamada) Qualcomm host bridge driver: - Add support for SDM845 PCIe controller (Bjorn Andersson) TI Keystone host bridge driver: - Fix "num-viewport" DT property error handling (Kishon Vijay Abraham I) - Fix link training retries initiation (Yurii Monakov) - Fix outbound region mapping (Yurii Monakov) Misc: - Add Switchtec Gen4 support (Kelvin Cao) - Add Switchtec Intercomm Notify and Upstream Error Containment support (Logan Gunthorpe) - Use dma_set_mask_and_coherent() since Switchtec supports 64-bit addressing (Wesley Sheng)" * tag 'pci-v5.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (60 commits) PCI: Allow adjust_bridge_window() to shrink resource if necessary PCI: Set resource size directly in adjust_bridge_window() PCI: Rename extend_bridge_window() to adjust_bridge_window() PCI: Rename extend_bridge_window() parameter PCI: Consider alignment of hot-added bridges when assigning resources PCI: Remove local variable usage in pci_bus_distribute_available_resources() PCI: Pass size + alignment to pci_bus_distribute_available_resources() PCI: Rename variables PCI: vmd: Add two VMD Device IDs PCI: Remove unnecessary braces PCI: brcmstb: Add MSI support PCI: brcmstb: Add Broadcom STB PCIe host controller driver x86/PCI: Remove X86_DEV_DMA_OPS PCI: vmd: Remove dma_map_ops overrides iommu/vt-d: Remove VMD child device sanity check iommu/vt-d: Use pci_real_dma_dev() for mapping PCI: Introduce pci_real_dma_dev() x86/PCI: Expose VMD's pci_dev in struct pci_sysdata x86/PCI: Add to_pci_sysdata() helper PCI/AER: Initialize aer_fifo ...
Showing the changes to include/uapi/linux (2 of 42 files). Show all
Unified · Split
| @@ -676,6 +676,7 @@ · 675 unmodified lines | ||
| 676 | 676 | #define PCI_EXP_LNKCTL2_TLS_32_0GT 0x0005 /* Supported Speed 32GT/s */ |
| 677 | 677 | #define PCI_EXP_LNKCTL2_ENTER_COMP 0x0010 /* Enter Compliance */ |
| 678 | 678 | #define PCI_EXP_LNKCTL2_TX_MARGIN 0x0380 /* Transmit Margin */ |
| 679 | +#define PCI_EXP_LNKCTL2_HASD 0x0020 /* HW Autonomous Speed Disable */ | |
| 679 | 680 | #define PCI_EXP_LNKSTA2 50 /* Link Status 2 */ |
| 680 | 681 | #define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 52 /* v2 endpoints with link end here */ |
| 681 | 682 | #define PCI_EXP_SLTCAP2 52 /* Slot Capabilities 2 */ |
| @@ -32,7 +32,18 @@ · 31 unmodified lines | ||
| 32 | 32 | #define SWITCHTEC_IOCTL_PART_VENDOR5 10 |
| 33 | 33 | #define SWITCHTEC_IOCTL_PART_VENDOR6 11 |
| 34 | 34 | #define SWITCHTEC_IOCTL_PART_VENDOR7 12 |
| 35 | −#define SWITCHTEC_IOCTL_NUM_PARTITIONS 13 | |
| 35 | +#define SWITCHTEC_IOCTL_PART_BL2_0 13 | |
| 36 | +#define SWITCHTEC_IOCTL_PART_BL2_1 14 | |
| 37 | +#define SWITCHTEC_IOCTL_PART_MAP_0 15 | |
| 38 | +#define SWITCHTEC_IOCTL_PART_MAP_1 16 | |
| 39 | +#define SWITCHTEC_IOCTL_PART_KEY_0 17 | |
| 40 | +#define SWITCHTEC_IOCTL_PART_KEY_1 18 | |
| 41 | + | |
| 42 | +#define SWITCHTEC_NUM_PARTITIONS_GEN3 13 | |
| 43 | +#define SWITCHTEC_NUM_PARTITIONS_GEN4 19 | |
| 44 | + | |
| 45 | +/* obsolete: for compatibility with old userspace software */ | |
| 46 | +#define SWITCHTEC_IOCTL_NUM_PARTITIONS SWITCHTEC_NUM_PARTITIONS_GEN3 | |
| 36 | 47 | |
| 37 | 48 | struct switchtec_ioctl_flash_info { |
| 38 | 49 | __u64 flash_length; |
| @@ -98,7 +109,9 @@ struct switchtec_ioctl_event_summary { · 59 unmodified lines | ||
| 98 | 109 | #define SWITCHTEC_IOCTL_EVENT_CREDIT_TIMEOUT 27 |
| 99 | 110 | #define SWITCHTEC_IOCTL_EVENT_LINK_STATE 28 |
| 100 | 111 | #define SWITCHTEC_IOCTL_EVENT_GFMS 29 |
| 101 | −#define SWITCHTEC_IOCTL_MAX_EVENTS 30 | |
| 112 | +#define SWITCHTEC_IOCTL_EVENT_INTERCOMM_REQ_NOTIFY 30 | |
| 113 | +#define SWITCHTEC_IOCTL_EVENT_UEC 31 | |
| 114 | +#define SWITCHTEC_IOCTL_MAX_EVENTS 32 | |
| 102 | 115 | |
| 103 | 116 | #define SWITCHTEC_IOCTL_EVENT_LOCAL_PART_IDX -1 |
| 104 | 117 | #define SWITCHTEC_IOCTL_EVENT_IDX_ALL -2 |