From patchwork Thu Jan 7 15:21:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1423362 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; dmarc=fail (p=none dis=none) header.from=seco.com 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=1RD2rWho; 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 4DBVP94H6tz9s24 for ; Fri, 8 Jan 2021 02:23:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5151E828D6; Thu, 7 Jan 2021 16:22:07 +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="1RD2rWho"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 60AA9828BE; Thu, 7 Jan 2021 16:21:54 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,T_SPF_HELO_TEMPERROR autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20603.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::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 D987A8289F for ; Thu, 7 Jan 2021 16:21:37 +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=ER2tTz1de4pInWG6zLUI2iL1Vv6u3HMmLGK9bkgfCJH1MB7ZnLPVYp4MXVK+0YVzr9o93e6ip8fgwTLWAg7UojjnYFFUUvMAj4medUZnB0g18/gy31J8GmUioTUOSZCBmI61USMBBnJyJiVMdTEEe3dTeyHBMd3QpvkF173Zl7YIM1EtM89vrkq7Lub0nYufXrc+B5XGuShxvppajV8xG6BY4H/xAcVsky5ooHr4NJ6OT9ncs7lyN3ZyghPHiYWsnJ+Oucgo7/dGibPkKG7WWXN1yIxXSDQXXYPbjSfwD1gP5i0lDHshjmX5gPIYiTOgqU4by0Ne9loijcwKsmDBgQ== 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=x/NbubtnUkcYdeV5aC02dwkNw6zAJ+8qglrD6ewDPlQ=; b=ULoZvJEm+V3KW4jwx0ofMRqozdt9ZPazwmt2Bx4sd/eZZgFGJyZMF5XXEp+CWyC83A2YW1yJh9Wnzv8F3qcLCeemhx6uGv6GTuXcxsa9xRNIN53YL/xG3EbKjUZP60cjJrtlovUswpyaQBgZrHzZmp426x0di0HD4kc3txNTHTNjPAcIHMyOiXFJ9O+qIgh82XKbj9JfjR+g0WcXu36bt4kEjfXJeiyWig98qtTOZw4/X/kOL8EWrp4c8lzLBKNuaGiFCZGjn3aXm5+q4wpQ4IrK/mnHHRwy+ljQP6fNWF2Rv6jT+0usGsC6gu2hvFjIYPLElqnrWHGTIcozHBBirA== 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=x/NbubtnUkcYdeV5aC02dwkNw6zAJ+8qglrD6ewDPlQ=; b=1RD2rWhoPCtOyV8tG313yrfK6W4kRse9SkW80wwK97z3Sv1siRstLN4vLKCbXYoIfDEQyZNOb7Yg5mDKp3XvkqJ0+yWgnVz6yp1SiGKgJ7jYw37/9ldsKD41EzGDLHCiagFFgyOAQiUshfToR6LREygrbcQkRg9X9emuLxpbFa4= 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 AM9PR03MB6930.eurprd03.prod.outlook.com (2603:10a6:20b:2d7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6; Thu, 7 Jan 2021 15:21:37 +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.3742.006; Thu, 7 Jan 2021 15:21:37 +0000 From: Sean Anderson To: u-boot@lists.denx.de Cc: Simon Glass , Sean Anderson , Filip Brozovic , mingming lee Subject: [PATCH v2 6/9] fastboot: Remove mmcpart argument from raw_part_get_info_by_name Date: Thu, 7 Jan 2021 10:21:00 -0500 Message-Id: <20210107152104.1837414-7-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210107152104.1837414-1-sean.anderson@seco.com> References: <20210107152104.1837414-1-sean.anderson@seco.com> X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: MN2PR19CA0053.namprd19.prod.outlook.com (2603:10b6:208:19b::30) 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 MN2PR19CA0053.namprd19.prod.outlook.com (2603:10b6:208:19b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6 via Frontend Transport; Thu, 7 Jan 2021 15:21:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a258bf3a-ac41-4a8b-2595-08d8b31fecd3 X-MS-TrafficTypeDiagnostic: AM9PR03MB6930: 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: MioNx9n+dPejBVZ3vLRbO1tpf8KNZBjHWY0gEbciuufnetOlVgj/jTFTBop4bcDljmOaCX9osKVjWZ7XA9bHQiaNamoc66jxvCg4gy2Xc+oOK/Y0cJH/+kuv9R5NofVaETsJWbXVTfA/lYL331WXkLyZCNQKpCebH2h7AU0uQvVPUvLQ1Rw2DsdQPRu3BNucOnw/HGemt5sJQSiTy07yoFesX3lkt4eajv0BW+JP88iRXPptPoHX0D+jmsXDxo/GpR4CEP2Rq4BREvqjf0irrUMT4j6+d4VE19sBRqGnUTBGWKtPNoEAmmjiHGrHu9YNl+teTH3J5JwK4QND8v15D7oVa9oIQIlNZq85D+L6FF9NdnjJGSSe0Yh+0+5pQ1785esG82AOWNifUFGk7zN1gw== 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:(346002)(136003)(396003)(376002)(366004)(39850400004)(66556008)(66476007)(66946007)(86362001)(6666004)(36756003)(478600001)(6486002)(16526019)(956004)(5660300002)(8676002)(6916009)(6512007)(2906002)(26005)(8936002)(186003)(6506007)(2616005)(52116002)(1076003)(54906003)(83380400001)(4326008)(316002)(44832011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: rDbRvoTqQlODZwVNHS9nOZTBjT9o2A+/TOOYoWGp2WFDVdQ4Gv3wPVYLLBkN1Mc6FWR6djvJkkr0gODaG0xyPt9qlHe8K9TgggovSjDtRcJxKfBAOIwVNkVDDNsj4TOvAcQmHAOs9BksKNBY6LG1z120fvqKODZOA4i7coSKyKu9nJFrA1Ni5b0Ws7BPN9HPlew9G8ECEiUvQWfVG6NFeznjFVhJckWvbRHzd7rC29A//D+jX61RzuyJRc+/ywLjTCvELtCpZJh8dgpbvaKG8QhbT8Rr6iAvsF4RIYW/ap3gsyb/s3maW0NWkDceTpJ9OSF4h/VqxYRvtFwAOAV71ysth8PyWRenzON42eMVwo5bQuHTNnIuDeFZKlzhPosD8DtXB8nLzPSkUKZQ8NXj6c25yqMDMuGIi5iS1+dxGEkzMd+I1TQU22jr+HtVo9JiEYbsx1imm8V5Cihhs6ges0S4S5hqhcPu1e62dcWXqE5SOqxSiL/3T8wBgtqVdKPyLcTLzXXoLGqljA+qgFlMSzwbnMLNk2Coq1Hgo7cSKv37BW4YOOXbBfs/CRUQFfniq5FOsYk4DDXhlJhOiYDXKVXiYHBU8WL+3/OGg1JgNgLdnyRC1k5gN4aRQAtdFQGUis7Du/1+96sSTaEqTEmF0ld7wYjLmKv6dgZw8gVR0dj4YjYYHvUDrJYSaI9AtLbzx5bMkQr/FRe8NS58h1t0pXWvK3lTPFWyUxClSTP2gytH6dQYy+7kiuZBgngs6wxnlqJpDOsPJisJap0d/vhV1WoUAmaJUBIfnzh5+mzRtKWenOwN3uP8oA8GjxXIuOQFXq8BW7fjfG0TPQWbq1mHOr3/H32+wm13I9fBTs6kermjT6W9yeO4dDgZHMc9iQS3x/GxJdJbtmlz+GoFa2vHSd+8HsmCoBqNyP/LuakR7UBEjFY+Sdfjj5gKaKqXxqAdQfDgnV5WD0Z899sk/uFV9KfZRyuGsrwfuC3lBOn20PhOX37aRr9lFRkN5HUX7rS1 X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-AuthSource: AM9PR03MB7251.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2021 15:21:37.0856 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-Network-Message-Id: a258bf3a-ac41-4a8b-2595-08d8b31fecd3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hggcKkkFwplQSI+Zzfh+YR5Cy1KPYReVqwiHsKqY3UIaQLeDIwmEHFpZiiLI6VXpeJ02gzmDVds7CEGFg/kjZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR03MB6930 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 ae8e8e512f..f6cacd711b 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; @@ -419,7 +425,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) { @@ -431,7 +436,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); @@ -455,7 +460,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) { @@ -528,16 +532,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)) { @@ -580,7 +580,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"); @@ -614,16 +613,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 */