Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ArmPkg: use ID register helper for ArmGicArch(Sec)Lib 

Use ArmHasGicSystemRegisters () instead of direct ID register tests.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
This commit is contained in:
Leif Lindholm 2020-12-18 12:05:44 +00:00 committed by mergify[bot]
parent 5cc25cff5d
commit b7ae5efb79
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArmPkg/Library/ArmGicArchLib/AArch64/ArmGicArchLib.c
View File

@ -25,7 +25,7 @@ ArmGicArchLibInitialize (
// feature is implemented on the CPU. This is also convenient as our GICv3 // feature is implemented on the CPU. This is also convenient as our GICv3
// driver requires SRE. If only Memory mapped access is available we try to // driver requires SRE. If only Memory mapped access is available we try to
// drive the GIC as a v2. // drive the GIC as a v2.
if (ArmReadIdPfr0 () & AARCH64_PFR0_GIC) { if (ArmHasGicSystemRegisters ()) {
// Make sure System Register access is enabled (SRE). This depends on the // Make sure System Register access is enabled (SRE). This depends on the
// higher privilege level giving us permission, otherwise we will either // higher privilege level giving us permission, otherwise we will either
// cause an exception here, or the write doesn't stick in which case we need // cause an exception here, or the write doesn't stick in which case we need

2
ArmPkg/Library/ArmGicArchLib/Arm/ArmGicArchLib.c
View File

@ -25,7 +25,7 @@ ArmGicArchLibInitialize (
// feature is implemented on the CPU. This is also convenient as our GICv3 // feature is implemented on the CPU. This is also convenient as our GICv3
// driver requires SRE. If only Memory mapped access is available we try to // driver requires SRE. If only Memory mapped access is available we try to
// drive the GIC as a v2. // drive the GIC as a v2.
if (ArmReadIdPfr1 () & ARM_PFR1_GIC) { if (ArmHasGicSystemRegisters ()) {
// Make sure System Register access is enabled (SRE). This depends on the // Make sure System Register access is enabled (SRE). This depends on the
// higher privilege level giving us permission, otherwise we will either // higher privilege level giving us permission, otherwise we will either
// cause an exception here, or the write doesn't stick in which case we need // cause an exception here, or the write doesn't stick in which case we need

2
ArmPkg/Library/ArmGicArchSecLib/AArch64/ArmGicArchLib.c
View File

@ -23,7 +23,7 @@ ArmGicGetSupportedArchRevision (
// feature is implemented on the CPU. This is also convenient as our GICv3 // feature is implemented on the CPU. This is also convenient as our GICv3
// driver requires SRE. If only Memory mapped access is available we try to // driver requires SRE. If only Memory mapped access is available we try to
// drive the GIC as a v2. // drive the GIC as a v2.
if (ArmReadIdPfr0 () & AARCH64_PFR0_GIC) { if (ArmHasGicSystemRegisters ()) {
// Make sure System Register access is enabled (SRE). This depends on the // Make sure System Register access is enabled (SRE). This depends on the
// higher privilege level giving us permission, otherwise we will either // higher privilege level giving us permission, otherwise we will either
// cause an exception here, or the write doesn't stick in which case we need // cause an exception here, or the write doesn't stick in which case we need

2
ArmPkg/Library/ArmGicArchSecLib/Arm/ArmGicArchLib.c
View File

@ -23,7 +23,7 @@ ArmGicGetSupportedArchRevision (
// feature is implemented on the CPU. This is also convenient as our GICv3 // feature is implemented on the CPU. This is also convenient as our GICv3
// driver requires SRE. If only Memory mapped access is available we try to // driver requires SRE. If only Memory mapped access is available we try to
// drive the GIC as a v2. // drive the GIC as a v2.
if (ArmReadIdPfr1 () & ARM_PFR1_GIC) { if (ArmHasGicSystemRegisters ()) {
// Make sure System Register access is enabled (SRE). This depends on the // Make sure System Register access is enabled (SRE). This depends on the
// higher privilege level giving us permission, otherwise we will either // higher privilege level giving us permission, otherwise we will either
// cause an exception here, or the write doesn't stick in which case we need // cause an exception here, or the write doesn't stick in which case we need