mirror of
https://github.com/openwrt/openwrt.git
synced 2025-03-10 14:34:13 +00:00
612e1c6801
Backport Aardvark PCIe controller driver changes that will appear in 5.17 kernel. They are currently accessible on LKML [1], in linux-next repository [2], or in Bjorn Helgaas' repository [3]. These changes mainly enhance driver removal method. [1] https://lore.kernel.org/linux-pci/20211130172913.9727-1-kabel@kernel.org/ [2] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/drivers/pci?h=next-20220107 [3] https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/log/?h=next Signed-off-by: Marek Behún <kabel@kernel.org>
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 2f040a17f5061457ae95035326d3159eddc1e5cc Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
|
Date: Tue, 30 Nov 2021 18:29:10 +0100
|
|
Subject: [PATCH] PCI: aardvark: Fix memory leak in driver unbind
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Free config space for emulated root bridge when unbinding driver to fix
|
|
memory leak. Do it after disabling and masking all interrupts, since
|
|
aardvark interrupt handler accesses config space of emulated root
|
|
bridge.
|
|
|
|
Link: https://lore.kernel.org/r/20211130172913.9727-9-kabel@kernel.org
|
|
Signed-off-by: Pali Rohár <pali@kernel.org>
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
|
---
|
|
drivers/pci/controller/pci-aardvark.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
|
|
index 08b34accfe2f..b3d89cb449b6 100644
|
|
--- a/drivers/pci/controller/pci-aardvark.c
|
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
|
@@ -1734,6 +1734,9 @@ static int advk_pcie_remove(struct platform_device *pdev)
|
|
advk_pcie_remove_msi_irq_domain(pcie);
|
|
advk_pcie_remove_irq_domain(pcie);
|
|
|
|
+ /* Free config space for emulated root bridge */
|
|
+ pci_bridge_emul_cleanup(&pcie->bridge);
|
|
+
|
|
/* Disable outbound address windows mapping */
|
|
for (i = 0; i < OB_WIN_COUNT; i++)
|
|
advk_pcie_disable_ob_win(pcie, i);
|
|
--
|
|
2.34.1
|
|
|