From nobody Wed May 8 17:32:26 2024 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+67722+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+67722+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1605800076; cv=none; d=zohomail.com; s=zohoarc; b=Mcdn4SyHkgzrkNYOIpq+oXyLp/vpbZzGbv/+YuKAhmnMoy9QLUWtfrGClUfT41mU9S72jsSIpWfxP+rmvHAxoXl+w+z0YwA/FvxNflVOlkUMWCmN/Lq9md+/FANQSoUqsjzR01Y0yg+//ocA5N0JqFvJmTaPY3APJApgJEHXgB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605800076; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=iaetodetXjTwvaXpfoaUvqWVeR94mgsRrUraq8u1Fto=; b=fW3HhwjG0VH8QZHXmHGyhjT0/0uTtVpxQw4IapYzAb43pqmL1Wwo4KMguS1lc7eX1WSOVQj4inIWKcg+9cIDv7VR7l0j7SPbS1bJthdHlZXzmlthRCkYH5P6N5rVNo1iu+TKx1u2YsQVj8f4zyZWpLWpN24tUrJZHffe3wyyoys= 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+67722+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 1605800076490904.3413084274755; Thu, 19 Nov 2020 07:34:36 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id CjxJYY1788612xrNgTnp3EUH; Thu, 19 Nov 2020 07:34:35 -0800 X-Received: from out30-43.freemail.mail.aliyun.com (out30-43.freemail.mail.aliyun.com [115.124.30.43]) by mx.groups.io with SMTP id smtpd.web08.8691.1605789590916466710 for ; Thu, 19 Nov 2020 04:39:51 -0800 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=alimailimapcm10staff010182156082;MF=huangming@linux.alibaba.com;NM=1;PH=DS;RN=9;SR=0;TI=SMTPD_---0UFuECXZ_1605789569; X-Received: from 842effaa37a8.tbsite.net(mailfrom:huangming@linux.alibaba.com fp:SMTPD_---0UFuECXZ_1605789569) by smtp.aliyun-inc.com(127.0.0.1); Thu, 19 Nov 2020 20:39:43 +0800 From: Ming Huang To: devel@edk2.groups.io, ard.biesheuvel@arm.com, sami.mujawar@arm.com, jiewen.yao@intel.com Cc: yitian.ly@alibaba-inc.com, terui.cl@alibaba-inc.com, guoheyi@linux.alibaba.com, ming.huang-@outlook.com, Ming Huang Subject: [edk2-devel] [PATCH edk2 v1 1/2] edk2/StandaloneMmPkg: Fix several print issues Date: Thu, 19 Nov 2020 20:39:27 +0800 Message-Id: <20201119123928.29501-2-huangming@linux.alibaba.com> In-Reply-To: <20201119123928.29501-1-huangming@linux.alibaba.com> References: <20201119123928.29501-1-huangming@linux.alibaba.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,huangming@linux.alibaba.com X-Gm-Message-State: 4LDCsyGtd09bIxmBAGZoPXl8x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1605800075; bh=fvF59eUw3Zs7bmIUcO6cwyBZu2mWCSjDBxSfMRmbLE0=; h=Cc:Date:From:Reply-To:Subject:To; b=sVmY+FV2FSB1VUMUmPdbTdCMCCYjr0iB6IYBLSBPXFeKWvtO/tovljJ6OUTgxnB1vGt KSupX3cxzichWhuErFgXLefErBxVNKxWiX61QzOcwTjARKc96xJHC/P/Ohave/xq8fgMT 1uJWXsvRvZU9ExiztjCpOdhdo38CEnht80w= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 1 DEBUG_ERROR should be used for error print; 2 The %r is finer for edk2 status print; Signed-off-by: Ming Huang --- StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c = | 4 ++-- StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCor= eEntryPoint.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 ( ); =20 if (Status !=3D 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; } =20 @@ -131,7 +131,7 @@ PiMmStandaloneArmTfCpuDriverEntry ( mMmst->CpuSaveState =3D NULL; =20 if (mMmEntryPoint =3D=3D NULL) { - DEBUG ((DEBUG_INFO, "Mm Entry point Not Found\n")); + DEBUG ((DEBUG_ERROR, "Mm Entry point Not Found\n")); return EFI_UNSUPPORTED; } =20 diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Sta= ndaloneMmCoreEntryPoint.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPo= int/AArch64/StandaloneMmCoreEntryPoint.c index 9cecfa667b..59a9963ff2 100644 --- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standalone= MmCoreEntryPoint.c +++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/Standalone= MmCoreEntryPoint.c @@ -126,7 +126,7 @@ DelegatedEventLoop ( ); =20 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)); } =20 --=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 (#67722): https://edk2.groups.io/g/devel/message/67722 Mute This Topic: https://groups.io/mt/78367459/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- From nobody Wed May 8 17:32:26 2024 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+67721+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+67721+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1605800078; cv=none; d=zohomail.com; s=zohoarc; b=OAPzVRLjthwMaDv32XPT9HVKDHIJftxw8tyDoTbPZFhcGNe1b/WSAHb+t9mFw0rmFcuw3r50/UPR7RY02BowyTLMxB+ZCe6GNnmbf1m3TU9in3qZrDtUszWg1lhJri8SVHPm/G6oq2WJ0cEaS2kSx01UrFj8bG9sfOYWtA+9u3k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605800078; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=5yvdb436apH/bbk5eLgU1qDu2qeRf1Q/U2SomgtVnSY=; b=hXKjwwUhl0nPo0YXcwjdQlYU2GeRZUtNNEyhSmU613aLenvaURzcN4aCeQON16wLtnB+hhDe3KMfjFEQi59mFncXP+0N/sYi5aHYTfMQKlx845NlAeMJw4GdSY3YZRUzke3EFufHB4BXcSdUTt8YJdfnMXuUE9FruU58BSr23vo= 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+67721+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 1605800078939278.5169609131783; Thu, 19 Nov 2020 07:34:38 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id pELNYY1788612xdgT6GoFMhV; Thu, 19 Nov 2020 07:34:38 -0800 X-Received: from out4436.biz.mail.alibaba.com (out4436.biz.mail.alibaba.com [47.88.44.36]) by mx.groups.io with SMTP id smtpd.web08.8690.1605789590085631423 for ; Thu, 19 Nov 2020 04:39:50 -0800 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04420;MF=huangming@linux.alibaba.com;NM=1;PH=DS;RN=9;SR=0;TI=SMTPD_---0UFuECXZ_1605789569; X-Received: from 842effaa37a8.tbsite.net(mailfrom:huangming@linux.alibaba.com fp:SMTPD_---0UFuECXZ_1605789569) by smtp.aliyun-inc.com(127.0.0.1); Thu, 19 Nov 2020 20:39:43 +0800 From: Ming Huang To: devel@edk2.groups.io, ard.biesheuvel@arm.com, sami.mujawar@arm.com, jiewen.yao@intel.com Cc: yitian.ly@alibaba-inc.com, terui.cl@alibaba-inc.com, guoheyi@linux.alibaba.com, ming.huang-@outlook.com, Ming Huang Subject: [edk2-devel] [PATCH edk2 v1 2/2] edk2/MM: Fix MM Communicate return wrong status issue Date: Thu, 19 Nov 2020 20:39:28 +0800 Message-Id: <20201119123928.29501-3-huangming@linux.alibaba.com> In-Reply-To: <20201119123928.29501-1-huangming@linux.alibaba.com> References: <20201119123928.29501-1-huangming@linux.alibaba.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,huangming@linux.alibaba.com X-Gm-Message-State: EMZzLpqK17GeImbmkD9K8Nptx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1605800078; bh=1JXCjgtrxHkoV63k1JZVXyW6BKcDBWN7Un0UIbHVE2s=; h=Cc:Date:From:Reply-To:Subject:To; b=TF0h4+jCEs2aSqHZ8tkWl7GbG32coeRPUzbluRRTsVvnQSAN84wO78StJ6QCsu7F/dy lvytWtYdLNS/TPVwG2Ozm6isiP4cNaaYZPtrAIYl+zuOUN0qEBwF3bQHGkn860zoIwz+g M2M5FbuqgizGddPtZz1aQoltID8wZS56W+k= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- 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/D= rivers/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 =3D EFI_OUT_OF_RESOURCES; - ASSERT (0); break; =20 default: Status =3D EFI_ACCESS_DENIED; - ASSERT (0); } =20 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 neede= d 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. =20 **/ -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 =3D MmiManage (NULL, NULL, NULL, NULL); =20 // // TBD: Do not use private data structure ? @@ -410,6 +410,7 @@ MmEntryPoint ( gMmCorePrivate->InMm =3D FALSE; =20 DEBUG ((DEBUG_INFO, "MmEntryPoint Done\n")); + return Status; } =20 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 =3D NULL; EFI_MM_ENTRY_CONTEXT MmEntryPointContext =3D {0}; EFI_STATUS Status; + EFI_STATUS MmRetStatus; UINTN NsCommBufferSize; =20 DEBUG ((DEBUG_INFO, "Received event - 0x%x on cpu %d\n", EventId, CpuNum= ber)); @@ -135,7 +136,7 @@ PiMmStandaloneArmTfCpuDriverEntry ( return EFI_UNSUPPORTED; } =20 - mMmEntryPoint (&MmEntryPointContext); + MmRetStatus =3D mMmEntryPoint (&MmEntryPointContext); =20 // Free the memory allocation done earlier and reset the per-cpu context ASSERT (GuidedEventContext); @@ -147,7 +148,7 @@ PiMmStandaloneArmTfCpuDriverEntry ( } PerCpuGuidedEventContext[CpuNumber] =3D NULL; =20 - return Status; + return MmRetStatus; } =20 EFI_STATUS --=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 (#67721): https://edk2.groups.io/g/devel/message/67721 Mute This Topic: https://groups.io/mt/78367458/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-