{"id":1745918,"url":"http://patchwork.ozlabs.org/api/patches/1745918/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20230221201925.9644-32-pali@kernel.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20230221201925.9644-32-pali@kernel.org>","list_archive_url":null,"date":"2023-02-21T20:18:57","name":"[RFC,u-boot-mvebu,31/59] tools: kwbimage: Fix dumping register set / DATA commands","commit_ref":"908801dcfe8a1e45b5e6e37c4b7e43f79dfc36ec","pull_url":null,"state":"accepted","archived":false,"hash":"c588dc9bbdf416a16e11a22382ca4825d41dec9e","submitter":{"id":78810,"url":"http://patchwork.ozlabs.org/api/people/78810/?format=json","name":"Pali Rohár","email":"pali@kernel.org"},"delegate":{"id":1696,"url":"http://patchwork.ozlabs.org/api/users/1696/?format=json","username":"stroese","first_name":"Stefan","last_name":"Roese","email":"sr@denx.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20230221201925.9644-32-pali@kernel.org/mbox/","series":[{"id":343058,"url":"http://patchwork.ozlabs.org/api/series/343058/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=343058","date":"2023-02-21T20:18:27","name":"arm: mvebu: Various fixes","version":1,"mbox":"http://patchwork.ozlabs.org/series/343058/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1745918/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1745918/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=)","legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=f+YoLqhx;\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=kernel.org","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.b=\"f+YoLqhx\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=kernel.org","phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org"],"Received":["from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature ECDSA (P-384))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4PLrg14VbDz240n\n\tfor ; Wed, 22 Feb 2023 07:36:45 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id DFD0A85BBC;\n\tTue, 21 Feb 2023 21:25:46 +0100 (CET)","by phobos.denx.de (Postfix, from userid 109)\n id 281DF85B3D; Tue, 21 Feb 2023 21:24:04 +0100 (CET)","from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n bits)) (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id E279A85B10\n for ; Tue, 21 Feb 2023 21:22:44 +0100 (CET)","from smtp.kernel.org (relay.kernel.org [52.25.139.140])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by dfw.source.kernel.org (Postfix) with ESMTPS id 70A44611D8;\n Tue, 21 Feb 2023 20:22:33 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 238FCC433A8;\n Tue, 21 Feb 2023 20:22:33 +0000 (UTC)","by pali.im (Postfix)\n id D39809E0; Tue, 21 Feb 2023 21:22:32 +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=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,\n SPF_PASS autolearn=ham autolearn_force=no version=3.4.2","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=k20201202; t=1677010953;\n bh=prC4UitjqWIVpEiyNbyhe+UAQCCKsMEsp61QoaorgIQ=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=f+YoLqhxK3vajotwi6nPn3ivVeKzxPTiMziryJ2G1hqPD/zJ56FjdFobSp8PNIWm0\n wjBnDcf93EETYAShPdJ0eguc9zTMcE4kX1rvVCA4pvUMg9MB061YS4+k531+7F6iux\n /QV+gYVULFyfnNcBD4Z/vXE5t5uVx1Wty/j5h16GPcWFSoqnzBhzVPiETFtGifxefo\n NcIyA8PPE9WKwmXZpqxc4EYDJliOXXdLKT+rfPLVjECtb/uYu3qrTVQepxfyLqC/j0\n UEcLrVsL6ukAs9DutvXNMJVExrcAdxfkD8V5JcIcZBsAq20lKl8Wb6wbw6pB/eHKzI\n mpqpBkuxy3d+g==","From":"=?utf-8?q?Pali_Roh=C3=A1r?= ","To":"u-boot@lists.denx.de","Cc":"Stefan Roese , Tony Dinh ,\n Josua Mayer ","Subject":"[PATCH RFC u-boot-mvebu 31/59] tools: kwbimage: Fix dumping register\n set / DATA commands","Date":"Tue, 21 Feb 2023 21:18:57 +0100","Message-Id":"<20230221201925.9644-32-pali@kernel.org>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20230221201925.9644-1-pali@kernel.org>","References":"<20230221201925.9644-1-pali@kernel.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" ","X-Virus-Scanned":"clamav-milter 0.103.6 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"Upper-bound for iterating for-loop over register set entries is incorrect.\nFix it byt calculating correct number of entries.\n\nAnd fix also dumping the last entry DATA_DELAY, which is the last and not\nfirst (zero).\n\nFixes: 1a8e6b63e24f (\"tools: kwbimage: Dump kwbimage config file on '-p -1' option\")\nSigned-off-by: Pali Rohár \n---\n tools/kwbimage.c | 19 +++++++++++--------\n 1 file changed, 11 insertions(+), 8 deletions(-)","diff":"diff --git a/tools/kwbimage.c b/tools/kwbimage.c\nindex 67b45503e466..1719b0415da1 100644\n--- a/tools/kwbimage.c\n+++ b/tools/kwbimage.c\n@@ -2148,6 +2148,7 @@ static int kwbimage_generate_config(void *ptr, struct image_tool_params *params)\n \tstruct ext_hdr_v0 *ehdr0;\n \tstruct bin_hdr_v0 *bhdr0;\n \tstruct opt_hdr_v1 *ohdr;\n+\tint regset_count;\n \tint params_count;\n \tunsigned offset;\n \tint is_v0_ext;\n@@ -2232,18 +2233,20 @@ static int kwbimage_generate_config(void *ptr, struct image_tool_params *params)\n \t\t\tcur_idx++;\n \t\t} else if (ohdr->headertype == OPT_HDR_V1_REGISTER_TYPE) {\n \t\t\tregset_hdr = (struct register_set_hdr_v1 *)ohdr;\n-\t\t\tfor (i = 0;\n-\t\t\t i < opt_hdr_v1_size(ohdr) - sizeof(struct opt_hdr_v1) -\n-\t\t\t\t sizeof(regset_hdr->data[0].last_entry);\n-\t\t\t i++)\n+\t\t\tif (opt_hdr_v1_size(ohdr) > sizeof(*ohdr))\n+\t\t\t\tregset_count = (opt_hdr_v1_size(ohdr) - sizeof(*ohdr)) /\n+\t\t\t\t\t sizeof(regset_hdr->data[0].entry);\n+\t\t\telse\n+\t\t\t\tregset_count = 0;\n+\t\t\tfor (i = 0; i < regset_count; i++)\n \t\t\t\tfprintf(f, \"DATA 0x%08x 0x%08x\\n\",\n \t\t\t\t\tle32_to_cpu(regset_hdr->data[i].entry.address),\n \t\t\t\t\tle32_to_cpu(regset_hdr->data[i].entry.value));\n-\t\t\tif (opt_hdr_v1_size(ohdr) - sizeof(struct opt_hdr_v1) >=\n-\t\t\t sizeof(regset_hdr->data[0].last_entry)) {\n-\t\t\t\tif (regset_hdr->data[0].last_entry.delay)\n+\t\t\tif (regset_count > 0) {\n+\t\t\t\tif (regset_hdr->data[regset_count-1].last_entry.delay !=\n+\t\t\t\t REGISTER_SET_HDR_OPT_DELAY_SDRAM_SETUP)\n \t\t\t\t\tfprintf(f, \"DATA_DELAY %u\\n\",\n-\t\t\t\t\t\t(unsigned)regset_hdr->data[0].last_entry.delay);\n+\t\t\t\t\t\t(unsigned)regset_hdr->data[regset_count-1].last_entry.delay);\n \t\t\t\telse\n \t\t\t\t\tfprintf(f, \"DATA_DELAY SDRAM_SETUP\\n\");\n \t\t\t}\n","prefixes":["RFC","u-boot-mvebu","31/59"]}