From 0cf21a2707d13bea1b9714887c1dc48e46c76542 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sun, 7 Nov 2021 21:45:46 +0100 Subject: [PATCH] update sources to Ubuntu-5.11.0-41.45 and rebase patches Signed-off-by: Thomas Lamprecht --- ...ides-for-missing-ACS-capabilities-4..patch | 6 ++--- ...lock-level-reissue-off-completion-pa.patch | 5 ++-- ...sce-host-bridge-contiguous-apertures.patch | 23 +++++++++++-------- ...I-Coalesce-host-bridge-contiguous-ap.patch | 14 ++++++----- submodules/ubuntu-hirsute | 2 +- 5 files changed, 28 insertions(+), 22 deletions(-) diff --git a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index e384ec1..57967fd 100644 --- a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -75,7 +75,7 @@ index ee85be64b680..a38a8e44422e 100644 Safety option to keep boot IRQs enabled. This should never be necessary. diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 35d0734830f6..7aa9d54c9263 100644 +index 872cd0cecf6d..127401e15384 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void) @@ -185,8 +185,8 @@ index 35d0734830f6..7aa9d54c9263 100644 /* * Decoding should be disabled for a PCI device during BAR sizing to avoid * conflict. But doing so may cause problems on host bridge and perhaps other -@@ -4869,6 +4969,8 @@ static const struct pci_dev_acs_enabled { - { PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs }, +@@ -4886,6 +4986,8 @@ static const struct pci_dev_acs_enabled { + { PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs }, /* APM X-Gene */ { PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs }, + /* Enable overrides for missing ACS capabilities */ diff --git a/patches/kernel/0006-io_uring-don-t-block-level-reissue-off-completion-pa.patch b/patches/kernel/0006-io_uring-don-t-block-level-reissue-off-completion-pa.patch index 5cee9af..7835ae3 100644 --- a/patches/kernel/0006-io_uring-don-t-block-level-reissue-off-completion-pa.patch +++ b/patches/kernel/0006-io_uring-don-t-block-level-reissue-off-completion-pa.patch @@ -22,15 +22,16 @@ https://lore.kernel.org/io-uring/20210727165811.284510-3-axboe@kernel.dk/T/#u Originally-by: Jens Axboe [backport] Signed-off-by: Fabian Ebner +Signed-off-by: Thomas Lamprecht --- fs/io_uring.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/io_uring.c b/fs/io_uring.c -index d43626339a2d..32b9d5a56c8c 100644 +index b9353cf8aab9..50d1920d2536 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c -@@ -2744,6 +2744,13 @@ static bool io_rw_reissue(struct io_kiocb *req, long res) +@@ -2746,6 +2746,13 @@ static bool io_rw_reissue(struct io_kiocb *req, long res) if (percpu_ref_is_dying(&req->ctx->refs)) return false; diff --git a/patches/kernel/0007-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch b/patches/kernel/0007-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch index a3eb9a7..1c17010 100644 --- a/patches/kernel/0007-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch +++ b/patches/kernel/0007-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch @@ -13,12 +13,13 @@ 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 +Signed-off-by: Thomas Lamprecht --- - 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 b5fdf42c4c2a..be51670572fa 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -19,7 +19,6 @@ @@ -29,11 +30,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 +65,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) +@@ -977,35 +959,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 +92,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); diff --git a/patches/kernel/0008-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch b/patches/kernel/0008-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch index de41df8..e7b8dc3 100644 --- a/patches/kernel/0008-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch +++ b/patches/kernel/0008-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch @@ -50,9 +50,10 @@ Cc: Guenter Roeck Suggested-by: Bjorn Helgaas Signed-off-by: Kai-Heng Feng Signed-off-by: Fabian Grünbichler +Signed-off-by: Thomas Lamprecht --- - drivers/pci/probe.c | 31 +++++++++++++++++++++++++++---- - 1 file changed, 27 insertions(+), 4 deletions(-) + drivers/pci/probe.c | 33 ++++++++++++++++++++++++++++----- + 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index be51670572fa..133f5d2b189d 100644 @@ -99,13 +100,14 @@ index be51670572fa..133f5d2b189d 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); diff --git a/submodules/ubuntu-hirsute b/submodules/ubuntu-hirsute index 8001bf2..1d5dc96 160000 --- a/submodules/ubuntu-hirsute +++ b/submodules/ubuntu-hirsute @@ -1 +1 @@ -Subproject commit 8001bf2b7ed9f2f566da32a6d3e049d711b63a52 +Subproject commit 1d5dc9627fe2f51457548f44d1dcbbda26925d8a