* [PATCH 1/2] efi: x86: move EFI earlyprintk code to shared location
2019-01-25 16:18 [PATCH 0/2] efi: arm: add support for earlycon on EFI framebuffer Ard Biesheuvel
@ 2019-01-25 16:18 ` Ard Biesheuvel
2019-01-25 16:18 ` [PATCH 2/2] efi: arm64: Enable earlycon for the GOP framebuffer Ard Biesheuvel
1 sibling, 0 replies; 3+ messages in thread
From: Ard Biesheuvel @ 2019-01-25 16:18 UTC (permalink / raw)
To: linux-efi
Cc: Ard Biesheuvel, graeme.gregory, linux-doc, pjones, corbet, agraf,
leif.lindholm, mingo, tglx, linux-arm-kernel
Move the x86 EFI earlyprintk to a shared location under drivers/firmware
and tweak it slightly so we can easily reuse it for other architectures
going forward.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/x86/Kconfig.debug | 2 +-
arch/x86/include/asm/efi.h | 6 +++++
arch/x86/platform/efi/Makefile | 1 -
drivers/firmware/efi/Kconfig | 4 +++
drivers/firmware/efi/Makefile | 1 +
arch/x86/platform/efi/early_printk.c => drivers/firmware/efi/earlycon.c | 26 ++++++++++----------
6 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 0723dff17e6c..078c633771e6 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -43,7 +43,7 @@ config EARLY_PRINTK_DBGP
config EARLY_PRINTK_EFI
bool "Early printk via the EFI framebuffer"
depends on EFI && EARLY_PRINTK
- select FONT_SUPPORT
+ select UEFI_EARLYCON
---help---
Write kernel log output directly into the EFI framebuffer.
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index 107283b1eb1e..79e9b5b10cb5 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -8,6 +8,7 @@
#include <asm/tlb.h>
#include <asm/nospec-branch.h>
#include <asm/mmu_context.h>
+#include <asm/setup.h>
/*
* We map the EFI regions needed for runtime services non-contiguously,
@@ -244,6 +245,11 @@ static inline bool efi_is_64bit(void)
extern bool efi_reboot_required(void);
+static inline struct screen_info *efi_get_screen_info(void)
+{
+ return &boot_params.screen_info;
+}
+
#else
static inline void parse_efi_setup(u64 phys_addr, u32 data_len) {}
static inline bool efi_reboot_required(void)
diff --git a/arch/x86/platform/efi/Makefile b/arch/x86/platform/efi/Makefile
index e4dc3862d423..fe29f3f5d384 100644
--- a/arch/x86/platform/efi/Makefile
+++ b/arch/x86/platform/efi/Makefile
@@ -3,5 +3,4 @@ OBJECT_FILES_NON_STANDARD_efi_thunk_$(BITS).o := y
OBJECT_FILES_NON_STANDARD_efi_stub_$(BITS).o := y
obj-$(CONFIG_EFI) += quirks.o efi.o efi_$(BITS).o efi_stub_$(BITS).o
-obj-$(CONFIG_EARLY_PRINTK_EFI) += early_printk.o
obj-$(CONFIG_EFI_MIXED) += efi_thunk_$(BITS).o
diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index 89110dfc7127..70335c7f0fe4 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -198,3 +198,7 @@ config EFI_DEV_PATH_PARSER
bool
depends on ACPI
default n
+
+config UEFI_EARLYCON
+ bool
+ select FONT_SUPPORT
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
index 5f9f5039de50..d18cfd83155c 100644
--- a/drivers/firmware/efi/Makefile
+++ b/drivers/firmware/efi/Makefile
@@ -32,3 +32,4 @@ obj-$(CONFIG_ARM64) += $(arm-obj-y)
obj-$(CONFIG_EFI_CAPSULE_LOADER) += capsule-loader.o
obj-$(CONFIG_UEFI_CPER_ARM) += cper-arm.o
obj-$(CONFIG_UEFI_CPER_X86) += cper-x86.o
+obj-$(CONFIG_UEFI_EARLYCON) += earlycon.o
diff --git a/arch/x86/platform/efi/early_printk.c b/drivers/firmware/efi/earlycon.c
similarity index 87%
rename from arch/x86/platform/efi/early_printk.c
rename to drivers/firmware/efi/earlycon.c
index 7138bc7a265c..c065c482d12b 100644
--- a/arch/x86/platform/efi/early_printk.c
+++ b/drivers/firmware/efi/earlycon.c
@@ -10,7 +10,7 @@
#include <linux/font.h>
#include <linux/io.h>
#include <linux/kernel.h>
-#include <asm/setup.h>
+#include <asm/efi.h>
static const struct font_desc *font;
static u32 efi_x, efi_y;
@@ -31,10 +31,10 @@ static __init int early_efi_map_fb(void)
if (!early_efi_keep)
return 0;
- base = boot_params.screen_info.lfb_base;
- if (boot_params.screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE)
- base |= (u64)boot_params.screen_info.ext_lfb_base << 32;
- size = boot_params.screen_info.lfb_size;
+ base = efi_get_screen_info()->lfb_base;
+ if (efi_get_screen_info()->capabilities & VIDEO_CAPABILITY_64BIT_BASE)
+ base |= (u64)efi_get_screen_info()->ext_lfb_base << 32;
+ size = efi_get_screen_info()->lfb_size;
efi_fb = ioremap(base, size);
return efi_fb ? 0 : -ENOMEM;
@@ -50,9 +50,9 @@ static __ref void *early_efi_map(unsigned long start, unsigned long len)
{
u64 base;
- base = boot_params.screen_info.lfb_base;
- if (boot_params.screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE)
- base |= (u64)boot_params.screen_info.ext_lfb_base << 32;
+ base = efi_get_screen_info()->lfb_base;
+ if (efi_get_screen_info()->capabilities & VIDEO_CAPABILITY_64BIT_BASE)
+ base |= (u64)efi_get_screen_info()->ext_lfb_base << 32;
if (efi_fb)
return (efi_fb + start);
@@ -71,7 +71,7 @@ static void early_efi_clear_scanline(unsigned int y)
unsigned long *dst;
u16 len;
- len = boot_params.screen_info.lfb_linelength;
+ len = efi_get_screen_info()->lfb_linelength;
dst = early_efi_map(y*len, len);
if (!dst)
return;
@@ -86,8 +86,8 @@ static void early_efi_scroll_up(void)
u16 len;
u32 i, height;
- len = boot_params.screen_info.lfb_linelength;
- height = boot_params.screen_info.lfb_height;
+ len = efi_get_screen_info()->lfb_linelength;
+ height = efi_get_screen_info()->lfb_height;
for (i = 0; i < height - font->height; i++) {
dst = early_efi_map(i*len, len);
@@ -135,7 +135,7 @@ early_efi_write(struct console *con, const char *str, unsigned int num)
const char *s;
void *dst;
- si = &boot_params.screen_info;
+ si = efi_get_screen_info();
len = si->lfb_linelength;
while (num) {
@@ -206,7 +206,7 @@ static __init int early_efi_setup(struct console *con, char *options)
u16 xres, yres;
u32 i;
- si = &boot_params.screen_info;
+ si = efi_get_screen_info();
xres = si->lfb_width;
yres = si->lfb_height;
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] efi: arm64: Enable earlycon for the GOP framebuffer
2019-01-25 16:18 [PATCH 0/2] efi: arm: add support for earlycon on EFI framebuffer Ard Biesheuvel
2019-01-25 16:18 ` [PATCH 1/2] efi: x86: move EFI earlyprintk code to shared location Ard Biesheuvel
@ 2019-01-25 16:18 ` Ard Biesheuvel
1 sibling, 0 replies; 3+ messages in thread
From: Ard Biesheuvel @ 2019-01-25 16:18 UTC (permalink / raw)
To: linux-efi
Cc: Ard Biesheuvel, graeme.gregory, linux-doc, pjones, corbet, agraf,
leif.lindholm, mingo, tglx, linux-arm-kernel
This repurposes the existing EFI earlyprintk support and exposes it
as an earlycon implementation, which can be enabled by passing the
kernel parameter 'earlycon=efi' on the command line.
Note that the early console is initialized before we have discovered
anything about the memory map, and so we cannot determine automatically
whether the framebuffer is backed by system memory that must be mapped
with cacheable attributes. So instead, a 'ram' earlycon option is
implemented to force this manually.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
Documentation/admin-guide/kernel-parameters.txt | 9 ++++-
arch/arm64/include/asm/efi.h | 6 +++
drivers/firmware/efi/Kconfig | 1 +
drivers/firmware/efi/earlycon.c | 42 +++++++++++++++-----
4 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index b799bcf67d7b..be6b4972cc3c 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1073,9 +1073,16 @@
specified address. The serial port must already be
setup and configured. Options are not yet supported.
+ efi[,options] # arm64 or x86
+ Start an early, unaccelerated console on the EFI
+ framebuffer. On DMA coherent arm64 systems that use
+ system memory for the framebuffer, pass the 'ram'
+ option so that it is mapped with the correct
+ attributes.
+
earlyprintk= [X86,SH,ARM,M68k,S390]
earlyprintk=vga
- earlyprintk=efi
+ earlyprintk=efi # x86 only
earlyprintk=sclp
earlyprintk=xen
earlyprintk=serial[,ttySn[,baudrate]]
diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h
index 7ed320895d1f..7f555f1c8d48 100644
--- a/arch/arm64/include/asm/efi.h
+++ b/arch/arm64/include/asm/efi.h
@@ -11,6 +11,7 @@
#include <asm/neon.h>
#include <asm/ptrace.h>
#include <asm/tlbflush.h>
+#include <linux/screen_info.h>
#ifdef CONFIG_EFI
extern void efi_init(void);
@@ -149,4 +150,9 @@ static inline void efi_set_pgd(struct mm_struct *mm)
void efi_virtmap_load(void);
void efi_virtmap_unload(void);
+static inline struct screen_info *efi_get_screen_info(void)
+{
+ return &screen_info;
+}
+
#endif /* _ASM_EFI_H */
diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index 70335c7f0fe4..9d67aab94cbf 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -201,4 +201,5 @@ config EFI_DEV_PATH_PARSER
config UEFI_EARLYCON
bool
+ default y if ARM64
select FONT_SUPPORT
diff --git a/drivers/firmware/efi/earlycon.c b/drivers/firmware/efi/earlycon.c
index c065c482d12b..4e8dba21673e 100644
--- a/drivers/firmware/efi/earlycon.c
+++ b/drivers/firmware/efi/earlycon.c
@@ -10,13 +10,17 @@
#include <linux/font.h>
#include <linux/io.h>
#include <linux/kernel.h>
+#include <linux/serial_core.h>
#include <asm/efi.h>
static const struct font_desc *font;
static u32 efi_x, efi_y;
static void *efi_fb;
static bool early_efi_keep;
+static bool fb_is_ram;
+static u64 fb_base;
+#ifdef CONFIG_EARLY_PRINTK_EFI
/*
* efi earlyprintk need use early_ioremap to map the framebuffer.
* But early_ioremap is not usable for earlyprintk=efi,keep, ioremap should
@@ -40,6 +44,7 @@ static __init int early_efi_map_fb(void)
return efi_fb ? 0 : -ENOMEM;
}
early_initcall(early_efi_map_fb);
+#endif
/*
* early_efi_map maps efi framebuffer region [start, start + len -1]
@@ -48,21 +53,21 @@ early_initcall(early_efi_map_fb);
*/
static __ref void *early_efi_map(unsigned long start, unsigned long len)
{
- u64 base;
-
- base = efi_get_screen_info()->lfb_base;
- if (efi_get_screen_info()->capabilities & VIDEO_CAPABILITY_64BIT_BASE)
- base |= (u64)efi_get_screen_info()->ext_lfb_base << 32;
-
if (efi_fb)
return (efi_fb + start);
+ else if (fb_is_ram)
+ return early_memremap(fb_base + start, len);
else
- return early_ioremap(base + start, len);
+ return early_ioremap(fb_base + start, len);
}
static __ref void early_efi_unmap(void *addr, unsigned long len)
{
- if (!efi_fb)
+ if (efi_fb)
+ return;
+ if (fb_is_ram)
+ early_memunmap(addr, len);
+ else
early_iounmap(addr, len);
}
@@ -210,6 +215,10 @@ static __init int early_efi_setup(struct console *con, char *options)
xres = si->lfb_width;
yres = si->lfb_height;
+ fb_base = efi_get_screen_info()->lfb_base;
+ if (efi_get_screen_info()->capabilities & VIDEO_CAPABILITY_64BIT_BASE)
+ fb_base |= (u64)efi_get_screen_info()->ext_lfb_base << 32;
+
/*
* early_efi_write_char() implicitly assumes a framebuffer with
* 32-bits per pixel.
@@ -226,11 +235,12 @@ static __init int early_efi_setup(struct console *con, char *options)
early_efi_scroll_up();
/* early_console_register will unset CON_BOOT in case ,keep */
- if (!(con->flags & CON_BOOT))
+ if (con && !(con->flags & CON_BOOT))
early_efi_keep = true;
return 0;
}
+#ifdef CONFIG_EARLY_PRINTK_EFI
struct console early_efi_console = {
.name = "earlyefi",
.write = early_efi_write,
@@ -238,3 +248,17 @@ struct console early_efi_console = {
.flags = CON_PRINTBUFFER,
.index = -1,
};
+#endif
+
+static int __init efi_earlycon_setup(struct earlycon_device *device,
+ const char *opt)
+{
+ if (efi_get_screen_info()->orig_video_isVGA != VIDEO_TYPE_EFI)
+ return -ENODEV;
+
+ device->con->write = early_efi_write;
+ early_efi_setup(NULL, NULL);
+ fb_is_ram = !strcmp(opt, "ram");
+ return 0;
+}
+EARLYCON_DECLARE(efi, efi_earlycon_setup);
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread