From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=maggie.chu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id DD3E92119BBD9 for ; Mon, 24 Dec 2018 21:55:09 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Dec 2018 21:55:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,395,1539673200"; d="scan'208";a="304840938" Received: from chumaggi-mobl.gar.corp.intel.com ([10.5.244.212]) by fmsmga006.fm.intel.com with ESMTP; 24 Dec 2018 21:55:06 -0800 From: Maggie Chu To: edk2-devel@lists.01.org Cc: Chao Zhang , Jiewen Yao , Eric Dong Date: Tue, 25 Dec 2018 13:54:25 +0800 Message-Id: <20181225055425.22216-1-maggie.chu@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 Subject: [PATCH] SecurityPkg: Incorrect warning message for Opal admin revert action 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: , X-List-Received-Date: Tue, 25 Dec 2018 05:55:10 -0000 https://bugzilla.tianocore.org/show_bug.cgi?id=1421 "revert action will take long time..." warning should be removed from pop up message when keep user data selected. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Maggie Chu Cc: Chao Zhang Cc: Jiewen Yao Cc: Eric Dong --- SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c index e3f5056953..38268539fb 100644 --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c @@ -1537,7 +1537,8 @@ ProcessOpalRequestRevert ( PopUpString = OpalGetPopUpString (Dev, RequestString); - if (Dev->OpalDisk.EstimateTimeCost > MAX_ACCEPTABLE_REVERTING_TIME) { + if ((!KeepUserData) && + (Dev->OpalDisk.EstimateTimeCost > MAX_ACCEPTABLE_REVERTING_TIME)) { BufferSize = StrSize (L"Warning: Revert action will take about ####### seconds, DO NOT power off system during the revert action!"); PopUpString2 = AllocateZeroPool (BufferSize); ASSERT (PopUpString2 != NULL); -- 2.16.2.windows.1