Thanks for the comments. How about change the commits order to be like: 1) S3 MTRRs operation: 2) AP page table unavailiable issue fix: 3) S3 ApHltLoopCode Operation: > UefiCpuPkg:Abstract some DxeMpLib code to function > UefiCpuPkg:Move some code in DxeMpLib to common place > UefiCpuPkg: Install gEdkiiEndOfS3ResumeGuid in S3Resume > UefiCpuPkg:Relocate AP to new safe buffer in PeiMpLib > UefiCpuPkg:Remove code to handle APIC setting and Interrupt > UefiCpuPkg:Rremove code to wakeup AP and relocate ap > UefiCpuPkg: Remove the duplicated mpservice locate > MdeModulePkg: remove MpService2Ppi field in SMM_S3_RESUME_STATE 4) Register table cleanup: Then the patch to remove the assignment for MpService2Ppi will be after the patch to remove the MpService2Ppi field consumption. Also I'll change the title of "UefiCpuPkg: Remove the duplicated mpservice locate" to "UefiCpuPkg: Remove unneeded MpService2Ppi assignment" to make it look clearer. Thanks, Dun From: Ni, Ray Sent: Monday, May 13, 2024 10:36 AM To: Tan, Dun ; devel@edk2.groups.io Cc: Wang, Jian J ; Liming Gao Subject: Re: [PATCH 18/18] MdeModulePkg:Remove MpService2Ppi field in SMM_S3_RESUME_STATE My comment to patch #6 suggested to keep the assignment to SmmS3ResumeState->MpService2Ppi. How about you keep the "SmmS3ResumeState->MpService2Ppi = 0" there and remove that assignment and the field together in this patch? Thanks, Ray ________________________________ From: Tan, Dun > Sent: Friday, May 10, 2024 18:08 To: devel@edk2.groups.io > Cc: Ni, Ray >; Wang, Jian J >; Liming Gao > Subject: [PATCH 18/18] MdeModulePkg:Remove MpService2Ppi field in SMM_S3_RESUME_STATE This MpService2Ppi field in SMM_S3_RESUME_STATE is used to wakeup AP to do the CPU initialization during smm s3 boot when the execution mode of PEI and DXE are the same. Currently, in CpuS3.c of smm cpu driver, BSP doesn't need to wakeup AP anymore. The initialization for AP will be done in S3Resume.c before transfer to CpuS3.c of smm cpu driver. So we can remove the MpService2Ppi field in SMM_S3_RESUME_STATE. Signed-off-by: Dun Tan > Cc: Ray Ni > Cc: Jian J Wang > Cc: Liming Gao > --- MdeModulePkg/Include/Guid/AcpiS3Context.h | 1 - 1 file changed, 1 deletion(-) diff --git a/MdeModulePkg/Include/Guid/AcpiS3Context.h b/MdeModulePkg/Include/Guid/AcpiS3Context.h index 72d173c4fd..0cfc81b49b 100644 --- a/MdeModulePkg/Include/Guid/AcpiS3Context.h +++ b/MdeModulePkg/Include/Guid/AcpiS3Context.h @@ -30,7 +30,6 @@ typedef struct { EFI_PHYSICAL_ADDRESS ReturnContext1; EFI_PHYSICAL_ADDRESS ReturnContext2; EFI_PHYSICAL_ADDRESS ReturnStackPointer; - EFI_PHYSICAL_ADDRESS MpService2Ppi; EFI_PHYSICAL_ADDRESS Smst; } SMM_S3_RESUME_STATE; -- 2.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118854): https://edk2.groups.io/g/devel/message/118854 Mute This Topic: https://groups.io/mt/106018145/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-