From nobody Fri May 17 04:59:50 2024 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+41322+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+41322+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558688551; cv=none; d=zoho.com; s=zohoarc; b=MDGPDS15iG1KQcYtKj5BHTt728O0HPk4oGkZkxWoSNPNz8DnwDUAbe4hfPV+9mDbVf6rofFQpACO8QOppJl79FvhdaLNhBf++axPx7crh2nze/KPZYsseOg1khiEuE5FxwfuZpb3L83co+G5Yq2ZzpGNSJuIV09OZ6Cex3EXONY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558688551; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=+ebv27ABssULbqwfl13qLZ+DWxS/juLJzwGO/rpu6UM=; b=InB4M25ciBGVGZrJTmMlve6rpgCMh5LaWFJeEuXlIu2O8ygwFKxxoQfDroW5j0FUMLQQSOehrSllIObWZ4spykjIpQx6yCV8AY0F56WytfsCXbGf4vuAU09jXu2wFTbO3ZcbX5TJLOvTkK6dwwF5UqPBrBlGWw1bhkB8fesRGm4= 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+41322+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 1558688551333640.0718980247368; Fri, 24 May 2019 02:02:31 -0700 (PDT) Return-Path: X-Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by groups.io with SMTP; Fri, 24 May 2019 02:02:30 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 May 2019 02:02:29 -0700 X-ExtLoop1: 1 X-Received: from shwdeopenpsi174.ccr.corp.intel.com ([10.239.157.33]) by orsmga005.jf.intel.com with ESMTP; 24 May 2019 02:02:28 -0700 From: "Xu, Wei6" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu , Chao B Zhang , Wei6 Xu Subject: [edk2-devel][Patch] MdeModulePkg/CapsuleApp: Enhance Capsule-On-Disk related functions. Date: Fri, 24 May 2019 17:02:07 +0800 Message-Id: <20190524090207.19728-1-wei6.xu@intel.com> 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,wei6.xu@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558688550; bh=wls28pR9tLiMpI9Xl0F7VOVdlfY0fcDv4WFUyaRXGYc=; h=Cc:Date:From:Reply-To:Subject:To; b=w3vtDe7O/moO5r+94u5ncL3oYuRCZ2eZhFcBfDqHUCWRxiMig+hyt6+ZRV5VeMrZixQ kF4TdRc1uLqX8mKO4R1AGnx1f047YZwPpq10D6MOdwVlIQ0nbyfkjTE4VH66Cc508dBqp MAAGAB60W4WQwUR12ad0HWK5hWPptvmpGQ4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1840 1. Add missing '\n' in usage. 2. Fix the dead loop of CapsuleApp -L. 3. Fix the bug that CapsuleApp -OD cannot perform capsules in sub- folder. 4. Optimize the handling for option -NR and -OD to support both 'CapsuleApp -OD -NR' and 'CapsuleApp -NR -OD'. 5. Check if Capsule-On-Disk is supported by "OsIndicationsSupported" variable firstly before processing capsules. If not supported, prompt an error message and quit the process. Cc: Jian J Wang Cc: Hao A Wu Cc: Chao B Zhang Signed-off-by: Wei6 Xu Acked-by: Hao A Wu Reviewed-by: Chao Zhang --- MdeModulePkg/Application/CapsuleApp/CapsuleApp.c | 41 ++++++++-------- MdeModulePkg/Application/CapsuleApp/CapsuleDump.c | 4 +- .../Application/CapsuleApp/CapsuleOnDisk.c | 56 ++++++++++++++++++= +++- 3 files changed, 77 insertions(+), 24 deletions(-) diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c b/MdeModulePk= g/Application/CapsuleApp/CapsuleApp.c index e3c591dbf3..0b5f7c8684 100644 --- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c +++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c @@ -847,11 +847,11 @@ PrintUsage ( Print(L" CapsuleApp -D \n"); Print(L" CapsuleApp -P GET -O \n"); Print(L"Parameter:\n"); Print(L" -NR: No reset will be triggered for the capsule\n"); Print(L" with CAPSULE_FLAGS_PERSIST_ACROSS_RESET and without CAPSU= LE_FLAGS_INITIATE_RESET.\n"); - Print(L" -OD: Delivery of Capsules via file on Mass Storage device."); + Print(L" -OD: Delivery of Capsules via file on Mass Storage device.\n"); Print(L" -S: Dump capsule report variable (EFI_CAPSULE_REPORT_GUID),\n= "); Print(L" which is defined in UEFI specification.\n"); Print(L" -C: Clear capsule report variable (EFI_CAPSULE_REPORT_GUID),\= n"); Print(L" which is defined in UEFI specification.\n"); Print(L" -P: Dump UEFI FMP protocol info, or get image with specified\= n"); @@ -1018,44 +1018,43 @@ UefiMain ( ParaNrIndex =3D Index; NoReset =3D TRUE; } } =20 - if (ParaOdIndex !=3D 0) { - if (ParaOdIndex =3D=3D Argc - 1) { + if (ParaOdIndex > ParaNrIndex) { + if (ParaNrIndex !=3D 0) { + CapsuleLastIndex =3D ParaNrIndex - 1; + } else { + CapsuleLastIndex =3D ParaOdIndex - 1; + } + + if (ParaOdIndex =3D=3D Argc -1) { MapFsStr =3D NULL; } else if (ParaOdIndex =3D=3D Argc - 2) { MapFsStr =3D Argv[Argc-1]; } else { - Print (L"CapsuleApp: Invalid Position for -OD Options\n"); + Print (L"CapsuleApp: Cannot specify more than one FS mapping!\n"); Status =3D EFI_INVALID_PARAMETER; goto Done; } - - if (ParaNrIndex !=3D 0) { - if (ParaNrIndex + 1 =3D=3D ParaOdIndex) { - CapsuleLastIndex =3D ParaNrIndex - 1; - } else { - Print (L"CapsuleApp: Invalid Position for -NR Options\n"); - Status =3D EFI_INVALID_PARAMETER; - goto Done; - } - } else { + } else if (ParaOdIndex < ParaNrIndex) { + if (ParaOdIndex !=3D 0) { CapsuleLastIndex =3D ParaOdIndex - 1; - } - } else { - if (ParaNrIndex !=3D 0) { - if (ParaNrIndex =3D=3D Argc -1) { - CapsuleLastIndex =3D ParaNrIndex - 1; + if (ParaOdIndex =3D=3D ParaNrIndex - 1) { + MapFsStr =3D NULL; + } else if (ParaOdIndex =3D=3D ParaNrIndex - 2) { + MapFsStr =3D Argv[ParaOdIndex + 1]; } else { - Print (L"CapsuleApp: Invalid Position for -NR Options\n"); + Print (L"CapsuleApp: Cannot specify more than one FS mapping!\n"); Status =3D EFI_INVALID_PARAMETER; goto Done; } } else { - CapsuleLastIndex =3D Argc - 1; + CapsuleLastIndex =3D ParaNrIndex - 1; } + } else { + CapsuleLastIndex =3D Argc - 1; } =20 CapsuleNum =3D CapsuleLastIndex - CapsuleFirstIndex + 1; =20 if (CapsuleFirstIndex > CapsuleLastIndex) { diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c b/MdeModuleP= kg/Application/CapsuleApp/CapsuleDump.c index b81c5b7b3a..0e0c566702 100644 --- a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c +++ b/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c @@ -810,12 +810,12 @@ DumpCapsuleFromDisk ( } =20 // // Get file count first // + Status =3D FileHandleFindFirstFile (DirHandle, &FileInfo); do { - Status =3D FileHandleFindFirstFile (DirHandle, &FileInfo); if (EFI_ERROR (Status) || FileInfo =3D=3D NULL) { Print (L"Get File Info Fail. Status =3D %r\n", Status); goto Done; } =20 @@ -844,12 +844,12 @@ DumpCapsuleFromDisk ( NoFile =3D FALSE; =20 // // Get all file info // + Status =3D FileHandleFindFirstFile (DirHandle, &FileInfo); do { - Status =3D FileHandleFindFirstFile (DirHandle, &FileInfo); if (EFI_ERROR (Status) || FileInfo =3D=3D NULL) { Print (L"Get File Info Fail. Status =3D %r\n", Status); goto Done; } =20 diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c b/MdeModul= ePkg/Application/CapsuleApp/CapsuleOnDisk.c index a11683d66c..df43a436f2 100644 --- a/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c +++ b/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c @@ -21,10 +21,12 @@ #include #include #include #include =20 +#define MAX_CAPSULE_NUM 10 + EFI_GUID mCapsuleOnDiskBootOptionGuid =3D { 0x4CC29BB7, 0x2413, 0x40A2, { = 0xB0, 0x6D, 0x25, 0x3E, 0x37, 0x10, 0xF5, 0x32 } }; =20 /** Get shell protocol. =20 @@ -742,10 +744,45 @@ SetCapsuleStatusVariable ( ); =20 return Status; } =20 +/** + Check if Capsule On Disk is supported. + + @retval TRUE Capsule On Disk is supported. + @retval FALSE Capsule On Disk is not supported. + +**/ +BOOLEAN +IsCapsuleOnDiskSupported ( + VOID + ) +{ + EFI_STATUS Status; + UINT64 OsIndicationsSupported; + UINTN DataSize; + + DataSize =3D sizeof(UINT64); + Status =3D gRT->GetVariable ( + L"OsIndicationsSupported", + &gEfiGlobalVariableGuid, + NULL, + &DataSize, + &OsIndicationsSupported + ); + if (EFI_ERROR (Status)) { + return FALSE; + } + + if (OsIndicationsSupported & EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SU= PPORTED) { + return TRUE; + } + + return FALSE; +} + /** Process Capsule On Disk. =20 @param[in] CapsuleBuffer An array of pointer to capsule images @param[in] CapsuleBufferSize An array of UINTN to capsule images size @@ -768,10 +805,20 @@ ProcessCapsuleOnDisk ( { EFI_STATUS Status; UINT16 BootNext; EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *Fs; BOOLEAN UpdateBootNext; + CHAR16 *FileName[MAX_CAPSULE_NUM]; + UINTN Index; + + // + // Check if Capsule On Disk is supported + // + if (!IsCapsuleOnDiskSupported ()) { + Print (L"CapsuleApp: Capsule On Disk is not supported.\n"); + return EFI_UNSUPPORTED; + } =20 // // Get a valid file system from boot path // Fs =3D NULL; @@ -780,14 +827,21 @@ ProcessCapsuleOnDisk ( if (EFI_ERROR (Status)) { Print (L"CapsuleApp: cannot find a valid file system on boot devies. S= tatus =3D %r\n", Status); return Status; } =20 + // + // Get file name from file path + // + for (Index =3D 0; Index < CapsuleNum; Index ++) { + FileName[Index] =3D GetFileNameFromPath (FilePath[Index]); + } + // // Copy capsule image to '\efi\UpdateCapsule\' // - Status =3D WriteUpdateFile (CapsuleBuffer, CapsuleBufferSize, FilePath, = CapsuleNum, Fs); + Status =3D WriteUpdateFile (CapsuleBuffer, CapsuleBufferSize, FileName, = CapsuleNum, Fs); if (EFI_ERROR (Status)) { Print (L"CapsuleApp: capsule image could not be copied for update.\n"); return Status; } =20 --=20 2.16.2.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 (#41322): https://edk2.groups.io/g/devel/message/41322 Mute This Topic: https://groups.io/mt/31742703/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-