* [PATCH RESEND v1 1/1] ArmPkg: Update SCMI Base Protocol version to 0x20000
@ 2021-05-10 8:26 PierreGondois
2021-05-10 8:50 ` Sami Mujawar
0 siblings, 1 reply; 3+ messages in thread
From: PierreGondois @ 2021-05-10 8:26 UTC (permalink / raw)
To: devel, sami.mujawar, leif, ardb+tianocore, Nicola.Mazzucato
From: Nicola Mazzucato <nicola.mazzucato@arm.com>
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 <nicola.mazzucato@arm.com>
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
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 <Base.h>
@@ -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 <Protocol/ArmScmi.h>
-#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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH RESEND v1 1/1] ArmPkg: Update SCMI Base Protocol version to 0x20000
2021-05-10 8:26 [PATCH RESEND v1 1/1] ArmPkg: Update SCMI Base Protocol version to 0x20000 PierreGondois
@ 2021-05-10 8:50 ` Sami Mujawar
2021-05-10 15:49 ` Ard Biesheuvel
0 siblings, 1 reply; 3+ messages in thread
From: Sami Mujawar @ 2021-05-10 8:50 UTC (permalink / raw)
To: Pierre Gondois, devel@edk2.groups.io, leif@nuviainc.com,
ardb+tianocore@kernel.org, Nicola Mazzucato
Hi All,
I have tested this patch on Juno R2.
Tested-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Regards,
Sami Mujawar
On 10/05/2021, 09:26, "Pierre.Gondois@arm.com" <Pierre.Gondois@arm.com> wrote:
From: Nicola Mazzucato <nicola.mazzucato@arm.com>
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 <nicola.mazzucato@arm.com>
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
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 <Base.h>
@@ -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 <Protocol/ArmScmi.h>
-#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
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH RESEND v1 1/1] ArmPkg: Update SCMI Base Protocol version to 0x20000
2021-05-10 8:50 ` Sami Mujawar
@ 2021-05-10 15:49 ` Ard Biesheuvel
0 siblings, 0 replies; 3+ messages in thread
From: Ard Biesheuvel @ 2021-05-10 15:49 UTC (permalink / raw)
To: Sami Mujawar
Cc: Pierre Gondois, devel@edk2.groups.io, leif@nuviainc.com,
ardb+tianocore@kernel.org, Nicola Mazzucato
On Mon, 10 May 2021 at 10:51, Sami Mujawar <Sami.Mujawar@arm.com> wrote:
>
> Hi All,
>
> I have tested this patch on Juno R2.
>
> Tested-by: Sami Mujawar <sami.mujawar@arm.com>
> Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
>
Merged as #1630
Thanks all.
>
> On 10/05/2021, 09:26, "Pierre.Gondois@arm.com" <Pierre.Gondois@arm.com> wrote:
>
> From: Nicola Mazzucato <nicola.mazzucato@arm.com>
>
> 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 <nicola.mazzucato@arm.com>
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
> 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 <Base.h>
> @@ -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 <Protocol/ArmScmi.h>
>
> -#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
>
>
> IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-10 15:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-10 8:26 [PATCH RESEND v1 1/1] ArmPkg: Update SCMI Base Protocol version to 0x20000 PierreGondois
2021-05-10 8:50 ` Sami Mujawar
2021-05-10 15:49 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox