History

Merge branch 'pci/msi' into next

* pci/msi: PCI/portdrv: Compute MSI/MSI-X IRQ vectors after final allocation PCI/portdrv: Factor out Interrupt Message Number lookup PCI/portdrv: Consolidate comments PCI/portdrv: Add #defines for AER and DPC Interrupt Message Number masks

Bjorn Helgaas committed 9 years ago

Commit 60181822 parents 65a129d a579ba42 files · +77 −96Browse files

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

Unified · Split

include/uapi/linux/pci_regs.h+2−0
@@ -746,6 +746,7 @@ · 745 unmodified lines
746#define PCI_ERR_ROOT_FIRST_FATAL 0x00000010 /* First UNC is Fatal */746#define PCI_ERR_ROOT_FIRST_FATAL 0x00000010 /* First UNC is Fatal */
747#define PCI_ERR_ROOT_NONFATAL_RCV 0x00000020 /* Non-Fatal Received */747#define PCI_ERR_ROOT_NONFATAL_RCV 0x00000020 /* Non-Fatal Received */
748#define PCI_ERR_ROOT_FATAL_RCV 0x00000040 /* Fatal Received */748#define PCI_ERR_ROOT_FATAL_RCV 0x00000040 /* Fatal Received */
749#define PCI_ERR_ROOT_AER_IRQ 0xf8000000 /* Advanced Error Interrupt Message Number */
749#define PCI_ERR_ROOT_ERR_SRC 52 /* Error Source Identification */750#define PCI_ERR_ROOT_ERR_SRC 52 /* Error Source Identification */
750 751
751/* Virtual Channel */752/* Virtual Channel */
@@ -960,6 +961,7 @@ · 208 unmodified lines
960 961
961/* Downstream Port Containment */962/* Downstream Port Containment */
962#define PCI_EXP_DPC_CAP 4 /* DPC Capability */963#define PCI_EXP_DPC_CAP 4 /* DPC Capability */
964#define PCI_EXP_DPC_IRQ 0x1f /* DPC Interrupt Message Number */
963#define PCI_EXP_DPC_CAP_RP_EXT 0x20 /* Root Port Extensions for DPC */965#define PCI_EXP_DPC_CAP_RP_EXT 0x20 /* Root Port Extensions for DPC */
964#define PCI_EXP_DPC_CAP_POISONED_TLP 0x40 /* Poisoned TLP Egress Blocking Supported */966#define PCI_EXP_DPC_CAP_POISONED_TLP 0x40 /* Poisoned TLP Egress Blocking Supported */
965#define PCI_EXP_DPC_CAP_SW_TRIGGER 0x80 /* Software Triggering Supported */967#define PCI_EXP_DPC_CAP_SW_TRIGGER 0x80 /* Software Triggering Supported */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t