Skip to contentSkip to conversation

EFI changes for v5.1

GIT PULL Merged Ingo Molnar 3 participants 4 messages Mar 5, 2019 – Mar 6, 2019 EFI

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest efi-core-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git efi-core-for-linus

# HEAD: 5c418dc789a3898717ebf2caa5716ba91a7150b2 efi: Fix build error due to enum collision between efi.h and ima.h

The main EFI changes in this cycle were:

- Move BGRT table handling to earlier in the boot so we don't overwrite it
- Use 32-bit alignment for efi_guid_t
- Allow the SetVirtualAddressMap() call to be omitted
- Implement earlycon=efifb based on existing earlyprintk code
- Various minor fixes and code cleanups from Sai, Ard and me

Thanks,

Ingo

------------------>
Anders Roxell (1):
efi: Fix build error due to enum collision between efi.h and ima.h

Ard Biesheuvel (6):
efi/memattr: Don't bail on zero VA if it equals the region's PA
efi: Use 32-bit alignment for efi_guid_t
efi: Replace GPL license boilerplate with SPDX headers efi/arm/arm64: Allow SetVirtualAddressMap() to be omitted
x86: Make ARCH_USE_MEMREMAP_PROT a generic Kconfig symbol efi/x86: Convert x86 EFI earlyprintk into generic earlycon implementation

Ingo Molnar (1):
efi/fdt: Apply more cleanups

Sai Praneeth Prakhya (1):
x86/efi: Mark can_free_region() as an __init function

 Documentation/admin-guide/kernel-parameters.txt |   8 +-
 arch/Kconfig                                    |   3 +
 arch/x86/Kconfig                                |   5 +-
 arch/x86/Kconfig.debug                          |  10 -
 arch/x86/include/asm/efi.h                      |   1 -
 arch/x86/kernel/early_printk.c                  |   4 -
 arch/x86/mm/ioremap.c                           |   4 +-
 arch/x86/platform/efi/Makefile                  |   1 -
 arch/x86/platform/efi/early_printk.c            | 240 ------------------------
 arch/x86/platform/efi/quirks.c                  |   6 +-
 drivers/firmware/efi/Kconfig                    |   6 +
 drivers/firmware/efi/Makefile                   |   1 +
 drivers/firmware/efi/apple-properties.c         |  13 +-
 drivers/firmware/efi/arm-init.c                 |   6 +-
 drivers/firmware/efi/arm-runtime.c              |   6 +-
 drivers/firmware/efi/capsule-loader.c           |   4 +-
 drivers/firmware/efi/capsule.c                  |   4 +-
 drivers/firmware/efi/cper-arm.c                 |  14 +-
 drivers/firmware/efi/cper.c                     |  14 +-
 drivers/firmware/efi/dev-path-parser.c          |   9 +-
 drivers/firmware/efi/earlycon.c                 | 206 ++++++++++++++++++++
 drivers/firmware/efi/efi-bgrt.c                 |   5 +-
 drivers/firmware/efi/efi-pstore.c               |   2 +
 drivers/firmware/efi/efibc.c                    |  10 +-
 drivers/firmware/efi/efivars.c                  |  58 +-----
 drivers/firmware/efi/esrt.c                     |   1 +
 drivers/firmware/efi/fake_mem.c                 |  16 +-
 drivers/firmware/efi/libstub/Makefile           |   4 +-
 drivers/firmware/efi/libstub/arm-stub.c         |   5 +
 drivers/firmware/efi/libstub/arm32-stub.c       |   6 +-
 drivers/firmware/efi/libstub/arm64-stub.c       |   6 +-
 drivers/firmware/efi/libstub/efi-stub-helper.c  |  15 +-
 drivers/firmware/efi/libstub/efistub.h          |  12 ++
 drivers/firmware/efi/libstub/fdt.c              | 115 ++++++------
 drivers/firmware/efi/libstub/gop.c              |   4 +-
 drivers/firmware/efi/libstub/random.c           |   6 +-
 drivers/firmware/efi/libstub/secureboot.c       |   4 +-
 drivers/firmware/efi/libstub/tpm.c              |   4 +-
 drivers/firmware/efi/memattr.c                  |   7 +-
 drivers/firmware/efi/runtime-map.c              |   3 +-
 drivers/firmware/efi/runtime-wrappers.c         |  48 ++---
 drivers/firmware/efi/test/efi_test.c            |   1 +
 drivers/firmware/efi/test/efi_test.h            |   2 +-
 drivers/firmware/efi/tpm.c                      |   5 +-
 drivers/firmware/efi/vars.c                     |  15 +-
 include/linux/efi.h                             |  41 ++--
 46 files changed, 393 insertions(+), 567 deletions(-)
 delete mode 100644 arch/x86/platform/efi/early_printk.c
 create mode 100644 drivers/firmware/efi/earlycon.c
#1 lore raw

Hi ingo,

Quoted 5 lines · Ingo Molnar

Linus,

Please pull the latest efi-core-for-linus git tree from:

Quoted 7 lines

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git efi-core-for-linus

# HEAD: 5c418dc789a3898717ebf2caa5716ba91a7150b2 efi: Fix build error due to enum collision between efi.h and ima.h

The main EFI changes in this cycle were:

- Move BGRT table handling to earlier in the boot so we don't overwrite it

This one actually got reverted because it broke x86. I haven't heard back from the Intel engineers that reported the issue, so i will revisit this at a later date.

Quoted 78 lines

