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

Update to 5.8.1.arch1

Browse Source
This commit is contained in:
Katelyn Schiesser 2020-08-15 16:38:16 -07:00
parent e24c122396
commit ed1f9bd7f2
5 changed files with 319 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.SRCINFO
View File

@ -1,8 +1,8 @@
pkgbase = linux-vfio pkgbase = linux-vfio
pkgdesc = Linux pkgdesc = Linux
pkgver = 5.7.12.arch1 pkgver = 5.8.1.arch1
pkgrel = 1 pkgrel = 1
url = https://git.archlinux.org/linux.git/log/?h=v5.7.12-arch1 url = https://git.archlinux.org/linux.git/log/?h=v5.8.1-arch1
arch = x86_64 arch = x86_64
license = GPL2 license = GPL2
makedepends = bc makedepends = bc
@ -16,7 +16,7 @@ pkgbase = linux-vfio
makedepends = imagemagick makedepends = imagemagick
makedepends = git makedepends = git
options = !strip options = !strip
source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.7.12-arch1 source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.8.1-arch1
source = config source = config
source = add-acs-overrides.patch source = add-acs-overrides.patch
source = i915-vga-arbiter.patch source = i915-vga-arbiter.patch
@ -25,9 +25,9 @@ pkgbase = linux-vfio
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30 validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
sha256sums = SKIP sha256sums = SKIP
sha256sums = 6313ccad7f8e4d8ce09dd5bdb51b8dfa124d0034d7097ba47008380a14a84f09 sha256sums = 457d5c9717048cd5334ba3d14dfb37699ac1d2c6dc2fd1df93adb487d6921f2f
sha256sums = 551d2ec326df256256a9e30d336a074493435fe0dbca77fd18216f9e91c0dd00 sha256sums = 44dc46859652fef332b9223dc4de93e6a67877921711259540fbf235319538ac
sha256sums = ccb814e2c382a59b907ccb183836eda72f21214484e489b5f473beca97856704 sha256sums = 1c9bae55dc1cd0ded83774116105a24a73ad4269cdc395f9f177b20d3206497a
sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
pkgname = linux-vfio pkgname = linux-vfio

8
PKGBUILD
View File

@ -4,7 +4,7 @@
# Upstream: Jan Alexander Steffens (heftig) <heftig@archlinux.org> # Upstream: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
pkgbase=linux-vfio pkgbase=linux-vfio
pkgver=5.7.12.arch1 pkgver=5.8.1.arch1
pkgrel=1 pkgrel=1
pkgdesc='Linux' pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.} _srctag=v${pkgver%.*}-${pkgver##*.}
@ -31,9 +31,9 @@ validpgpkeys=(
'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig) 'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig)
) )
sha256sums=('SKIP' sha256sums=('SKIP'
'6313ccad7f8e4d8ce09dd5bdb51b8dfa124d0034d7097ba47008380a14a84f09' '457d5c9717048cd5334ba3d14dfb37699ac1d2c6dc2fd1df93adb487d6921f2f'
'551d2ec326df256256a9e30d336a074493435fe0dbca77fd18216f9e91c0dd00' '44dc46859652fef332b9223dc4de93e6a67877921711259540fbf235319538ac'
'ccb814e2c382a59b907ccb183836eda72f21214484e489b5f473beca97856704' '1c9bae55dc1cd0ded83774116105a24a73ad4269cdc395f9f177b20d3206497a'
'8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c') '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c')
export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_HOST=archlinux

14
add-acs-overrides.patch
View File

@ -45,16 +45,12 @@ 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.
--- ---
.../admin-guide/kernel-parameters.txt | 8 ++
drivers/pci/quirks.c | 102 ++++++++++++++++++
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 5e2ce88d6eda..958769fe0fa2 100644 index fb95fad81c79..0a1e5281809a 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
@@ -3509,6 +3509,14 @@ @@ -3568,6 +3568,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.
@ -70,7 +66,7 @@ index 5e2ce88d6eda..958769fe0fa2 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 ca9ed5774eb1..4567b0e8f2de 100644 index 2ea61abd5830..025974dfc10a 100644
--- a/drivers/pci/quirks.c --- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c
@@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void) @@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void)
@ -180,7 +176,7 @@ index ca9ed5774eb1..4567b0e8f2de 100644
/* /*
* Decoding should be disabled for a PCI device during BAR sizing to avoid * 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 * conflict. But doing so may cause problems on host bridge and perhaps other
@@ -4796,6 +4896,8 @@ static const struct pci_dev_acs_enabled { @@ -4824,6 +4924,8 @@ static const struct pci_dev_acs_enabled {
{ PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs }, { PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs },
/* Zhaoxin Root/Downstream Ports */ /* Zhaoxin Root/Downstream Ports */
{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs }, { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
@ -189,5 +185,3 @@ index ca9ed5774eb1..4567b0e8f2de 100644
{ 0 } { 0 }
}; };
--
2.26.2

