On Wed, Jul 15, 2015 at 03:11:19PM +0100, Matt Fleming wrote: > On Fri, 19 Jun, at 01:25:31PM, Michael Brown wrote: > > > > You are right; this change can safely be reverted. Sorry for the noise. > > Guys, this is what I'm going to queue up for v4.3. My plan is to let it > bake in linux-next for a while, to try and shake out any problems. > > Interestingly, I'm not sure that the size of the bzImage is actually > guaranteed to be a multiple of 32, since it appears that > arch/x86/boot/tools/build.c only deals with 16-byte "paragraphs". > > --- > > From 809ca3d4eac5836e5f48c19f28babff1e5b71c77 Mon Sep 17 00:00:00 2001 > From: Matt Fleming <matt.fleming@xxxxxxxxx> > Date: Wed, 15 Jul 2015 14:05:53 +0100 > Subject: [PATCH] Revert "x86/efi: Request desired alignment via the PE/COFF > headers" > > This reverts commit aeffc4928ea21aab3c7be72f00e257799b661c29. > > Linn reports that Signtool complains that kernels built with > CONFIG_EFI_STUB are violating the PE/COFF specification because the > SizeOfImage field is not a multiple of SectionAlignment. Thanks Matt. The actual problem causing the failure in Signtool is that FileAlignment is less than 512 and not equal to SectionAlignment. Reverting the commit fixes this problem as well. The spec says that FileAlignment should be a power of 2 between 512 and 64K, but Signtool accepts other values when it is equal to SectionAlignment. > This violation was introduced as an optimisation to skip having the > kernel relocate itself during boot and instead have the firmware place > it at a correctly aligned address. > > No one else has complained and I'm not aware of any firmware > implementations that refuse to boot with commit aeffc4928ea2, but it's a > legitimate bug, so revert the offending commit. > > Reported-by: Linn Crosetto <linn@xxxxxx> > Cc: Michael Brown <mbrown@xxxxxxxxxxxxxxxx> > Signed-off-by: Matt Fleming <matt.fleming@xxxxxxxxx> > --- > arch/x86/boot/header.S | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S > index 16ef02596db2..7a6d43a554d7 100644 > --- a/arch/x86/boot/header.S > +++ b/arch/x86/boot/header.S > @@ -154,7 +154,7 @@ extra_header_fields: > #else > .quad 0 # ImageBase > #endif > - .long CONFIG_PHYSICAL_ALIGN # SectionAlignment > + .long 0x20 # SectionAlignment > .long 0x20 # FileAlignment > .word 0 # MajorOperatingSystemVersion > .word 0 # MinorOperatingSystemVersion Reviewed-by: Linn Crosetto <linn@xxxxxx> -- Linn Crosetto Linux for HP Helion OpenStack -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
