From patchwork Mon Dec 2 11:11:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 1203107 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="aLiLXzWp"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 47RMvF6mjYz9sP3 for ; Mon, 2 Dec 2019 22:14:17 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9F6AEC21EA8; Mon, 2 Dec 2019 11:12:36 +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 6C50CC21E56; Mon, 2 Dec 2019 11:11:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D5FCAC21C38; Mon, 2 Dec 2019 11:11:34 +0000 (UTC) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by lists.denx.de (Postfix) with ESMTPS id 58030C21D56 for ; Mon, 2 Dec 2019 11:11:33 +0000 (UTC) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20191202111131euoutp01c4e91ed4cf24a8f3a54a5bf552d1d1d7~ciXG8u8FY0750707507euoutp01D for ; Mon, 2 Dec 2019 11:11:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20191202111131euoutp01c4e91ed4cf24a8f3a54a5bf552d1d1d7~ciXG8u8FY0750707507euoutp01D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1575285091; bh=3pZ+HkfsltL+bO+jnLrEvMgVBCIkgIrt3zDYAjgh2Rw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aLiLXzWpUqsomfBkgHy5OgWMDmKBU+TVKR3OlPNy5iY/DbSC5JjDr2+RO3RViqDpO d56m8tuZK9ygxxJoDoCYh9UKdPqrFpHofzIm9bn5UtkpDYeyv5+c+98rExLel7a4Je GTe5p4XuxAJdxHEEbOCwBIetv4tHxJv8aKcsm9TI= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20191202111130eucas1p174a814bc9233d2c7d55143b19f4fc5d6~ciXGrktZ21988719887eucas1p1G; Mon, 2 Dec 2019 11:11:30 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id A1.E2.61286.261F4ED5; Mon, 2 Dec 2019 11:11:30 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20191202111130eucas1p22c4bc5190db03f1f3e0f2bdaf0f839e6~ciXGSJzcO2188621886eucas1p2r; Mon, 2 Dec 2019 11:11:30 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20191202111130eusmtrp27a11f3ca8b572fabecc417f02633f3ff~ciXGRiZ1_1635516355eusmtrp2c; Mon, 2 Dec 2019 11:11:30 +0000 (GMT) X-AuditID: cbfec7f2-f0bff7000001ef66-14-5de4f16271e4 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id A8.87.08375.261F4ED5; Mon, 2 Dec 2019 11:11:30 +0000 (GMT) Received: from AMDC2765.digital.local (unknown [106.120.51.73]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20191202111129eusmtip2cad40c814bc8580e439eca47db6a452d~ciXFq3i1D1448714487eusmtip2a; Mon, 2 Dec 2019 11:11:29 +0000 (GMT) From: Marek Szyprowski To: u-boot@lists.denx.de Date: Mon, 2 Dec 2019 12:11:15 +0100 Message-Id: <20191202111118.12868-4-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191202111118.12868-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLKsWRmVeSWpSXmKPExsWy7djPc7pJH5/EGlz+YmaxccZ6Vosbv9pY LZ6/u8xksfbIXXaLBZOfsFpsmP+WxWLG5JdsFn/2/2SxmDppM7vF272d7BaHp35gdOD2mDfr BIvHh49xHq8OrGL3uHNtD5vH2Ts7GD36tqxi9Fi/5SqLx6ZXHgEcUVw2Kak5mWWpRfp2CVwZ Zxpmsxb8U66YvyuugfGxTBcjJ4eEgInElNnfWLsYuTiEBFYwSqx9vZQdwvnCKDHxTysThPOZ UaLhxGLGLkYOsJZvLQYQ8eWMErePPGKD69j/fh8jyFw2AUOJrrddbCC2iICExK/+q4wgRcwC G5gl7rUdAisSBpo07VgHmM0ioCpx+eIEdpANvAK2ErdnJkPcJy+xesMBZhCbU8BOYn/nYhaQ ORICi9gl5nb/Z4QocpE4/PQ4K4QtLPHq+BZ2CFtG4v/O+UwQDc2MEg/PrWWHcHoYJS43zYDq tpY4fPwiK8hmZgFNifW79CHCjhLPZp6GeplP4sZbQZAwM5A5adt0Zogwr0RHmxBEtZrErOPr 4NYevHCJGcL2kFjztwcapBMZJdavmck8gVF+FsKyBYyMqxjFU0uLc9NTiw3zUsv1ihNzi0vz 0vWS83M3MQITzel/xz/tYPx6KekQowAHoxIPb8erx7FCrIllxZW5hxglOJiVRHivKz2MFeJN SaysSi3Kjy8qzUktPsQozcGiJM5bzfAgWkggPbEkNTs1tSC1CCbLxMEp1cBoK7Jsq/Dur4vn ql297D1/ou+dY18dPCZs+6imH2vLKTXt1Koa/41qi4QnXmc5fF87R5ChUsbtVF2qzrMpcqKv Xv3f84fdMLrQ1Eb6joP4X/VPGZ5f9ZZxPbwcs5Onsd7qAYNFypzaA1U8W6+bFfa95OzkXpVm bLwodTsjg/mhE/7fCiaFhLorsRRnJBpqMRcVJwIAAdcFqjADAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsVy+t/xe7pJH5/EGjxplrXYOGM9q8WNX22s Fs/fXWayWHvkLrvFgslPWC02zH/LYjFj8ks2iz/7f7JYTJ20md3i7d5OdovDUz8wOnB7zJt1 gsXjw8c4j1cHVrF73Lm2h83j7J0djB59W1YxeqzfcpXFY9MrjwCOKD2bovzSklSFjPziElul aEMLIz1DSws9IxNLPUNj81grI1MlfTublNSczLLUIn27BL2MMw2zWQv+KVfM3xXXwPhYpouR g0NCwETiW4tBFyMnh5DAUkaJpc1pILaEgIzEyWkNrBC2sMSfa11sXYxcQDWfGCU+XbkNlmAT MJToeguS4OQQEZCQ+NV/lRGkiFlgB7PE4retzCAJYaAF0451MILYLAKqEpcvTmAHWcwrYCtx e2YyxAJ5idUbDoCVcwrYSezvXMwCUiIEVPL+fdwERr4FjAyrGEVSS4tz03OLDfWKE3OLS/PS 9ZLzczcxAgN+27Gfm3cwXtoYfIhRgINRiYe349XjWCHWxLLiytxDjBIczEoivNeVHsYK8aYk VlalFuXHF5XmpBYfYjQFOmkis5Rocj4wGvNK4g1NDc0tLA3Njc2NzSyUxHk7BA7GCAmkJ5ak ZqemFqQWwfQxcXBKNTBK7pPNc3PsMLVxPOitbWVaWMfJsG5pXo2oylePOtOMhhVpS0K9vj4P vsfH8rI1ZpKmxtJPiZfCJvkY8JaG3V3itTr4+TTmLQuOXa6W3fr640/1rUlB/HXsV9+y3uP6 lPfTynOfw7u3B+Ydk5apOXZa1jW5q71NKMdZqV9HeUtYK9dWBpk32UosxRmJhlrMRcWJACJX 4ASOAgAA X-CMS-MailID: 20191202111130eucas1p22c4bc5190db03f1f3e0f2bdaf0f839e6 X-Msg-Generator: CA X-RootMTR: 20191202111130eucas1p22c4bc5190db03f1f3e0f2bdaf0f839e6 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20191202111130eucas1p22c4bc5190db03f1f3e0f2bdaf0f839e6 References: <20191202111118.12868-1-m.szyprowski@samsung.com> Cc: Matthias Brugger , Bartlomiej Zolnierkiewicz , Heinrich Schuchardt , Tom Rini , Marek Szyprowski Subject: [U-Boot] [PATCH v4 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__,