public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Ard Biesheuvel" <ard.biesheuvel@arm.com>
To: Wasim Khan <wasim.khan@oss.nxp.com>,
	devel@edk2.groups.io, meenakshi.aggarwal@nxp.com,
	vabhav.sharma@nxp.com, V.Sethi@nxp.com, leif@nuviainc.com,
	jon@solid-run.com
Cc: Wasim Khan <wasim.khan@nxp.com>
Subject: Re: [PATCH edk2-platforms 05/16] Silicon/NXP: PciHostBridgeLib: Setup PCIe LsGen4 Controller and ATU Windows
Date: Fri, 22 May 2020 11:24:34 +0200	[thread overview]
Message-ID: <81087d66-c40e-7487-6470-7023ddee801a@arm.com> (raw)
In-Reply-To: <1590102139-16588-6-git-send-email-wasim.khan@oss.nxp.com>

On 5/22/20 1:02 AM, Wasim Khan wrote:
> From: Wasim Khan <wasim.khan@nxp.com>
> 
> Setup PCIe LayerscapeGen4 controller and setup CFG, IO,
> MMIO and MMIO64 iATU windows.
> Check for PcdPciLsGen4Ctrl to enable LsGen4 PCIe
> controller.
> 
> Signed-off-by: Vabhav Sharma <vabhav.sharma@nxp.com>
> Signed-off-by: Wasim Khan <wasim.khan@nxp.com>

How much overlap is there between these controllers? Does it really make 
sense to use the same PciHostBridgeLib implementation and parameterize 
the hell out of it?


> ---
>   Silicon/NXP/NxpQoriqLs.dec                         |   1 +
>   .../Library/PciHostBridgeLib/PciHostBridgeLib.inf  |   1 +
>   Silicon/NXP/Include/Pcie.h                         | 120 ++++++++++
>   .../Library/PciHostBridgeLib/PciHostBridgeLib.c    | 255 +++++++++++++++++----
>   4 files changed, 336 insertions(+), 41 deletions(-)
> 
> diff --git a/Silicon/NXP/NxpQoriqLs.dec b/Silicon/NXP/NxpQoriqLs.dec
> index 293fd773fd3d..8271d19ed8e5 100644
> --- a/Silicon/NXP/NxpQoriqLs.dec
> +++ b/Silicon/NXP/NxpQoriqLs.dec
> @@ -39,3 +39,4 @@ [PcdsFixedAtBuild.common]
>   
>   [PcdsDynamic.common]
>     gNxpQoriqLsTokenSpaceGuid.PcdPciCfgShiftEnable|FALSE|BOOLEAN|0x00000600
> +  gNxpQoriqLsTokenSpaceGuid.PcdPciLsGen4Ctrl|FALSE|BOOLEAN|0x00000601
> diff --git a/Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> index 98cfb6aee6b0..b777acdc103f 100644
> --- a/Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> +++ b/Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> @@ -41,3 +41,4 @@ [FixedPcd]
>   
>   [Pcd]
>     gNxpQoriqLsTokenSpaceGuid.PcdPciCfgShiftEnable
> +  gNxpQoriqLsTokenSpaceGuid.PcdPciLsGen4Ctrl
> diff --git a/Silicon/NXP/Include/Pcie.h b/Silicon/NXP/Include/Pcie.h
> index ae85190180e8..4c41c3585a8b 100755
> --- a/Silicon/NXP/Include/Pcie.h
> +++ b/Silicon/NXP/Include/Pcie.h
> @@ -84,5 +84,125 @@
>   #define SEG_IO_BUS                0x0
>   
>   #define CFG_SHIFT_ENABLE          (PcdGetBool (PcdPciCfgShiftEnable))
> +#define PCI_LS_GEN4_CTRL          (PcdGetBool (PcdPciLsGen4Ctrl))
>   
> +// PCIe Layerscape Gen4 Controller
> +#define GPEX_CLASSCODE                          0x474
> +#define GPEX_CLASSCODE_SHIFT                    16
> +#define GPEX_CLASSCODE_MASK                     0xffff
> +#define PAB_AXI_PIO_CTRL(Idx)                   (0x840 + 0x10 * Idx)
> +#define APIO_EN                                 0x1
> +#define MEM_WIN_EN                              0x1 << 1
> +#define IO_WIN_EN                               0x1 << 2
> +#define CFG_WIN_EN                              0x1 << 3
> +#define PAB_PEX_PIO_CTRL(Idx)                   (0x8c0 + 0x10 * Idx)
> +#define PPIO_EN                                 (0x1 << 0)
> +#define PAB_PEX_PIO_STAT(Idx)                   (0x8c4 + 0x10 * Idx)
> +#define PAB_PEX_PIO_MT_STAT(Idx)                (0x8c8 + 0x10 * Idx)
> +#define PEX_AMAP_CTRL_TYPE_SHIFT                0x1
> +#define PEX_AMAP_CTRL_EN_SHIFT                  0x0
> +#define PEX_AMAP_CTRL_TYPE_MASK                 0x3
> +#define PEX_AMAP_CTRL_EN_MASK                   0x1
> +#define PAB_PEX_AMAP_CTRL(Idx)                  (0x4ba0 + 0x10 * Idx)
> +#define PAB_EXT_PEX_AMAP_SIZE(Idx)              (0xbef0 + 0x04 * Idx)
> +#define PAB_PEX_AMAP_AXI_WIN(Idx)               (0x4ba4 + 0x10 * Idx)
> +#define PAB_EXT_PEX_AMAP_AXI_WIN(Idx)           (0xb4a0 + 0x04 * Idx)
> +#define PAB_PEX_AMAP_PEX_WIN_L(Idx)             (0x4ba8 + 0x10 * Idx)
> +#define PAB_PEX_AMAP_PEX_WIN_H(Idx)             (0x4bac + 0x10 * Idx)
> +#define PAB_CTRL                                0x808
> +#define PAB_CTRL_APIO_EN                        0x1
> +#define PAB_CTRL_PPIO_EN                        (0x1 << 1)
> +#define PAB_CTRL_PAGE_SEL_SHIFT                 13
> +#define PAB_CTRL_PAGE_SEL_MASK                  0x3f
> +#define INDIRECT_ADDR_BNDRY                     0xc00
> +#define PAGE_IDX_SHIFT                          10
> +#define PAGE_ADDR_MASK                          0x3ff
> +#define PAB_AXI_AMAP_CTRL(Idx)                  (0xba0 + 0x10 * Idx)
> +#define PAB_EXT_AXI_AMAP_SIZE(Idx)              (0xbaf0 + 0x4 * Idx)
> +#define PAB_AXI_AMAP_AXI_WIN(Idx)               (0xba4 + 0x10 * Idx)
> +#define PAB_EXT_AXI_AMAP_AXI_WIN(Idx)           (0x80a0 + 0x4 * Idx)
> +#define PAB_AXI_AMAP_PEX_WIN_L(Idx)             (0xba8 + 0x10 * Idx)
> +#define PAB_AXI_AMAP_PEX_WIN_H(Idx)             (0xbac + 0x10 * Idx)
> +#define PAB_AXI_TYPE_CFG                        0x00
> +#define PAB_AXI_TYPE_IO                         0x01
> +#define PAB_AXI_TYPE_MEM                        0x02
> +#define AXI_AMAP_CTRL_EN                        0x1
> +#define AXI_AMAP_CTRL_TYPE_SHIFT                1
> +#define AXI_AMAP_CTRL_TYPE_MASK                 0x3
> +#define AXI_AMAP_CTRL_SIZE_SHIFT                10
> +#define AXI_AMAP_CTRL_SIZE_MASK                 0x3fffff
> +
> +
> +#define OFFSET_TO_PAGE_IDX(Off)                 ((Off >> PAGE_IDX_SHIFT) \
> +                                                & PAB_CTRL_PAGE_SEL_MASK)
> +
> +#define OFFSET_TO_PAGE_ADDR(Off)                ((Off & PAGE_ADDR_MASK) \
> +                                                | INDIRECT_ADDR_BNDRY)
> +/**
> +  Function to set page for LsGen4 Ctrl
> +
> +  @param  Dbi    GPEX host controller address.
> +  @param  PgIdx  The page index to select
> +
> +**/
> +STATIC inline VOID PciLsGen4SetPg (
> +  IN EFI_PHYSICAL_ADDRESS Dbi,
> +  IN UINT8 PgIdx
> +  )
> +{
> +  UINT32 Val;
> +  Val = MmioRead32 (Dbi + PAB_CTRL);
> +  Val &= ~(PAB_CTRL_PAGE_SEL_MASK << PAB_CTRL_PAGE_SEL_SHIFT);
> +  Val |= (PgIdx & PAB_CTRL_PAGE_SEL_MASK) << PAB_CTRL_PAGE_SEL_SHIFT;
> +  MmioWrite32 (Dbi + PAB_CTRL, Val);
> +}
> +
> +/**
> +  Function to read LsGen4 PCIe controller config space
> +  LsGen4 PCIe controller requires page number to be set
> +  in Bridge Control Register(PAB) for offset > 3KB.
> +
> +  @param  Dbi     GPEX host controller address.
> +  @param  Offset  Offset to read from
> +
> +**/
> +STATIC inline INTN PciLsGen4Read32 (
> +  IN EFI_PHYSICAL_ADDRESS Dbi,
> +  IN UINT32 Offset
> +  )
> +{
> +  if (Offset < INDIRECT_ADDR_BNDRY) {
> +    PciLsGen4SetPg (Dbi, 0);
> +    return MmioRead32 (Dbi + Offset);
> +  } else {
> +    // If Offset > 3KB, paging mechanism is used
> +    // Select page index and offset within the page
> +    PciLsGen4SetPg (Dbi, OFFSET_TO_PAGE_IDX (Offset));
> +    return MmioRead32 (Dbi + OFFSET_TO_PAGE_ADDR (Offset));
> +  }
> +}
> +
> +/**
> +  Function to write to LsGen4 PCIe controller config space
> +  LsGen4 PCIe controller requires page number to be set
> +  in Bridge Control Register(PAB) for offset > 3KB.
> +
> +  @param  Dbi     GPEX host controller address
> +  @param  Offset  Offset to read from
> +
> +**/
> +STATIC inline VOID PciLsGen4Write32 (
> +  IN EFI_PHYSICAL_ADDRESS Dbi,
> +  IN UINT32 Offset,
> +  IN UINT32 Value
> +  )
> +{
> +  if (Offset < INDIRECT_ADDR_BNDRY) {
> +    PciLsGen4SetPg (Dbi, 0);
> +    MmioWrite32 (Dbi + Offset, Value);
> +  } else {
> +    PciLsGen4SetPg (Dbi, OFFSET_TO_PAGE_IDX (Offset));
> +    MmioWrite32 (Dbi + OFFSET_TO_PAGE_ADDR (Offset), Value);
> +  }
> +}
>   #endif
> diff --git a/Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeLib.c
> index f92863c60868..d9944313da21 100644
> --- a/Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeLib.c
> +++ b/Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeLib.c
> @@ -201,7 +201,11 @@ PcieLinkUp (
>     UINT32 State;
>     UINT32 LtssmMask;
>   
> -  LtssmMask = 0x3f;
> +  if (PCI_LS_GEN4_CTRL) {
> +    LtssmMask = 0x7f;
> +  } else {
> +    LtssmMask = 0x3f;
> +  }
>   
>     PcieOps = GetMmioOperations (FeaturePcdGet (PcdPciLutBigEndian));
>     State = PcieOps->Read32 ((UINTN)Pcie + PCI_LUT_BASE + PCI_LUT_DBG) & LtssmMask;
> @@ -237,38 +241,58 @@ PcieOutboundSet (
>     IN UINT64 Size
>     )
>   {
> -  // PCIe Layerscape : Outbound Window
> -  MmioWrite32 (Dbi + IATU_VIEWPORT_OFF,
> -                (UINT32)(IATU_VIEWPORT_OUTBOUND | Idx));
> +  UINT32 Val;
>   
> -  MmioWrite32 (Dbi + IATU_LWR_BASE_ADDR_OFF_OUTBOUND_0,
> -                (UINT32)Phys);
> -
> -  MmioWrite32 (Dbi + IATU_UPPER_BASE_ADDR_OFF_OUTBOUND_0,
> -                (UINT32)(Phys >> 32));
> -
> -  MmioWrite32 (Dbi + IATU_LIMIT_ADDR_OFF_OUTBOUND_0,
> -                (UINT32)(Phys + Size - BIT0));
> -
> -  MmioWrite32 (Dbi + IATU_LWR_TARGET_ADDR_OFF_OUTBOUND_0,
> -                (UINT32)BusAddr);
> -
> -  MmioWrite32 (Dbi + IATU_UPPER_TARGET_ADDR_OFF_OUTBOUND_0,
> -                (UINT32)(BusAddr >> 32));
> -
> -  MmioWrite32 (Dbi + IATU_REGION_CTRL_1_OFF_OUTBOUND_0,
> -                (UINT32)Type);
> -
> -  if (CFG_SHIFT_ENABLE &&
> -     ((Type == IATU_REGION_CTRL_1_OFF_OUTBOUND_0_TYPE_CFG0) ||
> -     (Type == IATU_REGION_CTRL_1_OFF_OUTBOUND_0_TYPE_CFG1))) {
> -       MmioWrite32 (Dbi + IATU_REGION_CTRL_2_OFF_OUTBOUND_0,
> -         (IATU_REGION_CTRL_2_OFF_OUTBOUND_0_REGION_EN |
> -         IATU_ENABLE_CFG_SHIFT_FEATURE)
> -         );
> +  if (PCI_LS_GEN4_CTRL) {
> +    // PCIe Layerscape Gen4: Outbound Window
> +    Size = ~(Size -1 );
> +    Val = PciLsGen4Read32 ((UINTN)Dbi, PAB_AXI_AMAP_CTRL (Idx));
> +    Val &= ~((AXI_AMAP_CTRL_TYPE_MASK << AXI_AMAP_CTRL_TYPE_SHIFT) |
> +              (AXI_AMAP_CTRL_SIZE_MASK << AXI_AMAP_CTRL_SIZE_SHIFT) |
> +              AXI_AMAP_CTRL_EN);
> +    Val |= ((Type & AXI_AMAP_CTRL_TYPE_MASK) << AXI_AMAP_CTRL_TYPE_SHIFT) |
> +             (((UINT32)Size >> AXI_AMAP_CTRL_SIZE_SHIFT) <<
> +             AXI_AMAP_CTRL_SIZE_SHIFT) | AXI_AMAP_CTRL_EN;
> +    PciLsGen4Write32 ((UINTN)Dbi, PAB_AXI_AMAP_CTRL (Idx), Val);
> +    PciLsGen4Write32 ((UINTN)Dbi, PAB_AXI_AMAP_AXI_WIN (Idx), (UINT32)Phys);
> +    PciLsGen4Write32 ((UINTN)Dbi, PAB_EXT_AXI_AMAP_AXI_WIN (Idx), Phys >> 32);
> +    PciLsGen4Write32 ((UINTN)Dbi, PAB_AXI_AMAP_PEX_WIN_L (Idx), (UINT32)BusAddr);
> +    PciLsGen4Write32 ((UINTN)Dbi, PAB_AXI_AMAP_PEX_WIN_H (Idx), BusAddr >> 32);
> +    PciLsGen4Write32 ((UINTN)Dbi, PAB_EXT_AXI_AMAP_SIZE (Idx), Size >> 32);
>     } else {
> -    MmioWrite32 (Dbi + IATU_REGION_CTRL_2_OFF_OUTBOUND_0,
> -                  IATU_REGION_CTRL_2_OFF_OUTBOUND_0_REGION_EN);
> +    // PCIe Layerscape : Outbound Window
> +    MmioWrite32 (Dbi + IATU_VIEWPORT_OFF,
> +                  (UINT32)(IATU_VIEWPORT_OUTBOUND | Idx));
> +
> +    MmioWrite32 (Dbi + IATU_LWR_BASE_ADDR_OFF_OUTBOUND_0,
> +                  (UINT32)Phys);
> +
> +    MmioWrite32 (Dbi + IATU_UPPER_BASE_ADDR_OFF_OUTBOUND_0,
> +                  (UINT32)(Phys >> 32));
> +
> +    MmioWrite32 (Dbi + IATU_LIMIT_ADDR_OFF_OUTBOUND_0,
> +                  (UINT32)(Phys + Size - BIT0));
> +
> +    MmioWrite32 (Dbi + IATU_LWR_TARGET_ADDR_OFF_OUTBOUND_0,
> +                  (UINT32)BusAddr);
> +
> +    MmioWrite32 (Dbi + IATU_UPPER_TARGET_ADDR_OFF_OUTBOUND_0,
> +                  (UINT32)(BusAddr >> 32));
> +
> +    MmioWrite32 (Dbi + IATU_REGION_CTRL_1_OFF_OUTBOUND_0,
> +                  (UINT32)Type);
> +
> +    if (CFG_SHIFT_ENABLE &&
> +       ((Type == IATU_REGION_CTRL_1_OFF_OUTBOUND_0_TYPE_CFG0) ||
> +       (Type == IATU_REGION_CTRL_1_OFF_OUTBOUND_0_TYPE_CFG1))) {
> +         MmioWrite32 (Dbi + IATU_REGION_CTRL_2_OFF_OUTBOUND_0,
> +           (IATU_REGION_CTRL_2_OFF_OUTBOUND_0_REGION_EN |
> +           IATU_ENABLE_CFG_SHIFT_FEATURE)
> +           );
> +    } else {
> +      MmioWrite32 (Dbi + IATU_REGION_CTRL_2_OFF_OUTBOUND_0,
> +                    IATU_REGION_CTRL_2_OFF_OUTBOUND_0_REGION_EN);
> +    }
>     }
>   }
>   
> @@ -387,6 +411,124 @@ PcieLsSetupAtu (
>       SEG_IO_SIZE
>       );
>   }
> +
> +/**
> +  Function to set-up ATU windows for PCIe LayerscapeGen4 controller
> +
> +  @param Pcie      Address of PCIe host controller
> +  @param Cfg0Base  PCIe controller phy address Type0 Configuration Space.
> +  @param Cfg1Base  PCIe controller phy address Type1 Configuration Space.
> +  @param MemBase   PCIe controller phy address Memory Space.
> +  @param Mem64Base PCIe controller phy address MMIO64 Space.
> +  @param IoBase    PCIe controller phy address IO Space.
> +**/
> +STATIC
> +VOID
> +PcieLsGen4SetupAtu (
> +  IN EFI_PHYSICAL_ADDRESS Pcie,
> +  IN EFI_PHYSICAL_ADDRESS Cfg0Base,
> +  IN EFI_PHYSICAL_ADDRESS Cfg1Base,
> +  IN EFI_PHYSICAL_ADDRESS MemBase,
> +  IN EFI_PHYSICAL_ADDRESS Mem64Base,
> +  IN EFI_PHYSICAL_ADDRESS IoBase
> +  )
> +{
> +  // ATU : OUTBOUND WINDOW 1 : CFG0
> +  PcieOutboundSet (Pcie, IATU_REGION_INDEX0,
> +                         PAB_AXI_TYPE_CFG,
> +                         Cfg0Base,
> +                         SEG_CFG_BUS,
> +                         SEG_CFG_SIZE);
> +
> +  // ATU : OUTBOUND WINDOW 2 : IO
> +  PcieOutboundSet (Pcie, IATU_REGION_INDEX1,
> +                         PAB_AXI_TYPE_IO,
> +                         IoBase,
> +                         SEG_IO_BUS,
> +                         SEG_IO_SIZE);
> +
> +  // ATU : OUTBOUND WINDOW 3 : MEM
> +  PcieOutboundSet (Pcie, IATU_REGION_INDEX2,
> +                         PAB_AXI_TYPE_MEM,
> +                         MemBase,
> +                         SEG_MEM_BUS,
> +                         SEG_MEM_SIZE);
> +
> +  // ATU : OUTBOUND WINDOW 4 : MMIO64
> +  PcieOutboundSet (Pcie, IATU_REGION_INDEX3,
> +                            PAB_AXI_TYPE_MEM,
> +                            Mem64Base,
> +                            Mem64Base,
> +                            SIZE_4GB);
> +  Mem64Base += SIZE_4GB;
> +
> +  // ATU : OUTBOUND WINDOW 5 : MMIO64
> +  PcieOutboundSet (Pcie, IATU_REGION_INDEX4,
> +                            PAB_AXI_TYPE_MEM,
> +                            Mem64Base,
> +                            Mem64Base,
> +                            SIZE_4GB);
> +  Mem64Base += SIZE_4GB;
> +
> +  // ATU : OUTBOUND WINDOW 6 : MMIO64
> +  PcieOutboundSet (Pcie, IATU_REGION_INDEX5,
> +                            PAB_AXI_TYPE_MEM,
> +                            Mem64Base,
> +                            Mem64Base,
> +                            SIZE_4GB);
> +  Mem64Base += SIZE_4GB;
> +
> +  // ATU : OUTBOUND WINDOW 7 : MMIO64
> +  PcieOutboundSet (Pcie, IATU_REGION_INDEX6,
> +                            PAB_AXI_TYPE_MEM,
> +                            Mem64Base,
> +                            Mem64Base,
> +                            SIZE_4GB);
> +}
> +
> +/**
> +  Function to set-up PCIe inbound window
> +
> +  @param Pcie    Address of PCIe host controller.
> +  @param Idx     Index of inbound window.
> +  @param Type    Type(Cfg/Mem/IO) of iATU outbound window.
> +  @param Phys    PCIe controller phy address for inbound window.
> +  @param BusAdr  PCIe controller bus address for inbound window.
> +  @param Size    Window size
> +
> +**/
> +
> +STATIC
> +VOID
> +PciSetupInBoundWin (
> +  IN EFI_PHYSICAL_ADDRESS Pcie,
> +  IN UINT32 Idx,
> +  IN UINT32  Type,
> +  IN UINT64 Phys,
> +  IN UINT64 BusAddr,
> +  IN UINT64 Size)
> +{
> +  UINT32 Val;
> +  UINT64 WinSize;
> +
> +  if (PCI_LS_GEN4_CTRL) {
> +    Val = PciLsGen4Read32 ((UINTN)Pcie, PAB_PEX_AMAP_CTRL(Idx));
> +    Val &= ~(PEX_AMAP_CTRL_TYPE_MASK << PEX_AMAP_CTRL_TYPE_SHIFT);
> +    Val &= ~(PEX_AMAP_CTRL_EN_MASK << PEX_AMAP_CTRL_EN_SHIFT);
> +    Val = (Val | (Type << PEX_AMAP_CTRL_TYPE_SHIFT));
> +    Val = (Val | (1 << PEX_AMAP_CTRL_EN_SHIFT));
> +
> +    WinSize = ~(Size - 1);
> +    PciLsGen4Write32 ((UINTN)Pcie, PAB_PEX_AMAP_CTRL(Idx),
> +                       (Val | (UINT32)WinSize));
> +    PciLsGen4Write32 ((UINTN)Pcie, PAB_EXT_PEX_AMAP_SIZE(Idx), (WinSize>>32));
> +    PciLsGen4Write32 ((UINTN)Pcie, PAB_PEX_AMAP_AXI_WIN(Idx), (UINT32)Phys);
> +    PciLsGen4Write32 ((UINTN)Pcie, PAB_EXT_PEX_AMAP_AXI_WIN(Idx), (Phys>>32));
> +    PciLsGen4Write32 ((UINTN)Pcie, PAB_PEX_AMAP_PEX_WIN_L(Idx), (UINT32)BusAddr);
> +    PciLsGen4Write32 ((UINTN)Pcie, PAB_PEX_AMAP_PEX_WIN_H(Idx), (BusAddr >>32));
> +  }
> +}
> +
>   /**
>     Helper function to set-up PCIe controller
>   
> @@ -411,16 +553,47 @@ PcieSetupCntrl (
>   {
>     UINT32 Val;
>   
> -  // PCIe Layerscape Controller Setup
> -  PcieLsSetupAtu (Pcie, Cfg0Base, Cfg1Base, MemBase, Mem64Base, IoBase);
> -
> -  // Program Class code for Layerscape PCIe controller
> -  MmioWrite32 ((UINTN)Pcie + PCI_DBI_RO_WR_EN, 1);
> -  Val = MmioRead32 ((UINTN)Pcie + PCI_CLASS_DEVICE);
> -  Val &= ~(CLASS_CODE_MASK << CLASS_CODE_SHIFT);
> -  Val |= (PCI_CLASS_BRIDGE_PCI << CLASS_CODE_SHIFT);
> -  MmioWrite32 ((UINTN)Pcie + PCI_CLASS_DEVICE, Val);
> -  MmioWrite32 ((UINTN)Pcie + PCI_DBI_RO_WR_EN, 0);
> +  if (PCI_LS_GEN4_CTRL) {
> +    // PCIe LsGen4 Controller Setup
> +
> +    //Fix Class Code
> +    Val = PciLsGen4Read32 ((UINTN)Pcie, GPEX_CLASSCODE);
> +    Val &= ~(GPEX_CLASSCODE_MASK << GPEX_CLASSCODE_SHIFT);
> +    Val |= PCI_CLASS_BRIDGE_PCI << GPEX_CLASSCODE_SHIFT;
> +    PciLsGen4Write32 ((UINTN)Pcie, GPEX_CLASSCODE, Val);
> +
> +    // Enable APIO and Memory/IO/CFG Windows
> +    Val = PciLsGen4Read32 ((UINTN)Pcie, PAB_AXI_PIO_CTRL (0));
> +    Val |= APIO_EN | MEM_WIN_EN | IO_WIN_EN | CFG_WIN_EN;
> +    PciLsGen4Write32 ((UINTN)Pcie, PAB_AXI_PIO_CTRL (0), Val);
> +
> +    // LsGen4 Inbound Window Setup
> +    PciSetupInBoundWin (Pcie, 0, PAB_AXI_TYPE_MEM, 0 , 0, SIZE_1TB);
> +
> +    // LsGen4 Outbound Window Setup
> +    PcieLsGen4SetupAtu (Pcie, Cfg0Base, Cfg1Base, MemBase, Mem64Base, IoBase);
> +
> +    // Enable AMBA & PEX PIO
> +    Val = PciLsGen4Read32 ((UINTN)Pcie, PAB_CTRL);
> +    Val |= PAB_CTRL_APIO_EN | PAB_CTRL_PPIO_EN;
> +    PciLsGen4Write32 ((UINTN)Pcie, PAB_CTRL, Val);
> +
> +    Val = PciLsGen4Read32 ((UINTN)Pcie, PAB_PEX_PIO_CTRL(0));
> +    Val |= PPIO_EN;
> +    PciLsGen4Write32 ((UINTN)Pcie, PAB_PEX_PIO_CTRL(0), Val);
> +
> +  } else {
> +    // PCIe Layerscape Controller Setup
> +    PcieLsSetupAtu (Pcie, Cfg0Base, Cfg1Base, MemBase, Mem64Base, IoBase);
> +
> +    // Program Class code for Layerscape PCIe controller
> +    MmioWrite32 ((UINTN)Pcie + PCI_DBI_RO_WR_EN, 1);
> +    Val = MmioRead32 ((UINTN)Pcie + PCI_CLASS_DEVICE);
> +    Val &= ~(CLASS_CODE_MASK << CLASS_CODE_SHIFT);
> +    Val |= (PCI_CLASS_BRIDGE_PCI << CLASS_CODE_SHIFT);
> +    MmioWrite32 ((UINTN)Pcie + PCI_CLASS_DEVICE, Val);
> +    MmioWrite32 ((UINTN)Pcie + PCI_DBI_RO_WR_EN, 0);
> +  }
>   }
>   
>   /**
> 


  reply	other threads:[~2020-05-22  9:24 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-21 23:02 [PATCH edk2-platforms 00/16] Add PCIe Support Wasim Khan
2020-05-21 23:02 ` [PATCH edk2-platforms 01/16] Silicon/NXP/NxpQoriqLs.dec: Add PCIe related PCDs Wasim Khan
2020-05-22  9:12   ` Ard Biesheuvel
2020-05-24 18:31     ` Wasim Khan (OSS)
2020-05-26  6:16       ` Ard Biesheuvel
2020-05-21 23:02 ` [PATCH edk2-platforms 02/16] Silicon/NXP: LS1043A: Define " Wasim Khan
2020-05-21 23:02 ` [PATCH edk2-platforms 03/16] Silicon/NXP: Implement PciHostBridgeLib support Wasim Khan
2020-05-22  9:20   ` Ard Biesheuvel
2020-05-21 23:02 ` [PATCH edk2-platforms 04/16] Silicon/NXP: PciHostBridgeLib: CFG Shift feature support for PCIeLS Ctrl Wasim Khan
2020-05-22  9:22   ` Ard Biesheuvel
2020-05-21 23:02 ` [PATCH edk2-platforms 05/16] Silicon/NXP: PciHostBridgeLib: Setup PCIe LsGen4 Controller and ATU Windows Wasim Khan
2020-05-22  9:24   ` Ard Biesheuvel [this message]
2020-05-24 18:31     ` Wasim Khan (OSS)
2020-05-21 23:02 ` [PATCH edk2-platforms 06/16] Silicon/NXP: PciHostBridgeLib: add Workaround for A-011451 Wasim Khan
2020-05-21 23:02 ` [PATCH edk2-platforms 07/16] Silicon/NXP: PciHostBridgeLib: Dump Layerscale Gen4 ATU windows Wasim Khan
2020-05-22  9:33   ` Ard Biesheuvel
2020-05-21 23:02 ` [PATCH edk2-platforms 08/16] Silicon/NXP: PciHostBridgeLib: Dump Layerscale iATU windows Wasim Khan
2020-05-22  9:31   ` Ard Biesheuvel
2020-05-21 23:02 ` [PATCH edk2-platforms 09/16] Silicon/NXP: Implement PciSegmentLib for PCIe Layerscape Controller Wasim Khan
2020-05-22  9:29   ` Ard Biesheuvel
2020-05-24 18:32     ` Wasim Khan (OSS)
2020-05-25  4:30       ` Jon Nettleton
2020-05-25 15:21         ` Wasim Khan (OSS)
2020-05-21 23:02 ` [PATCH edk2-platforms 10/16] Silicon/NXP: PciSegmentLib: Add ECAM config support for PCIe LS Controller Wasim Khan
2020-05-22  9:36   ` Ard Biesheuvel
2020-05-24 18:32     ` Wasim Khan (OSS)
2020-05-21 23:02 ` [PATCH edk2-platforms 11/16] Silicon/NXP: PciSegmentLib: Add support PCIe LsGen4 Controller Wasim Khan
2020-05-22  9:38   ` Ard Biesheuvel
2020-05-24 18:32     ` Wasim Khan (OSS)
2020-05-21 23:02 ` [PATCH edk2-platforms 12/16] Silicon/NXP: PciSegmentLib: LsGen4Ctrl: Add Workaround for A-011264 Wasim Khan
2020-05-22  9:39   ` Ard Biesheuvel
2020-05-24 18:32     ` Wasim Khan (OSS)
2020-05-21 23:02 ` [PATCH edk2-platforms 13/16] Silicon/NXP/Drivers: Implement PciCpuIo2Dxe Driver Wasim Khan
2020-05-22  9:42   ` Ard Biesheuvel
2020-05-21 23:02 ` [PATCH edk2-platforms 14/16] Platform/NXP: LS1043aRdbPkg: Enable NetworkPkg Wasim Khan
2020-05-22  9:42   ` Ard Biesheuvel
2020-05-21 23:02 ` [PATCH edk2-platforms 15/16] Platform/NXP: LS1043aRdbPkg: Enable PCIE support Wasim Khan
2020-05-21 23:02 ` [PATCH edk2-platforms 16/16] Platform/NXP: LS1043aRdbPkg : Increase fv image size Wasim Khan
2020-05-22  9:44   ` Ard Biesheuvel
2020-05-22  9:46 ` [PATCH edk2-platforms 00/16] Add PCIe Support Ard Biesheuvel
2020-05-22 10:58   ` Leif Lindholm
2020-05-24 18:32     ` Wasim Khan (OSS)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=81087d66-c40e-7487-6470-7023ddee801a@arm.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox