target/linux/generic/pending-5.10/850-0001-PCI-aardvark-Replace-custom-PCIE_CORE_INT_-macros-wi.patch

   1 From 43f3f187e6f62ca40802afe39495c8a3e20b4bfa Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
   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
  10 Header file linux/pci.h defines enum pci_interrupt_pin with corresponding
  11 PCI_INTERRUPT_* values.
  12
  13 Signed-off-by: Pali Rohár <pali@kernel.org>
  14 Signed-off-by: Marek Behún <kabel@kernel.org>
  15 ---
  16  drivers/pci/controller/pci-aardvark.c | 6 +-----
  17  1 file changed, 1 insertion(+), 5 deletions(-)
  18
  19 diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
  20 index 226bce2f98f6..a573fc1aa4dd 100644
  21 --- a/drivers/pci/controller/pci-aardvark.c
  22 +++ b/drivers/pci/controller/pci-aardvark.c
  23 @@ -37,10 +37,6 @@
  24  #define     PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX_EN                        BIT(6)
  25  #define     PCIE_CORE_ERR_CAPCTL_ECRC_CHCK                     BIT(7)
  26  #define     PCIE_CORE_ERR_CAPCTL_ECRC_CHCK_RCV                 BIT(8)
  27 -#define     PCIE_CORE_INT_A_ASSERT_ENABLE                      1
  28 -#define     PCIE_CORE_INT_B_ASSERT_ENABLE                      2
  29 -#define     PCIE_CORE_INT_C_ASSERT_ENABLE                      3
  30 -#define     PCIE_CORE_INT_D_ASSERT_ENABLE                      4
  31  /* PIO registers base address and register offsets */
  32  #define PIO_BASE_ADDR                          0x4000
  33  #define PIO_CTRL                               (PIO_BASE_ADDR + 0x0)
  34 @@ -967,7 +963,7 @@ static int advk_sw_pci_bridge_init(struct advk_pcie *pcie)
  35         bridge->conf.pref_mem_limit = cpu_to_le16(PCI_PREF_RANGE_TYPE_64);
  36
  37         /* Support interrupt A for MSI feature */
  38 -       bridge->conf.intpin = PCIE_CORE_INT_A_ASSERT_ENABLE;
  39 +       bridge->conf.intpin = PCI_INTERRUPT_INTA;
  40
  41         /* Indicates supports for Completion Retry Status */
  42         bridge->pcie_conf.rootcap = cpu_to_le16(PCI_EXP_RTCAP_CRSVIS);
  43 --
  44 2.34.1
  45