From patchwork Fri Jun 14 13:04:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1115962 X-Patchwork-Delegate: trini@ti.com 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="p390kMnX"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45QLSs3sX9z9s3Z for ; Fri, 14 Jun 2019 23:05:49 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id CE84BC22398; Fri, 14 Jun 2019 13:05:27 +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=FREEMAIL_FROM, 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 809E0C21FA5; Fri, 14 Jun 2019 13:05:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6CC95C22375; Fri, 14 Jun 2019 13:05:02 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id CD2FCC22370 for ; Fri, 14 Jun 2019 13:04:58 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id k11so2489387wrl.1 for ; Fri, 14 Jun 2019 06:04:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zwf8B9qZ+EVYHfUCsK4Sk1XsuR1E7jHBS5j8nPyDPTM=; b=p390kMnXv0lc+LREFjexAnYsoiZxUcAWNABn0vrlaY3wObfFYhX2UkYBwVeZ4CtOfp xSXI0lleTTCYn8iBiFlbInKAZSAoAjoCUyBai40gHk0VeQWZKNeqpAcS51KfBZUFGXGY JErm6p/Po26+WMrs2MyxHbIjedjDu/kGqr81RTQ8AnNLt20QxI07pstN7RG+SB/nVLB/ P3biyCMZvjQKFJcjBEhH6OD4hubAX0fqv7jiUpBo24dZ7TWEUhJB1d37JLEUpP9XaINc +NU8vy6I95TA8+zqK6Qxrx0ZbfmTuJlDcXY68KTq0DBaATe0BkE8p6xyAOMkGIEWmwOW p8Eg== 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; bh=zwf8B9qZ+EVYHfUCsK4Sk1XsuR1E7jHBS5j8nPyDPTM=; b=FAohOEp+a6BS8h629pKd8lQr4+If6uoyO17yyjyjL0uNHG+X4eCHsB9aWLqlQYcbtR +vKnP+OxXlm3ZLU6DETyxR9tKC7EW48O0ZuFV0cxi8WK7YPjEI6lytXW3QYSWlDTnDiT M2S5T4Squl98sO0RRMKR3ou2kU5zf4ryebc62KmvOgOpu8iCR0FStWH2VwAGuzbbojx/ EQo3Kfkf7SsRClKsazzG/k4mmPBYUFEnPEH0YA9dUPHSvNnqlDxKVbrli94uw6ONi3zp 3C/1arHUi4pMBZCbOLtSj20pYey57/CZlD0i6y7nzcFGjevA5chmSkSELx/9/oyaCSTl ihwg== X-Gm-Message-State: APjAAAW/rGVsJ4GoRdCF8/vtPovwULjg6ejsmrwYPis6vi17QCHx7rEc Lh5iXEQKFQR52NKvAVDdifG7Etzx X-Google-Smtp-Source: APXvYqxuSA5MfEFuDHyt3nTG2eAD7SVUcKMzCrMk64dKsA+avyNAOwx5Otj7t5fO7kOJSOdBXsOhLw== X-Received: by 2002:a5d:56c1:: with SMTP id m1mr49298063wrw.26.1560517498251; Fri, 14 Jun 2019 06:04:58 -0700 (PDT) Received: from localhost ([194.105.145.90]) by smtp.gmail.com with ESMTPSA id t140sm9702540wmt.0.2019.06.14.06.04.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Jun 2019 06:04:57 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Date: Fri, 14 Jun 2019 16:04:54 +0300 Message-Id: <20190614130454.26797-3-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190614130454.26797-1-igor.opaniuk@gmail.com> References: <20190614130454.26797-1-igor.opaniuk@gmail.com> Cc: trini@konsulko.com, roman.stratiienko@globallogic.com, deymo@google.com, praneeth@ti.com, astrachan@google.com Subject: [U-Boot] [PATCH v4 2/2] disk: part: Extend API to get partition info 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Ruslan Trofymenko This patch adds part_get_info_by_dev_and_name_or_num() function which allows us to get partition info from its number or name. Partition of interest is specified by string like "device_num:partition_number" or "device_num#partition_name". The patch was extracted from [1]. [1] https://android-review.googlesource.com/c/platform/external/u-boot/+/729880/2 Signed-off-by: Ruslan Trofymenko Signed-off-by: Igor Opaniuk Reviewed-by: Alistair Strachan Reviewed-by: Sam Protsenko Reviewed-by: Simon Glass --- Changes in v4: None Changes in v3: None Changes in v2: * Error codes are changed to -EINVAL instead of -1 disk/part.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/part.h | 21 ++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/disk/part.c b/disk/part.c index 98cc54db20..580604c2bb 100644 --- a/disk/part.c +++ b/disk/part.c @@ -675,6 +675,74 @@ int part_get_info_by_name(struct blk_desc *dev_desc, const char *name, return part_get_info_by_name_type(dev_desc, name, info, PART_TYPE_ALL); } +/** + * Get partition info from device number and partition name. + * + * Parse a device number and partition name string in the form of + * "device_num#partition_name", for example "0#misc". If the partition + * is found, sets dev_desc and part_info accordingly with the information + * of the partition with the given partition_name. + * + * @param[in] dev_iface Device interface + * @param[in] dev_part_str Input string argument, like "0#misc" + * @param[out] dev_desc Place to store the device description pointer + * @param[out] part_info Place to store the partition information + * @return 0 on success, or a negative on error + */ +static int part_get_info_by_dev_and_name(const char *dev_iface, + const char *dev_part_str, + struct blk_desc **dev_desc, + disk_partition_t *part_info) +{ + char *ep; + const char *part_str; + int dev_num; + + part_str = strchr(dev_part_str, '#'); + if (!part_str || part_str == dev_part_str) + return -EINVAL; + + dev_num = simple_strtoul(dev_part_str, &ep, 16); + if (ep != part_str) { + /* Not all the first part before the # was parsed. */ + return -EINVAL; + } + part_str++; + + *dev_desc = blk_get_dev(dev_iface, dev_num); + if (!*dev_desc) { + printf("Could not find %s %d\n", dev_iface, dev_num); + return -EINVAL; + } + if (part_get_info_by_name(*dev_desc, part_str, part_info) < 0) { + printf("Could not find \"%s\" partition\n", part_str); + return -EINVAL; + } + return 0; +} + +int part_get_info_by_dev_and_name_or_num(const char *dev_iface, + const char *dev_part_str, + struct blk_desc **dev_desc, + disk_partition_t *part_info) +{ + /* Split the part_name if passed as "$dev_num#part_name". */ + if (!part_get_info_by_dev_and_name(dev_iface, dev_part_str, + dev_desc, part_info)) + return 0; + /* + * Couldn't lookup by name, try looking up the partition description + * directly. + */ + if (blk_get_device_part_str(dev_iface, dev_part_str, + dev_desc, part_info, 1) < 0) { + printf("Couldn't find partition %s %s\n", + dev_iface, dev_part_str); + return -EINVAL; + } + return 0; +} + void part_set_generic_name(const struct blk_desc *dev_desc, int part_num, char *name) { diff --git a/include/part.h b/include/part.h index ebca546db5..0b5cf3d5e8 100644 --- a/include/part.h +++ b/include/part.h @@ -201,6 +201,27 @@ int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name, int part_get_info_by_name(struct blk_desc *dev_desc, const char *name, disk_partition_t *info); +/** + * Get partition info from dev number + part name, or dev number + part number. + * + * Parse a device number and partition description (either name or number) + * in the form of device number plus partition name separated by a "#" + * (like "device_num#partition_name") or a device number plus a partition number + * separated by a ":". For example both "0#misc" and "0:1" can be valid + * partition descriptions for a given interface. If the partition is found, sets + * dev_desc and part_info accordingly with the information of the partition. + * + * @param[in] dev_iface Device interface + * @param[in] dev_part_str Input partition description, like "0#misc" or "0:1" + * @param[out] dev_desc Place to store the device description pointer + * @param[out] part_info Place to store the partition information + * @return 0 on success, or a negative on error + */ +int part_get_info_by_dev_and_name_or_num(const char *dev_iface, + const char *dev_part_str, + struct blk_desc **dev_desc, + disk_partition_t *part_info); + /** * part_set_generic_name() - create generic partition like hda1 or sdb2 *