Add Linux 5.5.19

This change updates the kernel to Linux 5.5.19 based on Ubuntu 5.5.0-7.8.
2020-04-29 21:32:45 +02:00 · 2020-04-29 21:32:45 +02:00 · 6c35f07438
commit 6c35f07438
parent dcd3ae67d9
16 changed files with 259494 additions and 52 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +1,7 @@
 [submodule "submodules/zfsonlinux"]
 	path = submodules/zfsonlinux
 	url = git://git.proxmox.com/git/zfsonlinux.git
-[submodule "submodules/ubuntu-focal"]
-	path = submodules/ubuntu-focal
-	url = git://git.proxmox.com/git/mirror_ubuntu-focal-kernel.git
+
+[submodule "submodules/linux-stable"]
+	path = submodules/linux-stable
+	url = git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
--- a/10
+++ b/10
@ -1,7 +1,7 @@
 # also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
 KERNEL_MAJ=5
-KERNEL_MIN=4
-KERNEL_PATCHLEVEL=30
+KERNEL_MIN=5
+KERNEL_PATCHLEVEL=19
 # increment KREL if the ABI changes (abicheck target in debian/rules)
 # rebuild packages with new KREL and run 'make abiupdate'
 KREL=1
@ -47,7 +47,7 @@ SKIPABI=0

 BUILD_DIR=build

-KERNEL_SRC=ubuntu-focal
+KERNEL_SRC=linux-stable
 KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC)
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org

@ -110,12 +110,13 @@ ${KERNEL_SRC}.prepared: ${KERNEL_SRC_SUBMODULE}
 	rm -rf ${BUILD_DIR}/${KERNEL_SRC} $@
 	mkdir -p ${BUILD_DIR}
 	cp -a ${KERNEL_SRC_SUBMODULE} ${BUILD_DIR}/${KERNEL_SRC}
