From patchwork Tue Mar 5 13:32:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 159656 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp4974949jad; Tue, 5 Mar 2019 05:33:11 -0800 (PST) X-Google-Smtp-Source: APXvYqzR6PoXGyeloqXaTp2AmDDKAfh1O38YZDh/8yKi0I8Mpr5VFve/MTimYV+SthMbPuL6SxYz X-Received: by 2002:a17:902:4203:: with SMTP id g3mr1193038pld.99.1551792791728; Tue, 05 Mar 2019 05:33:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551792791; cv=none; d=google.com; s=arc-20160816; b=xOc58hvvUNL56dHz0sPfthskRMwjhQlp894CAyDqp49pgTKuWuDxjXzR+j+iWP1PjT uHb3naTRMyy3Fv7stjhi01BP/FRmZvuptddlTyUEOboK+2SeqLFbQUVulpCei2p6UQx8 lf61FH1x6h3vE4kzX94c7zt1UGZxCL0YhVcDNCb4UBcsESWdTFIpP6oPlznwSKByNVq7 HKGI2Y+j2TXirWFe9JQe5vICBap65qvqwbl/HSgw42sBOEGBVoCslivjhKNkmaEjeYvY hNtM56qeArn0ECJeTQ06s/OY4ZnIRG7QEkemZOI6OZ7pQCtacLJZKSO5m0WmY7YrRiyl JkBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=gFV7NtHUQv3WMIqIC3aTqba8q4Frnc6BCuYUCOolSv0=; b=s9BzXkjo+yu8fFat17mi1YVS8nCzkCkEOwpcfmXC4LUKVvd+r8AzrbwSnj0hylp3oM SZdb9UdXuFMk5N+DyL2UryHfpawwlLCEAEpNbc7kSIHU23GtmLyIcoy5dDCnN57pOP1W VsrW2lm3dxelSFJm7IzQA8eb7c790PLVKgmOwk7dz/w3Sm6GKLWA1Adr8RYF93KRwAuO qLMIEz+yZgKvqUHWTSTIb0pA5gEm+xMPP3+QKRt5wMrv/Cbp1onuEa8yoJYXGgaVOH3P GImomP9sVmxwJHl2nnRcEOG7Zs6vcqkxlmyYPOhu2W0g0H7Q7/GaPeA0pJitxkM193VT icNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=IEhZdSR8; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id j70si7691841pgd.65.2019.03.05.05.33.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 05:33:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=IEhZdSR8; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A3FF0211D5059; Tue, 5 Mar 2019 05:33:03 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::42e; helo=mail-wr1-x42e.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 14831211D5058 for ; Tue, 5 Mar 2019 05:33:03 -0800 (PST) Received: by mail-wr1-x42e.google.com with SMTP id n2so9471066wrw.8 for ; Tue, 05 Mar 2019 05:33:02 -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=P3sj9G00/9dWu6acUoJIoA2/xlbe7ypCq7V6GfrB9FU=; b=IEhZdSR8nT4rUT3O8POQbW+h0jsah4V0WPfk9KCfQKC4JKFwuGggFSz48hjaWzu/3p ltqIq6I+IASwFsQo5BFRbJk6XgH0Zs9v+kS1a4a/y/7hgQk4I+XPyxri8y1jhF+WbezI Obr+7UHkJPahTvHUnLcr8LuOmemrUcHRhmzgetw5DcgbAic7PAOP8UYIGGG5+2DlBqyn sP6G+dA9RUvrtOej1UYhn4zWutHNuh2vMs5suYp0nymrnJeJrEsO7mTc1yhnjdgZMcoh j+VqfGawP9KfhO2lgmdygHbvNobYlG4HfIgv9gVKvkxjbHQ9+r2bbQgo9GqLaFgyntRM t/JQ== 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=P3sj9G00/9dWu6acUoJIoA2/xlbe7ypCq7V6GfrB9FU=; b=QD1hxMLnnlOr/WqgY9ybvnEYL8LOjy1ahmKpEnHuVpAoD9F6/NTNG0/V1TDBTt34SE XEJ98kpsrcItObPWMHk8FUe7lXQu/t6G0mWXg4zcxHbONvS7IEikuwWMqvuyp99cjGRE 4th9Tgq1ohjPczrVfXMRF3v/kzzAYtcOreiy5ixsduZDIaOtU7xyeqm/K4O2zXGbBtRc 6Vll/CR8H3ttZo791dLnaAu1qyFklULjhQzkySB9FPmrOPsgWY/QSqQOeD1GwduT0U9z qtrhqffCLLOg6+VAEa87JKQQj3krpGCYy2bzJ06fapUSVux2ETIy3cJCzf0vM/BKfSpP xrog== X-Gm-Message-State: APjAAAXluCyJGR3+LTtqwlkdP/qAwVCSKIuxx6WxZLo3BWdLO4TPIk7B gQAgP32rPumjBoKGbbhRV36fk0pNC1k= X-Received: by 2002:adf:e9c2:: with SMTP id l2mr15763195wrn.315.1551792780962; Tue, 05 Mar 2019 05:33:00 -0800 (PST) Received: from localhost.localdomain (aputeaux-684-1-18-114.w90-86.abo.wanadoo.fr. [90.86.221.114]) by smtp.gmail.com with ESMTPSA id i4sm8370097wrw.19.2019.03.05.05.32.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 05:33:00 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 5 Mar 2019 14:32:42 +0100 Message-Id: <20190305133248.4828-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305133248.4828-1-ard.biesheuvel@linaro.org> References: <20190305133248.4828-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH 04/10] StandaloneMmPkg: remove redundant StandaloneMmDriverEntryPoint driver X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" StandaloneMmDriverEntryPoint is implemented in MdePkg now, so let's drop the redundant StandaloneMmPkg version. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf | 41 -------- StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.c | 99 -------------------- 2 files changed, 140 deletions(-) -- 2.20.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: jiewen.yao@intel.com diff --git a/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf b/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf deleted file mode 100644 index 4d1896db10ba..000000000000 --- a/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf +++ /dev/null @@ -1,41 +0,0 @@ -## @file -# Module entry point library for Standalone MM driver. -# -# Copyright (c) 2015, Intel Corporation. All rights reserved.
-# Copyright (c) 2016-2018, ARM Ltd. All rights reserved.
-# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php. -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -# -## - -[Defines] - INF_VERSION = 0x0001001A - BASE_NAME = StandaloneMmDriverEntryPoint - FILE_GUID = BBC33478-98F8-4B78-B29D-574D681B7E43 - MODULE_TYPE = MM_STANDALONE - VERSION_STRING = 1.0 - PI_SPECIFICATION_VERSION = 0x00010032 - LIBRARY_CLASS = StandaloneMmDriverEntryPoint|MM_STANDALONE - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 IPF EBC -# - -[Sources] - StandaloneMmDriverEntryPoint.c - -[Packages] - MdePkg/MdePkg.dec - -[LibraryClasses] - BaseLib - DebugLib - diff --git a/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.c b/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.c deleted file mode 100644 index 64bffcfccc8a..000000000000 --- a/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.c +++ /dev/null @@ -1,99 +0,0 @@ -/** @file - Entry point to a Standalone MM driver. - -Copyright (c) 2015, Intel Corporation. All rights reserved.
-Copyright (c) 2016 - 2018, ARM Ltd. All rights reserved.
- -This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#include - -#include -#include - -VOID -EFIAPI -ProcessLibraryConstructorList ( - IN EFI_HANDLE ImageHandle, - IN IN EFI_MM_SYSTEM_TABLE *MmSystemTable - ); - -EFI_STATUS -EFIAPI -ProcessModuleEntryPointList ( - IN EFI_HANDLE ImageHandle, - IN IN EFI_MM_SYSTEM_TABLE *MmSystemTable - ); - -VOID -EFIAPI -ProcessLibraryDestructorList ( - IN EFI_HANDLE ImageHandle, - IN IN EFI_MM_SYSTEM_TABLE *MmSystemTable - ); - -/** - The entry point of PE/COFF Image for a Standalone MM Driver. - - This function is the entry point for a Standalone MM Driver. - This function must call ProcessLibraryConstructorList() and - ProcessModuleEntryPointList(). - If the return status from ProcessModuleEntryPointList() - is an error status, then ProcessLibraryDestructorList() must be called. - The return value from ProcessModuleEntryPointList() is returned. - If _gDriverUnloadImageCount is greater than zero, then an unload - handler must be registered for this image - and the unload handler must invoke ProcessModuleUnloadList(). - If _gUefiDriverRevision is not zero and SystemTable->Hdr.Revision is less - than _gUefiDriverRevison, then return EFI_INCOMPATIBLE_VERSION. - - - @param ImageHandle The image handle of the Standalone MM Driver. - @param SystemTable A pointer to the EFI System Table. - - @retval EFI_SUCCESS The Standalone MM Driver exited normally. - @retval EFI_INCOMPATIBLE_VERSION _gUefiDriverRevision is greater than - SystemTable->Hdr.Revision. - @retval Other Return value from ProcessModuleEntryPointList(). - -**/ -EFI_STATUS -EFIAPI -_ModuleEntryPoint ( - IN EFI_HANDLE ImageHandle, - IN IN EFI_MM_SYSTEM_TABLE *MmSystemTable - ) -{ - EFI_STATUS Status; - - // - // Call constructor for all libraries - // - ProcessLibraryConstructorList (ImageHandle, MmSystemTable); - - // - // Call the driver entry point - // - Status = ProcessModuleEntryPointList (ImageHandle, MmSystemTable); - - // - // If all of the drivers returned errors, then invoke all of the library destructors - // - if (EFI_ERROR (Status)) { - ProcessLibraryDestructorList (ImageHandle, MmSystemTable); - } - - // - // Return the cumulative return status code from all of the driver entry points - // - return Status; -} -