4.16.6-1
This commit is contained in:
Jan Alexander Steffens
parent
ff07558d65
commit
86b1e231a0
@ -1,8 +1,8 @@
|
||||
From f7a249814be46cbcb7bad48e4b1910baaf7f8961 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
|
||||
From 07043e7b2e94a711c7ffa6f72c6f50a73dccd86d Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <07043e7b2e94a711c7ffa6f72c6f50a73dccd86d.1525091195.git.jan.steffens@gmail.com>
|
||||
From: Serge Hallyn <serge.hallyn@canonical.com>
|
||||
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 <serge.hallyn@ubuntu.com>
|
||||
|
||||
@ -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: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
|
||||
References: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
|
||||
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 <jim.bride@linux.intel.com>
|
||||
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
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
From be536681bd2439bf8e95df124fa282cf4a2e7846 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <be536681bd2439bf8e95df124fa282cf4a2e7846.1524575789.git.jan.steffens@gmail.com>
|
||||
In-Reply-To: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
|
||||
References: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
|
||||
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)" <jan.steffens@gmail.com>
|
||||
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.
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
From a117a2995f291e765c5de06f42f02a1687ecb55e Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <a117a2995f291e765c5de06f42f02a1687ecb55e.1524575789.git.jan.steffens@gmail.com>
|
||||
In-Reply-To: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
|
||||
References: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
|
||||
From d6fbef15c12c47b27d23871d17040a41c319e0e0 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <d6fbef15c12c47b27d23871d17040a41c319e0e0.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)" <jan.steffens@gmail.com>
|
||||
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:
|
||||
|
||||
|
||||
@ -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: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
|
||||
References: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
|
||||
From: Igor Russkikh <igor.russkikh@aquantia.com>
|
||||
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 <igor.russkikh@aquantia.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
.../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
|
||||
|
||||
17
PKGBUILD
17
PKGBUILD
@ -4,7 +4,7 @@
|
||||
pkgbase=linux # Build stock -ARCH kernel
|
||||
#pkgbase=linux-custom # Build kernel with a different name
|
||||
_srcname=linux-4.16
|
||||
pkgver=4.16.5
|
||||
pkgver=4.16.6
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
url="https://www.kernel.org/"
|
||||
@ -22,7 +22,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=(
|
||||
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
|
||||
@ -30,17 +29,16 @@ validpgpkeys=(
|
||||
)
|
||||
sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9'
|
||||
'SKIP'
|
||||
'8c3bb050d11da6e91d3e169f76ee3ed6937e1ca64264e605ddba8108696ba011'
|
||||
'634d3fd97e5d9d90262db0a9d62ed0a40043eb691d68bd4a545f907079610b56'
|
||||
'SKIP'
|
||||
'627aa44c65d7297b00a8a7045d606d33b6a0b982c02331a101b94d38d348082a'
|
||||
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
|
||||
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
|
||||
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
|
||||
'113b1fe603f61b749c4cb3902a4f5d4fbec9d1e5081f008bac485cc345defa5f'
|
||||
'9db235c5edfc9a81a0f5866f9942e74d896243c37d50298288fbbe2f79169fd3'
|
||||
'd57665a468f93c94b92924fdbdc72ea50def74d9c8999104c9594e64fb196328'
|
||||
'079180ceaae87a4851eb56e80f6e33b0199dad3343c73275ddb710e0824feb73'
|
||||
'f1c751e29bc1bcfe634c49873eb34a5418db3dfbd1f6d789e738dee78071d3dd')
|
||||
'0f9cd4d94ad4866925b800ed843faa6485719b67f3f46d406ea1424795f37d31'
|
||||
'7f7a425358830f2cb81f85e25b6047eca89350994e1deb160295082ccbd470ff'
|
||||
'9fe2ee26ba324f28a42e7acc3b164344d61796a68b9a8f8ec74cb0dfeb58620e'
|
||||
'94e8d80886c31dfe628d3537f1c30f8a3f79aea7e542aa77e9c4291dafed1679')
|
||||
|
||||
_kernelname=${pkgbase#linux}
|
||||
: ${_kernelname:=-ARCH}
|
||||
@ -66,9 +64,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
|
||||
|
||||
cat ../config - >.config <<END
|
||||
CONFIG_LOCALVERSION="${_kernelname}"
|
||||
CONFIG_LOCALVERSION_AUTO=n
|
||||
|
||||
Loading…
Reference in New Issue
Block a user