* [PATCH edk2 v1 0/2] Fix some issues for StandaloneMM
@ 2020-11-07 8:28 Ming Huang
2020-11-07 8:28 ` [PATCH edk2 v1 1/2] edk2/StandaloneMmPkg: Fix several print issues Ming Huang
2020-11-07 8:28 ` [PATCH edk2 v1 2/2] edk2/MM: Fix MM Communicate return wrong status issue Ming Huang
0 siblings, 2 replies; 4+ messages in thread
From: Ming Huang @ 2020-11-07 8:28 UTC (permalink / raw)
To: devel; +Cc: yitian.ly, terui.cl, guoheyi, ming.huang-, Ming Huang
The main changes of this series are about return status issue
and debug print issue for StandaloneMM.
Ming Huang (2):
edk2/StandaloneMmPkg: Fix several print issues
edk2/MM: Fix MM Communicate return wrong status issue
ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c | 2 --
MdePkg/Include/Pi/PiMmCis.h | 2 +-
StandaloneMmPkg/Core/StandaloneMmCore.c | 5 +++--
.../Drivers/StandaloneMmCpu/AArch64/EventHandle.c | 9 +++++----
.../AArch64/StandaloneMmCoreEntryPoint.c | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH edk2 v1 1/2] edk2/StandaloneMmPkg: Fix several print issues
2020-11-07 8:28 [PATCH edk2 v1 0/2] Fix some issues for StandaloneMM Ming Huang
@ 2020-11-07 8:28 ` Ming Huang
2020-11-07 8:28 ` [PATCH edk2 v1 2/2] edk2/MM: Fix MM Communicate return wrong status issue Ming Huang
1 sibling, 0 replies; 4+ messages in thread
From: Ming Huang @ 2020-11-07 8:28 UTC (permalink / raw)
To: devel; +Cc: yitian.ly, terui.cl, guoheyi, ming.huang-, Ming Huang
1 DEBUG_ERROR should be used for error print;
2 The %r is finer for edk2 status print;
Signed-off-by: Ming Huang <huangming@linux.alibaba.com>
---
StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c | 4 ++--
StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
index 6a25c4c548..3730ee6379 100644
--- a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
+++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
@@ -110,7 +110,7 @@ PiMmStandaloneArmTfCpuDriverEntry (
);
if (Status != EFI_SUCCESS) {
- DEBUG ((DEBUG_INFO, "Mem alloc failed - 0x%x\n", EventId));
+ DEBUG ((DEBUG_ERROR, "Mem alloc failed - 0x%x\n", EventId));
return EFI_OUT_OF_RESOURCES;
}
@@ -131,7 +131,7 @@ PiMmStandaloneArmTfCpuDriverEntry (
mMmst->CpuSaveState = NULL;
if (mMmEntryPoint == NULL) {
- DEBUG ((DEBUG_INFO, "Mm Entry point Not Found\n"));
+ DEBUG ((DEBUG_ERROR, "Mm Entry point Not Found\n"));
return EFI_UNSUPPORTED;
}
diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
index 9cecfa667b..59a9963ff2 100644
--- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
+++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
@@ -126,7 +126,7 @@ DelegatedEventLoop (
);
if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "Failed delegated event 0x%x, Status 0x%x\n",
+ DEBUG ((DEBUG_ERROR, "Failed delegated event 0x%x, Status %r\n",
EventCompleteSvcArgs->Arg0, Status));
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH edk2 v1 2/2] edk2/MM: Fix MM Communicate return wrong status issue
2020-11-07 8:28 [PATCH edk2 v1 0/2] Fix some issues for StandaloneMM Ming Huang
2020-11-07 8:28 ` [PATCH edk2 v1 1/2] edk2/StandaloneMmPkg: Fix several print issues Ming Huang
@ 2020-11-07 8:28 ` Ming Huang
1 sibling, 0 replies; 4+ messages in thread
From: Ming Huang @ 2020-11-07 8:28 UTC (permalink / raw)
To: devel; +Cc: yitian.ly, terui.cl, guoheyi, ming.huang-, Ming Huang
When edk2 driver call EFI_MM_COMMUNICATION_PROTOCOL.Communicate,
the status of mm event can't return exactly to edk2 driver.
Signed-off-by: Ming Huang <huangming@linux.alibaba.com>
---
ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c | 2 --
MdePkg/Include/Pi/PiMmCis.h | 2 +-
StandaloneMmPkg/Core/StandaloneMmCore.c | 5 +++--
StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c | 5 +++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c b/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c
index 9457eaf1d8..b5b074b56e 100644
--- a/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c
+++ b/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c
@@ -172,12 +172,10 @@ MmCommunication2Communicate (
// Unexpected error since the CommSize was checked for zero length
// prior to issuing the SMC
Status = EFI_OUT_OF_RESOURCES;
- ASSERT (0);
break;
default:
Status = EFI_ACCESS_DENIED;
- ASSERT (0);
}
return Status;
diff --git a/MdePkg/Include/Pi/PiMmCis.h b/MdePkg/Include/Pi/PiMmCis.h
index fdf0591a03..762a1fbce5 100644
--- a/MdePkg/Include/Pi/PiMmCis.h
+++ b/MdePkg/Include/Pi/PiMmCis.h
@@ -237,7 +237,7 @@ typedef struct _EFI_MM_ENTRY_CONTEXT {
@param[in] MmEntryContext Processor information and functionality needed by MM Foundation.
**/
typedef
-VOID
+EFI_STATUS
(EFIAPI *EFI_MM_ENTRY_POINT)(
IN CONST EFI_MM_ENTRY_CONTEXT *MmEntryContext
);
diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.c b/StandaloneMmPkg/Core/StandaloneMmCore.c
index ac3e2c0b1b..aa59ceb5d7 100644
--- a/StandaloneMmPkg/Core/StandaloneMmCore.c
+++ b/StandaloneMmPkg/Core/StandaloneMmCore.c
@@ -332,7 +332,7 @@ MmEndOfDxeHandler (
needed by MM Foundation.
**/
-VOID
+EFI_STATUS
EFIAPI
MmEntryPoint (
IN CONST EFI_MM_ENTRY_CONTEXT *MmEntryContext
@@ -398,7 +398,7 @@ MmEntryPoint (
//
// Process Asynchronous MMI sources
//
- MmiManage (NULL, NULL, NULL, NULL);
+ Status = MmiManage (NULL, NULL, NULL, NULL);
//
// TBD: Do not use private data structure ?
@@ -410,6 +410,7 @@ MmEntryPoint (
gMmCorePrivate->InMm = FALSE;
DEBUG ((DEBUG_INFO, "MmEntryPoint Done\n"));
+ return Status;
}
EFI_STATUS
diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
index 3730ee6379..6951d8ae50 100644
--- a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
+++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
@@ -68,6 +68,7 @@ PiMmStandaloneArmTfCpuDriverEntry (
EFI_MM_COMMUNICATE_HEADER *GuidedEventContext = NULL;
EFI_MM_ENTRY_CONTEXT MmEntryPointContext = {0};
EFI_STATUS Status;
+ EFI_STATUS MmRetStatus;
UINTN NsCommBufferSize;
DEBUG ((DEBUG_INFO, "Received event - 0x%x on cpu %d\n", EventId, CpuNumber));
@@ -135,7 +136,7 @@ PiMmStandaloneArmTfCpuDriverEntry (
return EFI_UNSUPPORTED;
}
- mMmEntryPoint (&MmEntryPointContext);
+ MmRetStatus = mMmEntryPoint (&MmEntryPointContext);
// Free the memory allocation done earlier and reset the per-cpu context
ASSERT (GuidedEventContext);
@@ -147,7 +148,7 @@ PiMmStandaloneArmTfCpuDriverEntry (
}
PerCpuGuidedEventContext[CpuNumber] = NULL;
- return Status;
+ return MmRetStatus;
}
EFI_STATUS
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH edk2 v1 0/2] Fix some issues for StandaloneMM
@ 2020-11-19 12:39 Ming Huang
2020-11-19 12:39 ` [PATCH edk2 v1 1/2] edk2/StandaloneMmPkg: Fix several print issues Ming Huang
0 siblings, 1 reply; 4+ messages in thread
From: Ming Huang @ 2020-11-19 12:39 UTC (permalink / raw)
To: devel, ard.biesheuvel, sami.mujawar, jiewen.yao
Cc: yitian.ly, terui.cl, guoheyi, ming.huang-, Ming Huang
The main changes of this series are about return status issue
and debug print issue for StandaloneMM.
Ming Huang (2):
edk2/StandaloneMmPkg: Fix several print issues
edk2/MM: Fix MM Communicate return wrong status issue
ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c | 2 --
MdePkg/Include/Pi/PiMmCis.h | 2 +-
StandaloneMmPkg/Core/StandaloneMmCore.c | 5 +++--
.../Drivers/StandaloneMmCpu/AArch64/EventHandle.c | 9 +++++----
.../AArch64/StandaloneMmCoreEntryPoint.c | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH edk2 v1 1/2] edk2/StandaloneMmPkg: Fix several print issues
2020-11-19 12:39 [PATCH edk2 v1 0/2] Fix some issues for StandaloneMM Ming Huang
@ 2020-11-19 12:39 ` Ming Huang
0 siblings, 0 replies; 4+ messages in thread
From: Ming Huang @ 2020-11-19 12:39 UTC (permalink / raw)
To: devel, ard.biesheuvel, sami.mujawar, jiewen.yao
Cc: yitian.ly, terui.cl, guoheyi, ming.huang-, Ming Huang
1 DEBUG_ERROR should be used for error print;
2 The %r is finer for edk2 status print;
Signed-off-by: Ming Huang <huangming@linux.alibaba.com>
---
StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c | 4 ++--
StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
index 6a25c4c548..3730ee6379 100644
--- a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
+++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c
@@ -110,7 +110,7 @@ PiMmStandaloneArmTfCpuDriverEntry (
);
if (Status != EFI_SUCCESS) {
- DEBUG ((DEBUG_INFO, "Mem alloc failed - 0x%x\n", EventId));
+ DEBUG ((DEBUG_ERROR, "Mem alloc failed - 0x%x\n", EventId));
return EFI_OUT_OF_RESOURCES;
}
@@ -131,7 +131,7 @@ PiMmStandaloneArmTfCpuDriverEntry (
mMmst->CpuSaveState = NULL;
if (mMmEntryPoint == NULL) {
- DEBUG ((DEBUG_INFO, "Mm Entry point Not Found\n"));
+ DEBUG ((DEBUG_ERROR, "Mm Entry point Not Found\n"));
return EFI_UNSUPPORTED;
}
diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
index 9cecfa667b..59a9963ff2 100644
--- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
+++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
@@ -126,7 +126,7 @@ DelegatedEventLoop (
);
if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "Failed delegated event 0x%x, Status 0x%x\n",
+ DEBUG ((DEBUG_ERROR, "Failed delegated event 0x%x, Status %r\n",
EventCompleteSvcArgs->Arg0, Status));
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-19 12:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-07 8:28 [PATCH edk2 v1 0/2] Fix some issues for StandaloneMM Ming Huang
2020-11-07 8:28 ` [PATCH edk2 v1 1/2] edk2/StandaloneMmPkg: Fix several print issues Ming Huang
2020-11-07 8:28 ` [PATCH edk2 v1 2/2] edk2/MM: Fix MM Communicate return wrong status issue Ming Huang
-- strict thread matches above, loose matches on Subject: below --
2020-11-19 12:39 [PATCH edk2 v1 0/2] Fix some issues for StandaloneMM Ming Huang
2020-11-19 12:39 ` [PATCH edk2 v1 1/2] edk2/StandaloneMmPkg: Fix several print issues Ming Huang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox