From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by mx.groups.io with SMTP id smtpd.web09.13763.1620408803416078073 for ; Fri, 07 May 2021 10:33:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DBx//Oq+; spf=pass (domain: kernel.org, ip: 198.145.29.99, mailfrom: ardb@kernel.org) Received: by mail.kernel.org (Postfix) with ESMTPSA id 728156145E for ; Fri, 7 May 2021 17:33:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620408802; bh=hwJj7P63pufmvDuJgK+Any+HjF/AMPTk4CTb00TGd8I=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=DBx//Oq+Zjt7xjNFovNLjFYgk+W/KnYBlJt5SYTyLEjnf54aLafh89MOZvGPpyzWw ZTNrPEB960Ne+Ah2d8p9PRvHAakFaci1t34gCz4GjDxwhp1HyuDw6oEshe/n5tIetn oZe9lY9cLTBS28WoY12fcgbpgSw3L6Iopgcv7H/q36z+gT9D8YmP4rxu14v5z6HT1A wtEpSIG5jAF82unSbV3nhih1zSM6GbaRe78gliQ2g/ILNpIEqQuBVbCUTUUmhj105O 819BRXMN2JSvD4JuYGutQQc0n75lm9emfKcRcnn+/VVBgrKFwg9A4SDy/9JK8uob47 MySgPYTTljKwg== Received: by mail-ot1-f50.google.com with SMTP id g15-20020a9d128f0000b02902a7d7a7bb6eso8545953otg.9 for ; Fri, 07 May 2021 10:33:22 -0700 (PDT) X-Gm-Message-State: AOAM533mPCQeyJc9zuPh4Y9NGv7dlFXPWldaKjmFkILCu9NayoCkm8vg S4fgedHZdO+zfkQDHgepAksPiKo2kWKn2jYWhGA= X-Google-Smtp-Source: ABdhPJxDehkkqH9ZHHTjmGhHNcFEuaeoodcVW7/p+FC9H9AoYyFiQ72vqMkEODrktUneDJRLlZHDy3MgIl/mRDnV+h4= X-Received: by 2002:a9d:12e:: with SMTP id 43mr9421351otu.90.1620408801649; Fri, 07 May 2021 10:33:21 -0700 (PDT) MIME-Version: 1.0 References: <20210506104320.13163-1-Pierre.Gondois@arm.com> In-Reply-To: <20210506104320.13163-1-Pierre.Gondois@arm.com> From: "Ard Biesheuvel" Date: Fri, 7 May 2021 19:33:10 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v1 1/1] ArmPkg: Update SCMI Base Protocol version to 0x20000 To: Pierre Cc: edk2-devel-groups-io , Sami Mujawar , Leif Lindholm , Ard Biesheuvel , Nicola.Mazzucato@arm.com Content-Type: text/plain; charset="UTF-8" Hello Pierre, On Thu, 6 May 2021 at 12:43, wrote: > > From: Nicola Mazzucato > > The SCP-firmware has moved to full support for SCMIv2 which means that > the base protocol can be either compliant with SCMI v1 or v2. > > Allow any version between SCMI v1.0 and SCMI v2.0 to be compatible > with the current implementation. > > Signed-off-by: Nicola Mazzucato SOB is not an attribution of authorship, it is a statement made by the person contributing the patch asserting that the contribution complies with the license. IOW, you can keep the From: line, but please change the SOB to your name and email. Thanks, Ard. > --- > The changes can be seen at: https://github.com/PierreARM/edk2/tree/1732_Update_SCMI_version_v1 > > ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c | 10 ++++++---- > ArmPkg/Include/Protocol/ArmScmiBaseProtocol.h | 10 +++++----- > 2 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c b/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c > index d5890a7633a2..fb4e79aa3610 100644 > --- a/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c > +++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c > @@ -4,9 +4,9 @@ > > SPDX-License-Identifier: BSD-2-Clause-Patent > > - System Control and Management Interface V1.0 > - http://infocenter.arm.com/help/topic/com.arm.doc.den0056a/ > - DEN0056A_System_Control_and_Management_Interface.pdf > + @par Specification Reference: > + - Arm System Control and Management Interface - Platform Design Document > + (https://developer.arm.com/documentation/den0056/) > **/ > > #include > @@ -86,7 +86,9 @@ ArmScmiDxeEntryPoint ( > return Status; > } > > - if (Version != BASE_PROTOCOL_VERSION) { > + // Accept any version between SCMI v1.0 and SCMI v2.0 > + if ((Version < BASE_PROTOCOL_VERSION_V1) || > + (Version > BASE_PROTOCOL_VERSION_V2)) { > ASSERT (FALSE); > return EFI_UNSUPPORTED; > } > diff --git a/ArmPkg/Include/Protocol/ArmScmiBaseProtocol.h b/ArmPkg/Include/Protocol/ArmScmiBaseProtocol.h > index 73ad3e32a2f5..c4b81c0f56d3 100644 > --- a/ArmPkg/Include/Protocol/ArmScmiBaseProtocol.h > +++ b/ArmPkg/Include/Protocol/ArmScmiBaseProtocol.h > @@ -4,9 +4,9 @@ > > SPDX-License-Identifier: BSD-2-Clause-Patent > > - System Control and Management Interface V1.0 > - http://infocenter.arm.com/help/topic/com.arm.doc.den0056a/ > - DEN0056A_System_Control_and_Management_Interface.pdf > + @par Specification Reference: > + - Arm System Control and Management Interface - Platform Design Document > + (https://developer.arm.com/documentation/den0056/) > **/ > > #ifndef ARM_SCMI_BASE_PROTOCOL_H_ > @@ -14,7 +14,8 @@ > > #include > > -#define BASE_PROTOCOL_VERSION 0x10000 > +#define BASE_PROTOCOL_VERSION_V1 0x10000 > +#define BASE_PROTOCOL_VERSION_V2 0x20000 > > #define NUM_PROTOCOL_MASK 0xFFU > #define NUM_AGENT_MASK 0xFFU > @@ -165,4 +166,3 @@ typedef enum { > } SCMI_MESSAGE_ID_BASE; > > #endif /* ARM_SCMI_BASE_PROTOCOL_H_ */ > - > -- > 2.17.1 >