update kernel to 5.15.11

9 files changed, 64 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f0f214d115b..04396e8bd90c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-vfio-manjaro
-	pkgver = 5.15.10
-	pkgrel = 2
+	pkgver = 5.15.11
+	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
 	license = GPL2
@@ -18,20 +18,20 @@ pkgbase = linux-vfio-manjaro
 	makedepends = xz
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.10.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.11.xz
 	source = config
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch
 	source = 0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch
+	source = PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch
+	source = iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch
+	source = cpufreq_intel_pstate_ITMT_support_for_overclocked_system.patch
+	source = Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch
+	source = lg-laptop_Recognize_more_models.patch
 	source = 0101-i2c-nuvoton-nc677x-hwmon-driver.patch
 	source = 0103-futex.patch
 	source = 0104-revert-xhci-Add-support-for-Renesas-controller-with-memory.patch
 	source = 0105-quirk-kernel-org-bug-210681-firmware_rome_error.patch
 	source = 0108-drm_i915_Add_workaround_numbers_to_GEN7_COMMON_SLICE_CHICKEN1_whitelisting.patch::https://patchwork.freedesktop.org/patch/463650/raw/
-	source = 1ac8f753e4249e6864c1c42070ba957ceef1f82a.patch
-	source = 74db74ec6ce112c6137d51610429e7ac9ea5b6c1.patch
-	source = 62f1f7606485d450b23f86bc18dab101e7a2443d.patch
-	source = ae3386d67597db29ad2ba2685815e224a39897bc.patch
-	source = 675d4b66de78eec370cf5053eecdf00b26780af3.patch
 	source = 0201-lenovo-wmi2.patch
 	source = 0301-revert-fbcon-remove-now-unusued-softback_lines-cursor-argument.patch
 	source = 0302-revert-fbcon-remove-no-op-fbcon_set_origin.patch
@@ -51,20 +51,20 @@ pkgbase = linux-vfio-manjaro
 	source = 0413-bootsplash.gitpatch
 	source = 0999-acs.gitpatch
 	sha256sums = 57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
-	sha256sums = bdb35ece2dd0f6d8225947b63539e70c8fc16bd28f03395d590515d8187f03c4
-	sha256sums = ccbfb721030426bbd148602f99c88aaf226b7a6641a9c8c56973dd25a3f1df94
+	sha256sums = ad0392a077fab3781cfa6084a84de35364068ae46f58e8463db7826933778260
+	sha256sums = 7c65b68bd250de8726c3dd5befa556cde515393c871dd0e0b599f40a5c33ac41
 	sha256sums = 986f8d802f37b72a54256f0ab84da83cb229388d58c0b6750f7c770818a18421
 	sha256sums = df5843818f1571841e1a8bdbe38d7f853d841f38de46d6a6a5765de089495578
+	sha256sums = e2823eff3355b7c88a3fa327ea2f84f23cbd36569e0a5f0f76599023f63a52ca
+	sha256sums = ce53090a4572cd6162d22225113082f7e4df5028a1230529d170460e26dcf849
+	sha256sums = ab0360eac59329eb84f028c2f402ee4a17e4b3dfacb7957355e6178d35af87b9
+	sha256sums = 76701599bbafa49b90ccb073ef29ce2dc3731566e8fa852bd1e9e7796e184754
+	sha256sums = a2a0a0542055a6a921542fbb05cedb6eb6f3d3fb0c038bfb2304bfd3931a0f71
 	sha256sums = 7823d7488f42bc4ed7dfae6d1014dbde679d8b862c9a3697a39ba0dae5918978
 	sha256sums = 844e66a95d7df754c55ac2f1ce7e215b1e56e20ca095462d926a993d557b20e0
 	sha256sums = d9330ea593829a6ef3b824db9570253280cbff7da2b4beb47cbc037824d1a29b
 	sha256sums = 5e804e1f241ce542f3f0e83d274ede6aa4b0539e510fb9376f8106e8732ce69b
 	sha256sums = e8e6120035977903a7117ba215809b9b162b64a789848107513f219180baaada
