From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=jiewen.yao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E80592249275D for ; Thu, 1 Mar 2018 21:55:52 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Mar 2018 22:02:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,411,1515484800"; d="scan'208";a="38675134" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga002.jf.intel.com with ESMTP; 01 Mar 2018 22:02:01 -0800 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 1 Mar 2018 22:02:01 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 1 Mar 2018 22:02:00 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.124]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.116]) with mapi id 14.03.0319.002; Fri, 2 Mar 2018 14:01:58 +0800 From: "Yao, Jiewen" To: "Zeng, Star" , "edk2-devel@lists.01.org" CC: "Dong, Eric" , Laszlo Ersek Thread-Topic: [PATCH 3/3] UefiCpuPkg S3ResumePei: Signal S3SmmInitDone Thread-Index: AQHTseWOsd5vH/VbQUKu2Wlk3uPeuqO8c8hg Date: Fri, 2 Mar 2018 06:01:57 +0000 Message-ID: <74D8A39837DF1E4DA445A8C0B3885C503AAD9E01@shsmsx102.ccr.corp.intel.com> References: <1519967749-5112-1-git-send-email-star.zeng@intel.com> <1519967749-5112-4-git-send-email-star.zeng@intel.com> In-Reply-To: <1519967749-5112-4-git-send-email-star.zeng@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNmI4ZTAyYjYtNzdkMS00NTg1LWIzY2UtNTQxY2IzNjkyOGFhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjIuNS4xOCIsIlRydXN0ZWRMYWJlbEhhc2giOiIrVVJBS090Qkc2bzc5aWNLUk1WcnRCSk56ZWNIN0htMlhnNWNKTnRYSTk2SnE5WGE4a0dPaFBFdG1TSkQ5XC9UbCJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 3/3] UefiCpuPkg S3ResumePei: Signal S3SmmInitDone X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Mar 2018 05:55:53 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Star Can we keep the human readable debug message? - DEBUG ((DEBUG_INFO, "SignalEndOfS3Resume - Enter\n")); + DEBUG ((DEBUG_INFO, "Signal %g to SMM - Enter\n", HandlerType)); Other update is good to me. Reviewed-by: Jiewen.yao@intel.com Thank you Yao Jiewen > -----Original Message----- > From: Zeng, Star > Sent: Friday, March 2, 2018 1:16 PM > To: edk2-devel@lists.01.org > Cc: Zeng, Star ; Yao, Jiewen ; > Dong, Eric ; Laszlo Ersek > Subject: [PATCH 3/3] UefiCpuPkg S3ResumePei: Signal S3SmmInitDone >=20 > Cc: Jiewen Yao > Cc: Eric Dong > Cc: Laszlo Ersek > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Star Zeng > --- > UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c | 42 > +++++++++++++++------- > .../Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf | 3 ++ > 2 files changed, 33 insertions(+), 12 deletions(-) >=20 > diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c > b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c > index 4d776891a72d..2cb7b429e59c 100644 > --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c > +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -259,6 +260,12 @@ EFI_PEI_PPI_DESCRIPTOR mPpiListEndOfPeiTable =3D { > 0 > }; >=20 > +EFI_PEI_PPI_DESCRIPTOR mPpiListS3SmmInitDoneTable =3D { > + (EFI_PEI_PPI_DESCRIPTOR_PPI | > EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), > + &gEdkiiS3SmmInitDoneGuid, > + 0 > +}; > + > // > // Global Descriptor Table (GDT) > // > @@ -322,13 +329,14 @@ IsLongModeWakingVector ( > } >=20 > /** > - Send EndOfS3Resume event to SmmCore through communication buffer > way. > + Signal to SMM through communication buffer way. > + > + @param[in] HandlerType SMI handler type to be signaled. >=20 > - @retval EFI_SUCCESS Return send the event success. > **/ > -EFI_STATUS > -SignalEndOfS3Resume ( > - VOID > +VOID > +SignalToSmmByCommunication ( > + IN EFI_GUID *HandlerType > ) > { > EFI_STATUS Status; > @@ -338,7 +346,7 @@ SignalEndOfS3Resume ( > SMM_COMMUNICATE_HEADER_64 Header64; > VOID *CommBuffer; >=20 > - DEBUG ((DEBUG_INFO, "SignalEndOfS3Resume - Enter\n")); > + DEBUG ((DEBUG_INFO, "Signal %g to SMM - Enter\n", HandlerType)); >=20 > // > // This buffer consumed in DXE phase, so base on DXE mode to prepare > communicate buffer. > @@ -355,7 +363,7 @@ SignalEndOfS3Resume ( > Header32.MessageLength =3D 0; > CommSize =3D OFFSET_OF (SMM_COMMUNICATE_HEADER_32, Data); > } > - CopyGuid (CommBuffer, &gEdkiiEndOfS3ResumeGuid); > + CopyGuid (CommBuffer, HandlerType); >=20 > Status =3D PeiServicesLocatePpi ( > &gEfiPeiSmmCommunicationPpiGuid, > @@ -365,7 +373,7 @@ SignalEndOfS3Resume ( > ); > if (EFI_ERROR (Status)) { > DEBUG ((DEBUG_ERROR, "Locate Smm Communicate Ppi failed (%r)!\n", > Status)); > - return Status; > + return; > } >=20 > Status =3D SmmCommunicationPpi->Communicate ( > @@ -377,8 +385,8 @@ SignalEndOfS3Resume ( > DEBUG ((DEBUG_ERROR, "SmmCommunicationPpi->Communicate return > failure (%r)!\n", Status)); > } >=20 > - DEBUG ((DEBUG_INFO, "SignalEndOfS3Resume - Exit (%r)\n", Status)); > - return Status; > + DEBUG ((DEBUG_INFO, "Signal %g to SMM - Exit (%r)\n", HandlerType, > Status)); > + return; > } >=20 > /** > @@ -464,11 +472,11 @@ S3ResumeBootOs ( > PERF_END_EX (NULL, "EndOfPeiPpi", NULL, 0, PERF_INMODULE_END_ID); >=20 > // > - // Signal EndOfS3Resume event. > + // Signal EndOfS3Resume to SMM. > // > PERF_START_EX (NULL, "EndOfS3Resume", NULL, 0, > PERF_INMODULE_START_ID); >=20 > - SignalEndOfS3Resume (); > + SignalToSmmByCommunication (&gEdkiiEndOfS3ResumeGuid); >=20 > PERF_END_EX (NULL, "EndOfS3Resume", NULL, 0, > PERF_INMODULE_END_ID); >=20 > @@ -787,6 +795,16 @@ S3ResumeExecuteBootScript ( > Status =3D SmmAccess->Lock ((EFI_PEI_SERVICES > **)GetPeiServicesTablePointer (), SmmAccess, Index); > } > } > + > + // > + // Install S3SmmInitDone PPI. > + // > + Status =3D PeiServicesInstallPpi (&mPpiListS3SmmInitDoneTable); > + ASSERT_EFI_ERROR (Status); > + // > + // Signal S3SmmInitDone to SMM. > + // > + SignalToSmmByCommunication (&gEdkiiS3SmmInitDoneGuid); > } >=20 > if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) { > diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > index 9522ede726f4..47fecd7d6d80 100644 > --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > @@ -78,6 +78,9 @@ [Guids] > gEfiAcpiVariableGuid > gEfiAcpiS3ContextGuid ## > SOMETIMES_CONSUMES ## UNDEFINED # LockBox > gEdkiiEndOfS3ResumeGuid ## > SOMETIMES_CONSUMES ## UNDEFINED # Used to do smm communication > + ## SOMETIMES_PRODUCES ## UNDEFINED # Install PPI > + ## SOMETIMES_CONSUMES ## UNDEFINED # Used to do smm > communication > + gEdkiiS3SmmInitDoneGuid >=20 > [Ppis] > gEfiPeiReadOnlyVariable2PpiGuid ## CONSUMES > -- > 2.7.0.windows.1