Hello,
(+Ard)
this patch does not apply (with "master" being at 74f90d38c446).
Because:
On 05/22/20 00:43, Michael Kubacki wrote:
> diff --git
> a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> index 592862773390..1b18ce655522 100644
> --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> @@ -14,6 +14,7 @@
> # the authentication service provided in this driver will be broken, and
> the behavior is undefined.
> #
> # Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) Microsoft Corporation.<BR>
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
> @@ -42,6 +43,7 @@ [Sources]
> VariableParsing.c
> VariableParsing.h
> Variable.h
> + VariablePolicySmmDxe.c
>
> [Packages]
> MdePkg/MdePkg.dec
> @@ -56,22 +58,29 @@ [LibraryClasses]
> DxeServicesTableLib
> UefiDriverEntryPoint
> TpmMeasurementLib
> + SafeIntLib
> + PcdLib
>
> [Protocols]
> gEfiVariableWriteArchProtocolGuid ## PRODUCES
> gEfiVariableArchProtocolGuid ## PRODUCES
> gEfiSmmCommunicationProtocolGuid ## CONSUMES
> + gEfiMmCommunicationProtocolGuid ## CONSUMES
The context no longer matches here. This context has most recently been
modified by commit be4e0cfbad6b ("MdeModulePkg/VariableSmmRuntimeDxe:
switch to MM communicate 2", 2020-05-12):
$ git show be4e0cfbad6b -- \
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
Output:
> diff --git
> a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> index 592862773390..01564e4c5068 100644
> --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> @@ -60,7 +60,7 @@ [LibraryClasses]
> [Protocols]
> gEfiVariableWriteArchProtocolGuid ## PRODUCES
> gEfiVariableArchProtocolGuid ## PRODUCES
> - gEfiSmmCommunicationProtocolGuid ## CONSUMES
> + gEfiMmCommunication2ProtocolGuid ## CONSUMES
> ## CONSUMES
> ## NOTIFY
> ## UNDEFINED # Used to do smm communication
> @@ -100,7 +100,7 @@ [Guids]
> gEfiImageSecurityDatabaseGuid
>
> [Depex]
> - gEfiSmmCommunicationProtocolGuid
> + gEfiMmCommunication2ProtocolGuid
>
> [UserExtensions.TianoCore."ExtraFiles"]
> VariableSmmRuntimeDxeExtra.uni
And, because of the Depex change in that commit
(gEfiSmmCommunicationProtocolGuid -> gEfiMmCommunication2ProtocolGuid),
the last (4th) hunk of the present patch also fails to apply:
> ## CONSUMES
> ## NOTIFY
> ## UNDEFINED # Used to do smm communication
> gEfiSmmVariableProtocolGuid
> gEdkiiVariableLockProtocolGuid ## PRODUCES
> gEdkiiVarCheckProtocolGuid ## PRODUCES
> + gEdkiiVariablePolicyProtocolGuid ## PRODUCES
>
> [FeaturePcd]
> gEfiMdeModulePkgTokenSpaceGuid.PcdEnableVariableRuntimeCache ##
> CONSUMES
> gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics ##
> CONSUMES
>
> +[Pcd]
> + gEfiMdeModulePkgTokenSpaceGuid.PcdAllowVariablePolicyEnforcementDisable
> ## CONSUMES
> +
> [Guids]
> ## PRODUCES ## GUID # Signature of Variable store header
> ## CONSUMES ## GUID # Signature of Variable store header
> @@ -99,6 +108,8 @@ [Guids]
> ## SOMETIMES_CONSUMES ## Variable:L"dbt"
> gEfiImageSecurityDatabaseGuid
>
> + gVarCheckPolicyLibMmiHandlerGuid
> +
> [Depex]
> gEfiSmmCommunicationProtocolGuid
>
>
See the obsolete depex context above.
Ard had sent a heads-up about this under v2:
b968f054-8917-6c16-e5ff-9976d192d398@arm.com">http://mid.mail-archive.com/b968f054-8917-6c16-e5ff-9976d192d398@arm.com
https://edk2.groups.io/g/devel/message/59259
Please rebase this series to "master" and repost it.
(Of course I suggest waiting some more for v3 feedback; for example I
plan to review the v3 ArmVirtPkg and OvmfPkg patches.)
Thanks!
Laszlo
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#60171): https://edk2.groups.io/g/devel/message/60171
Mute This Topic: https://groups.io/mt/74387419/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
