Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Revert "PCI: use ACPI _CRS data by default"
This reverts commit 9e9f46c44e487af0a82eb61b624553e2f7118f5b.
Quoting from the commit message:
"At this point, it seems to solve more problems than it causes, so let's
try using it by default. It's an easy revert if it ends up causing
trouble."
And guess what? The _CRS code causes trouble.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+6
-6
+1
-1
Documentation/kernel-parameters.txt
+1
-1
Documentation/kernel-parameters.txt
···
1855
1855
IRQ routing is enabled.
1856
1856
noacpi [X86] Do not use ACPI for IRQ routing
1857
1857
or for PCI scanning.
1858
-
nocrs [X86] Don't use _CRS for PCI resource
1858
+
use_crs [X86] Use _CRS for PCI resource
1859
1859
allocation.
1860
1860
routeirq Do IRQ routing for all PCI devices.
1861
1861
This is normally done in pci_enable_device(),
+1
-1
arch/x86/include/asm/pci_x86.h
+1
-1
arch/x86/include/asm/pci_x86.h
···
25
25
#define PCI_BIOS_IRQ_SCAN 0x2000
26
26
#define PCI_ASSIGN_ALL_BUSSES 0x4000
27
27
#define PCI_CAN_SKIP_ISA_ALIGN 0x8000
28
-
#define PCI_NO_ROOT_CRS 0x10000
28
+
#define PCI_USE__CRS 0x10000
29
29
#define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000
30
30
#define PCI_HAS_IO_ECS 0x40000
31
31
#define PCI_NOASSIGN_ROMS 0x80000
+1
-1
arch/x86/pci/acpi.c
+1
-1
arch/x86/pci/acpi.c
+1
-1
arch/x86/pci/amd_bus.c
+1
-1
arch/x86/pci/amd_bus.c
+2
-2
arch/x86/pci/common.c
+2
-2
arch/x86/pci/common.c
···
515
515
} else if (!strcmp(str, "assign-busses")) {
516
516
pci_probe |= PCI_ASSIGN_ALL_BUSSES;
517
517
return NULL;
518
-
} else if (!strcmp(str, "nocrs")) {
519
-
pci_probe |= PCI_NO_ROOT_CRS;
518
+
} else if (!strcmp(str, "use_crs")) {
519
+
pci_probe |= PCI_USE__CRS;
520
520
return NULL;
521
521
} else if (!strcmp(str, "earlydump")) {
522
522
pci_early_dump_regs = 1;