summaryrefslogtreecommitdiff
path: root/kernels
diff options
context:
space:
mode:
Diffstat (limited to 'kernels')
-rw-r--r--kernels/linux-libre-xtreme/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch6
-rw-r--r--kernels/linux-libre-xtreme/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch6
-rw-r--r--kernels/linux-libre-xtreme/0003-SMILE-Plug-device-tree-file.patch6
-rw-r--r--kernels/linux-libre-xtreme/0004-fix-mvsdio-eMMC-timing.patch6
-rw-r--r--kernels/linux-libre-xtreme/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch6
-rw-r--r--kernels/linux-libre-xtreme/0006-set-default-cubietruck-led-triggers.patch6
-rw-r--r--kernels/linux-libre-xtreme/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch6
-rw-r--r--kernels/linux-libre-xtreme/0008-ARM-dove-enable-ethernet-on-D3Plug.patch6
-rw-r--r--kernels/linux-libre-xtreme/0009-power-add-power-sequence-library.patch6
-rw-r--r--kernels/linux-libre-xtreme/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch8
-rw-r--r--kernels/linux-libre-xtreme/0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch6
-rw-r--r--kernels/linux-libre-xtreme/0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch6
-rw-r--r--kernels/linux-libre-xtreme/0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch6
-rw-r--r--kernels/linux-libre-xtreme/0014-ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch61
-rw-r--r--kernels/linux-libre-xtreme/PKGBUILD51
-rw-r--r--kernels/linux-libre-xtreme/config.armv7h3
-rw-r--r--kernels/linux-libre-xtreme/config.x86_648
-rw-r--r--kernels/linux-libre-xtreme/mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch43
18 files changed, 179 insertions, 67 deletions
diff --git a/kernels/linux-libre-xtreme/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/kernels/linux-libre-xtreme/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
index 693b8791b..7aaecf303 100644
--- a/kernels/linux-libre-xtreme/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ b/kernels/linux-libre-xtreme/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@@ -1,7 +1,7 @@
-From 8d124d916897d965eafd7e85524d38756fb2d5ce Mon Sep 17 00:00:00 2001
+From ba0f7bad7435de617093d47ac4f0895a71dcee00 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@xxxxxx>
Date: Sun, 2 Dec 2012 19:59:28 +0100
-Subject: [PATCH 01/13] ARM: atags: add support for Marvell's u-boot
+Subject: [PATCH 01/14] ARM: atags: add support for Marvell's u-boot
Marvell uses a specific atag in its u-boot which includes among other
information the MAC addresses for up to 4 network interfaces.
@@ -47,5 +47,5 @@ index 6b335a9ff8c8..614150b53643 100644
};
--
-2.17.0
+2.18.0
diff --git a/kernels/linux-libre-xtreme/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/kernels/linux-libre-xtreme/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
index 1c12a7edd..67aaf723e 100644
--- a/kernels/linux-libre-xtreme/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/kernels/linux-libre-xtreme/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -1,7 +1,7 @@
-From 6f181867df1ccab0836928cc91a9388239b89086 Mon Sep 17 00:00:00 2001
+From 89b2c1805d92a98ccc424ecad060cb08ba8e6211 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@xxxxxx>
Date: Sun, 2 Dec 2012 19:56:58 +0100
-Subject: [PATCH 02/13] ARM: atags/fdt: retrieve MAC addresses from Marvell
+Subject: [PATCH 02/14] ARM: atags/fdt: retrieve MAC addresses from Marvell
boot loader
The atags are parsed and if a Marvell atag is found, up to 4 MAC
@@ -43,5 +43,5 @@ index 41fa7316c52b..807ed160a4b9 100644
}
--
-2.17.0
+2.18.0
diff --git a/kernels/linux-libre-xtreme/0003-SMILE-Plug-device-tree-file.patch b/kernels/linux-libre-xtreme/0003-SMILE-Plug-device-tree-file.patch
index c9099e761..e1416218a 100644
--- a/kernels/linux-libre-xtreme/0003-SMILE-Plug-device-tree-file.patch
+++ b/kernels/linux-libre-xtreme/0003-SMILE-Plug-device-tree-file.patch
@@ -1,7 +1,7 @@
-From a89566aa1896a895360380a6a4e66b997c059e02 Mon Sep 17 00:00:00 2001
+From d441e0ca2b03d5cc7e5034efc6b15b56698b353f Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 5 Sep 2014 15:41:19 -0600
-Subject: [PATCH 03/13] SMILE Plug device tree file
+Subject: [PATCH 03/14] SMILE Plug device tree file
This adds a dts file for the SMILE Plug, which only differs from the Mirabox
dts with the LED definitions.
@@ -205,5 +205,5 @@ index 000000000000..d01308ab848b
+ };
+};
--
-2.17.0
+2.18.0
diff --git a/kernels/linux-libre-xtreme/0004-fix-mvsdio-eMMC-timing.patch b/kernels/linux-libre-xtreme/0004-fix-mvsdio-eMMC-timing.patch
index 3c1c94f65..965b849b8 100644
--- a/kernels/linux-libre-xtreme/0004-fix-mvsdio-eMMC-timing.patch
+++ b/kernels/linux-libre-xtreme/0004-fix-mvsdio-eMMC-timing.patch
@@ -1,7 +1,7 @@
-From 80d34ee9819ed5400e37d4a9801f976d1c8281c0 Mon Sep 17 00:00:00 2001
+From 23883cf4470afeb33dc9c171978df76f5470f4f0 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 5 Sep 2014 15:43:56 -0600
-Subject: [PATCH 04/13] fix mvsdio eMMC timing
+Subject: [PATCH 04/14] fix mvsdio eMMC timing
These changes from Globalscale change the MMC timing to allow the eMMC versions
of the Mirabox and SMILE Plug to work.
@@ -34,5 +34,5 @@ index 210247b3d11a..1a1802dc9ef4 100644
host->clock = ios->clock;
host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
--
-2.17.0
+2.18.0
diff --git a/kernels/linux-libre-xtreme/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/kernels/linux-libre-xtreme/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
index bcba33beb..e90048ad6 100644
--- a/kernels/linux-libre-xtreme/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/kernels/linux-libre-xtreme/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,7 +1,7 @@
-From 0818bb121a785e899a143871e7b567b4ab1cde91 Mon Sep 17 00:00:00 2001
+From b8082b65dc78228d48e693c7bdf9dbe75a2043ff Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Feb 2014 01:43:50 -0300
-Subject: [PATCH 05/13] net/smsc95xx: Allow mac address to be set as a
+Subject: [PATCH 05/14] net/smsc95xx: Allow mac address to be set as a
parameter
---
@@ -92,5 +92,5 @@ index 309b88acd3d0..7bc9feb891a1 100644
/* maybe the boot loader passed the MAC address in devicetree */
--
-2.17.0
+2.18.0
diff --git a/kernels/linux-libre-xtreme/0006-set-default-cubietruck-led-triggers.patch b/kernels/linux-libre-xtreme/0006-set-default-cubietruck-led-triggers.patch
index 952bc1f4b..a5a9bcc44 100644
--- a/kernels/linux-libre-xtreme/0006-set-default-cubietruck-led-triggers.patch
+++ b/kernels/linux-libre-xtreme/0006-set-default-cubietruck-led-triggers.patch
@@ -1,7 +1,7 @@
-From 0879744ffdf15d57e51a023edac391acf3af80da Mon Sep 17 00:00:00 2001
+From 0cf9ae3f97075a40cd14e09c91de0468459c45d3 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 14 Feb 2015 12:32:27 +0100
-Subject: [PATCH 06/13] set default cubietruck led triggers
+Subject: [PATCH 06/14] set default cubietruck led triggers
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
---
@@ -29,5 +29,5 @@ index 5649161de1d7..2be64a886555 100644
};
--
-2.17.0
+2.18.0
diff --git a/kernels/linux-libre-xtreme/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/kernels/linux-libre-xtreme/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
index 6572bc84f..e29c41c6c 100644
--- a/kernels/linux-libre-xtreme/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+++ b/kernels/linux-libre-xtreme/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
@@ -1,7 +1,7 @@
-From 655d9afac9327f9ac6884e82146508f1c0a66c01 Mon Sep 17 00:00:00 2001
+From 8d59092709da9dc0f852411cb1bad579decd457c Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 11 Aug 2016 00:42:37 -0600
-Subject: [PATCH 07/13] exynos4412-odroid: set higher minimum buck2 regulator
+Subject: [PATCH 07/14] exynos4412-odroid: set higher minimum buck2 regulator
voltage
Set a higher minimum voltage to help reboot issue.
@@ -26,5 +26,5 @@ index d7ad07fd48f9..53c31c01713b 100644
regulator-always-on;
regulator-boot-on;
--
-2.17.0
+2.18.0
diff --git a/kernels/linux-libre-xtreme/0008-ARM-dove-enable-ethernet-on-D3Plug.patch b/kernels/linux-libre-xtreme/0008-ARM-dove-enable-ethernet-on-D3Plug.patch
index 927c84e9e..8e85907d0 100644
--- a/kernels/linux-libre-xtreme/0008-ARM-dove-enable-ethernet-on-D3Plug.patch
+++ b/kernels/linux-libre-xtreme/0008-ARM-dove-enable-ethernet-on-D3Plug.patch
@@ -1,7 +1,7 @@
-From 288a284da4996b5420bda1635a2240d0615912a3 Mon Sep 17 00:00:00 2001
+From c26422909f777d60214288dfdb538fa8cf510c5f Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 7 May 2017 13:32:25 -0600
-Subject: [PATCH 08/13] ARM: dove: enable ethernet on D3Plug
+Subject: [PATCH 08/14] ARM: dove: enable ethernet on D3Plug
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
---
@@ -27,5 +27,5 @@ index 826026c28f90..a4c9963e1261 100644
/* Samsung M8G2F eMMC */
&sdio0 {
--
-2.17.0
+2.18.0
diff --git a/kernels/linux-libre-xtreme/0009-power-add-power-sequence-library.patch b/kernels/linux-libre-xtreme/0009-power-add-power-sequence-library.patch
index a9fbf1ee8..e2dbaf12b 100644
--- a/kernels/linux-libre-xtreme/0009-power-add-power-sequence-library.patch
+++ b/kernels/linux-libre-xtreme/0009-power-add-power-sequence-library.patch
@@ -1,7 +1,7 @@
-From 19a5d3c65f38ed602ab452ab7226d533b4ca66df Mon Sep 17 00:00:00 2001
+From ce6183d0a8a9aea1a1d9acc9a85a05d73e741023 Mon Sep 17 00:00:00 2001
From: Peter Chen <peter.chen@nxp.com>
Date: Wed, 21 Jun 2017 14:42:03 +0800
-Subject: [PATCH 09/13] power: add power sequence library
+Subject: [PATCH 09/14] power: add power sequence library
We have an well-known problem that the device needs to do some power
sequence before it can be recognized by related host, the typical
@@ -786,5 +786,5 @@ index 000000000000..c5b278f5f2ae
+
+#endif /* __LINUX_PWRSEQ_H */
--
-2.17.0
+2.18.0
diff --git a/kernels/linux-libre-xtreme/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch b/kernels/linux-libre-xtreme/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch
index 7b51f8047..5737cac20 100644
--- a/kernels/linux-libre-xtreme/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch
+++ b/kernels/linux-libre-xtreme/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch
@@ -1,7 +1,7 @@
-From 3725bba0f1591b698482f4b144dc311199ef492b Mon Sep 17 00:00:00 2001
+From 5b874f0a1f92812bc797c01fa558f0ab4ed338ae Mon Sep 17 00:00:00 2001
From: Peter Chen <peter.chen@nxp.com>
Date: Wed, 21 Jun 2017 14:42:05 +0800
-Subject: [PATCH 10/13] usb: core: add power sequence handling for USB devices
+Subject: [PATCH 10/14] usb: core: add power sequence handling for USB devices
Some hard-wired USB devices need to do power sequence to let the
device work normally, the typical power sequence like: enable USB
@@ -39,7 +39,7 @@ index 987fc5ba6321..bd09fc8ff763 100644
---help---
Universal Serial Bus (USB) is a specification for a serial bus
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index aa9968d90a48..14b93b844aaa 100644
+index e3bf65e213cd..f6a739bbe754 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -28,6 +28,7 @@
@@ -160,5 +160,5 @@ index 4dc769ee9c74..b5d5c4818f90 100644
/**
--
-2.17.0
+2.18.0
diff --git a/kernels/linux-libre-xtreme/0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch b/kernels/linux-libre-xtreme/0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch
index f77b425fd..7c5261680 100644
--- a/kernels/linux-libre-xtreme/0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch
+++ b/kernels/linux-libre-xtreme/0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch
@@ -1,7 +1,7 @@
-From bc2e28fa4c09da9f27de359a576ad46f0c108dae Mon Sep 17 00:00:00 2001
+From dd0ec5ddeff7c8435888e7250eb47954740e7e5d Mon Sep 17 00:00:00 2001
From: Joshua Clayton <stillcompiling@gmail.com>
Date: Wed, 21 Jun 2017 14:42:06 +0800
-Subject: [PATCH 11/13] ARM: dts: imx6qdl: Enable usb node children with <reg>
+Subject: [PATCH 11/14] ARM: dts: imx6qdl: Enable usb node children with <reg>
Give usb nodes #address and #size attributes, so that a child node
representing a permanently connected device such as an onboard hub may
@@ -45,5 +45,5 @@ index c003e62bf290..7ffd2f1f769e 100644
interrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6QDL_CLK_USBOH3>;
--
-2.17.0
+2.18.0
diff --git a/kernels/linux-libre-xtreme/0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch b/kernels/linux-libre-xtreme/0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch
index fb95ba5d7..606b49708 100644
--- a/kernels/linux-libre-xtreme/0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch
+++ b/kernels/linux-libre-xtreme/0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch
@@ -1,7 +1,7 @@
-From b2ad93788d10a09f72eb170cf0f13ddecc540ff4 Mon Sep 17 00:00:00 2001
+From 01dea63eabb838525a193c32526791f6880c2b79 Mon Sep 17 00:00:00 2001
From: Peter Chen <peter.chen@nxp.com>
Date: Wed, 21 Jun 2017 14:42:07 +0800
-Subject: [PATCH 12/13] ARM: dts: imx6qdl-udoo.dtsi: fix onboard USB HUB
+Subject: [PATCH 12/14] ARM: dts: imx6qdl-udoo.dtsi: fix onboard USB HUB
property
The current dts describes USB HUB's property at USB controller's
@@ -76,5 +76,5 @@ index 906387915dc5..d3cc0b666e0d 100644
&usdhc3 {
--
-2.17.0
+2.18.0
diff --git a/kernels/linux-libre-xtreme/0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch b/kernels/linux-libre-xtreme/0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch
index 16c3f2336..0eaf2c470 100644
--- a/kernels/linux-libre-xtreme/0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch
+++ b/kernels/linux-libre-xtreme/0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch
@@ -1,7 +1,7 @@
-From 90445c490f11a0afefc9ccbae3ca5893ad0ddb15 Mon Sep 17 00:00:00 2001
+From 29a513109fa45d1039d7f52aacb3fc4a188e60d4 Mon Sep 17 00:00:00 2001
From: Joshua Clayton <stillcompiling@gmail.com>
Date: Wed, 21 Jun 2017 14:42:08 +0800
-Subject: [PATCH 13/13] ARM: dts: imx6q-evi: Fix onboard hub reset line
+Subject: [PATCH 13/14] ARM: dts: imx6q-evi: Fix onboard hub reset line
Previously the onboard hub was made to work by treating its
reset gpio as a regulator enable.
@@ -70,5 +70,5 @@ index fcd257bc5ac3..d32fa81bba95 100644
>;
};
--
-2.17.0
+2.18.0
diff --git a/kernels/linux-libre-xtreme/0014-ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch b/kernels/linux-libre-xtreme/0014-ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch
new file mode 100644
index 000000000..8dbde1ca0
--- /dev/null
+++ b/kernels/linux-libre-xtreme/0014-ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch
@@ -0,0 +1,61 @@
+From ac139b06e1b309c605c65cea2d547cbba4ae5370 Mon Sep 17 00:00:00 2001
+From: Ethan Tuttle <ethan@ethantuttle.com>
+Date: Tue, 19 Jun 2018 21:31:08 -0700
+Subject: [PATCH 14/14] ARM: mvebu: declare asm symbols as character arrays in
+ pmsu.c
+
+With CONFIG_FORTIFY_SOURCE, memcpy uses the declared size of operands to
+detect buffer overflows. If src or dest is declared as a char, attempts to
+copy more than byte will result in a fortify_panic().
+
+Address this problem in mvebu_setup_boot_addr_wa() by declaring
+mvebu_boot_wa_start and mvebu_boot_wa_end as character arrays. Also remove
+a couple addressof operators to avoid "arithmetic on pointer to an
+incomplete type" compiler error.
+
+See commit 54a7d50b9205 ("x86: mark kprobe templates as character arrays,
+not single characters") for a similar fix.
+
+Fixes "detected buffer overflow in memcpy" error during init on some mvebu
+systems (armada-370-xp, armada-375):
+
+(fortify_panic) from (mvebu_setup_boot_addr_wa+0xb0/0xb4)
+(mvebu_setup_boot_addr_wa) from (mvebu_v7_cpu_pm_init+0x154/0x204)
+(mvebu_v7_cpu_pm_init) from (do_one_initcall+0x7c/0x1a8)
+(do_one_initcall) from (kernel_init_freeable+0x1bc/0x254)
+(kernel_init_freeable) from (kernel_init+0x8/0x114)
+(kernel_init) from (ret_from_fork+0x14/0x2c)
+
+Signed-off-by: Ethan Tuttle <ethan@ethantuttle.com>
+Tested-by: Ethan Tuttle <ethan@ethantuttle.com>
+---
+ arch/arm/mach-mvebu/pmsu.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c
+index 27a78c80e5b1..73d5d72dfc3e 100644
+--- a/arch/arm/mach-mvebu/pmsu.c
++++ b/arch/arm/mach-mvebu/pmsu.c
+@@ -116,8 +116,8 @@ void mvebu_pmsu_set_cpu_boot_addr(int hw_cpu, void *boot_addr)
+ PMSU_BOOT_ADDR_REDIRECT_OFFSET(hw_cpu));
+ }
+
+-extern unsigned char mvebu_boot_wa_start;
+-extern unsigned char mvebu_boot_wa_end;
++extern unsigned char mvebu_boot_wa_start[];
++extern unsigned char mvebu_boot_wa_end[];
+
+ /*
+ * This function sets up the boot address workaround needed for SMP
+@@ -130,7 +130,7 @@ int mvebu_setup_boot_addr_wa(unsigned int crypto_eng_target,
+ phys_addr_t resume_addr_reg)
+ {
+ void __iomem *sram_virt_base;
+- u32 code_len = &mvebu_boot_wa_end - &mvebu_boot_wa_start;
++ u32 code_len = mvebu_boot_wa_end - mvebu_boot_wa_start;
+
+ mvebu_mbus_del_window(BOOTROM_BASE, BOOTROM_SIZE);
+ mvebu_mbus_add_window_by_id(crypto_eng_target, crypto_eng_attribute,
+--
+2.18.0
+
diff --git a/kernels/linux-libre-xtreme/PKGBUILD b/kernels/linux-libre-xtreme/PKGBUILD
index 9959f8850..6bb59b412 100644
--- a/kernels/linux-libre-xtreme/PKGBUILD
+++ b/kernels/linux-libre-xtreme/PKGBUILD
@@ -11,7 +11,7 @@
pkgbase=linux-libre-xtreme
_pkgbasever=4.17-gnu
-_pkgver=4.17.3-gnu
+_pkgver=4.17.6-gnu
_hardenedver=a
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -22,7 +22,7 @@ _srcname=linux-${_pkgbasever%-*}
_archpkgver=${_pkgver%-*}
pkgver=${_pkgver//-/_}
pkgrel=1
-rcnrel=armv7-x3
+rcnrel=armv7-x7
arch=('i686' 'x86_64' 'armv7h')
url="https://wiki.parabola.nu/Xtreme"
license=('GPL2')
@@ -56,11 +56,13 @@ source=(
'0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch'
'0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch'
'0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch'
+ '0014-ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch'
# other patches
'0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
'0002-fix-Atmel-maXTouch-touchscreen-support.patch'
'ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch'
'Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch'
+ 'mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch'
)
validpgpkeys=(
'474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -70,9 +72,9 @@ validpgpkeys=(
)
sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447690e64ec0e6488a778be8a7384891c003f39029ff5799f9884482628aadf2'
'SKIP'
- 'f885c0025d1c5c4a7b194fc0c59c602760a2e4bc382c8dd66987d8de8c4c18d463793d137c9beb0030edb63bedd215587e6bf3e254d8e03f1f59ffe49ee1752f'
+ 'e87d8039431db2fc26480d2079705056638a2147e97840a331f520ad273e4a0ac57b4d939ee1fe8fff9ac8518680be21513a2a0ab7dda618ca85b603b218c22b'
'SKIP'
- '700219e971944896037c1825b8a1df5b3be98eb7a76622e801bd01719f6c8147a35689cf890b23cfaf4eea96643981de17e7502af892fa37ed8baffb62e96337'
+ '01b034b73c91290b03b39be355d818db8bb6f03d4a0632f3c149aac82a89aec10a970a21358bc2182bfa24e7d32db39bb0055e7f89a2ab47e74e0e2e6bb77165'
'SKIP'
'13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
'SKIP'
@@ -81,30 +83,32 @@ sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447
'7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
'SKIP'
'2311293cefe326467d03bdc90097af471ab0fbbc2ec073c14c407561b34a6ef8f31ee8011c1ae9f73d0bb1b736de7ea1c0c4a9781711ab30ce6264fa2da64a0f'
- 'bec591710bd6ea28d6767562cc4cde8637d46600f693d74ca661aab34dc5483ea786a7d9c0dc8674e820313cd5c7823a11ce811ebb21c4381d7d22bc5b4e34f7'
- 'fc10f55ce41a989ce697d8df05ae911eca85559fb753abaaa22e1e776279e0774430e3746f2c42dda13cabfd4dfb789bdb73f77a159447620494a568faef5dbe'
+ '79bb858f3843c8ea303d6005328fb28ead3aa81f4f43c5509b0072f9f7c65127e95b7ae0ff0ad48dd5dd083cb373fe7fbdea2157370ec2c7c6c9f3d4b8cb2af2'
+ '05cd4eb578374850367b75fec2599b5bed210b175a7cc23933aa6528a8cd750ef0c470ea73d9c770e8c624bf6d229b287dbc7d913e5dc1a48c976803f23fe10e'
'7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
'4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
'2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
- 'e48864992df4f40d828a5dc5cb5d35e520b9d498638f0e44d2c2c21dc9b0555d3d211e655cf15bd2e1f5d23594f8f380aa2d8a4293b0cdf4dc6c53020ba6d421'
+ '93909dee8e89a5e243489c3c47b6b1023b4064bea7688e6d395912383e1d2e69b64c2dea161ef85ce9a52ff24b0de8fe975297cd1b17eaebc1f72a9d6a5cafbe'
'SKIP'
- '8b946f1baa0ecbae0d70781ff67d9cc6ab4abbb8c5768bfd1fbf211de3a3d17f3b9c5a0e5bc588bd90a730051bdfb6b530ab2b30b8142e9adb33f84684b008fe'
- '382ae823f4a1c9105ab9bae6a5d2871eba7f1a888da3a2acdb17cecdbe542613f2f27bb5aaab236d205593bebb57cd91cb7d3de9b70b837f35c3eeb96ace44e3'
- '1f1826e3e1be079f6153e927151d3d0beaed5ed6b5032841d443f25d5af89c0c769d2ba00c5b95cb7338bc7bc04ea65a312116640431e7fbe17e9850f43df894'
- '1c578fa28c25557b2ad647974330c4238f3bd70212bda23d1eac45ca7815b573768ec88d61c7d2b61e59d48f58d25883b2f862124b6bacafde754b8883d6cdb5'
- '0be0572cee24d7d34782f8b0fb2e8597bd7ad1ccc2603e1fd7372f7e8cae9ba5f1e627aaa2960aa4f145032e2ddee11021a226bbcd1439c24a61cb66d82b13a6'
- 'c0568844b4eae0ff56ff4293d075b4523ef69e75c2ee0349c3a5460c18a048bafad3f95bad957fc3692c43d7843354ee0603048d17d73c6ac0b97162e1c295c2'
- 'dd889b8e64baef3f9fee6a75111f4e1c5c420a8c72e25d89ff0db765bd7fbbae985a7cc6327d8bdb80e32d59e7fca9dc2e0dee2c4811bfdbab32783ce29ea842'
- 'a34fc71e4dccadba3bef57cdb5fddb8524771b095a437d0449bc76da031dcc40edb083209f25731b58478a2c713f7245676adfed22a453a74aa85cf245a76944'
- '6cd12c8947a661fda1a1f0f1d84cfaa8d6f66300d4495a59131b7df1ed6b10ce21cddb3291d25f1ebb0798d9b711af68c18b46c34122425b21f946000ab743e8'
- 'ae2432ade54b0a703473ed804a08fc6346bf20b427dd56d0bd188bf56398aee3dc61e3e7740353943a7928992073894215f222c24a46fe5440a2058567ba5452'
- '09ee66f32cdc0d17a200e1f87175030a0180158840dec18be45f6329039f08100782a9f30af939a09f94fa4ab11739620c9993078555de5a5b1942affad3047f'
- '9a2ef810d62c2120e6a662f4c58e4644dac83e6fd8317ce7d5641421b89ac60de117204e4fa4024c76a61db495a066802af37c21a9470c536b8d86ae0ac398ba'
- '850e6b8684db4dd6946f69690caaa34a350228d3fed0e08b461835337250c78f511d064fb8fcd2003c5112e68fd9a66b61111c5e3ca4f53b80a0922d8d5f5fba'
+ 'c6e758931e599199db07276a51b204a4030e0da80f08df60783278cf3d4d3ee6c0c280cc1788ca024cdf2043a39dd527e2205dd678368097b68240a7e80b931c'
+ '3e0852e188549e60fa35b70e82740d5124936688d5f5ff0314c4e555ad9cc4c7688c56b5949baa8fd67ede22a579019919b09091b59eafac60409fdf18105af5'
+ 'f80538cfb1af660a3dc2a8bf31ada1132d24d81064b347419d221417ad8e0e949431ef277b22fee771b6f9d43abf47d3e6a92ce4f5928a6cc4f25f0b628ba02a'
+ 'e09ef9f021515474d41a3cb3d11b88a133db012b322a604cc6597b675d9b98c96dbd5cc447426f053bcb00598d640f9ba0651d1496762cf39ee3f698b03b0416'
+ 'f0573b49e4184ddcac6e273c46a63439dfcea7ca0b7a232bf35fb22979bf593fdb18f6dbe243505a22dd94b465c22f2a92cab13d159d76aa330f9a4cf3f17971'
+ '56f20c4f0683e9a2d0936fe0669449485043431d8b77fcbdec30bad88349db8ed7d1286af5f3ad4732561533e716b0df6faa094d7a5b9a84acfea756d3139ac0'
+ 'a5f73c34912393bdf49cde6dd4e99d16f6a95a267e9384a5bc33633d89a0669a3dac49fdf3efb43aa0e477d520fcb577d826f3a2907f11d1d7584ca9e2d90faa'
+ '155b2b44d320a2605473c95ffb6664ba34ba806f8e53f951f2471adb45f0f6e18f04e409b31620c4fa096090916a4f1af69a3d7e467395a2845d4c0657927891'
+ '9b6f5fbc5738e1d83caad3328d2cc9bfc7e60a1a09a9eaaffb739952e13f630c029bb3472f7b4385fa52bd6953fd7e7492a44258d5b4baf30f81c99c71965b9a'
+ 'd32f7808c35cb58d7218c4cfe42d0967ee0975346827580b3fd34c1a45a975560b276cec909954d27a6feff23f4364b8a802501a03f46ac8e6b61f16910cb784'
+ 'b6b39a2fdc5963611806d387866edab43eb52c591b05d92e0ed887657d43383ddfc2e088b7063bd6586ff872203fdbf0348fecc2c1f673134a8cc5112a1d4179'
+ '79da6491df96d8bc13edc2bd071b8859a7f915a72244992869e3be44c3118fd3421d9fff4fe6c858895ad8c19dcc02d8d3b458dc6f3efbae3120693708af31b4'
+ '1d0626f6e95ffe71dbbf281167d312a8acfc300930b39e80ef7771a2b65091e974e2ec703d463d8fc16d36472f5f5deb28b77d854c0e96685d31e42040d18f6d'
+ 'a4d72cdcddc3f43f27e0d415e1d8ce45bc552ee07d29b566cd8128715daf8267f549968434ca6a949b39aed8bbd6b8790f65f7f4641d8008d1b856d8f1a8ee94'
'02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
'994d328326ca1e65fc4b1ea26d858e040367112881af4d2f33b953fd138fa44009f898211f84e29e1158ca61bd7080e871933dba4d7e8f084640a02110cfc920'
- 'cc8852b089aa24f588ad1af726503ecd1012ad7e1cbc47ea77f03a5f7aecd25306d40f2e16b8a1afeafe7e2e97b6b6840c9f462ed7be358090117e2e024df1bd')
+ 'cc8852b089aa24f588ad1af726503ecd1012ad7e1cbc47ea77f03a5f7aecd25306d40f2e16b8a1afeafe7e2e97b6b6840c9f462ed7be358090117e2e024df1bd'
+ '662e8cc92c2034de247530a981ed24d3d85109e5d0742a9c53c6def9528c151c3177c95992b8d9d1173b64817960ac7c6cb029817fa39cce48d8199823b8271a')
_kernelname=${pkgbase#linux-libre}
_replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}")
@@ -145,6 +149,7 @@ prepare() {
patch -p1 -i ../0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch
patch -p1 -i ../0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch
patch -p1 -i ../0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch
+ patch -p1 -i ../0014-ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch
fi
# add freedo as boot logo
@@ -160,6 +165,9 @@ prepare() {
# https://bugs.archlinux.org/task/56711
patch -Np1 -i ../Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
+ # Fix iwd provoking a BUG
+ patch -Np1 -i ../mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch
+
# maintain the TTY over USB disconnects
# http://www.coreboot.org/EHCI_Gadget_Debug
patch -p1 -i ../0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
@@ -220,6 +228,7 @@ _package() {
optdepends=('crda: to set the correct wireless channels of your country'
'apparmor: to configure and enable mandatory access control for programs'
'tomoyo-utils: to manage tomoyo userspace tools')
+ optdepends_x86_64=('usbctl: deny_new_usb control')
provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_pkgver%%-*}")
conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
diff --git a/kernels/linux-libre-xtreme/config.armv7h b/kernels/linux-libre-xtreme/config.armv7h
index 616fac2b9..1b01579d4 100644
--- a/kernels/linux-libre-xtreme/config.armv7h
+++ b/kernels/linux-libre-xtreme/config.armv7h
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.17.2-gnu-1-xtreme Kernel Configuration
+# Linux/arm 4.17.6-gnu-1-xtreme Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -6888,7 +6888,6 @@ CONFIG_DMA_ENGINE_RAID=y
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
# CONFIG_AUXDISPLAY is not set
-CONFIG_ARM_CHARLCD=y
CONFIG_UIO=m
CONFIG_UIO_CIF=m
CONFIG_UIO_PDRV_GENIRQ=m
diff --git a/kernels/linux-libre-xtreme/config.x86_64 b/kernels/linux-libre-xtreme/config.x86_64
index e62c7eadf..98d3c82cc 100644
--- a/kernels/linux-libre-xtreme/config.x86_64
+++ b/kernels/linux-libre-xtreme/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.3-gnu-1-xtreme Kernel Configuration
+# Linux/x86 4.17.6-gnu-1-xtreme Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -6213,7 +6213,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
@@ -6736,7 +6736,7 @@ CONFIG_USB_SERIAL_WISHBONE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
CONFIG_USB_SERIAL_UPD78F0730=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
#
# USB Miscellaneous drivers
@@ -7304,7 +7304,6 @@ CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
CONFIG_DCA=m
CONFIG_AUXDISPLAY=y
-CONFIG_CHARLCD=m
CONFIG_HD44780=m
CONFIG_KS0108=m
CONFIG_KS0108_PORT=0x378
@@ -7317,6 +7316,7 @@ CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
CONFIG_PANEL_PROFILE=5
# CONFIG_PANEL_CHANGE_MESSAGE is not set
+CONFIG_CHARLCD=m
CONFIG_UIO=m
CONFIG_UIO_CIF=m
CONFIG_UIO_PDRV_GENIRQ=m
diff --git a/kernels/linux-libre-xtreme/mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch b/kernels/linux-libre-xtreme/mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch
new file mode 100644
index 000000000..6bc71e6a4
--- /dev/null
+++ b/kernels/linux-libre-xtreme/mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch
@@ -0,0 +1,43 @@
+From e7441c9274a6a5453e06f4c2b8b5f72eca0a3f17 Mon Sep 17 00:00:00 2001
+From: Denis Kenzior <denkenz@gmail.com>
+Date: Tue, 19 Jun 2018 10:39:50 -0500
+Subject: [PATCH] mac80211: disable BHs/preemption in
+ ieee80211_tx_control_port()
+
+On pre-emption enabled kernels the following print was being seen due to
+missing local_bh_disable/local_bh_enable calls. mac80211 assumes that
+pre-emption is disabled in the data path.
+
+ BUG: using smp_processor_id() in preemptible [00000000] code: iwd/517
+ caller is __ieee80211_subif_start_xmit+0x144/0x210 [mac80211]
+ [...]
+ Call Trace:
+ dump_stack+0x5c/0x80
+ check_preemption_disabled.cold.0+0x46/0x51
+ __ieee80211_subif_start_xmit+0x144/0x210 [mac80211]
+
+Fixes: 911806491425 ("mac80211: Add support for tx_control_port")
+Signed-off-by: Denis Kenzior <denkenz@gmail.com>
+[commit message rewrite, fixes tag]
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+---
+ net/mac80211/tx.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
+index 44b5dfe8727d..fa1f1e63a264 100644
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -4845,7 +4845,9 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev,
+ skb_reset_network_header(skb);
+ skb_reset_mac_header(skb);
+
++ local_bh_disable();
+ __ieee80211_subif_start_xmit(skb, skb->dev, flags);
++ local_bh_enable();
+
+ return 0;
+ }
+--
+2.18.0
+