From patchwork Thu Nov 15 04:58:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 151161 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6554289ljp; Wed, 14 Nov 2018 20:57:49 -0800 (PST) X-Google-Smtp-Source: AJdET5fXCrnsbCX9YWVZ5+g5gmB7YYDir/sExUVJtKwIC/1a2O8pkDT1ufqK4LOtd3YJCPlr1NQD X-Received: by 2002:a50:8e16:: with SMTP id 22mr1499576edw.32.1542257869044; Wed, 14 Nov 2018 20:57:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542257869; cv=none; d=google.com; s=arc-20160816; b=kqKWDg5LhvjjdklI1yIXGKGJr6nzFUabYE86gg6XUQbsWZ+bzTOPeir+VlZinsVzTC qyjJRWCvaQNeEJIGvjIvVtUwPcUi2xTXwDUxKlMPYK0uPh/Jk222CLsaGnueNWV9J8ty U/g7fOeOyZET0zrHH5Qen4RabLXg4jMAolAtqRVl07a3fm/+sa3yu3K1EecZTQYOzNy9 ulAP8UiJ7XABu1ppqq5epZGNTsYC5+CZ5anQI5orNPkR0svYF2PKE5W7tTc8PozMPEBn Mi6oHo9KJUcYvirDwZIYDTd5ml/VE3jMHQNiE62tsRFcfw+MOmcTit49DdKeX9q7YFwk +P4Q== 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:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=JiN+a8Q07T1y05TwCh3TZWZuWvK2/vzpC0cwhH842CU=; b=BMohil9hRBudOWjq0sWas67qk2oaaOel+EVfso34Ru0fzPBiGHjPgo1xZ6OUE/sneQ 4Shp9zqQ947g2kYyG3BR0Rl+2qEQwvSNNNQWxqK3S2yrcN4n6BArcsXqkHPtcF8VoSNl GkVhNDaq3iRuLDkBegrKanUs04cu9DBJxyd4pu8utKgkReaa2A3yJf3/Mlcuh81yqciB GTzzL+mHnQq4+9w0JpQgFNjSRKrmZ+72XQn58PeqITOy3koJqWE7aaoPeaecOzbg/tbo XJ0lx200p7qMDZd2EacKCFsdMUnNCLBwQWL4N/sLqCYt6R1sODwy0UqgNkEZWIU3wCLv JUow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ht4S73Ps; 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 c16-v6si1136658ejr.327.2018.11.14.20.57.48; Wed, 14 Nov 2018 20:57:49 -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=ht4S73Ps; 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 A8253C224A8; Thu, 15 Nov 2018 04:56:39 +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_MSPIKE_H2, 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 D9445C224D1; Thu, 15 Nov 2018 04:56:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CF6EBC224D1; Thu, 15 Nov 2018 04:56:11 +0000 (UTC) Received: from mail-yb1-f193.google.com (mail-yb1-f193.google.com [209.85.219.193]) by lists.denx.de (Postfix) with ESMTPS id 251C8C224DE for ; Thu, 15 Nov 2018 04:56:08 +0000 (UTC) Received: by mail-yb1-f193.google.com with SMTP id p144-v6so7856389yba.11 for ; Wed, 14 Nov 2018 20:56: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=XO5tuAPi0hvt2xSlUD/H/BifiR6issya9T/vv5gkTN8=; b=ht4S73PshQgf738MbQ6orCPIdAdaBJv2t4BF0U/XpJOGfSBJ3b2no+wrrtnx/LagNy dyUQq666CrLkEFK9QHfhYP0St6f5zAMkMhuIb/CZBnhpgKka5KCWaS2OTvuJLm8VpoBk 47pFYsQ7lCAL+mR4HSIPVQWn6b1FJKBe2/lhw= 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=XO5tuAPi0hvt2xSlUD/H/BifiR6issya9T/vv5gkTN8=; b=mXR4I1r3jO7gEWVeDIN2mvKMlfl7v36C7h76Hy2R2PaY3k8BZ+AU2Q9t87ZtPvoPmc ZXgyV814Mh2LdKAaz75Sisev5eTPVKlAQX9FdaZmsxGkdIGDZuXdmDXj+idXbk01Uge/ Om5r2VhQ0hfrOrIrvtMY39kFiru6gdiv3IXcexVB4XLcFriHZYHAIWrL/a89EerQjHP9 9E7NGpGR6W79LMZMXlBoIoBLFRyW1MgovbEw2zoDcD1oQ17oS3kl5Rfu0FQSdxbRhdSk 93RQDNDYnCEzkwi21kWCitQFgT96D8OhP3jGgI5S3pkWzANjJnqdCZXxr9WsspEwmsR+ osnA== X-Gm-Message-State: AGRZ1gJ2B29m6r0VR04HCjSVnf4LL+2R9stWB7c/EtbNErcxcGlxYD2q JRt6rTEzfumiLib1j0V9AaoyBw== X-Received: by 2002:a25:3c81:: with SMTP id j123-v6mr4448086yba.250.1542257766867; Wed, 14 Nov 2018 20:56:06 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id u4sm5965234ywu.92.2018.11.14.20.56.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 20:56:06 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, agraf@suse.de Date: Thu, 15 Nov 2018 13:58:09 +0900 Message-Id: <20181115045810.28736-3-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181115045810.28736-1-takahiro.akashi@linaro.org> References: <20181115045810.28736-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: xypron.glpk@gmx.de, u-boot@lists.denx.de Subject: [U-Boot] [PATCH v2 2/3] efi_loader: enumerate disk devices every time 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" Currently, efi_init_obj_list() scan disk devices only once, and never change a list of efi disk devices. This will possibly result in failing to find a removable storage which may be added later on. See [1]. In this patch, called is efi_disk_update() which is responsible for re-scanning UCLASS_BLK devices and removing/adding efi disks if necessary. For example, => efishell devices Scanning disk pci_mmc.blk... Found 3 disks Device Name ============================================ /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b) /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/SD(0)/SD(0) /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/SD(0)/SD(0)/HD(2,MBR,0x086246ba,0x40800,0x3f800) => usb start starting USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... 3 USB Device(s) found scanning usb for storage devices... 1 Storage Device(s) found => efishell devices Scanning disk usb_mass_storage.lun0... Device Name ============================================ /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b) /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/SD(0)/SD(0) /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/SD(0)/SD(0)/HD(2,MBR,0x086246ba,0x40800,0x3f800) /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/USBClass(0,0,9,0,1)/USBClass(46f4,1,0,0,0)/HD(1,0x01,0,0x40,0x14fe4c) Without this patch, the last device, USB mass storage, won't show up. [1] https://lists.denx.de/pipermail/u-boot/2018-October/345307.html Signed-off-by: AKASHI Takahiro --- cmd/bootefi.c | 17 +++- include/efi_loader.h | 4 + lib/efi_loader/efi_disk.c | 191 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 210 insertions(+), 2 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 3cefb4d0ecaa..82649e211fda 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -56,9 +56,22 @@ efi_status_t efi_init_obj_list(void) */ efi_save_gd(); - /* Initialize once only */ - if (efi_obj_list_initialized != OBJ_LIST_NOT_INITIALIZED) + if (efi_obj_list_initialized == EFI_SUCCESS) { +#ifdef CONFIG_PARTITIONS + ret = efi_disk_update(); + if (ret != EFI_SUCCESS) + printf("+++ updating disks list failed\n"); + + /* + * It may sound odd, but most part of EFI should + * yet work. + */ +#endif return efi_obj_list_initialized; + } else if (efi_obj_list_initialized != OBJ_LIST_NOT_INITIALIZED) { + /* Initialize once only */ + return efi_obj_list_initialized; + } /* Initialize system table */ ret = efi_initialize_system_table(); diff --git a/include/efi_loader.h b/include/efi_loader.h index 5cc3bded03fa..3bae1844befb 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -260,6 +260,10 @@ efi_status_t efi_initialize_system_table(void); efi_status_t efi_console_register(void); /* Called by bootefi to make all disk storage accessible as EFI objects */ efi_status_t efi_disk_register(void); +/* Check validity of efi disk */ +bool efi_disk_is_valid(efi_handle_t handle); +/* Called by bootefi to find and update disk storage information */ +efi_status_t efi_disk_update(void); /* Create handles and protocols for the partitions of a block device */ int efi_disk_create_partitions(efi_handle_t parent, struct blk_desc *desc, const char *if_typename, int diskid, diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index c037526ad2d0..0c4d79ee3fc9 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -14,10 +14,14 @@ const efi_guid_t efi_block_io_guid = BLOCK_IO_GUID; +#define _EFI_DISK_FLAG_DELETED 0x1 /* to be removed */ +#define _EFI_DISK_FLAG_INVALID 0x80000000 /* in stale state */ + /** * struct efi_disk_obj - EFI disk object * * @header: EFI object header + * @flags: control flags * @ops: EFI disk I/O protocol interface * @ifname: interface name for block device * @dev_index: device index of block device @@ -30,6 +34,7 @@ const efi_guid_t efi_block_io_guid = BLOCK_IO_GUID; */ struct efi_disk_obj { struct efi_object header; + int flags; struct efi_block_io ops; const char *ifname; int dev_index; @@ -41,6 +46,35 @@ struct efi_disk_obj { struct blk_desc *desc; }; +static void efi_disk_mark_deleted(struct efi_disk_obj *disk) +{ + disk->flags |= _EFI_DISK_FLAG_DELETED; +} + +static void efi_disk_clear_deleted(struct efi_disk_obj *disk) +{ + disk->flags &= ~_EFI_DISK_FLAG_DELETED; +} + +static bool efi_disk_deleted_marked(struct efi_disk_obj *disk) +{ + return disk->flags & _EFI_DISK_FLAG_DELETED; +} + +static void efi_disk_mark_invalid(struct efi_disk_obj *disk) +{ + disk->flags |= _EFI_DISK_FLAG_INVALID; +} + +bool efi_disk_is_valid(efi_handle_t handle) +{ + struct efi_disk_obj *disk; + + disk = container_of(handle, struct efi_disk_obj, header); + + return !(disk->flags & _EFI_DISK_FLAG_INVALID); +} + static efi_status_t EFIAPI efi_disk_reset(struct efi_block_io *this, char extended_verification) { @@ -64,6 +98,9 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, unsigned long n; diskobj = container_of(this, struct efi_disk_obj, ops); + if (diskobj->flags & _EFI_DISK_FLAG_INVALID) + return EFI_DEVICE_ERROR; + desc = (struct blk_desc *) diskobj->desc; blksz = desc->blksz; blocks = buffer_size / blksz; @@ -440,3 +477,157 @@ efi_status_t efi_disk_register(void) return EFI_SUCCESS; } + +/* + * Mark all the block devices as "deleted," and return an array of + * handles for later use. It should be freed in a caller. + */ +static efi_status_t efi_disk_mark_deleted_all(efi_handle_t **handlesp) +{ + efi_handle_t *handles = NULL; + efi_uintn_t size = 0; + int num, i; + struct efi_disk_obj *disk; + efi_status_t ret; + + ret = efi_locate_handle(BY_PROTOCOL, &efi_block_io_guid, NULL, + &size, handles); + if (ret == EFI_BUFFER_TOO_SMALL) { + handles = calloc(1, size); + if (!handles) + return EFI_OUT_OF_RESOURCES; + + ret = efi_locate_handle(BY_PROTOCOL, &efi_block_io_guid, NULL, + &size, handles); + } + if (ret != EFI_SUCCESS) { + free(handles); + return ret; + } + + num = size / sizeof(*handles); + for (i = 0; i < num; i++) { + disk = container_of(handles[i], struct efi_disk_obj, header); + efi_disk_mark_deleted(disk); + } + + *handlesp = handles; + + return num; +} + +/* + * Clear "deleted" flag for a block device which is identified with desc. + * If desc is NULL, clear all devices. + * + * Return a number of disks cleared. + */ +static int efi_disk_clear_deleted_matched(struct blk_desc *desc, + efi_handle_t *handles, int num) +{ + struct efi_disk_obj *disk; + int disks, i; + + for (i = 0, disks = 0; i < num; i++) { + disk = container_of(handles[i], struct efi_disk_obj, header); + + if (!desc || disk->desc == desc) { + efi_disk_clear_deleted(disk); + disks++; + } + } + + return disks; +} + +/* + * Do delete all the block devices marked as "deleted" + */ +static efi_status_t efi_disk_do_delete(efi_handle_t *handles, int num) +{ + struct efi_disk_obj *disk; + int i; + + for (i = 0; i < num; i++) { + disk = container_of(handles[i], struct efi_disk_obj, header); + + if (!efi_disk_deleted_marked(disk)) + continue; + + efi_disk_mark_invalid(disk); + /* + * TODO: + * efi_delete_handle(handles[i]); + */ + } + + return EFI_SUCCESS; +} + +/* + * efi_disk_update - recreate efi disk mappings after initialization + * + * @return efi error code + */ +efi_status_t efi_disk_update(void) +{ +#ifdef CONFIG_BLK + efi_handle_t *handles = NULL; + struct udevice *dev; + struct blk_desc *desc; + const char *if_typename; + struct efi_disk_obj *disk; + int n, disks = 0; + efi_status_t ret; + + /* temporarily mark all the devices "deleted" */ + ret = efi_disk_mark_deleted_all(&handles); + if (ret & EFI_ERROR_MASK) { + printf("ERROR: Failed to rescan block devices.\n"); + return ret; + } + + n = (int)ret; + for (uclass_first_device_check(UCLASS_BLK, &dev); dev; + uclass_next_device_check(&dev)) { + desc = dev_get_uclass_platdata(dev); + if (n && efi_disk_clear_deleted_matched(desc, handles, n)) + /* existing device */ + continue; + + /* new device */ + if_typename = blk_get_if_type_name(desc->if_type); + + /* Add block device for the full device */ + printf("Scanning disk %s...\n", dev->name); + ret = efi_disk_add_dev(NULL, NULL, if_typename, + desc, desc->devnum, 0, 0, &disk); + if (ret == EFI_NOT_READY) { + printf("Disk %s not ready\n", dev->name); + continue; + } + if (ret != EFI_SUCCESS) { + printf("ERROR: failure to add disk device %s, r = %lu\n", + dev->name, ret & ~EFI_ERROR_MASK); + continue; + } + disks++; + + /* Partitions show up as block devices in EFI */ + disks += efi_disk_create_partitions(&disk->header, desc, + if_typename, + desc->devnum, dev->name); + } + + if (n) { + /* do delete "deleted" disks */ + ret = efi_disk_do_delete(handles, n); + + /* undo marking */ + efi_disk_clear_deleted_matched(NULL, handles, n); + + free(handles); + } +#endif + return EFI_SUCCESS; +}