From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by mx.groups.io with SMTP id smtpd.web09.4990.1654244327568418894 for ; Fri, 03 Jun 2022 01:18:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=t84M/w1t; spf=pass (domain: kernel.org, ip: 145.40.68.75, mailfrom: ardb@kernel.org) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E2FB1B8223C for ; Fri, 3 Jun 2022 08:18:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A781CC385A9 for ; Fri, 3 Jun 2022 08:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654244323; bh=BGkkXstaOtOOBZ7UPMeHMxBwB6pX2Aie7GVpqJg3CBY=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=t84M/w1tb3u4ELqb5D0T6LYzbMFQcXsouFtL9qPnojb3o4qmvVFgUJDDKL+EM09cw noVWvj0j/vjPli+OeEdUtY8/xUAU7GYp6mYPuZHiKvkDLkrsWRpD0KR0o9g6CI7Awx Y7vuzHWojvFYzqb+y69bCD2zoj8cw9lUbwdms0a+Nciyuulk2BUj0x4fHJbFUiQTS9 n/XjADCdjEgOkviA805vmtIrtXKrKkUSHk5CAUwrgi62Ob1Fs9tiCRuGREybFWygVS zoP9Xm0vWrvtL08PDpgVKr2NUVlo84s4Fc4zGrLq5eqmo0HwodAyA7g1oxrJS48/hc hBtdoL5pe6phQ== Received: by mail-oa1-f45.google.com with SMTP id 586e51a60fabf-e93bbb54f9so9741850fac.12 for ; Fri, 03 Jun 2022 01:18:43 -0700 (PDT) X-Gm-Message-State: AOAM533h9KL73dfg+BBuje0huv7eqlmRAJD44k52WLHGZUxSca3czQxU 9ij+V8/beV0qs7RudUT7mE1nb5KpL5hBQDx6G24= X-Google-Smtp-Source: ABdhPJwUHXL+0ZOepXgq9KCY6ptl0+Xd2cey/P/1dC339nuOvbnOf1iJqZgmz9RK8iGQ80BIeC9DkDItt3pMoo17XO4= X-Received: by 2002:a05:6871:5c8:b0:f3:3c1c:126f with SMTP id v8-20020a05687105c800b000f33c1c126fmr4985903oan.126.1654244322898; Fri, 03 Jun 2022 01:18:42 -0700 (PDT) MIME-Version: 1.0 References: <20220602091105.376777-1-kraxel@redhat.com> In-Reply-To: From: "Ard Biesheuvel" Date: Fri, 3 Jun 2022 10:18:31 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2 1/1] OvmfPkg/AmdSev: remove unused SMM bits from .dsc and .fdf files To: Dov Murik Cc: Gerd Hoffmann , edk2-devel-groups-io , James Bottomley , Min Xu , Jiewen Yao , Oliver Steffen , Jordan Justen , Ard Biesheuvel , Erdem Aktas , Pawel Polawski , Tom Lendacky , Brijesh Singh Content-Type: text/plain; charset="UTF-8" On Thu, 2 Jun 2022 at 21:08, Dov Murik wrote: > > Gerd, thanks for the cleanup. > > > Tested-by: Dov Murik > Reviewed-by: Dov Murik > Merged as #2939. Thanks. > > On 02/06/2022 12:11, Gerd Hoffmann wrote: > > Signed-off-by: Gerd Hoffmann > > --- > > OvmfPkg/AmdSev/AmdSevX64.dsc | 47 ------------------------------------ > > OvmfPkg/AmdSev/AmdSevX64.fdf | 15 ------------ > > 2 files changed, 62 deletions(-) > > > > diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc > > index fc1fdb2e2297..6b3827f7f6ed 100644 > > --- a/OvmfPkg/AmdSev/AmdSevX64.dsc > > +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc > > @@ -93,14 +93,6 @@ [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] > > XCODE:*_*_*_MTOC_FLAGS = -align 0x1000 > > CLANGPDB:*_*_*_DLINK_FLAGS = /ALIGN:4096 > > > > -# Force PE/COFF sections to be aligned at 4KB boundaries to support page level > > -# protection of DXE_SMM_DRIVER/SMM_CORE modules > > -[BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE] > > - GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 > > - XCODE:*_*_*_DLINK_FLAGS = -seg1addr 0x1000 -segalign 0x1000 > > - XCODE:*_*_*_MTOC_FLAGS = -align 0x1000 > > - CLANGPDB:*_*_*_DLINK_FLAGS = /ALIGN:4096 > > - > > ################################################################################ > > # > > # SKU Identification section - list of all SKU IDs supported by this Platform. > > @@ -380,45 +372,6 @@ [LibraryClasses.common.UEFI_APPLICATION] > > !endif > > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > > > > -[LibraryClasses.common.DXE_SMM_DRIVER] > > - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > > - TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > > - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf > > - MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf > > - ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf > > - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > > - SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf > > - MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf > > - SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf > > -!ifdef $(DEBUG_ON_SERIAL_PORT) > > - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > > -!else > > - DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > > -!endif > > - CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf > > -!if $(SOURCE_DEBUG_ENABLE) == TRUE > > - DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf > > -!endif > > - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf > > - PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > > - > > -[LibraryClasses.common.SMM_CORE] > > - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > > - TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > > - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf > > - SmmCorePlatformHookLib|MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf > > - MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf > > - ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf > > - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > > - SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf > > - SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf > > -!ifdef $(DEBUG_ON_SERIAL_PORT) > > - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > > -!else > > - DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > > -!endif > > - PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > > - > > ################################################################################ > > # > > # Pcd Section - list of all EDK II PCD Entries defined by this Platform. > > diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf > > index 844ba8a116d8..4658e1d30ed0 100644 > > --- a/OvmfPkg/AmdSev/AmdSevX64.fdf > > +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf > > @@ -436,18 +436,3 @@ [Rule.Common.SEC.RESET_VECTOR] > > FILE RAW = $(NAMED_GUID) { > > RAW BIN Align = 16 |.bin > > } > > - > > -[Rule.Common.SMM_CORE] > > - FILE SMM_CORE = $(NAMED_GUID) { > > - PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi > > - UI STRING="$(MODULE_NAME)" Optional > > - VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) > > - } > > - > > -[Rule.Common.DXE_SMM_DRIVER] > > - FILE SMM = $(NAMED_GUID) { > > - SMM_DEPEX SMM_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex > > - PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi > > - UI STRING="$(MODULE_NAME)" Optional > > - VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) > > - }