-	sha256sums = e2823eff3355b7c88a3fa327ea2f84f23cbd36569e0a5f0f76599023f63a52ca
-	sha256sums = ce53090a4572cd6162d22225113082f7e4df5028a1230529d170460e26dcf849
-	sha256sums = ab0360eac59329eb84f028c2f402ee4a17e4b3dfacb7957355e6178d35af87b9
-	sha256sums = 6846fbd7d8e05adc0b25179bc5bbd6320929d155fafd4443eff206d6b8b580ac
-	sha256sums = a2a0a0542055a6a921542fbb05cedb6eb6f3d3fb0c038bfb2304bfd3931a0f71
 	sha256sums = 1d58ef2991c625f6f0eb33b4cb8303932f53f1c4694e42bae24c9cd36d2ad013
 	sha256sums = 2b11905b63b05b25807dd64757c779da74dd4c37e36d3f7a46485b1ee5a9d326
 	sha256sums = 94a8538251ad148f1025cc3de446ce64f73dc32b01815426fb159c722e8fa5bc
@@ -85,13 +85,13 @@ pkgbase = linux-vfio-manjaro
 	sha256sums = 6d6b327ec7c7798f628f98ab964f4457d3cf043bad2632eb8f27548478a83cc1
 
 pkgname = linux-vfio-manjaro
-	pkgdesc = The Linux-vfio-manjaro kernel and modules
+	pkgdesc = The Linux-vfio-manjaro kernel and modules with ACS patch
 	depends = coreutils
 	depends = linux-firmware
 	depends = kmod
 	depends = mkinitcpio>=27
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = linux=5.15.10
+	provides = linux=5.15.11
 	provides = VIRTUALBOX-GUEST-MODULES
 	provides = WIREGUARD-MODULE
 
@@ -101,4 +101,4 @@ pkgname = linux-vfio-manjaro-headers
 	depends = python
 	depends = libelf
 	depends = pahole
-	provides = linux-headers=5.15.10
+	provides = linux-headers=5.15.11
diff --git a/0108-drm_i915_Add_workaround_numbers_to_GEN7_COMMON_SLICE_CHICKEN1_whitelisting.patch b/0108-drm_i915_Add_workaround_numbers_to_GEN7_COMMON_SLICE_CHICKEN1_whitelisting.patch
new file mode 100644
index 000000000000..7e59a4802e0a
--- /dev/null
+++ b/0108-drm_i915_Add_workaround_numbers_to_GEN7_COMMON_SLICE_CHICKEN1_whitelisting.patch
@@ -0,0 +1,17 @@
+diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
+index cd2935b9e7c81..c3211325c2d3e 100644
+--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
++++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
+@@ -1869,7 +1869,11 @@ static void tgl_whitelist_build(struct intel_engine_cs *engine)
+ 				  RING_FORCE_TO_NONPRIV_ACCESS_RD |
+ 				  RING_FORCE_TO_NONPRIV_RANGE_4);
+ 
+-		/* Wa_1808121037:tgl */
++		/*
++		 * Wa_1808121037:tgl
++		 * Wa_14012131227:dg1
++		 * Wa_1508744258:tgl,rkl,dg1,adl-s,adl-p
++		 */
+ 		whitelist_reg(w, GEN7_COMMON_SLICE_CHICKEN1);
+ 
+ 		/* Wa_1806527549:tgl */
diff --git a/ae3386d67597db29ad2ba2685815e224a39897bc.patch b/Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch
index e22b5cca4c74..38cf2bde55bd 100644
--- a/ae3386d67597db29ad2ba2685815e224a39897bc.patch
+++ b/Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch
@@ -42,12 +42,12 @@ index f1705b46fc8898..b9055a3e61ed76 100644
 +			set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
 +		}
  	}
- 
+
  	btintel_get_fw_name_tlv(ver, fwname, sizeof(fwname), "sfi");
 @@ -2303,6 +2305,10 @@ static int btintel_setup_combined(struct hci_dev *hdev)
  		goto exit_error;
  	}
- 
+
 +	/* memset ver_tlv to start with clean state as few fields are exclusive
 +	 * to bootloader mode and are not populated in operational mode
 +	 */
