Pull pci fix from Bjorn Helgaas: "Revert clipping of PCI host bridge windows to avoid E820 regions, which broke several machines by forcing unnecessary BAR reassignments (Hans de Goede)" * tag 'pci-v5.19-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: x86/PCI: Revert "x86/PCI: Clip only host bridge windows for E820 regions"
Unified · Split
| @@ -4,9 +4,6 @@ · 3 unmodified lines | ||
| 4 | 4 | |
| 5 | 5 | #include <asm/e820/types.h> |
| 6 | 6 | |
| 7 | −struct device; | |
| 8 | −struct resource; | |
| 9 | − | |
| 10 | 7 | extern struct e820_table *e820_table; |
| 11 | 8 | extern struct e820_table *e820_table_kexec; |
| 12 | 9 | extern struct e820_table *e820_table_firmware; |
| @@ -46,8 +43,6 @@ extern void e820__register_nosave_regions(unsigned long limit_pfn); · 33 unmodified lines | ||
| 46 | 43 | |
| 47 | 44 | extern int e820__get_entry_type(u64 start, u64 end); |
| 48 | 45 | |
| 49 | −extern void remove_e820_regions(struct device *dev, struct resource *avail); | |
| 50 | − | |
| 51 | 46 | /* |
| 52 | 47 | * Returns true iff the specified range [start,end) is completely contained inside |
| 53 | 48 | * the ISA region. |
| @@ -69,6 +69,8 @@ void pcibios_scan_specific_bus(int busn); · 68 unmodified lines | ||
| 69 | 69 | |
| 70 | 70 | /* pci-irq.c */ |
| 71 | 71 | |
| 72 | +struct pci_dev; | |
| 73 | + | |
| 72 | 74 | struct irq_info { |
| 73 | 75 | u8 bus, devfn; /* Bus, device and function */ |
| 74 | 76 | struct { |
| @@ -246,3 +248,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val) · 171 unmodified lines | ||
| 246 | 248 | # define x86_default_pci_init_irq NULL |
| 247 | 249 | # define x86_default_pci_fixup_irqs NULL |
| 248 | 250 | #endif |
| 251 | + | |
| 252 | +#if defined(CONFIG_PCI) && defined(CONFIG_ACPI) | |
| 253 | +extern bool pci_use_e820; | |
| 254 | +#else | |
| 255 | +#define pci_use_e820 false | |
| 256 | +#endif | |
| @@ -1,7 +1,8 @@ | ||
| 1 | 1 | // SPDX-License-Identifier: GPL-2.0 |
| 2 | −#include <linux/dev_printk.h> | |
| 3 | 2 | #include <linux/ioport.h> |
| 3 | +#include <linux/printk.h> | |
| 4 | 4 | #include <asm/e820/api.h> |
| 5 | +#include <asm/pci_x86.h> | |
| 5 | 6 | |
| 6 | 7 | static void resource_clip(struct resource *res, resource_size_t start, |
| 7 | 8 | resource_size_t end) |
| @@ -24,14 +25,14 @@ static void resource_clip(struct resource *res, resource_size_t start, · 16 unmodified lines | ||
| 24 | 25 | res->start = end + 1; |
| 25 | 26 | } |
| 26 | 27 | |
| 27 | −void remove_e820_regions(struct device *dev, struct resource *avail) | |
| 28 | +static void remove_e820_regions(struct resource *avail) | |
| 28 | 29 | { |
| 29 | 30 | int i; |
| 30 | 31 | struct e820_entry *entry; |
| 31 | 32 | u64 e820_start, e820_end; |
| 32 | 33 | struct resource orig = *avail; |
| 33 | 34 | |
| 34 | − if (!(avail->flags & IORESOURCE_MEM)) | |
| 35 | + if (!pci_use_e820) | |
| 35 | 36 | return; |
| 36 | 37 | |
| 37 | 38 | for (i = 0; i < e820_table->nr_entries; i++) { |
| @@ -41,7 +42,7 @@ void remove_e820_regions(struct device *dev, struct resource *avail) · 3 unmodified lines | ||
| 41 | 42 | |
| 42 | 43 | resource_clip(avail, e820_start, e820_end); |
| 43 | 44 | if (orig.start != avail->start || orig.end != avail->end) { |
| 44 | − dev_info(dev, "clipped %pR to %pR for e820 entry [mem %#010Lx-%#010Lx]\n", | |
| 45 | + pr_info("clipped %pR to %pR for e820 entry [mem %#010Lx-%#010Lx]\n", | |
| 45 | 46 | &orig, avail, e820_start, e820_end); |
| 46 | 47 | orig = *avail; |
| 47 | 48 | } |
| @@ -55,6 +56,9 @@ void arch_remove_reservations(struct resource *avail) · 7 unmodified lines | ||
| 55 | 56 | * the low 1MB unconditionally, as this area is needed for some ISA |
| 56 | 57 | * cards requiring a memory range, e.g. the i82365 PCMCIA controller. |
| 57 | 58 | */ |
| 58 | − if (avail->flags & IORESOURCE_MEM) | |
| 59 | + if (avail->flags & IORESOURCE_MEM) { | |
| 59 | 60 | resource_clip(avail, BIOS_ROM_BASE, BIOS_ROM_END); |
| 61 | + | |
| 62 | + remove_e820_regions(avail); | |
| 63 | + } | |
| 60 | 64 | } |
| @@ -8,7 +8,6 @@ · 7 unmodified lines | ||
| 8 | 8 | #include <linux/pci-acpi.h> |
| 9 | 9 | #include <asm/numa.h> |
| 10 | 10 | #include <asm/pci_x86.h> |
| 11 | −#include <asm/e820/api.h> | |
| 12 | 11 | |
| 13 | 12 | struct pci_root_info { |
| 14 | 13 | struct acpi_pci_root_info common; |
| @@ -20,7 +19,7 @@ struct pci_root_info { · 5 unmodified lines | ||
| 20 | 19 | #endif |
| 21 | 20 | }; |
| 22 | 21 | |
| 23 | −static bool pci_use_e820 = true; | |
| 22 | +bool pci_use_e820 = true; | |
| 24 | 23 | static bool pci_use_crs = true; |
| 25 | 24 | static bool pci_ignore_seg; |
| 26 | 25 | |
| @@ -387,11 +386,6 @@ static int pci_acpi_root_prepare_resources(struct acpi_pci_root_info *ci) · 360 unmodified lines | ||
| 387 | 386 | |
| 388 | 387 | status = acpi_pci_probe_root_resources(ci); |
| 389 | 388 | |
| 390 | − if (pci_use_e820) { | |
| 391 | − resource_list_for_each_entry(entry, &ci->resources) | |
| 392 | − remove_e820_regions(&device->dev, entry->res); | |
| 393 | − } | |
| 394 | − | |
| 395 | 389 | if (pci_use_crs) { |
| 396 | 390 | resource_list_for_each_entry_safe(entry, tmp, &ci->resources) |
| 397 | 391 | if (resource_is_pcicfg_ioport(entry->res)) |