1343acc8cd
Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch Manually reverted: generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch [3] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 [3] https://lore.kernel.org/all/trinity-2a727d96-0335-4d03-8f30-e22a0e10112d-1643363480085@3c-app-gmx-bap33/ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
48 lines
2.0 KiB
Diff
48 lines
2.0 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
|
|
@@ -1491,6 +1491,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);
|
|
|
|
+ /* 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.
|
|
+ */
|
|
+ virq = irq_find_mapping(pcie->irq_domain, 0);
|
|
+ if (generic_handle_irq(virq) == -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);
|