diff --git a/1ac8f753e4249e6864c1c42070ba957ceef1f82a.patch b/PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch
index 01b324a03a17..01b324a03a17 100644
--- a/1ac8f753e4249e6864c1c42070ba957ceef1f82a.patch
+++ b/PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch
diff --git a/PKGBUILD b/PKGBUILD
index 79d1d6f80ff5..29f2094f0ae1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,9 +7,8 @@ pkgname=('linux-vfio-manjaro' 'linux-vfio-manjaro-headers')
 _kernelname=-VFIO-MANJARO
 _basekernel=5.15
 _basever=515
-_pkgver=5.15.10
-pkgver=5.15.10
-pkgrel=2
+pkgver=5.15.11
+pkgrel=1
 arch=('x86_64')
 url="https://www.kernel.org/"
 license=('GPL2')
@@ -27,12 +26,16 @@ makedepends=('bc'
     'xz')
 options=('!strip')
 source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.xz"
-        "https://www.kernel.org/pub/linux/kernel/v5.x/patch-${_pkgver}.xz"
+        "https://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
         'config'
         # ARCH Patches
         '0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch'
         '0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch'
-        # Temp Fixes
+        'PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch'
+        'iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch'
+        'cpufreq_intel_pstate_ITMT_support_for_overclocked_system.patch'
+        'Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch'
+        'lg-laptop_Recognize_more_models.patch'
         # MANJARO Patches
         '0101-i2c-nuvoton-nc677x-hwmon-driver.patch'
 #        '0102-iomap-iomap_bmap-should-accept-unwritten-maps.patch'
@@ -40,12 +43,6 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
         '0104-revert-xhci-Add-support-for-Renesas-controller-with-memory.patch'
         '0105-quirk-kernel-org-bug-210681-firmware_rome_error.patch'
         '0108-drm_i915_Add_workaround_numbers_to_GEN7_COMMON_SLICE_CHICKEN1_whitelisting.patch::https://patchwork.freedesktop.org/patch/463650/raw/'
-        # Arch Patches
-        '1ac8f753e4249e6864c1c42070ba957ceef1f82a.patch'
-        '74db74ec6ce112c6137d51610429e7ac9ea5b6c1.patch'
-        '62f1f7606485d450b23f86bc18dab101e7a2443d.patch'
-        'ae3386d67597db29ad2ba2685815e224a39897bc.patch'
-        '675d4b66de78eec370cf5053eecdf00b26780af3.patch'
         # Lenovo + AMD
         '0201-lenovo-wmi2.patch'
         # other patches
