From 7ffd90ef3eaa01fe720a2009307ab9ef01342ffb Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 14 Dec 2021 16:41:56 +0100 Subject: [PATCH] update to Ubuntu-5.15.0-14.14 Signed-off-by: Thomas Lamprecht --- ...-accept-an-alternate-timestamp-strin.patch | 4 ++-- ...ides-for-missing-ACS-capabilities-4..patch | 8 +++---- ...-default-dynamic-halt-polling-growth.patch | 4 ++-- ...de-unregister_netdevice-refcount-lea.patch | 4 ++-- ...sce-host-bridge-contiguous-apertures.patch | 21 ++++++++++--------- ...I-Coalesce-host-bridge-contiguous-ap.patch | 20 ++++++++++-------- ...ove-the-ERESTARTSYS-handling-in-blkd.patch | 8 +++---- submodules/ubuntu-jammy | 2 +- 8 files changed, 37 insertions(+), 34 deletions(-) diff --git a/patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch b/patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch index 2b6c981..84c3306 100644 --- a/patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch +++ b/patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch @@ -21,10 +21,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h -index a72b154de7b0..4dd111086466 100755 +index 6a2a04d92f42..6c9430ee1a09 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h -@@ -24,10 +24,14 @@ else +@@ -22,10 +22,14 @@ else VERSION=$KBUILD_BUILD_VERSION fi 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 191f3ab..996190d 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 @@ -55,10 +55,10 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 111 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 8deb4cd7b133..291885ea26dd 100644 +index 69a6eb5dbb90..bdb05853d6c9 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -3808,6 +3808,15 @@ +@@ -3902,6 +3902,15 @@ Also, it enforces the PCI Local Bus spec rule that those bits should be 0 in system reset events (useful for kexec/kdump cases). @@ -75,7 +75,7 @@ index 8deb4cd7b133..291885ea26dd 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 d44037a6e109..1f576ba148dd 100644 +index 993eff5d2e39..e76bfd054dba 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void) @@ -185,7 +185,7 @@ index d44037a6e109..1f576ba148dd 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 -@@ -4875,6 +4975,8 @@ static const struct pci_dev_acs_enabled { +@@ -4912,6 +5012,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 }, diff --git a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch index 00c6bba..a427665 100644 --- a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch +++ b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch @@ -13,10 +13,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c -index 3b316cb42554..71aba634a6a8 100644 +index ce1847bc898b..8f2f8db422b4 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c -@@ -78,7 +78,7 @@ module_param(halt_poll_ns, uint, 0644); +@@ -79,7 +79,7 @@ module_param(halt_poll_ns, uint, 0644); EXPORT_SYMBOL_GPL(halt_poll_ns); /* Default doubles per-vcpu halt_poll_ns. */ diff --git a/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch b/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch index 34046e3..d821b32 100644 --- a/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch +++ b/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch @@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c -index 156b44f35102..66014d76a61b 100644 +index 91f53eeb0e79..c0b35ed33b30 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -10521,7 +10521,7 @@ static void netdev_wait_allrefs(struct net_device *dev) +@@ -10518,7 +10518,7 @@ static void netdev_wait_allrefs(struct net_device *dev) if (refcnt != 1 && time_after(jiffies, warning_time + netdev_unregister_timeout_secs * HZ)) { diff --git a/patches/kernel/0006-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch b/patches/kernel/0006-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch index 632427d..561c918 100644 --- a/patches/kernel/0006-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch +++ b/patches/kernel/0006-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch @@ -15,14 +15,14 @@ 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 | 50 ++++----------------------------------------- - 1 file changed, 4 insertions(+), 46 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 f6046a16dac1..275204646c68 100644 +index e322907d1f3c..d9fc02a71baa 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c -@@ -19,7 +19,6 @@ +@@ -20,7 +20,6 @@ #include #include #include @@ -30,7 +30,7 @@ index f6046a16dac1..275204646c68 100644 #include "pci.h" #define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */ -@@ -875,31 +874,14 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus) +@@ -881,31 +880,14 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus) dev_set_msi_domain(&bus->dev, d); } @@ -65,7 +65,7 @@ index f6046a16dac1..275204646c68 100644 char addr[64], *fmt; const char *name; int err; -@@ -979,35 +961,11 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) +@@ -988,35 +970,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"); @@ -92,13 +92,14 @@ index f6046a16dac1..275204646c68 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/0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch b/patches/kernel/0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch index cc4bd5f..7a39b45 100644 --- a/patches/kernel/0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch +++ b/patches/kernel/0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch @@ -50,15 +50,16 @@ 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 275204646c68..944c35d87258 100644 +index d9fc02a71baa..3459f460dbd8 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c -@@ -877,11 +877,11 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus) +@@ -883,11 +883,11 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus) static int pci_register_host_bridge(struct pci_host_bridge *bridge) { struct device *parent = bridge->dev.parent; @@ -73,7 +74,7 @@ index 275204646c68..944c35d87258 100644 char addr[64], *fmt; const char *name; int err; -@@ -961,11 +961,34 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) +@@ -970,11 +970,34 @@ 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"); @@ -99,13 +100,14 @@ index 275204646c68..944c35d87258 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-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch b/patches/kernel/0008-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch index 2b2a6b0..6c51c6e 100644 --- a/patches/kernel/0008-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch +++ b/patches/kernel/0008-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch @@ -14,11 +14,11 @@ Signed-off-by: Thomas Lamprecht block/bdev.c | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/fs/block_dev.c b/fs/block_dev.c -index e4a80bd4ddf1..4a14d28dd923 100644 +diff --git a/block/bdev.c b/block/bdev.c +index 485a258b0ab3..f93165f05987 100644 --- a/block/bdev.c +++ b/block/bdev.c -@@ -1436,6 +1436,10 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder) +@@ -800,6 +800,10 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder) if (ret) return ERR_PTR(ret); @@ -29,7 +29,7 @@ index e4a80bd4ddf1..4a14d28dd923 100644 bdev = blkdev_get_no_open(dev); if (!bdev) return ERR_PTR(-ENXIO); -@@ -1482,6 +1486,8 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder) +@@ -852,6 +856,8 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder) disk_unblock_events(disk); put_blkdev: blkdev_put_no_open(bdev); diff --git a/submodules/ubuntu-jammy b/submodules/ubuntu-jammy index d5d0348..401befb 160000 --- a/submodules/ubuntu-jammy +++ b/submodules/ubuntu-jammy @@ -1 +1 @@ -Subproject commit d5d03485a8a6a91f4406f08c8c0375dbdc84de7e +Subproject commit 401befb9c1c6116168fe6fdf36ec9c9d28771c57 -- 2.39.2