432
config
View File

File diff suppressed because it is too large Load Diff

27
i915-vga-arbiter.patch
View File

@ -37,10 +37,10 @@ until after vgacon->fbcon handoff.
--- ---
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 346846609f45..18be17cb56e3 100644 index 26996e1839e2..2569e2a91e6b 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c --- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -18753,6 +18753,7 @@ static void intel_hpd_poll_fini(struct drm_i915_private *i915) @@ -18665,6 +18665,7 @@ static void intel_hpd_poll_fini(struct drm_i915_private *i915)
/* part #1: call before irq uninstall */ /* part #1: call before irq uninstall */
void intel_modeset_driver_remove(struct drm_i915_private *i915) void intel_modeset_driver_remove(struct drm_i915_private *i915)
{ {
@ -49,10 +49,10 @@ index 346846609f45..18be17cb56e3 100644
flush_workqueue(i915->modeset_wq); flush_workqueue(i915->modeset_wq);
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index adb1225a3480..f39229c12938 100644 index 3a06f72c9859..8c034bbf455a 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h --- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -503,6 +503,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv, @@ -507,6 +507,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,
void lpt_pch_enable(const struct intel_crtc_state *crtc_state); void lpt_pch_enable(const struct intel_crtc_state *crtc_state);
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);
@ -104,7 +104,7 @@ index be333699c515..a76aa52cde76 100644
i915_reg_t vga_reg = intel_vga_cntrl_reg(dev_priv); i915_reg_t vga_reg = intel_vga_cntrl_reg(dev_priv);
@@ -49,6 +80,7 @@ void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv) @@ -49,6 +80,7 @@ void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv)
drm_dbg_kms(&dev_priv->drm, drm_dbg_kms(&dev_priv->drm,
"Something enabled VGA plane, disabling it\n"); "Something enabled VGA plane, disabling it\n");
intel_vga_disable(dev_priv); intel_vga_disable(dev_priv);
+ intel_vga_disable_mem(dev_priv); + intel_vga_disable_mem(dev_priv);
} }
@ -124,25 +124,25 @@ index ba5b55b917f0..7e2af7924e99 100644
+ +
#endif /* __INTEL_VGA_H__ */ #endif /* __INTEL_VGA_H__ */
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 81a4621853db..e2576468f040 100644 index 34ee12f3f02d..a46477eb9e34 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
@@ -232,9 +232,11 @@ static int i915_driver_modeset_probe_noirq(struct drm_i915_private *i915) @@ -233,9 +233,11 @@ static int i915_driver_modeset_probe_noirq(struct drm_i915_private *i915)
intel_bios_init(i915); intel_bios_init(i915);
- ret = intel_vga_register(i915); - ret = intel_vga_register(i915);
- if (ret) - if (ret)
- goto out; - goto cleanup_bios;
+ if (!i915_modparams.enable_hd_vgaarb || !HAS_PCH_SPLIT(i915)) { + if (!i915_modparams.enable_hd_vgaarb || !HAS_PCH_SPLIT(i915)) {
+ ret = intel_vga_register(i915); + ret = intel_vga_register(i915);
+ if (ret) + if (ret)
+ goto out; + goto cleanup_bios;
+ } + }
intel_power_domains_init_hw(i915, false); intel_power_domains_init_hw(i915, false);
@@ -276,6 +278,12 @@ static int i915_driver_modeset_probe(struct drm_i915_private *i915) @@ -280,6 +282,12 @@ static int i915_driver_modeset_probe(struct drm_i915_private *i915)
if (ret) if (ret)
goto cleanup_gem; goto cleanup_gem;
@ -156,7 +156,7 @@ index 81a4621853db..e2576468f040 100644
intel_hpd_init(i915); intel_hpd_init(i915);
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 add00ec1f787..e4f49c63a397 100644 index 02559da61e6e..da4f8fe3b2a6 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
@@ -121,6 +121,9 @@ i915_param_named_unsafe(invert_brightness, int, 0600, @@ -121,6 +121,9 @@ i915_param_named_unsafe(invert_brightness, int, 0600,
@ -170,7 +170,7 @@ index add00ec1f787..e4f49c63a397 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 45323732f099..304987c4f9e8 100644 index 4f21bfffbf0e..3f3bfb5eff5d 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
@@ -70,6 +70,7 @@ struct drm_printer; @@ -70,6 +70,7 @@ struct drm_printer;
@ -181,6 +181,3 @@ index 45323732f099..304987c4f9e8 100644
param(bool, enable_hangcheck, true, 0600) \ param(bool, enable_hangcheck, true, 0600) \
param(bool, load_detect_test, false, 0600) \ param(bool, load_detect_test, false, 0600) \
param(bool, force_reset_modeset_test, false, 0600) \ param(bool, force_reset_modeset_test, false, 0600) \
--
5.5.5