From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.groups.io with SMTP id smtpd.web10.3912.1574411564004392695 for ; Fri, 22 Nov 2019 00:32:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=sny0IG60; spf=pass (domain: linaro.org, ip: 209.85.128.67, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f67.google.com with SMTP id 8so6603763wmo.0 for ; Fri, 22 Nov 2019 00:32:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=79I3Ic2V10I77aXAaxLnTlMCwmKSY3QddIwpt3lRvNs=; b=sny0IG602J76eStZNe9Ns3BkRFtnF/zIJ5TtD7aifAQqa+Wx2Tp5XiObKMoxar/IZS yeUcAE8blB9mi9nM1eJIptULBSjcZAUJUdS8AAIZKQZ+guH6eyROzVE1hhPm200XbcOu 7NsSoDlnlZ6WL7IULpcL1KHw3lAIwYI83r1BG5BZhTF01/632tH2L7yde3SmBe57pjbA 1T5iK9JxlFy/NX3fDRK7kvWYIl+L3cZF/TKTgU650yVw7hYSGV12otn87iFzoOFHcVMY Dl0qq3EfAmWNiT7JIux9SpoCURjl7VKscbltf3qpszCftz5UU3rgDX6T5Ati68XTAQPu +ykA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=79I3Ic2V10I77aXAaxLnTlMCwmKSY3QddIwpt3lRvNs=; b=eyBVqVHEmAwouKY+oM/Cvr2+JPwBJpvdBb5TKTBpbtlODo/fxFexNwnzEjlGLk6bI0 QtZ5x2ji/cchIE6HBpFrTOO1vVTI3XV/lJVSVfzXvfycp/teLDbjaU/urg53kvY1n1VY BJa7yb+zw7zuaiV8uzbO9gXszM//DG71kwOqTZftZ2R+M/wgZwy+9EoQgIGaAHgAIsAs UtLJUFNE0F4Xhc8gey5LIdEvjpYSZPMfGKHOus19gZuOj0xG0fsZEy1GJ09jVOaaffrq zAlQf5Ob1UKX5xogfofH+zgvY0sm7RuDykO/Pjh8MbGHtuUdA7Azv9nKvL/akb4okYFk jElA== X-Gm-Message-State: APjAAAWriLhhCzqgViyQWcGq6uiBSgs1hfLjuX5zj/xFwD7lp2sR6mDk j1A+vmyr8T4HhIgw0o0uv+3TpYKD+Vvb/7yU X-Google-Smtp-Source: APXvYqwbNURdncTHr/o729ssvVlQz8pN596pRzlhUzA+y1YBzFUJHQ2EhqyGCL17RWBo+kET6QI4ZQ== X-Received: by 2002:a7b:ce11:: with SMTP id m17mr14043260wmc.123.1574411562221; Fri, 22 Nov 2019 00:32:42 -0800 (PST) Return-Path: Received: from sudo.home ([2a01:cb1d:112:6f00:ac04:254:3863:fdeb]) by smtp.gmail.com with ESMTPSA id c15sm7225845wrx.78.2019.11.22.00.32.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Nov 2019 00:32:41 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel , piwg@uefi.org, kimon.berlin@hp.com, eugene@hp.com Subject: [PATCH 2/6] MdeModulePkg/SmmIpl: expose MM communicate 2 protocol Date: Fri, 22 Nov 2019 09:32:30 +0100 Message-Id: <20191122083234.12756-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122083234.12756-1-ard.biesheuvel@linaro.org> References: <20191122083234.12756-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The MM communicate 2 protocol was introduced to factor out the mismatch between traditional MM, which requires the physical address of the MM buffer to be passed, and standalone MM, which copies the MM communicate buffer data into a separate buffer, requiring the virtual address. For this reason, MM communicate 2 carries both addresses, allowing the implementation to decide which address it needs. This hides this implementation detail from the callers of the protocol, which simply passes both addresses without having to reason about what the implementation of the protocol actually needs. Note that the old version of the protocol is retained, in order to support existing implementations that don't require this flexibility. Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c | 79 ++++++++++++++++++++ MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf | 1 + 2 files changed, 80 insertions(+) diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c index 1cf8c93227a3..d86b8b4a6a29 100644 --- a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c +++ b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -118,6 +119,39 @@ SmmCommunicationCommunicate ( IN OUT UINTN *CommSize OPTIONAL ); +/** + Communicates with a registered handler. + + This function provides a service to send and receive messages from a registered UEFI service. + + @param[in] This The EFI_MM_COMMUNICATION_PROTOCOL instance. + @param[in] CommBufferPhysical Physical address of the MM communication buffer + @param[in] CommBufferVirtual Virtual address of the MM communication buffer + @param[in] CommSize The size of the data buffer being passed in. On exit, the size of data + being returned. Zero if the handler does not wish to reply with any data. + This parameter is optional and may be NULL. + + @retval EFI_SUCCESS The message was successfully posted. + @retval EFI_INVALID_PARAMETER The CommBuffer was NULL. + @retval EFI_BAD_BUFFER_SIZE The buffer is too large for the MM implementation. + If this error is returned, the MessageLength field + in the CommBuffer header or the integer pointed by + CommSize, are updated to reflect the maximum payload + size the implementation can accommodate. + @retval EFI_ACCESS_DENIED The CommunicateBuffer parameter or CommSize parameter, + if not omitted, are in address range that cannot be + accessed by the MM environment. + +**/ +EFI_STATUS +EFIAPI +SmmCommunicationMmCommunicate2 ( + IN CONST EFI_MM_COMMUNICATION2_PROTOCOL *This, + IN OUT VOID *CommBufferPhysical, + IN OUT VOID *CommBufferVirtual, + IN OUT UINTN *CommSize OPTIONAL + ); + /** Event notification that is fired every time a gEfiSmmConfigurationProtocol installs. @@ -240,6 +274,13 @@ EFI_SMM_COMMUNICATION_PROTOCOL mSmmCommunication = { SmmCommunicationCommunicate }; +// +// PI 1.7 MM Communication Protocol 2 instance +// +EFI_MM_COMMUNICATION2_PROTOCOL mMmCommunication2 = { + SmmCommunicationMmCommunicate2 +}; + // // SMM Core Private Data structure that contains the data shared between // the SMM IPL and the SMM Core. @@ -576,6 +617,44 @@ SmmCommunicationCommunicate ( return (Status == EFI_SUCCESS) ? EFI_SUCCESS : EFI_NOT_FOUND; } +/** + Communicates with a registered handler. + + This function provides a service to send and receive messages from a registered UEFI service. + + @param[in] This The EFI_MM_COMMUNICATION_PROTOCOL instance. + @param[in] CommBufferPhysical Physical address of the MM communication buffer + @param[in] CommBufferVirtual Virtual address of the MM communication buffer + @param[in] CommSize The size of the data buffer being passed in. On exit, the size of data + being returned. Zero if the handler does not wish to reply with any data. + This parameter is optional and may be NULL. + + @retval EFI_SUCCESS The message was successfully posted. + @retval EFI_INVALID_PARAMETER The CommBuffer was NULL. + @retval EFI_BAD_BUFFER_SIZE The buffer is too large for the MM implementation. + If this error is returned, the MessageLength field + in the CommBuffer header or the integer pointed by + CommSize, are updated to reflect the maximum payload + size the implementation can accommodate. + @retval EFI_ACCESS_DENIED The CommunicateBuffer parameter or CommSize parameter, + if not omitted, are in address range that cannot be + accessed by the MM environment. + +**/ +EFI_STATUS +EFIAPI +SmmCommunicationMmCommunicate2 ( + IN CONST EFI_MM_COMMUNICATION2_PROTOCOL *This, + IN OUT VOID *CommBufferPhysical, + IN OUT VOID *CommBufferVirtual, + IN OUT UINTN *CommSize OPTIONAL + ) +{ + return SmmCommunicationCommunicate (&mSmmCommunication, + CommBufferPhysical, + CommSize); +} + /** Event notification that is fired when GUIDed Event Group is signaled. diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf index b6b1bbcdac51..0a05d593522e 100644 --- a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf +++ b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf @@ -50,6 +50,7 @@ [Protocols] gEfiSmmBase2ProtocolGuid ## PRODUCES gEfiSmmCommunicationProtocolGuid ## PRODUCES + gEfiMmCommunication2ProtocolGuid ## PRODUCES gEfiSmmAccess2ProtocolGuid ## CONSUMES ## NOTIFY ## CONSUMES -- 2.20.1