Skip to contentSkip to conversation

EFI changes

GIT PULL Matt Fleming 2 participants 6 messages Oct 28, 2013 – Oct 29, 2013 EFI

lore
Share & tools
lore
#0 lore raw

This is a respin of the EFI earlyprintk support with the fix for the allmodconfig build breakage that Ingo reported.

The following changes since commit c158c3bf59951bbb44bd7ccca9e6665dfd1617c5:

boot, efi: Remove redundant memset() (2013-10-04 20:07:47 +0100)

are available in the git repository at:

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

for you to fetch changes up to 265434a91cf3377d65dc2b6d80065271514b5696:

x86/efi: Add EFI framebuffer earlyprintk support (2013-10-28 11:57:58 +0000)

----------------------------------------------------------------
* Add support for earlyprintk=efi which uses the EFI framebuffer. Very useful for debugging boot issues.

----------------------------------------------------------------
Matt Fleming (2):
efi: Add asm-generic/efi.h for non-x86 x86/efi: Add EFI framebuffer earlyprintk support

 Documentation/kernel-parameters.txt  |   8 +-
 arch/ia64/include/asm/efi.h          |   6 ++
 arch/x86/Kconfig.debug               |  10 ++
 arch/x86/boot/compressed/eboot.c     |   1 -
 arch/x86/include/asm/efi.h           |  12 +++
 arch/x86/kernel/early_printk.c       |   6 ++
 arch/x86/kernel/setup.c              |   1 -
 arch/x86/platform/efi/Makefile       |   1 +
 arch/x86/platform/efi/early_printk.c | 191 +++++++++++++++++++++++++++++++++++
 arch/x86/platform/efi/efi.c          |   1 -
 arch/x86/platform/efi/efi_32.c       |   1 -
 arch/x86/platform/efi/efi_64.c       |   1 -
 arch/x86/platform/uv/bios_uv.c       |   1 -
 include/asm-generic/efi.h            |  17 ++++
 include/linux/efi.h                  |  31 +-----
 15 files changed, 250 insertions(+), 38 deletions(-)
 create mode 100644 arch/ia64/include/asm/efi.h
 create mode 100644 arch/x86/platform/efi/early_printk.c
 create mode 100644 include/asm-generic/efi.h
Signature · 1 line
Matt Fleming, Intel Open Source Technology Center
#1 lore raw
Quoted 35 lines · Matt Fleming

This is a respin of the EFI earlyprintk support with the fix for the allmodconfig build breakage that Ingo reported.

The following changes since commit c158c3bf59951bbb44bd7ccca9e6665dfd1617c5:

boot, efi: Remove redundant memset() (2013-10-04 20:07:47 +0100)

are available in the git repository at:

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

for you to fetch changes up to 265434a91cf3377d65dc2b6d80065271514b5696:

x86/efi: Add EFI framebuffer earlyprintk support (2013-10-28 11:57:58 +0000)

----------------------------------------------------------------
* Add support for earlyprintk=efi which uses the EFI framebuffer. Very useful for debugging boot issues.

----------------------------------------------------------------
Matt Fleming (2):
efi: Add asm-generic/efi.h for non-x86 x86/efi: Add EFI framebuffer earlyprintk support

 Documentation/kernel-parameters.txt  |   8 +-
 arch/ia64/include/asm/efi.h          |   6 ++
 arch/x86/Kconfig.debug               |  10 ++
 arch/x86/boot/compressed/eboot.c     |   1 -
 arch/x86/include/asm/efi.h           |  12 +++
 arch/x86/kernel/early_printk.c       |   6 ++
 arch/x86/kernel/setup.c              |   1 -
 arch/x86/platform/efi/Makefile       |   1 +
 arch/x86/platform/efi/early_printk.c | 191 +++++++++++++++++++++++++++++++++++
 arch/x86/platform/efi/efi.c          |   1 -
 arch/x86/platform/efi/efi_32.c       |   1 -
Quoted 8 lines
 arch/x86/platform/efi/efi_64.c       |   1 -
 arch/x86/platform/uv/bios_uv.c       |   1 -
 include/asm-generic/efi.h            |  17 ++++
 include/linux/efi.h                  |  31 +-----
 15 files changed, 250 insertions(+), 38 deletions(-)
 create mode 100644 arch/ia64/include/asm/efi.h
 create mode 100644 arch/x86/platform/efi/early_printk.c
 create mode 100644 include/asm-generic/efi.h

and this breaks the ARM build:

