Re: [platforms: PATCH 7/8] Marvell/Armada: Armada70x0Lib: Add support for 32-bit ARM

[Leif Lindholm <leif.lindholm@linaro.org>]

On Wed, Oct 11, 2017 at 05:40:48PM +0200, Marcin Wojtas wrote:
> From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> 
> Add an ARM implementation of ArmPlatformHelper.S.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

> ---
>  Platform/Marvell/Armada/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S | 77 ++++++++++++++++++++
>  Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf       |  3 +
>  2 files changed, 80 insertions(+)
> 
> diff --git a/Platform/Marvell/Armada/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S b/Platform/Marvell/Armada/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S
> new file mode 100644
> index 0000000..21459e5
> --- /dev/null
> +++ b/Platform/Marvell/Armada/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S
> @@ -0,0 +1,77 @@
> +//Based on ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S
> +//
> +//  Copyright (c) 2012-2013, ARM Limited. All rights reserved.
> +//  Copyright (c) 2016, Marvell. All rights reserved.
> +//  Copyright (c) 2017, Linaro Limited. All rights reserved.
> +//
> +//  This program and the accompanying materials are licensed and made available
> +//  under the terms and conditions of the BSD License which accompanies this
> +//  distribution. The full text of the license may be found at
> +//  http://opensource.org/licenses/bsd-license.php
> +//
> +//  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> +//  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED
> +//
> +
> +#include <AsmMacroIoLib.h>
> +#include <Library/ArmLib.h>
> +
> +#define CCU_MC_BASE                     0xF0001700
> +#define CCU_MC_RCR_OFFSET               0x0
> +#define CCU_MC_RCR_REMAP_EN             BIT0
> +#define CCU_MC_RCR_REMAP_SIZE(Size)     (((Size) - 1) ^ (SIZE_1MB - 1))
> +
> +#define CCU_MC_RSBR_OFFSET              0x4
> +#define CCU_MC_RSBR_SOURCE_BASE(Base)   (((Base) >> 20) << 10)
> +#define CCU_MC_RTBR_OFFSET              0x8
> +#define CCU_MC_RTBR_TARGET_BASE(Base)   (((Base) >> 20) << 10)
> +
> +ASM_FUNC(ArmPlatformPeiBootAction)
> +  .if   FixedPcdGet64 (PcdSystemMemoryBase) != 0
> +  .err  PcdSystemMemoryBase should be 0x0 on this platform!
> +  .endif
> +
> +  .if   FixedPcdGet64 (PcdSystemMemorySize) > FixedPcdGet32 (PcdDramRemapTarget)
> +    //
> +    // Use the low range for UEFI itself. The remaining memory will be mapped
> +    // and added to the GCD map later.
> +    //
> +    ADRL  (r0, mSystemMemoryEnd)
> +    MOV32 (r2, FixedPcdGet32 (PcdDramRemapTarget) - 1)
> +    mov   r3, #0
> +    strd  r2, r3, [r0]
> +  .endif
> +
> +  bx    lr
> +
> +//UINTN
> +//ArmPlatformGetCorePosition (
> +//  IN UINTN MpId
> +//  );
> +// With this function: CorePos = (ClusterId * 2) + CoreId
> +ASM_FUNC(ArmPlatformGetCorePosition)
> +  and   r1, r0, #ARM_CORE_MASK
> +  and   r0, r0, #ARM_CLUSTER_MASK
> +  add   r0, r1, r0, LSR #7
> +  bx    lr
> +
> +//UINTN
> +//ArmPlatformGetPrimaryCoreMpId (
> +//  VOID
> +//  );
> +ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)
> +  MOV32 (r0, FixedPcdGet32(PcdArmPrimaryCore))
> +  bx    lr
> +
> +//UINTN
> +//ArmPlatformIsPrimaryCore (
> +//  IN UINTN MpId
> +//  );
> +ASM_FUNC(ArmPlatformIsPrimaryCore)
> +  MOV32 (r1, FixedPcdGet32(PcdArmPrimaryCoreMask))
> +  and   r0, r0, r1
> +  MOV32 (r1, FixedPcdGet32(PcdArmPrimaryCore))
> +  cmp   r0, r1
> +  moveq r0, #1
> +  movne r0, #0
> +  bx    lr
> diff --git a/Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf b/Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf
> index 838a670..0dabd4b 100644
> --- a/Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf
> +++ b/Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf
> @@ -60,6 +60,9 @@
>  [Sources.AArch64]
>    AArch64/ArmPlatformHelper.S
>  
> +[Sources.ARM]
> +  ARM/ArmPlatformHelper.S
> +
>  [FixedPcd]
>    gArmTokenSpaceGuid.PcdSystemMemoryBase
>    gArmTokenSpaceGuid.PcdSystemMemorySize
> -- 
> 2.7.4
>