summaryrefslogtreecommitdiff
path: root/libre/linux-libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre/linux-libre')
-rw-r--r--libre/linux-libre/0003-Partially-revert-swiotlb-remove-various-exports.patch29
-rw-r--r--libre/linux-libre/0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch63
-rw-r--r--libre/linux-libre/PKGBUILD22
-rw-r--r--libre/linux-libre/config.armv7h5
-rw-r--r--libre/linux-libre/config.x86_644
5 files changed, 10 insertions, 113 deletions
diff --git a/libre/linux-libre/0003-Partially-revert-swiotlb-remove-various-exports.patch b/libre/linux-libre/0003-Partially-revert-swiotlb-remove-various-exports.patch
deleted file mode 100644
index de1bdde95..000000000
--- a/libre/linux-libre/0003-Partially-revert-swiotlb-remove-various-exports.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a4a45daaacca4c48f4f3840a42cf1c8f385c0e82 Mon Sep 17 00:00:00 2001
-Message-Id: <a4a45daaacca4c48f4f3840a42cf1c8f385c0e82.1526520264.git.jan.steffens@gmail.com>
-In-Reply-To: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com>
-References: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Fri, 6 Apr 2018 16:19:38 +0200
-Subject: [PATCH 3/4] Partially revert "swiotlb: remove various exports"
-
-This partially reverts commit 4bd89ed39b2ab8dc4ac4b6c59b07d420b0213bec.
-The proprietary NVIDIA driver needs one of the exports.
----
- lib/swiotlb.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/swiotlb.c b/lib/swiotlb.c
-index dc81f16b9095..1c0a8699f8b9 100644
---- a/lib/swiotlb.c
-+++ b/lib/swiotlb.c
-@@ -1016,6 +1016,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
- }
- return nelems;
- }
-+EXPORT_SYMBOL(swiotlb_map_sg_attrs);
-
- /*
- * Unmap a set of streaming mode DMA translations. Again, cpu read rules
---
-2.17.0
-
diff --git a/libre/linux-libre/0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch b/libre/linux-libre/0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch
deleted file mode 100644
index 009251cb3..000000000
--- a/libre/linux-libre/0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 005c2f4576d9bab5ff97dac4b3d27aafa2f1f153 Mon Sep 17 00:00:00 2001
-Message-Id: <005c2f4576d9bab5ff97dac4b3d27aafa2f1f153.1526520264.git.jan.steffens@gmail.com>
-In-Reply-To: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com>
-References: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com>
-From: Mathias Nyman <mathias.nyman@linux.intel.com>
-Date: Mon, 14 May 2018 11:57:23 +0300
-Subject: [PATCH 4/4] xhci: Fix USB3 NULL pointer dereference at logical
- disconnect.
-
-Hub driver will try to disable a USB3 device twice at logical disconnect,
-racing with xhci_free_dev() callback from the first port disable.
-
-This can be triggered with "udisksctl power-off --block-device <disk>"
-or by writing "1" to the "remove" sysfs file for a USB3 device
-in 4.17-rc4.
-
-USB3 devices don't have a similar disabled link state as USB2 devices,
-and use a U3 suspended link state instead. In this state the port
-is still enabled and connected.
-
-hub_port_connect() first disconnects the device, then later it notices
-that device is still enabled (due to U3 states) it will try to disable
-the port again (set to U3).
-
-The xhci_free_dev() called during device disable is async, so checking
-for existing xhci->devs[i] when setting link state to U3 the second time
-was successful, even if device was being freed.
-
-The regression was caused by, and whole thing revealed by,
-Commit 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device")
-which sets xhci->devs[i]->udev to NULL before xhci_virt_dev() returned.
-and causes a NULL pointer dereference the second time we try to set U3.
-
-Fix this by checking xhci->devs[i]->udev exists before setting link state.
-
-The original patch went to stable so this fix needs to be applied there as
-well.
-
-Fixes: 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device")
-Cc: <stable@vger.kernel.org>
-Reported-by: Jordan Glover <Golden_Miller83@protonmail.ch>
-Tested-by: Jordan Glover <Golden_Miller83@protonmail.ch>
-Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
----
- drivers/usb/host/xhci-hub.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
-index 72ebbc908e19..32cd52ca8318 100644
---- a/drivers/usb/host/xhci-hub.c
-+++ b/drivers/usb/host/xhci-hub.c
-@@ -354,7 +354,7 @@ int xhci_find_slot_id_by_port(struct usb_hcd *hcd, struct xhci_hcd *xhci,
-
- slot_id = 0;
- for (i = 0; i < MAX_HC_SLOTS; i++) {
-- if (!xhci->devs[i])
-+ if (!xhci->devs[i] || !xhci->devs[i]->udev)
- continue;
- speed = xhci->devs[i]->udev->speed;
- if (((speed >= USB_SPEED_SUPER) == (hcd->speed >= HCD_USB3))
---
-2.17.0
-
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 719f99f45..c97d3c3af 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -13,7 +13,7 @@
pkgbase=linux-libre # Build stock kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_pkgbasever=4.16-gnu
-_pkgver=4.16.9-gnu
+_pkgver=4.16.11-gnu
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
_replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -63,8 +63,6 @@ source=(
'0002-fix-Atmel-maXTouch-touchscreen-support.patch'
'0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch'
'0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch'
- '0003-Partially-revert-swiotlb-remove-various-exports.patch'
- '0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch'
)
validpgpkeys=(
'474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -72,7 +70,7 @@ validpgpkeys=(
)
sha512sums=('c6805b3649cd71cfef272384958b33da23a00908e795592470bf711dd67886ab7d7610e7d4ae8a2230fa7483466636465ed9744444464a078de37b41c3db23e0'
'SKIP'
- '1b181bfb60ebfb6f5dc8c6dd46359eba3578438b6a4b9bde2bbaaf7b3825d8956737d0afd5e2b0e21bdaacb5ce9cb472df752e6cbb881433edf40ab97574f05d'
+ 'dd86ad8882c1e56c95e3340ccece7f0c80aa1644e3f4c3868b8e3f6db415871930f5783a9c1d0bb4bd2caa8daedbef0e16475e9f997b21fefe2b30e784ff236c'
'SKIP'
'13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
'SKIP'
@@ -81,12 +79,12 @@ sha512sums=('c6805b3649cd71cfef272384958b33da23a00908e795592470bf711dd67886ab7d7
'7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
'SKIP'
'e29a438cfca6046236ef1f3b4f928cf6744170a1462ef190c3c5ace8966e7c4f9824bac17a9f3b58da9f59913a6978441d070fa18811d718d7c965f72c753d91'
- '093694e104c04faf5fe4708364a30f5d7c3cca4292a217d8ac84a8cf3a1aab5f428104a7bf15aa360d11ad3aad89fdbffd62701abd1f6ed168fc337ca1199222'
- '19e7368ad7febba038b87613f3862ae7d962ed881da785ea8871b952923e806426507a41f2a305ea2ec36e5f9b4c9a626468a30734ebf846c3cfc1dbe2ad967d'
+ '2f96c036a811cfbb7e76461f08735140c41081de69b4207ac3da3569e5fa7cef36c73cf5241b30e26bf525ec1fa9039fb349a3d9c9818c656adc33463f234a68'
+ 'f68651b0ab76bcf8d55ca9caaf275b15e0d3cbf49a082b7483f341601ea58c1c63956a7c9be91b01fb62b2d664c888274b2dfc7f4e024d285233a2a88ebe87ca'
'7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
'4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
'2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
- '4ae28c1e6ffb256933c0d898cdc202639b438f47e3fca9c4a00683ff6c735f51e0b86f36e974c0f47c3aae8629fb09eab97909e008857b6de89b734af99b62aa'
+ '65446112e83f5ce350faa6c686fed9db09bc56e9ea01630ad9fdfb2b7e7a5de1127abf8b2b3ef79705e7bee04ba5bc0366a3b7a058f0dc70082424d35445924b'
'SKIP'
'e331035c3b6687ab8f8ddc35b77470b0abc58457790b78ce50ccf2c246ec16a05815a3f4a0107c0a1a7ee68317b984e51df66b22d76236f6d104eb7eb02db7c8'
'04ffbd0e17a5d09ef7c02042b600b4903be5355e443ea168a6760a910eca0d4a11ef679fe9203cd2e59b0741e9405de7105d51e6e3c0713ecc0c08b212e7b39b'
@@ -105,9 +103,7 @@ sha512sums=('c6805b3649cd71cfef272384958b33da23a00908e795592470bf711dd67886ab7d7
'02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
'd4a5dadbdbbb8a2c2c3b4b5e77ea19664e0742825648d10635ce3b7642f01d71d51fd8ed58dcfd686981ef9c3f83965746686231b9bac1974809be1618e60373'
- '071c38539db9660e743cca5514a5b2c10e79716c59435976f7cd18bd77254b39e1cdba6386ac6938c00c7585e1834508f85bc65f4d2af28246dae864b71b06b3'
- '6c4bf0d5230e7a3e895f88cf6cc84d6df550fefa2c865e4d5853e02682e781c5a149fb4f853ac7513f335271415fae4a4edf13139de4ba067102e9d8083c22a0'
- 'f5a6e9e6244ed2bb336f359a65ba922226f76319c216eae3c1acca137084ab0c89372d8ec2299d0377ad909534a5d13d8db9a9376e357d600518c81811256d07')
+ '071c38539db9660e743cca5514a5b2c10e79716c59435976f7cd18bd77254b39e1cdba6386ac6938c00c7585e1834508f85bc65f4d2af28246dae864b71b06b3')
_kernelname=${pkgbase#linux-libre}
_replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}")
@@ -163,12 +159,6 @@ prepare() {
# https://bugs.archlinux.org/task/56711
patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
- # NVIDIA driver compat
- patch -Np1 -i ../0003-Partially-revert-swiotlb-remove-various-exports.patch
-
- # https://bugs.archlinux.org/task/58237
- patch -Np1 -i ../0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.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
diff --git a/libre/linux-libre/config.armv7h b/libre/linux-libre/config.armv7h
index 07d800f00..5224991b0 100644
--- a/libre/linux-libre/config.armv7h
+++ b/libre/linux-libre/config.armv7h
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.16.9-gnu-1 Kernel Configuration
+# Linux/arm 4.16.11-gnu-1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1904,8 +1904,7 @@ CONFIG_DEVTMPFS_MOUNT=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_EXTRA_FIRMWARE="am335x-bone-scale-data.bin am335x-evm-scale-data.bin am43x-evm-scale-data.bin"
-CONFIG_EXTRA_FIRMWARE_DIR="firmware"
+CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
CONFIG_WANT_DEV_COREDUMP=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index d703f219f..c6e31552f 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.16.9-gnu-1 Kernel Configuration
+# Linux/x86 4.16.11-gnu-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -6124,7 +6124,7 @@ CONFIG_SND_HDA_CODEC_CA0132_DSP=y
CONFIG_SND_HDA_CODEC_CMEDIA=m
CONFIG_SND_HDA_CODEC_SI3054=m
CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=10
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDA_CORE=m
CONFIG_SND_HDA_DSP_LOADER=y
CONFIG_SND_HDA_I915=y
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 08:19:04 +0000