Hi Aditya, On Thu, Mar 12, 2020 at 20:05:13 +0530, Aditya Angadi wrote: > From: Vijayenthiran Subramaniam <vijayenthiran.subraman...@arm.com> > > In preparation for adding support for Reference Design (RD) platforms > that have different base addresses for GIC distributor or redistributor, > create individual platform description files for all SGI/RD platforms > and move GIC related base addresses from the common SGI/RD platform > description file to individual platform description files. > The existing platform description is then included by individual > platform description files. > > Signed-off-by: Vijayenthiran Subramaniam <vijayenthiran.subraman...@arm.com>
The Signed-off-by indicates the contributor's statement that the contribution is in accordance with https://developercertificate.org/, the authors thoughts on the matter aren't really important (and they retain the authorship of the patch). Can you respin a v2 set with this and a couple of other high-level changes please? 1) Run edk2/BaseTools/Scripts/SetupGit.py in this repository to set up some sane defaults that ensure the patches are easier to review. Also, follow the steps from https://github.com/tianocore/tianocore.github.io/wiki/Laszlo%27s-unkempt-git-guide-for-edk2-contributors-and-maintainers#contrib-23 when actually generating the patches, to get rid of the filename munging in the diffstat below. 2) Please provide an update for Maintainers.txt with an entry for either all of Platform/ARM/ or one for Platform/ARM/SgiPkg, as part of this set. You can add me as M: and one or more arm.com people as R:. Best Regards, Leif > --- > Platform/ARM/SgiPkg/Include/SgiPlatform.h | 7 +--- > .../Library/PlatformLib/PlatformLib.inf | 3 +- > .../Library/PlatformLib/PlatformLibMem.c | 8 ++-- > Platform/ARM/SgiPkg/RdE1Edge.dsc | 37 +++++++++++++++++++ > Platform/ARM/SgiPkg/RdN1Edge.dsc | 37 +++++++++++++++++++ > Platform/ARM/SgiPkg/Sgi575.dsc | 37 +++++++++++++++++++ > Platform/ARM/SgiPkg/SgiPlatform.dec | 5 ++- > Platform/ARM/SgiPkg/SgiPlatform.dsc | 25 +------------ > 8 files changed, 124 insertions(+), 35 deletions(-) > create mode 100644 Platform/ARM/SgiPkg/RdE1Edge.dsc > create mode 100644 Platform/ARM/SgiPkg/RdN1Edge.dsc > create mode 100644 Platform/ARM/SgiPkg/Sgi575.dsc > > diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h > b/Platform/ARM/SgiPkg/Include/SgiPlatform.h > index e36a412155..d87fb2b540 100644 > --- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h > +++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h > @@ -1,6 +1,6 @@ > /** @file > * > -* Copyright (c) 2018, ARM Limited. All rights reserved. > +* Copyright (c) 2018-2020, ARM Limited. All rights reserved. > * > * SPDX-License-Identifier: BSD-2-Clause-Patent > * > @@ -45,11 +45,6 @@ > #define SGI_SUBSYS_GENERIC_WDOG_BASE 0x2A440000 > #define SGI_SUBSYS_GENERIC_WDOG_SZ SIZE_128KB > > -// Sub System Peripherals - GIC > -#define SGI_SUBSYS_GENERIC_GIC_BASE 0x30000000 > -#define SGI_SUBSYS_GENERIC_GICR_BASE 0x300C0000 > -#define SGI_SUBSYS_GENERIC_GIC_SZ SIZE_1MB > - > // Expansion AXI - Platform Peripherals - HDLCD1 > #define SGI_EXP_PLAT_PERIPH_HDLCD1_BASE 0x7FF60000 > #define SGI_EXP_PLAT_PERIPH_HDLCD1_SZ SIZE_64KB > diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf > b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf > index 3db70e900d..a918afef5f 100644 > --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf > +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf > @@ -1,5 +1,5 @@ > # > -# Copyright (c) 2018, ARM Limited. All rights reserved. > +# Copyright (c) 2018-2020, ARM Limited. All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -42,6 +42,7 @@ > > gArmSgiTokenSpaceGuid.PcdDramBlock2Base > gArmSgiTokenSpaceGuid.PcdDramBlock2Size > + gArmSgiTokenSpaceGuid.PcdGicSize > > gArmTokenSpaceGuid.PcdSystemMemoryBase > gArmTokenSpaceGuid.PcdSystemMemorySize > diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c > b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c > index 845aeaf4dd..8d0ad4ec9c 100644 > --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c > +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c > @@ -1,6 +1,6 @@ > /** @file > * > -* Copyright (c) 2018, ARM Limited. All rights reserved. > +* Copyright (c) 2018-2020, ARM Limited. All rights reserved. > * > * SPDX-License-Identifier: BSD-2-Clause-Patent > * > @@ -93,9 +93,9 @@ ArmPlatformGetVirtualMemoryMap ( > VirtualMemoryTable[Index].Attributes = > ARM_MEMORY_REGION_ATTRIBUTE_DEVICE; > > // Sub System Peripherals - GIC-600 > - VirtualMemoryTable[++Index].PhysicalBase = SGI_SUBSYS_GENERIC_GIC_BASE; > - VirtualMemoryTable[Index].VirtualBase = SGI_SUBSYS_GENERIC_GIC_BASE; > - VirtualMemoryTable[Index].Length = SGI_SUBSYS_GENERIC_GIC_SZ; > + VirtualMemoryTable[++Index].PhysicalBase = > FixedPcdGet64(PcdGicDistributorBase); > + VirtualMemoryTable[Index].VirtualBase = > FixedPcdGet64(PcdGicDistributorBase); > + VirtualMemoryTable[Index].Length = FixedPcdGet64(PcdGicSize); > VirtualMemoryTable[Index].Attributes = > ARM_MEMORY_REGION_ATTRIBUTE_DEVICE; > > // Expansion AXI - Platform Peripherals - HDLCD1 > diff --git a/Platform/ARM/SgiPkg/RdE1Edge.dsc > b/Platform/ARM/SgiPkg/RdE1Edge.dsc > new file mode 100644 > index 0000000000..082cbb0157 > --- /dev/null > +++ b/Platform/ARM/SgiPkg/RdE1Edge.dsc > @@ -0,0 +1,37 @@ > +# > +# Copyright (c) 2020, ARM Limited. All rights reserved. > +# > +# SPDX-License-Identifier: BSD-2-Clause-Patent > +# > + > +################################################################################ > +# > +# Defines Section - statements that will be processed to create a Makefile. > +# > +################################################################################ > +[Defines] > + PLATFORM_NAME = ArmSgi > + PLATFORM_GUID = c834de39-c5b0-458b-8ea3-882427179b8a > + PLATFORM_VERSION = 0.1 > + DSC_SPECIFICATION = 0x0001001B > + OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME) > + SUPPORTED_ARCHITECTURES = AARCH64|ARM > + BUILD_TARGETS = NOOPT|DEBUG|RELEASE > + SKUID_IDENTIFIER = DEFAULT > + FLASH_DEFINITION = Platform/ARM/SgiPkg/SgiPlatform.fdf > + BUILD_NUMBER = 1 > + > +# include common definitions from SgiPlatform.dsc > +!include Platform/ARM/SgiPkg/SgiPlatform.dsc > + > +################################################################################ > +# > +# Pcd Section - list of all EDK II PCD Entries defined by this Platform > +# > +################################################################################ > + > +[PcdsFixedAtBuild.common] > + # GIC Base Addresses > + gArmTokenSpaceGuid.PcdGicDistributorBase|0x30000000 > + gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x300C0000 > + gArmSgiTokenSpaceGuid.PcdGicSize|0x100000 > diff --git a/Platform/ARM/SgiPkg/RdN1Edge.dsc > b/Platform/ARM/SgiPkg/RdN1Edge.dsc > new file mode 100644 > index 0000000000..6774990ad6 > --- /dev/null > +++ b/Platform/ARM/SgiPkg/RdN1Edge.dsc > @@ -0,0 +1,37 @@ > +# > +# Copyright (c) 2020, ARM Limited. All rights reserved. > +# > +# SPDX-License-Identifier: BSD-2-Clause-Patent > +# > + > +################################################################################ > +# > +# Defines Section - statements that will be processed to create a Makefile. > +# > +################################################################################ > +[Defines] > + PLATFORM_NAME = ArmSgi > + PLATFORM_GUID = dbc75915-03df-4640-8f3d-3d3abf7c119b > + PLATFORM_VERSION = 0.1 > + DSC_SPECIFICATION = 0x0001001B > + OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME) > + SUPPORTED_ARCHITECTURES = AARCH64|ARM > + BUILD_TARGETS = NOOPT|DEBUG|RELEASE > + SKUID_IDENTIFIER = DEFAULT > + FLASH_DEFINITION = Platform/ARM/SgiPkg/SgiPlatform.fdf > + BUILD_NUMBER = 1 > + > +# include common definitions from SgiPlatform.dsc > +!include Platform/ARM/SgiPkg/SgiPlatform.dsc > + > +################################################################################ > +# > +# Pcd Section - list of all EDK II PCD Entries defined by this Platform > +# > +################################################################################ > + > +[PcdsFixedAtBuild.common] > + # GIC Base Addresses > + gArmTokenSpaceGuid.PcdGicDistributorBase|0x30000000 > + gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x300C0000 > + gArmSgiTokenSpaceGuid.PcdGicSize|0x100000 > diff --git a/Platform/ARM/SgiPkg/Sgi575.dsc b/Platform/ARM/SgiPkg/Sgi575.dsc > new file mode 100644 > index 0000000000..3c1904c2da > --- /dev/null > +++ b/Platform/ARM/SgiPkg/Sgi575.dsc > @@ -0,0 +1,37 @@ > +# > +# Copyright (c) 2020, ARM Limited. All rights reserved. > +# > +# SPDX-License-Identifier: BSD-2-Clause-Patent > +# > + > +################################################################################ > +# > +# Defines Section - statements that will be processed to create a Makefile. > +# > +################################################################################ > +[Defines] > + PLATFORM_NAME = ArmSgi > + PLATFORM_GUID = 3a6b2eae-0275-4b6e-a5d1-bd2ba1ce1fae > + PLATFORM_VERSION = 0.1 > + DSC_SPECIFICATION = 0x0001001B > + OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME) > + SUPPORTED_ARCHITECTURES = AARCH64|ARM > + BUILD_TARGETS = NOOPT|DEBUG|RELEASE > + SKUID_IDENTIFIER = DEFAULT > + FLASH_DEFINITION = Platform/ARM/SgiPkg/SgiPlatform.fdf > + BUILD_NUMBER = 1 > + > +# include common definitions from SgiPlatform.dsc > +!include Platform/ARM/SgiPkg/SgiPlatform.dsc > + > +################################################################################ > +# > +# Pcd Section - list of all EDK II PCD Entries defined by this Platform > +# > +################################################################################ > + > +[PcdsFixedAtBuild.common] > + # GIC Base Addresses > + gArmTokenSpaceGuid.PcdGicDistributorBase|0x30000000 > + gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x300C0000 > + gArmSgiTokenSpaceGuid.PcdGicSize|0x100000 > diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dec > b/Platform/ARM/SgiPkg/SgiPlatform.dec > index 9d70ec6777..4ac3dec91e 100644 > --- a/Platform/ARM/SgiPkg/SgiPlatform.dec > +++ b/Platform/ARM/SgiPkg/SgiPlatform.dec > @@ -1,5 +1,5 @@ > # > -# Copyright (c) 2018, ARM Limited. All rights reserved. > +# Copyright (c) 2018-2020, ARM Limited. All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -49,5 +49,8 @@ > gArmSgiTokenSpaceGuid.PcdVirtioNetSize|0x00000000|UINT32|0x00000008 > gArmSgiTokenSpaceGuid.PcdVirtioNetInterrupt|0x00000000|UINT32|0x00000009 > > + # GIC > + gArmSgiTokenSpaceGuid.PcdGicSize|0|UINT64|0x0000000A > + > [Ppis] > gNtFwConfigDtInfoPpiGuid = { 0x6f606eb3, 0x9123, 0x4e15, { 0xa8, 0x9b, > 0x0f, 0xac, 0x66, 0xef, 0xd0, 0x17 } } > diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc > b/Platform/ARM/SgiPkg/SgiPlatform.dsc > index 5226c5751e..4e1fcefb14 100644 > --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc > +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc > @@ -1,26 +1,9 @@ > # > -# Copyright (c) 2018, ARM Limited. All rights reserved. > +# Copyright (c) 2018-2020, ARM Limited. All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > > -################################################################################ > -# > -# Defines Section - statements that will be processed to create a Makefile. > -# > -################################################################################ > -[Defines] > - PLATFORM_NAME = ArmSgi > - PLATFORM_GUID = 3a6b2eae-0275-4b6e-a5d1-bd2ba1ce1fae > - PLATFORM_VERSION = 0.1 > - DSC_SPECIFICATION = 0x0001001B > - OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME) > - SUPPORTED_ARCHITECTURES = AARCH64|ARM > - BUILD_TARGETS = NOOPT|DEBUG|RELEASE > - SKUID_IDENTIFIER = DEFAULT > - FLASH_DEFINITION = Platform/ARM/SgiPkg/SgiPlatform.fdf > - BUILD_NUMBER = 1 > - > !include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > > [BuildOptions] > @@ -93,7 +76,7 @@ > > > ################################################################################ > # > -# Pcd Section - list of all EDK II PCD Entries defined by this Platform > +# Pcd Section - list of all EDK II PCD Entries common to all SGI/RD platforms > # > > ################################################################################ > > @@ -126,10 +109,6 @@ > gArmTokenSpaceGuid.PcdSystemMemoryBase|0x80000000 > gArmTokenSpaceGuid.PcdSystemMemorySize|0x7F000000 > > - # GIC Base Addresses > - gArmTokenSpaceGuid.PcdGicDistributorBase|0x30000000 > - gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x300C0000 > - > # > # PCIe > # > -- > 2.17.1 > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56030): https://edk2.groups.io/g/devel/message/56030 Mute This Topic: https://groups.io/mt/71903342/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
