From patchwork Sun Feb 16 18:23:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 206579 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26DEFC7619B for ; Sun, 16 Feb 2020 18:23:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0049122B48 for ; Sun, 16 Feb 2020 18:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581877428; bh=Y0lM0H5P6IdWgTvgZ+96YnGiA1Mtavj5RNAg7nRDo34=; h=From:To:Cc:Subject:Date:List-ID:From; b=a68S1FoZMAD5/8iERtlMJIxrqjwl0mTRrFrKrrQsMh9k1N8sAnc0Wsnxja28tPOnE lrrjY+K3fggkbWsGN5UsSidzaOUdVujBpHGHh5Gsxl6fpOG920QMcdPyi7u02xnC0p mQAuuti8sRsBDHbKaTGytvHaT0lOyhsb3ju/d1A8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726142AbgBPSXr (ORCPT ); Sun, 16 Feb 2020 13:23:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:32894 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725989AbgBPSXr (ORCPT ); Sun, 16 Feb 2020 13:23:47 -0500 Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr [109.210.65.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2722E206D6; Sun, 16 Feb 2020 18:23:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581877426; bh=Y0lM0H5P6IdWgTvgZ+96YnGiA1Mtavj5RNAg7nRDo34=; h=From:To:Cc:Subject:Date:From; b=SBasNHQLKJwTXUEuGcsnKD+CjiS6C6L/ai8u/F8JLdpGjO+ryNfzhRgaUFpMQF3IC 6OIvu+Fnqx2LbZrG3/0D/1rXtJxtkDf4nlRmfUS3tinqUI7owxNeJYnhBnSigg6ztp S+7RJsIEy4iBImVCHid4ggFqd4+ULRkwhXp4jnq4= From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Ard Biesheuvel , nivedita@alum.mit.edu, x86@kernel.org Subject: [PATCH 00/18] efi: clean up contents of struct efi Date: Sun, 16 Feb 2020 19:23:16 +0100 Message-Id: <20200216182334.8121-1-ardb@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org The generic r/w singleton object 'struct efi efi' is currently being used as a dumping ground for memory addresses of firmware tables that only have significance for a single architecture, or only at boot time [whereas struct efi is an object with indefinite lifetime, and which is exported to modules] Since we're expecting a new arrival that does affect all architectures, which will need to be added to struct efi as well, let's do a cleanup pass, and move out all the per-arch pieces and other stuff that does not need to live in a global r/w struct. As a side effect, I ran into some other things that can be refactored so that more code is shared between architectures, or made x86 specific if it is something that should maybe not have existed in the first place, and x86 is the only architecture where we cannot remove it for compatibility reasons. Finally, we get rid of the struct efi::systab member, which we only need at runtime to get at the 'runtime' pointer, so let's store that instead. This allows us to drop some ugly handling of the remapped systab address, which we cannot discover as easily as the remapped 'runtime' pointer. Cc: nivedita@alum.mit.edu Cc: x86@kernel.org Ard Biesheuvel (18): efi: drop handling of 'boot_info' configuration table efi/ia64: move HCDP and MPS table handling into IA64 arch code efi: move UGA and PROP table handling to x86 code efi: make rng_seed table handling local to efi.c efi: move mem_attr_table out of struct efi efi: make memreserve table handling local to efi.c efi: merge EFI system table revision and vendor checks efi/ia64: use existing helpers to locate ESI table efi/ia64: use local variable for EFI system table address efi/ia64: switch to efi_config_parse_tables() efi: make efi_config_init() x86 only efi: clean up config_parse_tables() efi/x86: remove runtime table address from kexec EFI setup data efi/x86: make fw_vendor, config_table and runtime sysfs nodes x86 specific efi/x86: merge assignments of efi.runtime_version efi: add 'runtime' pointer to struct efi efi/arm: drop unnecessary references to efi.systab efi/x86: drop 'systab' member from struct efi arch/ia64/kernel/efi.c | 55 ++-- arch/ia64/kernel/esi.c | 21 +- arch/x86/include/asm/efi.h | 6 +- arch/x86/kernel/asm-offsets_32.c | 5 + arch/x86/kernel/kexec-bzimage64.c | 5 +- arch/x86/platform/efi/efi.c | 262 ++++++++++---------- arch/x86/platform/efi/efi_32.c | 13 +- arch/x86/platform/efi/efi_64.c | 14 +- arch/x86/platform/efi/efi_stub_32.S | 21 +- arch/x86/platform/efi/quirks.c | 2 +- drivers/firmware/efi/arm-init.c | 68 ++--- drivers/firmware/efi/arm-runtime.c | 18 -- drivers/firmware/efi/efi.c | 237 ++++++++---------- drivers/firmware/efi/memattr.c | 13 +- drivers/firmware/efi/runtime-wrappers.c | 4 +- drivers/firmware/pcdp.c | 8 +- include/linux/efi.h | 76 +++--- 17 files changed, 379 insertions(+), 449 deletions(-)