mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 14:37:57 +00:00
be381a7ac7
Deleted (upstreamed): generic/backport-5.15/350-v5.18-MIPS-pgalloc-fix-memory-leak-caused-by-pgd_free.patch [1] generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch [2] generic/pending-5.15/850-0014-PCI-aardvark-Fix-reading-PCI_EXP_RTSTA_PME-bit-on-em.patch [3] generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch [4] Manually rebased: generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch ramips/patches-5.15/710-at803x.patch [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=d29cda15cab086d82d692de016f7249545d4b6b4 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=d5aad7d63b1b5c1f3c4b69e12c05e7c7d196fae8 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=ed750e22e44366e264bcdf7b1cf0713f08f7980a [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=0fe94b84c43cfea867e1721606185e8686d7d32f Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> [Refresh patches again] [Remove generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
From 7acd8ef92e8789e10b5d736d73cea3b625087f26 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
|
Date: Wed, 8 Dec 2021 06:07:44 +0100
|
|
Subject: [PATCH] PCI: aardvark: Add support for PME interrupts
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Currently enabling PCI_EXP_RTSTA_PME bit in PCI_EXP_RTCTL register does
|
|
nothing. This is because PCIe PME driver expects to receive PCIe interrupt
|
|
defined in PCI_EXP_FLAGS_IRQ register, but aardvark hardware does not
|
|
trigger PCIe INTx/MSI interrupt for PME event, rather it triggers custom
|
|
aardvark interrupt which this driver is not processing yet.
|
|
|
|
Fix this issue by handling PME interrupt in advk_pcie_handle_int() and
|
|
chaining it to PCIe interrupt 0 with generic_handle_domain_irq() (since
|
|
aardvark sets PCI_EXP_FLAGS_IRQ to zero). With this change PCIe PME driver
|
|
finally starts receiving PME interrupt.
|
|
|
|
Signed-off-by: Pali Rohár <pali@kernel.org>
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
---
|
|
drivers/pci/controller/pci-aardvark.c | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
--- a/drivers/pci/controller/pci-aardvark.c
|
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
|
@@ -1480,6 +1480,18 @@ 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);
|
|
|
|
+ /* Process PME interrupt */
|
|
+ if (isr0_status & PCIE_MSG_PM_PME_MASK) {
|
|
+ /*
|
|
+ * Do not clear PME interrupt bit in ISR0, it is cleared by IRQ
|
|
+ * receiver by writing to the PCI_EXP_RTSTA register of emulated
|
|
+ * root bridge. Aardvark HW returns zero for PCI_EXP_FLAGS_IRQ,
|
|
+ * so use PCIe interrupt 0.
|
|
+ */
|
|
+ if (generic_handle_domain_irq(pcie->irq_domain, 0) == -EINVAL)
|
|
+ dev_err_ratelimited(&pcie->pdev->dev, "unhandled PME IRQ\n");
|
|
+ }
|
|
+
|
|
/* Process ERR interrupt */
|
|
if (isr0_status & PCIE_ISR0_ERR_MASK) {
|
|
advk_writel(pcie, PCIE_ISR0_ERR_MASK, PCIE_ISR0_REG);
|