From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.groups.io with SMTP id smtpd.web10.3668.1587637743290164250 for ; Thu, 23 Apr 2020 03:29:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=ECQpRdo1; spf=pass (domain: nuviainc.com, ip: 209.85.128.66, mailfrom: leif@nuviainc.com) Received: by mail-wm1-f66.google.com with SMTP id g12so5964437wmh.3 for ; Thu, 23 Apr 2020 03:29:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=UfYVhbDBc1AXm0eCF1fOvhrMwUhMfZ4DYkHJeaYEqWc=; b=ECQpRdo17sc+o+kJQUbJTAx7uZ8lCQoV76fDGB9ii61Z5dhkqMqXFtaQj40ir462xP xNjKLCLAC+/ss9YJ+p+cenztfSn7dJAs96NpWf0xoBsbWJZoa3CWPbM3pxtRvNzUyT87 A67IqRvQ0pSSAqdbiY1OAOS450y0wi+RXG3igrlMjRlYN+lWBcZHjIw6TngyB/kYFeSq oTuSCzG6TANIagqDfTaAdkQmt0AHUOESvcc9eoerCgBr2IOpxbi8b2iCqAwGNQ3wXiXb s9fBAqUgi3bRxmOx4qtCbsxLu7QSziez0lUMS9Oj0pqwYhqvcEOg8Yk6CFkZBJW6I66v NuGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=UfYVhbDBc1AXm0eCF1fOvhrMwUhMfZ4DYkHJeaYEqWc=; b=kS60nocTfxLIHOOVK4z6cpowT1pRDdVA52D69BTQK7HHdlFwcWTml8F1I+CfMuFnMd coX48VoUlnwEUtT6x2rHoS7KxcMem8P/i78IbGIzi3m8RnCQ5DWeZe6hsshj12I1R8bF lSjpx/RFPEsaYkhe91qwBw78yMCORCWWBB3NpiBjdDTk+hN0lv7tqjABwTGRhbsBqoes i6AOLwEo+z3mdhx9ztlruYM0CUdsXRoTRovWyvpHeEa2OV8AZB8NOC/IARuYj52ANRrw Lr3TFTGvIPNNsBc2/a8X1Iv8mhZbsbEZtrhSsK9R8HrcpEMlIsPyHNjaXhCegi+XXufd zivg== X-Gm-Message-State: AGi0PubjLB2vqckr+MVXQUY6ZPeAwWVbW1c+/1jfDdafERUPkcOsjNxb phrfWRdKRzZbczQXmjCYtYEwrA== X-Google-Smtp-Source: APiQypLbpMZrBSmyiwHfQvAz/olzk/IZJlSsOwcW4YRZkVX2caxqqZ+c8JMF8Ixyplje+/KMsJXMbg== X-Received: by 2002:a05:600c:210c:: with SMTP id u12mr3504955wml.135.1587637741860; Thu, 23 Apr 2020 03:29:01 -0700 (PDT) Return-Path: Received: from vanye ([2001:470:1f09:12f0:b26e:bfff:fea9:f1b8]) by smtp.gmail.com with ESMTPSA id g25sm2990541wmh.24.2020.04.23.03.29.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 03:29:01 -0700 (PDT) Date: Thu, 23 Apr 2020 11:28:59 +0100 From: "Leif Lindholm" To: Pankaj Bansal Cc: Meenakshi Aggarwal , Michael D Kinney , devel@edk2.groups.io, Varun Sethi , Samer El-Haj-Mahmoud , Jon Nettleton , Ard Biesheuvel Subject: Re: [PATCH edk2-platforms v3 20/24] NXP: LS1043aRdbPkg: Use ArmPlatformHelper.S from ArmPlatformPkg Message-ID: <20200423102859.GX14075@vanye> References: <20200415121342.9246-1-pankaj.bansal@oss.nxp.com> <20200415121342.9246-21-pankaj.bansal@oss.nxp.com> MIME-Version: 1.0 In-Reply-To: <20200415121342.9246-21-pankaj.bansal@oss.nxp.com> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Apr 15, 2020 at 17:43:38 +0530, Pankaj Bansal wrote: > From: Pankaj Bansal > > ArmPlatformHelper.S is being replaced by the ArmPlatformPkg version at > commit hash f4dfad05dda2c7b29e8105605621f2b413f0af2b. > > Signed-off-by: Pankaj Bansal Reviewed-by: Leif Lindholm > --- > > Notes: > - Modify commit description > > Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.inf | 2 + > Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c | 8 --- > Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S | 60 ++++++++++++-------- > 3 files changed, 39 insertions(+), 31 deletions(-) > > diff --git a/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.inf b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.inf > index 07ca6b34445f..1faf99b99c54 100644 > --- a/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.inf > +++ b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.inf > @@ -37,3 +37,5 @@ > > [FixedPcd] > gArmTokenSpaceGuid.PcdArmPrimaryCore > + gArmTokenSpaceGuid.PcdArmPrimaryCoreMask > + > diff --git a/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c > index a554d1377484..dc81e7ba3101 100644 > --- a/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c > +++ b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c > @@ -137,11 +137,3 @@ ArmPlatformGetPlatformPpiList ( > *PpiList = gPlatformPpiTable; > } > > - > -UINTN > -ArmPlatformGetCorePosition ( > - IN UINTN MpId > - ) > -{ > - return 1; > -} > diff --git a/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S > index dfbf73675a2d..b7c6dbdc2e61 100644 > --- a/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S > +++ b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S > @@ -1,31 +1,45 @@ > -# @file > -# > -# Copyright (c) 2012-2013, ARM Limited. All rights reserved. > -# Copyright 2017, 2020 NXP > -# > -# SPDX-License-Identifier: BSD-2-Clause-Patent > -# > +// > +// Copyright (c) 2012-2013, ARM Limited. All rights reserved. > +// > +// SPDX-License-Identifier: BSD-2-Clause-Patent > +// > +// > > #include > -#include > - > -.text > -.align 2 > - > -GCC_ASM_IMPORT(ArmReadMpidr) > - > -ASM_FUNC(ArmPlatformIsPrimaryCore) > - tst x0, #3 > - cset x0, eq > - ret > +#include > > ASM_FUNC(ArmPlatformPeiBootAction) > -EL1_OR_EL2(x0) > -1: > -2: > ret > > +//UINTN > +//ArmPlatformGetCorePosition ( > +// IN UINTN MpId > +// ); > +// With this function: CorePos = (ClusterId * 4) + CoreId > +ASM_FUNC(ArmPlatformGetCorePosition) > + and x1, x0, #ARM_CORE_MASK > + and x0, x0, #ARM_CLUSTER_MASK > + add x0, x1, x0, LSR #6 > + ret > + > +//UINTN > +//ArmPlatformGetPrimaryCoreMpId ( > +// VOID > +// ); > ASM_FUNC(ArmPlatformGetPrimaryCoreMpId) > - MOV32 (x0, FixedPcdGet32(PcdArmPrimaryCore)) > - ldrh w0, [x0] > + MOV32 (w0, FixedPcdGet32 (PcdArmPrimaryCore)) > + ret > + > +//UINTN > +//ArmPlatformIsPrimaryCore ( > +// IN UINTN MpId > +// ); > +ASM_FUNC(ArmPlatformIsPrimaryCore) > + MOV32 (w1, FixedPcdGet32 (PcdArmPrimaryCoreMask)) > + and x0, x0, x1 > + MOV32 (w1, FixedPcdGet32 (PcdArmPrimaryCore)) > + cmp w0, w1 > + mov x0, #1 > + mov x1, #0 > + csel x0, x0, x1, eq > ret > -- > 2.17.1 >