aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.15/850-0018-PCI-aardvark-Use-separate-INTA-interrupt-for-emulate.patch
diff options
context:
space:
mode:
authorAnsuel Smith <ansuelsmth@gmail.com>2022-03-30 16:14:03 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-04-09 19:31:46 +0200
commit5b3a75e7a6688e067c5b03573c2c9a50994091d1 (patch)
tree983207cf311fe75838caea1846d1d0ce6f2481c4 /target/linux/generic/pending-5.15/850-0018-PCI-aardvark-Use-separate-INTA-interrupt-for-emulate.patch
parent848f112c91b54e1f7e3a591a5e4b5de8b3aa256b (diff)
downloadupstream-5b3a75e7a6688e067c5b03573c2c9a50994091d1.tar.gz
upstream-5b3a75e7a6688e067c5b03573c2c9a50994091d1.tar.bz2
upstream-5b3a75e7a6688e067c5b03573c2c9a50994091d1.zip
generic: 5.15: fix aardvak pci pending patch
Fix aardvak pci controller pending patch. Use generic_handle_domain_irq and fix rebase error. Fixes: 483503603cb2 ("generic: 5.15: rework pending patch") Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.15/850-0018-PCI-aardvark-Use-separate-INTA-interrupt-for-emulate.patch')
-rw-r--r--target/linux/generic/pending-5.15/850-0018-PCI-aardvark-Use-separate-INTA-interrupt-for-emulate.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/pending-5.15/850-0018-PCI-aardvark-Use-separate-INTA-interrupt-for-emulate.patch b/target/linux/generic/pending-5.15/850-0018-PCI-aardvark-Use-separate-INTA-interrupt-for-emulate.patch
index dfcd84f475..b681dc6755 100644
--- a/target/linux/generic/pending-5.15/850-0018-PCI-aardvark-Use-separate-INTA-interrupt-for-emulate.patch
+++ b/target/linux/generic/pending-5.15/850-0018-PCI-aardvark-Use-separate-INTA-interrupt-for-emulate.patch
@@ -90,20 +90,20 @@ Signed-off-by: Marek BehĂșn <kabel@kernel.org>
if (!(le16_to_cpu(pcie->bridge.pcie_conf.rootctl) & PCI_EXP_RTCTL_PMEIE))
return;
-- virq = irq_find_mapping(pcie->irq_domain, 0);
-+ virq = irq_find_mapping(pcie->rp_irq_domain, 0);
- if (generic_handle_irq(virq) == -EINVAL)
+- if (generic_handle_domain_irq(pcie->irq_domain, 0) == -EINVAL)
++ if (generic_handle_domain_irq(pcie->rp_irq_domain, 0) == -EINVAL)
dev_err_ratelimited(&pcie->pdev->dev, "unhandled PME IRQ\n");
}
+
@@ -1515,7 +1554,7 @@ static void advk_pcie_handle_int(struct
* Aardvark HW returns zero for PCI_ERR_ROOT_AER_IRQ, so use
* PCIe interrupt 0
*/
-- virq = irq_find_mapping(pcie->irq_domain, 0);
-+ virq = irq_find_mapping(pcie->rp_irq_domain, 0);
- if (generic_handle_irq(virq) == -EINVAL)
+- if (generic_handle_domain_irq(pcie->irq_domain, 0) == -EINVAL)
++ if (generic_handle_domain_irq(pcie->rp_irq_domain, 0) == -EINVAL)
dev_err_ratelimited(&pcie->pdev->dev, "unhandled ERR IRQ\n");
}
+
@@ -1560,6 +1599,21 @@ static void advk_pcie_irq_handler(struct
chained_irq_exit(chip, desc);
}