+	set -e; cd ${BUILD_DIR}/${KERNEL_SRC}; for patch in ../../patches/ubuntu/*.patch; do echo "applying Ubuntu patch '$$patch'" && patch -p1 < $${patch}; done
 # TODO: split for archs, track and diff in our repository?
 	cat ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.common.${ARCH} ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.flavour.generic > ${KERNEL_CFG_ORG}
 	cp ${KERNEL_CFG_ORG} ${BUILD_DIR}/${KERNEL_SRC}/.config
 	sed -i ${BUILD_DIR}/${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
 	rm -rf ${BUILD_DIR}/${KERNEL_SRC}/debian ${BUILD_DIR}/${KERNEL_SRC}/debian.master
-	set -e; cd ${BUILD_DIR}/${KERNEL_SRC}; for patch in ../../patches/kernel/*.patch; do echo "applying patch '$$patch'" && patch -p1 < $${patch}; done
+	set -e; cd ${BUILD_DIR}/${KERNEL_SRC}; for patch in ../../patches/pve/*.patch; do echo "applying PVE patch '$$patch'" && patch -p1 < $${patch}; done
 	touch $@

 ${MODULES}.prepared: $(addsuffix .prepared,${MODULE_DIRS})
@ -125,6 +126,7 @@ ${ZFSDIR}.prepared: ${ZFSONLINUX_SUBMODULE}
 	rm -rf ${BUILD_DIR}/${MODULES}/${ZFSDIR} ${BUILD_DIR}/${MODULES}/tmp $@
 	mkdir -p ${BUILD_DIR}/${MODULES}/tmp
 	cp -a ${ZFSONLINUX_SUBMODULE}/* ${BUILD_DIR}/${MODULES}/tmp
+	set -e; cd ${BUILD_DIR}/${MODULES}/tmp/upstream; for patch in ../../../../patches/zfsonlinux/*.patch; do echo "applying patch '$$patch'" && patch -p1 < $${patch}; done
 	cd ${BUILD_DIR}/${MODULES}/tmp; make kernel
 	rm -rf ${BUILD_DIR}/${MODULES}/tmp
 	touch ${ZFSDIR}.prepared
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+pve-edge-kernel (5.5.19-1) edge; urgency=medium
+
+  * update to Linux 5.5.19 based on Ubuntu 5.5.0-7.8
+
+ -- Fabian Mastenbroek <mail.fabianm@gmail.com>  Wed, 29 Apr 2020 21:20:30 +0200
+
 pve-edge-kernel (5.4.30-1) edge; urgency=medium

  * update to Ubuntu-5.4.0-24.28
--- 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
--- a/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch
+++ b/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch
--- 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
@ -1,15 +1,13 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 1e30ab2525d8a9ad1fe9a76bef64ff54c2d95e0d Mon Sep 17 00:00:00 2001
 From: Mark Weiman <mark.weiman@markzz.com>
-Date: Wed, 7 Feb 2018 16:04:03 -0500
-Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.15)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+Date: Sun, 12 Aug 2018 11:36:21 -0400
+Subject: [PATCH 09/14] pci: Enable overrides for missing ACS capabilities

 This an updated version of Alex Williamson's patch from:
 https://lkml.org/lkml/2013/5/30/513

 Original commit message follows:
+
 PCIe ACS (Access Control Services) is the PCIe 2.0+ feature that
 allows us to control whether transactions are allowed to be redirected
 in various subnodes of a PCIe topology.  For instance, if two
@ -47,27 +45,27 @@ specific devices which enforce isolation but not provide an ACS
 capability.  Please contact me to have your devices added and save
 your customers the hassle of this boot option.

-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Signed-off-by: Mark Weiman <mark.weiman@markzz.com>
+Signed-off-by: Alexandre Frade <admfrade@gmail.com>
 ---
 .../admin-guide/kernel-parameters.txt         |   9 ++
- drivers/pci/quirks.c                          | 102 ++++++++++++++++++
- 2 files changed, 111 insertions(+)
+ drivers/pci/quirks.c                          | 101 ++++++++++++++++++
+ 2 files changed, 110 insertions(+)

 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 174554924fb8..efa4a99121b7 100644
+index 8dee8f68fe15..8aa1f5c6c042 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -3434,6 +3434,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).
-+		pci_acs_override =
+@@ -3402,6 +3402,15 @@
+ 		nomsi		[MSI] If the PCI_MSI kernel config parameter is
+ 				enabled, this kernel boot option can be used to
+ 				disable the use of MSI interrupts system-wide.
+		pcie_acs_override =
 +					[PCIE] Override missing PCIe ACS support for:
 +				downstream
 +					All downstream ports - full ACS capabilities
 +				multifunction
-+					Add multifunction devices - multifunction ACS subset
+					All multifunction devices - multifunction ACS subset
 +				id:nnnn:nnnn
 +					Specific device - full ACS capabilities
 +					Specified as vid:did (vendor/device ID) in hex
@ -75,12 +73,12 @@ index 174554924fb8..efa4a99121b7 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 18119626d5c8..529feee083e2 100644
+index 320255e5e8f8..8d5808de9071 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void)
+@@ -3483,6 +3483,106 @@ static void quirk_no_bus_reset(struct pci_dev *dev)
+ 	dev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET;
 }
- fs_initcall_sync(pci_apply_final_quirks);
 
 +static bool acs_on_downstream;
 +static bool acs_on_multifunction;
@ -122,6 +120,7 @@ index 18119626d5c8..529feee083e2 100644
 +				goto next;
 +			}
 +			acs_on_ids[max_acs_id].vendor = val;
+
 +			p += strcspn(p, ":");
 +			if (*p != ':') {
 +				pr_warn("PCIe ACS invalid ID\n");
@ -181,16 +180,16 @@ index 18119626d5c8..529feee083e2 100644
 +
 +	return -ENOTTY;
 +}
-+
 /*
-  * 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
-@@ -4698,6 +4798,8 @@ static const struct pci_dev_acs_enabled {
- 	{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
- 	/* APM X-Gene */
- 	{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },
-+	/* Enable overrides for missing ACS capabilities */
+  * Some Atheros AR9xxx and QCA988x chips do not behave after a bus reset.
+  * The device will throw a Link Down error on AER-capable systems and
+@@ -4663,6 +4763,7 @@ static const struct pci_dev_acs_enabled {
+ 	{ PCI_VENDOR_ID_BROADCOM, 0xD714, pci_quirk_brcm_acs },
+ 	/* Amazon Annapurna Labs */
+ 	{ PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031, pci_quirk_al_acs },
 + 	{ PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
- 	/* Ampere Computing */
- 	{ PCI_VENDOR_ID_AMPERE, 0xE005, pci_quirk_xgene_acs },
- 	{ PCI_VENDOR_ID_AMPERE, 0xE006, pci_quirk_xgene_acs },
+ 	{ 0 }
+ };
+ 
+-- 
+2.17.1
--- a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch
+++ b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch
--- a/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch
+++ b/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch
--- a/patches/ubuntu/0001-base-packaging.patch
+++ b/patches/ubuntu/0001-base-packaging.patch
--- a/patches/ubuntu/0002-UBUNTU-SAUCE-add-vmlinux.strip-to-BOOT_TARGETS1-on-p.patch
+++ b/patches/ubuntu/0002-UBUNTU-SAUCE-add-vmlinux.strip-to-BOOT_TARGETS1-on-p.patch
@ -0,0 +1,27 @@
+From 6dbe2103c375cbcb9458504b7e4fa11574b2492c Mon Sep 17 00:00:00 2001
+From: Andy Whitcroft <apw@canonical.com>
+Date: Fri, 9 Sep 2016 14:02:29 +0100
+Subject: [PATCH 2/5] UBUNTU: SAUCE: add vmlinux.strip to BOOT_TARGETS1 on
+ powerpc
+
+Signed-off-by: Andy Whitcroft <apw@canonical.com>
+---
+ arch/powerpc/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
+index f357305..fbda4b5 100644
+--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
+@@ -285,7 +285,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/
+ all: zImage
+ 
+ # With make 3.82 we cannot mix normal and wildcard targets
+-BOOT_TARGETS1 := zImage zImage.initrd uImage
+BOOT_TARGETS1 := zImage zImage.initrd uImage vmlinux.strip
+ BOOT_TARGETS2 := zImage% dtbImage% treeImage.% cuImage.% simpleImage.% uImage.%
+ 
+ PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2)
+-- 
+2.7.4
+
--- a/patches/ubuntu/0003-UBUNTU-SAUCE-tools-hv-lsvmbus-add-manual-page.patch
+++ b/patches/ubuntu/0003-UBUNTU-SAUCE-tools-hv-lsvmbus-add-manual-page.patch
@ -0,0 +1,48 @@
+From dfc279950258378c695f3e23f1af5434dc73979a Mon Sep 17 00:00:00 2001
+From: Andy Whitcroft <apw@canonical.com>
+Date: Fri, 27 May 2016 13:52:22 +0100
+Subject: [PATCH 3/5] UBUNTU: SAUCE: tools/hv/lsvmbus -- add manual page
+
+BugLink: http://bugs.launchpad.net/bugs/1585311
+
+Signed-off-by: Andy Whitcroft <apw@canonical.com>
+Acked-by: Tim Gardner <tim.gardner@canonical.com>
+Acked-by: Brad Figg <brad.figg@canonical.com>
+Signed-off-by: Kamal Mostafa <kamal@canonical.com>
+---
+ tools/hv/lsvmbus.8 | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+ create mode 100644 tools/hv/lsvmbus.8
+
+diff --git a/tools/hv/lsvmbus.8 b/tools/hv/lsvmbus.8
+new file mode 100644
+index 00000000..ba07d664
+--- /dev/null
+++ b/tools/hv/lsvmbus.8
+@@ -0,0 +1,23 @@
+.\"  This page Copyright (C) 2016 Andy Whitcroft <apw@canonical.com>
+.\"  Distributed under the GPL v2 or later.
+.TH LSVMBUS 8
+.SH NAME
+lsvmbus \- List Hyper-V VMBus devices
+.SH SYNOPSIS
+.ft B
+.B lsvmbus [-vv]
+.br
+.SH DESCRIPTION
+\fBlsvmbus\fP
+displays devices attached to the Hyper-V VMBus.
+.SH OPTIONS
+.\"
+.TP
+.B -v
+With -v more information is printed including the VMBus Rel_ID, class ID,
+Rel_ID, and which channel is bound to which virtual processor.  Use -vv
+for additional detail including the Device_ID and the sysfs path.
+.\"
+.SH AUTHORS
+.nf
+Written by Dexuan Cui <decui@microsoft.com>
+-- 
+2.7.4
+
--- a/patches/ubuntu/0004-debian-changelog.patch
+++ b/patches/ubuntu/0004-debian-changelog.patch
--- a/patches/ubuntu/0005-configs-based-on-Ubuntu-5.5.0-7.8.patch
+++ b/patches/ubuntu/0005-configs-based-on-Ubuntu-5.5.0-7.8.patch
--- a/patches/zfsonlinux/0001-5.5-support.patch
+++ b/patches/zfsonlinux/0001-5.5-support.patch
--- a/submodules/linux-stable
+++ b/submodules/linux-stable
@ -0,0 +1 @@
+Subproject commit 937381741d02cc6594477c593b2f3a087b3a0bc1
--- a/submodules/ubuntu-focal
+++ b/submodules/ubuntu-focal
@ -1 +0,0 @@
-Subproject commit 6a99357b50cf0f01eca4c5a098de99f5b2624cc1
				`@ -0,0 +1 @@`
				`Subproject commit 937381741d02cc6594477c593b2f3a087b3a0bc1`
				`@ -1 +0,0 @@`
				`Subproject commit 6a99357b50cf0f01eca4c5a098de99f5b2624cc1`