@@ -68,20 +65,20 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
         '0413-bootsplash.gitpatch'
         '0999-acs.gitpatch')
 sha256sums=('57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8'
-            'bdb35ece2dd0f6d8225947b63539e70c8fc16bd28f03395d590515d8187f03c4'
-            'ccbfb721030426bbd148602f99c88aaf226b7a6641a9c8c56973dd25a3f1df94'
+            'ad0392a077fab3781cfa6084a84de35364068ae46f58e8463db7826933778260'
+            '7c65b68bd250de8726c3dd5befa556cde515393c871dd0e0b599f40a5c33ac41'
             '986f8d802f37b72a54256f0ab84da83cb229388d58c0b6750f7c770818a18421'
             'df5843818f1571841e1a8bdbe38d7f853d841f38de46d6a6a5765de089495578'
+            'e2823eff3355b7c88a3fa327ea2f84f23cbd36569e0a5f0f76599023f63a52ca'
+            'ce53090a4572cd6162d22225113082f7e4df5028a1230529d170460e26dcf849'
+            'ab0360eac59329eb84f028c2f402ee4a17e4b3dfacb7957355e6178d35af87b9'
+            '76701599bbafa49b90ccb073ef29ce2dc3731566e8fa852bd1e9e7796e184754'
+            'a2a0a0542055a6a921542fbb05cedb6eb6f3d3fb0c038bfb2304bfd3931a0f71'
             '7823d7488f42bc4ed7dfae6d1014dbde679d8b862c9a3697a39ba0dae5918978'
             '844e66a95d7df754c55ac2f1ce7e215b1e56e20ca095462d926a993d557b20e0'
             'd9330ea593829a6ef3b824db9570253280cbff7da2b4beb47cbc037824d1a29b'
             '5e804e1f241ce542f3f0e83d274ede6aa4b0539e510fb9376f8106e8732ce69b'
             'e8e6120035977903a7117ba215809b9b162b64a789848107513f219180baaada'
-            'e2823eff3355b7c88a3fa327ea2f84f23cbd36569e0a5f0f76599023f63a52ca'
-            'ce53090a4572cd6162d22225113082f7e4df5028a1230529d170460e26dcf849'
-            'ab0360eac59329eb84f028c2f402ee4a17e4b3dfacb7957355e6178d35af87b9'
-            '6846fbd7d8e05adc0b25179bc5bbd6320929d155fafd4443eff206d6b8b580ac'
-            'a2a0a0542055a6a921542fbb05cedb6eb6f3d3fb0c038bfb2304bfd3931a0f71'
             '1d58ef2991c625f6f0eb33b4cb8303932f53f1c4694e42bae24c9cd36d2ad013'
             '2b11905b63b05b25807dd64757c779da74dd4c37e36d3f7a46485b1ee5a9d326'
             '94a8538251ad148f1025cc3de446ce64f73dc32b01815426fb159c722e8fa5bc'
@@ -106,7 +103,7 @@ prepare() {
 
   # add upstream patch
   msg "add upstream patch"
-  patch -p1 -i "../patch-${_pkgver}"
+  patch -p1 -i "../patch-${pkgver}"
 
   local src
   for src in "${source[@]}"; do
@@ -134,6 +131,9 @@ prepare() {
   msg "set extraversion to pkgrel"
   sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
 
+  # set patchlevel to 14
+  #sed -ri "s|^(PATCHLEVEL =).*|\1 14|" Makefile
+
   msg "don't run depmod on 'make install'"
   # We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
@@ -153,7 +153,7 @@ build() {
 }
 
 package_linux-vfio-manjaro() {
-  pkgdesc="The ${pkgbase/linux/Linux} kernel and modules"
+  pkgdesc="The ${pkgbase/linux/Linux} kernel and modules with ACS patch"
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=27')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=("linux=${pkgver}" VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
diff --git a/config b/config
index c92606e06c25..e5bb8ec4429a 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.5-2 Kernel Configuration
+# Linux/x86 5.15.10-1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
@@ -2334,7 +2334,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
 # CONFIG_MTD_SWAP is not set
-# CONFIG_MTD_PARTITIONED_MASTER is not set
+CONFIG_MTD_PARTITIONED_MASTER=y
 
 #
 # RAM/ROM/Flash chip drivers
@@ -2346,7 +2346,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_RAM=m
+# CONFIG_MTD_RAM is not set
 CONFIG_MTD_ROM=m
 # CONFIG_MTD_ABSENT is not set
 # end of RAM/ROM/Flash chip drivers
@@ -2357,7 +2357,7 @@ CONFIG_MTD_ROM=m
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_PHYSMAP is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
+# CONFIG_MTD_PLATRAM is not set
 # end of Mapping drivers for chip access
 
 #
@@ -2370,7 +2370,9 @@ CONFIG_MTD_PLATRAM=m
 # CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_PHRAM=m
-# CONFIG_MTD_MTDRAM is not set
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
 CONFIG_MTD_BLOCK2MTD=m
 
 #
diff --git a/62f1f7606485d450b23f86bc18dab101e7a2443d.patch b/cpufreq_intel_pstate_ITMT_support_for_overclocked_system.patch
index 1f7922e34722..1f7922e34722 100644
--- a/62f1f7606485d450b23f86bc18dab101e7a2443d.patch
+++ b/cpufreq_intel_pstate_ITMT_support_for_overclocked_system.patch
diff --git a/74db74ec6ce112c6137d51610429e7ac9ea5b6c1.patch b/iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch
index bc9dc1857912..bc9dc1857912 100644
--- a/74db74ec6ce112c6137d51610429e7ac9ea5b6c1.patch
+++ b/iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch
diff --git a/675d4b66de78eec370cf5053eecdf00b26780af3.patch b/lg-laptop_Recognize_more_models.patch
index 8fbd217c36a2..8fbd217c36a2 100644
--- a/675d4b66de78eec370cf5053eecdf00b26780af3.patch
+++ b/lg-laptop_Recognize_more_models.patch