From nobody Tue Feb 10 02:55:44 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+72073+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+72073+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1614086092; cv=none; d=zohomail.com; s=zohoarc; b=ByrM7VDPsItZZdxwHY+rpzq2yOgScyx1ur2t0D0dcABfAC5NwLQvyPQt+wJV9/k+1pTPbe1MUVQIn0W6kcLDop3HlgD/8/oqDmUO5flObvLDopLe4lhRn1RU74N/eAfjKYz4nM9P5G3g4+M6CnGmjQTguffN+Cdoly0meuIzTPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614086092; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=OTkozzjw+FyeJVSYef1hnOhQYGAYEY3v7L2ZQAXCQMA=; b=iWkdrNamkqXEw8m1VDvo2S0gOa5RXiWaL9iZHPTBCxfncOOlXH9S1o/RE4rTdBLkeO3dFwXgseoZrnaVtISezw3mi1qrjfuTjpz1Blgt+A8gDpT+1yGpkeOKU4xkQU0NhRsfmTChcXR4FYqur5s+FME9kNx8ohN+8YvZlaCDKDw= 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+72073+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1614086092295618.097124076087; Tue, 23 Feb 2021 05:14:52 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id WWT2YY1788612xHcocOvwyFT; Tue, 23 Feb 2021 05:14:51 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.9420.1614086086176985395 for ; Tue, 23 Feb 2021 05:14:46 -0800 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D80D3101E; Tue, 23 Feb 2021 05:14:45 -0800 (PST) X-Received: from e120189.arm.com (unknown [10.57.9.161]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9B2573F70D; Tue, 23 Feb 2021 05:14:44 -0800 (PST) From: "PierreGondois" To: devel@edk2.groups.io, ardb+tianocore@kernel.org, leif@nuviainc.com, sami.mujawar@arm.com Subject: [edk2-devel] [PATCH v3 19/26] ArmPkg: Fix Ecc error 8005 for SCMI_PROTOCOL_ID Date: Tue, 23 Feb 2021 13:13:59 +0000 Message-Id: <20210223131406.3484-20-Pierre.Gondois@arm.com> In-Reply-To: <20210223131406.3484-1-Pierre.Gondois@arm.com> References: <20210223131406.3484-1-Pierre.Gondois@arm.com> 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,pierre.gondois@arm.com X-Gm-Message-State: wHXlJSNjzmpLjPcdue12e3iLx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1614086091; bh=QdTPbAfoupoCjB2IaJpeFJcrM4OC9rno7KaLMOzmo5k=; h=Date:From:Reply-To:Subject:To; b=X+PNP+Vm9F99hMm7RMvqcgwUn3Wp0EkRRATo7gK+nEbsKyKdtb4JftyTpB6Y8txV6vR jTsL290kl5T+mIKU383wd6jGUDnwECNsKp8TtsBRWWJr2AznVStsQpwv5bKUIMI2nJhYr 469sjz7ZQHebOl8xz0UTZ7i9REDonM24gpw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Pierre Gondois 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 --- The changes can be seen at: https://github.com/PierreARM/edk2/tree/1552_Ecc= _ArmPkg_BIS_v3 ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c | 12 ++++++------ ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c | 14 +++++++------- ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c | 10 +++++----- .../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 d89587f9edf3..c84ce97f15ac 100644 --- a/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c +++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2017-2018, Arm Limited. All rights reserved. + Copyright (c) 2017-2021, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -34,7 +34,7 @@ BaseGetVersion ( OUT UINT32 *Version ) { - return ScmiGetProtocolVersion (SCMI_PROTOCOL_ID_BASE, Version); + return ScmiGetProtocolVersion (ScmiProtocolIdBase, Version); } =20 /** Return total number of SCMI protocols supported by the SCP firmware. @@ -57,7 +57,7 @@ BaseGetTotalProtocols ( EFI_STATUS Status; UINT32 *ReturnValues; =20 - Status =3D ScmiGetProtocolAttributes (SCMI_PROTOCOL_ID_BASE, &ReturnValu= es); + Status =3D ScmiGetProtocolAttributes (ScmiProtocolIdBase, &ReturnValues); if (EFI_ERROR (Status)) { return Status; } @@ -91,7 +91,7 @@ BaseDiscoverVendorDetails ( SCMI_COMMAND Cmd; UINT32 PayloadLength; =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_BASE; + Cmd.ProtocolId =3D ScmiProtocolIdBase; Cmd.MessageId =3D MessageId; =20 PayloadLength =3D 0; @@ -183,7 +183,7 @@ BaseDiscoverImplVersion ( SCMI_COMMAND Cmd; UINT32 PayloadLength; =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_BASE; + Cmd.ProtocolId =3D ScmiProtocolIdBase; Cmd.MessageId =3D SCMI_MESSAGE_ID_BASE_DISCOVER_IMPLEMENTATION_VERSION; =20 PayloadLength =3D 0; @@ -250,7 +250,7 @@ BaseDiscoverListProtocols ( return EFI_BUFFER_TOO_SMALL; } =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_BASE; + Cmd.ProtocolId =3D ScmiProtocolIdBase; Cmd.MessageId =3D SCMI_MESSAGE_ID_BASE_DISCOVER_LIST_PROTOCOLS; =20 Skip =3D 0; diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c b/ArmPkg/Drivers= /ArmScmiDxe/ScmiClockProtocol.c index 5c06e31bda22..b7892bfd7771 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); } =20 /** Return total number of clock devices supported by the clock management @@ -76,7 +76,7 @@ ClockGetTotalClocks ( EFI_STATUS Status; UINT32 *ReturnValues; =20 - Status =3D ScmiGetProtocolAttributes (SCMI_PROTOCOL_ID_CLOCK, &ReturnVal= ues); + Status =3D ScmiGetProtocolAttributes (ScmiProtocolIdClock, &ReturnValues= ); if (EFI_ERROR (Status)) { return Status; } @@ -122,7 +122,7 @@ ClockGetClockAttributes ( =20 *MessageParams =3D ClockId; =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_CLOCK; + Cmd.ProtocolId =3D ScmiProtocolIdClock; Cmd.MessageId =3D SCMI_MESSAGE_ID_CLOCK_ATTRIBUTES; =20 PayloadLength =3D sizeof (ClockId); @@ -203,7 +203,7 @@ ClockDescribeRates ( return Status; } =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_CLOCK; + Cmd.ProtocolId =3D ScmiProtocolIdClock; Cmd.MessageId =3D SCMI_MESSAGE_ID_CLOCK_DESCRIBE_RATES; =20 *MessageParams++ =3D ClockId; @@ -320,7 +320,7 @@ ClockRateGet ( // Fill arguments for clock protocol command. *MessageParams =3D ClockId; =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_CLOCK; + Cmd.ProtocolId =3D ScmiProtocolIdClock; Cmd.MessageId =3D SCMI_MESSAGE_ID_CLOCK_RATE_GET; =20 PayloadLength =3D sizeof (ClockId); @@ -374,7 +374,7 @@ ClockRateSet ( ClockRateSetAttributes->Rate.Low =3D (UINT32)Rate; ClockRateSetAttributes->Rate.High =3D (UINT32)(Rate >> 32); =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_CLOCK; + Cmd.ProtocolId =3D ScmiProtocolIdClock; Cmd.MessageId =3D SCMI_MESSAGE_ID_CLOCK_RATE_SET; =20 PayloadLength =3D sizeof (CLOCK_RATE_SET_ATTRIBUTES); @@ -421,7 +421,7 @@ ClockEnable ( ClockConfigSetAttributes->ClockId =3D ClockId; ClockConfigSetAttributes->Attributes =3D Enable ? BIT0 : 0; =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_CLOCK; + Cmd.ProtocolId =3D ScmiProtocolIdClock; Cmd.MessageId =3D SCMI_MESSAGE_ID_CLOCK_CONFIG_SET; =20 PayloadLength =3D sizeof (CLOCK_CONFIG_SET_ATTRIBUTES); diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c b/ArmPkg/Drivers/ArmScmiDx= e/ScmiDxe.c index e95f56e670ed..d5890a7633a2 100644 --- a/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c +++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2017-2018, Arm Limited. All rights reserved. + Copyright (c) 2017-2021, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -24,9 +24,9 @@ #include "ScmiPrivate.h" =20 STATIC CONST SCMI_PROTOCOL_ENTRY Protocols[] =3D { - { SCMI_PROTOCOL_ID_BASE, ScmiBaseProtocolInit }, - { SCMI_PROTOCOL_ID_PERFORMANCE, ScmiPerformanceProtocolInit }, - { SCMI_PROTOCOL_ID_CLOCK, ScmiClockProtocolInit } + { ScmiProtocolIdBase, ScmiBaseProtocolInit }, + { ScmiProtocolIdPerformance, ScmiPerformanceProtocolInit }, + { ScmiProtocolIdClock, ScmiClockProtocolInit } }; =20 /** ARM SCMI driver entry point function. @@ -61,7 +61,7 @@ ArmScmiDxeEntryPoint ( UINT32 SupportedListSize; =20 // Every SCMI implementation must implement the base protocol. - ASSERT (Protocols[0].Id =3D=3D SCMI_PROTOCOL_ID_BASE); + ASSERT (Protocols[0].Id =3D=3D ScmiProtocolIdBase); =20 Status =3D ScmiBaseProtocolInit (&ImageHandle); if (EFI_ERROR (Status)) { diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiPerformanceProtocol.c b/ArmPkg/D= rivers/ArmScmiDxe/ScmiPerformanceProtocol.c index 712f95d6ea40..51cad4d2c602 100644 --- a/ArmPkg/Drivers/ArmScmiDxe/ScmiPerformanceProtocol.c +++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiPerformanceProtocol.c @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2017-2018, Arm Limited. All rights reserved. + Copyright (c) 2017-2021, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -35,7 +35,7 @@ PerformanceGetVersion ( OUT UINT32 *Version ) { - return ScmiGetProtocolVersion (SCMI_PROTOCOL_ID_PERFORMANCE, Version); + return ScmiGetProtocolVersion (ScmiProtocolIdPerformance, Version); } =20 /** Return protocol attributes of the performance management protocol. @@ -59,7 +59,7 @@ PerformanceGetAttributes ( UINT32* ReturnValues; =20 Status =3D ScmiGetProtocolAttributes ( - SCMI_PROTOCOL_ID_PERFORMANCE, + ScmiProtocolIdPerformance, &ReturnValues ); if (EFI_ERROR (Status)) { @@ -107,7 +107,7 @@ PerformanceDomainAttributes ( =20 *MessageParams =3D DomainId; =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_PERFORMANCE; + Cmd.ProtocolId =3D ScmiProtocolIdPerformance; Cmd.MessageId =3D SCMI_MESSAGE_ID_PERFORMANCE_DOMAIN_ATTRIBUTES; =20 PayloadLength =3D sizeof (DomainId); @@ -179,7 +179,7 @@ PerformanceDescribeLevels ( =20 *MessageParams++ =3D DomainId; =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_PERFORMANCE; + Cmd.ProtocolId =3D ScmiProtocolIdPerformance; Cmd.MessageId =3D SCMI_MESSAGE_ID_PERFORMANCE_DESCRIBE_LEVELS; =20 do { @@ -258,7 +258,7 @@ PerformanceLimitsSet ( *MessageParams++ =3D Limits->RangeMax; *MessageParams =3D Limits->RangeMin; =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_PERFORMANCE; + Cmd.ProtocolId =3D ScmiProtocolIdPerformance; Cmd.MessageId =3D SCMI_MESSAGE_ID_PERFORMANCE_LIMITS_SET; =20 PayloadLength =3D sizeof (DomainId) + sizeof (SCMI_PERFORMANCE_LIMITS); @@ -304,7 +304,7 @@ PerformanceLimitsGet ( =20 *MessageParams =3D DomainId; =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_PERFORMANCE; + Cmd.ProtocolId =3D ScmiProtocolIdPerformance; Cmd.MessageId =3D SCMI_MESSAGE_ID_PERFORMANCE_LIMITS_GET; =20 PayloadLength =3D sizeof (DomainId); @@ -354,7 +354,7 @@ PerformanceLevelSet ( *MessageParams++ =3D DomainId; *MessageParams =3D Level; =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_PERFORMANCE; + Cmd.ProtocolId =3D ScmiProtocolIdPerformance; Cmd.MessageId =3D SCMI_MESSAGE_ID_PERFORMANCE_LEVEL_SET; =20 PayloadLength =3D sizeof (DomainId) + sizeof (Level); @@ -399,7 +399,7 @@ PerformanceLevelGet ( =20 *MessageParams =3D DomainId; =20 - Cmd.ProtocolId =3D SCMI_PROTOCOL_ID_PERFORMANCE; + Cmd.ProtocolId =3D ScmiProtocolIdPerformance; Cmd.MessageId =3D SCMI_MESSAGE_ID_PERFORMANCE_LEVEL_GET; =20 PayloadLength =3D sizeof (DomainId); diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiPrivate.h b/ArmPkg/Drivers/ArmSc= miDxe/ScmiPrivate.h index 7763c848aedc..5f1225f54cd9 100644 --- a/ArmPkg/Drivers/ArmScmiDxe/ScmiPrivate.h +++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiPrivate.h @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2017-2018, Arm Limited. All rights reserved. + Copyright (c) 2017-2021, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -13,12 +13,12 @@ =20 // SCMI protocol IDs. typedef enum { - SCMI_PROTOCOL_ID_BASE =3D 0x10, - SCMI_PROTOCOL_ID_POWER_DOMAIN =3D 0x11, - SCMI_PROTOCOL_ID_SYSTEM_POWER =3D 0x12, - SCMI_PROTOCOL_ID_PERFORMANCE =3D 0x13, - SCMI_PROTOCOL_ID_CLOCK =3D 0x14, - SCMI_PROTOCOL_ID_SENSOR =3D 0x15 + ScmiProtocolIdBase =3D 0x10, + ScmiProtocolIdPowerDomain =3D 0x11, + ScmiProtocolIdSystemPower =3D 0x12, + ScmiProtocolIdPerformance =3D 0x13, + ScmiProtocolIdClock =3D 0x14, + ScmiProtocolIdSensor =3D 0x15 } SCMI_PROTOCOL_ID; =20 // SCMI message types. --=20 2.17.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 (#72073): https://edk2.groups.io/g/devel/message/72073 Mute This Topic: https://groups.io/mt/80850097/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-