From patchwork Mon Apr 12 22:53:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1465502 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=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=uOX/fIJV; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FK3vB5Pp5z9sVq for ; Tue, 13 Apr 2021 08:53:58 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A6C5180C77; Tue, 13 Apr 2021 00:53:41 +0200 (CEST) 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="uOX/fIJV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 590EA81578; Tue, 13 Apr 2021 00:53:33 +0200 (CEST) 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,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0605.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::605]) (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 DD65080C68 for ; Tue, 13 Apr 2021 00:53:25 +0200 (CEST) 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=OnC404zpTEL+H/xxUxmo0plqR6hFm8Hgs4n0SNITXMwrsl6Z9YxgyuZdE+6S8f/5jbzGaOdTMHEUL1fpxR+KpKT4SAzh87D5Y2eYOy/XoRLVG003Hjim0nhH4cwPMHHjx+DMxWWbWoFwm18nffkD4XGK48BqHmtFgM4nIuxcbYIqWE/ezcC9VMtcKg9ZcDm44kJiSW5n1+IFGekn9luVoc7X/dAq2gqr6UYdjqUtmBB4AfenH8D7u6FPJp/oSDqgGhz5rhYNucXr49hyZT34AtzDZ0ZIZlVUaGXQts/a14Gj0QUPUpZfDww8g9cssLcDUpGRaivn7SUoC8YrgmDnUg== 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=mwLROQ4vVv2jS1/iaI08mxADE4xWIP1hf2PJPWqucNw=; b=IHTHXpgl1v6KHZtm8Jp1E9Tmc2eeFHaPbw4HK4wE/Iz4g2DXif5uYoDxhw+sI1n1VMT4AQ0dc4wp21stSc6iA1QNjgB8iFhaGXoAUbRzZvhdvJABoKXE7idqr/UGJms2tRdpTGL8MX/s9hcqh0M6RrpTDEk0vnQ12yMHLjd07Zd89O3tkfumyO9AGyhHYckruUql19yFu9UQXoB8QzZAmgXbMoOh00jB15m/TpqjUBa27aMPVvyRsxDyg8MWPshWqOrhkplLdqEzQYjyfYAp4ya/CluO8CWDcjhupL5HZc9aj+2BV3eLBz+W3ToEpxYCEbtB7LgcaXXHJ3lp015k/Q== 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=mwLROQ4vVv2jS1/iaI08mxADE4xWIP1hf2PJPWqucNw=; b=uOX/fIJV87WdoxbewU7wpjJOXrK913FLUXBr7VU0UY68jZ6DuVgDXD8nNYwl3eEcV/qnig+1BnMAK+3RHNr6Lva53vzdIspVfiPSUtM0LUHOGqO0/4SdVBZxLvWvZ9C96jRP1txFqQada0cWsJ02x+lrcIr0Sw4lWesmF8dV1QY= 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 DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DBBPR03MB7051.eurprd03.prod.outlook.com (2603:10a6:10:200::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.22; Mon, 12 Apr 2021 22:53:22 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922%7]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 22:53:22 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: Heinrich Schuchardt , Simon Glass , Sean Anderson , Corneliu Doban , Joao Marcos Costa , Marek Szyprowski , Niel Fourie , Rayagonda Kokatanur , Richard Genoud Subject: [PATCH v2 1/3] cmd: fs: Use part_get_info_by_dev_and_name_or_num to parse partitions Date: Mon, 12 Apr 2021 18:53:05 -0400 Message-Id: <20210412225307.3217317-1-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BL0PR02CA0105.namprd02.prod.outlook.com (2603:10b6:208:51::46) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by BL0PR02CA0105.namprd02.prod.outlook.com (2603:10b6:208:51::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Mon, 12 Apr 2021 22:53:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 835b0ce6-8495-4f38-6815-08d8fe05c627 X-MS-TrafficTypeDiagnostic: DBBPR03MB7051: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c6ImHC4SJe0pxx3aYxksxJQJzDf+zRa09GoGILYfiIRMaxb3NUKOvkh1/nxOV+elQFLKF8rlg4n1YcHh+kyOpcy5uMmMdpGYy1vWaPuEJALnQ1oExkFSLg7C99l2VV8k/4b7zYPMVDacpoWTSM8dAp4gosM+Owh+/Mjj/jP0LvFyHLKR/3cj6amVx9zAy4yHwDDrMt5Jl86dHDH333p8ugh1f0kB6CSEbavM5r8mrwepv3Tof6fSOVb2zBWIVWTjIq0MWj/go8lTj2O7FlcgRc7SWZBz6fnusr0S2cIyilMOcMvb2ALMozNWB8WgkLp7zQC/4bPN0uzim/P/xLi4nMqFpd1IqHLx2EmFGdrSuPlk1DQf7bvhs5SEyc5HS5r83ipxc0MdTiDf5rxjeUyTT3bstXUxVXFB0PJ/ISLAHX/4AfsstFjpOSVin8NpPA3JeDT3yHRoB1b9sVmOXZXAA0QrFLkyBET9bDic4VL5AMhm5SRDxiLlrLrvrNdIgvjIxbQC6jqaloIe/2O0xrnWk73XuNLr6RizwyAbUvuQzXn4p1th1NvCRFO3GZpbZVHdnzvCSi8EqG/LQ9nz0bXDiq+fAwL7VsE5zjZjm0dqwoBUW7hJVeBI0RviHIIUQJsJbjnio1GY6dGjRiYjlXe52A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(396003)(136003)(39840400004)(346002)(366004)(956004)(54906003)(478600001)(5660300002)(66556008)(66946007)(44832011)(6916009)(2616005)(26005)(1076003)(186003)(6512007)(86362001)(6506007)(6486002)(52116002)(16526019)(66476007)(8936002)(36756003)(6666004)(7416002)(38350700002)(38100700002)(4326008)(316002)(2906002)(8676002)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: GWFNyPdasQXKLMcOLlsTU0jVx1WTL1rcCE+4fcnq6eF36gEXAGY9LmQ/TGw0MjmbL5ypfzh/O4vUNHAsT/SYmT9Ocu0z6MhB4iSrkNsMIwU75lD85xXQS1BgtEYv1kAB14bGtHyXGBqoDOAsJnGwrePI58q4ZjlHkNeaRd/qMq7QN8abtKr4QKjRUwwEoetLQB2y1tuZkavY8ai5hFffIWdXgYvzJw07X1NiMWmwBX4kZ7+lEvqnW2mlMcqsPLCSAaunam4JB9UU7pcFRzDBIuu8dEiVlvy0ts5NhHMSShhXLavDfoM+qXhq6W33/niE+AzDK5ZY7d47we5D4cVk/1QhTJ96AWViDJovWD1B8M9/zACruZz1fuuhtz3KbEwo2Wc60Tb9S2SpxGFRZttFncPXV8ghS2PCyZMHuxGvwJT6ue5wiDE8lcTNTgnwAc9/tSbCq4Bjw46cbMhl2p72+2W8n018yZmcJVfGilEFL5it7l9nIdcUeFg5Soa8pw1K0ZDN6d3TAPPpQVzt4humJ+4nl4AeLRM8qOcnnMEI52XHY3eRM5WGpzaEfqKFOVopyfv5a8dbIiFGh+9PWRevVEDlkjL8QPmrx0D6I3MLzBLZb2YrIyUxfnzEGjAdkobgQR02nDbUI18ULekWdkMpq69pjV3crDOoMQCnMpQjrdUPNh6pfGq/xrsEz4n84TQL8Hs9GHJFVMZWdtuwAgdd9GUAeGx2l7FWSItQcaxsgSdwU6KomCpf4od2nbGwZknBeHzDmC4CF/MZwW21L0+7QWAem883TMlCxbEPpLyQdkiBJChzgZQB6xpKGwLoe2UClaQBZMEDEIxSIQ5HsioRn5/Wg+oBC8pPWqZsKrpKPaUaJFW/wjhpeMDWjRnQdctkVAk6QU/0JiWd5GYQaT4xtXEokUk/jG8pZ1Vr8ScxxpiLIlYwGaOK/sN/JNSk3ltYsA5jjc2trHzk8pvRVUTlOg3AIbNmiuELhz660QQiBA9T2W8NQpx34A3+5InJsBuwfqfB2Yms0DLW54inZQdCydB/HWTgNGbHZA4j1pH+J0CXQpcG1qKdvb7MjME5MPdhs/+Y2h/WBUAwSZ0DO88xsgpfZeRnDZqpFIGYNcTALm6r4NlzeAcu5+yCWo2kqHmmz6t0lnfK2YOsL6yvWCLPAIPNRTy7ZKSa8q2h/Ar/7P4cZJ2RPNCMCOtp+oHZusnoMqH/yjrnZaLHsdskkf0MjquXJnHpbByKVFkB7McSC4KRur2Ye9aFnNKXDDkr5YjoNacy85xChV5cDd/qMB4B/gDqq/71fg3wfeeTKr/Y1W47Fv7klDyJ3RHK1CcVsrW7 X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 835b0ce6-8495-4f38-6815-08d8fe05c627 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 22:53:22.6990 (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: qnUICjrzm/ECiO+gsaNh5beNDqFtDwZJQIUKfJXp6ECjI/bhrX2J0m0/hfWWxXCI8wB5uNxNOBKS8vqqaLOiYQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7051 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.4 at phobos.denx.de X-Virus-Status: Clean This allows using dev#partlabel syntax. Signed-off-by: Sean Anderson --- Changes in v2: - Add stub for when CONFIG_PARTITIONS=n fs/fs.c | 4 ++-- include/part.h | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/fs/fs.c b/fs/fs.c index 900928c394..b7936fd4cf 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -385,8 +385,8 @@ int fs_set_blk_dev(const char *ifname, const char *dev_part_str, int fstype) } #endif - part = blk_get_device_part_str(ifname, dev_part_str, &fs_dev_desc, - &fs_partition, 1); + part = part_get_info_by_dev_and_name_or_num(ifname, dev_part_str, &fs_dev_desc, + &fs_partition, 1); if (part < 0) return -1; diff --git a/include/part.h b/include/part.h index 7f78271a98..419c859708 100644 --- a/include/part.h +++ b/include/part.h @@ -230,7 +230,7 @@ int part_get_info_by_name(struct blk_desc *dev_desc, * @param[in] allow_whole_dev true to allow the user to select partition 0 * (which means the whole device), false to require a valid * partition number >= 1 - * @return 0 on success, or a negative on error + * @return the partition number on success, or negative errno on error */ int part_get_info_by_dev_and_name_or_num(const char *dev_iface, const char *dev_part_str, @@ -275,6 +275,16 @@ static inline int blk_get_device_part_str(const char *ifname, struct disk_partition *info, int allow_whole_dev) { *dev_desc = NULL; return -1; } +static inline int +part_get_info_by_dev_and_name_or_num(const char *dev_iface, + const char *dev_part_str, + struct blk_desc **dev_desc, + struct disk_partition *part_info, + int allow_whole_dev) +{ + *dev_desc = NULL; + return -ENOSYS; +} #endif /* From patchwork Mon Apr 12 22:53:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1465501 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; 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=KG1HwDFz; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4FK3tz53lCz9sVq for ; Tue, 13 Apr 2021 08:53:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DCA3B80C65; Tue, 13 Apr 2021 00:53:31 +0200 (CEST) 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="KG1HwDFz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1D53580C77; Tue, 13 Apr 2021 00:53:29 +0200 (CEST) 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,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0605.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::605]) (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 8732A80C63 for ; Tue, 13 Apr 2021 00:53:25 +0200 (CEST) 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=gxwzXaJkRX74gWFrG1zZ1B6+xUfmMp/CeNfP4OdyaGZ24d8QT2OEGf8GONiB3AaePbtxzHBgzWT2TpxFdKH7YCn5esrrs72ejGUPUHrhRnOaGqRltFBHRpD1l82si6wIRNhqU2u/zv2IqNWXeL7SLSSSlkKKBWzuBymcTgjDIKGWibPdlf6dEFbrXgXGDnNR1Pjw+RBIRn8drKJoA6DbCj8w/yiOSTeViDpitKPKQtbh241MRZBww4WJ+AYXKfJjLvRNZ1VGUCf1H3wcZGP760Dqwu9sqUh1U9cPk79b8KP6vP3ZScLVm8Vmg5q3LbKDdWxBqVo6S8zyUDLUM2PKfg== 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=OAJ+r7XVh9UZ+uXvnqXNojf/VLQmonNJX15OwGfJW+I=; b=bexMjy7JJ0oGPvP5gGovF1EzK3DEnj2U38nSwCDij22RudVry7IdRcPtxKGqaxhBhAO4KTrzyPsD9ebf9qBsC3M34uA+n4GothF6dVLmhtIgmI1k7EH78ZBu3hjkLaIh93JjRkZ+HakFbDUvsonEleQf0y5YVdZsJmkdNxZqEEYHjeYlIvk0YSj7DA4dUUXK9C4Z18Jmfdbo0uQctaRpVBdBikz0lklBD60YhCP02Pp5yIU9L5a9lVqmOK0XVx9iD4LFA6bAmD2TSYwEiVPP75bSJ1uzQ4AKk5nw3b4TfwL/vsBDs4er3wav3LHom8qcbtl8R1NlVUTXG8ezo5moaQ== 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=OAJ+r7XVh9UZ+uXvnqXNojf/VLQmonNJX15OwGfJW+I=; b=KG1HwDFzF0irwty5JQ9fOI85N6QbxSKbCAOFUEOhl2QQ13tLx9GpK7sEz/qd6x4/uYbkQqrpG05HbMG/w06GecZajZDZjy8R/19ZegMg0S4JqRN12CgBShKiZRwMk8TzaannfGxaQcpT2GWVUvctZGMhYJcPxvyAkhjXU1p8me8= 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 DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DBBPR03MB7051.eurprd03.prod.outlook.com (2603:10a6:10:200::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.22; Mon, 12 Apr 2021 22:53:24 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922%7]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 22:53:24 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: Heinrich Schuchardt , Simon Glass , Sean Anderson , Anastasiia Lukianenko , Andrii Anisov , Oleksandr Andrushchenko Subject: [PATCH v2 2/3] part: Fix bogus return from part_get_info_by_dev_and_name Date: Mon, 12 Apr 2021 18:53:06 -0400 Message-Id: <20210412225307.3217317-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210412225307.3217317-1-sean.anderson@seco.com> References: <20210412225307.3217317-1-sean.anderson@seco.com> X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BL0PR02CA0105.namprd02.prod.outlook.com (2603:10b6:208:51::46) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by BL0PR02CA0105.namprd02.prod.outlook.com (2603:10b6:208:51::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Mon, 12 Apr 2021 22:53:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e774ad0f-2e9d-44d4-eb3a-08d8fe05c6fe X-MS-TrafficTypeDiagnostic: DBBPR03MB7051: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MRbv1WxCmGMRk3LiKpG4S8ZKnm1bguFcyhZ3y9BVJmv3uD/CIVjvDbr68L1XA+lAVqmNuDP70RBK5V0vSBfLh8SzARvwfzuEgsjcEsOkyybUOnovIWWGpfSVyNWqjShq+48cX4Ww7pmsn7RYN6Qg7SS3YjWI2i2acW3iavqTBmeeQRaOehxw6p/66CiAyR30COx9oR8fj6ut7XpDQl1jgDsbhRfBIqCimvWTOqMIkTmR9lUki1yk2FzKE77olJAp+znX9RmToAO18Bqp+qedgelIFFtz0ojkjlC0GoSgkiP+/cyH1KCVexrqVNLuYxbBopKFdCHvkSO/5adD8LowG8tcx/RuJRvYFdqjZ+1pNbQIef15yGpup/8LfqF2XUh9C26Yc2pmy0Jsp6NPFBOClNINe8I2X/FT/+RAccaeUzzP3dcjYVS3UIcZAE5iCFlu0ztn76emldp/lrrLv2COi9HmZ5Og8KMgd1aM7tezJO6qoOQHD+um1CMJ2TioxN8L23GkVAH9+kPVoroPK8yCAHNE86v+4GUZwoE/LFz5vOrR3/dKEwVSNCWOXOwr/i5qtJVydbKPmBwVC/XKeoOvtLxwREd76gLbGNBE7GU5Skbc9522cDba0yw3+Qn1rc0lm02l5yy80EoiYq4NMxJPkA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(396003)(136003)(39840400004)(346002)(366004)(956004)(54906003)(478600001)(5660300002)(66556008)(66946007)(44832011)(6916009)(2616005)(26005)(4744005)(1076003)(186003)(6512007)(86362001)(6506007)(6486002)(52116002)(16526019)(66476007)(8936002)(36756003)(6666004)(38350700002)(38100700002)(4326008)(316002)(2906002)(8676002)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 4W2rsxAPARbZttVhhfItTWfh0H5vMhroKN7b1TSXiYIhz1TgkVWVeZp2GuQ9JwH4PzzsFYKKQpNOfGnnWYAILPlK8eleFEURe2YURPcCUttfmvqTAdoFg5lDChMr4ih1jBIjT1Cs7Zw4hjwDzpZPO3YTcpwyFydLA6QoAfwgJWAq+meFhronpEugrnlBJRwKsGpYWUMS4SpQzhHGvKEVT9SFEkg/d4VtsSFnlDisimPAL8c/L4TpnrtkHOBPVgaqMWbxX16Q8/Sl9za8ODs4f6zP0CiFaCUJNiMW7eqo3nb0Ih2zfVUaVIJ/Jo9uR2D3/v6eF/vCASazIccCrkRa85GFPfbrRvBL4O2JrqaKQRnx4djjmWAmQNrBFo1EGOsSFZtpHATC4z5TRPM0RIezPVvaKWnzAut97cO0LgquMDTuXjPUHZCUb84PHRPcer6Uc5/mDKLXWTKP/vKYsKmKgvjtIfLSts2lPqyJS5vod/NuT3luaIhmGZZrffliC4eE8DSSY35HJltpZYcHMC1dARlFqJInJrals49gft8ImNW3zMoqjHevAmjuXGblpZD4/NK0bJjmYhfL9U7BH+/tnC2c6nHw+g7fPvPeowiZdHd7WDfBiXjQOflpCRzt+KBCvxFqYpYo8Rjy3rrp/T5k7DpIuk/CJkz8NNUFhnJGpwC1A4dgYtXq9ah5rHROW5v29ljbHP8YkLzQq+XwRD02s6n5LG6oY+KUVbCgGNcr9+rjU++sZQD0MqkS+9CGeYVBQOboeBz2vnVLzGTznxm2hnv4pCYCC8y28AuGpEk1DhGrePrxyCMpPP8cYgHAzJIR71b4O9gEkqsVKI1FrwurnZtQqkzKssc0mOFQd+j4MrK980nlbIsN309JrmK9F55/cKybG6T6BFB4snHqzuhKPJjw0Z2XcAND+mOgY2hav2bj+RptcREFdlNKAVjeYiCGiW/yIr86Lox84J8v3i9WNJCYDyK7e8ZIgCqzLy/eLcEKsZEu6dJscO99EreP8kHAfpO8izii8PaFsp75xLok5KPgrYW39Oxj947Pg+vUgDICTxcXofxv7uEqTkgcN7xNbTHqGadR96z+z637mXE7aEMg3HdldIi9OySHp2vOlubyYAuQPzv7i2gY5X3FVM33aHc9K/jxNC6e9DcWb7979qxGL/ykbPFES9pQKEEDWtNF9sjbr/99uL2nHBqh6T7vjqs3fthtsDQfEUvA29HXScoHrpVIAYCZGXvhDiTT4lSRAhVToN60I3dkw8Ej0/fZQYHWrf4vqSgeacShuEW1UQP1UwModCbCo9QRzvudH8V8oOQRf+lVAK0Gxi+hv/QI X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: e774ad0f-2e9d-44d4-eb3a-08d8fe05c6fe X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 22:53:24.3954 (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: qxbbHmwYuLF+NVlshR8oE2A3kpX/DLlsLsYXGGpQP4SQ1A1j9xhtsMbE/d4vhJJeAgdt07UpuaiKfuiOQQuQbg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7051 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.4 at phobos.denx.de X-Virus-Status: Clean blk_get_device_by_str returns the device number on success. So we must check if the return was negative to determine an error. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v2: - New disk/part.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disk/part.c b/disk/part.c index 80ced2ba88..5e7e59cf25 100644 --- a/disk/part.c +++ b/disk/part.c @@ -725,7 +725,7 @@ static int part_get_info_by_dev_and_name(const char *dev_iface, } ret = blk_get_device_by_str(dev_iface, dev_str, dev_desc); - if (ret) + if (ret < 0) goto cleanup; ret = part_get_info_by_name(*dev_desc, part_str, part_info); From patchwork Mon Apr 12 22:53:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1465503 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; 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=6qMAsb8Q; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4FK3vM43Swz9sVq for ; Tue, 13 Apr 2021 08:54:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3EC2E817A5; Tue, 13 Apr 2021 00:53:47 +0200 (CEST) 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="6qMAsb8Q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E55A380C77; Tue, 13 Apr 2021 00:53:33 +0200 (CEST) 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,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0601.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::601]) (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 ABAA280C6D for ; Tue, 13 Apr 2021 00:53:26 +0200 (CEST) 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=ge/2EIrzXnO+abr47JZqlLREypNK849IPQNSWK6sWkpuocLIgR0N+MXZY3Ckbup0HK9zKe9w4JLcc0bJGRydyu7EysfFYhylL58Iz1WYsLvbx3rMSM4ITof5Nbzcee9BzQj6HKCwsQe8/CNE7Cs/35b7YJJYWdshnVBC8WR4+jz7nnyCcTsLyhlg+2QrgAPefkhLSbyEkiEppqLERoIDne47glqzZGUNr8SaIldp5AfRGZZAaoHEk5NIPuKeJuRA7Psok6Y2oYkbomgBpFuWTvnO2gWxPtecicZkeHKs33xyL11DiEaQFpZMwRwbkF+RdnehFLDs5XDpIslGfZP+Xw== 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=aI1uCe5ZFuviiJhytMszF7Xr2YJnpiFbGU38KURVKHU=; b=UwOFiHwA4sxJZ8fynPZiycl9xuk7eM9+GZcRV/Pz+ifWIqDohjjZMi+C/PsXdrmo0t0zPGufQAfsHYHgCjpFxRZjiUClLJBQyPNpgIdQdoP9bMvJcA17rUWJPbD0ZWGD+yp5ojS7Kf6Kjban29gOvmnvA8IIrzE4UaTW7OxcFbkDEJHg/zQfCBfuS4ImH5oJ+rYKdh3zjNG/DhMaRGSqbkwN5Mj2ftfqYGNJcQ6Jy8/0iNeSz0IdJXr1r9b/qlh7DQZAHforwJZN4g37qf9MrtgUzbm1mNxbCi5cGm4Pxsw7Rgh9MDPhV8d7KfqKTJC2AwmFQr1fhRfUHZXZ4RDQrg== 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=aI1uCe5ZFuviiJhytMszF7Xr2YJnpiFbGU38KURVKHU=; b=6qMAsb8QVoHD5jFM4e9BeeczL5HwOCYcInY6VB67rK1p5RY4gRwx82Lm8TUfZLRyqQPWNGB1Or2HaBT0pOh906Bbl8FEflKgmKVzBpmtyRgJEd4gM5IzYgXE02+ThpVZExMK6kYcTWIhCqv/rYvrUqJroy04la1MCInv20Y8qWY= 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 DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DBBPR03MB7051.eurprd03.prod.outlook.com (2603:10a6:10:200::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.22; Mon, 12 Apr 2021 22:53:25 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922%7]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 22:53:25 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: Heinrich Schuchardt , Simon Glass , Sean Anderson Subject: [PATCH v2 3/3] test: Add test for partitions Date: Mon, 12 Apr 2021 18:53:07 -0400 Message-Id: <20210412225307.3217317-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210412225307.3217317-1-sean.anderson@seco.com> References: <20210412225307.3217317-1-sean.anderson@seco.com> X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BL0PR02CA0105.namprd02.prod.outlook.com (2603:10b6:208:51::46) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by BL0PR02CA0105.namprd02.prod.outlook.com (2603:10b6:208:51::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Mon, 12 Apr 2021 22:53:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fb14dcfc-2103-491e-0020-08d8fe05c7db X-MS-TrafficTypeDiagnostic: DBBPR03MB7051: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uRHIPWC+DW3saCtTuaeYJKAACYYLMKsZhbe2jvh5iDtkFdHUwwCXQjSDd2gUFD7a5FHII5f0x3ST5jB7DjagrcS86O8iYHHzXgpJosTupSnnTB2/W8Bd2KCDU4mo2ZO7ZmkLa95P2l03xyoGWDQoLz9L/QYZAZqIt5dmy4cxbQuE3jA+1vfCpjbu9sDma/717Ojfq6y9XThD/ZDa5IAXx84s+aV8YWAVDQOttA0y6YUHeH6JxArbvVqYgbFwiiPhkpilXWlLHU06dJbb1W7LThoDPVmbYHd+Paa1+LrkFAthEdnLdcStdXqjwBpPRXDqNxfqOHeZJdd7SK4wMLS1CYVNHUzNo1aNPGupxvLXTl5/XhRp+54rF/u0EZzuVPv2EeU8bpiDR88HAFCHBTn48JqdKn8evZ76teHvV4K+3yYeYfBg0T27RDX6MfcPd8nq4f4LrV70ffi9Dl0/hNBV+Hj0uTymlIllc8Q6RHPzcoecbbV9pK3szKJxsXrmMaMlyh5SRGPpgsYccsOl95sOCmlHtJPU1eol7Yq1JKXKBommWRntG/UZfaZVQ+JYngCRYvVPSuiEYUv0R+cmmxsZbEiLz7bWIuUfSOxyySFLXuvtDvt4fw//J3pj4/PWx9NSJnxA9RA85X3ufnyd9eC2XA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(396003)(136003)(39840400004)(346002)(366004)(956004)(54906003)(478600001)(5660300002)(66556008)(107886003)(66946007)(44832011)(6916009)(2616005)(26005)(1076003)(186003)(6512007)(86362001)(6506007)(6486002)(52116002)(16526019)(66476007)(8936002)(36756003)(6666004)(38350700002)(38100700002)(4326008)(316002)(2906002)(8676002)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: EauEgGf69coFBEqdyGypZ7FP/LBUwg8QIK/pRPPRwH2lWigysYadFlVYS+lZq/kVZaRUc6Sg2/Juo6S9gn/ffbnvGbFGnMemXuJ9wxxVBn48s/3mChlJpp7O8b6M1R773ENyDCFpqSdn/vjZm3dL7V2lp7iVR8i2sUsXEUpiyntZNJi/FwpwFK3mRY+Fht1WZHd22bJMafNXJdD9q3A6m0Ca8ibJTRBXIfEbYo9qGGXIwRkRKnKHXX4dB9AJjsFXz5f1R8K8QxbfEHoKx2HDkN3XngxnKO6hVal90q8rYPlflqqKobz5W4tGSsqiIl/NG66lqwUGCQa1BrDE/GYjfUNLds9PVHYovpdaJUyeSnEojhx/PEkZKPDT9Tj/I3RXh4XcQtJpNWgDhZv+C/G7q6xUgTVIKauC7JUT2k2d8WaxQqtCKKhjq3tzgh8Pn1moER+Cb6c/1MIdWZFdBonpJkfOdZzkLa2SWgAcOmnQbxi6CWLfmnUcQt4/reSo4hrISADGVY4iu2XjfH2FKHmAgTKauKXHbL0ZGuN2AzpjS6aMX1wZwpv04mJQnHqDYrY1bJkx4MGw3fCDGUtads7WeLU9NxCCjz3ORcv9FoBdzq//aEWlmpqwNas1FlIR+NsNzqIB6dcJwh/wqRn8GbyB1iS2eHuojiWQ0BRU+FEM5OcZawwGpas+PUKuMM9OKsKrgMI57J1eJo75Tp1yhGJ9LnrUw3Igp/y8LW7f9xbNN7vaQ3ge+MqGRM+DMFT+oPBZ1mtZVdmuP4fT21oDqm5JqHd7Sm6XwmW5B8cxDuhmd6hbRjHxD/kWrvzkAnRas4QR67QeNfz3auH/VoqrpR07u523lK32RbBP8+ARFJYotXrWUbgdKHgiMOn26WJmUScB7HnwxPpkyxNm379usUZaBb8bpCThAHhrV+2BonT1AkViLcQp8CYEQUsq0U4oRCnHDCZrmJQoqgcL8n1U1d10/yX6dLfDCqqyR5sWHMhWvlNU/1xShNIO2m7zNDWYZals/Wb1RE0FDe1xlSYgFvPJCAafJndHUT1SNmV2rdCmPRAR33Fw8rDdYUaJLp5Xo7WtyOQfKzzIYhYK60UcArWR6S+4y9bORY3hypDkFjDpCJGx2GsSwehWk57AqcsFQt9TbHmEKci9jtTPuGHxFzJevsyom5JAAbP39oag7SleoZnsgJtbDN+jGCC2zZbrYrab8RekXTqTSwZ+Zl7+L/h6tWWKIr3ETZ3vRWkrDl1B+/vKByBPsOl2l5LrntuCFpWp3LONW0GOLNu8TsJJWIS+WF+pPMN0K3QxmLQGcp7asELC2SFoTEJf7TF0sVXXOi8A X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb14dcfc-2103-491e-0020-08d8fe05c7db X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 22:53:25.6975 (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: s/e692kZnepo/cO/xiHZfZnxmEhrLSENZ4kWhbXO2K1IE20NLy9d56aL5qs/3ZyzPgAyhnoXci0BKXmBczODdg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7051 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.4 at phobos.denx.de X-Virus-Status: Clean This is technically a library function, but we use MMCs for testing, so it is easier to do it with DM. At the moment, the only block devices in sandbox are MMCs (AFAIK) so we just test with those. Signed-off-by: Sean Anderson --- Changes in v2: - New test/dm/Makefile | 1 + test/dm/part.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 test/dm/part.c diff --git a/test/dm/Makefile b/test/dm/Makefile index f5cc5540e8..7d017f8750 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -98,5 +98,6 @@ endif ifneq ($(CONFIG_EFI_PARTITION),) obj-$(CONFIG_FASTBOOT_FLASH_MMC) += fastboot.o endif +obj-$(CONFIG_EFI_PARTITION) += part.o endif endif # !SPL diff --git a/test/dm/part.c b/test/dm/part.c new file mode 100644 index 0000000000..051e9010b6 --- /dev/null +++ b/test/dm/part.c @@ -0,0 +1,76 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2020 Sean Anderson + */ + +#include +#include +#include +#include +#include +#include +#include + +static int dm_test_part(struct unit_test_state *uts) +{ + char str_disk_guid[UUID_STR_LEN + 1]; + struct blk_desc *mmc_dev_desc; + struct disk_partition part_info; + struct disk_partition parts[2] = { + { + .start = 48, /* GPT data takes up the first 34 blocks or so */ + .size = 1, + .name = "test1", + }, + { + .start = 49, + .size = 1, + .name = "test2", + }, + }; + + ut_asserteq(1, blk_get_device_by_str("mmc", "1", &mmc_dev_desc)); + if (CONFIG_IS_ENABLED(RANDOM_UUID)) { + gen_rand_uuid_str(parts[0].uuid, UUID_STR_FORMAT_STD); + gen_rand_uuid_str(parts[1].uuid, UUID_STR_FORMAT_STD); + gen_rand_uuid_str(str_disk_guid, UUID_STR_FORMAT_STD); + } + ut_assertok(gpt_restore(mmc_dev_desc, str_disk_guid, parts, + ARRAY_SIZE(parts))); + +#define test(expected, part_str, whole) \ + ut_asserteq(expected, \ + part_get_info_by_dev_and_name_or_num("mmc", part_str, \ + &mmc_dev_desc, \ + &part_info, whole)) + + test(-ENODEV, "", true); + env_set("bootdevice", "0"); + test(0, "", true); + env_set("bootdevice", "1"); + test(1, "", false); + test(1, "-", false); + env_set("bootdevice", ""); + test(-EPROTONOSUPPORT, "0", false); + test(0, "0", true); + test(0, ":0", true); + test(0, ".0", true); + test(0, ".0:0", true); + test(-EINVAL, "#test1", true); + test(1, "1", false); + test(1, "1", true); + test(-ENOENT, "1:0", false); + test(0, "1:0", true); + test(1, "1:1", false); + test(2, "1:2", false); + test(1, "1.0", false); + test(0, "1.0:0", true); + test(1, "1.0:1", false); + test(2, "1.0:2", false); + test(-EINVAL, "1#bogus", false); + test(1, "1#test1", false); + test(2, "1#test2", false); + + return 0; +} +DM_TEST(dm_test_part, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);