{"id":1745888,"url":"http://patchwork.ozlabs.org/api/patches/1745888/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20230221201925.9644-8-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-8-pali@kernel.org>","list_archive_url":null,"date":"2023-02-21T20:18:33","name":"[RFC,u-boot-mvebu,07/59] arm: mvebu: spl: Fix parsing SATA kwbimage","commit_ref":"d4aa2104327fd8b6d46f7c51de1e35f5ec702c93","pull_url":null,"state":"accepted","archived":false,"hash":"7f20d8e1612f2afde2f54c1895defa672419c158","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-8-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/1745888/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1745888/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=iN226G0k;\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=\"iN226G0k\";\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 4PLrTW3F2Gz23yr\n\tfor ; Wed, 22 Feb 2023 07:28:31 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id B6A3685B45;\n\tTue, 21 Feb 2023 21:23:45 +0100 (CET)","by phobos.denx.de (Postfix, from userid 109)\n id AD08E85A55; Tue, 21 Feb 2023 21:22:58 +0100 (CET)","from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 819CF85A8F\n for ; Tue, 21 Feb 2023 21:22:33 +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 ams.source.kernel.org (Postfix) with ESMTPS id 207D8B810C2;\n Tue, 21 Feb 2023 20:22:33 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 9FFABC4339C;\n Tue, 21 Feb 2023 20:22:32 +0000 (UTC)","by pali.im (Postfix)\n id A61ACAED; Tue, 21 Feb 2023 21:22:28 +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=1677010952;\n bh=TuCJ8EDbNyWppeyUfuq/eWNcK4cKGJC9uOHk8bAxDjI=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=iN226G0k/TbkVnF6lPpIF2YsGGog/4B+g0X/ByimYRc1iE27sm1C5vCfgRThvB6bP\n un2uz3pAI1RTXCYa/1KcHBK2Geg5vo2aVMUytnZohD2/TCE6u0JJEyCAYasJrAU+yw\n eEY/n9f1BEBnMqFJe9SIvrzDjXTCwk94jVZwMZysQ55AORACAMumKWw32g4U8d6oW9\n +5RQ6KOdFiK5s3PYF6ENkbbicxQYQoseXn8FMLFTaY8joAwBOLybvVcqX5eZOA9k+4\n vGWFDZDJk7f4nMc9e54QjOPSa9rUwoUrHkX/+MYMgrZbnYxvOVMgxaqeUCKsNZYIEh\n /v8u5DFg4CArQ==","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 07/59] arm: mvebu: spl: Fix parsing SATA\n kwbimage","Date":"Tue, 21 Feb 2023 21:18:33 +0100","Message-Id":"<20230221201925.9644-8-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":"Despite the official specification, Marvell BootROM does not interpret\nsrcaddr from SATA image as number of sectors the beginning of the hard\ndrive, but as number of sectors relative to the main header.\n\nTo process SATA kwbimage and load U-Boot proper from it in the same way as\nMarvell BootROM, it is needed to interpret srcaddr as relative offset to\nthe main header. This change fixes booting of U-Boot proper from SPL code\nin SATA image.\n\nFixes: 2226ca173486 (\"arm: mvebu: Load U-Boot proper binary in SPL code based on kwbimage header\")\nSigned-off-by: Pali Rohár \n---\n arch/arm/mach-mvebu/spl.c | 13 ++-----------\n 1 file changed, 2 insertions(+), 11 deletions(-)","diff":"diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c\nindex b238ba2f5d99..6a398612628e 100644\n--- a/arch/arm/mach-mvebu/spl.c\n+++ b/arch/arm/mach-mvebu/spl.c\n@@ -182,19 +182,10 @@ int spl_parse_board_header(struct spl_image_info *spl_image,\n \n \t/*\n \t * For SATA srcaddr is specified in number of sectors.\n-\t * The main header is must be stored at sector number 1.\n-\t * This expects that sector size is 512 bytes and recalculates\n-\t * data offset to bytes relative to the main header.\n+\t * This expects that sector size is 512 bytes.\n \t */\n-\tif (IS_ENABLED(CONFIG_SPL_SATA) && mhdr->blockid == IBR_HDR_SATA_ID) {\n-\t\tif (spl_image->offset < 1) {\n-\t\t\tprintf(\"ERROR: Wrong srcaddr (0x%08x) in SATA kwbimage\\n\",\n-\t\t\t spl_image->offset);\n-\t\t\treturn -EINVAL;\n-\t\t}\n-\t\tspl_image->offset -= 1;\n+\tif (IS_ENABLED(CONFIG_SPL_SATA) && mhdr->blockid == IBR_HDR_SATA_ID)\n \t\tspl_image->offset *= 512;\n-\t}\n \n \tif (spl_image->offset % 4 != 0) {\n \t\tprintf(\"ERROR: Wrong srcaddr (0x%08x) in kwbimage\\n\",\n","prefixes":["RFC","u-boot-mvebu","07/59"]}