From nobody Tue Feb 10 04:12:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+69205+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+69205+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1608301005; cv=none; d=zohomail.com; s=zohoarc; b=HCV/3wEiGjS7BIw7fkdKA3hcGXExaLhKNJI9yoXwgTxxqdRolcK6EDrHK39yxhD0h20FYJjkmcCmw5q/A6hMlUvKaZrgo0GzRdlsqLIjDpNc/xdonZZQZ1o0x1f7D0HY24Jsg7GGIerc0sFgwTAKuIQnUBHW7zWk7Vx8alUB3zg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608301005; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=n7bfy9A+rmlzPJAD7dsrmIEDpalTmvbamGF5emSPaNo=; b=NRr55qjVlOcgV/yRyEqnJ9y8jxaDZyZ1Y4ZgXfQ3KDRcEoUFjfzLBZ6w/zaSwinYHEMdrTMnxhubJQha342cKVTDZWjJDPmMlPvwEJo6KmeSDxpyAlDvweZ6msDhAdcm+CNR1flVwxcMHBbhZEnRvTtljVTv6KN5JHJJCkfO/Dc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+69205+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1608301005626796.638826703413; Fri, 18 Dec 2020 06:16:45 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id puNsYY1788612xsN78AYaRFf; Fri, 18 Dec 2020 06:16:45 -0800 X-Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web11.10547.1608300991999635796 for ; Fri, 18 Dec 2020 06:16:32 -0800 X-Received: by mail-wm1-f43.google.com with SMTP id q75so2748813wme.2 for ; Fri, 18 Dec 2020 06:16:26 -0800 (PST) X-Gm-Message-State: HFq75Hr5M1z1WzrDfL7ZAFUix1787277AA= X-Google-Smtp-Source: ABdhPJz+DOvMebdAfKr96FaaO5AGdWeDR5nD/RqykhBhsLEWm0I8KVpoYe+/lQLjbhOPtI1EmTtf7w== X-Received: by 2002:a7b:c4d5:: with SMTP id g21mr4497851wmk.92.1608300985242; Fri, 18 Dec 2020 06:16:25 -0800 (PST) X-Received: from vanye.hemma.eciton.net (cpc1-cmbg19-2-0-cust915.5-4.cable.virginm.net. [82.27.183.148]) by smtp.gmail.com with ESMTPSA id b12sm18558569wmj.2.2020.12.18.06.16.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Dec 2020 06:16:24 -0800 (PST) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Ard Biesheuvel Subject: [edk2-devel] [PATCH 8/9] ArmPkg/ArmLib: rename AArch64 variant of ArmReadIdPfr0 Date: Fri, 18 Dec 2020 14:16:16 +0000 Message-Id: <20201218141617.26947-9-leif@nuviainc.com> In-Reply-To: <20201218141617.26947-1-leif@nuviainc.com> References: <20201218141617.26947-1-leif@nuviainc.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,leif@nuviainc.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608301005; bh=LaK7DPe38iEXlMS57w1KWMZmAv6Evgu2GFBUDbLVG4E=; h=Cc:Date:From:Reply-To:Subject:To; b=g7XuQpL9wJZY4u/+KjmGxvby7AEuvp2OBfvPgwZmmVrhd5CXPw1lX2KTUb2ZZ0c8mBy zsUSo/56WCy3+93d5s95dmrtXLKSIWbKTYRxBCb2qpF9eMBqLCY9XjzITz6dfxeUA68W2 q1bVKlSJuLc34eguSgXGrauWKp/q1obnQrc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" ArmReadIdPfr0 is now used only inside ArmLib. Rename the AArch64 variant ArmReadIdAA64Pfr0 and add a declaration of that only into local header AArch64/AArch64Lib.h. Cc: Ard Biesheuvel Signed-off-by: Leif Lindholm --- ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h | 6 ++++++ ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c | 2 +- ArmPkg/Library/ArmLib/AArch64/AArch64Support.S | 5 +++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h b/ArmPkg/Library/Ar= mLib/AArch64/AArch64Lib.h index b2c8a8ea0b84..85bcecda730f 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h @@ -2,6 +2,7 @@ =20 Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
Portions Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.
+ Copyright (c) 2020, NUVIA Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -35,5 +36,10 @@ ArmCleanInvalidateDataCacheEntryBySetWay ( IN UINTN SetWayFormat ); =20 +UINTN +EFIAPI +ArmReadIdAA64Pfr0 ( + VOID + ); #endif // __AARCH64_LIB_H__ =20 diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c b/ArmPkg/Library/Ar= mLib/AArch64/AArch64Lib.c index 5b10eb33c97d..53e593bc994b 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c @@ -85,5 +85,5 @@ ArmHasGicSystemRegisters ( VOID ) { - return ((ArmReadIdPfr0 () & AARCH64_PFR0_GIC) !=3D 0); + return ((ArmReadIdAA64Pfr0 () & AARCH64_PFR0_GIC) !=3D 0); } diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S b/ArmPkg/Librar= y/ArmLib/AArch64/AArch64Support.S index 7f942c29ea66..129205d2ac27 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S @@ -3,6 +3,7 @@ # Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
# Copyright (c) 2011 - 2017, ARM Limited. All rights reserved. # Copyright (c) 2016, Linaro Limited. All rights reserved. +# Copyright (c) 2020, NUVIA Inc. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -395,7 +396,7 @@ ASM_FUNC(ArmReadVBar) ASM_FUNC(ArmEnableVFP) // Check whether floating-point is implemented in the processor. mov x1, x30 // Save LR - bl ArmReadIdPfr0 // Read EL1 Processor Feature Register (PF= R0) + bl ArmReadIdAA64Pfr0 // Read EL1 Processor Feature Register (PF= R0) mov x30, x1 // Restore LR ubfx x0, x0, #16, #4 // Extract the FP bits 16:19 cmp x0, #0xF // Check if FP bits are '1111b', @@ -448,7 +449,7 @@ ASM_FUNC(ArmIsArchTimerImplemented) ret =20 =20 -ASM_FUNC(ArmReadIdPfr0) +ASM_FUNC(ArmReadIdAA64Pfr0) mrs x0, id_aa64pfr0_el1 // Read ID_AA64PFR0 Register ret =20 --=20 2.20.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#69205): https://edk2.groups.io/g/devel/message/69205 Mute This Topic: https://groups.io/mt/79061644/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-