aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10/850-0013-PCI-aardvark-Add-support-for-ERR-interrupt-on-emulat.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-05-12 13:04:51 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-05-17 20:50:34 +0200
commit7a0af40e3746eb847aec1812294d2bd0b8c75f77 (patch)
tree49a70ca574879666d1cc27dbb05394ca929d4cd8 /target/linux/generic/pending-5.10/850-0013-PCI-aardvark-Add-support-for-ERR-interrupt-on-emulat.patch
parente0aaecdbb89eed44eb15fcc7e32f68a78d84a536 (diff)
downloadupstream-7a0af40e3746eb847aec1812294d2bd0b8c75f77.tar.gz
upstream-7a0af40e3746eb847aec1812294d2bd0b8c75f77.tar.bz2
upstream-7a0af40e3746eb847aec1812294d2bd0b8c75f77.zip
kernel: bump 5.10 to 5.10.115
Removed upstreamed: backport-5.10/850-v5.17-0004-PCI-aardvark-Clear-all-MSIs-at-setup.patch pending-5.10/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit b754b0c721131005efa7127151088e9c23dc9053)
Diffstat (limited to 'target/linux/generic/pending-5.10/850-0013-PCI-aardvark-Add-support-for-ERR-interrupt-on-emulat.patch')
-rw-r--r--target/linux/generic/pending-5.10/850-0013-PCI-aardvark-Add-support-for-ERR-interrupt-on-emulat.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/pending-5.10/850-0013-PCI-aardvark-Add-support-for-ERR-interrupt-on-emulat.patch b/target/linux/generic/pending-5.10/850-0013-PCI-aardvark-Add-support-for-ERR-interrupt-on-emulat.patch
index cc4bb467c3..8665431961 100644
--- a/target/linux/generic/pending-5.10/850-0013-PCI-aardvark-Add-support-for-ERR-interrupt-on-emulat.patch
+++ b/target/linux/generic/pending-5.10/850-0013-PCI-aardvark-Add-support-for-ERR-interrupt-on-emulat.patch
@@ -78,7 +78,7 @@ Signed-off-by: Marek BehĂșn <kabel@kernel.org>
if (mask & (PCI_BRIDGE_CTL_BUS_RESET << 16)) {
u32 val = advk_readl(pcie, PCIE_CORE_CTRL1_REG);
if (new & (PCI_BRIDGE_CTL_BUS_RESET << 16))
-@@ -1468,6 +1489,19 @@ static void advk_pcie_handle_int(struct
+@@ -1465,6 +1486,19 @@ static void advk_pcie_handle_int(struct
isr1_mask = advk_readl(pcie, PCIE_ISR1_MASK_REG);
isr1_status = isr1_val & ((~isr1_mask) & PCIE_ISR1_ALL_MASK);