In file included from /home/mingo/tip/init/main.c:44:
/home/mingo/tip/include/linux/efi.h:842:21: error: asm/efi.h: No such file or directory /home/mingo/tip/init/main.c: In function 'start_kernel':
/home/mingo/tip/init/main.c:638: error: implicit declaration of function 'efi_enabled' /home/mingo/tip/init/main.c:639: error: implicit declaration of function 'efi_late_init' /home/mingo/tip/init/main.c:640: error: implicit declaration of function 'efi_free_boot_services'

Thanks,

Ingo

#2 lore raw
Quoted 8 lines · Ingo Molnar

and this breaks the ARM build:

In file included from /home/mingo/tip/init/main.c:44:
/home/mingo/tip/include/linux/efi.h:842:21: error: asm/efi.h: No such file or directory /home/mingo/tip/init/main.c: In function 'start_kernel':
/home/mingo/tip/init/main.c:638: error: implicit declaration of function 'efi_enabled' /home/mingo/tip/init/main.c:639: error: implicit declaration of function 'efi_late_init' /home/mingo/tip/init/main.c:640: error: implicit declaration of function 'efi_free_boot_services'

Ah, that's my own fault because my 'next' branch doesn't include the ARM EFI support. Where did you get the patches from? Are they in linux-next?

I'm inclined to drop the cleanup patch for now and do it later, once things have settled because it's also causing conflicts for Borislav's work.

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

and this breaks the ARM build:

In file included from /home/mingo/tip/init/main.c:44:
/home/mingo/tip/include/linux/efi.h:842:21: error: asm/efi.h: No such file or directory /home/mingo/tip/init/main.c: In function 'start_kernel':
/home/mingo/tip/init/main.c:638: error: implicit declaration of function 'efi_enabled' /home/mingo/tip/init/main.c:639: error: implicit declaration of function 'efi_late_init' /home/mingo/tip/init/main.c:640: error: implicit declaration of function 'efi_free_boot_services'

Quoted 3 lines

Ah, that's my own fault because my 'next' branch doesn't include the ARM EFI support. Where did you get the patches from? Are they in linux-next?

It's all in tip:x86/efi.

Quoted 3 lines

I'm inclined to drop the cleanup patch for now and do it later, once things have settled because it's also causing conflicts for Borislav's work.

Sure.

Thanks,

Ingo

#4 lore raw
Quoted 17 lines · Ingo Molnar
Quoted 10 lines · Matt Fleming
Quoted 8 lines · Ingo Molnar

and this breaks the ARM build:

In file included from /home/mingo/tip/init/main.c:44:
/home/mingo/tip/include/linux/efi.h:842:21: error: asm/efi.h: No such file or directory /home/mingo/tip/init/main.c: In function 'start_kernel':
/home/mingo/tip/init/main.c:638: error: implicit declaration of function 'efi_enabled' /home/mingo/tip/init/main.c:639: error: implicit declaration of function 'efi_late_init' /home/mingo/tip/init/main.c:640: error: implicit declaration of function 'efi_free_boot_services'

Quoted 3 lines

Ah, that's my own fault because my 'next' branch doesn't include the ARM EFI support. Where did you get the patches from? Are they in linux-next?

Quoted 7 lines

It's all in tip:x86/efi.

Quoted 3 lines

I'm inclined to drop the cleanup patch for now and do it later, once things have settled because it's also causing conflicts for Borislav's work.

Sure.

OK, I've pushed out the 'next' branch and retagged it as 'efi-next' (again), which hopefully should be finally free from build errors.

Signature · 1 line
Matt Fleming, Intel Open Source Technology Center
#5 lore raw
Quoted 20 lines · Matt Fleming
Quoted 19 lines · Ingo Molnar
Quoted 10 lines · Matt Fleming
Quoted 8 lines · Ingo Molnar

and this breaks the ARM build:

In file included from /home/mingo/tip/init/main.c:44:
/home/mingo/tip/include/linux/efi.h:842:21: error: asm/efi.h: No such file or directory /home/mingo/tip/init/main.c: In function 'start_kernel':
/home/mingo/tip/init/main.c:638: error: implicit declaration of function 'efi_enabled' /home/mingo/tip/init/main.c:639: error: implicit declaration of function 'efi_late_init' /home/mingo/tip/init/main.c:640: error: implicit declaration of function 'efi_free_boot_services'

Quoted 3 lines

Ah, that's my own fault because my 'next' branch doesn't include the ARM EFI support. Where did you get the patches from? Are they in linux-next?

It's all in tip:x86/efi.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

I'm inclined to drop the cleanup patch for now and do it later, once things have settled because it's also causing conflicts for Borislav's work.

Sure.

OK, I've pushed out the 'next' branch and retagged it as 'efi-next' (again), which hopefully should be finally free from build errors.

Please send it out as a new pull requests so that the diffstat and shortlog can be seen and double checked, etc.

Thanks,

Ingo