From patchwork Fri Jul 5 12:37:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1128009 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="RGFZ5s3i"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45gDs63hp3z9sP7 for ; Fri, 5 Jul 2019 22:38:00 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id ACC87C21E36; Fri, 5 Jul 2019 12:37:54 +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, 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 C656BC21C38; Fri, 5 Jul 2019 12:37:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7B8B8C21C2C; Fri, 5 Jul 2019 12:37:49 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id 0EBE0C21BE5 for ; Fri, 5 Jul 2019 12:37:49 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id p74so5681509wme.4 for ; Fri, 05 Jul 2019 05:37:49 -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=HKMVOp+ToUUKgx9uLesrFX2SXsrj1sS0XwBQXLCZCp8=; b=RGFZ5s3i2EacVgn3q0eoC+3Hgmh6lnykd0R0UZ/E5RpLIsNCcUUY4rsdRMpprDj5qS L20eXVCFoX+db8OgzJZQOahs4MT83xkhRm+keGbaOw2D9mV+raXD4+WuOzQnNZ5UZGdi aXk5YZXUvg6BXpyBwOvizH2jqkzJCwZbAtSYVhHfXmaK7mXgBqprXLinURhtGUdFteOR SuL7QTreeNQ2zRMuwbVMxfK9Xouo6G3busymi8Y5xTQiFs3ueXr5uR0itkQlqaiTl8FS 79UUwi/Td9zU1p9z+bcEVjIzQWxcLCWII5Z+O8n+fjGB3T4v0N1YS9AKObiQ9gPlKQto OT0g== 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=HKMVOp+ToUUKgx9uLesrFX2SXsrj1sS0XwBQXLCZCp8=; b=m6lfxt0FtkwNkn33UeReRyBqnTv2JBJ0aDk75+zqM4syw7xQKB+MC4fSmgaxGELRz7 LuZEkRJLbyBC47cy6dC+RO715pr9bouZIadFAK0N305ZZnMvYESRedq3tbs5Wbm8/N24 ookylYTLyPotJh5XW/c/8W/Km7X+03NEzY4tfklHzXOX9DEzj0c7FN6ZMTAE5mglaa4o SVKzAebhuz135cbdtI/QkhN4HixkJskZSxi/OEFFEm++jkP5hNJ9lLCELKMDoDi7NoN4 1G1p0o4MTnvG2Rh5NnFTrkVubcK8p3jT1UTx8XVF+Hv+f3GuVCZly0Who10FmgjM625I FN6Q== X-Gm-Message-State: APjAAAUejNHnRTGJBUohmjCfuELW5z4j8vLIQfCB24LkNIw8B1y1wMq+ qOc+TNj1ghuqa4GeipHGsWPS+DAH X-Google-Smtp-Source: APXvYqyR2Id88VsjZOVvh1q/1He24L5gw5AoJDYUxt7dp3sYHjQK8MXNvM1Kh+23Xh7lL7NNkp5EfQ== X-Received: by 2002:a7b:c745:: with SMTP id w5mr3388212wmk.21.1562330268420; Fri, 05 Jul 2019 05:37:48 -0700 (PDT) Received: from localhost ([194.105.145.90]) by smtp.gmail.com with ESMTPSA id b9sm6975800wrx.57.2019.07.05.05.37.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Jul 2019 05:37:47 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Date: Fri, 5 Jul 2019 15:37:31 +0300 Message-Id: <20190705123736.3498-2-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190705123736.3498-1-igor.opaniuk@gmail.com> References: <20190705123736.3498-1-igor.opaniuk@gmail.com> Cc: Tien Fong Chee , Alex Deymo , Praneeth Bajjuri , Heinrich Schuchardt , astrachan@google.com, Tuomas Tynkkynen , Ruslan Trofymenko , Eugeniu Rosca Subject: [U-Boot] [PATCH v5 1/6] 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 --- disk/part.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/part.h | 21 ++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/disk/part.c b/disk/part.c index f14bc22b6d..7e84214731 100644 --- a/disk/part.c +++ b/disk/part.c @@ -674,6 +674,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 *