diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch | 72 | ||||
| -rw-r--r-- | PKGBUILD | 15 |
3 files changed, 13 insertions, 92 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Wed Apr 25 20:53:06 UTC 2018 +# Sat Apr 28 06:59:32 UTC 2018 pkgbase = linux-rc - pkgver = 4.16.5rc1 + pkgver = 4.16.6rc1 pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 @@ -13,10 +13,10 @@ pkgbase = linux-rc options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.16.5-rc1.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.16.5-rc1.sign - source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.4.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.4.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.16.6-rc1.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.16.6-rc1.sign + source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.5.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.5.sign source = config source = 60-linux.hook source = 90-linux.hook @@ -25,12 +25,11 @@ pkgbase = linux-rc source = 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch source = 0003-Partially-revert-swiotlb-remove-various-exports.patch source = 0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch - source = 0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch sha256sums = 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9 sha256sums = SKIP - sha256sums = 1cc472c8c6d76fc871118209892a4a3f752c22b1e6ffe149ecbc2f75324e7ba2 + sha256sums = 8291ea877fd6824e0e50be8be7aa76a434c3c42bd5bffb16deffb54f7af09ede sha256sums = SKIP - sha256sums = bad271dbda2d024daf4a2ab6e122b95b262ea80508ac8018bc61e8aa44f40cfe + sha256sums = 8c3bb050d11da6e91d3e169f76ee3ed6937e1ca64264e605ddba8108696ba011 sha256sums = SKIP sha256sums = 51f794dee6098b19b5f8ec2277f52a313584f2ff8b3abf111f2fd92a6ea118dd sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 @@ -40,7 +39,6 @@ pkgbase = linux-rc sha256sums = 545566a7358d711b8d4f9924df685e2410549e20d99e5d1c0dfaccdfeafda60d sha256sums = bef6dd7b3a749ec072614ea4ed0bd5ea1d90519731f3438e4938d5b957032cc5 sha256sums = d647211e288436bcc010019a69f4ebf9a94c33b423c650aea8098969208ec836 - sha256sums = d49a70d3b3f60c81d93735871f01ea60cafca87588d8d0d01801b2aec92e0e93 pkgname = linux-rc pkgdesc = The release candidate kernel and modules diff --git a/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch b/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch deleted file mode 100644 index d32cfc4088ae..000000000000 --- a/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch +++ /dev/null @@ -1,72 +0,0 @@ -From fb08717dc5ecf3ada73f93663b528d9d4ce4380b Mon Sep 17 00:00:00 2001 -Message-Id: <fb08717dc5ecf3ada73f93663b528d9d4ce4380b.1524129246.git.jan.steffens@gmail.com> -In-Reply-To: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com> -References: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com> -From: Igor Russkikh <igor.russkikh@aquantia.com> -Date: Wed, 11 Apr 2018 15:23:24 +0300 -Subject: [PATCH 6/6] 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 - @@ -5,8 +5,8 @@ pkgbase=linux-rc pkgrel=1 _srcname=linux-4.16 -_stable=4.16.4 -_patchver=4.16.5 +_stable=4.16.5 +_patchver=4.16.6 _rcver=1 pkgver=${_patchver}rc${_rcver} _rcpatch=patch-${_patchver}-rc${_rcver} @@ -30,7 +30,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 @@ -38,9 +37,9 @@ validpgpkeys=( ) sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' 'SKIP' - '1cc472c8c6d76fc871118209892a4a3f752c22b1e6ffe149ecbc2f75324e7ba2' + '8291ea877fd6824e0e50be8be7aa76a434c3c42bd5bffb16deffb54f7af09ede' 'SKIP' - 'bad271dbda2d024daf4a2ab6e122b95b262ea80508ac8018bc61e8aa44f40cfe' + '8c3bb050d11da6e91d3e169f76ee3ed6937e1ca64264e605ddba8108696ba011' 'SKIP' '51f794dee6098b19b5f8ec2277f52a313584f2ff8b3abf111f2fd92a6ea118dd' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' @@ -49,8 +48,7 @@ sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' 'a6119b46856ed2652c509fed380052e6df2be89c69a0d748cf7d8745bf35b871' '545566a7358d711b8d4f9924df685e2410549e20d99e5d1c0dfaccdfeafda60d' 'bef6dd7b3a749ec072614ea4ed0bd5ea1d90519731f3438e4938d5b957032cc5' - 'd647211e288436bcc010019a69f4ebf9a94c33b423c650aea8098969208ec836' - 'd49a70d3b3f60c81d93735871f01ea60cafca87588d8d0d01801b2aec92e0e93') + 'd647211e288436bcc010019a69f4ebf9a94c33b423c650aea8098969208ec836') _kernelname=${pkgbase#linux} @@ -79,9 +77,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/58158 - 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 |