sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ArmPkg/ArmScmiDxe: Fix ASSERT error in SCMI DXE

Browse Source 
This change fixes a bug in the SCMI DXE which is observed with the
upcoming release of the SCP firmware.

The PROTOCOL_ID_MASK (0xF) which is used to generate an index in
the ProtocolInitFxns is wrong because protocol ids can be
anywhere in 0x10 - 15 or 0x80 - FF range. This mask generates
the same index for two different protocols e.g. for protocol ids
0x10 and 0x90, which causes duplicate initialization of a protocol
resulting in a failure.

This change removes the use of PROTOCOL_ID_MASK and instead
uses a list of protocol ids and their initialization functions
to identify a supported protocol and initialize it.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Girish Pathak <girish.pathak@arm.com>
Tested-by: Sudeep Holla <sudeep.holla@arm.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
This commit is contained in:
Girish Pathak
2018-06-19 14:53:52 +01:00
committed by Ard Biesheuvel
parent 09ef8e9258
commit 889cf68c3c
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c
View File

@@ -29,13 +29,10 @@
#include "ScmiDxe.h" #include "ScmiDxe.h"
#include "ScmiPrivate.h" #include "ScmiPrivate.h"
STATIC CONST SCMI_PROTOCOL_INIT_TABLE ProtocolInitFxns[MAX_PROTOCOLS] = { STATIC CONST SCMI_PROTOCOL_ENTRY Protocols[] = {
{ ScmiBaseProtocolInit }, { SCMI_PROTOCOL_ID_BASE, ScmiBaseProtocolInit },
{ NULL }, { SCMI_PROTOCOL_ID_PERFORMANCE, ScmiPerformanceProtocolInit },
{ NULL }, { SCMI_PROTOCOL_ID_CLOCK, ScmiClockProtocolInit }
{ ScmiPerformanceProtocolInit },
{ ScmiClockProtocolInit },
{ NULL }
}; };
/** ARM SCMI driver entry point function. /** ARM SCMI driver entry point function.
@@ -65,14 +62,14 @@ ArmScmiDxeEntryPoint (
UINT32 Version; UINT32 Version;
UINT32 Index; UINT32 Index;
UINT32 NumProtocols; UINT32 NumProtocols;
UINT32 ProtocolNo; UINT32 ProtocolIndex;
UINT8 SupportedList[MAX_PROTOCOLS]; UINT8 SupportedList[MAX_PROTOCOLS];
UINT32 SupportedListSize = sizeof (SupportedList); UINT32 SupportedListSize = sizeof (SupportedList);
ProtocolNo = SCMI_PROTOCOL_ID_BASE & PROTOCOL_ID_MASK;
// Every SCMI implementation must implement the base protocol. // Every SCMI implementation must implement the base protocol.
Status = ProtocolInitFxns[ProtocolNo].Init (&ImageHandle); ASSERT (Protocols[0].Id == SCMI_PROTOCOL_ID_BASE);
Status = ScmiBaseProtocolInit (&ImageHandle);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ASSERT (FALSE); ASSERT (FALSE);
return Status; return Status;
@@ -123,13 +120,16 @@ ArmScmiDxeEntryPoint (
} }
// Install supported protocol on ImageHandle. // Install supported protocol on ImageHandle.
for (Index = 0; Index < NumProtocols; Index++) { for (ProtocolIndex = 1; ProtocolIndex < ARRAY_SIZE (Protocols);
ProtocolNo = SupportedList[Index] & PROTOCOL_ID_MASK; ProtocolIndex++) {
if (ProtocolInitFxns[ProtocolNo].Init != NULL) { for (Index = 0; Index < NumProtocols; Index++) {
Status = ProtocolInitFxns[ProtocolNo].Init (&ImageHandle); if (Protocols[ProtocolIndex].Id == SupportedList[Index]) {
if (EFI_ERROR (Status)) { Status = Protocols[ProtocolIndex].InitFn (&ImageHandle);
ASSERT (FALSE); if (EFI_ERROR (Status)) {
return Status; ASSERT_EFI_ERROR (Status);
return Status;
}
break;
} }
} }
} }

8
ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.h
View File

@@ -17,8 +17,9 @@
#ifndef SCMI_DXE_H_ #ifndef SCMI_DXE_H_
#define SCMI_DXE_H_ #define SCMI_DXE_H_
#include "ScmiPrivate.h"
#define MAX_PROTOCOLS 6 #define MAX_PROTOCOLS 6
#define PROTOCOL_ID_MASK 0xF
#define MAX_VENDOR_LEN SCMI_MAX_STR_LEN #define MAX_VENDOR_LEN SCMI_MAX_STR_LEN
/** Pointer to protocol initialization function. /** Pointer to protocol initialization function.
@@ -35,7 +36,8 @@ EFI_STATUS
); );
typedef struct { typedef struct {
SCMI_PROTOCOL_INIT_FXN Init; SCMI_PROTOCOL_ID Id; // Protocol Id.
} SCMI_PROTOCOL_INIT_TABLE; SCMI_PROTOCOL_INIT_FXN InitFn; // Protocol init function.
} SCMI_PROTOCOL_ENTRY;
#endif /* SCMI_DXE_H_ */ #endif /* SCMI_DXE_H_ */