From nobody Sun Feb 8 18:48:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40166+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40166+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557284521; cv=none; d=zoho.com; s=zohoarc; b=PamkEXOYIOB/081eH3HRZKN/A/eZpCX5ih75b7sNIPWJqlFbpISVSdMGgPNPUIEtQnrWXBMdkNu3W2NgA45uUEs4WNv9wwwgA0yf/t5ZUIXR8EKOEMBn/yG+xd+VI0wOL/hL8GuJL4DIbfo2bLaSqlF+6qflJS0L9bG6i9Qp3fY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557284521; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=LcT5WWuVFNCjF9Tfl8aiXqG2JdXbjJbFkV0YBPF0uqY=; b=QOAwKWqBIORtXy5WQCn58ba/wxCMiBlvf5N89BOx/h09vfo+iDojhU2ANvCRagY2yts5HwhLpblbLQSMYTCnmVI/VaovACbo8qlKQTQfOMcHMMW0Z+zw2qZvRslF++q74hs08Q3oNnDKwKCpVyX5DhPNCc8HnAoBCmtkYkG2iWg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40166+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557284520828447.5429143861048; Tue, 7 May 2019 20:02:00 -0700 (PDT) Return-Path: X-Received: from mga03.intel.com (mga03.intel.com []) by groups.io with SMTP; Tue, 07 May 2019 20:01:59 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 May 2019 20:01:54 -0700 X-ExtLoop1: 1 X-Received: from ydong10-win10.ccr.corp.intel.com ([10.239.158.133]) by fmsmga008.fm.intel.com with ESMTP; 07 May 2019 20:01:54 -0700 From: "Dong, Eric" To: devel@edk2.groups.io Cc: Hao Wu Subject: [edk2-devel] [Patch v2 2/3] SecurityPkg/OpalPassword: Change send BlockSID policy. Date: Wed, 8 May 2019 11:01:49 +0800 Message-Id: <20190508030150.3968-3-eric.dong@intel.com> In-Reply-To: <20190508030150.3968-1-eric.dong@intel.com> References: <20190508030150.3968-1-eric.dong@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,eric.dong@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557284520; bh=E6vEKJI76aZypCHfS0tEGt1puHOvMHPc3P33uaj0cXU=; h=Cc:Date:From:Reply-To:Subject:To; b=e392oEpHJU1tXtxsx3+b/eFGnD6+jRs8mq87eNM8CSUT2e+Pt1iQxuoeqE9EnAoYEOj EI59w22KYulZbTiSM9kTysaGdYRbdZ7C6NzdCuN8gFlL6nBBBE5y7hkMbApw+kvFlAHvL bTIEBShtZFhjhBJCVrJFfCCVN1ZgaTvDki4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D1782 Change Send BlockSID command time from ReadyToBoot to EndOfDxe. Signed-off-by: Eric Dong Cc: Hao Wu Reviewed-by: Hao A Wu --- .../Tcg/Opal/OpalPassword/OpalDriver.c | 104 ++++++++---------- 1 file changed, 46 insertions(+), 58 deletions(-) diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c b/SecurityPkg/T= cg/Opal/OpalPassword/OpalDriver.c index 42999c89f0..009a97f66f 100644 --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c @@ -424,6 +424,47 @@ BuildOpalDeviceInfo ( FreePool (S3InitDevices); } =20 +/** + + Send BlockSid command if needed. + +**/ +VOID +SendBlockSidCommand ( + VOID + ) +{ + OPAL_DRIVER_DEVICE *Itr; + TCG_RESULT Result; + OPAL_SESSION Session; + UINT32 PpStorageFlag; + + PpStorageFlag =3D Tcg2PhysicalPresenceLibGetManagementFlags (); + if ((PpStorageFlag & TCG2_BIOS_STORAGE_MANAGEMENT_FLAG_ENABLE_BLOCK_SID)= !=3D 0) { + // + // Send BlockSID command to each Opal disk + // + Itr =3D mOpalDriver.DeviceList; + while (Itr !=3D NULL) { + if (Itr->OpalDisk.SupportedAttributes.BlockSid) { + ZeroMem(&Session, sizeof(Session)); + Session.Sscp =3D Itr->OpalDisk.Sscp; + Session.MediaId =3D Itr->OpalDisk.MediaId; + Session.OpalBaseComId =3D Itr->OpalDisk.OpalBaseComId; + + DEBUG ((DEBUG_INFO, "OpalPassword: EndOfDxe point, send BlockSid c= ommand to device!\n")); + Result =3D OpalBlockSid (&Session, TRUE); // HardwareReset must a= lways be TRUE + if (Result !=3D TcgResultSuccess) { + DEBUG ((DEBUG_ERROR, "OpalBlockSid fail\n")); + break; + } + } + + Itr =3D Itr->Next; + } + } +} + /** Notification function of EFI_END_OF_DXE_EVENT_GROUP_GUID event group. =20 @@ -475,6 +516,11 @@ OpalEndOfDxeEventNotify ( TmpDev =3D TmpDev->Next; } =20 + // + // Send BlockSid command if needed. + // + SendBlockSidCommand (); + DEBUG ((DEBUG_INFO, "%a() - exit\n", __FUNCTION__)); =20 gBS->CloseEvent (Event); @@ -2262,53 +2308,6 @@ OpalDriverGetDeviceList( return mOpalDriver.DeviceList; } =20 -/** - ReadyToBoot callback to send BlockSid command. - - @param Event Pointer to this event - @param Context Event handler private Data - -**/ -VOID -EFIAPI -ReadyToBootCallback ( - IN EFI_EVENT Event, - IN VOID *Context - ) -{ - OPAL_DRIVER_DEVICE *Itr; - TCG_RESULT Result; - OPAL_SESSION Session; - UINT32 PpStorageFlag; - - gBS->CloseEvent (Event); - - PpStorageFlag =3D Tcg2PhysicalPresenceLibGetManagementFlags (); - if ((PpStorageFlag & TCG2_BIOS_STORAGE_MANAGEMENT_FLAG_ENABLE_BLOCK_SID)= !=3D 0) { - // - // Send BlockSID command to each Opal disk - // - Itr =3D mOpalDriver.DeviceList; - while (Itr !=3D NULL) { - if (Itr->OpalDisk.SupportedAttributes.BlockSid) { - ZeroMem(&Session, sizeof(Session)); - Session.Sscp =3D Itr->OpalDisk.Sscp; - Session.MediaId =3D Itr->OpalDisk.MediaId; - Session.OpalBaseComId =3D Itr->OpalDisk.OpalBaseComId; - - DEBUG ((DEBUG_INFO, "OpalPassword: ReadyToBoot point, send BlockSi= d command to device!\n")); - Result =3D OpalBlockSid (&Session, TRUE); // HardwareReset must a= lways be TRUE - if (Result !=3D TcgResultSuccess) { - DEBUG ((DEBUG_ERROR, "OpalBlockSid fail\n")); - break; - } - } - - Itr =3D Itr->Next; - } - } -} - /** Stop this Controller. =20 @@ -2571,7 +2570,6 @@ EfiDriverEntryPoint( ) { EFI_STATUS Status; - EFI_EVENT ReadyToBootEvent; EFI_EVENT EndOfDxeEvent; =20 Status =3D EfiLibInstallDriverBindingComponentName2 ( @@ -2604,16 +2602,6 @@ EfiDriverEntryPoint( ); ASSERT_EFI_ERROR (Status); =20 - // - // register a ReadyToBoot event callback for sending BlockSid command - // - Status =3D EfiCreateEventReadyToBootEx ( - TPL_CALLBACK, - ReadyToBootCallback, - (VOID *) &ImageHandle, - &ReadyToBootEvent - ); - // // Install Hii packages. // --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40166): https://edk2.groups.io/g/devel/message/40166 Mute This Topic: https://groups.io/mt/31539609/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-