- Use 32-bit alignment for efi_guid_t
- Allow the SetVirtualAddressMap() call to be omitted
- Implement earlycon=efifb based on existing earlyprintk code
- Various minor fixes and code cleanups from Sai, Ard and me

Thanks,

Ingo

------------------>
Anders Roxell (1):
efi: Fix build error due to enum collision between efi.h and ima.h

Ard Biesheuvel (6):
efi/memattr: Don't bail on zero VA if it equals the region's PA
efi: Use 32-bit alignment for efi_guid_t
efi: Replace GPL license boilerplate with SPDX headers efi/arm/arm64: Allow SetVirtualAddressMap() to be omitted
x86: Make ARCH_USE_MEMREMAP_PROT a generic Kconfig symbol efi/x86: Convert x86 EFI earlyprintk into generic earlycon implementation

Ingo Molnar (1):
efi/fdt: Apply more cleanups

Sai Praneeth Prakhya (1):
x86/efi: Mark can_free_region() as an __init function

 Documentation/admin-guide/kernel-parameters.txt |   8 +-
 arch/Kconfig                                    |   3 +
 arch/x86/Kconfig                                |   5 +-
 arch/x86/Kconfig.debug                          |  10 -
 arch/x86/include/asm/efi.h                      |   1 -
 arch/x86/kernel/early_printk.c                  |   4 -
 arch/x86/mm/ioremap.c                           |   4 +-
 arch/x86/platform/efi/Makefile                  |   1 -
 arch/x86/platform/efi/early_printk.c            | 240 ------------------------
 arch/x86/platform/efi/quirks.c                  |   6 +-
 drivers/firmware/efi/Kconfig                    |   6 +
 drivers/firmware/efi/Makefile                   |   1 +
 drivers/firmware/efi/apple-properties.c         |  13 +-
 drivers/firmware/efi/arm-init.c                 |   6 +-
 drivers/firmware/efi/arm-runtime.c              |   6 +-
 drivers/firmware/efi/capsule-loader.c           |   4 +-
 drivers/firmware/efi/capsule.c                  |   4 +-
 drivers/firmware/efi/cper-arm.c                 |  14 +-
 drivers/firmware/efi/cper.c                     |  14 +-
 drivers/firmware/efi/dev-path-parser.c          |   9 +-
 drivers/firmware/efi/earlycon.c                 | 206 ++++++++++++++++++++
 drivers/firmware/efi/efi-bgrt.c                 |   5 +-
 drivers/firmware/efi/efi-pstore.c               |   2 +
 drivers/firmware/efi/efibc.c                    |  10 +-
 drivers/firmware/efi/efivars.c                  |  58 +-----
 drivers/firmware/efi/esrt.c                     |   1 +
 drivers/firmware/efi/fake_mem.c                 |  16 +-
 drivers/firmware/efi/libstub/Makefile           |   4 +-
 drivers/firmware/efi/libstub/arm-stub.c         |   5 +
 drivers/firmware/efi/libstub/arm32-stub.c       |   6 +-
 drivers/firmware/efi/libstub/arm64-stub.c       |   6 +-
 drivers/firmware/efi/libstub/efi-stub-helper.c  |  15 +-
 drivers/firmware/efi/libstub/efistub.h          |  12 ++
 drivers/firmware/efi/libstub/fdt.c              | 115 ++++++------
 drivers/firmware/efi/libstub/gop.c              |   4 +-
 drivers/firmware/efi/libstub/random.c           |   6 +-
 drivers/firmware/efi/libstub/secureboot.c       |   4 +-
 drivers/firmware/efi/libstub/tpm.c              |   4 +-
 drivers/firmware/efi/memattr.c                  |   7 +-
 drivers/firmware/efi/runtime-map.c              |   3 +-
 drivers/firmware/efi/runtime-wrappers.c         |  48 ++---
 drivers/firmware/efi/test/efi_test.c            |   1 +
 drivers/firmware/efi/test/efi_test.h            |   2 +-
 drivers/firmware/efi/tpm.c                      |   5 +-
 drivers/firmware/efi/vars.c                     |  15 +-
 include/linux/efi.h                             |  41 ++--
 46 files changed, 393 insertions(+), 567 deletions(-)
 delete mode 100644 arch/x86/platform/efi/early_printk.c
 create mode 100644 drivers/firmware/efi/earlycon.c
#2 lore raw
Quoted 12 lines · Ard Biesheuvel

Hi ingo,

Quoted 9 lines · Ingo Molnar

Linus,

Please pull the latest efi-core-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git efi-core-for-linus

# HEAD: 5c418dc789a3898717ebf2caa5716ba91a7150b2 efi: Fix build error due to enum collision between efi.h and ima.h

Quoted 7 lines
Quoted 3 lines

The main EFI changes in this cycle were:

- Move BGRT table handling to earlier in the boot so we don't overwrite it

This one actually got reverted because it broke x86. I haven't heard back from the Intel engineers that reported the issue, so i will revisit this at a later date.

Indeed, and I applied the revert and then promptly forgot about it...

So the real changelog is:

- Use 32-bit alignment for efi_guid_t
- Allow the SetVirtualAddressMap() call to be omitted
- Implement earlycon=efifb based on existing earlyprintk code
- Various minor fixes and code cleanups from Sai, Ard and me

Sorry and thanks,

Ingo

merge bot Merged
#3 lore raw
In reply to Ingo Molnar
The pull request you sent on Tue, 5 Mar 2019 13:20:38 +0100:

The pull request you sent on Tue, 5 Mar 2019 13:20:38 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git efi-core-for-linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/c8f5ed6ef972ed4fd10b0c2e2baec3b6803d3c73

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker