From patchwork Tue Sep 24 13:11:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 1166582 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=samsung.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="tT/RgYlS"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46d1nd0f1kz9sDB for ; Tue, 24 Sep 2019 23:12:37 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AFAA0C21E13; Tue, 24 Sep 2019 13:11:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 928EBC21DD9; Tue, 24 Sep 2019 13:11:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1D699C21C29; Tue, 24 Sep 2019 13:11:24 +0000 (UTC) Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by lists.denx.de (Postfix) with ESMTPS id 50E89C21DA6 for ; Tue, 24 Sep 2019 13:11:22 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20190924131121euoutp02d7f557b22befa0f11f21e69868b02411~HYfDIj_Xg0931009310euoutp02z for ; Tue, 24 Sep 2019 13:11:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20190924131121euoutp02d7f557b22befa0f11f21e69868b02411~HYfDIj_Xg0931009310euoutp02z DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1569330681; bh=xpb89xumnKbkepwh0R9J4z/P6izn4YEanFXAJiH30QI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tT/RgYlSRFvnNkowIxION3LzLi7PNW1JYirQ22ExI8KZpFXUF0KoKKzq1xMLJOkgP fbCJmw+NuW/CtGxpEgzX7w1YvrLhVsuCVSBZbJkSm1TdNIa7RmWpKYnprVhWRC9A8e CMU4iwOfwC8Rq/Jr5O/JkWlJRg9uWOYWPDa/olcI= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20190924131121eucas1p27b946f97335f53d9d43ef2064f7306c5~HYfC_mxvN0155301553eucas1p2b; Tue, 24 Sep 2019 13:11:21 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 4F.2B.04309.9F51A8D5; Tue, 24 Sep 2019 14:11:21 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20190924131121eucas1p118611ad8a2d6e5dc36ea20dca87b7e16~HYfCddXYI0342603426eucas1p1V; Tue, 24 Sep 2019 13:11:21 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20190924131121eusmtrp290078842a5988849e96eaa77e1fcc44e~HYfCc4YY51458114581eusmtrp2K; Tue, 24 Sep 2019 13:11:21 +0000 (GMT) X-AuditID: cbfec7f4-afbff700000010d5-b1-5d8a15f9fcaa Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id FC.93.04117.9F51A8D5; Tue, 24 Sep 2019 14:11:21 +0100 (BST) Received: from AMDC2765.digital.local (unknown [106.120.51.73]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20190924131120eusmtip253f207bec43896223531658863030e01~HYfCBJ1Ax0443504435eusmtip2U; Tue, 24 Sep 2019 13:11:20 +0000 (GMT) From: Marek Szyprowski To: u-boot@lists.denx.de Date: Tue, 24 Sep 2019 15:11:08 +0200 Message-Id: <20190924131111.1691-4-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190924131111.1691-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42LZduzned2fol2xBpsua1lsnLGe1eLGrzZW i+fvLjNZrD1yl91iweQnrBYb5r9lsZgx+SWbxdu9newOHB7zZp1g8Th7ZwejR9+WVYwe67dc ZfHY9MojgDWKyyYlNSezLLVI3y6BK+Po3rOMBZeVKyb92sLSwLhXpouRk0NCwESicesy1i5G Lg4hgRWMElOW/2ODcL4wSrx99JkFwvnMKPH/wlcmmJaPX69CVS1nlJj1fzE7XMuBTXtYQarY BAwlut52sYHYIgISEr/6rzKCFDELbGeSaG+9zgKSEAYaterhOXYQm0VAVeLG15NgNq+AjcTV jh+sEOvkJVZvOMAMYnMK2Eocv3wI7FoJgc9sEs33upghilwk7v1bzwZhC0u8Or6FHcKWkfi/ cz4TREMzo8TDc2vZIZweRonLTTMYIaqsJQ4fvwg0lgPoPk2J9bv0IcKOEg1TprOAhCUE+CRu vBUECTMDmZO2TWeGCPNKdLQJQVSrScw6vg5u7cELl6BO85D4sHwNIySEJjBKdN+byDKBUX4W wrIFjIyrGMVTS4tz01OLjfJSy/WKE3OLS/PS9ZLzczcxApPG6X/Hv+xg3PUn6RCjAAejEg+v A2tXrBBrYllxZe4hRgkOZiUR3k1abbFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeasZHkQLCaQn lqRmp6YWpBbBZJk4OKUaGKc4+F0MLGVPi/L9M3/dqv3Gv/wYvVlv/i3wkn7IuV/dUv7n4lnC cxVLQ///Tex6wxDs+NyE50Cx4+oPv+1mTp3dwLe6wmCiSsjJM7d4fju++fvFVP+Vz/LjGVvn Tz608Ldtkt9N7+bKG0aCm6Sm3cx6JXrDcG9aWtpeuTCeqUZNYt67G2r32CmxFGckGmoxFxUn AgD8nUG/FgMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRmVeSWpSXmKPExsVy+t/xe7o/RbtiDZ5t5LbYOGM9q8WNX22s Fs/fXWayWHvkLrvFgslPWC02zH/LYjFj8ks2i7d7O9kdODzmzTrB4nH2zg5Gj74tqxg91m+5 yuKx6ZVHAGuUnk1RfmlJqkJGfnGJrVK0oYWRnqGlhZ6RiaWeobF5rJWRqZK+nU1Kak5mWWqR vl2CXsbRvWcZCy4rV0z6tYWlgXGvTBcjJ4eEgInEx69X2boYuTiEBJYySrz/sJ0ZIiEjcXJa AyuELSzx51oXVNEnRokNy6+wgSTYBAwlut52gdkiAhISv/qvMoIUMQvsZpK4vuoYI0hCGGjF qofn2EFsFgFViRtfT4LZvAI2Elc7fkBtkJdYveEA2GZOAVuJ45cPgcWFgGpmH3nNNoGRbwEj wypGkdTS4tz03GIjveLE3OLSvHS95PzcTYzAAN527OeWHYxd74IPMQpwMCrx8DqwdsUKsSaW FVfmHmKU4GBWEuHdpNUWK8SbklhZlVqUH19UmpNafIjRFOioicxSosn5wOjKK4k3NDU0t7A0 NDc2NzazUBLn7RA4GCMkkJ5YkpqdmlqQWgTTx8TBKdXAaD1XwOheMG9L4O4vS3MMetujt6yc Eaq2IsbE+fHjD5KCP2dITL4T+0F2afLB+81uesLuikHfKls9zf/s3lry2udP7h7XpsXvsoya 29iFOQo7bCrYviy9X3e176xeaM2+I1uuxt+94BgbblHGVRk1kXvZUT72V/HeLf9yf7bwrl34 VcWre+orJZbijERDLeai4kQAU8WNo3YCAAA= X-CMS-MailID: 20190924131121eucas1p118611ad8a2d6e5dc36ea20dca87b7e16 X-Msg-Generator: CA X-RootMTR: 20190924131121eucas1p118611ad8a2d6e5dc36ea20dca87b7e16 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20190924131121eucas1p118611ad8a2d6e5dc36ea20dca87b7e16 References: <20190924131111.1691-1-m.szyprowski@samsung.com> Cc: Matthias Brugger , Bartlomiej Zolnierkiewicz , Marek Szyprowski Subject: [U-Boot] [PATCH v2 3/6] dfu: mmc: rearrange the code X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Rename functions for bufferred file io operations to make them easier to understand. Also add missing file offset argument to them (currently unused). All this is a preparation to remove predefined file size limit (CONFIG_SYS_DFU_MAX_FILE_SIZE) for DFU read/write operations. Signed-off-by: Marek Szyprowski Acked-by: Lukasz Majewski --- drivers/dfu/dfu_mmc.c | 61 ++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index 403fd5351d..2d97f4528c 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -91,22 +91,8 @@ static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu, return 0; } -static int mmc_file_buffer(struct dfu_entity *dfu, void *buf, long *len) -{ - if (dfu_file_buf_len + *len > CONFIG_SYS_DFU_MAX_FILE_SIZE) { - dfu_file_buf_len = 0; - return -EINVAL; - } - - /* Add to the current buffer. */ - memcpy(dfu_file_buf + dfu_file_buf_len, buf, *len); - dfu_file_buf_len += *len; - - return 0; -} - static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, - void *buf, u64 *len) + u64 offset, void *buf, u64 *len) { char dev_part_str[8]; int ret; @@ -137,7 +123,7 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, switch (op) { case DFU_OP_READ: - ret = fs_read(dfu->name, (size_t)buf, 0, 0, &size); + ret = fs_read(dfu->name, (size_t)buf, offset, 0, &size); if (ret) { puts("dfu: fs_read error!\n"); return ret; @@ -145,7 +131,7 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, *len = size; break; case DFU_OP_WRITE: - ret = fs_write(dfu->name, (size_t)buf, 0, *len, &size); + ret = fs_write(dfu->name, (size_t)buf, offset, *len, &size); if (ret) { puts("dfu: fs_write error!\n"); return ret; @@ -166,6 +152,30 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, return ret; } +static int mmc_file_buf_write(struct dfu_entity *dfu, u64 offset, void *buf, long *len) +{ + if (dfu_file_buf_len + *len > CONFIG_SYS_DFU_MAX_FILE_SIZE) { + dfu_file_buf_len = 0; + return -EINVAL; + } + + /* Add to the current buffer. */ + memcpy(dfu_file_buf + dfu_file_buf_len, buf, *len); + dfu_file_buf_len += *len; + + return 0; +} + +static int mmc_file_buf_write_finish(struct dfu_entity *dfu) +{ + int ret = mmc_file_op(DFU_OP_WRITE, dfu, 0, dfu_file_buf, + &dfu_file_buf_len); + + /* Now that we're done */ + dfu_file_buf_len = 0; + return ret; +} + int dfu_write_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf, long *len) { @@ -177,7 +187,7 @@ int dfu_write_medium_mmc(struct dfu_entity *dfu, break; case DFU_FS_FAT: case DFU_FS_EXT4: - ret = mmc_file_buffer(dfu, buf, len); + ret = mmc_file_buf_write(dfu, offset, buf, len); break; default: printf("%s: Layout (%s) not (yet) supported!\n", __func__, @@ -193,11 +203,7 @@ int dfu_flush_medium_mmc(struct dfu_entity *dfu) if (dfu->layout != DFU_RAW_ADDR) { /* Do stuff here. */ - ret = mmc_file_op(DFU_OP_WRITE, dfu, dfu_file_buf, - &dfu_file_buf_len); - - /* Now that we're done */ - dfu_file_buf_len = 0; + ret = mmc_file_buf_write_finish(dfu); } return ret; @@ -214,7 +220,7 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size) case DFU_FS_FAT: case DFU_FS_EXT4: dfu_file_buf_filled = -1; - ret = mmc_file_op(DFU_OP_SIZE, dfu, NULL, size); + ret = mmc_file_op(DFU_OP_SIZE, dfu, 0, NULL, size); if (ret < 0) return ret; if (*size > CONFIG_SYS_DFU_MAX_FILE_SIZE) @@ -227,14 +233,15 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size) } } -static int mmc_file_unbuffer(struct dfu_entity *dfu, u64 offset, void *buf, + +static int mmc_file_buf_read(struct dfu_entity *dfu, u64 offset, void *buf, long *len) { int ret; u64 file_len; if (dfu_file_buf_filled == -1) { - ret = mmc_file_op(DFU_OP_READ, dfu, dfu_file_buf, &file_len); + ret = mmc_file_op(DFU_OP_READ, dfu, 0, dfu_file_buf, &file_len); if (ret < 0) return ret; dfu_file_buf_filled = file_len; @@ -259,7 +266,7 @@ int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf, break; case DFU_FS_FAT: case DFU_FS_EXT4: - ret = mmc_file_unbuffer(dfu, offset, buf, len); + ret = mmc_file_buf_read(dfu, offset, buf, len); break; default: printf("%s: Layout (%s) not (yet) supported!\n", __func__,