diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-13 22:14:54 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-13 22:14:54 +0100 |
commit | 8e66791a80abd0e86ac1995395129791eefe50b5 (patch) | |
tree | 3a74d712f47818c9e9f8517251532ac35d88060e /Documentation | |
parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
parent | x86/PCI: Move and shrink AMD 64-bit window to avoid conflict (diff) | |
download | linux-8e66791a80abd0e86ac1995395129791eefe50b5.tar.xz linux-8e66791a80abd0e86ac1995395129791eefe50b5.zip |
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 'Documentation')
-rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index a626465dd877..faccc582c0f9 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3097,6 +3097,12 @@ pcie_scan_all Scan all possible PCIe devices. Otherwise we only look for one device below a PCIe downstream port. + big_root_window Try to add a big 64bit memory window to the PCIe + root complex on AMD CPUs. Some GFX hardware + can resize a BAR to allow access to all VRAM. + Adding the window is slightly risky (it may + conflict with unreported devices), so this + taints the kernel. pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power Management. |