From 21b0fce3cc6577c0319f430bba023b77d5e9a7d8 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Mon, 2 Oct 2023 11:11:20 +0100 Subject: [PATCH] Bump to 6.5.5.arch1 Signed-off-by: Nikolaos Karaolidis --- 0001-add-acs-overrides.patch | 37 +++------- 0002-i915-vga-arbiter.patch | 101 +++++++++++---------------- PKGBUILD | 51 +++++++------- config | 130 ++++++++++++++++++++++++++++------- linux/PKGBUILD | 46 +++++++------ linux/config | 130 ++++++++++++++++++++++++++++------- 6 files changed, 312 insertions(+), 183 deletions(-) diff --git a/0001-add-acs-overrides.patch b/0001-add-acs-overrides.patch index 712c0eb..49bb605 100644 --- a/0001-add-acs-overrides.patch +++ b/0001-add-acs-overrides.patch @@ -1,19 +1,7 @@ -From c1ed6974bffaee49ae8a82838a4cf7cd8ebad36c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=A9clairevoyant?= - <848000+eclairevoyant@users.noreply.github.com> -Date: Sun, 1 Jan 2023 16:21:00 -0500 -Subject: [PATCH 1/2] add-acs-overrides - ---- - .../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 -index 42af9ca0127e..4f94a9f2cff0 100644 ---- a/Documentation/admin-guide/kernel-parameters.txt -+++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -4145,6 +4145,14 @@ +diff --unified --recursive --text a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt +--- a/Documentation/admin-guide/kernel-parameters.txt 2023-08-26 21:41:59.900155485 +0200 ++++ b/Documentation/admin-guide/kernel-parameters.txt 2023-08-26 21:42:33.030920840 +0200 +@@ -4256,6 +4256,14 @@ nomsi [MSI] If the PCI_MSI kernel config parameter is enabled, this kernel boot option can be used to disable the use of MSI interrupts system-wide. @@ -28,14 +16,13 @@ index 42af9ca0127e..4f94a9f2cff0 100644 noioapicquirk [APIC] Disable all boot interrupt quirks. Safety option to keep boot IRQs enabled. This should never be necessary. -diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 285acc4aaccc..7ad267e87c34 100644 ---- a/drivers/pci/quirks.c -+++ b/drivers/pci/quirks.c -@@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void) +diff --unified --recursive --text a/drivers/pci/quirks.c b/drivers/pci/quirks.c +--- a/drivers/pci/quirks.c 2023-08-26 21:42:01.850200571 +0200 ++++ b/drivers/pci/quirks.c 2023-08-26 21:42:33.030920840 +0200 +@@ -194,6 +194,106 @@ } fs_initcall_sync(pci_apply_final_quirks); - + +static bool acs_on_downstream; +static bool acs_on_multifunction; + @@ -139,7 +126,7 @@ index 285acc4aaccc..7ad267e87c34 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 -@@ -5002,6 +5102,8 @@ static const struct pci_dev_acs_enabled { +@@ -5017,6 +5117,8 @@ { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs }, /* Wangxun nics */ { PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs }, @@ -147,7 +134,5 @@ index 285acc4aaccc..7ad267e87c34 100644 + { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides }, { 0 } }; - --- -2.38.1 +-- diff --git a/0002-i915-vga-arbiter.patch b/0002-i915-vga-arbiter.patch index 0467c13..3d5fab2 100644 --- a/0002-i915-vga-arbiter.patch +++ b/0002-i915-vga-arbiter.patch @@ -1,26 +1,10 @@ -From c8894968896294c7ced91b86fb59ca2c1aa6e031 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=A9clairevoyant?= - <848000+eclairevoyant@users.noreply.github.com> -Date: Sun, 1 Jan 2023 16:21:24 -0500 -Subject: [PATCH 2/2] i915-vga-arbiter +diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/display/intel_display_driver.c package.new/drivers/gpu/drm/i915/display/intel_display_driver.c +--- package.orig/drivers/gpu/drm/i915/display/intel_display_driver.c 2023-09-23 10:14:39.000000000 +0100 ++++ package.new/drivers/gpu/drm/i915/display/intel_display_driver.copy.c 2023-10-02 11:08:54.420518964 +0100 +@@ -203,9 +203,11 @@ ---- - drivers/gpu/drm/i915/display/intel_display.c | 15 ++++++++-- - drivers/gpu/drm/i915/display/intel_display.h | 1 + - drivers/gpu/drm/i915/display/intel_vga.c | 31 ++++++++++++++++++++ - drivers/gpu/drm/i915/display/intel_vga.h | 4 +++ - drivers/gpu/drm/i915/i915_params.c | 3 ++ - drivers/gpu/drm/i915/i915_params.h | 1 + - 6 files changed, 52 insertions(+), 3 deletions(-) - -diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c -index de77054195c6..507ee4e0d1dc 100644 ---- a/drivers/gpu/drm/i915/display/intel_display.c -+++ b/drivers/gpu/drm/i915/display/intel_display.c -@@ -8656,9 +8656,11 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915) - intel_bios_init(i915); - + - ret = intel_vga_register(i915); - if (ret) - goto cleanup_bios; @@ -29,13 +13,13 @@ index de77054195c6..507ee4e0d1dc 100644 + if (ret) + goto cleanup_bios; + } - + /* FIXME: completely on the wrong abstraction layer */ - intel_power_domains_init_hw(i915, false); -@@ -8807,6 +8809,12 @@ int intel_modeset_init(struct drm_i915_private *i915) + ret = intel_power_domains_init(i915); +@@ -364,6 +366,12 @@ if (ret) return ret; - + + /* + * Must do this after fbcon init so that + * vgacon_save_screen() works during the handover. @@ -45,19 +29,18 @@ index de77054195c6..507ee4e0d1dc 100644 /* Only enable hotplug handling once the fbdev is fully set up. */ intel_hpd_init(i915); intel_hpd_poll_disable(i915); -@@ -8977,6 +8985,7 @@ void intel_modeset_driver_remove(struct drm_i915_private *i915) +@@ -410,6 +418,7 @@ if (!HAS_DISPLAY(i915)) return; - + + intel_vga_enable_mem(i915); flush_workqueue(i915->display.wq.flip); flush_workqueue(i915->display.wq.modeset); - -diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h -index 884e8e67b17c..90f932db61f0 100644 ---- a/drivers/gpu/drm/i915/display/intel_display.h -+++ b/drivers/gpu/drm/i915/display/intel_display.h -@@ -576,6 +576,7 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe); + +diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/display/intel_display.h package.new/drivers/gpu/drm/i915/display/intel_display.h +--- package.orig/drivers/gpu/drm/i915/display/intel_display.h 2023-08-26 21:42:01.223519415 +0200 ++++ package.new/drivers/gpu/drm/i915/display/intel_display.h 2023-08-26 21:47:01.677083488 +0200 +@@ -426,6 +426,7 @@ int vlv_get_hpll_vco(struct drm_i915_private *dev_priv); int vlv_get_cck_clock(struct drm_i915_private *dev_priv, const char *name, u32 reg, int ref_freq); @@ -65,14 +48,13 @@ index 884e8e67b17c..90f932db61f0 100644 int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv, const char *name, u32 reg); void intel_init_display_hooks(struct drm_i915_private *dev_priv); -diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c -index b5d058404c14..ad23732a9f21 100644 ---- a/drivers/gpu/drm/i915/display/intel_vga.c -+++ b/drivers/gpu/drm/i915/display/intel_vga.c -@@ -45,6 +45,36 @@ void intel_vga_disable(struct drm_i915_private *dev_priv) +diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/display/intel_vga.c package.new/drivers/gpu/drm/i915/display/intel_vga.c +--- package.orig/drivers/gpu/drm/i915/display/intel_vga.c 2023-08-26 21:42:01.230186236 +0200 ++++ package.new/drivers/gpu/drm/i915/display/intel_vga.c 2023-08-26 21:47:01.677083488 +0200 +@@ -47,6 +47,36 @@ intel_de_posting_read(dev_priv, vga_reg); } - + +void intel_vga_enable_mem(struct drm_i915_private *dev_priv) +{ + struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev); @@ -106,46 +88,43 @@ index b5d058404c14..ad23732a9f21 100644 void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv) { i915_reg_t vga_reg = intel_vga_cntrl_reg(dev_priv); -@@ -53,6 +83,7 @@ void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv) +@@ -55,6 +85,7 @@ drm_dbg_kms(&dev_priv->drm, "Something enabled VGA plane, disabling it\n"); intel_vga_disable(dev_priv); + intel_vga_disable_mem(dev_priv); } } - -diff --git a/drivers/gpu/drm/i915/display/intel_vga.h b/drivers/gpu/drm/i915/display/intel_vga.h -index ba5b55b917f0..7e2af7924e99 100644 ---- a/drivers/gpu/drm/i915/display/intel_vga.h -+++ b/drivers/gpu/drm/i915/display/intel_vga.h -@@ -15,4 +15,8 @@ void intel_vga_redisable_power_on(struct drm_i915_private *i915); + +diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/display/intel_vga.h package.new/drivers/gpu/drm/i915/display/intel_vga.h +--- package.orig/drivers/gpu/drm/i915/display/intel_vga.h 2023-08-26 21:42:01.230186236 +0200 ++++ package.new/drivers/gpu/drm/i915/display/intel_vga.h 2023-08-26 21:47:01.677083488 +0200 +@@ -15,4 +15,8 @@ int intel_vga_register(struct drm_i915_private *i915); void intel_vga_unregister(struct drm_i915_private *i915); - + +/* i915 vga arb patch */ +void intel_vga_enable_mem(struct drm_i915_private *i915); +void intel_vga_disable_mem(struct drm_i915_private *i915); + #endif /* __INTEL_VGA_H__ */ -diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c -index d1e4d528cb17..a00cbc6591b0 100644 ---- a/drivers/gpu/drm/i915/i915_params.c -+++ b/drivers/gpu/drm/i915/i915_params.c -@@ -154,6 +154,9 @@ i915_param_named_unsafe(invert_brightness, int, 0400, +diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/i915_params.c package.new/drivers/gpu/drm/i915/i915_params.c +--- package.orig/drivers/gpu/drm/i915/i915_params.c 2023-08-26 21:42:01.243519878 +0200 ++++ package.new/drivers/gpu/drm/i915/i915_params.c 2023-08-26 21:47:01.680416897 +0200 +@@ -160,6 +160,9 @@ i915_param_named(disable_display, bool, 0400, "Disable display (default: false)"); - + +i915_param_named(enable_hd_vgaarb, bool, 0444, + "Enable support for VGA arbitration on Intel HD IGD. (default: false)"); + i915_param_named(memtest, bool, 0400, "Perform a read/write test of all device memory on module load (default: off)"); - -diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h -index 2733cb6cfe09..f21c5b1529cc 100644 ---- a/drivers/gpu/drm/i915/i915_params.h -+++ b/drivers/gpu/drm/i915/i915_params.h -@@ -76,6 +76,7 @@ struct drm_printer; + +diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/i915_params.h package.new/drivers/gpu/drm/i915/i915_params.h +--- package.orig/drivers/gpu/drm/i915/i915_params.h 2023-08-26 21:42:01.243519878 +0200 ++++ package.new/drivers/gpu/drm/i915/i915_params.h 2023-08-26 21:47:01.680416897 +0200 +@@ -79,6 +79,7 @@ param(unsigned int, lmem_size, 0, 0400) \ param(unsigned int, lmem_bar_size, 0, 0400) \ /* leave bools at the end to not create holes */ \ @@ -153,6 +132,4 @@ index 2733cb6cfe09..f21c5b1529cc 100644 param(bool, enable_hangcheck, true, 0600) \ param(bool, load_detect_test, false, 0600) \ param(bool, force_reset_modeset_test, false, 0600) \ --- -2.38.1 - +-- diff --git a/PKGBUILD b/PKGBUILD index 299dba0..13814b7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,18 +1,16 @@ # Maintainer: Jan Alexander Steffens (heftig) pkgbase=linux-eirene -pkgver=6.4.8.arch1 +pkgver=6.5.5.arch1 pkgrel=1 pkgdesc='Linux' -_srctag=v${pkgver%.*}-${pkgver##*.} -url="https://github.com/archlinux/linux/commits/$_srctag" +url='https://github.com/archlinux/linux' arch=(x86_64) license=(GPL2) makedepends=( bc cpio gettext - git libelf pahole perl @@ -21,9 +19,11 @@ makedepends=( xz ) options=('!strip') -_srcname=archlinux-linux +_srcname=linux-${pkgver%.*} +_srctag=v${pkgver%.*}-${pkgver##*.} source=( - "$_srcname::git+https://github.com/archlinux/linux?signed#tag=$_srctag" + https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign} + $url/releases/download/$_srctag/linux-$_srctag.patch.zst{,.sig} config # the main kernel config file 0001-add-acs-overrides.patch 0002-i915-vga-arbiter.patch @@ -33,37 +33,41 @@ validpgpkeys=( ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds 647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman A2FF3A36AAA56654109064AB19802F8B0D70FC30 # Jan Alexander Steffens (heftig) - C7E7849466FE2358343588377258734B41C31549 # David Runge ) -b2sums=('SKIP' - '8e8f600cf3d4bb61aea6b12deaed0f2fecda39017758e658501b2913d34b02ca5b4e40152dfd6686b2b216bc698cbf9e789253765bfc2a413c66241b018b341f' - '08f8a109cc4ddd1625c272d6b4eddd47a9c7b676bd2a94053301f969659fdbd30a3749527088bf4246f4e6962d8d8f75ad5895ff11c69792068f196aff1c4bae' - '6628cbee66acd3b821661ad5ffb046dfffe04f2024c872e8dd2b429f038feead0ebe4a42bfd39f4830975861d70fa32de684841f6d8352b6dbf2f722b41b5b88' +# https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256sums=('8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95' + 'SKIP' + '3c1392a87b53181ffb32ad150a4f27679fe1ba4a49e56537ac8ce2302fa4a1c7' + 'SKIP' + '46451dbc3305d4c2e726a2f1943bddf697c5bb6815d93e5baed80bca82e53fdc' + 'd8b5cfb04ef3de8971ac36a55b5aecea04d891203a1a6009c67ce6c98c5e2a8d' + 'dba50d9d153787ff0dd1225ca45f0a0b2d5a46b0dccfe06200a67232cc24928e' + 'd37258e84eb1d55c6206300acfc5f12ca4f97aa2e9d9f7cd446451428f7dc1b6') +b2sums=('2152bdcd8799b89612e76c1b3794313f981e08eda23c0150e56297a07f326c85f2a7a08106eb4e4d502b2134ed69e4344263fe6a2b398af5b5d7ccd018c0899b' + 'SKIP' + 'f874eb3add9aaad46c913aa1a57c178dd5ce835e02c24692aab8fc3cf1e5c2040d381159b0b732f6fff39f9aa0e502ee2df8e82d7750ccb5f3d1c8ee391bdaf3' + 'SKIP' + '9a1770eed7e306ddd532b1df9d62c52b4f6c938d147473bed6ba92a4139654f313d7033bb6bc509f4054fa757acf33a8d73b6f36fed2a134f72d1724bf2db717' + '45f0e1b3175c3fd21f84a08c0d3f21f742635019e2add83f45bf734ee3f0a42cb6f6745c69b819c9719660bfb09fc2067652ace66315699d113de4ccc2e3b60e' + '8c7e6bdc3346ad823c70cc054457429a1fc8600f52e3ddc297c74e1ee45192ba450906325a105daaac872fa08e645e12ef2afeeedac90ac911ffe8f661024da5' 'f6652b62dc20932aff69b3f0fc8cfc30a0ac9ce6a16f4365576bfef10c0da7a2a357496a94ea54f2f6da2e33ec9a53f375fa2a8391586b3648f94e684e45cc61') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_make() { - test -s version - make KERNELRELEASE="$( localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname - make defconfig - make -s kernelrelease > version - make mrproper local src for src in "${source[@]}"; do src="${src%%::*}" src="${src##*/}" + src="${src%.zst}" [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -89,15 +93,16 @@ prepare() { sed -i 's/# CONFIG_LIVEPATCH is not set/CONFIG_LIVEPATCH=y/' .config - _make olddefconfig + make olddefconfig diff -u ../config .config || : + make -s kernelrelease > version echo "Prepared $pkgbase version $( pkgbase=linux -pkgver=6.4.8.arch1 +pkgver=6.5.5.arch1 pkgrel=1 pkgdesc='Linux' -_srctag=v${pkgver%.*}-${pkgver##*.} -url="https://github.com/archlinux/linux/commits/$_srctag" +url='https://github.com/archlinux/linux' arch=(x86_64) license=(GPL2) makedepends=( bc cpio gettext - git libelf pahole perl @@ -27,43 +25,46 @@ makedepends=( texlive-latexextra ) options=('!strip') -_srcname=archlinux-linux +_srcname=linux-${pkgver%.*} +_srctag=v${pkgver%.*}-${pkgver##*.} source=( - "$_srcname::git+https://github.com/archlinux/linux?signed#tag=$_srctag" + https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign} + $url/releases/download/$_srctag/linux-$_srctag.patch.zst{,.sig} config # the main kernel config file ) validpgpkeys=( ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds 647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman A2FF3A36AAA56654109064AB19802F8B0D70FC30 # Jan Alexander Steffens (heftig) - C7E7849466FE2358343588377258734B41C31549 # David Runge ) -b2sums=('SKIP' - '8e8f600cf3d4bb61aea6b12deaed0f2fecda39017758e658501b2913d34b02ca5b4e40152dfd6686b2b216bc698cbf9e789253765bfc2a413c66241b018b341f') +# https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256sums=('8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95' + 'SKIP' + '3c1392a87b53181ffb32ad150a4f27679fe1ba4a49e56537ac8ce2302fa4a1c7' + 'SKIP' + '46451dbc3305d4c2e726a2f1943bddf697c5bb6815d93e5baed80bca82e53fdc') +b2sums=('2152bdcd8799b89612e76c1b3794313f981e08eda23c0150e56297a07f326c85f2a7a08106eb4e4d502b2134ed69e4344263fe6a2b398af5b5d7ccd018c0899b' + 'SKIP' + 'f874eb3add9aaad46c913aa1a57c178dd5ce835e02c24692aab8fc3cf1e5c2040d381159b0b732f6fff39f9aa0e502ee2df8e82d7750ccb5f3d1c8ee391bdaf3' + 'SKIP' + '9a1770eed7e306ddd532b1df9d62c52b4f6c938d147473bed6ba92a4139654f313d7033bb6bc509f4054fa757acf33a8d73b6f36fed2a134f72d1724bf2db717') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_make() { - test -s version - make KERNELRELEASE="$( localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname - make defconfig - make -s kernelrelease > version - make mrproper local src for src in "${source[@]}"; do src="${src%%::*}" src="${src##*/}" + src="${src%.zst}" [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -71,16 +72,17 @@ prepare() { echo "Setting config..." cp ../config .config - _make olddefconfig + make olddefconfig diff -u ../config .config || : + make -s kernelrelease > version echo "Prepared $pkgbase version $(