update patches for Ubuntu-5.13.0-17.17

[pve-kernel.git] / patches / kernel / 0008-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch

diff --git a/patches/kernel/0008-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch b/patches/kernel/0008-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch
index a3eb9a71f53fc3328511a466ed4ff87b8048a9a5..1cd38d8c15f0409b1c4a7e6977f56a530d1f4366 100644 (file)
--- a/patches/kernel/0008-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch
+++ b/patches/kernel/0008-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch
@@ -1,24 +1,22 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Mon, 2 Aug 2021 10:22:30 +0200
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Mon, 27 Sep 2021 11:28:39 +0200
 Subject: [PATCH] Revert "PCI: Coalesce host bridge contiguous apertures"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
 
-This reverts commit c2ff8072deba40887560dc73dd2e558ec539ea09.
+This reverts commit ab20e43b20b60f5cc8e2ea3763ffa388158469ac.
 
 was reverted upstream because of reports similar to
 
 Link: https://bugzilla.proxmox.com/show_bug.cgi?id=3552
 Link: https://lore.kernel.org/r/20210709231529.GA3270116@roeck-us.net
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- drivers/pci/probe.c | 49 ++++-----------------------------------------
- 1 file changed, 4 insertions(+), 45 deletions(-)
+ drivers/pci/probe.c | 52 +++++----------------------------------------
+ 1 file changed, 5 insertions(+), 47 deletions(-)
 
 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index 04664d4fe4be..be51670572fa 100644
+index f6046a16dac1..275204646c68 100644
 --- a/drivers/pci/probe.c
 +++ b/drivers/pci/probe.c
 @@ -19,7 +19,6 @@
@@ -29,11 +27,12 @@ index 04664d4fe4be..be51670572fa 100644
  #include "pci.h"
  
  #define CARDBUS_LATENCY_TIMER 176     /* secondary latency timer */
-@@ -875,30 +874,14 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus)
+@@ -875,31 +874,14 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus)
        dev_set_msi_domain(&bus->dev, d);
  }
  
--static int res_cmp(void *priv, struct list_head *a, struct list_head *b)
+-static int res_cmp(void *priv, const struct list_head *a,
+-                 const struct list_head *b)
 -{
 -      struct resource_entry *entry1, *entry2;
 -
@@ -63,7 +62,7 @@ index 04664d4fe4be..be51670572fa 100644
        char addr[64], *fmt;
        const char *name;
        int err;
-@@ -976,35 +959,11 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
+@@ -979,35 +961,11 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
        if (nr_node_ids > 1 && pcibus_to_node(bus) == NUMA_NO_NODE)
                dev_warn(&bus->dev, "Unknown NUMA node; performance will be reduced\n");
  
@@ -90,13 +89,14 @@ index 04664d4fe4be..be51670572fa 100644
 -
        /* Add initial resources to the bus */
        resource_list_for_each_entry_safe(window, n, &resources) {
-+              list_move_tail(&window->node, &bridge->windows);
-               offset = window->offset;
-               res = window->res;
+-              offset = window->offset;
+-              res = window->res;
 -              if (!res->end)
 -                      continue;
 -
--              list_move_tail(&window->node, &bridge->windows);
+               list_move_tail(&window->node, &bridge->windows);
++              offset = window->offset;
++              res = window->res;
  
                if (res->flags & IORESOURCE_BUS)
                        pci_bus_insert_busn_res(bus, bus->number, res->end);