Hello_User/linux-vfio
1
0
Fork 0
forked from AUR/linux-vfio
Code Issues Pull Requests Projects Releases Wiki Activity

Update to 4.19.8.arch1-1

Browse Source
This commit is contained in:
Mark Weiman 2018-12-12 11:29:25 -05:00
parent daa4ab363a
commit eb625e082b
4 changed files with 48 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.SRCINFO
View File

@ -1,7 +1,7 @@
pkgbase = linux-vfio pkgbase = linux-vfio
pkgver = 4.18.16.arch1 pkgver = 4.19.8.arch1
pkgrel = 1 pkgrel = 1
url = https://git.archlinux.org/linux.git/log/?h=v4.18.16-arch1 url = https://git.archlinux.org/linux.git/log/?h=v4.19.8-arch1
arch = x86_64 arch = x86_64
license = GPL2 license = GPL2
makedepends = xmlto makedepends = xmlto
@ -13,7 +13,7 @@ pkgbase = linux-vfio
makedepends = python-sphinx makedepends = python-sphinx
makedepends = graphviz makedepends = graphviz
options = !strip options = !strip
source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v4.18.16-arch1 source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v4.19.8-arch1
source = config source = config
source = 60-linux.hook source = 60-linux.hook
source = 90-linux.hook source = 90-linux.hook
@ -28,8 +28,8 @@ pkgbase = linux-vfio
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
sha256sums = 5687fbf6508be9c133c721f368be9e572751f27798995af468a363c5f2aedd33 sha256sums = aca1e02ec3e04122e82426762e133054a0124ce236b005fe610240a93c870b87
sha256sums = fc1734c1d24aca66015d93f8636afd52afa0f939516d83efb3457da6b5044944 sha256sums = afb4c025d1180c1c8d9419910910f44755a4aefc711c2f0d4fee374d6b33e0d5
pkgname = linux-vfio pkgname = linux-vfio
pkgdesc = The Linux-vfio kernel and modules pkgdesc = The Linux-vfio kernel and modules

