From: "PierreGondois" <pierre.gondois@arm.com>
To: devel@edk2.groups.io, ardb+tianocore@kernel.org, leif@nuviainc.com
Cc: sami.mujawar@arm.com
Subject: [PATCH v1 01/27] ArmPkg: Fix Ecc error 8001 in Chipset
Date: Thu, 21 Jan 2021 09:50:53 +0000 [thread overview]
Message-ID: <20210121095119.22143-2-Pierre.Gondois@arm.com> (raw)
In-Reply-To: <20210121095119.22143-1-Pierre.Gondois@arm.com>
From: Pierre Gondois <Pierre.Gondois@arm.com>
This patch fixes the following Ecc reported error:
Only capital letters are allowed to be used
for #define declarations
Edk2 coding standard stating that:
"Names starting with one or two underscores, such as
_MACRO_GUARD_FILE_NAME_H_, must not be used."
the include guard of ArmCortexA5x.h is also updated.
Ref:
https://edk2-docs.gitbook.io/edk-ii-c-coding-standards-specification/
5_source_files/53_include_files#
5-3-5-all-include-file-contents-must-be-protected-by-a-include-guard
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
The changes can be seen at: https://github.com/PierreARM/edk2/tree/1552_Ecc_ArmPkg_BIS_v1
ArmPkg/Include/Chipset/AArch64.h | 12 ++++++------
ArmPkg/Include/Chipset/ArmCortexA5x.h | 6 +++---
ArmPkg/Include/Chipset/ArmV7.h | 4 ++--
.../ArmExceptionLib/AArch64/ExceptionSupport.S | 10 +++++-----
ArmPlatformPkg/PrePeiCore/AArch64/Exception.S | 10 +++++-----
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/ArmPkg/Include/Chipset/AArch64.h b/ArmPkg/Include/Chipset/AArch64.h
index 0ade5cce91c3..d49f4d60b15d 100644
--- a/ArmPkg/Include/Chipset/AArch64.h
+++ b/ArmPkg/Include/Chipset/AArch64.h
@@ -1,7 +1,7 @@
/** @file
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
- Copyright (c) 2011 - 2017, ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2011 - 2021, Arm Limited. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -39,7 +39,7 @@
// MIDR - Main ID Register definitions
#define ARM_CPU_TYPE_SHIFT 4
#define ARM_CPU_TYPE_MASK 0xFFF
-#define ARM_CPU_TYPE_AEMv8 0xD0F
+#define ARM_CPU_TYPE_AEMV8 0xD0F
#define ARM_CPU_TYPE_A53 0xD03
#define ARM_CPU_TYPE_A57 0xD07
#define ARM_CPU_TYPE_A72 0xD08
@@ -97,10 +97,10 @@
#define ARM_VECTOR_CUR_SP0_FIQ 0x100
#define ARM_VECTOR_CUR_SP0_SERR 0x180
-#define ARM_VECTOR_CUR_SPx_SYNC 0x200
-#define ARM_VECTOR_CUR_SPx_IRQ 0x280
-#define ARM_VECTOR_CUR_SPx_FIQ 0x300
-#define ARM_VECTOR_CUR_SPx_SERR 0x380
+#define ARM_VECTOR_CUR_SPX_SYNC 0x200
+#define ARM_VECTOR_CUR_SPX_IRQ 0x280
+#define ARM_VECTOR_CUR_SPX_FIQ 0x300
+#define ARM_VECTOR_CUR_SPX_SERR 0x380
#define ARM_VECTOR_LOW_A64_SYNC 0x400
#define ARM_VECTOR_LOW_A64_IRQ 0x480
diff --git a/ArmPkg/Include/Chipset/ArmCortexA5x.h b/ArmPkg/Include/Chipset/ArmCortexA5x.h
index 847a6e00430b..2661ed8c0182 100644
--- a/ArmPkg/Include/Chipset/ArmCortexA5x.h
+++ b/ArmPkg/Include/Chipset/ArmCortexA5x.h
@@ -6,8 +6,8 @@
**/
-#ifndef __ARM_CORTEX_A5x_H__
-#define __ARM_CORTEX_A5x_H__
+#ifndef ARM_CORTEX_A5X_H__
+#define ARM_CORTEX_A5X_H__
//
// Cortex A5x feature bit definitions
@@ -41,4 +41,4 @@ ArmUnsetCpuExCrBit (
IN UINT64 Bits
);
-#endif
+#endif // ARM_CORTEX_A5X_H__
diff --git a/ArmPkg/Include/Chipset/ArmV7.h b/ArmPkg/Include/Chipset/ArmV7.h
index fe91031ef33d..025f87a56d16 100644
--- a/ArmPkg/Include/Chipset/ArmV7.h
+++ b/ArmPkg/Include/Chipset/ArmV7.h
@@ -1,7 +1,7 @@
/** @file
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
- Copyright (c) 2011-2015, ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2011-2021, Arm Limited. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -70,7 +70,7 @@
// MIDR - Main ID Register definitions
#define ARM_CPU_TYPE_SHIFT 4
#define ARM_CPU_TYPE_MASK 0xFFF
-#define ARM_CPU_TYPE_AEMv8 0xD0F
+#define ARM_CPU_TYPE_AEMV8 0xD0F
#define ARM_CPU_TYPE_A53 0xD03
#define ARM_CPU_TYPE_A57 0xD07
#define ARM_CPU_TYPE_A15 0xC0F
diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
index 5b10a1339ac1..9202952ee9c0 100644
--- a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
+++ b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2011 - 2014 ARM LTD. All rights reserved.<BR>
+// Copyright (c) 2011 - 2021, Arm Limited. All rights reserved.<BR>
// Portion of Copyright (c) 2014 NVIDIA Corporation. All rights reserved.<BR>
// Copyright (c) 2016 HP Development Company, L.P.
//
@@ -200,19 +200,19 @@ ASM_PFX(SErrorSP0):
//
// Current EL with SPx: 0x200 - 0x380
//
-VECTOR_ENTRY(ExceptionHandlersStart, ARM_VECTOR_CUR_SPx_SYNC)
+VECTOR_ENTRY(ExceptionHandlersStart, ARM_VECTOR_CUR_SPX_SYNC)
ASM_PFX(SynchronousExceptionSPx):
ExceptionEntry EXCEPT_AARCH64_SYNCHRONOUS_EXCEPTIONS, SP0
-VECTOR_ENTRY(ExceptionHandlersStart, ARM_VECTOR_CUR_SPx_IRQ)
+VECTOR_ENTRY(ExceptionHandlersStart, ARM_VECTOR_CUR_SPX_IRQ)
ASM_PFX(IrqSPx):
ExceptionEntry EXCEPT_AARCH64_IRQ
-VECTOR_ENTRY(ExceptionHandlersStart, ARM_VECTOR_CUR_SPx_FIQ)
+VECTOR_ENTRY(ExceptionHandlersStart, ARM_VECTOR_CUR_SPX_FIQ)
ASM_PFX(FiqSPx):
ExceptionEntry EXCEPT_AARCH64_FIQ
-VECTOR_ENTRY(ExceptionHandlersStart, ARM_VECTOR_CUR_SPx_SERR)
+VECTOR_ENTRY(ExceptionHandlersStart, ARM_VECTOR_CUR_SPX_SERR)
ASM_PFX(SErrorSPx):
ExceptionEntry EXCEPT_AARCH64_SERROR
diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
index 59a3da2721e7..43e40f97c3ee 100644
--- a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
+++ b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011-2014, ARM Limited. All rights reserved.
+# Copyright (c) 2011-2021, Arm Limited. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -51,22 +51,22 @@ _DefaultSError_t:
mov x0, #EXCEPT_AARCH64_SERROR
TO_HANDLER
-VECTOR_ENTRY(PeiVectorTable, ARM_VECTOR_CUR_SPx_SYNC)
+VECTOR_ENTRY(PeiVectorTable, ARM_VECTOR_CUR_SPX_SYNC)
_DefaultSyncExceptHandler_h:
mov x0, #EXCEPT_AARCH64_SYNCHRONOUS_EXCEPTIONS
TO_HANDLER
-VECTOR_ENTRY(PeiVectorTable, ARM_VECTOR_CUR_SPx_IRQ)
+VECTOR_ENTRY(PeiVectorTable, ARM_VECTOR_CUR_SPX_IRQ)
_DefaultIrq_h:
mov x0, #EXCEPT_AARCH64_IRQ
TO_HANDLER
-VECTOR_ENTRY(PeiVectorTable, ARM_VECTOR_CUR_SPx_FIQ)
+VECTOR_ENTRY(PeiVectorTable, ARM_VECTOR_CUR_SPX_FIQ)
_DefaultFiq_h:
mov x0, #EXCEPT_AARCH64_FIQ
TO_HANDLER
-VECTOR_ENTRY(PeiVectorTable, ARM_VECTOR_CUR_SPx_SERR)
+VECTOR_ENTRY(PeiVectorTable, ARM_VECTOR_CUR_SPX_SERR)
_DefaultSError_h:
mov x0, #EXCEPT_AARCH64_SERROR
TO_HANDLER
--
2.17.1
next prev parent reply other threads:[~2021-01-21 9:51 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 9:50 [PATCH v1 00/27] Fix Ecc reported errors in ArmPkg PierreGondois
2021-01-21 9:50 ` PierreGondois [this message]
2021-02-05 14:38 ` [edk2-devel] [PATCH v1 01/27] ArmPkg: Fix Ecc error 8001 in Chipset Sami Mujawar
2021-01-21 9:50 ` [PATCH v1 02/27] ArmPkg: Fix Ecc error 8001 in SemihostLib PierreGondois
2021-02-05 14:43 ` [edk2-devel] " Sami Mujawar
2021-01-21 9:50 ` [PATCH v1 03/27] ArmPkg: Fix Ecc error 8001 in Chipset PierreGondois
2021-02-05 14:48 ` [edk2-devel] " Sami Mujawar
2021-01-21 9:50 ` [PATCH v1 04/27] ArmPkg: Fix Ecc error 8001 in ArmArchTimerLib PierreGondois
2021-02-05 14:51 ` [edk2-devel] " Sami Mujawar
2021-01-21 9:50 ` [PATCH v1 05/27] ArmPkg: Fix Ecc error 9005 in CpuDxe PierreGondois
2021-02-05 14:52 ` [edk2-devel] " Sami Mujawar
2021-01-21 9:50 ` [PATCH v1 06/27] ArmPkg: Fix Ecc error 10006 in ArmPkg.dsc PierreGondois
2021-01-21 9:50 ` [PATCH v1 07/27] ArmPkg: Fix Ecc error 10016 in StandaloneMmMmuLib PierreGondois
2021-01-21 9:51 ` [PATCH v1 08/27] ArmPkg: Fix Ecc error 10014 in ArmScmiDxe PierreGondois
2021-01-21 9:51 ` [PATCH v1 09/27] ArmPkg: Fix Ecc error 10014 in GenericWatchdogDxe PierreGondois
2021-01-21 9:51 ` [PATCH v1 10/27] ArmPkg: Fix Ecc error 10014 in MmCommunicationDxe PierreGondois
2021-01-21 9:51 ` [PATCH v1 11/27] ArmPkg: Fix Ecc error 10014 in SemihostLib PierreGondois
2021-01-21 9:51 ` [PATCH v1 12/27] ArmPkg: Remove ArmGic/ArmGicSecLib.c PierreGondois
2021-01-21 9:51 ` [PATCH v1 13/27] ArmPkg: Fix Ecc error 5003 in ArmExceptionLib PierreGondois
2021-01-21 9:51 ` [PATCH v1 14/27] ArmPkg: Fix Ecc error 6001 in MmCommunicationDxe PierreGondois
2021-01-21 9:51 ` [PATCH v1 15/27] ArmPkg: Fix Ecc error 6001 in ArmSoftFloatLib PierreGondois
2021-01-21 9:51 ` [PATCH v1 16/27] ArmPkg: Rename include guard in ArmGicLib.h PierreGondois
2021-01-21 9:51 ` [PATCH v1 17/27] ArmPkg: Fix Ecc error 7008 for SCMI_CLOCK_RATE PierreGondois
2021-01-21 9:51 ` [PATCH v1 18/27] ArmPkg: Fix Ecc error 7008 for OPTEE_MESSAGE_PARAM PierreGondois
2021-01-21 9:51 ` [PATCH v1 19/27] ArmPkg: Fix Ecc error 8005/8007 in ArmDisassemblerLib PierreGondois
2021-01-21 9:51 ` [PATCH v1 20/27] ArmPkg: Fix Ecc error 8005 for SCMI_PROTOCOL_ID PierreGondois
2021-01-21 9:51 ` [PATCH v1 21/27] ArmPkg: Fix Ecc error 8005 for SCMI_MESSAGE_TYPE PierreGondois
2021-01-21 9:51 ` [PATCH v1 22/27] ArmPkg: Fix Ecc error 8005 for SCMI_STATUS PierreGondois
2021-01-21 9:51 ` [PATCH v1 23/27] ArmPkg: Fix Ecc error 8005 for SCMI_MESSAGE_ID PierreGondois
2021-01-21 9:51 ` [PATCH v1 24/27] ArmPkg: Fix Ecc error 8005 for SCMI_MESSAGE_ID_BASE PierreGondois
2021-01-21 9:51 ` [PATCH v1 25/27] ArmPkg: Fix Ecc error 8005 for SCMI_MESSAGE_ID_CLOCK PierreGondois
2021-01-21 9:51 ` [PATCH v1 26/27] ArmPkg: Fix Ecc error 8005 for SCMI_CLOCK_RATE_FORMAT PierreGondois
2021-01-21 9:51 ` [PATCH v1 27/27] ArmPkg: Fix Ecc error 8005 for SCMI_MESSAGE_ID_PERFORMANCE PierreGondois
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210121095119.22143-2-Pierre.Gondois@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox