From patchwork Tue Feb 2 15:23:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1434781 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=FA+qpQOV; 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 4DVTBg49KRz9tT8 for ; Wed, 3 Feb 2021 02:24:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8297E8269F; Tue, 2 Feb 2021 16:24:29 +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="FA+qpQOV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9658780829; Tue, 2 Feb 2021 16:24:25 +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-am6eur05on20605.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::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 C159F80829 for ; Tue, 2 Feb 2021 16:24:22 +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=eVZR+kwkWDSFTj4hpgdusDf4lPuW02gJ59r1+Qnl/R1412YWbvmka77aJuWd9nYjIpy5diO9DgTjO89wUhOmuBVptLyFjeiNIzlOZ+r1Bgh14/K5mLGRCBvSyYHAypmia7/cssivEhk05n74rpQCho9KdyG0B6JYyKsG26fEcRHo17Ke0/XVH2hzWXTVjynw5WYbJpregGeNl6hmyx+eE+duIOJrT7eVE+CukEXpyI6NK4hPbSZZcC8lstsQy9djNfy0POmhFnvMataIYWB6TFwUIBp917yBj/QnAoSj5uZpj2DE/eaTzd3JCUmfMds0RuZzJoa1U9gG904cwrsBLw== 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=BM0y18CTXCv3ks7mMHXWWBs4Fy7b5cE3IwDf1sT3Rz8=; b=Nve4LRHyueYAgnXV6LE9jV4VVVuvyb0JVH9rGehKQbcqQul4//fvRQR/ZiprV3Dpq3aZ/qp8yKfFeXuer+p5cC4y5Ul/kQWlT4bFEEeZEOdzbgZVeNpdNcfBplbryjJ6kC5OIYGgkGTk+c4lZgwol0tGhNTg5NG2pr+TmSM6TXw8Bnid3mz/XNaD5U+hGQsxN7z4rWc2shbgEHJNDEfFZH/C6b6K8Xiwm4Kb1qlugd+RETjB1LkS3Uztctx/5nnLxR/c/+trCDcNBoNqBk7IGuemTsOfqlMccg2c+b/pkR39XXyACXermU5uO2o5GI8I/IXvl4dHMQKaEPGbn8kh8g== 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=BM0y18CTXCv3ks7mMHXWWBs4Fy7b5cE3IwDf1sT3Rz8=; b=FA+qpQOVfCQpm3F9ywVmZibimc73RDL9w2P8fdLMbD9XgFRgllIF2ebpdSzFzKrO8ojkDCmEldl3f5cWCx4xH32t3Kq+NKtrNBe2yAMNgID21PX6LKcCO2x2c9Aab2L9vPpFrMghvz0+M4N3chCLx75DUEF/uDejuNa7Ac6j5eA= 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:21 +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:21 +0000 From: Sean Anderson To: u-boot@lists.denx.de Cc: Lukasz Majewski , Simon Glass , Sean Anderson , Peng Fan Subject: [PATCH v4 1/9] mmc: sandbox: Add support for writing Date: Tue, 2 Feb 2021 10:23:44 -0500 Message-Id: <20210202152352.33245-2-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:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee2e5a73-03ee-4ae3-b45c-08d8c78e9d69 X-MS-TrafficTypeDiagnostic: VI1PR0302MB2816: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RMDRUpFNuMrGI56uBjeyYDy++V54Yg7nD1aps6hmyQvNXWA0j+WXELXHfcOzEbOdcKrVDcxniFbIrw5rfzYcrrjYn1PxvUvDgJ4TX+fpisbcS/CZpK8j7p3LUi3aCIdfTK4QI2zH6IsSd65VLRhcRMgRnqbFvwz/O75nTpmElh5VgQ2151GeKFcWvOHBPyknLyiccT3p7w7Uf5KK5QEm6MHZ7NsjhA3jdX/FQVokTS7cKebNVJmrnW7ZLlL6sP9zPfYTMhKUSQb4iJxG+82wXCFTOmYKzzjZdxc+L10f/iMV2gKpJLI4AUGqU2SYMXqbzzEc3P8uhq/MV8UG7rEcV49zfyBCXrugbW9RXi9KRr5CcuicIxl7tUNRHIxGkbdM77w0qJiDxwli1lKrHb5ye6istbi8Vx8+Gt7RdFc1pAGyygZe1Yr4aFH2jfXpGpCPxGbXSaUGmdoWtS0Jrgb+7pdzH6IZs4NrGU2hvRu3P1lXY51bfZs3WtwOtJAPakSRQe1awekznOLX4ATvkNrmP/ja+n53o6OGkksLh+bbHg/bk2zpZdg9kEwEd6FWIBHv 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)(21314003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 6z2qZvYyR7bFSlUTjUqThpOgPAgTx655IRZkggQzNItb0qC1LrBxnOYRslFc3byJEu1o7pALGuvQ0MS9Obd2ftf+SN7LarIAeQ4mCHkYaelaS0VXYdyoFZDWMwMx05qMhZX0IpgDUHcxb4vxAH8JEkKmG7w3DvTIHMM3vLmaVchYIpK6tQIqiAcO4uB0FpVLRjcfHNFwS1yG73HFUCjmm7Z2p1l02Fj/7aja7vW3HSX7KtZd35+LnjjHFb/ZhI9AIoh3l6n8BcEGmil/USBDEV5iNXnwtGzMZCVq/zR484wXt23Hjcg058bYO63e0isICJSvvGcknS0lXheuhyLbzMdzKXiArWTS3r9kHAeDfAcipCDcb2FuVlNts9DWcXdz4722kNEY9dk9/oqV1Z+hLUYcyfbVOH0foMTD8+4FLUg4uHkYyf8iHcoWffQ4J6RYKmoEOFGE59gSOrVNQDzfjY4Fwbkvwv3dGkC2hTo8mF4jbY4ZwfIKpJAbTArKyJOvY6yvMigilHFt96qbolyxjdh7LzHtaPxtRaB1KFXj4ehuSwRMPcUxkQYSgK54kxtnIsGTBp1w1iYXojC4osBnua1Ouwu4eNw3N+xA8SXKD2+VP/zyydfzqfghZYg6DkrJy+x9ZBTYDTFftPxicffJwv7FWtjO/YFVFy6LPapFZp+u6eroYVG3Ay3YpRvN9KHNm1L+tTo6FxsbRZTlLLQhb8S4T8/WX0ioa+g6Y7J81t3kwgaoObTB2UH+u1BzGgh2C8jeWI6EWYrdHOl+wwZxXbxYhey+z8nkE3e0dZFHu4oZUCleEGHqvjZTNyPIQ6wIaAELnrKD1ZmwogFfF5QusQ08SZYLkmW2v6xnSli9TUF3rlGxQoIG4dHMeSCxqcKbaXVzaVJZBPd9NinChOmhffPk1ifbdObbOxJgKkwaSelCgVvksNFAj+2FyJFvGlo81S4ZQyAAnQg/96eEn6f1j1cNLWD0j7Qt9feThyBV32PmAjZqYOhQYrhGetw+EFuk4ynZdbsPZjMmkbDhr5SwDGGWvo5Jst/yeRnbecyZS/ubByHuysq/7JxfK29kGe39 X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee2e5a73-03ee-4ae3-b45c-08d8c78e9d69 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:21.4234 (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: 8ScFv/KWXdxVyQQAK3cc89xC/jPXvrsge3Vl836UqFE/gB7gKZi3KQIgK40O95G2TAlMn1YXYAeaL5HQSX/6zQ== 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 writing to the sandbox mmc backed by an in-memory buffer. The unit test has been updated to test reading, writing, and erasing. I'm not sure what MMCs erase to; I picked 0, but if it's 0xFF then that can be easily changed. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v4: - xxx_auto_alloc_size -> xxx_auto drivers/mmc/sandbox_mmc.c | 43 +++++++++++++++++++++++++++++++++------ test/dm/mmc.c | 19 ++++++++++++----- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c index 8a2391d651..18ba020aac 100644 --- a/drivers/mmc/sandbox_mmc.c +++ b/drivers/mmc/sandbox_mmc.c @@ -17,6 +17,17 @@ struct sandbox_mmc_plat { struct mmc mmc; }; +#define MMC_CSIZE 0 +#define MMC_CMULT 8 /* 8 because the card is high-capacity */ +#define MMC_BL_LEN_SHIFT 10 +#define MMC_BL_LEN BIT(MMC_BL_LEN_SHIFT) +#define MMC_CAPACITY (((MMC_CSIZE + 1) << (MMC_CMULT + 2)) \ + * MMC_BL_LEN) /* 1 MiB */ + +struct sandbox_mmc_priv { + u8 buf[MMC_CAPACITY]; +}; + /** * sandbox_mmc_send_cmd() - Emulate SD commands * @@ -26,6 +37,10 @@ struct sandbox_mmc_plat { static int sandbox_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { + struct sandbox_mmc_priv *priv = dev_get_priv(dev); + struct mmc *mmc = mmc_get_mmc_dev(dev); + static ulong erase_start, erase_end; + switch (cmd->cmdidx) { case MMC_CMD_ALL_SEND_CID: memset(cmd->response, '\0', sizeof(cmd->response)); @@ -44,8 +59,9 @@ static int sandbox_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, break; case MMC_CMD_SEND_CSD: cmd->response[0] = 0; - cmd->response[1] = 10 << 16; /* 1 << block_len */ - cmd->response[2] = 0; + cmd->response[1] = (MMC_BL_LEN_SHIFT << 16) | + ((MMC_CSIZE >> 16) & 0x3f); + cmd->response[2] = (MMC_CSIZE & 0xffff) << 16; cmd->response[3] = 0; break; case SD_CMD_SWITCH_FUNC: { @@ -59,13 +75,27 @@ static int sandbox_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, break; } case MMC_CMD_READ_SINGLE_BLOCK: - memset(data->dest, '\0', data->blocksize); - break; case MMC_CMD_READ_MULTIPLE_BLOCK: - strcpy(data->dest, "this is a test"); + memcpy(data->dest, &priv->buf[cmd->cmdarg * data->blocksize], + data->blocks * data->blocksize); + break; + case MMC_CMD_WRITE_SINGLE_BLOCK: + case MMC_CMD_WRITE_MULTIPLE_BLOCK: + memcpy(&priv->buf[cmd->cmdarg * data->blocksize], data->src, + data->blocks * data->blocksize); break; case MMC_CMD_STOP_TRANSMISSION: break; + case SD_CMD_ERASE_WR_BLK_START: + erase_start = cmd->cmdarg; + break; + case SD_CMD_ERASE_WR_BLK_END: + erase_end = cmd->cmdarg; + break; + case MMC_CMD_ERASE: + memset(&priv->buf[erase_start * mmc->write_bl_len], '\0', + (erase_end - erase_start + 1) * mmc->write_bl_len); + break; case SD_CMD_APP_SEND_OP_COND: cmd->response[0] = OCR_BUSY | OCR_HCS; cmd->response[1] = 0; @@ -148,5 +178,6 @@ U_BOOT_DRIVER(mmc_sandbox) = { .bind = sandbox_mmc_bind, .unbind = sandbox_mmc_unbind, .probe = sandbox_mmc_probe, - .plat_auto = sizeof(struct sandbox_mmc_plat), + .priv_auto = sizeof(struct sandbox_mmc_priv), + .plat_auto = sizeof(struct sandbox_mmc_plat), }; diff --git a/test/dm/mmc.c b/test/dm/mmc.c index 4e5136c850..f744452ff2 100644 --- a/test/dm/mmc.c +++ b/test/dm/mmc.c @@ -29,16 +29,25 @@ static int dm_test_mmc_blk(struct unit_test_state *uts) { struct udevice *dev; struct blk_desc *dev_desc; - char cmp[1024]; + int i; + char write[1024], read[1024]; ut_assertok(uclass_get_device(UCLASS_MMC, 0, &dev)); ut_assertok(blk_get_device_by_str("mmc", "0", &dev_desc)); - /* Read a few blocks and look for the string we expect */ + /* Write a few blocks and verify that we get the same data back */ ut_asserteq(512, dev_desc->blksz); - memset(cmp, '\0', sizeof(cmp)); - ut_asserteq(2, blk_dread(dev_desc, 0, 2, cmp)); - ut_assertok(strcmp(cmp, "this is a test")); + for (i = 0; i < sizeof(write); i++) + write[i] = i; + ut_asserteq(2, blk_dwrite(dev_desc, 0, 2, write)); + ut_asserteq(2, blk_dread(dev_desc, 0, 2, read)); + ut_asserteq_mem(write, read, sizeof(write)); + + /* Now erase them */ + memset(write, '\0', sizeof(write)); + ut_asserteq(2, blk_derase(dev_desc, 0, 2)); + ut_asserteq(2, blk_dread(dev_desc, 0, 2, read)); + ut_asserteq_mem(write, read, sizeof(write)); return 0; } From patchwork Tue Feb 2 15:23:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1434783 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=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=xQAKWJ20; 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 4DVTBv4Xqrz9tT8 for ; Wed, 3 Feb 2021 02:24:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8748582674; Tue, 2 Feb 2021 16:24:32 +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="xQAKWJ20"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 24F37801D8; Tue, 2 Feb 2021 16:24:29 +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-am6eur05on20626.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::626]) (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 16F54801D8 for ; Tue, 2 Feb 2021 16:24:26 +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=N+sEuMEUbRjy8B/R1J0kkcuitWi17MmVUJfUtw4Suahoq88DzuQsFmwwb5zrt6MZNY3KMbHncPmybjjptFKrb9iin9KtZ8hPElrCGikZvDXHcLPdfIcrw196mnVvK74tVDAfxPXqBsMniYn9Jdf4nDSQrLbg3hv9GBbWp4AE+Okgc5zLHD9ROfgm92srrWZcgar+YA3AGoD2dF398PdtTJUiz1KfP35ocRCGySq8mZz1+5s9B2IxcOG/F+uiEirKXAwYezfSGrZ9sbd8/dLsDAbQdjBElU9/7uIewBuwXvTiz4ITZhnHhMTCcHUhhHz5AT7Az2kuAHXM8zTDil9V8g== 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=PWu4XWfXcmAst4LHe0PwX0syT5XIp1GySIK8L3nRZ38=; b=BxlJkW1Lqod7+XvMKbFMs/uEXyhRtdt1IZTKQADA3HRWVwJb7SAvG/oGqFYuYklo1Gecf1Rd9hl75Znw18w5ZIWXHqtfiS+agRYOzcCp8lMVasOArNhI0vrx6/RKsSi/NWNxsC4rD0nhQIAOmu+/lCAcybmdqD7MLpCNOfgUc2WlozZXRBsZmuLhgB6iNgRKUyMfUxkAkFSKNEUNP+5wme4HJpdkOPSGwZqjITBMAs6BOwL2KivgkxsqbljTYxQjcmlWcnLgpeLEJmhnZVDQB32wOiW/tRzR2Mn+6IAWgpEeuENPw58DgnxlpZNnlY01wOC0aL/aFL0WXFvdZ7f+bg== 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=PWu4XWfXcmAst4LHe0PwX0syT5XIp1GySIK8L3nRZ38=; b=xQAKWJ20n76GAbRWB/pQWo7gL3eAO1OzUzkDLlc71W2X9dZTkoZU5qiccdfp0zrOsuR2GjLTlaE5I6i+tYCS/TkPpZ5l+MQyGrG+8BLNHaditVkkqP+yxTP7Q+uDTjN2tZqg3KYYZo2UgwSkOfDCWzb+JxvTez4PK6BExlnG5Qg= 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:22 +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:22 +0000 From: Sean Anderson To: u-boot@lists.denx.de Cc: Lukasz Majewski , Simon Glass , Sean Anderson , Mario Six Subject: [PATCH v4 2/9] test: dm: Add test for fastboot mmc partition naming Date: Tue, 2 Feb 2021 10:23:45 -0500 Message-Id: <20210202152352.33245-3-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:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc3fb13a-599b-45ab-cbbc-08d8c78e9e2a X-MS-TrafficTypeDiagnostic: VI1PR0302MB2816: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:209; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NHnMr6XhAn1/QwxyRPHYVP/sXPRCq6tJWQOYEx+Sial4ZuFOOWgV2XN/YaHW7nO7nEuz80DQm56+NLNrodQ27sB7v3lUFm45wVppBrZdElH8kuR0jE1qjQtsPOiTWb7hQoFifnUd0ZMMJ/l2JoCdHYIuZo5ex50rW++YM54HgWi4DwcaqAZy1omi2h0BB2wAdrggpKI8zemL81D2PToghlczu9e7WVHAYEmNVvDbWr6hPgUpewWSvC9OhBtkZzf27wt6DDERkECMiXXBFMXFeLE8325EwEXs7fhou9iUJ9gc3e1T+7qQ7FfojKx8xev32P/aoD4w+cddE/OyIHyXOJuzj6WJ3uWODv5WkLVzvsfTA83c/vp2mQ8DorYnIpdpv2WF30vc+Fcvocilt68p9R9VA5+AKdqb0XWpYKo/p/BC+ZXEEkNjd6dEuI1cuLAIotqowE27lgGj0XD7mwZA2EWeKItZ5nmVSy+24PJifTp4a3nEbzmcE+RgBzBkrVYUBvstMD2+pjihRDjXQmaRBA== 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: B66G1NaQskzmPYWWhB33Z7+AUe3UQfoFEw3rD2ermggtAaGYE5oz7Z2r5OlLHIhLXueWqFoTqgr9/R2c77swBZBzd8w8wId4eLaMDL/1F3ILfCENLAW1WxyeDkSSJLxgde1w3sqHS9sceEusxbbpoyI+VCkeMdxYVgoLMYv1JbhNg104CnE5roVdZAhpu8ZGdHZ9oaYyb3vUlmjfAPHYljd7/n3pu0jHNSdLVLNt4ifMna5GZAZBugQkA/zPSEoo5k/CZp1G85zXYHnwE5Cep8T+qEG0GZN/PKSkWHVUL/mLdniFpz7E2tMmF/jXGNEgL9r1UnWi0iKJ98jWQWKr5ZsemktnlviikHgSt0/7Mw8TWl2qwWn7G1/Jl6IAyn/1ZsPuqHgJK8z+aB0REnIgCDy8KjigqHIk3Pzcy9qR1Hek4Rve01mFNywRk3YcBG7cVa8PFzhQcOLUl68Jmgh8xVZU3jSneKh6SeDE/3SIaLLeiFnAIxGvIZBy1lura8Cm66Ck6KDkMrrR4oyIFLTeCeL9o4UVwzPnGcacf5CGLIcUtWRoeUiQgaoa1c4QVeMR+Wl1RnPHq6XAy5xtGpGlUtdkR/kf9AXjZm2qnlm4qc5RJDEerwl1/E8LUfIWhlvLww/H14XxlpfuG/ZspMJMFU19w/QegUe4VI68UhYhJzlfFLC8Y83uIsYH/RzYsavPZKgwJKJGQMZc6ZPWAy7VcXNBpyXf3fRezdqckwlZnQN8qvz2rhkynfB93sFUm1ndB+n85eyGJSj5kVHBJ8a276LJJ52DrFfI/XRIJ8Cd5KJYK98I3zPQLjfHUEnhxN5FU7uh6na6WdMcT0JkO/+loNyYvzGCAIQafe8S3kblZnItFneRLT4uMOSKpaqKQt/Xp5ji6OR99JpFKz4gwsF23c5Kx7velYUbtiwXLLbWE8iDZ5acQKGQ2fFWztiO7wQqOFOR6aQC5bkz9UImTzS9QgfXe0WqJ51xuj4mh+eTIPUZkfeCQVcWO9zcyQCmoiZSg6JGwjIEh9lP/IrP6Hqk2G1dXNuI7dh2PFNsnVWYYi0iREXxi05udWUbFZOAr+qm X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc3fb13a-599b-45ab-cbbc-08d8c78e9e2a 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:22.6799 (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: A+2wxn2l18uiRzRzBK0+MKx6TRYF2lOLBaiFR6mUJs2fECc78GQSKH/Emqgf1nBKm1npGxhzDbn3T1cU0NosQg== 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 test verifies the mapping between fastboot partitions and partitions as understood by U-Boot. It also tests the creation of GPT partitions, though that is not the primary goal. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v1) configs/sandbox64_defconfig | 2 ++ configs/sandbox_defconfig | 2 ++ test/dm/Makefile | 3 ++ test/dm/fastboot.c | 64 +++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+) create mode 100644 test/dm/fastboot.c diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index 4e67819559..9fe07f0c38 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -110,6 +110,8 @@ CONFIG_DM_DEMO=y CONFIG_DM_DEMO_SIMPLE=y CONFIG_DM_DEMO_SHAPE=y CONFIG_DFU_SF=y +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_GPIO_HOG=y CONFIG_DM_GPIO_LOOKUP_LABEL=y CONFIG_PM8916_GPIO=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 0c7674efc9..269288783f 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -135,6 +135,8 @@ CONFIG_DFU_SF=y CONFIG_DMA=y CONFIG_DMA_CHANNELS=y CONFIG_SANDBOX_DMA=y +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_GPIO_HOG=y CONFIG_DM_GPIO_LOOKUP_LABEL=y CONFIG_PM8916_GPIO=y diff --git a/test/dm/Makefile b/test/dm/Makefile index 46e076ed09..be4385c709 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -91,5 +91,8 @@ obj-$(CONFIG_SCMI_FIRMWARE) += scmi.o ifneq ($(CONFIG_PINMUX),) obj-$(CONFIG_PINCONF) += pinmux.o endif +ifneq ($(CONFIG_EFI_PARTITION)$(CONFIG_FASTBOOT_FLASH_MMC),) +obj-y += fastboot.o +endif endif endif # !SPL diff --git a/test/dm/fastboot.c b/test/dm/fastboot.c new file mode 100644 index 0000000000..8f905d8fa8 --- /dev/null +++ b/test/dm/fastboot.c @@ -0,0 +1,64 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2015 Google, Inc + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define FB_ALIAS_PREFIX "fastboot_partition_alias_" + +static int dm_test_fastboot_mmc_part(struct unit_test_state *uts) +{ + char response[FASTBOOT_RESPONSE_LEN] = {0}; + char str_disk_guid[UUID_STR_LEN + 1]; + struct blk_desc *mmc_dev_desc, *fb_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_assertok(blk_get_device_by_str("mmc", + __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV), + &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))); + + /* "Classic" partition labels */ + ut_asserteq(1, fastboot_mmc_get_part_info("test1", &fb_dev_desc, + &part_info, response)); + ut_asserteq(2, fastboot_mmc_get_part_info("test2", &fb_dev_desc, + &part_info, response)); + + /* Test aliases */ + ut_assertnull(env_get(FB_ALIAS_PREFIX "test3")); + ut_assertok(env_set(FB_ALIAS_PREFIX "test3", "test1")); + ut_asserteq(1, fastboot_mmc_get_part_info("test3", &fb_dev_desc, + &part_info, response)); + ut_assertok(env_set(FB_ALIAS_PREFIX "test3", NULL)); + + return 0; +} +DM_TEST(dm_test_fastboot_mmc_part, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); From patchwork Tue Feb 2 15:23:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1434784 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=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=Dz8TSIFS; 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 4DVTC73N13z9tT8 for ; Wed, 3 Feb 2021 02:25:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 44564826E8; Tue, 2 Feb 2021 16:24:35 +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="Dz8TSIFS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CE848826AE; Tue, 2 Feb 2021 16:24:29 +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,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20600.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::600]) (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 7DB4D80829 for ; Tue, 2 Feb 2021 16:24:26 +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=djPlpmqyS8bk9QawTGJhST19WY4pGrvI7Z5DAtxBee/7eakYi2j20m89TOzQ/gGhJlUSFb48aWr3RBLSQpzldfnUGC4ltf2Ym2XQtuUQvKsuXlv9FBjlPR88a7fjORvp9g5eM7OTc5x+dXdUz75OdSrVC9NSA8UziHrQgDHv7iE8TmBl+TCtPi8XtebWmfi7fZ2KEt/q2EXlVYTag38svxlgk8BbScR5hzvnBxFjWHxmsdRJFjt1dyvVCr6MBADA3XQR8+XctZfHHvuX6uJ7mA7vQ0IzTQquhFhbKeKuiNQBz18nvISR5wV2bmuf/GgPziE8NmBxQH8tkrWO0MOUkA== 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=de7eLX1QFSDlOeHJdFikJ+rGlysz1vv+vMTVyPlsmgk=; b=oQjgbg3m88q340oDvkXfcbjViBqGtCe3mTXBLtebOBjMiJCBK7UivlieMu/YmZXSE/kgvs7L13JKhsg8qEJpgNpSQV7Z+KCc0b501miqU03oYKMLBhb2kpZP/V3Lw6Xt0ObpmOjvnnklg79JVdcB13BYZvwBgJFPYQ2im6JbvmN575sO3yFVYo5q5hC+syDzG4GHh0xwyM4TEv98wlywLYrGSwFXQl0F/vB3xYbkZ+nJ4M8AHeqwCJ5MODhiyDa40lfa11pvH7x122u1FeHO9So73vpEpHySX8TE8IWt2G0/5GAcEIsRBOmnhGonFvaDZoG3UU+FUNzvLCXIOT/6LQ== 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=de7eLX1QFSDlOeHJdFikJ+rGlysz1vv+vMTVyPlsmgk=; b=Dz8TSIFSKi4GH6MXrbkD8GfNV0HylI0vXe/dxw9fBsTa2SWW7R7IEGSGE/1tNF7DK61G/N/PN/L0njO0CafnOjPwdYFwlQ/afkb3CYppx+s2W8iTwyHtiOzHQKS1QX/axV8l4Bavj6mphQrMc/cxJvZFT/SsCfsOXiJMM8ZV2WM= 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:25 +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:24 +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 3/9] part: Give several functions more useful return values Date: Tue, 2 Feb 2021 10:23:46 -0500 Message-Id: <20210202152352.33245-4-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:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 22b04add-bfc4-48b0-019b-08d8c78e9f0d X-MS-TrafficTypeDiagnostic: VI1PR0302MB2816: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:883; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sohfSKh06XdIxfFwRXIm2CyoTshfTkZGYVpaYaj+u05DJZq042//zFp9YCh+frQ7We06A+uUQ15KU6MJ97TFKF7HsUqaO+a3ATjiSM8X5eWKyI7B1Fzq7NouXnb8x0TF5x/oVzaslA3t2gYUQ3L5GdElz0nNfhebiUZHlz6Pqd1FSraAWRzdTCVVuCxw4xPNBqt2tzeokjQ3QOGXbIkEm9tGPisjVR28ua+It4NIwzZvg1YiWapn/pSPWx3CGW749WrKz7A08NeJHrJFark5IApIyhx1chOjU3m6qEMJCxEuO9YpagbyGicEcHYPbZk3+8oU0BsVP5zU9Gz9Yb1eXdxYt1BzKqrgt6hm61xde78iz7tvr9AlQ2Z2vyks+eeltJaYM8C3rAzjPGnxnVojyAv4HGfbdkKI1wZrFsF1WR74cizOgc1J1P7vBq0epFbXgW3ILJkKSpQfwL18LxdEcS6O0uEafpTUBrdSWGsdAW6EgWA2AfQYTBdKnmt9gXaQzQXf1k1Z0g81qixubedw4Q== 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: FLlZ9wb1CT9nGuDluMUh2k5pElNBgsKboxmSyWBXFweeqf+9ibIkXax8bsYVhYMdewjzDDkfLo43vJqQtSV9RdJ67fXyAtCED4HVnsLGPO8kbT05jRcqRbIE4sgO6Nizt2uNSn6lPdePpp1cP/fOMMDKeAzX1oB03Cn7LqN63mOJX5THHr5xJG+sWRozx/ALV3vCHfF7mYQbMkI1C/vuYuYP9RGEDiLsTEQOdMzFHT9G9sS5ic/MYu+42IOHSDqhIJrX4DCPF5IAZzIMBjiZH/EHuUBd2aW4ek1UvXJK0V2X9Yz3a26qLmMsDBX0HXEeiLX54gnaAkbOThSPLdYqAPVeP8+dFNPL49ijZC9BBybciA+5EDaYIjhroplQHnGMtSTSA1G0ev0yuMkDWT5v218aDopo/b3o2Vts7U69ww6sPKvoYB5uHhZcedgV80ikjIY6yOJI++DM71Mz7RFl94OHr/bdV0GpaEsQtP+tECWT9O1YcYLtecuiNn4MojmKSdkHF8xv6voJGT7rX9ue1pKHZTNWJ7v0643O9vD5Zy6FqjE8BzJHbHJbeYaceoX1veSAHIzWo4VvNZk2gjXkgpSHGKGnbcQMimpBecTV5hsTMQZoB7kbRK9UyDHFiPl6zLlp4GqIUwef1+LTvoAOBKTvod7aAQN40/+KEqvyLSs0LpANL943ByrW3diMedwW0gnNtLB6RE+r7sJEr0G71I3/rVeDz0KZqyto7AxtW7RHEI+tB5MOJy6ciTBGKt7gr34Inr7agMksVSQRs/pV+SujP0xCcYipe/xTw26PtBUq5XdM2rTYvI9ec6XgV6vnkolLMvXEIE2XvdcDTgjlmjPI/bxWxEJj6hPBxiPrBerAfXY4X7XkhmQ5HG1IbPLVuoQh2cdAkYE9C9/Wz6EZ/qJEVjORwwj1mbgocIhFVECa2ZDOMsSOOw8qhrGyLDZPjeJTrZD6vQmVNw7UitksbmkCXWcoVxADz8TE3nSPV9Y38rNbDop/2LEqXuTqG8jEPTSx0fMMJdwbZTeDbfbnbALCcO6zJkZqpkb/K7FY161SV8wJBovccJoA1+KjtkSn X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22b04add-bfc4-48b0-019b-08d8c78e9f0d 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:24.1624 (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: JZVUULDUILC1MomlzTq/HsbKEdsJxc60v8p55hXOyRo3GzDA1eLNtXqMBgFh+TzgCicE143LCAujRUME8hkuaA== 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 Several functions in disk/part.c just return -1 on error. This makes them return different errnos for different failures. This helps callers differentiate between failures, even if they cannot read stdout. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v1) disk/part.c | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/disk/part.c b/disk/part.c index b69fd345f3..5e354e256f 100644 --- a/disk/part.c +++ b/disk/part.c @@ -354,7 +354,7 @@ int part_get_info(struct blk_desc *dev_desc, int part, } #endif /* CONFIG_HAVE_BLOCK_DEVICE */ - return -1; + return -ENOENT; } int part_get_info_whole_disk(struct blk_desc *dev_desc, @@ -416,7 +416,7 @@ int blk_get_device_by_str(const char *ifname, const char *dev_hwpart_str, *dev_desc = get_dev_hwpart(ifname, dev, hwpart); if (!(*dev_desc) || ((*dev_desc)->type == DEV_TYPE_UNKNOWN)) { debug("** Bad device %s %s **\n", ifname, dev_hwpart_str); - dev = -ENOENT; + dev = -ENODEV; goto cleanup; } @@ -440,7 +440,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, struct blk_desc **dev_desc, struct disk_partition *info, int allow_whole_dev) { - int ret = -1; + int ret; const char *part_str; char *dup_str = NULL; const char *dev_str; @@ -482,7 +482,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, if (0 == strcmp(ifname, "ubi")) { if (!ubifs_is_mounted()) { printf("UBIFS not mounted, use ubifsmount to mount volume first!\n"); - return -1; + return -EINVAL; } *dev_desc = NULL; @@ -504,6 +504,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, /* If still no dev_part_str, it's an error */ if (!dev_part_str) { printf("** No device specified **\n"); + ret = -ENODEV; goto cleanup; } @@ -520,8 +521,10 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, /* Look up the device */ dev = blk_get_device_by_str(ifname, dev_str, dev_desc); - if (dev < 0) + if (dev < 0) { + ret = dev; goto cleanup; + } /* Convert partition ID string to number */ if (!part_str || !*part_str) { @@ -538,6 +541,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, if (*ep || (part == 0 && !allow_whole_dev)) { printf("** Bad partition specification %s %s **\n", ifname, dev_part_str); + ret = -ENOENT; goto cleanup; } } @@ -551,6 +555,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, if (!(*dev_desc)->lba) { printf("** Bad device size - %s %s **\n", ifname, dev_str); + ret = -EINVAL; goto cleanup; } @@ -562,6 +567,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, if ((part > 0) || (!allow_whole_dev)) { printf("** No partition table - %s %s **\n", ifname, dev_str); + ret = -EPROTONOSUPPORT; goto cleanup; } @@ -630,7 +636,6 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, *info = tmpinfo; } else { printf("** No valid partitions found **\n"); - ret = -1; goto cleanup; } } @@ -638,7 +643,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, printf("** Invalid partition type \"%.32s\"" " (expect \"" BOOT_PART_TYPE "\")\n", info->type); - ret = -1; + ret = -EINVAL; goto cleanup; } @@ -674,7 +679,7 @@ int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name, } } - return -1; + return -ENOENT; } int part_get_info_by_name(struct blk_desc *dev_desc, const char *name, @@ -704,7 +709,7 @@ static int part_get_info_by_dev_and_name(const char *dev_iface, { char *ep; const char *part_str; - int dev_num; + int dev_num, ret; part_str = strchr(dev_part_str, '#'); if (!part_str || part_str == dev_part_str) @@ -720,13 +725,12 @@ static int part_get_info_by_dev_and_name(const char *dev_iface, *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; + return -ENODEV; } - if (part_get_info_by_name(*dev_desc, part_str, part_info) < 0) { + ret = part_get_info_by_name(*dev_desc, part_str, part_info); + if (ret < 0) printf("Could not find \"%s\" partition\n", part_str); - return -EINVAL; - } - return 0; + return ret; } int part_get_info_by_dev_and_name_or_num(const char *dev_iface, @@ -734,21 +738,23 @@ int part_get_info_by_dev_and_name_or_num(const char *dev_iface, struct blk_desc **dev_desc, struct disk_partition *part_info) { + int ret; + /* 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; + ret = part_get_info_by_dev_and_name(dev_iface, dev_part_str, + dev_desc, part_info); + if (ret >= 0) + return ret; /* * 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) { + ret = blk_get_device_part_str(dev_iface, dev_part_str, + dev_desc, part_info, 1); + if (ret < 0) printf("Couldn't find partition %s %s\n", dev_iface, dev_part_str); - return -EINVAL; - } - return 0; + return ret; } void part_set_generic_name(const struct blk_desc *dev_desc, From patchwork Tue Feb 2 15:23:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1434785 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=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=fvW8ZUV+; 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 4DVTCM5f5Lz9tT8 for ; Wed, 3 Feb 2021 02:25:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 06307826E1; Tue, 2 Feb 2021 16:24:38 +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="fvW8ZUV+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 67D19826D4; 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-am6eur05on2062d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::62d]) (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 16C0382674 for ; Tue, 2 Feb 2021 16:24:27 +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=nlUdMmCgHKS+CEEGIpzVqzeVE8jqvuQr/+TK0lbi9qh/gtFX07AERVmaJSpEpoJfEkobQTp79KoOiTbg1bmfqW/9EN/DmrhW4u+AU2Fa5mR0xTICZgPSSBoDY6DAkQgMFV8hd3CnnVoWXo4H/hf2HYZEZ4hzPqJt+xV8iuAW7ac6jwTxNglxLgys3USJbVL7ARgiGJcn2pB/gtZjzlITGbk2CnDJlh/CeomfybJGHDc+9Vx5FypOO0Rf7n0qLpS6Q1wpLU43CThyZ6dh7fQWj8UGEdCKtNl2uIrLR72NVE685dIkcR7e49OdB+Qk+YTM2bNXuDp/AtehoyCOn1gPcw== 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=muGC6gAqiQsQJshXL7zwRvn9xGeU5becvE3hvXzaGok=; b=ZfIiYPTwF/TnDEiuDPblLIorfvWe/YVzOGZTdRRHsQrUfjGf48XOh5vyAYQQpzMrcBRe95quRtufSDD349pJdKLh2U3FdAcL052mGvXwBLfy6hX2aYAUm0XHMNcW2hZtxyHW3UoRE2J7A8fc2EJpi2gaqPPtcNFWDD8i9MUL6pTvg85xQGrEqfSO/Lnh+1bvYuxWOkFih/hMSQXpq7Iyq45Yaw0wfgyw+cWszBYOcWwDBogqkeKI4xZeNsj2xExOdNu9qm3ox2KLndulUoeOoMDTIGNmWuh0HORbMrz+QRHTT6FkKMkZKSkKdkfSaJ6BHOF2bMTAAJwpAs0ZvtdNvQ== 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=muGC6gAqiQsQJshXL7zwRvn9xGeU5becvE3hvXzaGok=; b=fvW8ZUV+IStY9UeKoVx2STPVWY2iC8VboJUwjKKz/Y3vimuWCfn3Yep44ygXLuA5fNTW+9eW+Sw1GgGsTaNTW2X8/zK+4/UhOwJjJzPnui+HRBxX8hi3swH4nrj7zZ7frNPWWUQDIehdlMa6QUZApNMlHrRnUgzWLmPAUzRe24c= 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:26 +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:26 +0000 From: Sean Anderson To: u-boot@lists.denx.de Cc: Lukasz Majewski , Simon Glass , Sean Anderson , Anastasiia Lukianenko , Andrii Anisov , Corneliu Doban , Heinrich Schuchardt , Igor Opaniuk , Marek Szyprowski , Oleksandr Andrushchenko , Rayagonda Kokatanur , Sam Protsenko Subject: [PATCH v4 4/9] part: Support getting whole disk from part_get_info_by_dev_and_name_or_num Date: Tue, 2 Feb 2021 10:23:47 -0500 Message-Id: <20210202152352.33245-5-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:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0497fee2-1a4a-4958-d923-08d8c78ea03c X-MS-TrafficTypeDiagnostic: VI1PR0302MB2816: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:820; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gj9d0SqyJV6mlF86VBZLQX4GnWaPf1nGCMeSCP0IFugeE0ZONS9CKzBlbcpQJvB1Qvtlews/afHNujVnkHi+p2zKa/MQXCIlD4p/KcYqnYZFLKZiA4BxpVnkQRPlo3YOiSzSBAvzENcoJ4waO17Ryo9wBxxAsk9TM5gHlgzNHhfhPFHqQyfHI//uH8tPfel6RMxhUsTg9GlT1hh/jyT4q/n//rwZ7C8buNpJ1Fi3n2ZggAw8F86IEPg1T1pjHJsYcoU7lb3X+IZsIuRoojhceqCrs4fuq3Nk1QUjxRPkaClsQ6gmBVAFPFIyIxbwexWtV/uHkHLxGEPt92Q+4j2MBnJAuPS70VGFQGvMX75Vv0dAQ8l3ygj5h/MeU/nzCdlJzAvShh8cDsxBwvM9en+1pV1fwDBSDgN48Efuioy4aH3wS06DhG9gCIgz3nqe2moYgQxVN/LnqGp8vzx/t2xsZgAKxBPA8DztrfQmfLE9FML7FM+Cu5xYBLhYcthCywtd0FWSe1ISd6M6f+uGYLiOLA== 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)(7416002)(86362001)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: P5900ZMOuNvXOz15nIgER50pvKrv+jxnJ/XVSZ38WcPsZeMoCvC99H7tEvce2UCBbIUlVL8XjDeA5cg/yi8LebKMBk6wS/sltK+RJVjjkW/Y5DI2RqDYhVDWPSgmSB+kGIwUveTEuM/148SrmJDTjN2oadkwG0OMR4AjmyHcWi/saa6cXLqOe/Y6Rbm0shsFuxB+Zv5BxU93rp6xbzBuInP5BivyvUk3ZQ7lzJNinGMD/zi6Cj8aosE7OjAeujYc6X8/3SNqKP15CKWnU0sP5ZwjLkst3GVQ94mC+3dFQl4gysS6HnARV3VeAHvhGMNyhLUkWOh5uTGg8Tyv3dbtDdolSoQDKAuUlKVVFe2SDNYKeaf7spDiD3f2Y03P3KAbkQuEFGek2ei6hir6wrdcXHSpXE95Zk0vPXX1JSUoHljYvx0EBfiU4EMnbra9QEl3wfWCHvQj2gRNXhYGnU2zSoz8YV3Qx3UAsXtkCo/6oYhoxGqocCf4zpaksj5HsplGylv3bUggUKtxeIzY2DRuia6+4Sawh/gPdzXo5qgU2pdzj2+XsjqFhc1RdAoiRVkHvU8zBpZ2pj96qGGCZDuyeutCtfyRGNJeTxFXRMVopCIanGQgXRLLWMYQ2CtXq52K34vRkfVBLE2p4X8E5Oz0GtxahvpuHdLlKvi4mU5G2AgcU9zgazAm4s4+xCtgEttF3YzPgY5JqpM+qTxR+Mq5wvfi44ym96z95gHngE9ZSSND60dY9j37I2FQE0auu/vzSLCPe84DCYCVtjro+9sVDtJe0hMEAM0TxBHn08Z9zIs8jt6+i1EhPfZhVmXyG0PoZCVlFzmLdB7F9wUaBsqb9IwFxEVde9KSGorxtmslDUrOsKlekRqLbQiGvkwNSxLF6WGMeueSCPUqDz9aM03OarId778VR4Jmix9kQciLspCxl0nV9xUR2bIm8kbOrNlpu9fgVCM1gNi7egCBFMTHJNh/GBEeoHQrni8QFU2mZf+JDEZP9uyIJLTt4gnnlpT14qW0KITNoWFwLWxTQmzciZJdDaKd3Quwo0zDolp0s1BBxZErfuS9a5DAmT5aF39p X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0497fee2-1a4a-4958-d923-08d8c78ea03c 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:26.1476 (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: 1EQidQJn5Y2IhDCnXXnDAVwD8ZPe0O/AZfFzcrHPIOLDFVQfIuzQjoIZ/RTmqMtyqC+Nuovb9S2bpVMv+P815Q== 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 an option to part_get_info_by_dev_and_name_or_num to allow callers to specify whether whole-disk partitions are fine. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v1) cmd/ab_select.c | 3 ++- disk/part.c | 5 +++-- include/part.h | 6 +++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cmd/ab_select.c b/cmd/ab_select.c index 6298fcfb60..3e46663d6e 100644 --- a/cmd/ab_select.c +++ b/cmd/ab_select.c @@ -22,7 +22,8 @@ static int do_ab_select(struct cmd_tbl *cmdtp, int flag, int argc, /* Lookup the "misc" partition from argv[2] and argv[3] */ if (part_get_info_by_dev_and_name_or_num(argv[2], argv[3], - &dev_desc, &part_info) < 0) { + &dev_desc, &part_info, + false) < 0) { return CMD_RET_FAILURE; } diff --git a/disk/part.c b/disk/part.c index 5e354e256f..39c6b00a59 100644 --- a/disk/part.c +++ b/disk/part.c @@ -736,7 +736,8 @@ static int part_get_info_by_dev_and_name(const char *dev_iface, 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) + struct disk_partition *part_info, + int allow_whole_dev) { int ret; @@ -750,7 +751,7 @@ int part_get_info_by_dev_and_name_or_num(const char *dev_iface, * directly. */ ret = blk_get_device_part_str(dev_iface, dev_part_str, - dev_desc, part_info, 1); + dev_desc, part_info, allow_whole_dev); if (ret < 0) printf("Couldn't find partition %s %s\n", dev_iface, dev_part_str); diff --git a/include/part.h b/include/part.h index 815515aa80..7f78271a98 100644 --- a/include/part.h +++ b/include/part.h @@ -227,12 +227,16 @@ int part_get_info_by_name(struct blk_desc *dev_desc, * @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 + * @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 */ 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); + struct disk_partition *part_info, + int allow_whole_dev); /** * part_set_generic_name() - create generic partition like hda1 or sdb2 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; } From patchwork Tue Feb 2 15:23:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1434787 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=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=nxPa2rip; 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 4DVTCp5GD3z9vFB for ; Wed, 3 Feb 2021 02:25:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1D0B782709; Tue, 2 Feb 2021 16:24:47 +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="nxPa2rip"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E71C826F5; Tue, 2 Feb 2021 16:24:34 +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,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2061d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::61d]) (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 2AF43826A5 for ; Tue, 2 Feb 2021 16:24:30 +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=ZM/8KuQ5+I3H0bdXOOOOUge5EnUsJ1cO8dXP1TrrIKKQdbAsa/1U1CYm7Hf79RawDqoFkJGh++mkQ5hySepZhChyM/vg8LO048VgZK9gYAXcBIJTERKT1HOVG9lZE8nLwgKlYYj0klnfshGgj01l8w3Aae5ng/uvES47kxdacCLYu3rzq0H6o4LvH312cAC5pj7JHsxwMp742SsVgG1lquZTIhAaB9nDQ8LWXYaKFKLtd0IMVczthyVGT6j10dpvcDqf5M1nxz8RLd1wH1Vbw9DAsvNGk4QUPAXX0+S0OlYqQoYPWQ3HYeDb1WuheR12Cz8G6J6+hUEYnCCQ0IdOjQ== 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=owPc5CRA3pKM13F8RA2Lfde6GjMGzTPaCvjIY6vTtyk=; b=Pp+C05TBgKzPcsLAnX4onHm3u0H/K7PQteYIagCXqOWwQEEmFydKQqSvItIZRZNTfGnYYiEpsvipx2Gg/myDQDTZ+OGi7FUXxTpETx71hPYdqZ6qLOLRCkM25UDCs/TvCXx1rrMbTi+JBCeWOxSCUg/baHX45p/2F/zWYlZObZunljWgCo7kX519TEMJH2UNs8XceB0Gn6yZqz0AxWpeKCBRFQ2CoAFk2p+hCdpDHD8yQEYYhuQn2c6+vhjRjEQpv3Xe9wF7oIlNyq7k6iMo6hYq75PZQUB6Eqw6s8zgOVlTz4X4LfuVheW4GCgu+15/rnVyZOVcxNH3b//DIAX3uw== 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=owPc5CRA3pKM13F8RA2Lfde6GjMGzTPaCvjIY6vTtyk=; b=nxPa2ripPsVtRlrMb+ayLSD4tenGf4d2LqefFSLMMp+IetA+lspEUo2mI1YdersMSp0Kr31rvfAGuP3Hys7C1vH2dXNChOPvwO0S6j/Mz+ofM78abgfB+wSBPwXWNYnTaYrUvqR5PH5VwoTDtNGp6UVFCoFIKukF7rifI7r+lu0= 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:29 +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:29 +0000 From: Sean Anderson To: u-boot@lists.denx.de Cc: Lukasz Majewski , Simon Glass , Sean Anderson , Filip Brozovic , Marek Szyprowski , Patrick Delaunay , Roman Stratiienko Subject: [PATCH v4 6/9] fastboot: Remove mmcpart argument from raw_part_get_info_by_name Date: Tue, 2 Feb 2021 10:23:49 -0500 Message-Id: <20210202152352.33245-7-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:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d55cc962-e862-48c6-d01f-08d8c78ea200 X-MS-TrafficTypeDiagnostic: VI1PR0302MB2816: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:176; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ISCZwPwSEiWKcTrzTtjfAlSUjFQs6oO76DTbKrdPkqrvp+3DROLBgyGK620zZ2WRE5AuZqRGM7+QWWL7HcIQklFHx1+d+3YilrRLQNvCkwG1tQt2oivWdKwprjkFlZxA5zTCdCzU7xREgZJzgTZ34TCQyFzRg8hA0e8u3XyCwoaMFmChVK3duLDO34rYYNhu3f8FlKqf0eqIlonsDMEmdhdZbtdGPrUZ8eQPaIZH8cUP19Y7P/Hb2CdQA3P35HBToeygMUU0+ziS1Q/J+ERGzCPCSbKelXrscgC26bkAndZTQD7JYAQTf33esxta3d1wBJCSOLNwOgMEAlfA7wmxAW/5SDGJxzIilX+rvMlPYW1R9k83U7+O10W72MGtHEY5QF1jay/uOIlIiFy3JJQJ2QXbchCGrkBU87qyrNEip725gB7M8rUJox7oQnTfLbzYUShE/oEmcRjkdGdn5scqPnhNZVbFrRB1+EkAvpKMl68jL1mZ4/kZIoe6ieLMMpio+Ksy1uaQlw8Bk7P1NkvmEA== 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: D9pVexpKzHa+4uw2YkDZFPGi089H4BFOX5hl9mcP5UzU0eP00Xb+I5vq+20JsrjtpM0ZSBgiXTDK+Mwm/DQjpY49RQKYgbVHMEWpYeSgKFU2oo/EkTb2Mp88WDahExVEm4Bn6B1Dexbz+VbgOkzEuwt/k7YAVyjeYwaVm8X6MyqDURipe8yddrtry6ol5RNNeOqvo/ygZrMvwJ3HoL7p9UYsD0fKS3mw9kVPE3eDIHKsKCoQOhozbRHg3no3Ge1pdpo25O/nkGz8jhMGESs4I4PLS0JfQzfll0c6JOqvxUCoC/vlPCjMpq0Wypov6BDnVU/g/F/dadNobPXPUx5TcwDGN9b1qIGWpEeFKZ6PCTOwHnQ7kycE0jfDfa5W0Jo7a94dNDCExRKiNGsSJQdyAvpr64GWpPYthpmW+RqxR91fPwBF44BilbI3vchEteCLEYyzqaDjtoBElfWe7Lv2EO/VprHWtBK4fTWeoHsIcht+WKn8pm3wHpIGuUelR26rKB9g6CVnq94KVEhiw7eFSQcplTkwHdikMf1mneSs5wVkagAy9SGkvSNt2s6Gz9PxMZ3pVtk5w4G9IzqbQK3MNFvNNcrys9rzLF/2TBNyAqa0hj+FgvGdZMRU7oEXH+u1AmLCVYrcckA7beSZeeiv+9Pv6a6dLI3ExT7bNYEzdVNVEbe4sCgg22mkJ/lW8n9BpEBvRTqEuXrQrZcij5ILqfM8vKUtKkVnIpLfaIHTflK692QDJYNTETHqAEBLg8q695yIbzqtFhMB8mm80XM5q7C8M5Tej1eSgDvrjJEKdrKi2IqhMucKpxi03XebGCEdlR+qDuRI5jGToYyiNjZZX/gHaurk+Mt+6xrMW8mI8P2yigjyAzfKWPOlqhgRuOoxL+PV2eNGoC2D7MIChMKIxiOwIkwUU4rmQ2jfMWYNkGREtJrt6jBGpY/1Yzc0Yd8e+gtW4FLC3kcEMJzuQdqyxqNxODDshh1KiDpTZWunswezJHxOBQCK3d1uX5IDy4coGeCIMkFqWZB4CTaR4dYE/pvlB/gp2z3meCu+826wXvay2jLOdg7vJG/v7sqm8eaQ X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: d55cc962-e862-48c6-d01f-08d8c78ea200 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:29.1216 (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: pYeRVKklOcLyxuhxkqhHkx+1DnOGX3EXVFYwAEWd3iI7Rhz6UlL848ZfQ4/D/ZccqVS9sG9x9RVai/YEjW3kcg== 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 The only thing mmcpart was used for was to pass to blk_dselect_hwpart. This calls blk_dselect_hwpart directly from raw_part_get_info_by_name. The error handling is dropped, but it is reintroduced in the next commit (albeit less specificly). Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v1) drivers/fastboot/fb_mmc.c | 41 +++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index 50532acb84..75347bb99b 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -51,7 +51,8 @@ static int part_get_info_by_name_or_alias(struct blk_desc *dev_desc, } static int raw_part_get_info_by_name(struct blk_desc *dev_desc, - const char *name, struct disk_partition *info, int *mmcpart) + const char *name, + struct disk_partition *info) { /* strlen("fastboot_raw_partition_") + PART_NAME_LEN + 1 */ char env_desc_name[23 + PART_NAME_LEN + 1]; @@ -85,8 +86,13 @@ static int raw_part_get_info_by_name(struct blk_desc *dev_desc, strncpy((char *)info->name, name, PART_NAME_LEN); if (raw_part_desc) { - if (strcmp(strsep(&raw_part_desc, " "), "mmcpart") == 0) - *mmcpart = simple_strtoul(raw_part_desc, NULL, 0); + if (strcmp(strsep(&raw_part_desc, " "), "mmcpart") == 0) { + ulong mmcpart = simple_strtoul(raw_part_desc, NULL, 0); + int ret = blk_dselect_hwpart(dev_desc, mmcpart); + + if (ret) + return ret; + } } return 0; @@ -425,7 +431,6 @@ int fastboot_mmc_get_part_info(const char *part_name, struct disk_partition *part_info, char *response) { int r = 0; - int mmcpart; *dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV); if (!*dev_desc) { @@ -437,7 +442,7 @@ int fastboot_mmc_get_part_info(const char *part_name, return -ENOENT; } - if (raw_part_get_info_by_name(*dev_desc, part_name, part_info, &mmcpart) < 0) { + if (raw_part_get_info_by_name(*dev_desc, part_name, part_info) < 0) { r = part_get_info_by_name_or_alias(*dev_desc, part_name, part_info); if (r < 0) { fastboot_fail("partition not found", response); @@ -461,7 +466,6 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer, { struct blk_desc *dev_desc; struct disk_partition info; - int mmcpart = 0; dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV); if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) { @@ -541,16 +545,12 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer, } #endif - if (raw_part_get_info_by_name(dev_desc, cmd, &info, &mmcpart) == 0) { - if (blk_dselect_hwpart(dev_desc, mmcpart)) { - pr_err("Failed to select hwpart\n"); - fastboot_fail("Failed to select hwpart", response); + if (raw_part_get_info_by_name(dev_desc, cmd, &info) != 0) { + if (part_get_info_by_name_or_alias(dev_desc, cmd, &info) < 0) { + pr_err("cannot find partition: '%s'\n", cmd); + fastboot_fail("cannot find partition", response); return; } - } else if (part_get_info_by_name_or_alias(dev_desc, cmd, &info) < 0) { - pr_err("cannot find partition: '%s'\n", cmd); - fastboot_fail("cannot find partition", response); - return; } if (is_sparse_image(download_buffer)) { @@ -593,7 +593,6 @@ void fastboot_mmc_erase(const char *cmd, char *response) struct disk_partition info; lbaint_t blks, blks_start, blks_size, grp_size; struct mmc *mmc = find_mmc_device(CONFIG_FASTBOOT_FLASH_MMC_DEV); - int mmcpart = 0; if (mmc == NULL) { pr_err("invalid mmc device\n"); @@ -632,16 +631,12 @@ void fastboot_mmc_erase(const char *cmd, char *response) } #endif - if (raw_part_get_info_by_name(dev_desc, cmd, &info, &mmcpart) == 0) { - if (blk_dselect_hwpart(dev_desc, mmcpart)) { - pr_err("Failed to select hwpart\n"); - fastboot_fail("Failed to select hwpart", response); + if (raw_part_get_info_by_name(dev_desc, cmd, &info) != 0) { + if (part_get_info_by_name_or_alias(dev_desc, cmd, &info) < 0) { + pr_err("cannot find partition: '%s'\n", cmd); + fastboot_fail("cannot find partition", response); return; } - } else if (part_get_info_by_name_or_alias(dev_desc, cmd, &info) < 0) { - pr_err("cannot find partition: '%s'\n", cmd); - fastboot_fail("cannot find partition", response); - return; } /* Align blocks to erase group size to avoid erasing other partitions */ From patchwork Tue Feb 2 15:23:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1434788 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=6OToaqnW; 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 4DVTD212Gvz9vFD for ; Wed, 3 Feb 2021 02:25:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9FFFE82731; Tue, 2 Feb 2021 16:24:48 +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="6OToaqnW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7D69082709; Tue, 2 Feb 2021 16:24:36 +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,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2060a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::60a]) (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 949D7826AE for ; Tue, 2 Feb 2021 16:24:31 +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=FoRwoZR/TheD9JKblo6x34F5KCCDoHV2jEKAw5Dcj6Wa4N4gX2dq9YG2FVhrNoeSaZ1I/fK+5E12wQmNmvpVKcle8pQ0aO8hwqYe8Z/WjkbGbxH3Uv6Usp272Lu1aFt2iBzjT+D8AGg+HaueJNSD1omeoVi4lN63Z3EJ08I4Ek+60fUJUp8vK+XA2tkW8kTco/pmM0Te1hgGaO5aozMUPJ4xUeuEWdk5Ukb9AG885QG+D+dlWoEkwUzQPz4svSauKLVci2bkinDd/aCEWWVUMRXP8bzDVMxPPD1M2+ZG+z4en8m0MAmxWhoK3e7+dOKEpkTHN5uM3vINgyKB3skxXg== 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=SHp9CX/Cj9DapOD1mO+QNwksc4LfaW3Xt930nFz6iSg=; b=ZQZ9YCKvKJNcsQZrKBmKPp9nKjiTrzFwDnhsiYYc0wb4YmQuLm4l5JVj3vDgfG6AqjdZpmw93RUQF6PiyEGKmRTL2MDoG86R3GsdzBK0Aa6PkbqCdgdE29Yqh0talbsBPzhhviM6k8tA4uoZgagxIZwktFNUjn5SuURPOxjRIJnlGj+Vj6vo66HCh9a8zhqPxUHmLcDMUlCuCytzi19TMdr5ZbouMN3FhSYaZ4SMgqf1Rg3j2Iz1y4L18MvyzZUnwyPcQDSmWlu9i60X2YBY7+1Cfe+YjTtLtiLtY2SipKR3RbknKZyuPRbbpGxA8oJ7nS/ZmizwZ1HVVnbwQmVKnQ== 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=SHp9CX/Cj9DapOD1mO+QNwksc4LfaW3Xt930nFz6iSg=; b=6OToaqnWnai9Z3uOkUUlxN8GQGUdn6t6TnOAHUCBwDd9U9JOaOpxkuF8hugpE9Lt5Y5TKVH+v3e8qUn46uHEngKnbJaWdzyl331Y/a6+WAeHYqsGO/Z+QMA3/FphsM3/OKgiK0IOq0MZo/GObeXkLSlDkCzn8EFzuR48MSrmICg= 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:30 +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:30 +0000 From: Sean Anderson To: u-boot@lists.denx.de Cc: Lukasz Majewski , Simon Glass , Sean Anderson , Filip Brozovic , Marek Szyprowski , Patrick Delaunay , Roman Stratiienko Subject: [PATCH v4 7/9] fastboot: Move part_get_info_by_name_or_alias after raw_part_get_info_by_name Date: Tue, 2 Feb 2021 10:23:50 -0500 Message-Id: <20210202152352.33245-8-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:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 585da8d3-5de6-4437-408c-08d8c78ea2e9 X-MS-TrafficTypeDiagnostic: VI1PR0302MB2816: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:346; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n9Ix8i7nh5+ucNj8AV6lbtEqpiWN2vgSW9zm0gdL+5kXHIrmLjilDobDzwrwLY0rY/0wFRJ9+XbSgxmEukvtSwHOaKcTpGsqZeOHk82Bc7AfM5C23hDaMHkcJfkj7YzhutgR+QZocx43eMNkUnAkE3R0O+EtaChMjEg1uwfR9WMHtmFHtFS1I1KGnsbhIxIntEWR5TnRZ5A2H0BDwbAVG0ePU+8gzjcFrcYFo3s/c9yXdEiU2BsiDrhlrhQnMULzB5XODiN+P4qxNPfn7mLhJOSuogFDEERH+XEEIFlbEU9Uk3jIsblkKbanBglZdynu6JwigZ9f1wCDQQ9NELuVsGVOaqslYoozhcACEPMbHghSBm7qZKh2i/12CWV/RGsoLbJdWVjGcd9fLx9v6REcVIBUo1eMDi1AcCX0/pvarvhCel4202Xoh+WyEhxjQ75pmyxtMaU1krn7HV4zfUXY84OILLLqB7+U8orI0rorxPmuqo4d0mlVigGl9AoumAH5et3pPJQtRBlrsYujAG+fQQ== 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: Q3Ah1N0L8VgElatP5jfpzw9+ULmf9Cob8FiYb+iISKb8P/wKcrKcVXR1CIhxDM6GMk4NIOrEbnnQ/iJb4issNEusfFmUrHEk1BwvMBuZdyWtvayekEJ20cnjNlnPl+kHYjB2jZaEB4VVcybICbRbXv2ZPUj9Ua7UARY6PiqAvH0jVqlegNNVBpYe+SSisdhxMMu6D99Etkq1XSRcHBDmGZpp/3NHLQWCnOT9q2HHA0QPz5X0AwzJAhf02SbpZ6QXcC3SzoPQ323XeCb0INkZ0l8V08XBFKyuF8mYmPu4jbOjj5l0d1colk8ys6dbOEvxjAH2X8NnM1yxHfeC2jxoLab/da+fEoXyZ2Kpo8b0FxiIjBCyKzmQdot/XZWMrxsgTXAN1y0ixKAQVTBPAgm4h0nhMuM32S9A8o17LuUSvwYR2ObeYedpS0r+6eAfHlTGLSDQtfWlRjcSrXWqgq3jPS8JagDz50PEG6HNRz5ciPfJMwEztkLRdQS7BRig56uWBsbjEZYkX3qKJAS2Dt6kDsGw0NKKApQim/upfzMMmNGAJcmKea58pwzwPqBpSxg/4EncA3hnJmOdSqaA9bLNeUjlRNZiGRKhO1s5+5I6g8SvwRW1c5ue/kYvCq7yHz0kocei1clf4QykQKgZMhgjI9hEa3Dz8tNMDMQT3jlpoySenItb66+bE71eZplXObIaRrCPSxGvD0Fx0XtvsK9Y3BxDuJCgCw4NcX4IVItUbdoT+Iy02egnvCuEmcnyqsKxgzdlm14r8oDAnyKxIFgPkFtY7Kq95BxPO1ox6PNNXUMnTUQJh1uOonHNoEoK7lCW/QUCYeTOKdj/kwdRPeLPYQaqd6tosQ4rtoX2KwvAV8WugRpR5k3zOw+j9n0jYPc9ScfofkYkfkjg01si/41tEXJSpUO1qVMlt2Nf13Hr2yhoaULcN9GG3tFP5EknWaEr08egjTZUKt1laOABmEV0hyr5Y2Rr29WfHakCpXiZypbyCftEhFsbCUTfodd+DcSWuDcswMtoikqgeVjubQYNOaVrEZclpdqkS4nAurIVyhSLn6ezKa0iNyjWJwst/Dhg X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 585da8d3-5de6-4437-408c-08d8c78ea2e9 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:30.6489 (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: qRRR/PhKb9XCzUyQj4rCdKU1s4GHZGj5uqfJJwZPJfrXqjFTZGleM5kOjkS/p8oKKT/hwdOqvoCuWYnd0Gib+Q== 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 makes the next commit more readable by doing the move now. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v1) drivers/fastboot/fb_mmc.c | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index 75347bb99b..71eeb02c8f 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -28,28 +28,6 @@ struct fb_mmc_sparse { struct blk_desc *dev_desc; }; -static int part_get_info_by_name_or_alias(struct blk_desc *dev_desc, - const char *name, struct disk_partition *info) -{ - int ret; - - ret = part_get_info_by_name(dev_desc, name, info); - if (ret < 0) { - /* strlen("fastboot_partition_alias_") + PART_NAME_LEN + 1 */ - char env_alias_name[25 + PART_NAME_LEN + 1]; - char *aliased_part_name; - - /* check for alias */ - strcpy(env_alias_name, "fastboot_partition_alias_"); - strncat(env_alias_name, name, PART_NAME_LEN); - aliased_part_name = env_get(env_alias_name); - if (aliased_part_name != NULL) - ret = part_get_info_by_name(dev_desc, - aliased_part_name, info); - } - return ret; -} - static int raw_part_get_info_by_name(struct blk_desc *dev_desc, const char *name, struct disk_partition *info) @@ -98,6 +76,28 @@ static int raw_part_get_info_by_name(struct blk_desc *dev_desc, return 0; } +static int part_get_info_by_name_or_alias(struct blk_desc *dev_desc, + const char *name, struct disk_partition *info) +{ + int ret; + + ret = part_get_info_by_name(dev_desc, name, info); + if (ret < 0) { + /* strlen("fastboot_partition_alias_") + PART_NAME_LEN + 1 */ + char env_alias_name[25 + PART_NAME_LEN + 1]; + char *aliased_part_name; + + /* check for alias */ + strcpy(env_alias_name, "fastboot_partition_alias_"); + strncat(env_alias_name, name, PART_NAME_LEN); + aliased_part_name = env_get(env_alias_name); + if (aliased_part_name != NULL) + ret = part_get_info_by_name(dev_desc, + aliased_part_name, info); + } + return ret; +} + /** * fb_mmc_blk_write() - Write/erase MMC in chunks of FASTBOOT_MAX_BLK_WRITE * From patchwork Tue Feb 2 15:23:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1434789 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=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=OKeN3/br; 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 4DVTDF054xz9tT8 for ; Wed, 3 Feb 2021 02:26:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0E9B582734; Tue, 2 Feb 2021 16:24:51 +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="OKeN3/br"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 024868270E; Tue, 2 Feb 2021 16:24:39 +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-am6eur05on2061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::61e]) (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 4AE38826F3 for ; Tue, 2 Feb 2021 16:24:33 +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=L/MLgjrf4+pnU5A139UMeTFCme/QEhBpvQSHiQ5S4rz8lpBjro+P1P9PJC7R5FouS6DLBqPPLIvUKt/pYXqwOXyeo+k1Ttcln61dz/RkowqQ/eRxifGRkmpfMO06zfYAO8W1CMUlLB9fLpONDStUKhIYIvP624dhoE+0iW6SZ78+aWZaRcmhds2xdgNYNzpoKQmOTD6HIshWgj07nVCKrOampbJP8yeW0ENrRhCv1ftpGmCpl4poYAhW4BZ4KOUWfFZsijgjUsq25Ox084CN9pvStA2rPK1/FS5IhjcFJYS5XRtPq+gubtM7KUxpDmYQaHKANYZsjiyWSmHPNGkg/A== 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=MEI5i+20a/7//CiD0Ox7IgS2sQYw7LWElEO4gDU6UI4=; b=cfhnHXntgBe4EaznUrWYbmYYNo3Iv1asxXnQ1CnSS07oool6UY4Y8aSK0pjfZyT7sIsIS5k2OsMN+MHAJ4Th3o+Fk6pBbogdzrF7UgyuuqIHYVyhMcIYmEPe5HVA9cCghlUP100GTgvVp6pIaYu+1Hlca72ehVbmILC9zX+saFfYlTuXz6/BHXo3zHj7cSabwG2kzTjV7F8nDXn3m1vc8krlZk4TA4tV5naUgF/hcqYdgDngKQ75nnzgmwMdRhSzNpx4+FX5SIo9YyUuK3X5u/2Cn3fO/kZ9TxOLzwwvlCMvSVK+XYWazEWALDA4oQprKVbQiCsSLClwezztqupCPg== 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=MEI5i+20a/7//CiD0Ox7IgS2sQYw7LWElEO4gDU6UI4=; b=OKeN3/briJi6i7PQI6md5JZ7riLNITkPh3lDvo8/fhZhgzKgAz2ea3UDUd+Jobk3SLEmqmazQ5YLq20YYGOirF7n/EvkDZKUULA0rsCRHU049cxHyykWn6C0VgMLC+omQdsumo2ZKxaS1Mayek242SglmfDLf5gqbTpMWgwZlmU= 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:32 +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:32 +0000 From: Sean Anderson To: u-boot@lists.denx.de Cc: Lukasz Majewski , Simon Glass , Sean Anderson , Filip Brozovic , Patrick Delaunay , Roman Stratiienko Subject: [PATCH v4 8/9] fastboot: Allow u-boot-style partitions Date: Tue, 2 Feb 2021 10:23:51 -0500 Message-Id: <20210202152352.33245-9-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:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 477f6429-bee6-47f2-ca20-08d8c78ea3bd X-MS-TrafficTypeDiagnostic: VI1PR0302MB2816: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3044; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PA+IIVIHrlSLH2imhVXYIOko7PnLsc+EhUP2a1xbmvIrBahbebadST9h2JM0momUUloldVt0taavSHcxPDIrdvoBWz/TDiAc0Usu7/OZepWFKuCLkEF/tzqczX1q7tpariMFDcul3kyYQIBBYWcUYH2fDDzo7YMMhPHRYnnFMFG9GdbhXnamWmdLPEoQbNvKPBfd+kkjcbXO8XtY0JBMUTNlYve5m7BQ3sTtBgEoU1dxztgv/+gpJmlNk4+lsH7HdDLB4qxnrkzCaKlPNCTuceCO8MmnEEdX1TL4iK8gERzLcyDih8SrtEjMbgKIwLcFPTYetGQhtmnoz113avoc9Z5KN4HGEGu0aAp2ywOtdxZpIM7twbKQ1/ibI17NMNKIRLbAH/tSVDDYBvw4Bxt3kg7gCbFjUBj+JQV3y+CwQj+BfEckC3KUAovBsIV3NO3qlu0B4zdq5hQXrs2bIAJ4Nk+k04xm4aodddCuS68FsUdo/WqTp3HBDbmwMoBETjj1bhyleuQ275OstQZKsP2nbw== 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)(30864003)(6486002)(52116002)(186003)(44832011)(4326008)(956004)(36756003)(8676002)(8936002)(86362001)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: VbwXbQiCXAQDvALiGqxGWrY6XFGVaCZOUEK57Ey4OFg0TG4G5OXcXS7zGPoXzfgiS9QrShLJvHfkUZGKSi5Q7LCgHzMvo37+QKURLfkad5W3fzYfBvhaFHMmFWVmJkSQF0YjsCkCE81hNCbnZCUcjIOSeWjmLoCAr2yXyYn3tVu1wYg/AEFSCe6hQhmynIBVrscPJCkgzvfcsCH+oMGTYKuuo3EmNeKAfZE0UJD0PpMgSsD4Bce09LMVNph+tmx+pcsoevu8LqDlrOIEi/uR3Q+4n1akDBskkPkk7hAhRKQ0jIDGLvblL8b0jYxnbIbRRbGIiugjVZz49TNDtz+upTs26ma+Dh2IDUuchb6cR41hB4RC0y4V4ymNrsVbWPyhUlJ09dVQ3wRqjvANLsyXIpjfeWegJ3Z7nlqKIhBBeQENlHrj28HIpMpvht0PjFxqvlfTyuzTRGZeF+W2tCdF0U6MzXnTrEabbqKVbj+o6DG4PtxYahcOMlPGdELmCAMbAvwDbAm5Lr/TGBS23l5KhqyVjjYnN4qhRf+8KuCmjBPuNNz8M2ggc5HVKBF2XI4ZVk03VHTWgHCyMIPe0VukEs1Qc3UQ0IV+VlAc0pPPO/Nt0kbsHsPzga63SlXWrfmxgI5KAx/76YQoMSomDtixCeJEWg76rDcXfTssvPknJam2MaPgWD2s2fnDQrxRb+hkSvaa9aZak7aQO0CCXbrTmvPX/fYRRJvwJmAEV5/LmQbyOZmy/sG9lag8MT5JfGZziO8b/uVdPKjQ2j1qNvR4i+T6HppR0NwrMwxS1Ebtt4F13h7CMbBHbL3GUesa9Dpn2sNP64tnEO2IPpYl/o/ltN0l8jacerH9GuibQUVVbOEXdyMfpRK5kgSaPsRpLDzsaskqFjmXm+Hi+JEWaMn23X5n2wLUAUJ+ki4hvazprIJN3YmM80UHFPuwKKrm/1Oih0RSLi2dDUcv0E/dY1yKVWLpJTOOvbDRUnO7WQxtk6kg8497PxwSU8okshuhSEE//SAllCMdl3Teu1JeexBxkpzapNCx6WKPX2gnQ0Q8jjOBC8bDkjsk4QnJGJcRGhqD X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 477f6429-bee6-47f2-ca20-08d8c78ea3bd 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:32.0607 (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: 66K1ncr3OZfXyaPaYfyEwoD0GEQpcrPf4hqERG0ii3eVVzIZ12wSF5vhbH5w7kpNB5m/PevaPyvzqUYX/QtkeQ== 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 partitions of the form "dev.hwpart:part" and "dev#partname". This allows one to flash to eMMC boot partitions without having to use CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT. It also allows one to flash to an entire device without needing CONFIG_FASTBOOT_MMC_USER_NAME. Lastly, one can also flash MMC devices other than CONFIG_FASTBOOT_FLASH_MMC_DEV. Because devices can be specified explicitly, CONFIG_FASTBOOT_FLASH_MMC_DEV is used only when necessary for existing functionality. For those cases, fastboot_mmc_get_dev has been added as a helper function. This allows There should be no conflicts with the existing system, but just in case, I have ordered detection of these names after all existing names. The fastboot_mmc_part test has been updated for these new names. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v4: - Fix missing closing brace drivers/fastboot/fb_mmc.c | 157 ++++++++++++++++++++++++-------------- test/dm/fastboot.c | 37 ++++++++- 2 files changed, 132 insertions(+), 62 deletions(-) diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index 71eeb02c8f..8e74e50e91 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -76,12 +76,37 @@ static int raw_part_get_info_by_name(struct blk_desc *dev_desc, return 0; } -static int part_get_info_by_name_or_alias(struct blk_desc *dev_desc, - const char *name, struct disk_partition *info) +static int do_get_part_info(struct blk_desc **dev_desc, const char *name, + struct disk_partition *info) { int ret; - ret = part_get_info_by_name(dev_desc, name, info); + /* First try partition names on the default device */ + *dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV); + if (*dev_desc) { + ret = part_get_info_by_name(*dev_desc, name, info); + if (ret >= 0) + return ret; + + /* Then try raw partitions */ + ret = raw_part_get_info_by_name(*dev_desc, name, info); + if (ret >= 0) + return ret; + } + + /* Then try dev.hwpart:part */ + ret = part_get_info_by_dev_and_name_or_num("mmc", name, dev_desc, + info, true); + return ret; +} + +static int part_get_info_by_name_or_alias(struct blk_desc **dev_desc, + const char *name, + struct disk_partition *info) +{ + int ret; + + ret = do_get_part_info(dev_desc, name, info); if (ret < 0) { /* strlen("fastboot_partition_alias_") + PART_NAME_LEN + 1 */ char env_alias_name[25 + PART_NAME_LEN + 1]; @@ -92,8 +117,8 @@ static int part_get_info_by_name_or_alias(struct blk_desc *dev_desc, strncat(env_alias_name, name, PART_NAME_LEN); aliased_part_name = env_get(env_alias_name); if (aliased_part_name != NULL) - ret = part_get_info_by_name(dev_desc, - aliased_part_name, info); + ret = do_get_part_info(dev_desc, aliased_part_name, + info); } return ret; } @@ -430,27 +455,49 @@ int fastboot_mmc_get_part_info(const char *part_name, struct blk_desc **dev_desc, struct disk_partition *part_info, char *response) { - int r = 0; + int ret; - *dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV); - if (!*dev_desc) { - fastboot_fail("block device not found", response); - return -ENOENT; - } if (!part_name || !strcmp(part_name, "")) { fastboot_fail("partition not given", response); return -ENOENT; } - if (raw_part_get_info_by_name(*dev_desc, part_name, part_info) < 0) { - r = part_get_info_by_name_or_alias(*dev_desc, part_name, part_info); - if (r < 0) { - fastboot_fail("partition not found", response); - return r; + ret = part_get_info_by_name_or_alias(dev_desc, part_name, part_info); + if (ret < 0) { + switch (ret) { + case -ENOSYS: + case -EINVAL: + fastboot_fail("invalid partition or device", response); + break; + case -ENODEV: + fastboot_fail("no such device", response); + break; + case -ENOENT: + fastboot_fail("no such partition", response); + break; + case -EPROTONOSUPPORT: + fastboot_fail("unknown partition table type", response); + break; + default: + fastboot_fail("unanticipated error", response); + break; } } - return r; + return ret; +} + +static struct blk_desc *fastboot_mmc_get_dev(char *response) +{ + struct blk_desc *ret = blk_get_dev("mmc", + CONFIG_FASTBOOT_FLASH_MMC_DEV); + + if (!ret || ret->type == DEV_TYPE_UNKNOWN) { + pr_err("invalid mmc device\n"); + fastboot_fail("invalid mmc device", response); + return NULL; + } + return ret; } /** @@ -467,22 +514,19 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer, struct blk_desc *dev_desc; struct disk_partition info; - dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV); - if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) { - pr_err("invalid mmc device\n"); - fastboot_fail("invalid mmc device", response); - return; - } - #ifdef CONFIG_FASTBOOT_MMC_BOOT_SUPPORT if (strcmp(cmd, CONFIG_FASTBOOT_MMC_BOOT1_NAME) == 0) { - fb_mmc_boot_ops(dev_desc, download_buffer, 1, - download_bytes, response); + dev_desc = fastboot_mmc_get_dev(response); + if (dev_desc) + fb_mmc_boot_ops(dev_desc, download_buffer, 1, + download_bytes, response); return; } if (strcmp(cmd, CONFIG_FASTBOOT_MMC_BOOT2_NAME) == 0) { - fb_mmc_boot_ops(dev_desc, download_buffer, 2, - download_bytes, response); + dev_desc = fastboot_mmc_get_dev(response); + if (dev_desc) + fb_mmc_boot_ops(dev_desc, download_buffer, 1, + download_bytes, response); return; } #endif @@ -494,6 +538,10 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer, if (strcmp(cmd, CONFIG_FASTBOOT_GPT_NAME) == 0 || strcmp(cmd, CONFIG_FASTBOOT_MMC_USER_NAME) == 0) { #endif + dev_desc = fastboot_mmc_get_dev(response); + if (!dev_desc) + return; + printf("%s: updating MBR, Primary and Backup GPT(s)\n", __func__); if (is_valid_gpt_buf(dev_desc, download_buffer)) { @@ -517,6 +565,10 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer, #if CONFIG_IS_ENABLED(DOS_PARTITION) if (strcmp(cmd, CONFIG_FASTBOOT_MBR_NAME) == 0) { + dev_desc = fastboot_mmc_get_dev(response); + if (!dev_desc) + return; + printf("%s: updating MBR\n", __func__); if (is_valid_dos_buf(download_buffer)) { printf("%s: invalid MBR - refusing to write to flash\n", @@ -539,19 +591,16 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer, #ifdef CONFIG_ANDROID_BOOT_IMAGE if (strncasecmp(cmd, "zimage", 6) == 0) { - fb_mmc_update_zimage(dev_desc, download_buffer, - download_bytes, response); + dev_desc = fastboot_mmc_get_dev(response); + if (dev_desc) + fb_mmc_update_zimage(dev_desc, download_buffer, + download_bytes, response); return; } #endif - if (raw_part_get_info_by_name(dev_desc, cmd, &info) != 0) { - if (part_get_info_by_name_or_alias(dev_desc, cmd, &info) < 0) { - pr_err("cannot find partition: '%s'\n", cmd); - fastboot_fail("cannot find partition", response); - return; - } - } + if (fastboot_mmc_get_part_info(cmd, &dev_desc, &info, response) < 0) + return; if (is_sparse_image(download_buffer)) { struct fb_mmc_sparse sparse_priv; @@ -594,28 +643,19 @@ void fastboot_mmc_erase(const char *cmd, char *response) lbaint_t blks, blks_start, blks_size, grp_size; struct mmc *mmc = find_mmc_device(CONFIG_FASTBOOT_FLASH_MMC_DEV); - if (mmc == NULL) { - pr_err("invalid mmc device\n"); - fastboot_fail("invalid mmc device", response); - return; - } - - dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV); - if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) { - pr_err("invalid mmc device\n"); - fastboot_fail("invalid mmc device", response); - return; - } - #ifdef CONFIG_FASTBOOT_MMC_BOOT_SUPPORT if (strcmp(cmd, CONFIG_FASTBOOT_MMC_BOOT1_NAME) == 0) { /* erase EMMC boot1 */ - fb_mmc_boot_ops(dev_desc, NULL, 1, 0, response); + dev_desc = fastboot_mmc_get_dev(response); + if (dev_desc) + fb_mmc_boot_ops(dev_desc, NULL, 1, 0, response); return; } if (strcmp(cmd, CONFIG_FASTBOOT_MMC_BOOT2_NAME) == 0) { /* erase EMMC boot2 */ - fb_mmc_boot_ops(dev_desc, NULL, 2, 0, response); + dev_desc = fastboot_mmc_get_dev(response); + if (dev_desc) + fb_mmc_boot_ops(dev_desc, NULL, 1, 0, response); return; } #endif @@ -623,6 +663,10 @@ void fastboot_mmc_erase(const char *cmd, char *response) #ifdef CONFIG_FASTBOOT_MMC_USER_SUPPORT if (strcmp(cmd, CONFIG_FASTBOOT_MMC_USER_NAME) == 0) { /* erase EMMC userdata */ + dev_desc = fastboot_mmc_get_dev(response); + if (!dev_desc) + return; + if (fb_mmc_erase_mmc_hwpart(dev_desc)) fastboot_fail("Failed to erase EMMC_USER", response); else @@ -631,13 +675,8 @@ void fastboot_mmc_erase(const char *cmd, char *response) } #endif - if (raw_part_get_info_by_name(dev_desc, cmd, &info) != 0) { - if (part_get_info_by_name_or_alias(dev_desc, cmd, &info) < 0) { - pr_err("cannot find partition: '%s'\n", cmd); - fastboot_fail("cannot find partition", response); - return; - } - } + if (fastboot_mmc_get_part_info(cmd, &dev_desc, &info, response) < 0) + return; /* Align blocks to erase group size to avoid erasing other partitions */ grp_size = mmc->erase_grp_size; diff --git a/test/dm/fastboot.c b/test/dm/fastboot.c index 8f905d8fa8..e7f8c362b8 100644 --- a/test/dm/fastboot.c +++ b/test/dm/fastboot.c @@ -35,9 +35,12 @@ static int dm_test_fastboot_mmc_part(struct unit_test_state *uts) }, }; - ut_assertok(blk_get_device_by_str("mmc", - __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV), - &mmc_dev_desc)); + /* + * There are a lot of literal 0s I don't want to have to construct from + * MMC_DEV. + */ + ut_asserteq(0, CONFIG_FASTBOOT_FLASH_MMC_DEV); + ut_assertok(blk_get_device_by_str("mmc", "0", &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); @@ -59,6 +62,34 @@ static int dm_test_fastboot_mmc_part(struct unit_test_state *uts) &part_info, response)); ut_assertok(env_set(FB_ALIAS_PREFIX "test3", NULL)); + /* "New" partition labels */ + ut_asserteq(1, fastboot_mmc_get_part_info("#test1", &fb_dev_desc, + &part_info, response)); + ut_asserteq(1, fastboot_mmc_get_part_info("0#test1", &fb_dev_desc, + &part_info, response)); + ut_asserteq(1, fastboot_mmc_get_part_info("0.0#test1", &fb_dev_desc, + &part_info, response)); + ut_asserteq(1, fastboot_mmc_get_part_info("0:1", &fb_dev_desc, + &part_info, response)); + ut_asserteq(1, fastboot_mmc_get_part_info("0.0:1", &fb_dev_desc, + &part_info, response)); + ut_asserteq(1, fastboot_mmc_get_part_info("0", &fb_dev_desc, + &part_info, response)); + ut_asserteq(1, fastboot_mmc_get_part_info("0.0", &fb_dev_desc, + &part_info, response)); + ut_asserteq(0, fastboot_mmc_get_part_info("0:0", &fb_dev_desc, + &part_info, response)); + ut_asserteq(0, fastboot_mmc_get_part_info("0.0:0", &fb_dev_desc, + &part_info, response)); + ut_asserteq(0, fastboot_mmc_get_part_info("1", &fb_dev_desc, + &part_info, response)); + ut_asserteq(0, fastboot_mmc_get_part_info("1.0", &fb_dev_desc, + &part_info, response)); + ut_asserteq(1, fastboot_mmc_get_part_info(":1", &fb_dev_desc, + &part_info, response)); + ut_asserteq(0, fastboot_mmc_get_part_info(":0", &fb_dev_desc, + &part_info, response)); + return 0; } DM_TEST(dm_test_fastboot_mmc_part, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); From patchwork Tue Feb 2 15:23:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1434790 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=KDmcCIxS; 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 4DVTDT1D1Wz9vFB for ; Wed, 3 Feb 2021 02:26:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8CEB082751; Tue, 2 Feb 2021 16:24:52 +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="KDmcCIxS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8604A82709; Tue, 2 Feb 2021 16:24:39 +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,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20603.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::603]) (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 B5FE0826D4 for ; Tue, 2 Feb 2021 16:24:34 +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=dqyyp27HIopTQKo1FiHK2gxD1UpLCGOXXyOKYahOkBD8/7OvgNmtjI6Wzsy/tLSHF+d0oY6Hpafyc6WBi+jHT2nq/1/k6s27a4//CMAXKZggnWOoftgnQLyD9o0WKVqMxqqEqUN3tlZF3AmN2Mhrt189R9q2Ljydc8JDOx6zb9hu52Fgw+tNbBTFMfzhegwRJYs370qUd9E6xDSv2yYRcz3lJuHr3NjZqM4VHszWW+0G42CaDGfMNEMlTtB+u//WVx/dMkHBeocifQME10XMeRAy6x2WsfiwvGIVUZedIb8TycEttcIdzkbvqDBsymAss9AuQDFnUqQHYz6jrVWzyw== 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=4v1CxFNl+qnzB+E17/+HiHaniyCq5Aos6F43ScE7S/I=; b=lW6Jz7hBSK0myz4fK4pX60/ZEb4ozB7uZ13BB/gSW9IM8OKBAZxTLL+OAHKWL5FxYJpltL1VzQ06BgKgnMLdFcSBkdS4rxGHXLSD3S0+IFOqyh+rWcrRJL19LlOWYIwQfGfGXsMHWc/ALtNhsQ3NMJsUUSl2By2CShWHVZwbRpAQ7u8q6i6knV1xCP+KgLxAtFfGrO4wfgZbVdmt0pb9Jc8+tztYAeROIOCwRhkBSgdloMNACXeldDXXO+/vGPIDO0V+QrVKC70fHcANiDSWtnR5zZJVN9pKVTHH1xzzQk/HutuV5hP6EDeWSfF79hXSrO7oOJGDLKrRhmrFwqO7Cg== 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=4v1CxFNl+qnzB+E17/+HiHaniyCq5Aos6F43ScE7S/I=; b=KDmcCIxSWiG7DNUZgKaUKj7wAJMi8Gu0ifbAZaCEm1FpRkzsz5XMJaPUgYmvzfy93ZbwYdfqg6tkzxz6BWR0DSccBCen5gvO38wOmyI8oSSkzbi15MdfbTNUBTbV0G46ydB6QAthzBk62w9mv5bOvAyug+HcNT2gBNd6S4g1Qiw= 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:33 +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:33 +0000 From: Sean Anderson To: u-boot@lists.denx.de Cc: Lukasz Majewski , Simon Glass , Sean Anderson , Filip Brozovic , Heinrich Schuchardt , Marek Szyprowski , =?utf-8?q?Pali_Roh=C3=A1r?= , Patrick Delaunay , Sam Protsenko Subject: [PATCH v4 9/9] fastboot: Partition specification Date: Tue, 2 Feb 2021 10:23:52 -0500 Message-Id: <20210202152352.33245-10-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:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ce299185-beb7-4008-da6f-08d8c78ea4c3 X-MS-TrafficTypeDiagnostic: VI1PR0302MB2816: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /jg5uG7IRwPHnsH4M840DdD8ATb8rMPPD+s/jPvIBpVE92oehnNr1fEM715dDrHdkTuk4ssKXdwypuH9N3NyUtGk11vsU/beXX6BwQ29cG1qILMD3Cra8EeTQ0bwCm8cP9IGXAjwVgtXin/ehAR0yrcCMfSyoYtt6u/1rAgbYqkFbLUf5ohLfnPd9zyoK1QdDprwDkWvjfznMLkBiib5Vc7tVEOm5JZBBOquCfW1FHRgVKGd6wKG9HyVH/JyKa/oJU51mdqyvc8sWSPnYxNlScx+v5lMT7oZr9Eb5f+iAx84rhqIH+bGBFZy/HBtavOE1QPWd6GeLRuxkjcr4xyvZMF4Wz9IHKUEOCMK4KyXKkaXXkS6mg/Gm0OUoyFUN3HvGhuOoGbCeSdokRKHjFkLLfP1Bcyic0tvROx1lAp/uYSpuLdHvUaZAZNOX2pTX0WjGQWvggb0flKawvybCZldQiiQ0LAddcqy/9xD+0vwiRNBkkKScBL4sGKWxkyDQ/4/BWK+qiktGPzv3ZB25teIXg== 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: XNxzjzR3fEdW0TyWHtoZMQLFLxxf1Rg+3LMYY1BHCvgTrQFpqdc7cBVLxqx1m6MmvCtekqeb/mhnY+tyr2mDffFlrowBRsHkmxIjAOXPAItJXQLr36vWP2LGXcw8Us7huh28opbjmKceqaPoXycnBmknSe3iYp5ZuUFxoDP9qvrBP+3APwy6xj9L7nqt73StWkXcxdoDJ4AA/RVMtyzAf1LrXI7ZpTk6guS9Sgnmsh6OXP/Zs8MxUlNUB7/74a7dIoS78EWhdGCk+AGaM3gZ5na424W+7hmkQPfBwcNDhIHCOZ5hg4pfW4vv0dBmrt1YFq1ErJdpVb97o6XzhnavsJ7/20kgpSl1sx/vfRPFnvx8tOR6Adq1LYnkMapJjuWHmzO9dUlxH1nOj62+vLPvHqBiTLNx7SOGFa3sMKYJfVpeBOOgdbPb7ZFw2AApGiPkOCCw+2kvJnwU/Ix6VGvhKBTWPsrd31j1dA/ETttu+EV3hq8kelP822YDRcfvhvsgJV1V+mdG4oSIKYdMh6jAYhMyKeZ3XUIFwzFkexHw2yhLwTKArbi4mFvm6YcGQnjLYaNxPncQ3+vt2EzUiLzrSixDGowJstTkRVciV/BY8+NcLbmeBAAW0ksgxOEy0/BKR6/Q36QAcWJrmsbw2O4N+X7YqwJ6YDAw8TJ5R13ZEMf+3MGSwZciMgtV/hCde/6hIPmFpFtsn0g8btNILepEquzvAiMAT4ZDNJ/3NqGCF13Qucf4Nbea2zlQKkoRMtlxezciHgfh9afh8Fa2j6tQ47eL6F0CVM8QTKpN13GU0iVoGoW1eJEExk4ev+z/+s/7Fg13jl2t+GZILZlV1E1MXSyOMbZL+XUZHME38LaxKeu4zpbLC8BpOjuSIaAaWdHc1uJ16LlS6bU6m6jhmYSvdGfrHLqgHMoB9hF3nfukR51zzbrY+QTUdc+c5BhFLNlbH66lAgIVbvQHnQfFWDYq782ZZiQret9yHs3luEjIB+esNlfuTS8QJqW0T0nwRPnQ7RnCG2dn9lYcFc+TePhQ9cl1rfilFsJzTN+Z8Q2PZZ2YPZikQT/tGE81QPgvm8ra X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce299185-beb7-4008-da6f-08d8c78ea4c3 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:33.7463 (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: kFpI4sPSXF8FOB5U1hYYucEX8MLyLaAaCmK8WdKnttN3HVYfPF7VX9uhJeCGoHdl4cV/Yg0ueyQLmpKtIKq4+w== 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 documents the way U-Boot understands partitions specifications. This also updates the fastboot documentation for the changes in the previous commit. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v4: - Expand documentation, making it more man-page-like Changes in v2: - Move partition documentation under doc/usage doc/android/fastboot.rst | 4 ++ doc/usage/index.rst | 1 + doc/usage/partitions.rst | 80 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 doc/usage/partitions.rst diff --git a/doc/android/fastboot.rst b/doc/android/fastboot.rst index 16b11399b3..ce513a2a0f 100644 --- a/doc/android/fastboot.rst +++ b/doc/android/fastboot.rst @@ -154,6 +154,10 @@ The device index starts from ``a`` and refers to the interface (e.g. USB controller, SD/MMC controller) or disk index. The partition index starts from ``1`` and describes the partition number on the particular device. +Alternatively, partition types may be specified using :ref:`U-Boot's partition +syntax `. This allows specifying partitions like ``0.1``, +``0#boot``, or ``:3``. The interface is always ``mmc``. + Writing Partition Table ----------------------- diff --git a/doc/usage/index.rst b/doc/usage/index.rst index 83cfbafd90..d45467caf2 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -6,6 +6,7 @@ Use U-Boot fdt_overlays netconsole + partitions Shell commands -------------- diff --git a/doc/usage/partitions.rst b/doc/usage/partitions.rst new file mode 100644 index 0000000000..cbf8ae34f1 --- /dev/null +++ b/doc/usage/partitions.rst @@ -0,0 +1,80 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. _partitions: + +Partitions +========== + +Synopsis +-------- + +:: + + [devnum][.hwpartnum][:partnum|#partname] + +Description +----------- + +Many U-Boot commands allow specifying partitions (or whole disks) using a +generic syntax. + +interface + The interface used to access the partition's device, like ``mmc`` or + ``scsi``. For a full list of supported interfaces, consult the + ``if_typename_str`` array in ``drivers/block/blk-uclass.c`` + +devnum + The device number. This defaults to 0. + +hwpartnum + The hardware partition number. All devices have at least one hardware + partition. On most devices, hardware partition 0 specifies the whole + device. On eMMC devices, hardware partition 0 is the user partition, + hardware partitions 1 and 2 are the boot partitions, hardware partition + 3 is the RPMB partition, and further partitions are general-purpose + user-created partitions. The default hardware partition number is 0. + +partnum + The partition number, starting from 1. The partition number 0 specifies + that the whole device is to be used as one "partition." + +partname + The partition name. This is the partition label for GPT partitions. For + MBR partitions, the following syntax is used:: + + + + mbr_interface + A device type like ``mmcsd`` or ``hd``. See the + ``part_set_generic_name`` function in ``disk/part.c`` for a + complete list. + + devletter + The device number as an offset from ``a``. For example, device + number 2 would have a device letter of ``c``. + + partnum + The partition number. This is the same as above. + +If neither ``partname`` nor ``partnum`` is specified and there is a partition +table, then partition 1 is used. If there is no partition table, then the whole +device is used as one "partition." If none of ``devnum``, ``hwpartnum``, +``partnum``, or ``partname`` is specified, or only ``-`` is specified, then +``devnum`` defaults to the value of the ``bootdevice`` environmental variable. + +Examples +-------- + +List the root directory contents on MMC device 2, hardware partition 1, +and partition number 3:: + + ls mmc 2.1:3 / + +Load ``/kernel.itb`` to address ``0x80000000`` from SCSI device 0, hardware partition +0, and the partition labeled ``boot``:: + + load scsi #boot 0x80000000 /kernel.itb + +Print the partition UUID of the SATA device ``$bootdevice``, hardware partition +0, and partition number 0:: + + part uuid sata -