Hi&nbsp;<span style="white-space: pre-wrap;">Laszlo,<br /><br />I did the patch mostly following the pattern of this commit: </span><a href="https://github.com/tianocore/edk2/commit/22cedf5bbde616e0369e9f8649964f175a0cb95e">MdeModulePkg/FaultTolerantWriteDxe: factor out boot service accesses &middot; tianocore/edk2@22cedf5 (github.com)</a>. The extra step I made was renaming the&nbsp;<span style="white-space: pre-wrap;">CpuIo2Smm.c to </span><span style="white-space: pre-wrap;">CpuIo2Common.c for semantic reason.</span><br /><br /><span style="white-space: pre-wrap;">The needed changes here are:<br />1. Replacing gSmst with gMmst. Because </span><span style="white-space: pre-wrap;">SmmServicesTableLib does not exist for MM_STANDALONE type drivers, but MmServicesTableLib has </span>library instances for both&nbsp;<span style="white-space: pre-wrap;">MM_STANDALONE and DXE_SMM_DRIVER as is. Both </span><span style="white-space: pre-wrap;">MmServicesTableLib and </span><span style="white-space: pre-wrap;">SmmServicesTableLib</span><span style="white-space: pre-wrap;"> retrieve services table through the same protocol GUID, reference to substantially the same data structure.</span><br /><span style="white-space: pre-wrap;">2. Abstract the driver entry point for Traditional MM and Standalone MM instances. Because these drivers have different entry point interface definitions.</span><br /><br /><span style="white-space: pre-wrap;">I will update the commit message to fix the typo. In addition, I can revert the file renaming change and break the above 2 changes into 2 patches, if that make the git history and review process cleaner.<br /><br />Regards,<br />Kun</span>