850-0001-PCI-aardvark-Replace-custom-PCIE_CORE_INT_-macros-wi.patch 1.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. From 43f3f187e6f62ca40802afe39495c8a3e20b4bfa Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <[email protected]>
  3. Date: Mon, 10 Jan 2022 01:50:50 +0100
  4. Subject: [PATCH] PCI: aardvark: Replace custom PCIE_CORE_INT_* macros with
  5. PCI_INTERRUPT_*
  6. MIME-Version: 1.0
  7. Content-Type: text/plain; charset=UTF-8
  8. Content-Transfer-Encoding: 8bit
  9. Header file linux/pci.h defines enum pci_interrupt_pin with corresponding
  10. PCI_INTERRUPT_* values.
  11. Signed-off-by: Pali Rohár <[email protected]>
  12. Signed-off-by: Marek Behún <[email protected]>
  13. ---
  14. drivers/pci/controller/pci-aardvark.c | 6 +-----
  15. 1 file changed, 1 insertion(+), 5 deletions(-)
  16. --- a/drivers/pci/controller/pci-aardvark.c
  17. +++ b/drivers/pci/controller/pci-aardvark.c
  18. @@ -37,10 +37,6 @@
  19. #define PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX_EN BIT(6)
  20. #define PCIE_CORE_ERR_CAPCTL_ECRC_CHCK BIT(7)
  21. #define PCIE_CORE_ERR_CAPCTL_ECRC_CHCK_RCV BIT(8)
  22. -#define PCIE_CORE_INT_A_ASSERT_ENABLE 1
  23. -#define PCIE_CORE_INT_B_ASSERT_ENABLE 2
  24. -#define PCIE_CORE_INT_C_ASSERT_ENABLE 3
  25. -#define PCIE_CORE_INT_D_ASSERT_ENABLE 4
  26. /* PIO registers base address and register offsets */
  27. #define PIO_BASE_ADDR 0x4000
  28. #define PIO_CTRL (PIO_BASE_ADDR + 0x0)
  29. @@ -968,7 +964,7 @@ static int advk_sw_pci_bridge_init(struc
  30. bridge->conf.pref_mem_limit = cpu_to_le16(PCI_PREF_RANGE_TYPE_64);
  31. /* Support interrupt A for MSI feature */
  32. - bridge->conf.intpin = PCIE_CORE_INT_A_ASSERT_ENABLE;
  33. + bridge->conf.intpin = PCI_INTERRUPT_INTA;
  34. /* Aardvark HW provides PCIe Capability structure in version 2 */
  35. bridge->pcie_conf.cap = cpu_to_le16(2);