Hi Jeff, Thank you for this patch. I have some minor updates like removing ssdtpcieosctemplate_aml_code[] from SsdtPcieGenerator.h as it has been moved to SsdtPcieSupportLibPrivate.h, and adding SsdtPcieSupportLib to DynamicTables.dsc.inc so that the Package Dsc build succeeds. Otherwise, these changes look good to me. I will make the changes locally before pushing. Reviewed-by: Sami Mujawar Regards, Sami Mujawar