x86/PCI: Ignore E820 reservations for bridge windows on newer systems
Subsystems (5)
v5 cover x86/PCI: Ignore E820 reservations for bridge windows on newer systems
Hi All,
Here is v5 of my patch to address the E820 reservations vs PCI host bridge windows issue which is causing touchpad and/or thunderbolt issues on many different laptop models.
Changes in v5:
- Drop mention of Windows behavior from the commit msg, replace with a reference to the specs
- Improve documentation in Documentation/admin-guide/kernel-parameters.txt
- Reword the big comment added, use "PCI host bridge window" in it and drop all references to Windows
- Add a second patch moving the arch/x86/pci/acpi.c printk-s to pr_info/warn
Changes in v4:
- Rewrap the big comment block to fit in 80 columns
I believe that this is ready for merging now.
Bjorn, can you review/ack this please ?
x86/tip folks it would be ideal if you can pick this up and send at least the first patch as a fix to Linus for 5.15. This fixes a bug which has been plaguing a lot of users (see all the bug links in the commit msg).
Regards,
Hans
Hans de Goede (2):
x86/PCI: Ignore E820 reservations for bridge windows on newer systems x86/PCI/ACPI: Replace printk calls with pr_info/pr_warn calls
.../admin-guide/kernel-parameters.txt | 9 ++++ arch/x86/include/asm/pci_x86.h | 10 ++++ arch/x86/kernel/resource.c | 4 ++ arch/x86/pci/acpi.c | 49 +++++++++++++++---- arch/x86/pci/common.c | 6 +++ 5 files changed, 68 insertions(+), 10 deletions(-)
Signature · 1 line
2.31.1
PATCH v5 1/2 x86/PCI: Ignore E820 reservations for bridge windows on newer systems
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI host bridge window returned by the ACPI _CRS method, see commit 4dc2287c1805 ("x86: avoid E820 regions when allocating address space").
To work around this bug Linux excludes E820 reserved addresses when allocating addresses from the PCI host bridge window since 2010.
Recently (2020) some systems have shown-up with E820 reservations which cover the entire _CRS returned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:
[mem 0x000000004bc50000-0x00000000cfffffff] reserved pci_bus 0000:00: root bus resource [mem 0x65400000-0xbfffffff window]
The ACPI specifications appear to allow this new behavior:
The relationship between E820 and ACPI _CRS is not really very clear. ACPI v6.3, sec 15, table 15-374, says AddressRangeReserved means:
This range of addresses is in use or reserved by the system and is not to be included in the allocatable memory pool of the operating system's memory manager.
and it may be used when:
The address range is in use by a memory-mapped system device.
Furthermore, sec 15.2 says:
Address ranges defined for baseboard memory-mapped I/O devices, such as APICs, are returned as reserved.
A PCI host bridge qualifies as a baseboard memory-mapped I/O device, and its apertures are in use and certainly should not be included in the general allocatable pool, so the fact that some BIOS-es reports the PCI aperture as "reserved" in E820 doesn't seem like a BIOS bug.
So it seems that the excluding of E820 reserved addresses is a mistake.
Ideally Linux would fully stop excluding E820 reserved addresses, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that pci_use_e820 will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.
Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
---
Changes in v5:
- Drop mention of Windows behavior from the commit msg, replace with a reference to the specs
- Improve documentation in Documentation/admin-guide/kernel-parameters.txt
- Reword the big comment added, use "PCI host bridge window" in it and drop all refences to Windows
Changes in v4:
- Rewrap the big comment block to fit in 80 columns
- Add Rafael's Acked-by
- Add Cc: [email protected]
Changes in v3:
- Commit msg tweaks (drop dmesg timestamps, typo fix)
- Use "defined(CONFIG_...)" instead of "defined CONFIG_..."
- Add Mika's Reviewed-by
Changes in v2:
- Replace the per model DMI quirk approach with disabling E820 reservations checking for all systems with a BIOS year >= 2018
- Add documentation for the new kernel-parameters to Documentation/admin-guide/kernel-parameters.txt
---
Other patches trying to address the same issue:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
V1 patch:
https://lore.kernel.org/r/[email protected]
--- .../admin-guide/kernel-parameters.txt | 9 ++++++ arch/x86/include/asm/pci_x86.h | 10 +++++++ arch/x86/kernel/resource.c | 4 +++ arch/x86/pci/acpi.c | 28 +++++++++++++++++++ arch/x86/pci/common.c | 6 ++++ 5 files changed, 57 insertions(+)
Documentation/admin-guide/kernel-parameters.txt +9 -0
@@ -3949,6 +3949,15 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. + use_e820 [X86] Use E820 reservations to exclude parts of + PCI host bridge windows. This is a workaround + for BIOS defects in host bridge _CRS methods. + If you need to use this, please report a bug to + <[email protected]>. + no_e820 [X86] Ignore E820 reservations for PCI host + bridge windows. This is the default on modern + hardware. If you need to use this, please report + a bug to <[email protected]>. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaround
arch/x86/include/asm/pci_x86.h +10 -0
@@ -39,6 +39,8 @@ do { \#define PCI_ROOT_NO_CRS 0x100000#define PCI_NOASSIGN_BARS 0x200000#define PCI_BIG_ROOT_WINDOW 0x400000 +#define PCI_USE_E820 0x800000 +#define PCI_NO_E820 0x1000000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;
@@ -64,6 +66,8 @@ void pcibios_scan_specific_bus(int busn);/* pci-irq.c */ +struct pci_dev ; +struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct {
@@ -232,3 +236,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)# define x86_default_pci_init_irq NULL# define x86_default_pci_fixup_irqs NULL#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_ACPI ) +extern bool pci_use_e820; +#else +#define pci_use_e820 false +#endif
arch/x86/kernel/resource.c +4 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/ioport.h> #include <asm/e820/api.h> +#include <asm/pci_x86.h> static void resource_clip (struct resource *res,resource_size_t start,resource_size_t end)
@@ -28,6 +29,9 @@ static void remove_e820_regions(struct resource *avail)int i;struct e820_entry *entry; +if (!pci_use_e820) +return ; +for (i =0 ; i < e820_table->nr_entries; i++) { entry = &e820_table->entries[i];
arch/x86/pci/acpi.c +28 -0
@@ -21,6 +21,8 @@ struct pci_root_info {static bool pci_use_crs = true;static bool pci_ignore_seg = false; +/* Consumed in arch/x86/kernel/resource.c */ +bool pci_use_e820 = false;static int __init set_use_crs (const struct dmi_system_id *id) {
@@ -160,6 +162,32 @@ void __init pci_acpi_crs_quirks(void)"if necessary, use \"pci=%s\" and report a bug\n" , pci_use_crs ?"Using" :"Ignoring" , pci_use_crs ? "nocrs" : "use_crs"); + +/* +* Some BIOS-es contain a bug where they add addresses which map to +* system RAM in the PCI host bridge window returned by the ACPI _CRS +* method, see commit 4dc2287c1805 ("x86: avoid E820 regions when +* allocating address space"). To avoid this Linux by default excludes +* E820 reservations when allocating addresses since 2010. +* In 2020 some systems have shown-up with E820 reservations which cover +* the entire _CRS returned PCI host bridge window, causing all attempts +* to assign memory to PCI BARs to fail if Linux uses E820 reservations. +* +* Ideally Linux would fully stop using E820 reservations, but then +* the old systems this was added for will regress. +* Instead keep the old behavior for old systems, while ignoring the +* E820 reservations for any systems from now on. +*/ +if (year >=0 && year <2018 ) + pci_use_e820 = true; + +if (pci_probe &PCI_NO_E820 ) + pci_use_e820 = false; +else if (pci_probe &PCI_USE_E820 ) + pci_use_e820 = true; + +printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Using" :"Ignoring" ); }#ifdef CONFIG_PCI_MMCONFIG
arch/x86/pci/common.c +6 -0
@@ -595,6 +595,12 @@ char *__init pcibios_setup(char *str) }else if (!strcmp (str,"nocrs" )) { pci_probe |=PCI_ROOT_NO_CRS ;return NULL ; + }else if (!strcmp (str,"use_e820" )) { + pci_probe |=PCI_USE_E820 ; +return NULL ; + }else if (!strcmp (str,"no_e820" )) { + pci_probe |=PCI_NO_E820 ; +return NULL ; #ifdef CONFIG_PHYS_ADDR_T_64BIT }else if (!strcmp (str,"big_root_window" )) { pci_probe |=PCI_BIG_ROOT_WINDOW ;
Signature · 1 line
2.31.1
Quoted 57 lines · Hans de Goede
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI host bridge window returned by the ACPI
_CRSmethod, see commit4dc2287c1805("x86: avoid E820 regions when allocating address space").To work around this bug Linux excludes E820 reserved addresses when allocating addresses from the PCI host bridge window since 2010.
Recently (2020) some systems have shown-up with E820 reservations which cover the entire
_CRSreturned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:[mem 0x000000004bc50000-0x00000000cfffffff] reserved
pci_bus0000:00: root bus resource [mem 0x65400000-0xbfffffff window]The ACPI specifications appear to allow this new behavior:
The relationship between E820 and ACPI
_CRSis not really very clear. ACPI v6.3, sec 15, table 15-374, says AddressRangeReserved means:This range of addresses is in use or reserved by the system and is not to be included in the allocatable memory pool of the operating system's memory manager.
and it may be used when:
The address range is in use by a memory-mapped system device.
Furthermore, sec 15.2 says:
Address ranges defined for baseboard memory-mapped I/O devices, such as APICs, are returned as reserved.
A PCI host bridge qualifies as a baseboard memory-mapped I/O device, and its apertures are in use and certainly should not be included in the general allocatable pool, so the fact that some BIOS-es reports the PCI aperture as "reserved" in E820 doesn't seem like a BIOS bug.
So it seems that the excluding of E820 reserved addresses is a mistake.
Ideally Linux would fully stop excluding E820 reserved addresses, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that
pci_use_e820will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
Quoted 13 lines
Cc Benoit Grégoire <[email protected]>Cc Hui Wang <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Signed-off-by Hans de Goede <[email protected]>
I'm sorry we have to add more ugliness because of my mistake in 4dc2287c1805, but I don't see a better option.
Quoted 177 lines
---
Changes in v5:
- Drop mention of Windows behavior from the commit msg, replace with a reference to the specs
- Improve documentation inDocumentation/admin-guide/kernel-parameters.txt
- Reword the big comment added, use "PCI host bridge window" in it and drop all refences to WindowsChanges in v4:
- Rewrap the big comment block to fit in 80 columns
- Add Rafael's Acked-by
- Add Cc: [email protected]Changes in v3:
- Commit msg tweaks (drop dmesg timestamps, typo fix)
- Use "defined(CONFIG_...)" instead of "definedCONFIG_..."
- Add Mika's Reviewed-byChanges in v2:
- Replace the per model DMI quirk approach with disabling E820 reservations checking for all systems with a BIOS year >= 2018
- Add documentation for the new kernel-parameters toDocumentation/admin-guide/kernel-parameters.txt
---
Other patches trying to address the same issue:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
V1 patch:
https://lore.kernel.org/r/[email protected]--- .../admin-guide/kernel-parameters.txt | 9 ++++++ arch/x86/include/asm/pci_x86.h | 10 +++++++ arch/x86/kernel/resource.c | 4 +++ arch/x86/pci/acpi.c | 28 +++++++++++++++++++ arch/x86/pci/common.c | 6 ++++ 5 files changed, 57 insertions(+)Documentation/admin-guide/kernel-parameters.txt +9
-0@@ -3949,6 +3949,15 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. + use_e820 [X86] Use E820 reservations to exclude parts of + PCI host bridge windows. This is a workaround + for BIOS defects in host bridge _CRS methods. + If you need to use this, please report a bug to + <[email protected]>. + no_e820 [X86] Ignore E820 reservations for PCI host + bridge windows. This is the default on modern + hardware. If you need to use this, please report + a bug to <[email protected]>. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaroundarch/x86/include/asm/pci_x86.h +10
-0@@ -39,6 +39,8 @@ do { \#define PCI_ROOT_NO_CRS 0x100000#define PCI_NOASSIGN_BARS 0x200000#define PCI_BIG_ROOT_WINDOW 0x400000 +#define PCI_USE_E820 0x800000 +#define PCI_NO_E820 0x1000000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;@@ -64,6 +66,8 @@ void pcibios_scan_specific_bus(int busn);/* pci-irq.c */ +struct pci_dev ; +struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct {@@ -232,3 +236,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)# define x86_default_pci_init_irq NULL# define x86_default_pci_fixup_irqs NULL#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_ACPI ) +extern bool pci_use_e820; +#else +#define pci_use_e820 false +#endif arch/x86/kernel/resource.c +4
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/ioport.h> #include <asm/e820/api.h> +#include <asm/pci_x86.h> static void resource_clip (struct resource *res,resource_size_t start,resource_size_t end)@@ -28,6 +29,9 @@ static void remove_e820_regions(struct resource *avail)int i;struct e820_entry *entry; +if (!pci_use_e820) +return ; +for (i =0 ; i < e820_table->nr_entries; i++) { entry = &e820_table->entries[i];arch/x86/pci/acpi.c +28
-0@@ -21,6 +21,8 @@ struct pci_root_info {static bool pci_use_crs = true;static bool pci_ignore_seg = false; +/* Consumed in arch/x86/kernel/resource.c */ +bool pci_use_e820 = false;static int __init set_use_crs (const struct dmi_system_id *id) {@@ -160,6 +162,32 @@ void __init pci_acpi_crs_quirks(void)"if necessary, use \"pci=%s\" and report a bug\n" , pci_use_crs ?"Using" :"Ignoring" , pci_use_crs ? "nocrs" : "use_crs"); + +/* +* Some BIOS-es contain a bug where they add addresses which map to +* system RAM in the PCI host bridge window returned by the ACPI _CRS +* method, see commit 4dc2287c1805 ("x86: avoid E820 regions when +* allocating address space"). To avoid this Linux by default excludes +* E820 reservations when allocating addresses since 2010. +* In 2020 some systems have shown-up with E820 reservations which cover +* the entire _CRS returned PCI host bridge window, causing all attempts +* to assign memory to PCI BARs to fail if Linux uses E820 reservations. +* +* Ideally Linux would fully stop using E820 reservations, but then +* the old systems this was added for will regress. +* Instead keep the old behavior for old systems, while ignoring the +* E820 reservations for any systems from now on. +*/ +if (year >=0 && year <2018 ) + pci_use_e820 = true; + +if (pci_probe &PCI_NO_E820 ) + pci_use_e820 = false; +else if (pci_probe &PCI_USE_E820 ) + pci_use_e820 = true; + +printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Using" :"Ignoring" ); }#ifdef CONFIG_PCI_MMCONFIG arch/x86/pci/common.c +6
-0@@ -595,6 +595,12 @@ char *__init pcibios_setup(char *str) }else if (!strcmp (str,"nocrs" )) { pci_probe |=PCI_ROOT_NO_CRS ;return NULL ; + }else if (!strcmp (str,"use_e820" )) { + pci_probe |=PCI_USE_E820 ; +return NULL ; + }else if (!strcmp (str,"no_e820" )) { + pci_probe |=PCI_NO_E820 ; +return NULL ; #ifdef CONFIG_PHYS_ADDR_T_64BIT }else if (!strcmp (str,"big_root_window" )) { pci_probe |=PCI_BIG_ROOT_WINDOW ;Signature · 1 line
2.31.1
Hi,
Quoted 72 lines · Bjorn Helgaas
Quoted 57 lines · Hans de Goede
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI host bridge window returned by the ACPI
_CRSmethod, see commit4dc2287c1805("x86: avoid E820 regions when allocating address space").To work around this bug Linux excludes E820 reserved addresses when allocating addresses from the PCI host bridge window since 2010.
Recently (2020) some systems have shown-up with E820 reservations which cover the entire
_CRSreturned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:[mem 0x000000004bc50000-0x00000000cfffffff] reserved
pci_bus0000:00: root bus resource [mem 0x65400000-0xbfffffff window]The ACPI specifications appear to allow this new behavior:
The relationship between E820 and ACPI
_CRSis not really very clear. ACPI v6.3, sec 15, table 15-374, says AddressRangeReserved means:This range of addresses is in use or reserved by the system and is not to be included in the allocatable memory pool of the operating system's memory manager.
and it may be used when:
The address range is in use by a memory-mapped system device.
Furthermore, sec 15.2 says:
Address ranges defined for baseboard memory-mapped I/O devices, such as APICs, are returned as reserved.
A PCI host bridge qualifies as a baseboard memory-mapped I/O device, and its apertures are in use and certainly should not be included in the general allocatable pool, so the fact that some BIOS-es reports the PCI aperture as "reserved" in E820 doesn't seem like a BIOS bug.
So it seems that the excluding of E820 reserved addresses is a mistake.
Ideally Linux would fully stop excluding E820 reserved addresses, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that
pci_use_e820will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
Quoted 13 lines
Cc Benoit Grégoire <[email protected]>Cc Hui Wang <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Signed-off-by Hans de Goede <[email protected]>
Quoted 1 line
Acked-by Bjorn Helgaas <[email protected]>
Thank you.
Regards,
Hans
Quoted 182 lines
I'm sorry we have to add more ugliness because of my mistake in
4dc2287c1805, but I don't see a better option.Quoted 177 lines
---
Changes in v5:
- Drop mention of Windows behavior from the commit msg, replace with a reference to the specs
- Improve documentation inDocumentation/admin-guide/kernel-parameters.txt
- Reword the big comment added, use "PCI host bridge window" in it and drop all refences to WindowsChanges in v4:
- Rewrap the big comment block to fit in 80 columns
- Add Rafael's Acked-by
- Add Cc: [email protected]Changes in v3:
- Commit msg tweaks (drop dmesg timestamps, typo fix)
- Use "defined(CONFIG_...)" instead of "definedCONFIG_..."
- Add Mika's Reviewed-byChanges in v2:
- Replace the per model DMI quirk approach with disabling E820 reservations checking for all systems with a BIOS year >= 2018
- Add documentation for the new kernel-parameters toDocumentation/admin-guide/kernel-parameters.txt
---
Other patches trying to address the same issue:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
V1 patch:
https://lore.kernel.org/r/[email protected]--- .../admin-guide/kernel-parameters.txt | 9 ++++++ arch/x86/include/asm/pci_x86.h | 10 +++++++ arch/x86/kernel/resource.c | 4 +++ arch/x86/pci/acpi.c | 28 +++++++++++++++++++ arch/x86/pci/common.c | 6 ++++ 5 files changed, 57 insertions(+)Documentation/admin-guide/kernel-parameters.txt +9
-0@@ -3949,6 +3949,15 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. + use_e820 [X86] Use E820 reservations to exclude parts of + PCI host bridge windows. This is a workaround + for BIOS defects in host bridge _CRS methods. + If you need to use this, please report a bug to + <[email protected]>. + no_e820 [X86] Ignore E820 reservations for PCI host + bridge windows. This is the default on modern + hardware. If you need to use this, please report + a bug to <[email protected]>. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaroundarch/x86/include/asm/pci_x86.h +10
-0@@ -39,6 +39,8 @@ do { \#define PCI_ROOT_NO_CRS 0x100000#define PCI_NOASSIGN_BARS 0x200000#define PCI_BIG_ROOT_WINDOW 0x400000 +#define PCI_USE_E820 0x800000 +#define PCI_NO_E820 0x1000000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;@@ -64,6 +66,8 @@ void pcibios_scan_specific_bus(int busn);/* pci-irq.c */ +struct pci_dev ; +struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct {@@ -232,3 +236,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)# define x86_default_pci_init_irq NULL# define x86_default_pci_fixup_irqs NULL#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_ACPI ) +extern bool pci_use_e820; +#else +#define pci_use_e820 false +#endif arch/x86/kernel/resource.c +4
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/ioport.h> #include <asm/e820/api.h> +#include <asm/pci_x86.h> static void resource_clip (struct resource *res,resource_size_t start,resource_size_t end)@@ -28,6 +29,9 @@ static void remove_e820_regions(struct resource *avail)int i;struct e820_entry *entry; +if (!pci_use_e820) +return ; +for (i =0 ; i < e820_table->nr_entries; i++) { entry = &e820_table->entries[i];arch/x86/pci/acpi.c +28
-0@@ -21,6 +21,8 @@ struct pci_root_info {static bool pci_use_crs = true;static bool pci_ignore_seg = false; +/* Consumed in arch/x86/kernel/resource.c */ +bool pci_use_e820 = false;static int __init set_use_crs (const struct dmi_system_id *id) {@@ -160,6 +162,32 @@ void __init pci_acpi_crs_quirks(void)"if necessary, use \"pci=%s\" and report a bug\n" , pci_use_crs ?"Using" :"Ignoring" , pci_use_crs ? "nocrs" : "use_crs"); + +/* +* Some BIOS-es contain a bug where they add addresses which map to +* system RAM in the PCI host bridge window returned by the ACPI _CRS +* method, see commit 4dc2287c1805 ("x86: avoid E820 regions when +* allocating address space"). To avoid this Linux by default excludes +* E820 reservations when allocating addresses since 2010. +* In 2020 some systems have shown-up with E820 reservations which cover +* the entire _CRS returned PCI host bridge window, causing all attempts +* to assign memory to PCI BARs to fail if Linux uses E820 reservations. +* +* Ideally Linux would fully stop using E820 reservations, but then +* the old systems this was added for will regress. +* Instead keep the old behavior for old systems, while ignoring the +* E820 reservations for any systems from now on. +*/ +if (year >=0 && year <2018 ) + pci_use_e820 = true; + +if (pci_probe &PCI_NO_E820 ) + pci_use_e820 = false; +else if (pci_probe &PCI_USE_E820 ) + pci_use_e820 = true; + +printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Using" :"Ignoring" ); }#ifdef CONFIG_PCI_MMCONFIG arch/x86/pci/common.c +6
-0@@ -595,6 +595,12 @@ char *__init pcibios_setup(char *str) }else if (!strcmp (str,"nocrs" )) { pci_probe |=PCI_ROOT_NO_CRS ;return NULL ; + }else if (!strcmp (str,"use_e820" )) { + pci_probe |=PCI_USE_E820 ; +return NULL ; + }else if (!strcmp (str,"no_e820" )) { + pci_probe |=PCI_NO_E820 ; +return NULL ; #ifdef CONFIG_PHYS_ADDR_T_64BIT }else if (!strcmp (str,"big_root_window" )) { pci_probe |=PCI_BIG_ROOT_WINDOW ;Signature · 1 line
2.31.1
Quoted 57 lines · Hans de Goede
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI host bridge window returned by the ACPI
_CRSmethod, see commit4dc2287c1805("x86: avoid E820 regions when allocating address space").To work around this bug Linux excludes E820 reserved addresses when allocating addresses from the PCI host bridge window since 2010.
Recently (2020) some systems have shown-up with E820 reservations which cover the entire
_CRSreturned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:[mem 0x000000004bc50000-0x00000000cfffffff] reserved
pci_bus0000:00: root bus resource [mem 0x65400000-0xbfffffff window]The ACPI specifications appear to allow this new behavior:
The relationship between E820 and ACPI
_CRSis not really very clear. ACPI v6.3, sec 15, table 15-374, says AddressRangeReserved means:This range of addresses is in use or reserved by the system and is not to be included in the allocatable memory pool of the operating system's memory manager.
and it may be used when:
The address range is in use by a memory-mapped system device.
Furthermore, sec 15.2 says:
Address ranges defined for baseboard memory-mapped I/O devices, such as APICs, are returned as reserved.
A PCI host bridge qualifies as a baseboard memory-mapped I/O device, and its apertures are in use and certainly should not be included in the general allocatable pool, so the fact that some BIOS-es reports the PCI aperture as "reserved" in E820 doesn't seem like a BIOS bug.
So it seems that the excluding of E820 reserved addresses is a mistake.
Ideally Linux would fully stop excluding E820 reserved addresses, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that
pci_use_e820will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
Quoted 13 lines
Cc Benoit Grégoire <[email protected]>Cc Hui Wang <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Signed-off-by Hans de Goede <[email protected]>
I haven't seen anybody else eager to merge this, so I guess I'll stick my neck out here.
I applied this to my for-linus branch for v5.15.
Quoted 177 lines
---
Changes in v5:
- Drop mention of Windows behavior from the commit msg, replace with a reference to the specs
- Improve documentation inDocumentation/admin-guide/kernel-parameters.txt
- Reword the big comment added, use "PCI host bridge window" in it and drop all refences to WindowsChanges in v4:
- Rewrap the big comment block to fit in 80 columns
- Add Rafael's Acked-by
- Add Cc: [email protected]Changes in v3:
- Commit msg tweaks (drop dmesg timestamps, typo fix)
- Use "defined(CONFIG_...)" instead of "definedCONFIG_..."
- Add Mika's Reviewed-byChanges in v2:
- Replace the per model DMI quirk approach with disabling E820 reservations checking for all systems with a BIOS year >= 2018
- Add documentation for the new kernel-parameters toDocumentation/admin-guide/kernel-parameters.txt
---
Other patches trying to address the same issue:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
V1 patch:
https://lore.kernel.org/r/[email protected]--- .../admin-guide/kernel-parameters.txt | 9 ++++++ arch/x86/include/asm/pci_x86.h | 10 +++++++ arch/x86/kernel/resource.c | 4 +++ arch/x86/pci/acpi.c | 28 +++++++++++++++++++ arch/x86/pci/common.c | 6 ++++ 5 files changed, 57 insertions(+)Documentation/admin-guide/kernel-parameters.txt +9
-0@@ -3949,6 +3949,15 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. + use_e820 [X86] Use E820 reservations to exclude parts of + PCI host bridge windows. This is a workaround + for BIOS defects in host bridge _CRS methods. + If you need to use this, please report a bug to + <[email protected]>. + no_e820 [X86] Ignore E820 reservations for PCI host + bridge windows. This is the default on modern + hardware. If you need to use this, please report + a bug to <[email protected]>. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaroundarch/x86/include/asm/pci_x86.h +10
-0@@ -39,6 +39,8 @@ do { \#define PCI_ROOT_NO_CRS 0x100000#define PCI_NOASSIGN_BARS 0x200000#define PCI_BIG_ROOT_WINDOW 0x400000 +#define PCI_USE_E820 0x800000 +#define PCI_NO_E820 0x1000000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;@@ -64,6 +66,8 @@ void pcibios_scan_specific_bus(int busn);/* pci-irq.c */ +struct pci_dev ; +struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct {@@ -232,3 +236,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)# define x86_default_pci_init_irq NULL# define x86_default_pci_fixup_irqs NULL#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_ACPI ) +extern bool pci_use_e820; +#else +#define pci_use_e820 false +#endif arch/x86/kernel/resource.c +4
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/ioport.h> #include <asm/e820/api.h> +#include <asm/pci_x86.h> static void resource_clip (struct resource *res,resource_size_t start,resource_size_t end)@@ -28,6 +29,9 @@ static void remove_e820_regions(struct resource *avail)int i;struct e820_entry *entry; +if (!pci_use_e820) +return ; +for (i =0 ; i < e820_table->nr_entries; i++) { entry = &e820_table->entries[i];arch/x86/pci/acpi.c +28
-0@@ -21,6 +21,8 @@ struct pci_root_info {static bool pci_use_crs = true;static bool pci_ignore_seg = false; +/* Consumed in arch/x86/kernel/resource.c */ +bool pci_use_e820 = false;static int __init set_use_crs (const struct dmi_system_id *id) {@@ -160,6 +162,32 @@ void __init pci_acpi_crs_quirks(void)"if necessary, use \"pci=%s\" and report a bug\n" , pci_use_crs ?"Using" :"Ignoring" , pci_use_crs ? "nocrs" : "use_crs"); + +/* +* Some BIOS-es contain a bug where they add addresses which map to +* system RAM in the PCI host bridge window returned by the ACPI _CRS +* method, see commit 4dc2287c1805 ("x86: avoid E820 regions when +* allocating address space"). To avoid this Linux by default excludes +* E820 reservations when allocating addresses since 2010. +* In 2020 some systems have shown-up with E820 reservations which cover +* the entire _CRS returned PCI host bridge window, causing all attempts +* to assign memory to PCI BARs to fail if Linux uses E820 reservations. +* +* Ideally Linux would fully stop using E820 reservations, but then +* the old systems this was added for will regress. +* Instead keep the old behavior for old systems, while ignoring the +* E820 reservations for any systems from now on. +*/ +if (year >=0 && year <2018 ) + pci_use_e820 = true; + +if (pci_probe &PCI_NO_E820 ) + pci_use_e820 = false; +else if (pci_probe &PCI_USE_E820 ) + pci_use_e820 = true; + +printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Using" :"Ignoring" ); }#ifdef CONFIG_PCI_MMCONFIG arch/x86/pci/common.c +6
-0@@ -595,6 +595,12 @@ char *__init pcibios_setup(char *str) }else if (!strcmp (str,"nocrs" )) { pci_probe |=PCI_ROOT_NO_CRS ;return NULL ; + }else if (!strcmp (str,"use_e820" )) { + pci_probe |=PCI_USE_E820 ; +return NULL ; + }else if (!strcmp (str,"no_e820" )) { + pci_probe |=PCI_NO_E820 ; +return NULL ; #ifdef CONFIG_PHYS_ADDR_T_64BIT }else if (!strcmp (str,"big_root_window" )) { pci_probe |=PCI_BIG_ROOT_WINDOW ;Signature · 1 line
2.31.1
Quoted 72 lines · Bjorn Helgaas
Quoted 57 lines · Hans de Goede
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI host bridge window returned by the ACPI
_CRSmethod, see commit4dc2287c1805("x86: avoid E820 regions when allocating address space").To work around this bug Linux excludes E820 reserved addresses when allocating addresses from the PCI host bridge window since 2010.
Recently (2020) some systems have shown-up with E820 reservations which cover the entire
_CRSreturned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:[mem 0x000000004bc50000-0x00000000cfffffff] reserved
pci_bus0000:00: root bus resource [mem 0x65400000-0xbfffffff window]The ACPI specifications appear to allow this new behavior:
The relationship between E820 and ACPI
_CRSis not really very clear. ACPI v6.3, sec 15, table 15-374, says AddressRangeReserved means:This range of addresses is in use or reserved by the system and is not to be included in the allocatable memory pool of the operating system's memory manager.
and it may be used when:
The address range is in use by a memory-mapped system device.
Furthermore, sec 15.2 says:
Address ranges defined for baseboard memory-mapped I/O devices, such as APICs, are returned as reserved.
A PCI host bridge qualifies as a baseboard memory-mapped I/O device, and its apertures are in use and certainly should not be included in the general allocatable pool, so the fact that some BIOS-es reports the PCI aperture as "reserved" in E820 doesn't seem like a BIOS bug.
So it seems that the excluding of E820 reserved addresses is a mistake.
Ideally Linux would fully stop excluding E820 reserved addresses, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that
pci_use_e820will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
Quoted 13 lines
Cc Benoit Grégoire <[email protected]>Cc Hui Wang <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Signed-off-by Hans de Goede <[email protected]>
Quoted 4 lines
I haven't seen anybody else eager to merge this, so I guess I'll stick my neck out here.
I applied this to my for-linus branch for v5.15.
(I only applied patch 1/2, to fix the PCI BAR assignments. The 2/2 patch to convert printk to pr_info might be nice, but definitely not -rc7 material. I'm hesitant enough about 1/2.)
<note this is a resend to see if some bounces which I was getting
from vger are resolved, please ignore>
Hi,
Quoted 72 lines · Bjorn Helgaas
Quoted 57 lines · Hans de Goede
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI host bridge window returned by the ACPI
_CRSmethod, see commit4dc2287c1805("x86: avoid E820 regions when allocating address space").To work around this bug Linux excludes E820 reserved addresses when allocating addresses from the PCI host bridge window since 2010.
Recently (2020) some systems have shown-up with E820 reservations which cover the entire
_CRSreturned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:[mem 0x000000004bc50000-0x00000000cfffffff] reserved
pci_bus0000:00: root bus resource [mem 0x65400000-0xbfffffff window]The ACPI specifications appear to allow this new behavior:
The relationship between E820 and ACPI
_CRSis not really very clear. ACPI v6.3, sec 15, table 15-374, says AddressRangeReserved means:This range of addresses is in use or reserved by the system and is not to be included in the allocatable memory pool of the operating system's memory manager.
and it may be used when:
The address range is in use by a memory-mapped system device.
Furthermore, sec 15.2 says:
Address ranges defined for baseboard memory-mapped I/O devices, such as APICs, are returned as reserved.
A PCI host bridge qualifies as a baseboard memory-mapped I/O device, and its apertures are in use and certainly should not be included in the general allocatable pool, so the fact that some BIOS-es reports the PCI aperture as "reserved" in E820 doesn't seem like a BIOS bug.
So it seems that the excluding of E820 reserved addresses is a mistake.
Ideally Linux would fully stop excluding E820 reserved addresses, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that
pci_use_e820will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
Quoted 13 lines
Cc Benoit Grégoire <[email protected]>Cc Hui Wang <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Signed-off-by Hans de Goede <[email protected]>
Quoted 4 lines
I haven't seen anybody else eager to merge this, so I guess I'll stick my neck out here.
I applied this to my for-linus branch for v5.15.
Thank you, and sorry about the build-errors which the lkp kernel-test-robot found.
I've just send out a patch which fixes these build-errors (verified with both .config-s from the lkp reports). Feel free to squash this into the original patch (or keep them separate, whatever works for you).
Regards,
Hans
Quoted 178 lines
Quoted 177 lines
---
Changes in v5:
- Drop mention of Windows behavior from the commit msg, replace with a reference to the specs
- Improve documentation inDocumentation/admin-guide/kernel-parameters.txt
- Reword the big comment added, use "PCI host bridge window" in it and drop all refences to WindowsChanges in v4:
- Rewrap the big comment block to fit in 80 columns
- Add Rafael's Acked-by
- Add Cc: [email protected]Changes in v3:
- Commit msg tweaks (drop dmesg timestamps, typo fix)
- Use "defined(CONFIG_...)" instead of "definedCONFIG_..."
- Add Mika's Reviewed-byChanges in v2:
- Replace the per model DMI quirk approach with disabling E820 reservations checking for all systems with a BIOS year >= 2018
- Add documentation for the new kernel-parameters toDocumentation/admin-guide/kernel-parameters.txt
---
Other patches trying to address the same issue:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
V1 patch:
https://lore.kernel.org/r/[email protected]--- .../admin-guide/kernel-parameters.txt | 9 ++++++ arch/x86/include/asm/pci_x86.h | 10 +++++++ arch/x86/kernel/resource.c | 4 +++ arch/x86/pci/acpi.c | 28 +++++++++++++++++++ arch/x86/pci/common.c | 6 ++++ 5 files changed, 57 insertions(+)Documentation/admin-guide/kernel-parameters.txt +9
-0@@ -3949,6 +3949,15 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. + use_e820 [X86] Use E820 reservations to exclude parts of + PCI host bridge windows. This is a workaround + for BIOS defects in host bridge _CRS methods. + If you need to use this, please report a bug to + <[email protected]>. + no_e820 [X86] Ignore E820 reservations for PCI host + bridge windows. This is the default on modern + hardware. If you need to use this, please report + a bug to <[email protected]>. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaroundarch/x86/include/asm/pci_x86.h +10
-0@@ -39,6 +39,8 @@ do { \#define PCI_ROOT_NO_CRS 0x100000#define PCI_NOASSIGN_BARS 0x200000#define PCI_BIG_ROOT_WINDOW 0x400000 +#define PCI_USE_E820 0x800000 +#define PCI_NO_E820 0x1000000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;@@ -64,6 +66,8 @@ void pcibios_scan_specific_bus(int busn);/* pci-irq.c */ +struct pci_dev ; +struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct {@@ -232,3 +236,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)# define x86_default_pci_init_irq NULL# define x86_default_pci_fixup_irqs NULL#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_ACPI ) +extern bool pci_use_e820; +#else +#define pci_use_e820 false +#endif arch/x86/kernel/resource.c +4
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/ioport.h> #include <asm/e820/api.h> +#include <asm/pci_x86.h> static void resource_clip (struct resource *res,resource_size_t start,resource_size_t end)@@ -28,6 +29,9 @@ static void remove_e820_regions(struct resource *avail)int i;struct e820_entry *entry; +if (!pci_use_e820) +return ; +for (i =0 ; i < e820_table->nr_entries; i++) { entry = &e820_table->entries[i];arch/x86/pci/acpi.c +28
-0@@ -21,6 +21,8 @@ struct pci_root_info {static bool pci_use_crs = true;static bool pci_ignore_seg = false; +/* Consumed in arch/x86/kernel/resource.c */ +bool pci_use_e820 = false;static int __init set_use_crs (const struct dmi_system_id *id) {@@ -160,6 +162,32 @@ void __init pci_acpi_crs_quirks(void)"if necessary, use \"pci=%s\" and report a bug\n" , pci_use_crs ?"Using" :"Ignoring" , pci_use_crs ? "nocrs" : "use_crs"); + +/* +* Some BIOS-es contain a bug where they add addresses which map to +* system RAM in the PCI host bridge window returned by the ACPI _CRS +* method, see commit 4dc2287c1805 ("x86: avoid E820 regions when +* allocating address space"). To avoid this Linux by default excludes +* E820 reservations when allocating addresses since 2010. +* In 2020 some systems have shown-up with E820 reservations which cover +* the entire _CRS returned PCI host bridge window, causing all attempts +* to assign memory to PCI BARs to fail if Linux uses E820 reservations. +* +* Ideally Linux would fully stop using E820 reservations, but then +* the old systems this was added for will regress. +* Instead keep the old behavior for old systems, while ignoring the +* E820 reservations for any systems from now on. +*/ +if (year >=0 && year <2018 ) + pci_use_e820 = true; + +if (pci_probe &PCI_NO_E820 ) + pci_use_e820 = false; +else if (pci_probe &PCI_USE_E820 ) + pci_use_e820 = true; + +printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Using" :"Ignoring" ); }#ifdef CONFIG_PCI_MMCONFIG arch/x86/pci/common.c +6
-0@@ -595,6 +595,12 @@ char *__init pcibios_setup(char *str) }else if (!strcmp (str,"nocrs" )) { pci_probe |=PCI_ROOT_NO_CRS ;return NULL ; + }else if (!strcmp (str,"use_e820" )) { + pci_probe |=PCI_USE_E820 ; +return NULL ; + }else if (!strcmp (str,"no_e820" )) { + pci_probe |=PCI_NO_E820 ; +return NULL ; #ifdef CONFIG_PHYS_ADDR_T_64BIT }else if (!strcmp (str,"big_root_window" )) { pci_probe |=PCI_BIG_ROOT_WINDOW ;Signature · 1 line
2.31.1
PATCH v5 2/2 x86/PCI/ACPI: Replace printk calls with pr_info/pr_warn calls
In reply to Hans de GoedeThe direct use of printk is deprecated, replace the printk calls in arch/x86/pci/acpi.c with pr_info/pr_warn calls.
---
Changes in v5:
- Rebase on v5 of:
"x86/PCI: Ignore E820 reservations for bridge windows on newer systems" and send it out as part of a series instead of as a stand-alone patch
- Add Rafael's Acked-by
--- arch/x86/pci/acpi.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
arch/x86/pci/acpi.c +13 -12
@@ -1,4 +1,7 @@// SPDX-License-Identifier: GPL-2.0 + +#define pr_fmt (fmt) "PCI: " fmt +#include <linux/pci.h> #include <linux/acpi.h> #include <linux/init.h>
@@ -38,7 +41,7 @@ static int __init set_nouse_crs(const struct dmi_system_id *id)static int __init set_ignore_seg (const struct dmi_system_id *id) { -printk (KERN_INFO "PCI: %s detected: ignoring ACPI _SEG\n" , id->ident); +pr_info ("%s detected: ignoring ACPI _SEG\n" , id->ident); pci_ignore_seg = true;return 0 ; }
@@ -158,10 +161,9 @@ void __init pci_acpi_crs_quirks(void)else if (pci_probe &PCI_USE__CRS ) pci_use_crs = true; -printk (KERN_INFO "PCI: %s host bridge windows from ACPI; " -"if necessary, use \"pci=%s\" and report a bug\n" , - pci_use_crs ?"Using" :"Ignoring" , - pci_use_crs ?"nocrs" :"use_crs" ); +pr_info ("%s host bridge windows from ACPI; if necessary, use \"pci=%s\" and report a bug\n" , + pci_use_crs ?"Using" :"Ignoring" , + pci_use_crs ?"nocrs" :"use_crs" );/* * Some BIOS-es contain a bug where they add addresses which map to
@@ -186,8 +188,8 @@ void __init pci_acpi_crs_quirks(void)else if (pci_probe &PCI_USE_E820 ) pci_use_e820 = true; -printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , - pci_use_e820 ?"Using" :"Ignoring" ); +pr_info ("%s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Using" :"Ignoring" ); }#ifdef CONFIG_PCI_MMCONFIG
@@ -362,9 +364,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) root->segment = domain =0 ;if (domain && !pci_domains_supported) { -printk (KERN_WARNING "pci_bus %04x:%02x: " -"ignored (multiple domains not supported)\n" , - domain, busnum); +pr_warn ("pci_bus %04x:%02x: ignored (multiple domains not supported)\n" , + domain, busnum);return NULL ; }
@@ -432,7 +433,7 @@ int __init pci_acpi_init(void)if (acpi_noirq)return -ENODEV ; -printk (KERN_INFO "PCI: Using ACPI for IRQ routing\n" ); +pr_info ("Using ACPI for IRQ routing\n" );acpi_irq_penalty_init (); pcibios_enable_irq = acpi_pci_irq_enable; pcibios_disable_irq = acpi_pci_irq_disable;
@@ -444,7 +445,7 @@ int __init pci_acpi_init(void)* also do it here in case there are still broken drivers that * don't use pci_enable_device(). */ -printk (KERN_INFO "PCI: Routing PCI interrupts for all devices because \"pci=routeirq\" specified\n" ); +pr_info ("Routing PCI interrupts for all devices because \"pci=routeirq\" specified\n" );for_each_pci_dev (dev)acpi_pci_irq_enable (dev); }
Signature · 1 line
2.31.1