From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-x236.google.com (mail-wr0-x236.google.com [IPv6:2a00:1450:400c:c0c::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1B0792095DB8E for ; Tue, 1 Aug 2017 08:16:26 -0700 (PDT) Received: by mail-wr0-x236.google.com with SMTP id y43so8201928wrd.3 for ; Tue, 01 Aug 2017 08:18:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=e1WApgLAPOLp2xTrbD5aA/R1mpTzWEJTDz7bVydtPpA=; b=Tgt9YyA+bbz/qr7BTkNSmB18S3AyoSqH4XEUr0uMjnrw3mI8q11JAskN+9epKCFYIU LrrUVITOGo2fDtgMmJxjHDO0RqA6RxcYVQ2aEomhLhB4hsBxklM35vRfEBG55UoquiqD zDMYwGeAfVWdmdRpEnmCLGC7XNdT3Op/gArDE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=e1WApgLAPOLp2xTrbD5aA/R1mpTzWEJTDz7bVydtPpA=; b=DWjn0PtJmnGHMLHJsQIUKvMTOLwPsJMAVe1P1UIy1QUvKlFBorZYC475dG00BWYxGc iuGKUImhhoqo4SIBE5pE4r+E7+REwJmDTjXAkuQhsEtNUChTzcO3Jt4KQFP2dQ4fRFI4 l0GGUwnup+0VtzD/d6EB6gHDVvf0XGZCa8m9jm1xFST/Abs6lUBYMAsz69yPWdfLwZxW LCkyeJhIsU4EkSW2Axl/PxVSOPFCycqHtgjA4pzWnvNZ2ZLr6J7oJu6fnuM5OICiY27n dPf/Kypcx6aVYOrxEcNHa4WNHFIdNWihbYwevYMgdWDHNr48qSsDTMZ4+PpF/p28VIQ0 LmiA== X-Gm-Message-State: AIVw113MaX0C0QS6VLJ2CBnRYymLVoLQivxxDQbOkkRY4AOnWBzTU1w4 BzAkjHv9QSgKuM96 X-Received: by 10.223.166.173 with SMTP id t42mr15654850wrc.272.1501600713495; Tue, 01 Aug 2017 08:18:33 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id q10sm36878978wrb.3.2017.08.01.08.18.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 08:18:32 -0700 (PDT) Date: Tue, 1 Aug 2017 16:18:31 +0100 From: Leif Lindholm To: Jun Nie Cc: haojian.zhuang@linaro.org, ard.biesheuvel@linaro.org, edk2-devel@lists.01.org, linaro-uefi@lists.linaro.org, shawn.guo@linaro.org, jason.liu@linaro.org Message-ID: <20170801151831.GC26462@bivouac.eciton.net> References: <1501579741-28866-1-git-send-email-jun.nie@linaro.org> <1501579741-28866-2-git-send-email-jun.nie@linaro.org> MIME-Version: 1.0 In-Reply-To: <1501579741-28866-2-git-send-email-jun.nie@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [PATCH v4 2/4] EmbeddedPkg/AndroidFastboot: split android boot header X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2017 15:16:26 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Aug 01, 2017 at 05:28:59PM +0800, Jun Nie wrote: > Split android boot header definition to share code among > different applications and libraries. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Jun Nie > --- > .../Application/AndroidFastboot/AndroidBootImg.c | 35 +++------------ > .../AndroidFastboot/AndroidFastbootApp.h | 1 + > .../AndroidFastboot/Arm/BootAndroidBootImg.c | 2 +- > EmbeddedPkg/Include/Library/AndroidBootImgLib.h | 50 ++++++++++++++++++++++ > 4 files changed, 57 insertions(+), 31 deletions(-) > create mode 100644 EmbeddedPkg/Include/Library/AndroidBootImgLib.h > > diff --git a/EmbeddedPkg/Application/AndroidFastboot/AndroidBootImg.c b/EmbeddedPkg/Application/AndroidFastboot/AndroidBootImg.c > index f3e770b..2f7f093 100644 > --- a/EmbeddedPkg/Application/AndroidFastboot/AndroidBootImg.c > +++ b/EmbeddedPkg/Application/AndroidFastboot/AndroidBootImg.c > @@ -14,32 +14,6 @@ > > #include "AndroidFastbootApp.h" > > -#define BOOT_MAGIC "ANDROID!" > -#define BOOT_MAGIC_LENGTH sizeof (BOOT_MAGIC) - 1 > - > -// Check Val (unsigned) is a power of 2 (has only one bit set) > -#define IS_POWER_OF_2(Val) (Val != 0 && ((Val & (Val - 1)) == 0)) > - > -// No documentation for this really - sizes of fields has been determined > -// empirically. > -#pragma pack(1) > -typedef struct { > - CHAR8 BootMagic[BOOT_MAGIC_LENGTH]; > - UINT32 KernelSize; > - UINT32 KernelAddress; > - UINT32 RamdiskSize; > - UINT32 RamdiskAddress; > - UINT32 SecondStageBootloaderSize; > - UINT32 SecondStageBootloaderAddress; > - UINT32 KernelTaggsAddress; > - UINT32 PageSize; > - UINT32 Reserved[2]; > - CHAR8 ProductName[16]; > - CHAR8 KernelArgs[BOOTIMG_KERNEL_ARGS_SIZE]; > - UINT32 Id[32]; > -} ANDROID_BOOTIMG_HEADER; > -#pragma pack() > - > // Find the kernel and ramdisk in an Android boot.img. > // return EFI_INVALID_PARAMTER if the boot.img is invalid (i.e. doesn't have the > // right magic value), > @@ -64,7 +38,8 @@ ParseAndroidBootImg ( > > Header = (ANDROID_BOOTIMG_HEADER *) BootImg; > > - if (AsciiStrnCmp (Header->BootMagic, BOOT_MAGIC, BOOT_MAGIC_LENGTH) != 0) { > + if (AsciiStrnCmp ((CONST CHAR8 *)Header->BootMagic, ANDROID_BOOT_MAGIC, > + ANDROID_BOOT_MAGIC_LENGTH) != 0) { > return EFI_INVALID_PARAMETER; > } > > @@ -72,7 +47,7 @@ ParseAndroidBootImg ( > return EFI_NOT_FOUND; > } > > - ASSERT (IS_POWER_OF_2 (Header->PageSize)); > + ASSERT (IS_VALID_ANDROID_PAGE_SIZE (Header->PageSize)); So, this change uses the macro that is now only introduced in patch 2/4, and hence this patch breaks bisect. Could you move this change to 3/4 instead? > > *KernelSize = Header->KernelSize; > *Kernel = BootImgBytePtr + Header->PageSize; > @@ -84,8 +59,8 @@ ParseAndroidBootImg ( > + ALIGN_VALUE (Header->KernelSize, Header->PageSize)); > } > > - AsciiStrnCpyS (KernelArgs, BOOTIMG_KERNEL_ARGS_SIZE, Header->KernelArgs, > - BOOTIMG_KERNEL_ARGS_SIZE); > + AsciiStrnCpyS (KernelArgs, ANDROID_BOOTIMG_KERNEL_ARGS_SIZE, Header->KernelArgs, > + ANDROID_BOOTIMG_KERNEL_ARGS_SIZE); > > return EFI_SUCCESS; > } > diff --git a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.h b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.h > index f62660f..e4c5aa3 100644 > --- a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.h > +++ b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.h > @@ -15,6 +15,7 @@ > #ifndef __ANDROID_FASTBOOT_APP_H__ > #define __ANDROID_FASTBOOT_APP_H__ > > +#include > #include > #include > #include > diff --git a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c > index f446cce..1d9024b 100644 > --- a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c > +++ b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c > @@ -112,7 +112,7 @@ BootAndroidBootImg ( > ) > { > EFI_STATUS Status; > - CHAR8 KernelArgs[BOOTIMG_KERNEL_ARGS_SIZE]; > + CHAR8 KernelArgs[ANDROID_BOOTIMG_KERNEL_ARGS_SIZE]; > VOID *Kernel; > UINTN KernelSize; > VOID *Ramdisk; > diff --git a/EmbeddedPkg/Include/Library/AndroidBootImgLib.h b/EmbeddedPkg/Include/Library/AndroidBootImgLib.h > new file mode 100644 > index 0000000..8116c7c > --- /dev/null > +++ b/EmbeddedPkg/Include/Library/AndroidBootImgLib.h > @@ -0,0 +1,50 @@ > +/** @file > + > + Copyright (c) 2013-2014, ARM Ltd. All rights reserved.
> + Copyright (c) 2017, Linaro. > + > + This program and the accompanying materials > + are licensed and made available under the terms and conditions of the BSD License > + which accompanies this distribution. The full text of the license may be found at > + http://opensource.org/licenses/bsd-license.php > + > + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. > + > +**/ > + > +#ifndef __ABOOTIMG_H__ > +#define __ABOOTIMG_H__ > + > +#include > +#include > +#include > + > +#include > +#include > + > +#define ANDROID_BOOTIMG_KERNEL_ARGS_SIZE 512 > + > +#define ANDROID_BOOT_MAGIC "ANDROID!" > +#define ANDROID_BOOT_MAGIC_LENGTH (sizeof (ANDROID_BOOT_MAGIC) - 1) > + > +/* https://android.googlesource.com/platform/system/core/+/master/mkbootimg/bootimg.h */ > +typedef struct { > + UINT8 BootMagic[ANDROID_BOOT_MAGIC_LENGTH]; > + UINT32 KernelSize; > + UINT32 KernelAddress; > + UINT32 RamdiskSize; > + UINT32 RamdiskAddress; > + UINT32 SecondStageBootloaderSize; > + UINT32 SecondStageBootloaderAddress; > + UINT32 KernelTaggsAddress; > + UINT32 PageSize; > + UINT32 Reserved[2]; > + CHAR8 ProductName[16]; > + CHAR8 KernelArgs[ANDROID_BOOTIMG_KERNEL_ARGS_SIZE]; > + UINT32 Id[32]; > +} ANDROID_BOOTIMG_HEADER; The original definition used #pragma pack (1) #pragma pack () around this struct definition. I believe we should maintain that. / Leif > + > +/* Check Val (unsigned) is a power of 2 (has only one bit set) */ > +#define IS_POWER_OF_2(Val) ((Val) != 0 && (((Val) & ((Val) - 1)) == 0)) > +#endif /* __ABOOTIMG_H__ */ > -- > 1.9.1 >