From patchwork Tue Jan 29 02:59:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 1032444 X-Patchwork-Delegate: agraf@suse.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="GMQAo18l"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pWSk2xWZz9sDB for ; Tue, 29 Jan 2019 14:00:06 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1F53DC21BE5; Tue, 29 Jan 2019 02:59:49 +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, 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 1654FC21DFB; Tue, 29 Jan 2019 02:59:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 91C2DC21D8A; Tue, 29 Jan 2019 02:59:41 +0000 (UTC) Received: from mail-yw1-f66.google.com (mail-yw1-f66.google.com [209.85.161.66]) by lists.denx.de (Postfix) with ESMTPS id C4ED1C21DC1 for ; Tue, 29 Jan 2019 02:59:37 +0000 (UTC) Received: by mail-yw1-f66.google.com with SMTP id h32so7658182ywk.2 for ; Mon, 28 Jan 2019 18:59:37 -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=cnXbOJl7Pm87gBHrmYk84LFqaci0lN00kOnUJx1FmSg=; b=GMQAo18lZHHEYZ7lOPJCBgQW4lsOWu5vdB7hLNSzcr4PBM6LC34/sW27zouCTOeul4 g8/oWXsedBAIvIIKAz6X4MtoKkob9iImGT2GJVwM7rYvVhxUBbinTI5PNfFpe+Q7u106 HY7vdYGfB82WxvDWdxTHtwJoClh43/LqusaGs= 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=cnXbOJl7Pm87gBHrmYk84LFqaci0lN00kOnUJx1FmSg=; b=O2m2fFnOGXh6LPaOuiLK4SeZUvlltFJCgmiMJ5uMi9COSEffQ1VuE7evZ17eSSuB7W iBWF34/JozFfa2V15Z0lLxuX7WXws9lVR+YVTinbUjTcczM6x5ueh3YorXIXluN6Gz/3 fMuJBSqQnAwvV2R6P6k/sP/bwlkP9DfEFAVSkYU83M6P9OoYfOZsPe8cR7jY83z1OUnc ZdUi0rv/O6pKleCe/I53B8VZQrWClgQMO8esiax7EK0UhSu1dGDSsJ7N0gHoMtw7hKAg t2htg6mPf5qx8jM2y0Vdv9zp8Asi3s3OmS5fIjbMhAa515k0mhmzCiIEZuPNmOE9ivuh 57bg== X-Gm-Message-State: AJcUukeX0aUvROLQiVKVA53qMFYGVz8T13F/Ek2WN4oW/6xDPdLjuVr0 3VMnNSxBLeS7YuXHpzSMAZEYWA== X-Google-Smtp-Source: ALg8bN5QtLRN/yDIqIHr7oWIc1R0MSD7a1lfaEihlqLl6/HS/b+L1Uq47fy4tDXAHg8cdpmwvzm4lw== X-Received: by 2002:a81:695:: with SMTP id 143mr23640064ywg.370.1548730776780; Mon, 28 Jan 2019 18:59:36 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id c127sm12777640ywb.67.2019.01.28.18.59.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 18:59:36 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, agraf@suse.de, xypron.glpk@gmx.de, sjg@chromium.org Date: Tue, 29 Jan 2019 11:59:54 +0900 Message-Id: <20190129025956.21870-2-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190129025956.21870-1-takahiro.akashi@linaro.org> References: <20190129025956.21870-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [RFC 1/3] dm: blk: add UCLASS_PARTITION 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" UCLASS_PARTITION device will be created as a child node of UCLASS_BLK device. Signed-off-by: AKASHI Takahiro --- drivers/block/blk-uclass.c | 52 ++++++++++++++++++++++++++++++++++++++ include/dm/uclass-id.h | 1 + 2 files changed, 53 insertions(+) diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index baaf431e5e0c..d4ca30f23fc1 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -10,6 +10,8 @@ #include #include #include +#include +#include static const char *if_typename_str[IF_TYPE_COUNT] = { [IF_TYPE_IDE] = "ide", @@ -654,3 +656,53 @@ UCLASS_DRIVER(blk) = { .post_probe = blk_post_probe, .per_device_platdata_auto_alloc_size = sizeof(struct blk_desc), }; + +U_BOOT_DRIVER(blk_partition) = { + .name = "blk_partition", + .id = UCLASS_PARTITION, + .platdata_auto_alloc_size = sizeof(struct disk_part), +}; + +UCLASS_DRIVER(partition) = { + .id = UCLASS_PARTITION, + .name = "partition", +}; + +#if defined(CONFIG_PARTITIONS) && defined(CONFIG_HAVE_BLOCK_DEVICE) +int blk_create_partitions(struct udevice *parent) +{ + int part; + struct blk_desc *desc = dev_get_uclass_platdata(parent); + disk_partition_t info; + struct disk_part *part_data; + char devname[32]; + struct udevice *dev; + int disks = 0, ret; + + /* Add devices for each partition */ + for (part = 1; part <= MAX_SEARCH_PARTITIONS; part++) { + if (part_get_info(desc, part, &info)) + continue; + snprintf(devname, sizeof(devname), "%s:%d", parent->name, + part); + + ret = device_bind_driver(parent, "blk_partition", + strdup(devname), &dev); + if (ret) + return ret; + + part_data = dev_get_uclass_platdata(dev); + part_data->partnum = part; + part_data->gpt_part_info = info; + + disks++; + } + + return disks; +} +#else +int blk_create_partitions(struct udevice *dev) +{ + return 0; +} +#endif diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index f3bafb3c6353..e02b5f8fda42 100644 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@ -65,6 +65,7 @@ enum uclass_id { UCLASS_NVME, /* NVM Express device */ UCLASS_PANEL, /* Display panel, such as an LCD */ UCLASS_PANEL_BACKLIGHT, /* Backlight controller for panel */ + UCLASS_PARTITION, /* Logical disk partition device */ UCLASS_PCH, /* x86 platform controller hub */ UCLASS_PCI, /* PCI bus */ UCLASS_PCI_GENERIC, /* Generic PCI bus device */ From patchwork Tue Jan 29 02:59:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 1032445 X-Patchwork-Delegate: agraf@suse.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="DvE5m/Uu"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pWTM22dpz9sDB for ; Tue, 29 Jan 2019 14:00:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 05C35C21DD7; Tue, 29 Jan 2019 03:00:05 +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, 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 9A7B2C21C57; Tue, 29 Jan 2019 02:59:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BFDD7C21DB5; Tue, 29 Jan 2019 02:59:47 +0000 (UTC) Received: from mail-yb1-f195.google.com (mail-yb1-f195.google.com [209.85.219.195]) by lists.denx.de (Postfix) with ESMTPS id 8612CC21DED for ; Tue, 29 Jan 2019 02:59:44 +0000 (UTC) Received: by mail-yb1-f195.google.com with SMTP id l20so7502118ybl.9 for ; Mon, 28 Jan 2019 18:59:44 -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=88gp+e2Zg+NQ0e2foPjvymmKo+nnALVEwHTpd4D8cdM=; b=DvE5m/UulpgqfESNKVEsuhuYj9yoHGXMIXNhYWsdtEOzUlQ7HigV/021xYS7TsYWbY zg6eJalRqDUl/zg5MTBoynspobtEAsM0VVFtO8NPYWSrKV6E+kC35N4y55WAq4gBDf3s 9Ds32QyoFfsIdgNAF1mG8uqEgDZAtx40345S4= 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=88gp+e2Zg+NQ0e2foPjvymmKo+nnALVEwHTpd4D8cdM=; b=ZNMn+bzEMHZ5kmGUHbd0tiCd9cHyT1WTp4+SxAewuDpckH2Y0f1rqhRHOsl23QFj6i vEYqg68n8vsTBYq3k0RsYo0GBHf4fqWHLpr8zYh6VgDbqe/O87Yz0YJfEY1qTR2E5zym mkEn2mbrfcyCFW+RjXLg55Lo0d1Ujlj2XJSfqZhq5pcEqrmC85lodIH2glxxHmOBbcvb d9wzNmzJ34xrlsE911iXpI2g3RPfNOWQjIhqD2q8CvVRLuzGXEcLtUIuumXdeOyN753m irbNvi9w64j7sKJLbTj9iPNB48VEN3g3s6rsinB7HLRBFwXt0WExkBjH+Ao+5C/OumyQ GllA== X-Gm-Message-State: AJcUukfrswPAqhgZD6ePMD9MU/AQUbFKyNawnTLsqmHa2yqTladwjhDc 2VA7zH/QOBecPtCcTOFirASjbg== X-Google-Smtp-Source: ALg8bN6xEeJMYf1/85RXKmaHwnYVyf76ZHvWnQv2i7yE3rPv5by8YfyuUwMq5azht5299E1cMWIcyQ== X-Received: by 2002:a25:7708:: with SMTP id s8mr21536429ybc.4.1548730783374; Mon, 28 Jan 2019 18:59:43 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id v9sm13824679ywh.2.2019.01.28.18.59.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 18:59:42 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, agraf@suse.de, xypron.glpk@gmx.de, sjg@chromium.org Date: Tue, 29 Jan 2019 11:59:55 +0900 Message-Id: <20190129025956.21870-3-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190129025956.21870-1-takahiro.akashi@linaro.org> References: <20190129025956.21870-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [RFC 2/3] efi_loader: associate BLK/PARTITION device to efi_disk 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" efi_disk_create() will initialize efi_disk attributes for each device, either UCLASS_BLK or UCLASS_PARTITION. Currently (temporarily), efi_disk_obj structure is embedded into blk_desc to hold efi-specific attributes. Signed-off-by: AKASHI Takahiro --- drivers/block/blk-uclass.c | 9 ++ drivers/core/device.c | 3 + include/blk.h | 24 +++++ include/dm/device.h | 4 + lib/efi_loader/efi_disk.c | 192 ++++++++++++++++++++++++++----------- 5 files changed, 174 insertions(+), 58 deletions(-) diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index d4ca30f23fc1..28c45d724113 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -657,6 +657,9 @@ UCLASS_DRIVER(blk) = { .per_device_platdata_auto_alloc_size = sizeof(struct blk_desc), }; +/* FIXME */ +extern int efi_disk_create(struct udevice *dev); + U_BOOT_DRIVER(blk_partition) = { .name = "blk_partition", .id = UCLASS_PARTITION, @@ -695,6 +698,12 @@ int blk_create_partitions(struct udevice *parent) part_data->partnum = part; part_data->gpt_part_info = info; + ret = efi_disk_create(dev); + if (ret) { + device_unbind(dev); + return ret; + } + disks++; } diff --git a/drivers/core/device.c b/drivers/core/device.c index 0d15e5062b66..8625fccb0dcb 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -67,6 +67,9 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, dev->parent = parent; dev->driver = drv; dev->uclass = uc; +#ifdef CONFIG_EFI_LOADER + INIT_LIST_HEAD(&dev->efi_obj.protocols); +#endif dev->seq = -1; dev->req_seq = -1; diff --git a/include/blk.h b/include/blk.h index d0c033aece0f..405f6f790d66 100644 --- a/include/blk.h +++ b/include/blk.h @@ -8,6 +8,7 @@ #define BLK_H #include +#include #ifdef CONFIG_SYS_64BIT_LBA typedef uint64_t lbaint_t; @@ -53,6 +54,26 @@ enum sig_type { SIG_TYPE_COUNT /* Number of signature types */ }; +/* FIXME */ +/** + * struct efi_disk_obj - EFI disk object + * + * @ops: EFI disk I/O protocol interface + * @media: block I/O media information + * @dp: device path to the block device + * @part: partition + * @volume: simple file system protocol of the partition + * @offset: offset into disk for simple partition + */ +struct efi_disk_obj { + struct efi_block_io ops; + struct efi_block_io_media media; + struct efi_device_path *dp; + unsigned int part; + struct efi_simple_file_system_protocol *volume; + lbaint_t offset; +}; + /* * With driver model (CONFIG_BLK) this is uclass platform data, accessible * with dev_get_uclass_platdata(dev) @@ -92,6 +113,9 @@ struct blk_desc { * device. Once these functions are removed we can drop this field. */ struct udevice *bdev; +#ifdef CONFIG_EFI_LOADER + struct efi_disk_obj efi_disk; +#endif #else unsigned long (*block_read)(struct blk_desc *block_dev, lbaint_t start, diff --git a/include/dm/device.h b/include/dm/device.h index 27a6d7b9fdb0..121bfb46b1a0 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -146,6 +147,9 @@ struct udevice { #ifdef CONFIG_DEVRES struct list_head devres_head; #endif +#ifdef CONFIG_EFI_LOADER + struct efi_object efi_obj; +#endif }; /* Maximum sequence number supported */ diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index c037526ad2d0..84fa0ddfba14 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -14,33 +14,6 @@ const efi_guid_t efi_block_io_guid = BLOCK_IO_GUID; -/** - * struct efi_disk_obj - EFI disk object - * - * @header: EFI object header - * @ops: EFI disk I/O protocol interface - * @ifname: interface name for block device - * @dev_index: device index of block device - * @media: block I/O media information - * @dp: device path to the block device - * @part: partition - * @volume: simple file system protocol of the partition - * @offset: offset into disk for simple partition - * @desc: internal block device descriptor - */ -struct efi_disk_obj { - struct efi_object header; - struct efi_block_io ops; - const char *ifname; - int dev_index; - struct efi_block_io_media media; - struct efi_device_path *dp; - unsigned int part; - struct efi_simple_file_system_protocol *volume; - lbaint_t offset; - struct blk_desc *desc; -}; - static efi_status_t EFIAPI efi_disk_reset(struct efi_block_io *this, char extended_verification) { @@ -64,7 +37,7 @@ 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); - desc = (struct blk_desc *) diskobj->desc; + desc = container_of(diskobj, struct blk_desc, efi_disk); blksz = desc->blksz; blocks = buffer_size / blksz; lba += diskobj->offset; @@ -217,6 +190,7 @@ efi_fs_from_path(struct efi_device_path *full_path) return handler->protocol_interface; } +#ifndef CONFIG_BLK /* * Create a handle for a partition or disk * @@ -343,6 +317,136 @@ int efi_disk_create_partitions(efi_handle_t parent, struct blk_desc *desc, return disks; } +#else +static int efi_disk_create_common(efi_handle_t handle, + struct efi_disk_obj *disk, + struct blk_desc *desc) +{ + efi_status_t ret; + + /* Hook up to the device list */ + efi_add_handle(handle); + + /* Fill in EFI IO Media info (for read/write callbacks) */ + disk->media.removable_media = desc->removable; + disk->media.media_present = 1; + disk->media.block_size = desc->blksz; + disk->media.io_align = desc->blksz; + disk->media.last_block = desc->lba - disk->offset; + disk->ops.media = &disk->media; + + /* add protocols */ + disk->ops = block_io_disk_template; + ret = efi_add_protocol(handle, &efi_block_io_guid, &disk->ops); + if (ret != EFI_SUCCESS) + goto err; + + ret = efi_add_protocol(handle, &efi_guid_device_path, disk->dp); + if (ret != EFI_SUCCESS) + goto err; + + return 0; + +err: + /* FIXME: undo adding protocols */ + return -1; +} + +/* + * Create a handle for a raw disk + * + * @dev uclass device + * @return 0 on success, -1 otherwise + */ +int efi_disk_create_raw(struct udevice *dev) +{ + struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct efi_disk_obj *disk = &desc->efi_disk; + + /* Don't add empty devices */ + if (!desc->lba) + return -1; + + /* raw block device */ + disk->offset = 0; + disk->part = 0; + disk->dp = efi_dp_from_part(desc, 0); + + /* efi IO media */ + disk->media.logical_partition = 0; + + return efi_disk_create_common(&dev->efi_obj, disk, desc); +} + +/* + * Create a handle for a partition + * + * @dev uclass device + * @return 0 on success, -1 otherwise + */ +int efi_disk_create_part(struct udevice *dev) +{ + struct udevice *parent = dev->parent; + struct blk_desc *desc = dev_get_uclass_platdata(parent); + struct blk_desc *this; + struct disk_part *pdata = dev_get_uclass_platdata(dev); + struct efi_disk_obj *disk; + struct efi_device_path *node; + + int ret; + + /* dummy block device */ + this = malloc(sizeof(*this)); + if (!this) + return -1; + disk = &this->efi_disk; + + /* logical disk partition */ + disk->offset = pdata->gpt_part_info.start; + disk->part = pdata->partnum; + + node = efi_dp_part_node(desc, disk->part); + disk->dp = efi_dp_append_node(desc->efi_disk.dp, node); + efi_free_pool(node); + + /* efi IO media */ + disk->media.logical_partition = 1; + + ret = efi_disk_create_common(&dev->efi_obj, disk, desc); + if (ret) + goto err; + + /* partition may support file system access */ + disk->volume = efi_simple_file_system(desc, disk->part, disk->dp); + ret = efi_add_protocol(&dev->efi_obj, + &efi_simple_file_system_protocol_guid, + disk->volume); + if (ret != EFI_SUCCESS) + goto err; + + return 0; + +err: + free(this); + /* FIXME: undo create */ + + return -1; +} + +int efi_disk_create(struct udevice *dev) +{ + enum uclass_id id; + + id = device_get_uclass_id(dev); + + if (id == UCLASS_BLK) + return efi_disk_create_raw(dev); + else if (id == UCLASS_PARTITION) + return efi_disk_create_part(dev); + else + return -1; +} +#endif /* CONFIG_BLK */ /* * U-Boot doesn't have a list of all online disk devices. So when running our @@ -357,38 +461,10 @@ int efi_disk_create_partitions(efi_handle_t parent, struct blk_desc *desc, */ efi_status_t efi_disk_register(void) { +#ifndef CONFIG_BLK struct efi_disk_obj *disk; int disks = 0; efi_status_t ret; -#ifdef CONFIG_BLK - struct udevice *dev; - - for (uclass_first_device_check(UCLASS_BLK, &dev); dev; - uclass_next_device_check(&dev)) { - struct blk_desc *desc = dev_get_uclass_platdata(dev); - const char *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) { - printf("ERROR: failure to add disk device %s, r = %lu\n", - dev->name, ret & ~EFI_ERROR_MASK); - return ret; - } - disks++; - - /* Partitions show up as block devices in EFI */ - disks += efi_disk_create_partitions( - &disk->header, desc, if_typename, - desc->devnum, dev->name); - } -#else int i, if_type; /* Search for all available disk devices */ @@ -435,8 +511,8 @@ efi_status_t efi_disk_register(void) if_typename, i, devname); } } -#endif printf("Found %d disks\n", disks); +#endif return EFI_SUCCESS; } From patchwork Tue Jan 29 02:59:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 1032446 X-Patchwork-Delegate: agraf@suse.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="bg4SqMFe"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pWTd2D8Vz9sDB for ; Tue, 29 Jan 2019 14:00:52 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 79221C21DF8; Tue, 29 Jan 2019 03:00:36 +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, 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 90505C21E1B; Tue, 29 Jan 2019 03:00:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D5AA5C21C6A; Tue, 29 Jan 2019 02:59:55 +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 E7302C21DD4 for ; Tue, 29 Jan 2019 02:59:50 +0000 (UTC) Received: by mail-yb1-f193.google.com with SMTP id e12so7612382ybn.10 for ; Mon, 28 Jan 2019 18:59:50 -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=a62miuZQCVJwW3uz/r2tROwKNvbUujiLHFxxKcmGEAY=; b=bg4SqMFerjCDuOZj0XeBeQsONR/39wtqB33kr/bgDQ3nICQyo8N6mH3z9WSXfLPe28 NPiZQTXs8lqgciQe/xJzpLLkOLMMOHj3NayGkU3qqTupYhdA4u69ac3adKdL06EE6YB0 yfHHzOII+IpxHkzgJ5eXJ04ftH+Aeohl9vRMw= 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=a62miuZQCVJwW3uz/r2tROwKNvbUujiLHFxxKcmGEAY=; b=EJqqpfXp3Wj1AEWgx0njwSbhJXOG2DDGZOf+Rbc5qlY7AGJJLs3iRRe0texmwqy7QT qRINbGucoFwI57OlU1pfrdHalTGi4VvF6g2BYHyV2kMejsGwc/B+Vy6SLle3743H+7y8 34y7y+E+vxxGLjFK2u4T9/23zo75ypy3O7VMmQXxNJ7klu3bcJ4xJ9IKl6L4wPUdgnat iQWQUw0/LOfdT7AUXfioWokiejvyt9tEVfEJgQfj6RFsf5db7Jid2O+S+ET71lME0zVM XZfp+lcbNqIIt8Tw5r+YBEIg2BCeeW7IP4U/MS+gFEX8bUaNWuwmszkgOGVW946oEPRB fMKw== X-Gm-Message-State: AJcUuketUirNDb2nnLACfJhwc9/7GyIbtlk6zdjDk3sMPGET5HcW6s2Q cZlePk1adnXsaP2K2TVS0JiOY99QCbI= X-Google-Smtp-Source: ALg8bN6rKCL8FROxAbPGqvC2Glm+Mds6accLXBBXu8g/5Xkk1UVce/xQaq1+ozO5G2pHWIgoZdyyRA== X-Received: by 2002:a25:af07:: with SMTP id a7mr23674588ybh.400.1548730789871; Mon, 28 Jan 2019 18:59:49 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id g127sm13626076ywf.38.2019.01.28.18.59.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 18:59:49 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, agraf@suse.de, xypron.glpk@gmx.de, sjg@chromium.org Date: Tue, 29 Jan 2019 11:59:56 +0900 Message-Id: <20190129025956.21870-4-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190129025956.21870-1-takahiro.akashi@linaro.org> References: <20190129025956.21870-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [RFC 3/3] drivers: align block device drivers with DM-efi integration 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" Efi_disk_create() should be hook up at every creation of block device at each driver. Associated blk_desc must be properly set up before calling this function. Signed-off-by: AKASHI Takahiro --- common/usb_storage.c | 27 +++++++++++++++++++++++++-- drivers/scsi/scsi.c | 22 ++++++++++++++++++++++ lib/efi_driver/efi_block_device.c | 30 +++++++++--------------------- 3 files changed, 56 insertions(+), 23 deletions(-) diff --git a/common/usb_storage.c b/common/usb_storage.c index 8c889bb1a648..ff895c0e4557 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -46,6 +46,10 @@ #include #include +/* FIXME */ +extern int efi_disk_create(struct udevice *dev); +extern int blk_create_partitions(struct udevice *parent); + #undef BBB_COMDAT_TRACE #undef BBB_XPORT_TRACE @@ -227,8 +231,27 @@ static int usb_stor_probe_device(struct usb_device *udev) ret = usb_stor_get_info(udev, data, blkdev); if (ret == 1) { - usb_max_devs++; - debug("%s: Found device %p\n", __func__, udev); + ret = efi_disk_create(dev); + if (ret) { + debug("Cannot create efi_disk device\n"); + ret = device_unbind(dev); + if (ret) + return ret; + } else { + usb_max_devs++; + ret = blk_create_partitions(dev); + if (ret < 0) { + debug("Cannot create disk partition device\n"); + /* TODO: undo create */ + + ret = device_unbind(dev); + if (ret) + return ret; + } + usb_max_devs += ret; + debug("%s: Found device %p, partitions:%d\n", + __func__, udev, ret); + } } else { debug("usb_stor_get_info: Invalid device\n"); ret = device_unbind(dev); diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index df47e2fc78bd..f0f8cbc0bf26 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -11,6 +11,10 @@ #include #include +/* FIXME */ +int efi_disk_create(struct udevice *dev); +int blk_create_partitions(struct udevice *parent); + #if !defined(CONFIG_DM_SCSI) # ifdef CONFIG_SCSI_DEV_LIST # define SCSI_DEV_LIST CONFIG_SCSI_DEV_LIST @@ -593,9 +597,27 @@ static int do_scsi_scan_one(struct udevice *dev, int id, int lun, bool verbose) memcpy(&bdesc->product, &bd.product, sizeof(bd.product)); memcpy(&bdesc->revision, &bd.revision, sizeof(bd.revision)); + ret = efi_disk_create(bdev); + if (ret) { + debug("Can't create efi_disk device\n"); + ret = device_unbind(bdev); + + return ret; + } + ret = blk_create_partitions(bdev); + if (ret < 0) { + debug("Can't create efi_disk partitions\n"); + /* TODO: undo create */ + + ret = device_unbind(bdev); + + return ret; + } + if (verbose) { printf(" Device %d: ", 0); dev_print(bdesc); + debug("Found %d partitions\n", ret); } return 0; } diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index 3f147cf60879..4ab3402d6768 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -32,6 +32,10 @@ #include #include +/* FIXME */ +extern int efi_disk_create(struct udevice *dev); +extern int blk_create_partitions(struct udevice *parent); + /* * EFI attributes of the udevice handled by this driver. * @@ -102,24 +106,6 @@ static ulong efi_bl_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, return blkcnt; } -/* - * Create partions for the block device. - * - * @handle EFI handle of the block device - * @dev udevice of the block device - */ -static int efi_bl_bind_partitions(efi_handle_t handle, struct udevice *dev) -{ - struct blk_desc *desc; - const char *if_typename; - - desc = dev_get_uclass_platdata(dev); - if_typename = blk_get_if_type_name(desc->if_type); - - return efi_disk_create_partitions(handle, desc, if_typename, - desc->devnum, dev->name); -} - /* * Create a block device for a handle * @@ -168,15 +154,17 @@ static int efi_bl_bind(efi_handle_t handle, void *interface) platdata->handle = handle; platdata->io = interface; + ret = efi_disk_create(bdev); + if (ret) + return ret; + ret = device_probe(bdev); if (ret) return ret; EFI_PRINT("%s: block device '%s' created\n", __func__, bdev->name); - /* Create handles for the partions of the block device */ - disks = efi_bl_bind_partitions(handle, bdev); + disks = blk_create_partitions(bdev); EFI_PRINT("Found %d partitions\n", disks); - return 0; }