From patchwork Tue Nov 26 08:15:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 1200797 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 (no SPF record) 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="RH0l4yJF"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 47McGy33lGz9sPK for ; Tue, 26 Nov 2019 19:18:18 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1993DC21F75; Tue, 26 Nov 2019 08:17:02 +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 C7244C21F37; Tue, 26 Nov 2019 08:15:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A0DD8C21E31; Tue, 26 Nov 2019 08:15:46 +0000 (UTC) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by lists.denx.de (Postfix) with ESMTPS id E05CDC21E47 for ; Tue, 26 Nov 2019 08:15:45 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20191126081545euoutp01672756e7b1edaf90383779f3d8918670~aqF72V19j1139811398euoutp01f for ; Tue, 26 Nov 2019 08:15:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20191126081545euoutp01672756e7b1edaf90383779f3d8918670~aqF72V19j1139811398euoutp01f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1574756145; bh=3pZ+HkfsltL+bO+jnLrEvMgVBCIkgIrt3zDYAjgh2Rw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RH0l4yJF3yHXdrov0W6mLE3OOPGAm9O6aLySsL3TFxd2n8t+rfMDaudH/iuogudgd ClyWEKLOx6Kzh8kweLP0VWf9FJfLDNJdV9g9hipsn+YCf5lFxM3+eyc22xspiRfskZ Wysj3MS8agkkFd4OqE1mLNv1YyQW9+0T8UzawsEM= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20191126081545eucas1p10d2203ac38bb28225893c1e52f7db85c~aqF7myBsf0404504045eucas1p1h; Tue, 26 Nov 2019 08:15:45 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 0B.97.61286.13FDCDD5; Tue, 26 Nov 2019 08:15:45 +0000 (GMT) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20191126081544eucas1p19beac0f0582b90846a36bb9faf09c39a~aqF7Q4rYJ0874208742eucas1p1d; Tue, 26 Nov 2019 08:15:44 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20191126081544eusmtrp15a797b0f15f7a8b4418908644c914bf8~aqF7QTblo2279022790eusmtrp1u; Tue, 26 Nov 2019 08:15:44 +0000 (GMT) X-AuditID: cbfec7f2-f0bff7000001ef66-48-5ddcdf31d531 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 12.D3.08375.03FDCDD5; Tue, 26 Nov 2019 08:15:44 +0000 (GMT) Received: from AMDC2765.digital.local (unknown [106.120.51.73]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20191126081544eusmtip2f03399b45c3e3f2b591b6faf103516ae~aqF6vetTM2183921839eusmtip2-; Tue, 26 Nov 2019 08:15:44 +0000 (GMT) From: Marek Szyprowski To: u-boot@lists.denx.de Date: Tue, 26 Nov 2019 09:15:09 +0100 Message-Id: <20191126081512.5138-4-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191126081512.5138-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpileLIzCtJLcpLzFFi42LZduznOV3D+3diDQ7d4LbYOGM9q8WNX22s Fs/fXWayWHvkLrvFgslPWC02zH/LYjFj8ks2i7d7O9kdODzmzTrB4nH2zg5Gj74tqxg91m+5 yuKx6ZVHAGsUl01Kak5mWWqRvl0CV8aZhtmsBf+UK+bvimtgfCzTxcjJISFgInH+5wnmLkYu DiGBFYwSl1/2sUI4Xxgl7qy+CpX5zCjx4fdnZriW03vYIBLLGSUaL29jgWv58XobG0gVm4Ch RNfbLjBbREBC4lf/VUaQImaB7UwS7a3XWUASwkCjzvy5ww5iswioSvye38QKYvMK2EicOdXD DrFOXmL1hgNgqzkFbCV+zfvHDjJIQuA7m8SZg6egilwkjnxdBXWfsMSr41ug4jISpyf3sEA0 NDNKPDy3Fqq7B+jXphmMEFXWEoePXwRazQF0n6bE+l36EGFHiTu3e5lBwhICfBI33gqChJmB zEnbpkOFeSU62oQgqtUkZh1fB7f24IVLUOd4SBz/u4UREkITGCX+H9/OPIFRfhbCsgWMjKsY xVNLi3PTU4sN81LL9YoTc4tL89L1kvNzNzECU8bpf8c/7WD8einpEKMAB6MSD++Ps7djhVgT y4orcw8xSnAwK4nwah++EyvEm5JYWZValB9fVJqTWnyIUZqDRUmct5rhQbSQQHpiSWp2ampB ahFMlomDU6qBcee1rtv/J+acmne6Yunq9kfPD35Wvued9SHzfdH7Y+lbzNz2PElvkGkqFBWp Odp5wDp89Yk2H63Tli+Wf3eze7ah0GnjU50T72JTChl64pyu733+RX/LN0tfNYV/XZfZ/7C3 RWx8uPaydccWcUvV10mnd/+6KLFD/JfDtJUBGzXOfHod2rvLaIcSS3FGoqEWc1FxIgCiZ8MJ FQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRmVeSWpSXmKPExsVy+t/xe7oG9+/EGnxZamKxccZ6Vosbv9pY LZ6/u8xksfbIXXaLBZOfsFpsmP+WxWLG5JdsFm/3drI7cHjMm3WCxePsnR2MHn1bVjF6rN9y lcVj0yuPANYoPZui/NKSVIWM/OISW6VoQwsjPUNLCz0jE0s9Q2PzWCsjUyV9O5uU1JzMstQi fbsEvYwzDbNZC/4pV8zfFdfA+Fimi5GTQ0LAROL86T1sXYxcHEICSxkltt97xAKRkJE4Oa2B FcIWlvhzrQuq6BOjxLU/i5lAEmwChhJdb0ESnBwiAhISv/qvMoIUMQvsZpK4vuoYI0hCGGjF mT932EFsFgFVid/zm8Cm8grYSJw51cMOsUFeYvWGA8wgNqeArcSvef/A4kJANROP/WOewMi3 gJFhFaNIamlxbnpusaFecWJucWleul5yfu4mRmD4bjv2c/MOxksbgw8xCnAwKvHw/jh7O1aI NbGsuDL3EKMEB7OSCK/24TuxQrwpiZVVqUX58UWlOanFhxhNgY6ayCwlmpwPjK28knhDU0Nz C0tDc2NzYzMLJXHeDoGDMUIC6YklqdmpqQWpRTB9TBycUg2M86+kO1mxPFsl1PzTqkDieKRj ZqH1/W8nG90mHgljOCOs/OeigCwfa/QZxtv7vbusd+vX7vvw6LWIwP5jUQ7RyrsfFbmom/iF 832XFTX48zkpRlB2vvid9fW7+XT0dkVelyh0ux/OpzpnwR6VDZNbc1e/+s/vs/HgqmcZ4eub 9zLUrHrQmdSmxFKckWioxVxUnAgAZXL6N3UCAAA= X-CMS-MailID: 20191126081544eucas1p19beac0f0582b90846a36bb9faf09c39a X-Msg-Generator: CA X-RootMTR: 20191126081544eucas1p19beac0f0582b90846a36bb9faf09c39a X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20191126081544eucas1p19beac0f0582b90846a36bb9faf09c39a References: <20191126081512.5138-1-m.szyprowski@samsung.com> Cc: Matthias Brugger , Bartlomiej Zolnierkiewicz , Marek Szyprowski Subject: [U-Boot] [PATCH v3 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 5b551f6ae1..e52c02be10 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__,