From patchwork Tue Feb 2 15:23:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1434786 X-Patchwork-Delegate: lukma@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=dkCx9sGV; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DVTCb514Nz9tT8 for ; Wed, 3 Feb 2021 02:25:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 19A1982714; Tue, 2 Feb 2021 16:24:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="dkCx9sGV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DC377826DF; Tue, 2 Feb 2021 16:24:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20615.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::615]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8FC1B82699 for ; Tue, 2 Feb 2021 16:24:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ijJxF935/Q9OqvLHRalHrSCKqlJvMutfT/azE7teeDjP2MxIC9LdgmPg1u4/2rrPbNwZzzfvSRPbWAFHsAie9AXGRju+MCsOg4QBpn7vi4vw4d3pphqkBJ8RAh4w1Q9rNFjZooguWNUm4VbnX5d/7bWewF+aHkP1/qijs3vhHj4Iy0RueDvWM/FbLQmfeo9b0YtREOYO8hlyo4bu2Jct3atgVrNPOgImlB8obdyF8MsKrmgV7K0XTToyygsipo9Mug6J6AK9lP/n54pHdTwQ08qVHns10gWG0q6c1bu7rQmU/cvBSi7SlqTvMCVRbBzc3LtCoQPsKoWbMoiGV5heLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TdgpPPDxDZxaAmEc3ICmOgfNxaCERgbDHlrL3tRJ1Kk=; b=B/9D4pBL0Vv67HVpx7hbTSTy4D3009EX9STBTSXiTzQHTDkdfu5fk4t7rQl2LYYxwdMHfPy+ykJpqAO39214DLAsWab90YqF4PZ5724xJro4nnDH5Masl1TknAz8uU7rVwlMM69RpwQE6Hq7pi9HoZeRv44vnVSrNjRefv5RnNdPqI5q1ZA07vs3Y2reUSXd2lfyaZDFxrwXJ0LBD+QATOzptdYH4pkdm0VOrRpGlfIVqv3GczZ4+u1MpNe+j6UO3jzewf8JBG+AtIUUsDPZ/vsz7avmdUjYCW3tFuTHYLOmrtqoCCXaC3PmmUYGj75ScbLx9WJ3VZXfVh/D0vhGbQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TdgpPPDxDZxaAmEc3ICmOgfNxaCERgbDHlrL3tRJ1Kk=; b=dkCx9sGVwTAyMrnku6qMvehNT7K4T22NT0bjg+MxVSSDgl0nBg9EFSF16GjvVz5X2ZtJ9xTnOQJ3R+/aIej87RN8G+Vq/hkeEA0SxRlArIR4ES/0mYSnv/Z1xgZwxQn4n2v408qhUPeB+3mCtNYPNo0XqVG1beyjfnQhlOSGb+Y= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=seco.com; Received: from AM9PR03MB7251.eurprd03.prod.outlook.com (2603:10a6:20b:26e::16) by VI1PR0302MB2816.eurprd03.prod.outlook.com (2603:10a6:800:e4::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3805.19; Tue, 2 Feb 2021 15:24:27 +0000 Received: from AM9PR03MB7251.eurprd03.prod.outlook.com ([fe80::a8f2:7dd:46e5:8526]) by AM9PR03MB7251.eurprd03.prod.outlook.com ([fe80::a8f2:7dd:46e5:8526%6]) with mapi id 15.20.3805.028; Tue, 2 Feb 2021 15:24:27 +0000 From: Sean Anderson To: u-boot@lists.denx.de Cc: Lukasz Majewski , Simon Glass , Sean Anderson , Anastasiia Lukianenko , Andrii Anisov , Heinrich Schuchardt , Oleksandr Andrushchenko Subject: [PATCH v4 5/9] part: Support string block devices in part_get_info_by_dev_and_name Date: Tue, 2 Feb 2021 10:23:48 -0500 Message-Id: <20210202152352.33245-6-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210202152352.33245-1-sean.anderson@seco.com> References: <20210202152352.33245-1-sean.anderson@seco.com> X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BL1PR13CA0432.namprd13.prod.outlook.com (2603:10b6:208:2c3::17) To AM9PR03MB7251.eurprd03.prod.outlook.com (2603:10a6:20b:26e::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by BL1PR13CA0432.namprd13.prod.outlook.com (2603:10b6:208:2c3::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.16 via Frontend Transport; Tue, 2 Feb 2021 15:24:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 66fda113-3351-4d3f-0b83-08d8c78ea11a X-MS-TrafficTypeDiagnostic: VI1PR0302MB2816: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:519; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /4UjtRG1czmiG3WXKRqq+ZM5oBK+XWrRH4645r7wOkQSSMgbec03uIFvVWO+VV7VOKaCaq1qtEyPWjZWkdjfikjOQ8aZZmyFiLdwabZq5D7EnmAGpThztK6BAWBglDeE/cZNIoZ4VO8Bw4lkIeVyawP9qFZI3l4cwppdEMf3xTQ4rpmhSLLW8CWuRQ01hveU+LnKmDgyW9hYAuG9n8W0/wIii6bLuyLQPaV06h+exSiUjIittKsfd69Xog1eDrcRF4znuxHKjQ/8LlVg3UTe2WmQ22h+noJcDllTFoNXeIwnMroukH8lHrcFkf90H6XWDCLpqae30gbTv0iLGvYjCSGfDUNUxUQl1/r8i7lSUpsVCz3GvQGJTbChu5lYFSrxyXv71NCeXUu7M13b0bfKD8G+9jzYmYWq25OZj9WoZ5xcXghEqvddxl3e0uVmDYg/mh7Kk83r0HljugQJAYJ5P01vrCdqZIMi1iiErMykfsA7ARc3N85yez6X6zHTIld7wv4HTnOopJ8MoM7QtK57Fw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR03MB7251.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(396003)(346002)(39850400004)(366004)(136003)(54906003)(6512007)(1076003)(6916009)(316002)(478600001)(66476007)(66556008)(6666004)(5660300002)(16526019)(66946007)(2616005)(83380400001)(6506007)(2906002)(6486002)(52116002)(186003)(44832011)(4326008)(956004)(36756003)(8676002)(8936002)(86362001)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: YrHkpBLs5XiKXV0olvqVLXE8ZHr7e+cSFnf+cs7Wzpu73CwPyrWmviIQeGZzldDC3QBvhhLjDMVY6RN7jUDO5NMhNKbG7+tB7Apt27tHM6CxHzIFy4lcwTVk8JZ69DGxcNZEyASICjbUpxFigKmMZwfsYpS+Itnr8CoOY3b/jDsqoUsZewylgggEq36Hkt+DUJ3/ZVZPi36Oe5bNfhNCU7l+k4FSVvw/pHtcK9qExYxtckrsg2owS5B/rfBxaGSKfS6eyT1Oh63BYEpJh2VX6sw7uWIMpar28Ewdps1yGUZa6QAnvbezboX0T7QAeL5xoMSoT6XvvPUtQp1jy5LkToctyJhli0UySvYfr1RB9yDaRAaBg/zCLh1yTQQDppdo3h/Ua5sLLNjwXEdKTUGSkorwPjHX/T0+fbgqwlFTgFk1G7TQxEsXWT1U9M9/LPb928L7hMBZeNmigPVxMBJeD05Uy34DsXdkdi7xNXVvPxJNlDyIoXtEdgMlnfutDny6rRxvru/5Jhj05uC7jfLSYBdZ+3TwAn86cARAOVWhMpMDlmu35ttegxPQtwBPQ261Axw8hrJT7/8V3UE8xYnzFpYYmAR3jU7v5r4BeUw481t53M7KDEDAGYyKb1DixrnSt5iL08+Gj623eCvPqGcf/LrCzx/B65bz5hAdaZGDH3rZZFleous0DY78/71gdqYrDNRRwuf7/XYxAxrBW9ER9BqnGo65D392ZKYmycq954MSM42kyMTrjV+zWTnv7mqg9Yl9P7cMpW5dtFWjZay4LkcehRXKlGHA6Avpr135Yt1HkUJASJKNrV+WDaf9nsLlM9R75ff7jZxH+HYi9Vu328y/LomnoL6pNw4yJnLIPeZnovrDjB+9TT/QiLPpvvoSyrbyxvA7+Mj6eVfEoW70zXPBjHShQksZGmxujWkAXtdQxKVSPwKypXLbewLhvlxMkFKRwN/30UeQ5v9GXuOQ3K5TxFjIp7lSfOP1Jfi+ORibAPKzA9EvPptxbpih2MCQklxwOlCmIqO4CNn865Dan9JZ9278hW0Oqi/VmkeJxYkrQOVYeCZs0iVehWm6XQLF X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 66fda113-3351-4d3f-0b83-08d8c78ea11a X-MS-Exchange-CrossTenant-AuthSource: AM9PR03MB7251.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2021 15:24:27.6242 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Ub8GrlfofesbkNFx5MVMc81htx2t+iokBVmRtLGYUpad60zyMLbZcQ/DvUNB9S21Ku+Q7CvxqLEl5Z3LtNMQmg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0302MB2816 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean This adds support for things like "#partname" and "0.1#partname". The block device parsing is done like in blk_get_device_part_str. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v2) Changes in v2: - Update Documentation disk/part.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/disk/part.c b/disk/part.c index 39c6b00a59..aaeafbb0b2 100644 --- a/disk/part.c +++ b/disk/part.c @@ -692,12 +692,13 @@ int part_get_info_by_name(struct blk_desc *dev_desc, const char *name, * 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. + * "devicenum.hwpartnum#partition_name", for example "0.1#misc". devicenum and + * hwpartnum are both optional, defaulting to 0. 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[in] dev_part_str Input string argument, like "0.1#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 @@ -707,29 +708,31 @@ static int part_get_info_by_dev_and_name(const char *dev_iface, struct blk_desc **dev_desc, struct disk_partition *part_info) { - char *ep; - const char *part_str; - int dev_num, ret; + char *dup_str = NULL; + const char *dev_str, *part_str; + int ret; + /* Separate device and partition name specification */ 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. */ + if (part_str) { + dup_str = strdup(dev_part_str); + dup_str[part_str - dev_part_str] = 0; + dev_str = dup_str; + part_str++; + } else { 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 -ENODEV; - } + ret = blk_get_device_by_str(dev_iface, dev_str, dev_desc); + if (ret) + goto cleanup; + ret = part_get_info_by_name(*dev_desc, part_str, part_info); if (ret < 0) printf("Could not find \"%s\" partition\n", part_str); + +cleanup: + free(dup_str); return ret; }