From patchwork Fri Jan 25 16:18:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 156613 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp542753jaa; Fri, 25 Jan 2019 08:18:15 -0800 (PST) X-Google-Smtp-Source: ALg8bN5GDeOtBmcehJNa0xQZpTkEy+7b7lHPT7TwhpGj+b7Sjjbbl0Qq9dLv8zatd0D4MmNH3kli X-Received: by 2002:a62:b511:: with SMTP id y17mr11612293pfe.199.1548433095734; Fri, 25 Jan 2019 08:18:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548433095; cv=none; d=google.com; s=arc-20160816; b=XFbD1ZEK4mY1m4Ev5xNwPgMjaoOdxl8zXg87cN6/PeBIlFHVv06R/B2B5lPt3mQKDU G/UORkkvkEItiEzN262mHP2g+2L6HqjCC7aAEcX5W+xRtGzS8DdgfsONyNOLeRiYEgpR FoGRryqenjYp0zBzHxFxhN9ZzcyMzUHzpykLMeRE4QeAmDpiIsxJalK1EKHU4lKk0BJI ihZ7rchIvj2KjQmWQzOLno+Igkmcmb6OHGdXJ2uPprO8ywhBf4Gt0h8pRbnAPdA8wEJC Evn7m21DWDOMDewojYOt/M9+kFN2FmiAj9cbFmbHVi7ebFb3lbO6rW1aRDmiOJmzoVWK Edlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kXfEZq52cZ0/nqk4AkmgAb2q1S2R98chAyM1XAevOXo=; b=fwwsUF7NjhJUvhXhDN9ktO2x8+yBw/dtnipKc3dzf9Hf4OgsSqhIvACYOTkoI3ocI5 b3PiihZ2sQhUBezWcG8Qait4+lvo7S+UClWTZeoHRfBsjy7iCfTljLTqT+2uZ8XlvjX+ FE/Om4i9w4Y/nENFJ2D8HPlntkVD0yv9FEDDMrBUZYP2cchIuWyV6BrjRWZWaL9pJeQ6 wonYgtVAYxbQI8bzcPVLVbDOOkcqrrww81EsSSPSXZmXlWro/Kc8q2b6PZYwhFb/r5KB qWiJa8QMVCchVs959lAuUH7ogM+pofpzyED9OM9bHymgY2QLHnKQCmaXVCoOm4S5zhYh 00PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZcZ4Pgwp; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 187si145382pfv.238.2019.01.25.08.18.15; Fri, 25 Jan 2019 08:18:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZcZ4Pgwp; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726122AbfAYQSP (ORCPT + 3 others); Fri, 25 Jan 2019 11:18:15 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:34274 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726778AbfAYQSP (ORCPT ); Fri, 25 Jan 2019 11:18:15 -0500 Received: by mail-wr1-f66.google.com with SMTP id f7so10959041wrp.1 for ; Fri, 25 Jan 2019 08:18:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kXfEZq52cZ0/nqk4AkmgAb2q1S2R98chAyM1XAevOXo=; b=ZcZ4Pgwp+nsetNADwvYWavI5DWF/gHaBCp3w2iW0cguhbDQEbkm4ArLIZ5gHZ2nOHD n2eu23bT55JCaib488W1/G9Ku2GaIbQtiyAX+tGPlMA4m99Wb5cflWAyaVuQrSv5b8Sb 09WG7YER+P7BcVJUfFun1D+DVSTjJfJAWJPdA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kXfEZq52cZ0/nqk4AkmgAb2q1S2R98chAyM1XAevOXo=; b=FBy9x0I/c1ABcrYTvW/GX/m3B9bsNgo9RSR7Lfv4Z3c3ROoMB3bkqPXATdQrgK8aFZ xHX6nZxoQdROW6n6WMnQQOeyuEcw8M0Jj+gybKAPRvVeA0IkiB/PyShe9tQRNjgJhIru /WckIIoDBhqw5AsIDyvJY7A46yURG/KTCzqcnL9xoZON7EcBzkybQ/Eqt3TATyNR6rSL 2dIbspoQTUJTwARmAOIZn9Nic363bhZsW6BeDFqj2SYeDLrxzL3tV1g+a8HcqBc08TgB JNLmuK9J/55eL9LXD+hOR568Nxtd7ZcsfUjEduU+WcrQ6vWl/EyHlls4jgTbez4WFPP0 iqog== X-Gm-Message-State: AJcUukfSW064N8bfv+2qK4BjwVr3VnNBtwQFLA2umxyE42ZdBQPdGv4y 7aj+z4gHK9LkNms0g27rFddqoi9SvO0B5Q== X-Received: by 2002:adf:8001:: with SMTP id 1mr11668254wrk.23.1548433092208; Fri, 25 Jan 2019 08:18:12 -0800 (PST) Received: from localhost.localdomain (laubervilliers-657-1-83-120.w92-154.abo.wanadoo.fr. [92.154.90.120]) by smtp.gmail.com with ESMTPSA id t76sm68987212wme.33.2019.01.25.08.18.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 08:18:11 -0800 (PST) From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: corbet@lwn.net, leif.lindholm@linaro.org, graeme.gregory@linaro.org, mingo@redhat.com, tglx@linutronix.de, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, agraf@suse.de, pjones@redhat.com, Ard Biesheuvel Subject: [PATCH 1/2] efi: x86: move EFI earlyprintk code to shared location Date: Fri, 25 Jan 2019 17:18:05 +0100 Message-Id: <20190125161806.13472-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190125161806.13472-1-ard.biesheuvel@linaro.org> References: <20190125161806.13472-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org 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 --- 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(-) -- 2.20.1 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 #include #include +#include /* * 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 #include #include -#include +#include 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;