Re: [edk2] [PATCH edk2-platforms 39/39] Platform/NXP:PCIe enablement for LS2088A RDB
>-Original Message- >From: Leif Lindholm [mailto:leif.lindh...@linaro.org] >Sent: Friday, April 20, 2018 9:06 PM >To: Meenakshi Aggarwal <meenakshi.aggar...@nxp.com> >Cc: ard.biesheu...@linaro.org; edk2-devel@lists.01.org; Udit Kumar ><udit.ku...@nxp.com>; Varun Sethi <v.se...@nxp.com>; Vabhav Sharma ><vabhav.sha...@nxp.com> >Subject: Re: [PATCH edk2-platforms 39/39] Platform/NXP:PCIe enablement for >LS2088A RDB > >On Fri, Feb 16, 2018 at 02:20:35PM +0530, Meenakshi wrote: >> From: Vabhav <vabhav.sha...@nxp.com> >> >> Compilation: Update the fdf, dsc and dec files. >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Vabhav <vabhav.sha...@nxp.com> >> --- >> Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc| 17 >+ >> Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf| 9 + >> .../Library/PlatformLib/ArmPlatformLib.inf | 2 ++ >> .../LS2088aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c | 6 ++ >> Silicon/NXP/LS2088A/LS2088A.dsc | 3 +++ >> 5 files changed, 37 insertions(+) >> >> diff --git a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc >> b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc >> index 4d32ea5..1ae55d4 100755 >> --- a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc >> +++ b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc >> @@ -43,6 +43,8 @@ >>BoardLib|Platform/NXP/LS2088aRdbPkg/Library/BoardLib/BoardLib.inf >>FpgaLib|Platform/NXP/LS2088aRdbPkg/Library/FpgaLib/FpgaLib.inf >>NorFlashLib|Silicon/NXP/Library/NorFlashLib/NorFlashLib.inf >> + PciSegmentLib|Silicon/NXP/Library/PciSegmentLib/PciSegmentLib.inf >> + >> + PciHostBridgeLib|Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeL >> + ib.inf >> >> [PcdsFixedAtBuild.common] >> >> @@ -97,6 +99,13 @@ >>gNxpQoriqLsTokenSpaceGuid.PcdFlashDeviceBase64|0x58000 >>gNxpQoriqLsTokenSpaceGuid.PcdFlashReservedRegionBase64|0x58030 >> >> + # >> + # PCI PCDs. >> + # >> + gNxpQoriqLsTokenSpaceGuid.PcdPciDebug|FALSE >> + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutBase|0x8 >> + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutDbg|0x407FC >> + >> >> >## > >> ## >> # >> # Components Section - list of all EDK II Modules needed by this >> Platform @@ -115,3 +124,11 @@ >>Silicon/NXP/Drivers/I2cDxe/I2cDxe.inf >>Silicon/NXP/Drivers/NorFlashDxe/NorFlashDxe.inf >>Silicon/NXP/Drivers/UsbHcdInitDxe/UsbHcd.inf >> + Silicon/NXP/Drivers/PciCpuIo2Dxe/PciCpuIo2Dxe.inf >> + MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { >> + >> + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8010004F >> + } >> + MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf >> + >> + ## >> diff --git a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf >> b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf >> index 8688d85..35a79bd 100644 >> --- a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf >> +++ b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf >> @@ -127,6 +127,13 @@ READ_LOCK_STATUS = TRUE >>INF Silicon/NXP/Drivers/NorFlashDxe/NorFlashDxe.inf >> >># >> + # PCI >> + # >> + INF Silicon/NXP/Drivers/PciCpuIo2Dxe/PciCpuIo2Dxe.inf >> + INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf >> + INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf >> + >> + # >># Network modules >># >>INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf >> @@ -153,6 +160,8 @@ READ_LOCK_STATUS = TRUE >> >>INF >> >MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDev >> iceDxe.inf >> >> + INF >> + >ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >> + > >Same comment as previously platforms: please conditionalise and mention in >commit message. >(Please add some detail to commit message in general about what is being >enabled.) > >/ >Leif Ok , Updated in header I will update in commit message Thanks. > >># >># USB Support >># >> diff --git >> a/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf >> b/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf >> index f5e5abd..0b836a8 100644 >> --- >> a/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf >> +++ b/Platform/NXP/LS2088aRdbPkg/Library/PlatformLi
Re: [edk2] [PATCH edk2-platforms 39/39] Platform/NXP:PCIe enablement for LS2088A RDB
On Fri, Feb 16, 2018 at 02:20:35PM +0530, Meenakshi wrote: > From: Vabhav> > Compilation: Update the fdf, dsc and dec files. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Vabhav > --- > Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc| 17 > + > Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf| 9 + > .../Library/PlatformLib/ArmPlatformLib.inf | 2 ++ > .../LS2088aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c | 6 ++ > Silicon/NXP/LS2088A/LS2088A.dsc | 3 +++ > 5 files changed, 37 insertions(+) > > diff --git a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc > b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc > index 4d32ea5..1ae55d4 100755 > --- a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc > +++ b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc > @@ -43,6 +43,8 @@ >BoardLib|Platform/NXP/LS2088aRdbPkg/Library/BoardLib/BoardLib.inf >FpgaLib|Platform/NXP/LS2088aRdbPkg/Library/FpgaLib/FpgaLib.inf >NorFlashLib|Silicon/NXP/Library/NorFlashLib/NorFlashLib.inf > + PciSegmentLib|Silicon/NXP/Library/PciSegmentLib/PciSegmentLib.inf > + PciHostBridgeLib|Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeLib.inf > > [PcdsFixedAtBuild.common] > > @@ -97,6 +99,13 @@ >gNxpQoriqLsTokenSpaceGuid.PcdFlashDeviceBase64|0x58000 >gNxpQoriqLsTokenSpaceGuid.PcdFlashReservedRegionBase64|0x58030 > > + # > + # PCI PCDs. > + # > + gNxpQoriqLsTokenSpaceGuid.PcdPciDebug|FALSE > + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutBase|0x8 > + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutDbg|0x407FC > + > > > # > # Components Section - list of all EDK II Modules needed by this Platform > @@ -115,3 +124,11 @@ >Silicon/NXP/Drivers/I2cDxe/I2cDxe.inf >Silicon/NXP/Drivers/NorFlashDxe/NorFlashDxe.inf >Silicon/NXP/Drivers/UsbHcdInitDxe/UsbHcd.inf > + Silicon/NXP/Drivers/PciCpuIo2Dxe/PciCpuIo2Dxe.inf > + MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { > + > + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8010004F > + } > + MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf > + > + ## > diff --git a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf > b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf > index 8688d85..35a79bd 100644 > --- a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf > +++ b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf > @@ -127,6 +127,13 @@ READ_LOCK_STATUS = TRUE >INF Silicon/NXP/Drivers/NorFlashDxe/NorFlashDxe.inf > ># > + # PCI > + # > + INF Silicon/NXP/Drivers/PciCpuIo2Dxe/PciCpuIo2Dxe.inf > + INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf > + INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf > + > + # ># Network modules ># >INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf > @@ -153,6 +160,8 @@ READ_LOCK_STATUS = TRUE > >INF > MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf > > + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > + Same comment as previously platforms: please conditionalise and mention in commit message. (Please add some detail to commit message in general about what is being enabled.) / Leif ># ># USB Support ># > diff --git > a/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf > b/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf > index f5e5abd..0b836a8 100644 > --- a/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf > +++ b/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf > @@ -44,6 +44,8 @@ >gArmTokenSpaceGuid.PcdArmPrimaryCore >gNxpQoriqLsTokenSpaceGuid.PcdCcsrBaseAddr >gNxpQoriqLsTokenSpaceGuid.PcdCcsrSize > + gNxpQoriqLsTokenSpaceGuid.PcdRomBaseAddr > + gNxpQoriqLsTokenSpaceGuid.PcdRomSize >gNxpQoriqLsTokenSpaceGuid.PcdIfcRegion1BaseAddr >gNxpQoriqLsTokenSpaceGuid.PcdIfcRegion1Size >gNxpQoriqLsTokenSpaceGuid.PcdIfcRegion2BaseAddr > diff --git a/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c > b/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c > index ccb49f6..8b2145b 100644 > --- a/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c > +++ b/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c > @@ -80,6 +80,12 @@ ArmPlatformGetVirtualMemoryMap ( >VirtualMemoryTable[Index].Length = FixedPcdGet64 (PcdCcsrSize); >VirtualMemoryTable[Index].Attributes = > ARM_MEMORY_REGION_ATTRIBUTE_DEVICE; > > + // ROM Space > + VirtualMemoryTable[++Index].PhysicalBase = FixedPcdGet64 (PcdRomBaseAddr); > + VirtualMemoryTable[Index].VirtualBase = FixedPcdGet64 (PcdRomBaseAddr); > + VirtualMemoryTable[Index].Length = FixedPcdGet64 (PcdRomSize); > + VirtualMemoryTable[Index].Attributes = > ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;
[edk2] [PATCH edk2-platforms 39/39] Platform/NXP:PCIe enablement for LS2088A RDB
From: VabhavCompilation: Update the fdf, dsc and dec files. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Vabhav --- Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc| 17 + Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf| 9 + .../Library/PlatformLib/ArmPlatformLib.inf | 2 ++ .../LS2088aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c | 6 ++ Silicon/NXP/LS2088A/LS2088A.dsc | 3 +++ 5 files changed, 37 insertions(+) diff --git a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc index 4d32ea5..1ae55d4 100755 --- a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc +++ b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc @@ -43,6 +43,8 @@ BoardLib|Platform/NXP/LS2088aRdbPkg/Library/BoardLib/BoardLib.inf FpgaLib|Platform/NXP/LS2088aRdbPkg/Library/FpgaLib/FpgaLib.inf NorFlashLib|Silicon/NXP/Library/NorFlashLib/NorFlashLib.inf + PciSegmentLib|Silicon/NXP/Library/PciSegmentLib/PciSegmentLib.inf + PciHostBridgeLib|Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeLib.inf [PcdsFixedAtBuild.common] @@ -97,6 +99,13 @@ gNxpQoriqLsTokenSpaceGuid.PcdFlashDeviceBase64|0x58000 gNxpQoriqLsTokenSpaceGuid.PcdFlashReservedRegionBase64|0x58030 + # + # PCI PCDs. + # + gNxpQoriqLsTokenSpaceGuid.PcdPciDebug|FALSE + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutBase|0x8 + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutDbg|0x407FC + # # Components Section - list of all EDK II Modules needed by this Platform @@ -115,3 +124,11 @@ Silicon/NXP/Drivers/I2cDxe/I2cDxe.inf Silicon/NXP/Drivers/NorFlashDxe/NorFlashDxe.inf Silicon/NXP/Drivers/UsbHcdInitDxe/UsbHcd.inf + Silicon/NXP/Drivers/PciCpuIo2Dxe/PciCpuIo2Dxe.inf + MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8010004F + } + MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf + + ## diff --git a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf index 8688d85..35a79bd 100644 --- a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf +++ b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf @@ -127,6 +127,13 @@ READ_LOCK_STATUS = TRUE INF Silicon/NXP/Drivers/NorFlashDxe/NorFlashDxe.inf # + # PCI + # + INF Silicon/NXP/Drivers/PciCpuIo2Dxe/PciCpuIo2Dxe.inf + INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf + INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf + + # # Network modules # INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf @@ -153,6 +160,8 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + # # USB Support # diff --git a/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf b/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf index f5e5abd..0b836a8 100644 --- a/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf +++ b/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf @@ -44,6 +44,8 @@ gArmTokenSpaceGuid.PcdArmPrimaryCore gNxpQoriqLsTokenSpaceGuid.PcdCcsrBaseAddr gNxpQoriqLsTokenSpaceGuid.PcdCcsrSize + gNxpQoriqLsTokenSpaceGuid.PcdRomBaseAddr + gNxpQoriqLsTokenSpaceGuid.PcdRomSize gNxpQoriqLsTokenSpaceGuid.PcdIfcRegion1BaseAddr gNxpQoriqLsTokenSpaceGuid.PcdIfcRegion1Size gNxpQoriqLsTokenSpaceGuid.PcdIfcRegion2BaseAddr diff --git a/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c b/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c index ccb49f6..8b2145b 100644 --- a/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c +++ b/Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c @@ -80,6 +80,12 @@ ArmPlatformGetVirtualMemoryMap ( VirtualMemoryTable[Index].Length = FixedPcdGet64 (PcdCcsrSize); VirtualMemoryTable[Index].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE; + // ROM Space + VirtualMemoryTable[++Index].PhysicalBase = FixedPcdGet64 (PcdRomBaseAddr); + VirtualMemoryTable[Index].VirtualBase = FixedPcdGet64 (PcdRomBaseAddr); + VirtualMemoryTable[Index].Length = FixedPcdGet64 (PcdRomSize); + VirtualMemoryTable[Index].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE; + // IFC region 1 // // A-009241 : Unaligned write transactions to IFC may result in corruption of data diff --git a/Silicon/NXP/LS2088A/LS2088A.dsc b/Silicon/NXP/LS2088A/LS2088A.dsc index 0d8fd82..831edea 100644 --- a/Silicon/NXP/LS2088A/LS2088A.dsc +++ b/Silicon/NXP/LS2088A/LS2088A.dsc @@ -69,5 +69,8 @@ gNxpQoriqLsTokenSpaceGuid.PcdNumI2cController|4 gNxpQoriqLsTokenSpaceGuid.PcdIfcBaseAddr|0x0224 gNxpQoriqLsTokenSpaceGuid.PcdNumUsbController|2 +