diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-13 13:14:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-13 13:14:54 -0800 |
| commit | 8e66791a80abd0e86ac1995395129791eefe50b5 (patch) | |
| tree | 3a74d712f47818c9e9f8517251532ac35d88060e /arch/x86/include | |
| parent | ed93de8420a342785da7585b06c107ae32f73b2b (diff) | |
| parent | 03a551734cfc2b93f83950a595974e3c9cbd82fd (diff) | |
Merge tag 'pci-v4.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"Fix AMD boot regression due to 64-bit window conflicting with system
memory (Christian König)"
* tag 'pci-v4.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
x86/PCI: Move and shrink AMD 64-bit window to avoid conflict
x86/PCI: Add "pci=big_root_window" option for AMD 64-bit windows
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/pci_x86.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h index 7a5d6695abd3..eb66fa9cd0fc 100644 --- a/arch/x86/include/asm/pci_x86.h +++ b/arch/x86/include/asm/pci_x86.h @@ -38,6 +38,7 @@ do { \ #define PCI_NOASSIGN_ROMS 0x80000 #define PCI_ROOT_NO_CRS 0x100000 #define PCI_NOASSIGN_BARS 0x200000 +#define PCI_BIG_ROOT_WINDOW 0x400000 extern unsigned int pci_probe; extern unsigned long pirq_table_addr; |