From patchwork Tue Jan 15 02:54:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 155598 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4382685jaa; Mon, 14 Jan 2019 18:54:16 -0800 (PST) X-Google-Smtp-Source: ALg8bN53dUKCihNXQ+mOkdfyAPp0R2gPcJUbP/CkoaqX9/mBHVMJRPlLJ49EziHoLZ4lwgIt17zt X-Received: by 2002:aa7:d88c:: with SMTP id u12mr1502108edq.237.1547520856478; Mon, 14 Jan 2019 18:54:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547520856; cv=none; d=google.com; s=arc-20160816; b=QCdq7kGCZLe2Dydi5Bc/Dl4vjGBhrJZS2GEOL0/3KFg6WvCiKPDenEZnISw5uiLkzC poHhEidzVT3ClYIw/g3xhgG/6NoZCeQs6P1sBtIzXVA683AqHY8oUIphqc9YXQFzLNe2 SpnP0r/OelgMCZ8bV7SEcVApa7eW9CPvbMfQ8C4DB1kcvQ3Q2a47iiFXD0u78ltqLNiX BBiXPaR3yI6K50AACXr9gXjOrq7xoxm8YxjMhk+jEFUPt58jkI6sinfAhhX0OKhv7VWG Vbsn6SVMCag9kQJY+t4z82HErg6naiUQLSG56QSScMCw1EqJfeupPLUrnbFSqjBHSuMn LV8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:message-id:date:to:from:dkim-signature; bh=33xaKw+XEDJS/uv5Kgthg816bScqk3Py2iZWsq0cLYc=; b=zRzUN2CHcn/5gMGSdWMRdibs7jw7vlo/4sWmBlAzG9FglktUI8gIYSJYZk3RbHOhlw lvFJCQHOXRibt/Sjzwivmp7xtiBEK7yfe5WyZEOUTvfuKewSvA2mktszy51dbnGAAT7Z thLxztBGHbkc0IdIO8QzNcyDw78mEaqKnperu2ANne2Xx3HixGpW+XvZeiKeR92Ww1nS hhoWHJ6vmJZdhOKEWV1QutuY696seo5kPWix10PYvNA0kZdg7PR87d8GGxMJyA1OoCWm rRhbLRtge6C8LGV0o48C+k7rfGf5INXMM1KSvzf8mS5utU+Kv3SOsDr6TEN07WFiAxxE gmXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Da3r0ACN; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id g18si43613edq.449.2019.01.14.18.54.15; Mon, 14 Jan 2019 18:54:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Da3r0ACN; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id A5E7EC21F1D; Tue, 15 Jan 2019 02:54:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9689FC21C51; Tue, 15 Jan 2019 02:54:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7EBF5C21C51; Tue, 15 Jan 2019 02:54:09 +0000 (UTC) Received: from mail-yw1-f65.google.com (mail-yw1-f65.google.com [209.85.161.65]) by lists.denx.de (Postfix) with ESMTPS id 06815C21C50 for ; Tue, 15 Jan 2019 02:54:09 +0000 (UTC) Received: by mail-yw1-f65.google.com with SMTP id g194so503791ywe.7 for ; Mon, 14 Jan 2019 18:54:08 -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:mime-version :content-transfer-encoding; bh=e2ebilU1Kp4faXsbXYLz200OJNdgdEJk81ovHu+nUv4=; b=Da3r0ACNpRc9lQ+yQGYBtUIoKom8tmXb2VbiGzLKhpWOv8xHbCJX/x+dk12ENXKJlJ A//dcJ+6aVWcrFOFNxJcWj1mOGFKiG2tVZ2GEYLq2sXBaDy9j2wZK7l9Xt1m2Y8UQc3d n0v6sz1gsW3aylUUVhB1AStFSYQM7RcvkcOSg= 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:mime-version :content-transfer-encoding; bh=e2ebilU1Kp4faXsbXYLz200OJNdgdEJk81ovHu+nUv4=; b=ZPGE7faGOISBFfB2I7zIgchxOuLJUYB+KBwp5e7Knr6HQPVHq3t/Cn9/Cu6Z7I8OOK itihK3dF7Qx1FI/oK2PscNy/4xDSLeUJ3lC3fCSLquvbuC8YVvGQwx+PS63lB/P8ooNq tw/HwcBhmEnExs4Lle6YHRVGf7W5mJ7hABe5XBi7wtG3SztpjGE55n33Slx1PiUqPYId xseJ+udKSkJ/kyk0WLHZcpcZT9J0Ayhl1jR7nye2lcJT5buJaGUfgE7Zd7EwwrpCUQV2 zqpRkkBjJQVxXcvtAT5jGe7RWK9iClLNQs+q4cEU1ulBDgdtvmf0i8JsOn+WaWgexDVj woYQ== X-Gm-Message-State: AJcUukeR7n7ts0Imvq2v7rU1f0zvlDBq1RKdktZ1twuApkgyOY305f0Q jlLASVXrpmB3bCThujNP+YvT1Q== X-Received: by 2002:a81:5142:: with SMTP id f63mr1282975ywb.11.1547520847680; Mon, 14 Jan 2019 18:54:07 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id a7sm834858ywb.18.2019.01.14.18.54.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 18:54:07 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, agraf@suse.de, xypron.glpk@gmx.de Date: Tue, 15 Jan 2019 11:54:06 +0900 Message-Id: <20190115025406.11894-1-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH v2] efi_loader: move efi_init_obj_list() to a new efi_setup.c X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" # removed unnecessary "#if" statements from v1 The function, efi_init_obj_list(), can be shared in different pseudo efi applications, like bootefi/bootmgr as well as my efishell. Moreover, it will be utilized to extend efi initialization, for example, my "removable disk support" patch and "capsule-on-disk support" patch in the future. So with this patch, it will be moved to a new file, efi_setup.c, under lib/efi_loader and exported, making no changes in functionality. Signed-off-by: AKASHI Takahiro --- cmd/bootefi.c | 75 -------------------------------- include/efi_loader.h | 2 + lib/efi_loader/Makefile | 1 + lib/efi_loader/efi_setup.c | 89 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+), 75 deletions(-) create mode 100644 lib/efi_loader/efi_setup.c diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 38679ffc56a9..7012d72ab50d 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -30,84 +30,9 @@ DECLARE_GLOBAL_DATA_PTR; #define OBJ_LIST_NOT_INITIALIZED 1 -static efi_status_t efi_obj_list_initialized = OBJ_LIST_NOT_INITIALIZED; - static struct efi_device_path *bootefi_image_path; static struct efi_device_path *bootefi_device_path; -/* Initialize and populate EFI object list */ -efi_status_t efi_init_obj_list(void) -{ - efi_status_t ret = EFI_SUCCESS; - - /* - * On the ARM architecture gd is mapped to a fixed register (r9 or x18). - * As this register may be overwritten by an EFI payload we save it here - * and restore it on every callback entered. - */ - efi_save_gd(); - - /* Initialize once only */ - if (efi_obj_list_initialized != OBJ_LIST_NOT_INITIALIZED) - return efi_obj_list_initialized; - - /* Initialize system table */ - ret = efi_initialize_system_table(); - if (ret != EFI_SUCCESS) - goto out; - - /* Initialize root node */ - ret = efi_root_node_register(); - if (ret != EFI_SUCCESS) - goto out; - - /* Initialize EFI driver uclass */ - ret = efi_driver_init(); - if (ret != EFI_SUCCESS) - goto out; - - ret = efi_console_register(); - if (ret != EFI_SUCCESS) - goto out; -#ifdef CONFIG_PARTITIONS - ret = efi_disk_register(); - if (ret != EFI_SUCCESS) - goto out; -#endif -#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO) - ret = efi_gop_register(); - if (ret != EFI_SUCCESS) - goto out; -#endif -#ifdef CONFIG_NET - ret = efi_net_register(); - if (ret != EFI_SUCCESS) - goto out; -#endif -#ifdef CONFIG_GENERATE_ACPI_TABLE - ret = efi_acpi_register(); - if (ret != EFI_SUCCESS) - goto out; -#endif -#ifdef CONFIG_GENERATE_SMBIOS_TABLE - ret = efi_smbios_register(); - if (ret != EFI_SUCCESS) - goto out; -#endif - ret = efi_watchdog_register(); - if (ret != EFI_SUCCESS) - goto out; - - /* Initialize EFI runtime services */ - ret = efi_reset_system_init(); - if (ret != EFI_SUCCESS) - goto out; - -out: - efi_obj_list_initialized = ret; - return ret; -} - /* * Allow unaligned memory access. * diff --git a/include/efi_loader.h b/include/efi_loader.h index 16633d6da0d5..dd68cfce5c65 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -252,6 +252,8 @@ extern struct list_head efi_obj_list; /* List of all events */ extern struct list_head efi_events; +/* Initialize efi execution environment */ +efi_status_t efi_init_obj_list(void); /* Called by bootefi to initialize root node */ efi_status_t efi_root_node_register(void); /* Called by bootefi to initialize runtime */ diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index 26b999bf7c51..3ba539314aee 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -29,6 +29,7 @@ obj-y += efi_image_loader.o obj-y += efi_memory.o obj-y += efi_root_node.o obj-y += efi_runtime.o +obj-y += efi_setup.o obj-y += efi_unicode_collation.o obj-y += efi_variable.o obj-y += efi_watchdog.o diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c new file mode 100644 index 000000000000..38569af1f2c8 --- /dev/null +++ b/lib/efi_loader/efi_setup.c @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * EFI setup code + * + * Copyright (c) 2016 Alexander Graf + * Copyright (c) 2018 AKASHI Takahiro, Linaro Limited + */ + +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +#define OBJ_LIST_NOT_INITIALIZED 1 + +static efi_status_t efi_obj_list_initialized = OBJ_LIST_NOT_INITIALIZED; + +/* Initialize and populate EFI object list */ +efi_status_t efi_init_obj_list(void) +{ + efi_status_t ret = EFI_SUCCESS; + + /* + * On the ARM architecture gd is mapped to a fixed register (r9 or x18). + * As this register may be overwritten by an EFI payload we save it here + * and restore it on every callback entered. + */ + efi_save_gd(); + + /* Initialize once only */ + if (efi_obj_list_initialized != OBJ_LIST_NOT_INITIALIZED) + return efi_obj_list_initialized; + + /* Initialize system table */ + ret = efi_initialize_system_table(); + if (ret != EFI_SUCCESS) + goto out; + + /* Initialize root node */ + ret = efi_root_node_register(); + if (ret != EFI_SUCCESS) + goto out; + + /* Initialize EFI driver uclass */ + ret = efi_driver_init(); + if (ret != EFI_SUCCESS) + goto out; + + ret = efi_console_register(); + if (ret != EFI_SUCCESS) + goto out; +#ifdef CONFIG_PARTITIONS + ret = efi_disk_register(); + if (ret != EFI_SUCCESS) + goto out; +#endif +#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO) + ret = efi_gop_register(); + if (ret != EFI_SUCCESS) + goto out; +#endif +#ifdef CONFIG_NET + ret = efi_net_register(); + if (ret != EFI_SUCCESS) + goto out; +#endif +#ifdef CONFIG_GENERATE_ACPI_TABLE + ret = efi_acpi_register(); + if (ret != EFI_SUCCESS) + goto out; +#endif +#ifdef CONFIG_GENERATE_SMBIOS_TABLE + ret = efi_smbios_register(); + if (ret != EFI_SUCCESS) + goto out; +#endif + ret = efi_watchdog_register(); + if (ret != EFI_SUCCESS) + goto out; + + /* Initialize EFI runtime services */ + ret = efi_reset_system_init(); + if (ret != EFI_SUCCESS) + goto out; + +out: + efi_obj_list_initialized = ret; + return ret; +}