From e931a486bed188d71aa250b106ede5cf3f7f1fa0 Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 30 Apr 2018 23:13:33 -0300 Subject: upgpkg: libre/linux-libre 4.16.6_gnu-1 Signed-off-by: David P --- ...to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 6 +- ...p-Only-use-the-alternate-fixed-mode-if-it.patch | 10 +-- ...lly-revert-swiotlb-remove-various-exports.patch | 10 +-- ...vboxguest-on-guests-with-more-than-4G-RAM.patch | 10 +-- ...tia-Regression-on-reset-with-1.x-firmware.patch | 72 ---------------------- libre/linux-libre/PKGBUILD | 19 +++--- libre/linux-libre/config.x86_64 | 4 +- 7 files changed, 27 insertions(+), 104 deletions(-) delete mode 100644 libre/linux-libre/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch diff --git a/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch index 156d03e21..6c04b5b53 100644 --- a/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,8 +1,8 @@ -From f7a249814be46cbcb7bad48e4b1910baaf7f8961 Mon Sep 17 00:00:00 2001 -Message-Id: +From 07043e7b2e94a711c7ffa6f72c6f50a73dccd86d Mon Sep 17 00:00:00 2001 +Message-Id: <07043e7b2e94a711c7ffa6f72c6f50a73dccd86d.1525091195.git.jan.steffens@gmail.com> From: Serge Hallyn Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/5] add sysctl to disallow unprivileged CLONE_NEWUSER by +Subject: [PATCH 1/4] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn diff --git a/libre/linux-libre/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/libre/linux-libre/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch index ad7ac0c34..ad57c4124 100644 --- a/libre/linux-libre/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch +++ b/libre/linux-libre/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch @@ -1,10 +1,10 @@ -From 7f9a95491f506700d46db581ef3734ced7c9618b Mon Sep 17 00:00:00 2001 -Message-Id: <7f9a95491f506700d46db581ef3734ced7c9618b.1524575789.git.jan.steffens@gmail.com> -In-Reply-To: -References: +From 5cbcef251f3997a70ac62e9a971287b06b25f727 Mon Sep 17 00:00:00 2001 +Message-Id: <5cbcef251f3997a70ac62e9a971287b06b25f727.1525091195.git.jan.steffens@gmail.com> +In-Reply-To: <07043e7b2e94a711c7ffa6f72c6f50a73dccd86d.1525091195.git.jan.steffens@gmail.com> +References: <07043e7b2e94a711c7ffa6f72c6f50a73dccd86d.1525091195.git.jan.steffens@gmail.com> From: Jim Bride Date: Mon, 6 Nov 2017 13:38:57 -0800 -Subject: [PATCH 2/5] drm/i915/edp: Only use the alternate fixed mode if it's +Subject: [PATCH 2/4] drm/i915/edp: Only use the alternate fixed mode if it's asked for In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for 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 index 4669b03bd..8047b6b46 100644 --- a/libre/linux-libre/0003-Partially-revert-swiotlb-remove-various-exports.patch +++ b/libre/linux-libre/0003-Partially-revert-swiotlb-remove-various-exports.patch @@ -1,10 +1,10 @@ -From be536681bd2439bf8e95df124fa282cf4a2e7846 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From 2104179915f493a1ff7212a0c740a6f2f21a8503 Mon Sep 17 00:00:00 2001 +Message-Id: <2104179915f493a1ff7212a0c740a6f2f21a8503.1525091195.git.jan.steffens@gmail.com> +In-Reply-To: <07043e7b2e94a711c7ffa6f72c6f50a73dccd86d.1525091195.git.jan.steffens@gmail.com> +References: <07043e7b2e94a711c7ffa6f72c6f50a73dccd86d.1525091195.git.jan.steffens@gmail.com> From: "Jan Alexander Steffens (heftig)" Date: Fri, 6 Apr 2018 16:19:38 +0200 -Subject: [PATCH 3/5] Partially revert "swiotlb: remove various exports" +Subject: [PATCH 3/4] Partially revert "swiotlb: remove various exports" This partially reverts commit 4bd89ed39b2ab8dc4ac4b6c59b07d420b0213bec. The proprietary NVIDIA driver needs one of the exports. diff --git a/libre/linux-libre/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch b/libre/linux-libre/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch index ae5b8c9e4..c09c6a17d 100644 --- a/libre/linux-libre/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch +++ b/libre/linux-libre/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch @@ -1,10 +1,10 @@ -From a117a2995f291e765c5de06f42f02a1687ecb55e Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From d6fbef15c12c47b27d23871d17040a41c319e0e0 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <07043e7b2e94a711c7ffa6f72c6f50a73dccd86d.1525091195.git.jan.steffens@gmail.com> +References: <07043e7b2e94a711c7ffa6f72c6f50a73dccd86d.1525091195.git.jan.steffens@gmail.com> From: "Jan Alexander Steffens (heftig)" Date: Wed, 11 Apr 2018 21:27:44 +0200 -Subject: [PATCH 4/5] Fix vboxguest on guests with more than 4G RAM +Subject: [PATCH 4/4] Fix vboxguest on guests with more than 4G RAM Squashed commit of the following: diff --git a/libre/linux-libre/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch b/libre/linux-libre/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch deleted file mode 100644 index d02da63cb..000000000 --- a/libre/linux-libre/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 415d0ca52b88f7cf3300a54c337ca80ebeccce5c Mon Sep 17 00:00:00 2001 -Message-Id: <415d0ca52b88f7cf3300a54c337ca80ebeccce5c.1524575789.git.jan.steffens@gmail.com> -In-Reply-To: -References: -From: Igor Russkikh -Date: Wed, 11 Apr 2018 15:23:24 +0300 -Subject: [PATCH 5/5] net: aquantia: Regression on reset with 1.x firmware - -On ASUS XG-C100C with 1.5.44 firmware a special mode called "dirty wake" -is active. With this mode when motherboard gets powered (but no poweron -happens yet), NIC automatically enables powersave link and watches -for WOL packet. -This normally allows to powerup the PC after AC power failures. - -Not all motherboards or bios settings gives power to PCI slots, -so this mode is not enabled on all the hardware. - -4.16 linux driver introduced full hardware reset sequence -This is required since before that we had no NIC hardware -reset implemented and there were side effects of "not clean start". - -But this full reset is incompatible with "dirty wake" WOL feature -it keeps the PHY link in a special mode forever. As a consequence, -driver sees no link and no traffic. - -To fix this we forcibly change FW state to idle state before doing -the full reset. This makes FW to restore link state. - -Fixes: c8c82eb net: aquantia: Introduce global AQC hardware reset sequence -Signed-off-by: Igor Russkikh -Signed-off-by: David S. Miller ---- - .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c -index d3b847ec7465..c58b2c227260 100644 ---- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c -+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c -@@ -48,6 +48,8 @@ - #define FORCE_FLASHLESS 0 - - static int hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual); -+static int hw_atl_utils_mpi_set_state(struct aq_hw_s *self, -+ enum hal_atl_utils_fw_state_e state); - - int hw_atl_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops) - { -@@ -247,6 +249,20 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self) - - self->rbl_enabled = (boot_exit_code != 0); - -+ /* FW 1.x may bootup in an invalid POWER state (WOL feature). -+ * We should work around this by forcing its state back to DEINIT -+ */ -+ if (!hw_atl_utils_ver_match(HW_ATL_FW_VER_1X, -+ aq_hw_read_reg(self, -+ HW_ATL_MPI_FW_VERSION))) { -+ int err = 0; -+ -+ hw_atl_utils_mpi_set_state(self, MPI_DEINIT); -+ AQ_HW_WAIT_FOR((aq_hw_read_reg(self, HW_ATL_MPI_STATE_ADR) & -+ HW_ATL_MPI_STATE_MSK) == MPI_DEINIT, -+ 10, 1000U); -+ } -+ - if (self->rbl_enabled) - return hw_atl_utils_soft_reset_rbl(self); - else --- -2.17.0 - diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index ff0915a9f..527208830 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.5-gnu +_pkgver=4.16.6-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -65,7 +65,6 @@ source=( '0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch' '0003-Partially-revert-swiotlb-remove-various-exports.patch' '0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch' - '0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch' ) validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -73,7 +72,7 @@ validpgpkeys=( ) sha512sums=('c6805b3649cd71cfef272384958b33da23a00908e795592470bf711dd67886ab7d7610e7d4ae8a2230fa7483466636465ed9744444464a078de37b41c3db23e0' 'SKIP' - '0696f81eccf4c47acd4074f50a6f7dcae38171bbe91d3df14ddaa9692192dfcd9bfa715dfea714460ed3dc59683c7a1fbf9eca0982fffc23537942ad76f0bf72' + '6e23ed3a88bae4be0b07424ad900adce3ca985050f23f5ab9878b54ae3bd8de1868f1dc52d8c66614be7016e2e3ae3efad78a415e4554048fad53fe2106c0b00' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -82,7 +81,7 @@ sha512sums=('c6805b3649cd71cfef272384958b33da23a00908e795592470bf711dd67886ab7d7 '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78' 'SKIP' '09b1d390e8e3603adf76018364ad645292ae8d51628a5e6e807cdace51519addf3f544b2dd71c67847464544fcb1728914f0b8b4addcfac1bafd0191729e8268' - '7d87ecaf0a37218be2cd5a67c353dafa5995935f7a8e805200156850c3a103d9f954b975aa768fed51114b21b06427556b78e71055b90578f62c2d08117a1539' + 'ff48c6efb71233739dc2d62b33856853c96dc031b2a3a09753244d0e9dd1a7c0f4df95b6326f24df5b2ebd17580e244b068702b18b6aa1650981b15dff0e0d90' 'ed907cdbc11f0de7a2af797f43020ec7c9f2186c2cc042db88689b2a48dcbb29409432e75ee2ec2bbbfca5659e163ddce85c5dbbbe06766d869f4160c2617dca' '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a' '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44' @@ -105,11 +104,10 @@ sha512sums=('c6805b3649cd71cfef272384958b33da23a00908e795592470bf711dd67886ab7d7 '0a1a18aa8a6cbf1bab406d356786d2c35fe52608c25bef8beefe440b8a015ba59375106f8b04051ae2225e158420875a82ee07d5b88a2f2087afeb102e8966c0' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - 'aa59b7f4fce14c95719a969af12c570acfd5fb8c624787bd8c75ba40ae1cc7e87126daaf22c9de2b7869c438fc5b1f56282b68ba0541aad058ec42631b8fe38b' - '7c9dec73129161edf1d72fd3867dc03a1a2a3df37e99b65135171154fed340a06c55986bbff694b0fa912d1f1d4eee6e5beec9393866812c849ef429934b1600' - 'f96404228e5f541decd4962aae1c8b61192ef5a0349ab96fc370b71ac09b2c403cdcf2bbef8a4512db5458b575e4856d2e83f373c4a087c5895adeed5f9362c9' - '0e88c4d5552566938750234228683e64cf736a43bc210db0aa2e47ae145d78c2417e04c615dbd3571b6fd6739d283d7e67a03ac04e1e898bd5f2812257c800ac' - '0507e1b8c246e6b1c0be32f8d9c93e888c163b3f546d097bcd7596d0357994642b9eadc1c409c935854b91eabe7bb8b195fba1fa87fe09da347e152b999b17bc') + '0eaa95666e56173102725c920bf5e9eaba83bb2da3d5aa7bb0524bf5bee3ea5ac9acec648964332176ac9777a7060f007839ffac237ce6d477cce831412894b8' + '6562f3a4bd21c46bde51a96fc883cc3b126c3df3f553eeb00cc53560f98dbccabdfac81a9048dd2bad5e178d4b6424fb7f8d8bd7ac11f94fe631fcb8e8c82db7' + 'e03ad4c9f109c75baf2750d582818aa1ed3bc8008ff4f7fdaeb1faf25e23d87d7cb9f3c468eacb8b4d84f4aba104de808fdcdab67ee13cd0b0b2315e3163b340' + 'fe961e9dce455aa0f48c2b7009544dbe13231a3b7cc02b3516aad5646bead9e924f6740fb4e868fcc843e17fda994ae6f2f4c57dc056b361a4091bcf9327f0ba') _kernelname=${pkgbase#linux-libre} _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") @@ -171,9 +169,6 @@ prepare() { # https://bugs.archlinux.org/task/58153 patch -Np1 -i ../0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch - # https://bugs.archlinux.org/task/58174 - patch -Np1 -i ../0005-net-aquantia-Regression-on-reset-with-1.x-firmware.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.x86_64 b/libre/linux-libre/config.x86_64 index d94a36f82..82f6d4ed0 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.4-gnu-1 Kernel Configuration +# Linux/x86 4.16.6-gnu-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -571,7 +571,7 @@ CONFIG_AMD_NUMA=y CONFIG_X86_64_ACPI_NUMA=y CONFIG_NODES_SPAN_OTHER_NODES=y # CONFIG_NUMA_EMU is not set -CONFIG_NODES_SHIFT=2 +CONFIG_NODES_SHIFT=5 CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y -- cgit v1.2.3