Changed to build linux-5.12.14

Changed the URL to direct to github.com instead of git.archlinux.org since arch moved to github.com

3 files changed, 16 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3fd1b22904b0..0f033d8b6da4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = linux-fix_navi_reset
 	pkgdesc = experimental fix for AMD-Cards with "Unknown PCI header type 127" by Geoffrey McRae
-	pkgver = 5.12.8.arch1
+	pkgver = 5.12.14.arch1
 	pkgrel = 1
-	url = https://git.archlinux.org/linux.git/log/?h=v5.12.8-arch1
+	url = https://git.archlinux.org/linux.git/log/?h=v5.12.14-arch1
 	arch = x86_64
 	license = GPL2
 	makedepends = bc
@@ -16,7 +16,7 @@ pkgbase = linux-fix_navi_reset
 	makedepends = imagemagick
 	makedepends = git
 	options = !strip
-	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.12.8-arch1
+	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.12.14-arch1
 	source = config
 	source = sphinx-workaround.patch
 	source = navi_reset.patch
diff --git a/PKGBUILD b/PKGBUILD
index 4b348a79f104..c2253335fd64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,22 @@
 # Maintainer: 1400Blank <1400blank@gmail.com>
 
 pkgbase=linux-fix_navi_reset
-pkgver=5.12.8.arch1
+pkgver=5.12.14.arch1
 pkgrel=1
 pkgdesc='experimental fix for AMD Navi Cards with "Unknown PCI header type 127" by Geoffrey McRae'
 _srctag=v${pkgver%.*}-${pkgver##*.}
-url="https://git.archlinux.org/linux.git/log/?h=$_srctag"
+url="https://github.com/archlinux/linux/commits/$_srctag"
 arch=(x86_64)
 license=(GPL2)
 makedepends=(
-  bc kmod libelf pahole
+  bc kmod libelf pahole cpio perl tar xz
   xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick
   git
 )
 options=('!strip')
 _srcname=archlinux-linux
 source=(
-  "$_srcname::git+https://git.archlinux.org/linux.git?signed#tag=$_srctag"
+  "$_srcname::git+https://github.com/archlinux/linux?signed#tag=$_srctag"
   config         # the main kernel config file
   navi_reset.patch
 )
@@ -27,8 +27,7 @@ validpgpkeys=(
 )
 sha256sums=('SKIP'
             '623601ed9d7879dd9dba1cd50fc8051f9db508b49b4fc0c47c5a9eb9165fc04e'
-            '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
-            '4725968648c12546cbd19f71ab2e37507484316d8f85270ff2741ba8def60da1')
+            '3d8899948333e2aab96150a9ff6e9d944b1bae8a59acde78aa88bb385224c855')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
@@ -97,6 +96,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+  depends=(pahole)
 
   cd $_srcname
   local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
@@ -201,6 +201,3 @@ for _p in "${pkgname[@]}"; do
 done
 
 # vim:set ts=8 sts=2 sw=2 et:
-sha256sums=('SKIP'
-            '623601ed9d7879dd9dba1cd50fc8051f9db508b49b4fc0c47c5a9eb9165fc04e'
-            '4725968648c12546cbd19f71ab2e37507484316d8f85270ff2741ba8def60da1')
diff --git a/navi_reset.patch b/navi_reset.patch
index 41c7dcaf322a..83c203cfde6f 100644
--- a/navi_reset.patch
+++ b/navi_reset.patch
@@ -1,8 +1,6 @@
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 44c4ae1abd00..a3325beff5a6 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -3825,6 +3825,131 @@ static int delay_250ms_after_flr(struct pci_dev *dev, int probe)
+--- a/drivers/pci/quirks.c	2021-07-04 16:26:40.345636618 +0200
++++ b/drivers/pci/quirks.c	2021-07-04 16:14:15.504916148 +0200
+@@ -3998,6 +3998,132 @@
  	return 0;
  }
  
@@ -131,13 +129,14 @@ index 44c4ae1abd00..a3325beff5a6 100644
 +	return 0;
 +}
 +
++
  static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {
  	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82599_SFP_VF,
  		 reset_intel_82599_sfp_virtfn },
-@@ -3836,6 +3961,13 @@ static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {
- 	{ PCI_VENDOR_ID_INTEL, 0x0953, delay_250ms_after_flr },
- 	{ PCI_VENDOR_ID_CHELSIO, PCI_ANY_ID,
+@@ -4011,6 +4137,13 @@
  		reset_chelsio_generic_dev },
+ 	{ PCI_VENDOR_ID_HUAWEI, PCI_DEVICE_ID_HINIC_VF,
+ 		reset_hinic_vf_dev },
 +	{ PCI_VENDOR_ID_ATI, 0x7310, reset_amd_navi10 },
 +	{ PCI_VENDOR_ID_ATI, 0x7312, reset_amd_navi10 },
 +	{ PCI_VENDOR_ID_ATI, 0x7318, reset_amd_navi10 },
@@ -148,5 +147,3 @@ index 44c4ae1abd00..a3325beff5a6 100644
  	{ 0 }
  };
  
--- 
-2.20.1