From a9a82ab82201b3ac54f5370b68570fb983cabd85 Mon Sep 17 00:00:00 2001 From: Mark Weiman Date: Tue, 13 Feb 2018 11:39:42 -0500 Subject: [PATCH] Update to 4.15.2-1 --- .SRCINFO | 10 +++-- ...-Do-not-disable-PCI-host-on-non-Mips.patch | 37 +++++++++++++++++++ PKGBUILD | 11 ++++-- 3 files changed, 51 insertions(+), 7 deletions(-) create mode 100644 0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch diff --git a/.SRCINFO b/.SRCINFO index bce02f4..7a05131 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = linux-vfio - pkgver = 4.15.1 + pkgver = 4.15.2 pkgrel = 1 url = http://www.kernel.org/ arch = x86_64 @@ -13,8 +13,8 @@ pkgbase = linux-vfio options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.1.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.1.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.2.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.2.sign source = config source = 60-linux.hook source = 90-linux.hook @@ -23,11 +23,12 @@ pkgbase = linux-vfio source = i915-vga-arbiter.patch source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch source = 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch + source = 0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769 sha256sums = SKIP - sha256sums = 202a0a34f221ae335de096c292927d7a7d4bcdbc2dd46d43b8a5f6420f95a0cf + sha256sums = 812499c5d0cc5183606dc9388084df162ca2eb5fa374d8f8b00136fd82825847 sha256sums = SKIP sha256sums = 57400ed3b21281ad84d72756ce98815c8f6073b8c53b3bc6d73120c47902a263 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 @@ -37,6 +38,7 @@ pkgbase = linux-vfio sha256sums = 7cb4a5da6bf551dbb2db2e0b4e4d0774ee98cc30d9e617e030b27e6cba3e6293 sha256sums = 7b7363b53c68f52b119df994c9c08d4f29271b408f021366ab23f862518bd9bc sha256sums = ac996455cddccc312d93e63845d92b2d8ab8fb53208a221948d28c76c678d215 + sha256sums = b21406c060cf601f879528cfa1b83f524c44d8ecd99689c331a7c6326653d0be pkgname = linux-vfio pkgdesc = The Linux-vfio kernel and modules diff --git a/0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch b/0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch new file mode 100644 index 0000000..f1102e0 --- /dev/null +++ b/0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch @@ -0,0 +1,37 @@ +From 1a0e4c170e4622947c0d1d530d63a3241a99b93c Mon Sep 17 00:00:00 2001 +Message-Id: <1a0e4c170e4622947c0d1d530d63a3241a99b93c.1518115547.git.jan.steffens@gmail.com> +In-Reply-To: +References: +From: Sven Joachim +Date: Fri, 26 Jan 2018 10:38:01 +0100 +Subject: [PATCH 3/3] ssb: Do not disable PCI host on non-Mips + +After upgrading an old laptop to 4.15-rc9, I found that the eth0 and +wlan0 interfaces had disappeared. It turns out that the b43 and b44 +drivers require SSB_PCIHOST_POSSIBLE which depends on +PCI_DRIVERS_LEGACY, a config option that only exists on Mips. + +Fixes: 58eae1416b80 ("ssb: Disable PCI host for PCI_DRIVERS_GENERIC") +Cc: stable@vger.org +Signed-off-by: Sven Joachim +Reviewed-by: James Hogan +--- + drivers/ssb/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig +index 71c73766ee22..65af12c3bdb2 100644 +--- a/drivers/ssb/Kconfig ++++ b/drivers/ssb/Kconfig +@@ -32,7 +32,7 @@ config SSB_BLOCKIO + + config SSB_PCIHOST_POSSIBLE + bool +- depends on SSB && (PCI = y || PCI = SSB) && PCI_DRIVERS_LEGACY ++ depends on SSB && (PCI = y || PCI = SSB) && (PCI_DRIVERS_LEGACY || !MIPS) + default y + + config SSB_PCIHOST +-- +2.16.1 + diff --git a/PKGBUILD b/PKGBUILD index 0b00d32..f46a1da 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=linux-vfio _srcname=linux-4.15 -pkgver=4.15.1 +pkgver=4.15.2 pkgrel=1 arch=('x86_64') url="http://www.kernel.org/" @@ -27,10 +27,11 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" 'i915-vga-arbiter.patch' 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch + 0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch ) sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' 'SKIP' - '202a0a34f221ae335de096c292927d7a7d4bcdbc2dd46d43b8a5f6420f95a0cf' + '812499c5d0cc5183606dc9388084df162ca2eb5fa374d8f8b00136fd82825847' 'SKIP' '57400ed3b21281ad84d72756ce98815c8f6073b8c53b3bc6d73120c47902a263' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' @@ -39,7 +40,8 @@ sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' '1a4a992199d4d70f7f35735f63a634bb605c2b594b7352ad5fd54512737d2784' '7cb4a5da6bf551dbb2db2e0b4e4d0774ee98cc30d9e617e030b27e6cba3e6293' '7b7363b53c68f52b119df994c9c08d4f29271b408f021366ab23f862518bd9bc' - 'ac996455cddccc312d93e63845d92b2d8ab8fb53208a221948d28c76c678d215') + 'ac996455cddccc312d93e63845d92b2d8ab8fb53208a221948d28c76c678d215' + 'b21406c060cf601f879528cfa1b83f524c44d8ecd99689c331a7c6326653d0be') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -65,6 +67,9 @@ prepare() { # https://bugs.archlinux.org/task/56711 patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch + # https://bugs.archlinux.org/task/57327 + patch -Np1 -i ../0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch + # patches for vga arbiter fix in intel systems patch -p1 -i "${srcdir}/i915-vga-arbiter.patch"