850-v5.17-0007-PCI-aardvark-Mask-all-interrupts-when-unbinding-driv.patch 1.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. From 13bcdf07cb2ecff5d45d2c141df2539b15211448 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <[email protected]>
  3. Date: Tue, 30 Nov 2021 18:29:09 +0100
  4. Subject: [PATCH] PCI: aardvark: Mask all interrupts when unbinding driver
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. Ensure that no interrupt can be triggered after driver unbind.
  9. Link: https://lore.kernel.org/r/[email protected]
  10. Signed-off-by: Pali Rohár <[email protected]>
  11. Signed-off-by: Marek Behún <[email protected]>
  12. Signed-off-by: Lorenzo Pieralisi <[email protected]>
  13. ---
  14. drivers/pci/controller/pci-aardvark.c | 21 +++++++++++++++++++++
  15. 1 file changed, 21 insertions(+)
  16. --- a/drivers/pci/controller/pci-aardvark.c
  17. +++ b/drivers/pci/controller/pci-aardvark.c
  18. @@ -1693,6 +1693,27 @@ static int advk_pcie_remove(struct platf
  19. val &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
  20. advk_writel(pcie, val, PCIE_CORE_CMD_STATUS_REG);
  21. + /* Disable MSI */
  22. + val = advk_readl(pcie, PCIE_CORE_CTRL2_REG);
  23. + val &= ~PCIE_CORE_CTRL2_MSI_ENABLE;
  24. + advk_writel(pcie, val, PCIE_CORE_CTRL2_REG);
  25. +
  26. + /* Clear MSI address */
  27. + advk_writel(pcie, 0, PCIE_MSI_ADDR_LOW_REG);
  28. + advk_writel(pcie, 0, PCIE_MSI_ADDR_HIGH_REG);
  29. +
  30. + /* Mask all interrupts */
  31. + advk_writel(pcie, PCIE_MSI_ALL_MASK, PCIE_MSI_MASK_REG);
  32. + advk_writel(pcie, PCIE_ISR0_ALL_MASK, PCIE_ISR0_MASK_REG);
  33. + advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_MASK_REG);
  34. + advk_writel(pcie, PCIE_IRQ_ALL_MASK, HOST_CTRL_INT_MASK_REG);
  35. +
  36. + /* Clear all interrupts */
  37. + advk_writel(pcie, PCIE_MSI_ALL_MASK, PCIE_MSI_STATUS_REG);
  38. + advk_writel(pcie, PCIE_ISR0_ALL_MASK, PCIE_ISR0_REG);
  39. + advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_REG);
  40. + advk_writel(pcie, PCIE_IRQ_ALL_MASK, HOST_CTRL_INT_STATUS_REG);
  41. +
  42. /* Remove IRQ domains */
  43. advk_pcie_remove_msi_irq_domain(pcie);
  44. advk_pcie_remove_irq_domain(pcie);