b754b0c721
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>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From a46f2f6dd4093438d9615dfbf5c0fea2a9835dba 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:08 +0100
|
|
Subject: [PATCH] PCI: aardvark: Disable bus mastering when unbinding driver
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Ensure that after driver unbind PCIe cards are not able to forward
|
|
memory and I/O requests in the upstream direction.
|
|
|
|
Link: https://lore.kernel.org/r/20211130172913.9727-7-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 | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
--- a/drivers/pci/controller/pci-aardvark.c
|
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
|
@@ -1690,6 +1690,7 @@ static int advk_pcie_remove(struct platf
|
|
{
|
|
struct advk_pcie *pcie = platform_get_drvdata(pdev);
|
|
struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
|
|
+ u32 val;
|
|
int i;
|
|
|
|
/* Remove PCI bus with all devices */
|
|
@@ -1698,6 +1699,11 @@ static int advk_pcie_remove(struct platf
|
|
pci_remove_root_bus(bridge->bus);
|
|
pci_unlock_rescan_remove();
|
|
|
|
+ /* Disable Root Bridge I/O space, memory space and bus mastering */
|
|
+ val = advk_readl(pcie, PCIE_CORE_CMD_STATUS_REG);
|
|
+ val &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
|
|
+ advk_writel(pcie, val, PCIE_CORE_CMD_STATUS_REG);
|
|
+
|
|
/* Remove IRQ domains */
|
|
advk_pcie_remove_msi_irq_domain(pcie);
|
|
advk_pcie_remove_irq_domain(pcie);
|