Skip to contentSkip to conversation

EFI urgent fixes

GIT PULL Matt Fleming 2 participants 4 messages Sep 8, 2014 – Sep 9, 2014 EFI

lore
Share & tools
lore
#0 lore raw

Folks,

Please queue up the following fixes, mainly for regressions introduced in the merge window or -rc2.

The following changes since commit 52addcf9d6669fa439387610bc65c92fa0980cef:

Linux 3.17-rc2 (2014-08-25 15:36:20 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git tags/efi-urgent

for you to fetch changes up to 5d6012d8d72b4107bbc68d9e761aa5e2ddd73b05:

efi/arm64: Fix fdt-related memory reservation (2014-09-08 20:52:48 +0100)

----------------------------------------------------------------
* Fix early boot regression affecting x86 EFI boot stub when loading initrds above 4GB - Yinghai Lu

* Relocate GOT entries in the x86 EFI boot stub now that we have symbols with global visibility - Matt Fleming

* Fixes for compiler warnings caused by parameter and variable names shadowing types - Mark Rustad

* General EFI cleanups and simplifications - Mathias Krause

* fdt memory reservation fix for arm64 - Mark Salter

----------------------------------------------------------------
Mark Rustad (1):
efi: Resolve some shadow warnings

Mark Salter (1):
efi/arm64: Fix fdt-related memory reservation

Mathias Krause (4):
x86/efi: Remove unused efi_call* macros
x86/efi: Unexport add_efi_memmap variable
x86/efi: Update comment regarding required phys mapped EFI services x86/efi: Mark initialization code as such

Matt Fleming (1):
x86/efi: Fixup GOT in all boot code paths

Yinghai Lu (1):
x86/efi: Only load initrd above 4g on second try

 arch/arm64/mm/init.c                |  3 +-
 arch/x86/boot/compressed/eboot.c    | 18 +++++++-----
 arch/x86/boot/compressed/head_32.S  | 54 +++++++++++++++++++++++++----------
 arch/x86/boot/compressed/head_64.S  | 56 +++++++++++++++++++++++++++----------
 arch/x86/include/asm/efi.h          | 31 +++++++-------------
 arch/x86/platform/efi/efi.c         | 20 ++++++-------
 arch/x86/platform/efi/efi_32.c      | 12 ++++----
 arch/x86/platform/efi/efi_64.c      |  6 ++--
 arch/x86/platform/efi/efi_stub_32.S |  4 +--
 drivers/firmware/efi/libstub/fdt.c  | 10 ++++++-
 drivers/firmware/efi/vars.c         | 14 +++++-----
 11 files changed, 140 insertions(+), 88 deletions(-)
Signature · 1 line
Matt Fleming, Intel Open Source Technology Center
#1 lore raw
Quoted 4 lines · Matt Fleming

Folks,

Please queue up the following fixes, mainly for regressions introduced in the merge window or -rc2.

So the rule for post-rc1 merges is to fix regressions 'only', not 'mainly'!

Quoted 3 lines

----------------------------------------------------------------
Mark Rustad (1):
efi: Resolve some shadow warnings

That's not a critical regression.

Quoted 3 lines

Mark Salter (1):
efi/arm64: Fix fdt-related memory reservation

That's a regression fix.

Quoted 5 lines

Mathias Krause (4):
x86/efi: Remove unused efi_call* macros
x86/efi: Unexport add_efi_memmap variable
x86/efi: Update comment regarding required phys mapped EFI services x86/efi: Mark initialization code as such

Neither of these 4 changes is a critical regression!

Quoted 2 lines

Matt Fleming (1):
x86/efi: Fixup GOT in all boot code paths

That's a regression fix.

Quoted 2 lines

Yinghai Lu (1):
x86/efi: Only load initrd above 4g on second try

This revert is a regression fix too.

So please only put the 3 regression fixes into efi-urgent, the rest can go into the v3.18 pile.

Thanks,

Ingo

#2 lore raw
Quoted 3 lines · Ingo Molnar

So please only put the 3 regression fixes into efi-urgent, the rest can go into the v3.18 pile.

OK, I'll sort that out.

Signature · 1 line
Matt Fleming, Intel Open Source Technology Center
#3 lore raw
Quoted 6 lines · Matt Fleming
Quoted 3 lines · Ingo Molnar

So please only put the 3 regression fixes into efi-urgent, the rest can go into the v3.18 pile.

OK, I'll sort that out.

Thanks!

Ingo