From patchwork Fri Feb 8 08:15:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 1038521 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" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="DDgIZjiF"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43wp9b3WgTz9sML for ; Fri, 8 Feb 2019 19:23:47 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0B235C21F7F; Fri, 8 Feb 2019 08:23: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 B88E1C22041; Fri, 8 Feb 2019 08:15:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7620EC22002; Fri, 8 Feb 2019 08:15:37 +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 38DB6C22027 for ; Fri, 8 Feb 2019 08:15:25 +0000 (UTC) Received: by mail-yb1-f193.google.com with SMTP id k9so1111868ybg.1 for ; Fri, 08 Feb 2019 00:15:25 -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=0z+H6ZUWfLuFs2KSYlROSmg7BmJEQYiIpOZ5b1Q6NBI=; b=DDgIZjiFdpykUWvvaHH4wY+hQQOKE8TtIOPbrIXLITVlgTRETKL7o09DI5ZsxkR4xD dnBoclKBp3F2f3DoPiz7EQBpbVGS3pUvJTEcmy/zSq38yYBGAO1eGLY42a0Db9kCWdlt 5m3V219L8no3TXztEpeJSljJXRG+f+NKJtA924IaiuglcCVnuF79J5F3uJoFHmJnMWlx WO65ef7FMCJFqpa7pjsR6jP26EK72/0Ue/4ZDHFGoaJj54quNZ2w0LaxAZmOS3BmBWEs IObocP2tKpmnnT0wcvnx0VVKMstVqK5u1+HQqNGKtogcCYs6Jcgp5BNygs01tRytMsGA ozfg== 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=0z+H6ZUWfLuFs2KSYlROSmg7BmJEQYiIpOZ5b1Q6NBI=; b=dRqpWXFwCmCp8X1S0gMhPO5e1nqFAz+MWqU3NR2BrkeixKJp1NsZPVfLcIOTq9S5X4 UeamtqmYRLPyifGDgKA2Jw62mqY5uSzKebYzbUAwUN6MxVHKwnOT02IkgC2JV3S9tqdB 8En9iHrhOGFQ+IIA+um3JOi8EMBRFpJzBWuWxKQcqqHEL2bHMYtobqEdTY1UkHCdvtU3 q9XgeyACjw5AMOMR/hm3dKXhcxbFWRbuLVn3Z3AljojOoggaUILA31drg+RWQ0tqc32A JqxG+DAXk0sCBAWaJj6VDhfcm+7+8ItE+gCTv3eNgqK6MWL7QI/RHR8j0Lc61C1eGXEX WFww== X-Gm-Message-State: AHQUAua7QA6mVZaJyVpno2mK0kP3zB4Efp4+N5bHqFaiKffP5wEPNWVh mwlhgY+W3TNJjSpxS/xEioj4Dw== X-Google-Smtp-Source: AHgI3IYjg8sCFNl9JMHfUSfWCDZHxlNpJpfPx6YfuF/VU/z75+96IbzCrmvdDN6TzLGHlLJzYgB35g== X-Received: by 2002:a25:8e0c:: with SMTP id p12mr16758158ybl.3.1549613724064; Fri, 08 Feb 2019 00:15:24 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id f188sm811228ywc.70.2019.02.08.00.15.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Feb 2019 00:15:23 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, agraf@suse.de, xypron.glpk@gmx.de, sjg@chromium.org Date: Fri, 8 Feb 2019 17:15:39 +0900 Message-Id: <20190208081542.2813-13-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190208081542.2813-1-takahiro.akashi@linaro.org> References: <20190208081542.2813-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [RFC v2 12/15] efi_loader: disk: convert efi_disk_obj to DM 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, which will now be associated with efi_disk (EFI_BLOCK_IO_PROTOCOL). 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 ++ include/blk.h | 24 +++++ lib/efi_loader/efi_disk.c | 216 ++++++++++++++++++++++++++----------- lib/efi_loader/efi_file.c | 14 +++ 4 files changed, 200 insertions(+), 63 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/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/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index c037526ad2d0..5e6cbb49bfb2 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; @@ -189,7 +162,7 @@ static const struct efi_block_io block_io_disk_template = { struct efi_simple_file_system_protocol * efi_fs_from_path(struct efi_device_path *full_path) { - struct efi_object *efiobj; + struct udevice *handle, *protocol; struct efi_handler *handler; struct efi_device_path *device_path; struct efi_device_path *file_path; @@ -202,21 +175,23 @@ efi_fs_from_path(struct efi_device_path *full_path) efi_free_pool(file_path); /* Get the EFI object for the partition */ - efiobj = efi_dp_find_obj(device_path, NULL); + handle = efi_dp_find_obj(device_path, NULL); efi_free_pool(device_path); - if (!efiobj) + if (!handle) return NULL; /* Find the simple file system protocol */ - ret = efi_search_protocol(efiobj, &efi_simple_file_system_protocol_guid, - &handler); + ret = efi_search_protocol(handle, &efi_simple_file_system_protocol_guid, + &protocol); if (ret != EFI_SUCCESS) return NULL; /* Return the simple file system protocol for the partition */ + handler = protocol->uclass_platdata; return handler->protocol_interface; } +#ifndef CONFIG_BLK /* * Create a handle for a partition or disk * @@ -343,6 +318,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, 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, 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_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 +462,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 +512,21 @@ efi_status_t efi_disk_register(void) if_typename, i, devname); } } -#endif printf("Found %d disks\n", disks); +#endif return EFI_SUCCESS; } + +static int efi_disk_probe(struct udevice *dev) +{ + device_set_name(dev, "BLOCK_IO"); + + return 0; +} + +U_BOOT_DRIVER(efi_disk) = { + .name = "efi_disk", + .id = UCLASS_EFI_PROTOCOL, + .probe = efi_disk_probe, +}; diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index 128cb0a6273a..ec306fb8ca4f 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -708,3 +709,16 @@ efi_simple_file_system(struct blk_desc *desc, int part, return &fs->base; } + +static int efi_simple_file_system_probe(struct udevice *dev) +{ + device_set_name(dev, "SIMPLE_FILE_SYSTEM"); + + return 0; +} + +U_BOOT_DRIVER(efi_simple_file_system) = { + .name = "efi_simple_file_system", + .id = UCLASS_EFI_PROTOCOL, + .probe = efi_simple_file_system_probe, +};