Updated to 4.16.6.a

4 files changed, 5 insertions, 77 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0564d73..d66eeaf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgbase=linux-libre-hardened
 _majver=4.16
-_minver=5
+_minver=6
 _fullver=${_majver}.${_minver}
 _basever=${_majver}-gnu
 _pkgver=${_fullver}-gnu
@@ -30,24 +30,22 @@ source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}/linux
 
         # https://bugs.archlinux.org/task/56711
         drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch
-        net-aquantia-Regression-on-reset-with-1.x-firmware.patch
         fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
         partially-revert-swiotlb-remove-various-exports.patch
 )
 sha256sums=('5bd4ee95a0a9d7d2f962504f4b684b441b07f5a136e8bb8ad959f2d29ab9b913'
             'SKIP'
-            '6e71ec91c057638ea160ff05860df13e772e8b43a609bc83c518ce0a41db14aa'
+            '07f671e3bf9ea10918f146c1fd96eaa6da6410e91256665f3d36699de9952f65'
             'SKIP'
-            '65482af87d9bac91d67591bde20ab56162060ea05fad910dbfcb5e5e964c8804'
+            '587477338e3c34e31c8d895bae9bed6847d6b0b5ad318460733ee9213730315f'
             'SKIP'
             'f9ccd3b7809b276b39527b2fc8384aaef0028d536118baedb6e079b743637420'
             'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
-            '98f29f3319e14b1419f4dcd6bc42e994bcaace0162421f739409bafc35e98d3e'
+            '70cb3454acc2ca929f71835b5325ed114e6c1977a449e6b3258781ad01fb145c'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
             'c08d12c699398ef88b764be1837b9ee11f2efd3188bd1bf4e8f85dfbeee58148'
-            'd7233371fe617895b600ad1939d8b818395276d07b8a7918b955c9590a5d1112'
             'b1c1cf770b2baab046d52687ec3dd83c543e3f45b4abeae2686c814673e0a1c5'
             '87a0849079db7bf1deefb687bcf43170f1b209d27af9950f98b049cdf233b447')
 validpgpkeys=(
@@ -67,7 +65,6 @@ prepare() {
 
   # Hotfixes
   patch -p1 -i "${srcdir}/drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch"
-  patch -p1 -i "${srcdir}/net-aquantia-Regression-on-reset-with-1.x-firmware.patch"
   patch -p1 -i "${srcdir}/fix-vboxguest-on-guests-with-more-than-4G-RAM.patch"
   patch -p1 -i "${srcdir}/partially-revert-swiotlb-remove-various-exports.patch"
 
diff --git a/config.x86_64 b/config.x86_64
index 013ab30..1f4e5e9 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.16.5 Kernel Configuration
+# Linux/x86 4.16.6 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -1945,7 +1945,6 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
diff --git a/net-aquantia-Regression-on-reset-with-1.x-firmware.patch b/net-aquantia-Regression-on-reset-with-1.x-firmware.patch
deleted file mode 100644
index 7dda10a..0000000
--- a/net-aquantia-Regression-on-reset-with-1.x-firmware.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Igor Russkikh <igor.russkikh@aquantia.com>
-Date: Wed, 11 Apr 2018 15:23:24 +0300
-Subject: 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
-
diff --git a/regdom-hack-4.16.5.patch b/regdom-hack-4.16.6.patch
index 76a8db5..76a8db5 100644
--- a/regdom-hack-4.16.5.patch
+++ b/regdom-hack-4.16.6.patch