From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 5337E7803D1 for ; Wed, 3 Apr 2024 07:50:40 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=f6tupCyenKIrWSI5PXD7e8wxZqkObJhYmEG5tPrkb5A=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1712130638; v=1; b=LYnaB79HllAQzBd95w+7QmA+xzCIhvCiQf3Rm+3MZo2Sj/6VkG9LWepODBLuSd1+J1qoZ8YE ZtkiRA7pKp5kBqTNizklqhSosqLdjMqyVmWhOlTwFV0AJTj+XPGLuC/VeusiaZn5PCqGqf1NnGS j9PUSSDmcbbxgIBmkdJByOYTyAql2b9jUjSIn1JigllwEZRmFy+IFkWkTM3o23NUe8jgxg8sBR+ eJwP2q62NJJ2tGad/bu8v9+/IJGGnPxtE8JnjmZuc/rUz3uCGqaYala2mXu/gv6Qv+1GvOM33fk waooQ3ayxTV1kQKf2wqmKUlmcbanXCN3Up4ZSWxC5bAqw== X-Received: by 127.0.0.2 with SMTP id y0TYYY7687511x5vioWULLFf; Wed, 03 Apr 2024 00:50:38 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by mx.groups.io with SMTP id smtpd.web11.5859.1712130636141857502 for ; Wed, 03 Apr 2024 00:50:38 -0700 X-CSE-ConnectionGUID: nd08wvvoQ6yJS7YNnSBnnw== X-CSE-MsgGUID: ZvSVJnFbQWy/FgmA81ajcg== X-IronPort-AV: E=McAfee;i="6600,9927,11032"; a="10311940" X-IronPort-AV: E=Sophos;i="6.07,176,1708416000"; d="scan'208";a="10311940" X-Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Apr 2024 00:50:38 -0700 X-CSE-ConnectionGUID: j5BzbjH5TsKwVLv59MhHEw== X-CSE-MsgGUID: 32KtrV5rTvytr4tvEeaXDA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,176,1708416000"; d="scan'208";a="18399057" X-Received: from shwdesfp01.ccr.corp.intel.com ([10.239.158.151]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Apr 2024 00:50:36 -0700 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Zhiguang Liu , Liming Gao , Jiaxin Wu , Ray Ni , Laszlo Ersek , Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [PATCH v2 1/6] Revert 2ec8f0c6407f062441b205b900038933865c7b3c Date: Wed, 3 Apr 2024 15:50:12 +0800 Message-Id: <20240403075017.1997-2-zhiguang.liu@intel.com> In-Reply-To: <20240403075017.1997-1-zhiguang.liu@intel.com> References: <20240403075017.1997-1-zhiguang.liu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Wed, 03 Apr 2024 00:50:38 -0700 Resent-From: zhiguang.liu@intel.com Reply-To: devel@edk2.groups.io,zhiguang.liu@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: UZmjNeIgkaijv8zfO3I4p0qbx7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=LYnaB79H; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io This reverts commit "StandaloneMmPkg: Disallow unregister MMI handler in other MMI handler" for better design later. Cc: Liming Gao Cc: Jiaxin Wu Cc: Ray Ni Cc: Laszlo Ersek Cc: Ray Ni Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Sami Mujawar Signed-off-by: Zhiguang Liu --- StandaloneMmPkg/Core/Mmi.c | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/StandaloneMmPkg/Core/Mmi.c b/StandaloneMmPkg/Core/Mmi.c index 9e52072bf7..c1a1d76e85 100644 --- a/StandaloneMmPkg/Core/Mmi.c +++ b/StandaloneMmPkg/Core/Mmi.c @@ -36,9 +36,8 @@ typedef struct { MMI_ENTRY *MmiEntry; } MMI_HANDLER; -LIST_ENTRY mRootMmiHandlerList = INITIALIZE_LIST_HEAD_VARIABLE (mRootMmiHandlerList); -LIST_ENTRY mMmiEntryList = INITIALIZE_LIST_HEAD_VARIABLE (mMmiEntryList); -MMI_HANDLER *mCurrentMmiHandler = NULL; +LIST_ENTRY mRootMmiHandlerList = INITIALIZE_LIST_HEAD_VARIABLE (mRootMmiHandlerList); +LIST_ENTRY mMmiEntryList = INITIALIZE_LIST_HEAD_VARIABLE (mMmiEntryList); /** Finds the MMI entry for the requested handler type. @@ -162,19 +161,13 @@ MmiManage ( // get next node before handler is executed, since LIST_ENTRY that // Link points to may be freed if unregister MMI handler. // - Link = Link->ForwardLink; - // - // Assign gCurrentMmiHandle before calling the MMI handler and - // set to NULL when it returns. - // - mCurrentMmiHandler = MmiHandler; - Status = MmiHandler->Handler ( - (EFI_HANDLE)MmiHandler, - Context, - CommBuffer, - CommBufferSize - ); - mCurrentMmiHandler = NULL; + Link = Link->ForwardLink; + Status = MmiHandler->Handler ( + (EFI_HANDLE)MmiHandler, + Context, + CommBuffer, + CommBufferSize + ); switch (Status) { case EFI_INTERRUPT_PENDING: @@ -321,13 +314,6 @@ MmiHandlerUnRegister ( return EFI_INVALID_PARAMETER; } - // - // Do not allow to unregister MMI Handler inside other MMI Handler - // - if ((mCurrentMmiHandler != NULL) && (mCurrentMmiHandler != MmiHandler)) { - return EFI_INVALID_PARAMETER; - } - MmiEntry = MmiHandler->MmiEntry; RemoveEntryList (&MmiHandler->Link); -- 2.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117349): https://edk2.groups.io/g/devel/message/117349 Mute This Topic: https://groups.io/mt/105304504/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-