From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.79]) by mx.groups.io with SMTP id smtpd.web10.167.1630450109795156272 for ; Tue, 31 Aug 2021 15:48:30 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@nvidia.com header.s=selector2 header.b=nL2jbEvm; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nvidia.com, ip: 40.107.244.79, mailfrom: jbrasen@nvidia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GKrBw5DrmrqVGJnKbJnBx+sK4Xoq/6T8v8rtB50W7OC+zRz5htehKqHpjeOmtf5/BLymd3p24R/T/t7ovaox02cXrDCX77JDBtcKo3XBBnJst7BDoGvTyp24hqh6lk9IfSGLfr5RN56CVHPb6+3PU/LoZ6aKguFFJxqB1IdUZhQKcGW0jFVr/lCzzbEL6yqWle7DUbyhzEpNFNmCuJBsGRM4PxC5mc1a6FhKLSkwt7rZJMnsucMEFcS09li+l8YJ/2GCQhpLcc0QrsGWEL8MMpfd8yRg1rR/dKkUrvFqKxCAcJUIttMCrr22WEm2sK01bvnCxOkTuz0xFdVgsQ0OjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=OI6iH3agYoHQ9Umdbl48qv8Wb1AVCaa4ycXAJEgwQhc=; b=XozdHWZ+DasJOT+5DBFhF2Qh4NaCtX9tox1norXZ+s0OTtKc6C1eJE4crZRBn5QHu43ENg+qZNjpB8lhK75XaGqcJHqpYPdyNuh+slDlHVHO90aAAJyyfwXBiODVmU/0Y+uDcEpwhiWz48DwHSwbH+WBHGBSsKGCDXDQXl771D5jXuGyUZK/2waShPm0itH/a7YH55AvlCtzR84yW2kbZOTY8WgXYjV5k1tthiKv2Z/F9IBnXS8nVlvCfriadsBN4PaffboneuugjnKjjTBTwB5EsJ4g9wPthJqFHB2/gc7sqF7tNJGb1DCpqGLY78geCrlm862NgUFZsOLR8dahbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.32) smtp.rcpttodomain=hpe.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OI6iH3agYoHQ9Umdbl48qv8Wb1AVCaa4ycXAJEgwQhc=; b=nL2jbEvmQc7nrLobbQNZ1wkM7Wpa1YeJdTmxX+afgDSs9xYtMKQ/m6RDItHfVahRD3/IUCKkShto3B2WuKA5Wu2Jliew1YZQbBhKgmgiIzautVQJ/KNfBeY/qqySQ8EYo1NG7s8nwCODWMk89/TYFsJVRN6VdPdrkD8Y1HIu995jhNbLMN5MzLfpT0SL5g5zLKrfWaHJTZ5c1mRqcZ1HBvRL7kmwejGUktAVC3JjRfgkGRGhbK6zuBLev5dFvbBeqF5ycjR4YQzkJe73aoorgqKcQ4xFsZ78cMFl6MgtOHiuaRdEBc2UxDNJupzQH0V7iFXsUl88SqVPxIIISDNZtQ== Received: from BN9PR03CA0477.namprd03.prod.outlook.com (2603:10b6:408:139::32) by MN2PR12MB4271.namprd12.prod.outlook.com (2603:10b6:208:1d7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17; Tue, 31 Aug 2021 22:48:28 +0000 Received: from BN8NAM11FT029.eop-nam11.prod.protection.outlook.com (2603:10b6:408:139:cafe::97) by BN9PR03CA0477.outlook.office365.com (2603:10b6:408:139::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17 via Frontend Transport; Tue, 31 Aug 2021 22:48:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.32) smtp.mailfrom=nvidia.com; hpe.com; dkim=none (message not signed) header.d=none;hpe.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.32 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.32; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.32) by BN8NAM11FT029.mail.protection.outlook.com (10.13.177.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 31 Aug 2021 22:48:28 +0000 Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 31 Aug 2021 15:48:27 -0700 Received: from build-jbrasen-20210819T103534360.nvidia.com (172.20.187.6) by mail.nvidia.com (172.20.187.15) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 31 Aug 2021 15:48:27 -0700 From: "Jeff Brasen" To: CC: , , , , Jeff Brasen Subject: [PATCH 1/1] EmbeddedPkg: Add LoadFile2 for linux initrd Date: Tue, 31 Aug 2021 22:48:11 +0000 Message-ID: <747e079edeaca7c1864005ec711b7689e107c34f.1630449811.git.jbrasen@nvidia.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 In-Reply-To: References: X-NVConfidentiality: public Return-Path: jbrasen@nvidia.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 45c40cb8-3f2b-453a-6558-08d96cd172f2 X-MS-TrafficTypeDiagnostic: MN2PR12MB4271: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wAPo4sfn2uMktlg5YMNKctzDqoT75kZs9fGM+oH/LyiAftKXlw71KNL6zFXjzzZR6pjSySevxcIwoEb9YizcTpu4Be2Zqho9Z4hyq14E2XgWwNpwRmnlkOZxpu8BYkfRDVJ706MrK3nY5PLKvQ9geC2Cxfq+Ijp8dkVwFJ82R3QFiXckUpyV+R0EFaGEkUPBcaJ3BLGmoIQlyOOZIMYMwupdmIQqRyQWbAuXQTXtTsz2aw4D5bZKCehfL5CKhPT0PKHi5w6Dn7oF9XQu6p08DS43LqaJ76kXqlJmywEtjSTRIsCOyMPGDrx171LqTUYzZUE2bY9Wyd3HnaUZ3UfmSZkh9SZm6a9dk4i3fGYxDpPGsU/Bh2KVESDEAE5Dhw96uWNzbNLsFpx9g2t1bpTwXHR1J/Nr9CMN4J1YMKZ/e18vlGNDy0dmywTyMm5QuElVFm0IjFjTrtCMO3rLuoE076akTQnNUXpQOQT5D4Xt+PRPfP6J/Cz2qTWsM40/BA5A4v3wKSXvXevESb/EIybCq6O2OXEucnCMnOUPKPTag84rwd2kBwyp+qAL0V2R95LJIEVwhxJvxLbxGMz3NQUU9Sd8UsBjs/IKtA5BAW5iAkFVYUNXV/lhSZ1O6U0OMHefl4mBXAJ68r1Hp+UwMafxnwJiCrV6C2GHEA//uUxculvcbx7YV5kX68AOv+3gDKmk+lZ/a+mJ/IeEYah9bYwjWHOUptyAmCQTe+07/AZB1ao= X-Forefront-Antispam-Report: CIP:216.228.112.32;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:schybrid01.nvidia.com;CAT:NONE;SFS:(4636009)(376002)(136003)(39860400002)(346002)(396003)(46966006)(36840700001)(8936002)(83380400001)(47076005)(478600001)(426003)(107886003)(8676002)(336012)(82310400003)(6916009)(7636003)(82740400003)(2906002)(356005)(36756003)(36860700001)(70586007)(2616005)(86362001)(7696005)(26005)(186003)(54906003)(6666004)(296002)(316002)(70206006)(19627235002)(4326008)(5660300002)(44824005);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 22:48:28.0526 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 45c40cb8-3f2b-453a-6558-08d96cd172f2 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.112.32];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT029.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4271 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Add support under a pcd feature for using the new interface to pass initrd to the linux kernel. Signed-off-by: Jeff Brasen --- EmbeddedPkg/EmbeddedPkg.dec | 1 + .../AndroidBootImgLib/AndroidBootImgLib.inf | 3 + .../AndroidBootImgLib/AndroidBootImgLib.c | 147 ++++++++++++++++-- 3 files changed, 142 insertions(+), 9 deletions(-) diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec index c2068ce5a8ce..7638aaaadeb8 100644 --- a/EmbeddedPkg/EmbeddedPkg.dec +++ b/EmbeddedPkg/EmbeddedPkg.dec @@ -86,6 +86,7 @@ [Ppis] [PcdsFeatureFlag.common] gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob|FALSE|BO= OLEAN|0x0000001b gEmbeddedTokenSpaceGuid.PcdGdbSerial|FALSE|BOOLEAN|0x00000053 + gEmbeddedTokenSpaceGuid.PcdAndroidBootLoadFile2|FALSE|BOOLEAN|0x0000005b =20 [PcdsFixedAtBuild.common] gEmbeddedTokenSpaceGuid.PcdPrePiStackBase|0|UINT32|0x0000000b diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.inf b/= EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.inf index bfed4ba9dcd4..39d8abe72cd1 100644 --- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.inf +++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.inf @@ -42,3 +42,6 @@ [Protocols] =20 [Guids] gFdtTableGuid + +[FeaturePcd] + gEmbeddedTokenSpaceGuid.PcdAndroidBootLoadFile2 diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/Em= beddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c index bbc240c3632a..255996e65bdc 100644 --- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c +++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c @@ -10,11 +10,15 @@ #include #include #include +#include #include #include =20 #include #include +#include + +#include =20 #include =20 @@ -25,7 +29,14 @@ typedef struct { EFI_DEVICE_PATH_PROTOCOL End; } MEMORY_DEVICE_PATH; =20 +typedef struct { + VENDOR_DEVICE_PATH VenMediaNode; + EFI_DEVICE_PATH_PROTOCOL EndNode; +} RAMDISK_DEVICE_PATH; + STATIC ANDROID_BOOTIMG_PROTOCOL *mAndroidBootImg; +STATIC EFI_PHYSICAL_ADDRESS mRamdiskData =3D 0; +STATIC UINT64 mRamdiskSize =3D 0; =20 STATIC CONST MEMORY_DEVICE_PATH mMemoryDevicePathTemplate =3D { @@ -48,6 +59,96 @@ STATIC CONST MEMORY_DEVICE_PATH mMemoryDevicePathTemplat= e =3D } // End }; =20 +STATIC RAMDISK_DEVICE_PATH mRamdiskDevicePath =3D +{ + { + { + MEDIA_DEVICE_PATH, + MEDIA_VENDOR_DP, + { sizeof (VENDOR_DEVICE_PATH), 0 } + }, + LINUX_EFI_INITRD_MEDIA_GUID + }, + { + END_DEVICE_PATH_TYPE, + END_ENTIRE_DEVICE_PATH_SUBTYPE, + { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 } + } +}; + +/** + Causes the driver to load a specified file. + + @param This Protocol instance pointer. + @param FilePath The device specific path of the file to load. + @param BootPolicy Should always be FALSE. + @param BufferSize On input the size of Buffer in bytes. On output with = a return + code of EFI_SUCCESS, the amount of data transferred t= o + Buffer. On output with a return code of EFI_BUFFER_TO= O_SMALL, + the size of Buffer required to retrieve the requested= file. + @param Buffer The memory buffer to transfer the file to. IF Buffer = is NULL, + then no the size of the requested file is returned in + BufferSize. + + @retval EFI_SUCCESS The file was loaded. + @retval EFI_UNSUPPORTED BootPolicy is TRUE. + @retval EFI_INVALID_PARAMETER FilePath is not a valid device path, or + BufferSize is NULL. + @retval EFI_NO_MEDIA No medium was present to load the file. + @retval EFI_DEVICE_ERROR The file was not loaded due to a device er= ror. + @retval EFI_NO_RESPONSE The remote system did not respond. + @retval EFI_NOT_FOUND The file was not found + @retval EFI_ABORTED The file load process was manually cancele= d. + @retval EFI_BUFFER_TOO_SMALL The BufferSize is too small to read the cu= rrent + directory entry. BufferSize has been updat= ed with + the size needed to complete the request. + + +**/ +EFI_STATUS +EFIAPI +AndroidBootImgLoadFile2 ( + IN EFI_LOAD_FILE2_PROTOCOL *This, + IN EFI_DEVICE_PATH_PROTOCOL *FilePath, + IN BOOLEAN BootPolicy, + IN OUT UINTN *BufferSize, + IN VOID *Buffer OPTIONAL + ) + +{ + // Verify if the valid parameters + if (This =3D=3D NULL || BufferSize =3D=3D NULL || FilePath =3D=3D NULL |= | !IsDevicePathValid (FilePath, 0)) { + return EFI_INVALID_PARAMETER; + } + + if (BootPolicy) { + return EFI_UNSUPPORTED; + } + + // Check if the given buffer size is big enough + // EFI_BUFFER_TOO_SMALL gets boot manager allocate a bigger buffer + if (mRamdiskSize =3D=3D 0) { + return EFI_NOT_FOUND; + } + if (Buffer =3D=3D NULL || *BufferSize < mRamdiskSize) { + *BufferSize =3D mRamdiskSize; + return EFI_BUFFER_TOO_SMALL; + } + + // Copy InitRd + gBS->CopyMem (Buffer, (VOID *)mRamdiskData, mRamdiskSize); + + return EFI_SUCCESS; +} + +/// +/// Load File Protocol instance +/// +GLOBAL_REMOVE_IF_UNREFERENCED +EFI_LOAD_FILE2_PROTOCOL mAndroidBootImgLoadFile2 =3D { + AndroidBootImgLoadFile2 +}; + EFI_STATUS AndroidBootImgGetImgSize ( IN VOID *BootImg, @@ -383,6 +484,7 @@ AndroidBootImgBoot ( VOID *RamdiskData; UINTN RamdiskSize; IN VOID *FdtBase; + EFI_HANDLE RamdiskHandle; =20 Status =3D gBS->LocateProtocol (&gAndroidBootImgProtocolGuid, NULL, (VOID **) &mAndroidBootImg); @@ -420,16 +522,32 @@ AndroidBootImgBoot ( return Status; } =20 - Status =3D AndroidBootImgLocateFdt (Buffer, &FdtBase); - if (EFI_ERROR (Status)) { - FreePool (NewKernelArg); - return Status; - } + if (FeaturePcdGet (PcdAndroidBootLoadFile2)) { + RamdiskHandle =3D 0; + mRamdiskData =3D (EFI_PHYSICAL_ADDRESS)RamdiskData; + mRamdiskSize =3D RamdiskSize; + Status =3D gBS->InstallMultipleProtocolInterfaces (&RamdiskHandle, + &gEfiLoadFile2Protoco= lGuid, + &mAndroidBootImgLoadF= ile2, + &gEfiDevicePathProtoc= olGuid, + &mRamdiskDevicePath, + NULL); + if (EFI_ERROR (Status)) { + FreePool (NewKernelArg); + return Status; + } + } else { + Status =3D AndroidBootImgLocateFdt (Buffer, &FdtBase); + if (EFI_ERROR (Status)) { + FreePool (NewKernelArg); + return Status; + } =20 - Status =3D AndroidBootImgUpdateFdt (Buffer, FdtBase, RamdiskData, Ramdis= kSize); - if (EFI_ERROR (Status)) { - FreePool (NewKernelArg); - return Status; + Status =3D AndroidBootImgUpdateFdt (Buffer, FdtBase, RamdiskData, Ramd= iskSize); + if (EFI_ERROR (Status)) { + FreePool (NewKernelArg); + return Status; + } } =20 KernelDevicePath =3D mMemoryDevicePathTemplate; @@ -466,5 +584,16 @@ AndroidBootImgBoot ( Status =3D gBS->StartImage (ImageHandle, NULL, NULL); // Clear the Watchdog Timer if the image returns gBS->SetWatchdogTimer (0, 0x10000, 0, NULL); + + if (FeaturePcdGet (PcdAndroidBootLoadFile2)) { + mRamdiskData =3D 0; + mRamdiskSize =3D 0; + gBS->UninstallMultipleProtocolInterfaces (RamdiskHandle, + &gEfiLoadFile2ProtocolGuid, + &mAndroidBootImgLoadFile2, + &gEfiDevicePathProtocolGuid, + &mRamdiskDevicePath, + NULL); + } return EFI_SUCCESS; } --=20 2.17.1