From patchwork Mon Aug 29 21:16:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Fenkart X-Patchwork-Id: 663837 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3sNPcV279Hz9s9W for ; Tue, 30 Aug 2016 07:17:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ED8844B698; Mon, 29 Aug 2016 23:17:28 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sKO1cwCPT5gA; Mon, 29 Aug 2016 23:17:28 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 88E1C4B9CB; Mon, 29 Aug 2016 23:17:28 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3E6EB4B98A for ; Mon, 29 Aug 2016 23:17:25 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VO2gcGxwTZb1 for ; Mon, 29 Aug 2016 23:17:25 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail.newtechgroup.ch (mail.newtechgroup.ch [83.144.237.166]) by theia.denx.de (Postfix) with ESMTPS id 0649E4B698 for ; Mon, 29 Aug 2016 23:17:23 +0200 (CEST) Received: from localhost (192.168.1.1) by vsrv-mailch01.newtechgroup.local (192.168.1.208) with Microsoft SMTP Server (TLS) id 15.0.775.38; Mon, 29 Aug 2016 23:17:22 +0200 From: Andreas Fenkart To: Date: Mon, 29 Aug 2016 23:16:57 +0200 Message-ID: <1472505422-26122-2-git-send-email-andreas.fenkart@digitalstrom.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1472505422-26122-1-git-send-email-andreas.fenkart@digitalstrom.com> References: <1472505422-26122-1-git-send-email-andreas.fenkart@digitalstrom.com> MIME-Version: 1.0 X-Originating-IP: [192.168.1.1] X-ClientProxiedBy: VSRV-MAILCH01.newtechgroup.local (192.168.1.208) To vsrv-mailch01.newtechgroup.local (192.168.1.208) X-Brightmail-Tracker: H4sIAAAAAAAAC+NgFprPKsWRWlGSWpSXmKPExsVyYAUjo27SsiPhBltPrl7GZvHrg5/F4f4bTBZv93ayOzB7dE2ez+Jx9s4ORo9NrzwCmKNYM/OS8isSWDNmLN/KUvBPtmLltQb2BsaXYl2MXBxCAusZJc7smc7excjJwSZgIfHwzhQWEFtEQELiV/9VRhCbWSBRYvLLbrC4sICzxIfVL5lBbBYBVYmZ37exgdi8AgESVw4tBKuXEJCTuDz9AVicUyBQ4sbSc0wgthBQzZE9n5gh6gUlTs58wgIxX0Li4IsXQHEOoBpdif7t0hBjAiVa5j5mgrDdJWa/vs0MYdtLrHvxjRWkXELAUeLJh1CYks/bVrJC2NoS21/tg7J1JJbvg/hQQkBe4ufWJVAjKyUuPr4MFY+XaDr6Bao+VOLJ0Ub2CYwSs5AcOgvJoQsYmVYxKpQVF5Xp5iZm5iRnGBjq5aWWl6QmZ6QX5ZcW6OXkJyfmbGKExNaFHYzNr90PMUpyMCmJ8k6NPxIuxJeUn1KZkVicEV9UmpNafIhRhoNDSYKXeQlQTrAoNT21Ii0zBxjlMGkmDs5DjBIcPEoivN8WA9XwFhck5hZnpkPkTzFKSonzqoMkBEASGaV5cL2XGEWlhHlPzQTK8RSkFuVmlkDEbzEKczxkEmLJy89LlQK6kwEINBhfMYpzMCoJ84qCHMKTmVcCt+MV0HomoPUFdw6DrC9JREhJNTBue1Lw7maYTspXteaLp55dObjirr9H/NcvBZuYF9+7v3qletkG9eOHPi9+9Nn/Y3ly52oB9bU/L9RNjc66xlFx46jk8dkWukmZsY6RHB0xYRsfsvrLep/r+am+ao+qRUTe5ZSKe7s80tUXOHouTZ3uG2wgnNbsUhYo/Nh/x3/n6N91s8WTP/MosRRnJBpqMRcVJwIAcagktTIDAAA= Cc: Stefan Agner Subject: [U-Boot] [PATCH 1/6] tools/env: factor out environment_end function X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" instead of adhoc computation of the environment end, use a function with a proper name Signed-off-by: Andreas Fenkart --- tools/env/fw_env.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index d27f57e..90eb5fa 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -643,6 +643,18 @@ int fw_parse_script(char *fname, struct env_opts *opts) return ret; } +/** + * environment_end() - compute offset of first byte right after environemnt + * @dev - index of enviroment buffer + * Return: + * device offset of first byte right after environemnt + */ +off_t environment_end(int dev) +{ + /* environment is block aligned */ + return DEVOFFSET(dev) + ENVSECTORS(dev) * DEVESIZE(dev); +} + /* * Test for bad block on NAND, just returns 0 on NOR, on NAND: * 0 - block is good @@ -683,7 +695,6 @@ static int flash_read_buf (int dev, int fd, void *buf, size_t count, 0 on NOR */ size_t processed = 0; /* progress counter */ size_t readlen = count; /* current read length */ - off_t top_of_range; /* end of the last block we may use */ off_t block_seek; /* offset inside the current block to the start of the data */ loff_t blockstart; /* running start of the current block - @@ -702,19 +713,11 @@ static int flash_read_buf (int dev, int fd, void *buf, size_t count, */ blocklen = DEVESIZE (dev); - /* - * To calculate the top of the range, we have to use the - * global DEVOFFSET (dev), which can be different from offset - */ - top_of_range = ((DEVOFFSET(dev) / blocklen) + - ENVSECTORS (dev)) * blocklen; - /* Limit to one block for the first read */ if (readlen > blocklen - block_seek) readlen = blocklen - block_seek; } else { blocklen = 0; - top_of_range = offset + count; } /* This only runs once on NOR flash */ @@ -723,7 +726,7 @@ static int flash_read_buf (int dev, int fd, void *buf, size_t count, if (rc < 0) /* block test failed */ return -1; - if (blockstart + block_seek + readlen > top_of_range) { + if (blockstart + block_seek + readlen > environment_end(dev)) { /* End of range is reached */ fprintf (stderr, "Too few good blocks within range\n"); @@ -783,7 +786,6 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, below offset */ off_t block_seek; /* offset inside the erase block to the start of the data */ - off_t top_of_range; /* end of the last block we may use */ loff_t blockstart; /* running start of the current block - MEMGETBADBLOCK needs 64 bits */ int rc; @@ -793,7 +795,6 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, */ if (mtd_type == MTD_ABSENT) { blocklen = count; - top_of_range = offset + count; erase_len = blocklen; blockstart = offset; block_seek = 0; @@ -801,13 +802,10 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, } else { blocklen = DEVESIZE(dev); - top_of_range = ((DEVOFFSET(dev) / blocklen) + - ENVSECTORS(dev)) * blocklen; - erase_offset = (offset / blocklen) * blocklen; /* Maximum area we may use */ - erase_len = top_of_range - erase_offset; + erase_len = environment_end(dev) - erase_offset; blockstart = erase_offset; /* Offset inside a block */ @@ -882,7 +880,7 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, if (rc < 0) /* block test failed */ return rc; - if (blockstart + erasesize > top_of_range) { + if (blockstart + erasesize > environment_end(dev)) { fprintf (stderr, "End of range reached, aborting\n"); return -1; }