6
PKGBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Mark Weiman <markzz@archlinux.net> # Maintainer: Mark Weiman <markzz@archlinux.net>
pkgbase=linux-vfio pkgbase=linux-vfio
_srcver=4.18.16-arch1 _srcver=4.19.8-arch1
pkgver=${_srcver//-/.} pkgver=${_srcver//-/.}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)
@ -30,8 +30,8 @@ sha256sums=('SKIP'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
'5687fbf6508be9c133c721f368be9e572751f27798995af468a363c5f2aedd33' 'aca1e02ec3e04122e82426762e133054a0124ce236b005fe610240a93c870b87'
'fc1734c1d24aca66015d93f8636afd52afa0f939516d83efb3457da6b5044944') 'afb4c025d1180c1c8d9419910910f44755a4aefc711c2f0d4fee374d6b33e0d5')
_kernelname=${pkgbase#linux} _kernelname=${pkgbase#linux}
: ${_kernelname:=-ARCH} : ${_kernelname:=-ARCH}

28
add-acs-overrides.patch
View File

@ -1,7 +1,7 @@
From 3cf550fd8ca366897abe643442d198d1647cadc7 Mon Sep 17 00:00:00 2001 From 5ffe511d5d8b5e803c8fa7249438efca7368b4c4 Mon Sep 17 00:00:00 2001
From: Mark Weiman <mark.weiman@markzz.com> From: Mark Weiman <mark.weiman@markzz.com>
Date: Sun, 12 Aug 2018 11:36:21 -0400 Date: Wed, 12 Dec 2018 10:18:35 -0500
Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.17.14) Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.18)
This an updated version of Alex Williamson's patch from: This an updated version of Alex Williamson's patch from:
https://lkml.org/lkml/2013/5/30/513 https://lkml.org/lkml/2013/5/30/513
@ -44,18 +44,16 @@ Note to hardware vendors, we have facilities to permanently quirk
specific devices which enforce isolation but not provide an ACS specific devices which enforce isolation but not provide an ACS
capability. Please contact me to have your devices added and save capability. Please contact me to have your devices added and save
your customers the hassle of this boot option. your customers the hassle of this boot option.
Signed-off-by: Mark Weiman <mark.weiman@markzz.com>
--- ---
.../admin-guide/kernel-parameters.txt | 8 ++ .../admin-guide/kernel-parameters.txt | 8 ++
drivers/pci/quirks.c | 102 ++++++++++++++++++ drivers/pci/quirks.c | 102 ++++++++++++++++++
2 files changed, 110 insertions(+) 2 files changed, 110 insertions(+)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index ff4ba249a26f..e23d259d461f 100644 index 1370b424a453..e9334812da5d 100644
--- a/Documentation/admin-guide/kernel-parameters.txt --- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3019,6 +3019,14 @@ @@ -3106,6 +3106,14 @@
nomsi [MSI] If the PCI_MSI kernel config parameter is nomsi [MSI] If the PCI_MSI kernel config parameter is
enabled, this kernel boot option can be used to enabled, this kernel boot option can be used to
disable the use of MSI interrupts system-wide. disable the use of MSI interrupts system-wide.
@ -71,11 +69,11 @@ index ff4ba249a26f..e23d259d461f 100644
Safety option to keep boot IRQs enabled. This Safety option to keep boot IRQs enabled. This
should never be necessary. should never be necessary.
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 785a29ba4f51..63fb2096f90d 100644 index a4d11d14b196..0be08f804e87 100644
--- a/drivers/pci/quirks.c --- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c
@@ -3533,6 +3533,106 @@ static int __init pci_apply_final_quirks(void) @@ -186,6 +186,106 @@ static int __init pci_apply_final_quirks(void)
}
fs_initcall_sync(pci_apply_final_quirks); fs_initcall_sync(pci_apply_final_quirks);
+static bool acs_on_downstream; +static bool acs_on_downstream;
@ -179,17 +177,17 @@ index 785a29ba4f51..63fb2096f90d 100644
+} +}
+ +
/* /*
* Following are device-specific reset methods which can be used to * Decoding should be disabled for a PCI device during BAR sizing to avoid
* reset a single function if other methods (e.g. FLR, PM D0->D3) are * conflict. But doing so may cause problems on host bridge and perhaps other
@@ -4401,6 +4501,8 @@ static const struct pci_dev_acs_enabled { @@ -4393,6 +4493,8 @@ static const struct pci_dev_acs_enabled {
{ PCI_VENDOR_ID_AMPERE, 0xE00A, pci_quirk_xgene_acs }, { PCI_VENDOR_ID_AMPERE, 0xE00A, pci_quirk_xgene_acs },
{ PCI_VENDOR_ID_AMPERE, 0xE00B, pci_quirk_xgene_acs }, { PCI_VENDOR_ID_AMPERE, 0xE00B, pci_quirk_xgene_acs },
{ PCI_VENDOR_ID_AMPERE, 0xE00C, pci_quirk_xgene_acs }, { PCI_VENDOR_ID_AMPERE, 0xE00C, pci_quirk_xgene_acs },
+ /* allow acs for any */ + /* allow acs for any */
+ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides }, + { PCI_ANY_ID, PCI_ANY_ID, pci_acs_overrides },
{ 0 } { 0 }
}; };
-- --
2.18.0 2.20.0

48
i915-vga-arbiter.patch
View File

