From 462f95ec5b7ac6b6cda5cb6b91e7278c17a9e514 Mon Sep 17 00:00:00 2001 From: Pierre Gondois Date: Fri, 15 Jan 2021 17:06:22 +0000 Subject: ArmPkg: Fix Ecc error 8005 for SCMI_PROTOCOL_ID This patch fixes the following Ecc reported error: Variable name does not follow the rules: 1. First character should be upper case 2. Must contain lower case characters 3. No white space characters 4. Global variable name must start with a 'g' Signed-off-by: Pierre Gondois Reviewed-by: Sami Mujawar --- ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c | 12 ++++++------ ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c | 14 +++++++------- ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c | 10 +++++----- ArmPkg/Drivers/ArmScmiDxe/ScmiPerformanceProtocol.c | 18 +++++++++--------- ArmPkg/Drivers/ArmScmiDxe/ScmiPrivate.h | 14 +++++++------- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c b/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c index d89587f9ed..c84ce97f15 100644 --- a/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c +++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2017-2018, Arm Limited. All rights reserved. + Copyright (c) 2017-2021, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -34,7 +34,7 @@ BaseGetVersion ( OUT UINT32 *Version ) { - return ScmiGetProtocolVersion (SCMI_PROTOCOL_ID_BASE, Version); + return ScmiGetProtocolVersion (ScmiProtocolIdBase, Version); } /** Return total number of SCMI protocols supported by the SCP firmware. @@ -57,7 +57,7 @@ BaseGetTotalProtocols ( EFI_STATUS Status; UINT32 *ReturnValues; - Status = ScmiGetProtocolAttributes (SCMI_PROTOCOL_ID_BASE, &ReturnValues); + Status = ScmiGetProtocolAttributes (ScmiProtocolIdBase, &ReturnValues); if (EFI_ERROR (Status)) { return Status; } @@ -91,7 +91,7 @@ BaseDiscoverVendorDetails ( SCMI_COMMAND Cmd; UINT32 PayloadLength; - Cmd.ProtocolId = SCMI_PROTOCOL_ID_BASE; + Cmd.ProtocolId = ScmiProtocolIdBase; Cmd.MessageId = MessageId; PayloadLength = 0; @@ -183,7 +183,7 @@ BaseDiscoverImplVersion ( SCMI_COMMAND Cmd; UINT32 PayloadLength; - Cmd.ProtocolId = SCMI_PROTOCOL_ID_BASE; + Cmd.ProtocolId = ScmiProtocolIdBase; Cmd.MessageId = SCMI_MESSAGE_ID_BASE_DISCOVER_IMPLEMENTATION_VERSION; PayloadLength = 0; @@ -250,7 +250,7 @@ BaseDiscoverListProtocols ( return EFI_BUFFER_TOO_SMALL; } - Cmd.ProtocolId = SCMI_PROTOCOL_ID_BASE; + Cmd.ProtocolId = ScmiProtocolIdBase; Cmd.MessageId = SCMI_MESSAGE_ID_BASE_DISCOVER_LIST_PROTOCOLS; Skip = 0; diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c b/ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c index 5c06e31bda..b7892bfd77 100644 --- a/ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c +++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c @@ -52,7 +52,7 @@ ClockGetVersion ( OUT UINT32 *Version ) { - return ScmiGetProtocolVersion (SCMI_PROTOCOL_ID_CLOCK, Version); + return ScmiGetProtocolVersion (ScmiProtocolIdClock, Version); } /** Return total number of clock devices supported by the clock management @@ -76,7 +76,7 @@ ClockGetTotalClocks ( EFI_STATUS Status; UINT32 *ReturnValues; - Status = ScmiGetProtocolAttributes (SCMI_PROTOCOL_ID_CLOCK, &ReturnValues); + Status = ScmiGetProtocolAttributes (ScmiProtocolIdClock, &ReturnValues); if (EFI_ERROR (Status)) { return Status; } @@ -122,7 +122,7 @@ ClockGetClockAttributes ( *MessageParams = ClockId; - Cmd.ProtocolId = SCMI_PROTOCOL_ID_CLOCK; + Cmd.ProtocolId = ScmiProtocolIdClock; Cmd.MessageId = SCMI_MESSAGE_ID_CLOCK_ATTRIBUTES; PayloadLength = sizeof (ClockId); @@ -203,7 +203,7 @@ ClockDescribeRates ( return Status; } - Cmd.ProtocolId = SCMI_PROTOCOL_ID_CLOCK; + Cmd.ProtocolId = ScmiProtocolIdClock; Cmd.MessageId = SCMI_MESSAGE_ID_CLOCK_DESCRIBE_RATES; *MessageParams++ = ClockId; @@ -320,7 +320,7 @@ ClockRateGet ( // Fill arguments for clock protocol command. *MessageParams = ClockId; - Cmd.ProtocolId = SCMI_PROTOCOL_ID_CLOCK; + Cmd.ProtocolId = ScmiProtocolIdClock; Cmd.MessageId = SCMI_MESSAGE_ID_CLOCK_RATE_GET; PayloadLength = sizeof (ClockId); @@ -374,7 +374,7 @@ ClockRateSet ( ClockRateSetAttributes->Rate.Low = (UINT32)Rate; ClockRateSetAttributes->Rate.High = (UINT32)(Rate >> 32); - Cmd.ProtocolId = SCMI_PROTOCOL_ID_CLOCK; + Cmd.ProtocolId = ScmiProtocolIdClock; Cmd.MessageId = SCMI_MESSAGE_ID_CLOCK_RATE_SET; PayloadLength = sizeof (CLOCK_RATE_SET_ATTRIBUTES); @@ -421,7 +421,7 @@ ClockEnable ( ClockConfigSetAttributes->ClockId = ClockId; ClockConfigSetAttributes->Attributes = Enable ? BIT0 : 0; - Cmd.ProtocolId = SCMI_PROTOCOL_ID_CLOCK; + Cmd.ProtocolId = ScmiProtocolIdClock; Cmd.MessageId = SCMI_MESSAGE_ID_CLOCK_CONFIG_SET; PayloadLength = sizeof (CLOCK_CONFIG_SET_ATTRIBUTES); diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c b/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c index e95f56e670..d5890a7633 100644 --- a/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c +++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2017-2018, Arm Limited. All rights reserved. + Copyright (c) 2017-2021, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -24,9 +24,9 @@ #include "ScmiPrivate.h" STATIC CONST SCMI_PROTOCOL_ENTRY Protocols[] = { - { SCMI_PROTOCOL_ID_BASE, ScmiBaseProtocolInit }, - { SCMI_PROTOCOL_ID_PERFORMANCE, ScmiPerformanceProtocolInit }, - { SCMI_PROTOCOL_ID_CLOCK, ScmiClockProtocolInit } + { ScmiProtocolIdBase, ScmiBaseProtocolInit }, + { ScmiProtocolIdPerformance, ScmiPerformanceProtocolInit }, + { ScmiProtocolIdClock, ScmiClockProtocolInit } }; /** ARM SCMI driver entry point function. @@ -61,7 +61,7 @@ ArmScmiDxeEntryPoint ( UINT32 SupportedListSize; // Every SCMI implementation must implement the base protocol. - ASSERT (Protocols[0].Id == SCMI_PROTOCOL_ID_BASE); + ASSERT (Protocols[0].Id == ScmiProtocolIdBase); Status = ScmiBaseProtocolInit (&ImageHandle); if (EFI_ERROR (Status)) { diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiPerformanceProtocol.c b/ArmPkg/Drivers/ArmScmiDxe/ScmiPerformanceProtocol.c index 712f95d6ea..51cad4d2c6 100644 --- a/ArmPkg/Drivers/ArmScmiDxe/ScmiPerformanceProtocol.c +++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiPerformanceProtocol.c @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2017-2018, Arm Limited. All rights reserved. + Copyright (c) 2017-2021, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -35,7 +35,7 @@ PerformanceGetVersion ( OUT UINT32 *Version ) { - return ScmiGetProtocolVersion (SCMI_PROTOCOL_ID_PERFORMANCE, Version); + return ScmiGetProtocolVersion (ScmiProtocolIdPerformance, Version); } /** Return protocol attributes of the performance management protocol. @@ -59,7 +59,7 @@ PerformanceGetAttributes ( UINT32* ReturnValues; Status = ScmiGetProtocolAttributes ( - SCMI_PROTOCOL_ID_PERFORMANCE, + ScmiProtocolIdPerformance, &ReturnValues ); if (EFI_ERROR (Status)) { @@ -107,7 +107,7 @@ PerformanceDomainAttributes ( *MessageParams = DomainId; - Cmd.ProtocolId = SCMI_PROTOCOL_ID_PERFORMANCE; + Cmd.ProtocolId = ScmiProtocolIdPerformance; Cmd.MessageId = SCMI_MESSAGE_ID_PERFORMANCE_DOMAIN_ATTRIBUTES; PayloadLength = sizeof (DomainId); @@ -179,7 +179,7 @@ PerformanceDescribeLevels ( *MessageParams++ = DomainId; - Cmd.ProtocolId = SCMI_PROTOCOL_ID_PERFORMANCE; + Cmd.ProtocolId = ScmiProtocolIdPerformance; Cmd.MessageId = SCMI_MESSAGE_ID_PERFORMANCE_DESCRIBE_LEVELS; do { @@ -258,7 +258,7 @@ PerformanceLimitsSet ( *MessageParams++ = Limits->RangeMax; *MessageParams = Limits->RangeMin; - Cmd.ProtocolId = SCMI_PROTOCOL_ID_PERFORMANCE; + Cmd.ProtocolId = ScmiProtocolIdPerformance; Cmd.MessageId = SCMI_MESSAGE_ID_PERFORMANCE_LIMITS_SET; PayloadLength = sizeof (DomainId) + sizeof (SCMI_PERFORMANCE_LIMITS); @@ -304,7 +304,7 @@ PerformanceLimitsGet ( *MessageParams = DomainId; - Cmd.ProtocolId = SCMI_PROTOCOL_ID_PERFORMANCE; + Cmd.ProtocolId = ScmiProtocolIdPerformance; Cmd.MessageId = SCMI_MESSAGE_ID_PERFORMANCE_LIMITS_GET; PayloadLength = sizeof (DomainId); @@ -354,7 +354,7 @@ PerformanceLevelSet ( *MessageParams++ = DomainId; *MessageParams = Level; - Cmd.ProtocolId = SCMI_PROTOCOL_ID_PERFORMANCE; + Cmd.ProtocolId = ScmiProtocolIdPerformance; Cmd.MessageId = SCMI_MESSAGE_ID_PERFORMANCE_LEVEL_SET; PayloadLength = sizeof (DomainId) + sizeof (Level); @@ -399,7 +399,7 @@ PerformanceLevelGet ( *MessageParams = DomainId; - Cmd.ProtocolId = SCMI_PROTOCOL_ID_PERFORMANCE; + Cmd.ProtocolId = ScmiProtocolIdPerformance; Cmd.MessageId = SCMI_MESSAGE_ID_PERFORMANCE_LEVEL_GET; PayloadLength = sizeof (DomainId); diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiPrivate.h b/ArmPkg/Drivers/ArmScmiDxe/ScmiPrivate.h index 7763c848ae..5f1225f54c 100644 --- a/ArmPkg/Drivers/ArmScmiDxe/ScmiPrivate.h +++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiPrivate.h @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2017-2018, Arm Limited. All rights reserved. + Copyright (c) 2017-2021, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -13,12 +13,12 @@ // SCMI protocol IDs. typedef enum { - SCMI_PROTOCOL_ID_BASE = 0x10, - SCMI_PROTOCOL_ID_POWER_DOMAIN = 0x11, - SCMI_PROTOCOL_ID_SYSTEM_POWER = 0x12, - SCMI_PROTOCOL_ID_PERFORMANCE = 0x13, - SCMI_PROTOCOL_ID_CLOCK = 0x14, - SCMI_PROTOCOL_ID_SENSOR = 0x15 + ScmiProtocolIdBase = 0x10, + ScmiProtocolIdPowerDomain = 0x11, + ScmiProtocolIdSystemPower = 0x12, + ScmiProtocolIdPerformance = 0x13, + ScmiProtocolIdClock = 0x14, + ScmiProtocolIdSensor = 0x15 } SCMI_PROTOCOL_ID; // SCMI message types. -- cgit v1.2.3