Pull PCI updates from Bjorn Helgaas: "Enumeration changes: - Add _HPX Type 3 settings support, which gives firmware more influence over device configuration (Alexandru Gagniuc) - Support fixed bus numbers from bridge Enhanced Allocation capabilities (Subbaraya Sundeep) - Add "external-facing" DT property to identify cases where we require IOMMU protection against untrusted devices (Jean-Philippe Brucker) - Enable PCIe services for host controller drivers that use managed host bridge alloc (Jean-Philippe Brucker) - Log PCIe port service messages with pci_dev, not the pcie_device (Frederick Lawler) - Convert pciehp from pciehp_debug module parameter to generic dynamic debug (Frederick Lawler) Peer-to-peer DMA: - Add whitelist of Root Complexes that support peer-to-peer DMA between Root Ports (Christian König) Native controller drivers: - Add PCI host bridge DMA ranges for bridges that can't DMA everywhere, e.g., iProc (Srinath Mannam) - Add Amazon Annapurna Labs PCIe host controller driver (Jonathan Chocron) - Fix Tegra MSI target allocation so DMA doesn't generate unwanted MSIs (Vidya Sagar) - Fix of_node reference leaks (Wen Yang) - Fix Hyper-V module unload & device removal issues (Dexuan Cui) - Cleanup R-Car driver (Marek Vasut) - Cleanup Keystone driver (Kishon Vijay Abraham I) - Cleanup i.MX6 driver (Andrey Smirnov) Significant bug fixes: - Reset Lenovo ThinkPad P50 GPU so nouveau works after reboot (Lyude Paul) - Fix Switchtec firmware update performance issue (Wesley Sheng) - Work around Pericom switch link retraining erratum (Stefan Mätje)" * tag 'pci-v5.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (141 commits) MAINTAINERS: Add Karthikeyan Mitran and Hou Zhiqiang for Mobiveil PCI PCI: pciehp: Remove pointless MY_NAME definition PCI: pciehp: Remove pointless PCIE_MODULE_NAME definition PCI: pciehp: Remove unused dbg/err/info/warn() wrappers PCI: pciehp: Log messages with pci_dev, not pcie_device PCI: pciehp: Replace pciehp_debug module param with dyndbg PCI: pciehp: Remove pciehp_debug uses PCI/AER: Log messages with pci_dev, not pcie_device PCI/DPC: Log messages with pci_dev, not pcie_device PCI/PME: Replace dev_printk(KERN_DEBUG) with dev_info() PCI/AER: Replace dev_printk(KERN_DEBUG) with dev_info() PCI: Replace dev_printk(KERN_DEBUG) with dev_info(), etc PCI: Replace printk(KERN_INFO) with pr_info(), etc PCI: Use dev_printk() when possible PCI: Cleanup setup-bus.c comments and whitespace PCI: imx6: Allow asynchronous probing PCI: dwc: Save root bus for driver remove hooks PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code PCI: dwc: Free MSI in dw_pcie_host_init() error path PCI: dwc: Free MSI IRQ page in dw_pcie_free_msi() ...
Showing the changes to include/uapi/linux (2 of 92 files). Show all
Unified · Split
| @@ -1,7 +1,5 @@ | ||
| 1 | 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ |
| 2 | 2 | /* |
| 3 | − * pci_regs.h | |
| 4 | − * | |
| 5 | 3 | * PCI standard defines |
| 6 | 4 | * Copyright 1994, Drew Eckhardt |
| 7 | 5 | * Copyright 1997--1999 Martin Mares <mj@ucw.cz> |
| @@ -15,7 +13,7 @@ · 7 unmodified lines | ||
| 15 | 13 | * PCI System Design Guide |
| 16 | 14 | * |
| 17 | 15 | * For HyperTransport information, please consult the following manuals |
| 18 | − * from http://www.hypertransport.org | |
| 16 | + * from http://www.hypertransport.org : | |
| 19 | 17 | * |
| 20 | 18 | * The HyperTransport I/O Link Specification |
| 21 | 19 | */ |
| @@ -301,7 +299,7 @@ · 279 unmodified lines | ||
| 301 | 299 | #define PCI_SID_ESR_FIC 0x20 /* First In Chassis Flag */ |
| 302 | 300 | #define PCI_SID_CHASSIS_NR 3 /* Chassis Number */ |
| 303 | 301 | |
| 304 | −/* Message Signalled Interrupts registers */ | |
| 302 | +/* Message Signalled Interrupt registers */ | |
| 305 | 303 | |
| 306 | 304 | #define PCI_MSI_FLAGS 2 /* Message Control */ |
| 307 | 305 | #define PCI_MSI_FLAGS_ENABLE 0x0001 /* MSI feature enabled */ |
| @@ -319,7 +317,7 @@ · 11 unmodified lines | ||
| 319 | 317 | #define PCI_MSI_MASK_64 16 /* Mask bits register for 64-bit devices */ |
| 320 | 318 | #define PCI_MSI_PENDING_64 20 /* Pending intrs for 64-bit devices */ |
| 321 | 319 | |
| 322 | −/* MSI-X registers */ | |
| 320 | +/* MSI-X registers (in MSI-X capability) */ | |
| 323 | 321 | #define PCI_MSIX_FLAGS 2 /* Message Control */ |
| 324 | 322 | #define PCI_MSIX_FLAGS_QSIZE 0x07FF /* Table size */ |
| 325 | 323 | #define PCI_MSIX_FLAGS_MASKALL 0x4000 /* Mask all vectors for this function */ |
| @@ -333,13 +331,13 @@ · 7 unmodified lines | ||
| 333 | 331 | #define PCI_MSIX_FLAGS_BIRMASK PCI_MSIX_PBA_BIR /* deprecated */ |
| 334 | 332 | #define PCI_CAP_MSIX_SIZEOF 12 /* size of MSIX registers */ |
| 335 | 333 | |
| 336 | −/* MSI-X Table entry format */ | |
| 334 | +/* MSI-X Table entry format (in memory mapped by a BAR) */ | |
| 337 | 335 | #define PCI_MSIX_ENTRY_SIZE 16 |
| 338 | −#define PCI_MSIX_ENTRY_LOWER_ADDR 0 | |
| 339 | −#define PCI_MSIX_ENTRY_UPPER_ADDR 4 | |
| 340 | −#define PCI_MSIX_ENTRY_DATA 8 | |
| 341 | −#define PCI_MSIX_ENTRY_VECTOR_CTRL 12 | |
| 342 | −#define PCI_MSIX_ENTRY_CTRL_MASKBIT 1 | |
| 336 | +#define PCI_MSIX_ENTRY_LOWER_ADDR 0 /* Message Address */ | |
| 337 | +#define PCI_MSIX_ENTRY_UPPER_ADDR 4 /* Message Upper Address */ | |
| 338 | +#define PCI_MSIX_ENTRY_DATA 8 /* Message Data */ | |
| 339 | +#define PCI_MSIX_ENTRY_VECTOR_CTRL 12 /* Vector Control */ | |
| 340 | +#define PCI_MSIX_ENTRY_CTRL_MASKBIT 0x00000001 | |
| 343 | 341 | |
| 344 | 342 | /* CompactPCI Hotswap Register */ |
| 345 | 343 | |
| @@ -372,6 +370,12 @@ · 26 unmodified lines | ||
| 372 | 370 | #define PCI_EA_FIRST_ENT_BRIDGE 8 /* First EA Entry for Bridges */ |
| 373 | 371 | #define PCI_EA_ES 0x00000007 /* Entry Size */ |
| 374 | 372 | #define PCI_EA_BEI 0x000000f0 /* BAR Equivalent Indicator */ |
| 373 | + | |
| 374 | +/* EA fixed Secondary and Subordinate bus numbers for Bridge */ | |
| 375 | +#define PCI_EA_SEC_BUS_MASK 0xff | |
| 376 | +#define PCI_EA_SUB_BUS_MASK 0xff00 | |
| 377 | +#define PCI_EA_SUB_BUS_SHIFT 8 | |
| 378 | + | |
| 375 | 379 | /* 0-5 map to BARs 0-5 respectively */ |
| 376 | 380 | #define PCI_EA_BEI_BAR0 0 |
| 377 | 381 | #define PCI_EA_BEI_BAR5 5 |
| @@ -465,19 +469,19 @@ · 87 unmodified lines | ||
| 465 | 469 | /* PCI Express capability registers */ |
| 466 | 470 | |
| 467 | 471 | #define PCI_EXP_FLAGS 2 /* Capabilities register */ |
| 468 | −#define PCI_EXP_FLAGS_VERS 0x000f /* Capability version */ | |
| 469 | −#define PCI_EXP_FLAGS_TYPE 0x00f0 /* Device/Port type */ | |
| 470 | −#define PCI_EXP_TYPE_ENDPOINT 0x0 /* Express Endpoint */ | |
| 471 | −#define PCI_EXP_TYPE_LEG_END 0x1 /* Legacy Endpoint */ | |
| 472 | −#define PCI_EXP_TYPE_ROOT_PORT 0x4 /* Root Port */ | |
| 473 | −#define PCI_EXP_TYPE_UPSTREAM 0x5 /* Upstream Port */ | |
| 474 | −#define PCI_EXP_TYPE_DOWNSTREAM 0x6 /* Downstream Port */ | |
| 475 | −#define PCI_EXP_TYPE_PCI_BRIDGE 0x7 /* PCIe to PCI/PCI-X Bridge */ | |
| 476 | −#define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 /* PCI/PCI-X to PCIe Bridge */ | |
| 477 | −#define PCI_EXP_TYPE_RC_END 0x9 /* Root Complex Integrated Endpoint */ | |
| 478 | −#define PCI_EXP_TYPE_RC_EC 0xa /* Root Complex Event Collector */ | |
| 479 | −#define PCI_EXP_FLAGS_SLOT 0x0100 /* Slot implemented */ | |
| 480 | −#define PCI_EXP_FLAGS_IRQ 0x3e00 /* Interrupt message number */ | |
| 472 | +#define PCI_EXP_FLAGS_VERS 0x000f /* Capability version */ | |
| 473 | +#define PCI_EXP_FLAGS_TYPE 0x00f0 /* Device/Port type */ | |
| 474 | +#define PCI_EXP_TYPE_ENDPOINT 0x0 /* Express Endpoint */ | |
| 475 | +#define PCI_EXP_TYPE_LEG_END 0x1 /* Legacy Endpoint */ | |
| 476 | +#define PCI_EXP_TYPE_ROOT_PORT 0x4 /* Root Port */ | |
| 477 | +#define PCI_EXP_TYPE_UPSTREAM 0x5 /* Upstream Port */ | |
| 478 | +#define PCI_EXP_TYPE_DOWNSTREAM 0x6 /* Downstream Port */ | |
| 479 | +#define PCI_EXP_TYPE_PCI_BRIDGE 0x7 /* PCIe to PCI/PCI-X Bridge */ | |
| 480 | +#define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 /* PCI/PCI-X to PCIe Bridge */ | |
| 481 | +#define PCI_EXP_TYPE_RC_END 0x9 /* Root Complex Integrated Endpoint */ | |
| 482 | +#define PCI_EXP_TYPE_RC_EC 0xa /* Root Complex Event Collector */ | |
| 483 | +#define PCI_EXP_FLAGS_SLOT 0x0100 /* Slot implemented */ | |
| 484 | +#define PCI_EXP_FLAGS_IRQ 0x3e00 /* Interrupt message number */ | |
| 481 | 485 | #define PCI_EXP_DEVCAP 4 /* Device capabilities */ |
| 482 | 486 | #define PCI_EXP_DEVCAP_PAYLOAD 0x00000007 /* Max_Payload_Size */ |
| 483 | 487 | #define PCI_EXP_DEVCAP_PHANTOM 0x00000018 /* Phantom functions */ |
| @@ -616,8 +620,8 @@ · 132 unmodified lines | ||
| 616 | 620 | #define PCI_EXP_RTCAP 30 /* Root Capabilities */ |
| 617 | 621 | #define PCI_EXP_RTCAP_CRSVIS 0x0001 /* CRS Software Visibility capability */ |
| 618 | 622 | #define PCI_EXP_RTSTA 32 /* Root Status */ |
| 619 | −#define PCI_EXP_RTSTA_PME 0x00010000 /* PME status */ | |
| 620 | −#define PCI_EXP_RTSTA_PENDING 0x00020000 /* PME pending */ | |
| 623 | +#define PCI_EXP_RTSTA_PME 0x00010000 /* PME status */ | |
| 624 | +#define PCI_EXP_RTSTA_PENDING 0x00020000 /* PME pending */ | |
| 621 | 625 | /* |
| 622 | 626 | * The Device Capabilities 2, Device Status 2, Device Control 2, |
| 623 | 627 | * Link Capabilities 2, Link Status 2, Link Control 2, |
| @@ -637,13 +641,13 @@ · 13 unmodified lines | ||
| 637 | 641 | #define PCI_EXP_DEVCAP2_OBFF_MASK 0x000c0000 /* OBFF support mechanism */ |
| 638 | 642 | #define PCI_EXP_DEVCAP2_OBFF_MSG 0x00040000 /* New message signaling */ |
| 639 | 643 | #define PCI_EXP_DEVCAP2_OBFF_WAKE 0x00080000 /* Re-use WAKE# for OBFF */ |
| 640 | −#define PCI_EXP_DEVCAP2_EE_PREFIX 0x00200000 /* End-End TLP Prefix */ | |
| 644 | +#define PCI_EXP_DEVCAP2_EE_PREFIX 0x00200000 /* End-End TLP Prefix */ | |
| 641 | 645 | #define PCI_EXP_DEVCTL2 40 /* Device Control 2 */ |
| 642 | 646 | #define PCI_EXP_DEVCTL2_COMP_TIMEOUT 0x000f /* Completion Timeout Value */ |
| 643 | 647 | #define PCI_EXP_DEVCTL2_COMP_TMOUT_DIS 0x0010 /* Completion Timeout Disable */ |
| 644 | 648 | #define PCI_EXP_DEVCTL2_ARI 0x0020 /* Alternative Routing-ID */ |
| 645 | −#define PCI_EXP_DEVCTL2_ATOMIC_REQ 0x0040 /* Set Atomic requests */ | |
| 646 | −#define PCI_EXP_DEVCTL2_ATOMIC_EGRESS_BLOCK 0x0080 /* Block atomic egress */ | |
| 649 | +#define PCI_EXP_DEVCTL2_ATOMIC_REQ 0x0040 /* Set Atomic requests */ | |
| 650 | +#define PCI_EXP_DEVCTL2_ATOMIC_EGRESS_BLOCK 0x0080 /* Block atomic egress */ | |
| 647 | 651 | #define PCI_EXP_DEVCTL2_IDO_REQ_EN 0x0100 /* Allow IDO for requests */ |
| 648 | 652 | #define PCI_EXP_DEVCTL2_IDO_CMP_EN 0x0200 /* Allow IDO for completions */ |
| 649 | 653 | #define PCI_EXP_DEVCTL2_LTR_EN 0x0400 /* Enable LTR mechanism */ |
| @@ -659,11 +663,11 @@ · 9 unmodified lines | ||
| 659 | 663 | #define PCI_EXP_LNKCAP2_SLS_16_0GB 0x00000010 /* Supported Speed 16GT/s */ |
| 660 | 664 | #define PCI_EXP_LNKCAP2_CROSSLINK 0x00000100 /* Crosslink supported */ |
| 661 | 665 | #define PCI_EXP_LNKCTL2 48 /* Link Control 2 */ |
| 662 | −#define PCI_EXP_LNKCTL2_TLS 0x000f | |
| 663 | −#define PCI_EXP_LNKCTL2_TLS_2_5GT 0x0001 /* Supported Speed 2.5GT/s */ | |
| 664 | −#define PCI_EXP_LNKCTL2_TLS_5_0GT 0x0002 /* Supported Speed 5GT/s */ | |
| 665 | −#define PCI_EXP_LNKCTL2_TLS_8_0GT 0x0003 /* Supported Speed 8GT/s */ | |
| 666 | −#define PCI_EXP_LNKCTL2_TLS_16_0GT 0x0004 /* Supported Speed 16GT/s */ | |
| 666 | +#define PCI_EXP_LNKCTL2_TLS 0x000f | |
| 667 | +#define PCI_EXP_LNKCTL2_TLS_2_5GT 0x0001 /* Supported Speed 2.5GT/s */ | |
| 668 | +#define PCI_EXP_LNKCTL2_TLS_5_0GT 0x0002 /* Supported Speed 5GT/s */ | |
| 669 | +#define PCI_EXP_LNKCTL2_TLS_8_0GT 0x0003 /* Supported Speed 8GT/s */ | |
| 670 | +#define PCI_EXP_LNKCTL2_TLS_16_0GT 0x0004 /* Supported Speed 16GT/s */ | |
| 667 | 671 | #define PCI_EXP_LNKSTA2 50 /* Link Status 2 */ |
| 668 | 672 | #define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 52 /* v2 endpoints with link end here */ |
| 669 | 673 | #define PCI_EXP_SLTCAP2 52 /* Slot Capabilities 2 */ |
| @@ -752,18 +756,18 @@ · 82 unmodified lines | ||
| 752 | 756 | #define PCI_ERR_CAP_ECRC_CHKE 0x00000100 /* ECRC Check Enable */ |
| 753 | 757 | #define PCI_ERR_HEADER_LOG 28 /* Header Log Register (16 bytes) */ |
| 754 | 758 | #define PCI_ERR_ROOT_COMMAND 44 /* Root Error Command */ |
| 755 | −#define PCI_ERR_ROOT_CMD_COR_EN 0x00000001 /* Correctable Err Reporting Enable */ | |
| 756 | −#define PCI_ERR_ROOT_CMD_NONFATAL_EN 0x00000002 /* Non-Fatal Err Reporting Enable */ | |
| 757 | −#define PCI_ERR_ROOT_CMD_FATAL_EN 0x00000004 /* Fatal Err Reporting Enable */ | |
| 759 | +#define PCI_ERR_ROOT_CMD_COR_EN 0x00000001 /* Correctable Err Reporting Enable */ | |
| 760 | +#define PCI_ERR_ROOT_CMD_NONFATAL_EN 0x00000002 /* Non-Fatal Err Reporting Enable */ | |
| 761 | +#define PCI_ERR_ROOT_CMD_FATAL_EN 0x00000004 /* Fatal Err Reporting Enable */ | |
| 758 | 762 | #define PCI_ERR_ROOT_STATUS 48 |
| 759 | −#define PCI_ERR_ROOT_COR_RCV 0x00000001 /* ERR_COR Received */ | |
| 760 | −#define PCI_ERR_ROOT_MULTI_COR_RCV 0x00000002 /* Multiple ERR_COR */ | |
| 761 | −#define PCI_ERR_ROOT_UNCOR_RCV 0x00000004 /* ERR_FATAL/NONFATAL */ | |
| 762 | −#define PCI_ERR_ROOT_MULTI_UNCOR_RCV 0x00000008 /* Multiple FATAL/NONFATAL */ | |
| 763 | −#define PCI_ERR_ROOT_FIRST_FATAL 0x00000010 /* First UNC is Fatal */ | |
| 764 | −#define PCI_ERR_ROOT_NONFATAL_RCV 0x00000020 /* Non-Fatal Received */ | |
| 765 | −#define PCI_ERR_ROOT_FATAL_RCV 0x00000040 /* Fatal Received */ | |
| 766 | −#define PCI_ERR_ROOT_AER_IRQ 0xf8000000 /* Advanced Error Interrupt Message Number */ | |
| 763 | +#define PCI_ERR_ROOT_COR_RCV 0x00000001 /* ERR_COR Received */ | |
| 764 | +#define PCI_ERR_ROOT_MULTI_COR_RCV 0x00000002 /* Multiple ERR_COR */ | |
| 765 | +#define PCI_ERR_ROOT_UNCOR_RCV 0x00000004 /* ERR_FATAL/NONFATAL */ | |
| 766 | +#define PCI_ERR_ROOT_MULTI_UNCOR_RCV 0x00000008 /* Multiple FATAL/NONFATAL */ | |
| 767 | +#define PCI_ERR_ROOT_FIRST_FATAL 0x00000010 /* First UNC is Fatal */ | |
| 768 | +#define PCI_ERR_ROOT_NONFATAL_RCV 0x00000020 /* Non-Fatal Received */ | |
| 769 | +#define PCI_ERR_ROOT_FATAL_RCV 0x00000040 /* Fatal Received */ | |
| 770 | +#define PCI_ERR_ROOT_AER_IRQ 0xf8000000 /* Advanced Error Interrupt Message Number */ | |
| 767 | 771 | #define PCI_ERR_ROOT_ERR_SRC 52 /* Error Source Identification */ |
| 768 | 772 | |
| 769 | 773 | /* Virtual Channel */ |
| @@ -875,12 +879,12 @@ · 105 unmodified lines | ||
| 875 | 879 | |
| 876 | 880 | /* Page Request Interface */ |
| 877 | 881 | #define PCI_PRI_CTRL 0x04 /* PRI control register */ |
| 878 | −#define PCI_PRI_CTRL_ENABLE 0x01 /* Enable */ | |
| 879 | −#define PCI_PRI_CTRL_RESET 0x02 /* Reset */ | |
| 882 | +#define PCI_PRI_CTRL_ENABLE 0x0001 /* Enable */ | |
| 883 | +#define PCI_PRI_CTRL_RESET 0x0002 /* Reset */ | |
| 880 | 884 | #define PCI_PRI_STATUS 0x06 /* PRI status register */ |
| 881 | −#define PCI_PRI_STATUS_RF 0x001 /* Response Failure */ | |
| 882 | −#define PCI_PRI_STATUS_UPRGI 0x002 /* Unexpected PRG index */ | |
| 883 | −#define PCI_PRI_STATUS_STOPPED 0x100 /* PRI Stopped */ | |
| 885 | +#define PCI_PRI_STATUS_RF 0x0001 /* Response Failure */ | |
| 886 | +#define PCI_PRI_STATUS_UPRGI 0x0002 /* Unexpected PRG index */ | |
| 887 | +#define PCI_PRI_STATUS_STOPPED 0x0100 /* PRI Stopped */ | |
| 884 | 888 | #define PCI_PRI_STATUS_PASID 0x8000 /* PRG Response PASID Required */ |
| 885 | 889 | #define PCI_PRI_MAX_REQ 0x08 /* PRI max reqs supported */ |
| 886 | 890 | #define PCI_PRI_ALLOC_REQ 0x0c /* PRI max reqs allowed */ |
| @@ -898,16 +902,16 @@ · 11 unmodified lines | ||
| 898 | 902 | |
| 899 | 903 | /* Single Root I/O Virtualization */ |
| 900 | 904 | #define PCI_SRIOV_CAP 0x04 /* SR-IOV Capabilities */ |
| 901 | −#define PCI_SRIOV_CAP_VFM 0x01 /* VF Migration Capable */ | |
| 905 | +#define PCI_SRIOV_CAP_VFM 0x00000001 /* VF Migration Capable */ | |
| 902 | 906 | #define PCI_SRIOV_CAP_INTR(x) ((x) >> 21) /* Interrupt Message Number */ |
| 903 | 907 | #define PCI_SRIOV_CTRL 0x08 /* SR-IOV Control */ |
| 904 | −#define PCI_SRIOV_CTRL_VFE 0x01 /* VF Enable */ | |
| 905 | −#define PCI_SRIOV_CTRL_VFM 0x02 /* VF Migration Enable */ | |
| 906 | −#define PCI_SRIOV_CTRL_INTR 0x04 /* VF Migration Interrupt Enable */ | |
| 907 | −#define PCI_SRIOV_CTRL_MSE 0x08 /* VF Memory Space Enable */ | |
| 908 | −#define PCI_SRIOV_CTRL_ARI 0x10 /* ARI Capable Hierarchy */ | |
| 908 | +#define PCI_SRIOV_CTRL_VFE 0x0001 /* VF Enable */ | |
| 909 | +#define PCI_SRIOV_CTRL_VFM 0x0002 /* VF Migration Enable */ | |
| 910 | +#define PCI_SRIOV_CTRL_INTR 0x0004 /* VF Migration Interrupt Enable */ | |
| 911 | +#define PCI_SRIOV_CTRL_MSE 0x0008 /* VF Memory Space Enable */ | |
| 912 | +#define PCI_SRIOV_CTRL_ARI 0x0010 /* ARI Capable Hierarchy */ | |
| 909 | 913 | #define PCI_SRIOV_STATUS 0x0a /* SR-IOV Status */ |
| 910 | −#define PCI_SRIOV_STATUS_VFM 0x01 /* VF Migration Status */ | |
| 914 | +#define PCI_SRIOV_STATUS_VFM 0x0001 /* VF Migration Status */ | |
| 911 | 915 | #define PCI_SRIOV_INITIAL_VF 0x0c /* Initial VFs */ |
| 912 | 916 | #define PCI_SRIOV_TOTAL_VF 0x0e /* Total VFs */ |
| 913 | 917 | #define PCI_SRIOV_NUM_VF 0x10 /* Number of VFs */ |
| @@ -937,13 +941,13 @@ · 23 unmodified lines | ||
| 937 | 941 | |
| 938 | 942 | /* Access Control Service */ |
| 939 | 943 | #define PCI_ACS_CAP 0x04 /* ACS Capability Register */ |
| 940 | −#define PCI_ACS_SV 0x01 /* Source Validation */ | |
| 941 | −#define PCI_ACS_TB 0x02 /* Translation Blocking */ | |
| 942 | −#define PCI_ACS_RR 0x04 /* P2P Request Redirect */ | |
| 943 | −#define PCI_ACS_CR 0x08 /* P2P Completion Redirect */ | |
| 944 | −#define PCI_ACS_UF 0x10 /* Upstream Forwarding */ | |
| 945 | −#define PCI_ACS_EC 0x20 /* P2P Egress Control */ | |
| 946 | −#define PCI_ACS_DT 0x40 /* Direct Translated P2P */ | |
| 944 | +#define PCI_ACS_SV 0x0001 /* Source Validation */ | |
| 945 | +#define PCI_ACS_TB 0x0002 /* Translation Blocking */ | |
| 946 | +#define PCI_ACS_RR 0x0004 /* P2P Request Redirect */ | |
| 947 | +#define PCI_ACS_CR 0x0008 /* P2P Completion Redirect */ | |
| 948 | +#define PCI_ACS_UF 0x0010 /* Upstream Forwarding */ | |
| 949 | +#define PCI_ACS_EC 0x0020 /* P2P Egress Control */ | |
| 950 | +#define PCI_ACS_DT 0x0040 /* Direct Translated P2P */ | |
| 947 | 951 | #define PCI_ACS_EGRESS_BITS 0x05 /* ACS Egress Control Vector Size */ |
| 948 | 952 | #define PCI_ACS_CTRL 0x06 /* ACS Control Register */ |
| 949 | 953 | #define PCI_ACS_EGRESS_CTL_V 0x08 /* ACS Egress Control Vector */ |
| @@ -993,9 +997,9 @@ · 43 unmodified lines | ||
| 993 | 997 | #define PCI_EXP_DPC_CAP_DL_ACTIVE 0x1000 /* ERR_COR signal on DL_Active supported */ |
| 994 | 998 | |
| 995 | 999 | #define PCI_EXP_DPC_CTL 6 /* DPC control */ |
| 996 | −#define PCI_EXP_DPC_CTL_EN_FATAL 0x0001 /* Enable trigger on ERR_FATAL message */ | |
| 997 | −#define PCI_EXP_DPC_CTL_EN_NONFATAL 0x0002 /* Enable trigger on ERR_NONFATAL message */ | |
| 998 | −#define PCI_EXP_DPC_CTL_INT_EN 0x0008 /* DPC Interrupt Enable */ | |
| 1000 | +#define PCI_EXP_DPC_CTL_EN_FATAL 0x0001 /* Enable trigger on ERR_FATAL message */ | |
| 1001 | +#define PCI_EXP_DPC_CTL_EN_NONFATAL 0x0002 /* Enable trigger on ERR_NONFATAL message */ | |
| 1002 | +#define PCI_EXP_DPC_CTL_INT_EN 0x0008 /* DPC Interrupt Enable */ | |
| 999 | 1003 | |
| 1000 | 1004 | #define PCI_EXP_DPC_STATUS 8 /* DPC Status */ |
| 1001 | 1005 | #define PCI_EXP_DPC_STATUS_TRIGGER 0x0001 /* Trigger Status */ |
| @@ -50,7 +50,7 @@ struct switchtec_ioctl_flash_part_info { · 49 unmodified lines | ||
| 50 | 50 | __u32 active; |
| 51 | 51 | }; |
| 52 | 52 | |
| 53 | −struct switchtec_ioctl_event_summary { | |
| 53 | +struct switchtec_ioctl_event_summary_legacy { | |
| 54 | 54 | __u64 global; |
| 55 | 55 | __u64 part_bitmap; |
| 56 | 56 | __u32 local_part; |
| @@ -59,6 +59,15 @@ struct switchtec_ioctl_event_summary { · 2 unmodified lines | ||
| 59 | 59 | __u32 pff[48]; |
| 60 | 60 | }; |
| 61 | 61 | |
| 62 | +struct switchtec_ioctl_event_summary { | |
| 63 | + __u64 global; | |
| 64 | + __u64 part_bitmap; | |
| 65 | + __u32 local_part; | |
| 66 | + __u32 padding; | |
| 67 | + __u32 part[48]; | |
| 68 | + __u32 pff[255]; | |
| 69 | +}; | |
| 70 | + | |
| 62 | 71 | #define SWITCHTEC_IOCTL_EVENT_STACK_ERROR 0 |
| 63 | 72 | #define SWITCHTEC_IOCTL_EVENT_PPU_ERROR 1 |
| 64 | 73 | #define SWITCHTEC_IOCTL_EVENT_ISP_ERROR 2 |
| @@ -127,6 +136,8 @@ struct switchtec_ioctl_pff_port { · 62 unmodified lines | ||
| 127 | 136 | _IOWR('W', 0x41, struct switchtec_ioctl_flash_part_info) |
| 128 | 137 | #define SWITCHTEC_IOCTL_EVENT_SUMMARY \ |
| 129 | 138 | _IOR('W', 0x42, struct switchtec_ioctl_event_summary) |
| 139 | +#define SWITCHTEC_IOCTL_EVENT_SUMMARY_LEGACY \ | |
| 140 | + _IOR('W', 0x42, struct switchtec_ioctl_event_summary_legacy) | |
| 130 | 141 | #define SWITCHTEC_IOCTL_EVENT_CTL \ |
| 131 | 142 | _IOWR('W', 0x43, struct switchtec_ioctl_event_ctl) |
| 132 | 143 | #define SWITCHTEC_IOCTL_PFF_TO_PORT \ |