Skip to content

Commit 13bcdf0

Browse files
paliLorenzo Pieralisi
authored andcommitted
PCI: aardvark: Mask all interrupts when unbinding driver
Ensure that no interrupt can be triggered after driver unbind. Link: https://lore.kernel.org/r/20211130172913.9727-8-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>
1 parent a46f2f6 commit 13bcdf0

1 file changed

Lines changed: 21 additions & 0 deletions

File tree

drivers/pci/controller/pci-aardvark.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,6 +1709,27 @@ static int advk_pcie_remove(struct platform_device *pdev)
17091709
val &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
17101710
advk_writel(pcie, val, PCIE_CORE_CMD_STATUS_REG);
17111711

1712+
/* Disable MSI */
1713+
val = advk_readl(pcie, PCIE_CORE_CTRL2_REG);
1714+
val &= ~PCIE_CORE_CTRL2_MSI_ENABLE;
1715+
advk_writel(pcie, val, PCIE_CORE_CTRL2_REG);
1716+
1717+
/* Clear MSI address */
1718+
advk_writel(pcie, 0, PCIE_MSI_ADDR_LOW_REG);
1719+
advk_writel(pcie, 0, PCIE_MSI_ADDR_HIGH_REG);
1720+
1721+
/* Mask all interrupts */
1722+
advk_writel(pcie, PCIE_MSI_ALL_MASK, PCIE_MSI_MASK_REG);
1723+
advk_writel(pcie, PCIE_ISR0_ALL_MASK, PCIE_ISR0_MASK_REG);
1724+
advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_MASK_REG);
1725+
advk_writel(pcie, PCIE_IRQ_ALL_MASK, HOST_CTRL_INT_MASK_REG);
1726+
1727+
/* Clear all interrupts */
1728+
advk_writel(pcie, PCIE_MSI_ALL_MASK, PCIE_MSI_STATUS_REG);
1729+
advk_writel(pcie, PCIE_ISR0_ALL_MASK, PCIE_ISR0_REG);
1730+
advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_REG);
1731+
advk_writel(pcie, PCIE_IRQ_ALL_MASK, HOST_CTRL_INT_STATUS_REG);
1732+
17121733
/* Remove IRQ domains */
17131734
advk_pcie_remove_msi_irq_domain(pcie);
17141735
advk_pcie_remove_irq_domain(pcie);

0 commit comments

Comments
 (0)