From 315412ae0c5e84afcd1d2032d5ddc852dabdf578 Mon Sep 17 00:00:00 2001 From: Katelyn Schiesser Date: Tue, 5 May 2020 15:07:21 -0700 Subject: [PATCH] Update to 5.6.10.arch1 --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- add-acs-overrides.patch | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0bedd20..8be6fa2 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ pkgbase = linux-vfio pkgdesc = Linux - pkgver = 5.6.8.arch1 + pkgver = 5.6.10.arch1 pkgrel = 1 - url = https://git.archlinux.org/linux.git/log/?h=v5.6.8-arch1 + url = https://git.archlinux.org/linux.git/log/?h=v5.6.10-arch1 arch = x86_64 license = GPL2 makedepends = bc @@ -15,7 +15,7 @@ pkgbase = linux-vfio makedepends = imagemagick makedepends = git options = !strip - source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.6.8-arch1 + source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.6.10-arch1 source = config source = add-acs-overrides.patch source = i915-vga-arbiter.patch @@ -25,7 +25,7 @@ pkgbase = linux-vfio validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA sha256sums = SKIP sha256sums = f392c9ecbb5177ea2573aaf22935322940ea2be0366f3fb9c9f861431f4aed21 - sha256sums = c39393514e5a9e215628177b5258fc63d1ba4f9a223e91076ef9eccb4395d6a8 + sha256sums = 1f11475db0778b7c4a4d6b07c86c2421ea01a653d6ee18d564204903d1ec0a8b sha256sums = 094a29902b52cec2f0840219225a1458ca925f875524ecb7827da62a33c74ccf sha256sums = e2e2e64ed4b716046a999b880fe41def580eca89fb6eb412ed141d2d3c7715da diff --git a/PKGBUILD b/PKGBUILD index 12466b6..e630eb2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Upstream: Jan Alexander Steffens (heftig) pkgbase=linux-vfio -pkgver=5.6.8.arch1 +pkgver=5.6.10.arch1 pkgrel=1 pkgdesc='Linux' _srctag=v${pkgver%.*}-${pkgver##*.} @@ -32,7 +32,7 @@ validpgpkeys=( ) sha256sums=('SKIP' 'f392c9ecbb5177ea2573aaf22935322940ea2be0366f3fb9c9f861431f4aed21' - 'c39393514e5a9e215628177b5258fc63d1ba4f9a223e91076ef9eccb4395d6a8' + '1f11475db0778b7c4a4d6b07c86c2421ea01a653d6ee18d564204903d1ec0a8b' '094a29902b52cec2f0840219225a1458ca925f875524ecb7827da62a33c74ccf' 'e2e2e64ed4b716046a999b880fe41def580eca89fb6eb412ed141d2d3c7715da') diff --git a/add-acs-overrides.patch b/add-acs-overrides.patch index 43dc095..ce4efd0 100644 --- a/add-acs-overrides.patch +++ b/add-acs-overrides.patch @@ -179,14 +179,14 @@ index fbeb9f73ef28..3bf409c65609 100644 /* * Decoding should be disabled for a PCI device during BAR sizing to avoid * conflict. But doing so may cause problems on host bridge and perhaps other -@@ -4767,6 +4867,8 @@ static const struct pci_dev_acs_enabled { - { PCI_VENDOR_ID_BROADCOM, 0xD714, pci_quirk_brcm_acs }, - /* Amazon Annapurna Labs */ - { PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031, pci_quirk_al_acs }, +@@ -4796,6 +4896,8 @@ static const struct pci_dev_acs_enabled { + { PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs }, + /* Zhaoxin Root/Downstream Ports */ + { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs }, + /* allow acs for any */ + { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides }, { 0 } }; - + -- -5.5.6 +5.6.10