diff options
| -rw-r--r-- | .SRCINFO | 36 | ||||
| -rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 2 | ||||
| -rw-r--r-- | 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch | 2 | ||||
| -rw-r--r-- | 0003-Partially-revert-swiotlb-remove-various-exports.patch | 2 | ||||
| -rw-r--r-- | 0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch | 2 | ||||
| -rw-r--r-- | 0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch | 72 | ||||
| -rw-r--r-- | PKGBUILD | 22 |
7 files changed, 29 insertions, 109 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-bfq-mq - pkgver = 4.16.5 - pkgrel = 2 + pkgver = 4.16.6 + pkgrel = 1 url = https://github.com/Algodev-github/bfq-mq/ arch = x86_64 license = GPL2 @@ -12,8 +12,8 @@ pkgbase = linux-bfq-mq 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/patch-4.16.5.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.5.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.6.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.6.sign source = kernel_gcc_patch-20180310.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180310.tar.gz source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.16/4.16-bfq-sq-mq-git-20180410.patch source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.16/0100-Check-presence-on-tree-of-every-entity-after-every-a.patch @@ -26,12 +26,11 @@ pkgbase = linux-bfq-mq 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 validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9 sha256sums = SKIP - sha256sums = 8c3bb050d11da6e91d3e169f76ee3ed6937e1ca64264e605ddba8108696ba011 + sha256sums = 634d3fd97e5d9d90262db0a9d62ed0a40043eb691d68bd4a545f907079610b56 sha256sums = SKIP sha256sums = b2c1292e06544465b636543e6ac8a01959470d32ce3664460721671f1347c815 sha256sums = de404c2a4af012eb31829183eebc2a291489357d5cd099829b57c194d167525f @@ -41,11 +40,10 @@ pkgbase = linux-bfq-mq sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = 5f6ba52aaa528c4fa4b1dc097e8930fad0470d7ac489afcb13313f289ca32184 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 - sha256sums = 51258aefbc3d5aec92deb58d554604f8049750aa6bfa76cad86b644e14d09b9a - sha256sums = da09575187b1c1e6777e3c924cc3f92e3269559d20572107487a65c57f3e335d - sha256sums = a571ee8624c8a1f4a2ce02d77744de000cdda3ac552ec5696a35008dfa0fa1ff - sha256sums = e4ba84e7d33ab50013b499675cf670cf0ce1db8f158fd1dad02961cb9bf39efb - sha256sums = 44436c9d2c0fd4c60e1068f475f14b0a2d39618526341a08de2a8601e943a9bc + sha256sums = 928e2ba6f66c682cc93ef5bba5020007407ed32bec87d0e5018fdcb64dba35db + sha256sums = 9fb5aec08992578b9143ee76a72698fc0f567f4202bdf8ebe6cd64ce9fd63238 + sha256sums = e41680227a5eb78125a45701bad3bcfc8628fcf21b198b6e302188f0c156ef19 + sha256sums = a807cf9c06b16b08f0b2b0b2e8609914dd998258c7a275c38495f2e33e2c0807 pkgname = linux-bfq-mq pkgdesc = The Linux-bfq-mq kernel and modules with the BFQ-MQ scheduler @@ -56,19 +54,19 @@ pkgname = linux-bfq-mq depends = mkinitcpio>=0.7 optdepends = crda: to set the correct wireless channels of your country optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig - provides = linux-bfq-mq=4.16.5 - provides = linux=4.16.5 + provides = linux-bfq-mq=4.16.6 + provides = linux=4.16.6 backup = etc/mkinitcpio.d/linux-bfq-mq.preset pkgname = linux-bfq-mq-headers pkgdesc = Header files and scripts for building modules for Linux-bfq-mq kernel - depends = linux-bfq-mq=4.16.5 - provides = linux-bfq-mq-headers=4.16.5 - provides = linux-headers=4.16.5 + depends = linux-bfq-mq=4.16.6 + provides = linux-bfq-mq-headers=4.16.6 + provides = linux-headers=4.16.6 pkgname = linux-bfq-mq-docs pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-bfq-mq kernel - depends = linux-bfq-mq=4.16.5 - provides = linux-bfq-mq-docs=4.16.5 - provides = linux-docs=4.16.5 + depends = linux-bfq-mq=4.16.6 + provides = linux-bfq-mq-docs=4.16.6 + provides = linux-docs=4.16.6 diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch index b2f326324412..bb734e91965e 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -2,7 +2,7 @@ From 3a7745f6fdd71aa34dae33c3edc586363d9ece9e Mon Sep 17 00:00:00 2001 Message-Id: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.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> diff --git a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch index b97ed8832f60..fa5e4f91106e 100644 --- a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch +++ b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch @@ -4,7 +4,7 @@ In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffe References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.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 diff --git a/0003-Partially-revert-swiotlb-remove-various-exports.patch b/0003-Partially-revert-swiotlb-remove-various-exports.patch index 69e45899cc67..fdedd7ee8b17 100644 --- a/0003-Partially-revert-swiotlb-remove-various-exports.patch +++ b/0003-Partially-revert-swiotlb-remove-various-exports.patch @@ -4,7 +4,7 @@ In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffe References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.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. diff --git a/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch b/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch index c192a360d57b..a1d531150e11 100644 --- a/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch +++ b/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch @@ -4,7 +4,7 @@ In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffe References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.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: 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 7ab8e37cb78b..000000000000 --- a/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 33feec41e6d35bbc679befe5ec0fb12acef18c95 Mon Sep 17 00:00:00 2001 -Message-Id: <33feec41e6d35bbc679befe5ec0fb12acef18c95.1523790169.git.jan.steffens@gmail.com> -In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com> -References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.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 - @@ -62,10 +62,10 @@ _1k_HZ_ticks= pkgbase=linux-bfq-mq #pkgbase=linux-custom # Build kernel with a different name -pkgver=4.16.5 +pkgver=4.16.6 _srcpatch="${pkgver##*\.*\.}" _srcname="linux-${pkgver%%\.${_srcpatch}}" -pkgrel=2 +pkgrel=1 arch=('x86_64') url="https://github.com/Algodev-github/bfq-mq/" license=('GPL2') @@ -104,12 +104,11 @@ source=(# mainline kernel patches '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-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch' - '0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch') + '0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch') sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' 'SKIP' - '8c3bb050d11da6e91d3e169f76ee3ed6937e1ca64264e605ddba8108696ba011' + '634d3fd97e5d9d90262db0a9d62ed0a40043eb691d68bd4a545f907079610b56' 'SKIP' 'b2c1292e06544465b636543e6ac8a01959470d32ce3664460721671f1347c815' 'de404c2a4af012eb31829183eebc2a291489357d5cd099829b57c194d167525f' @@ -119,11 +118,10 @@ sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' '5f6ba52aaa528c4fa4b1dc097e8930fad0470d7ac489afcb13313f289ca32184' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - '51258aefbc3d5aec92deb58d554604f8049750aa6bfa76cad86b644e14d09b9a' - 'da09575187b1c1e6777e3c924cc3f92e3269559d20572107487a65c57f3e335d' - 'a571ee8624c8a1f4a2ce02d77744de000cdda3ac552ec5696a35008dfa0fa1ff' - 'e4ba84e7d33ab50013b499675cf670cf0ce1db8f158fd1dad02961cb9bf39efb' - '44436c9d2c0fd4c60e1068f475f14b0a2d39618526341a08de2a8601e943a9bc') + '928e2ba6f66c682cc93ef5bba5020007407ed32bec87d0e5018fdcb64dba35db' + '9fb5aec08992578b9143ee76a72698fc0f567f4202bdf8ebe6cd64ce9fd63238' + 'e41680227a5eb78125a45701bad3bcfc8628fcf21b198b6e302188f0c156ef19' + 'a807cf9c06b16b08f0b2b0b2e8609914dd998258c7a275c38495f2e33e2c0807') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -154,10 +152,6 @@ prepare() { ### Fix https://bugs.archlinux.org/task/58153 msg "Fix #58153" patch -Np1 -i ../0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch - - ### Fix https://bugs.archlinux.org/task/58174 - msg "Fix #58174" - patch -Np1 -i ../0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch ### Patch source with BFQ-SQ-MQ _ver="$(cat Makefile | grep -m1 -e SUBLEVEL | grep -o "[[:digit:]]*")" |