@ -1,8 +1,8 @@
From d6c4ee204c18e0f15ac425928c594ec4e901d0c8 Mon Sep 17 00:00:00 2001 From a95d3e5bab8d9d6482e81f1c3ea24c16acb2cb42 Mon Sep 17 00:00:00 2001
From: Mark Weiman <mark.weiman@markzz.com> From: Mark Weiman <mark.weiman@markzz.com>
Date: Sun, 24 Jun 2018 12:43:14 -0400 Date: Wed, 12 Dec 2018 10:31:24 -0500
Subject: [PATCH] [PATCH] i915: Add module option to support VGA arbiter on HD Subject: [PATCH] i915: Add module option to support VGA arbiter on HD devices
devices (4.17) (4.19)
This is an updated version of Alex Williamson's patch from: This is an updated version of Alex Williamson's patch from:
https://lkml.org/lkml/2014/5/9/517 https://lkml.org/lkml/2014/5/9/517
@ -34,8 +34,6 @@ VGA devices.
This also rolls in reverted commit 6e1b4fda, which corrected an This also rolls in reverted commit 6e1b4fda, which corrected an
ordering issue with 81b5c7bc by delaying the disabling of VGA memory ordering issue with 81b5c7bc by delaying the disabling of VGA memory
until after vgacon->fbcon handoff. until after vgacon->fbcon handoff.
Signed-off-by: Mark Weiman <mark.weiman@markzz.com>
--- ---
drivers/gpu/drm/i915/i915_drv.c | 23 +++++++++++++++---- drivers/gpu/drm/i915/i915_drv.c | 23 +++++++++++++++----
drivers/gpu/drm/i915/i915_params.c | 3 +++ drivers/gpu/drm/i915/i915_params.c | 3 +++
@ -45,10 +43,10 @@ Signed-off-by: Mark Weiman <mark.weiman@markzz.com>
5 files changed, 57 insertions(+), 4 deletions(-) 5 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 3b4daafebdcb..1c79e6c3c54e 100644 index f8cfd16be534..f5ba210d7b00 100644
--- a/drivers/gpu/drm/i915/i915_drv.c --- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -665,11 +665,20 @@ static int i915_load_modeset_init(struct drm_device *dev) @@ -650,11 +650,20 @@ static int i915_load_modeset_init(struct drm_device *dev)
* If we are a secondary display controller (!PCI_DISPLAY_CLASS_VGA), * If we are a secondary display controller (!PCI_DISPLAY_CLASS_VGA),
* then we do not take part in VGA arbitration and the * then we do not take part in VGA arbitration and the
* vga_client_register() fails with -ENODEV. * vga_client_register() fails with -ENODEV.
@ -73,7 +71,7 @@ index 3b4daafebdcb..1c79e6c3c54e 100644
intel_register_dsm_handler(); intel_register_dsm_handler();
ret = vga_switcheroo_register_client(pdev, &i915_switcheroo_ops, false); ret = vga_switcheroo_register_client(pdev, &i915_switcheroo_ops, false);
@@ -710,6 +719,12 @@ static int i915_load_modeset_init(struct drm_device *dev) @@ -693,6 +702,12 @@ static int i915_load_modeset_init(struct drm_device *dev)
if (ret) if (ret)
goto cleanup_gem; goto cleanup_gem;
@ -87,12 +85,12 @@ index 3b4daafebdcb..1c79e6c3c54e 100644
intel_hpd_init(dev_priv); intel_hpd_init(dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 08108ce5be21..9b0f44dcfb37 100644 index 295e981e4a39..243edeee97dd 100644
--- a/drivers/gpu/drm/i915/i915_params.c --- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c
@@ -133,6 +133,9 @@ i915_param_named(disable_display, bool, 0400, @@ -126,6 +126,9 @@ i915_param_named_unsafe(invert_brightness, int, 0600,
i915_param_named_unsafe(enable_cmd_parser, bool, 0400, i915_param_named(disable_display, bool, 0400,
"Enable command parsing (true=enabled [default], false=disabled)"); "Disable display (default: false)");
+i915_param_named(enable_hd_vgaarb, bool, 0444, +i915_param_named(enable_hd_vgaarb, bool, 0444,
+ "Enable support for VGA arbitration on Intel HD IGD. (default: false)"); + "Enable support for VGA arbitration on Intel HD IGD. (default: false)");
@ -101,22 +99,22 @@ index 08108ce5be21..9b0f44dcfb37 100644
"Enable the MMIO debug code for the first N failures (default: off). " "Enable the MMIO debug code for the first N failures (default: off). "
"This may negatively affect performance."); "This may negatively affect performance.");
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 430f5f9d0ff4..52e9081ad39d 100644 index 6c4d4a21474b..72b9bca3cc14 100644
--- a/drivers/gpu/drm/i915/i915_params.h --- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h
@@ -58,6 +58,7 @@ struct drm_printer; @@ -57,6 +57,7 @@ struct drm_printer;
param(unsigned int, inject_load_failure, 0) \
/* leave bools at the end to not create holes */ \ /* leave bools at the end to not create holes */ \
param(bool, alpha_support, IS_ENABLED(CONFIG_DRM_I915_ALPHA_SUPPORT)) \ param(bool, alpha_support, IS_ENABLED(CONFIG_DRM_I915_ALPHA_SUPPORT)) \
param(bool, enable_cmd_parser, true) \
+ param(bool, enable_hd_vgaarb, false) \ + param(bool, enable_hd_vgaarb, false) \
param(bool, enable_hangcheck, true) \ param(bool, enable_hangcheck, true) \
param(bool, fastboot, false) \ param(bool, fastboot, false) \
param(bool, prefault_disable, false) \ param(bool, prefault_disable, false) \
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 56004ffbd8bb..16bc85180ec3 100644 index 3bd44d042a1d..b1aaa966679b 100644
--- a/drivers/gpu/drm/i915/intel_display.c --- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14506,6 +14506,36 @@ static void i915_disable_vga(struct drm_i915_private *dev_priv) @@ -15025,6 +15025,36 @@ static void i915_disable_vga(struct drm_i915_private *dev_priv)
POSTING_READ(vga_reg); POSTING_READ(vga_reg);
} }
@ -153,7 +151,7 @@ index 56004ffbd8bb..16bc85180ec3 100644
void intel_modeset_init_hw(struct drm_device *dev) void intel_modeset_init_hw(struct drm_device *dev)
{ {
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
@@ -15025,6 +15055,7 @@ void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv) @@ -15540,6 +15570,7 @@ void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv)
if (!(I915_READ(vga_reg) & VGA_DISP_DISABLE)) { if (!(I915_READ(vga_reg) & VGA_DISP_DISABLE)) {
DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n"); DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n");
i915_disable_vga(dev_priv); i915_disable_vga(dev_priv);
@ -161,20 +159,20 @@ index 56004ffbd8bb..16bc85180ec3 100644
} }
} }
@@ -15402,6 +15433,8 @@ void intel_modeset_cleanup(struct drm_device *dev) @@ -15946,6 +15977,8 @@ void intel_modeset_cleanup(struct drm_device *dev)
{ {
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
+ i915_enable_vga_mem(dev_priv); + i915_enable_vga_mem(dev_priv);
+ +
flush_work(&dev_priv->atomic_helper.free_work); flush_workqueue(dev_priv->modeset_wq);
WARN_ON(!llist_empty(&dev_priv->atomic_helper.free_list));
flush_work(&dev_priv->atomic_helper.free_work);
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index a80fbad9be0f..1bc005cc168b 100644 index 8fc61e96754f..c1271e41e592 100644
--- a/drivers/gpu/drm/i915/intel_drv.h --- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1441,6 +1441,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv, @@ -1486,6 +1486,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,
const char *name, u32 reg); const char *name, u32 reg);
void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv); void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv);
void lpt_disable_iclkip(struct drm_i915_private *dev_priv); void lpt_disable_iclkip(struct drm_i915_private *dev_priv);
@ -183,5 +181,5 @@ index a80fbad9be0f..1bc005cc168b 100644
unsigned int intel_fb_xy_to_linear(int x, int y, unsigned int intel_fb_xy_to_linear(int x, int y,
const struct intel_plane_state *state, const struct intel_plane_state *state,
-- --
2.17.1 2.20.0