From patchwork Fri Jul 21 04:39:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810677 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=pEEKBGUu; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=A25hUPtc; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cLG1h19z20Cs for ; Fri, 21 Jul 2023 14:40:19 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3C89886321; Fri, 21 Jul 2023 06:40:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="pEEKBGUu"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="A25hUPtc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7B7F3862E9; Fri, 21 Jul 2023 06:40:08 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 972BB8622E for ; Fri, 21 Jul 2023 06:40:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id CC92F3200F75; Fri, 21 Jul 2023 00:40:02 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 21 Jul 2023 00:40:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914402; x= 1690000802; bh=8hwUbLd2xrFl9UInVAG423gikkJRFCFmJsnUFKTnP5I=; b=p EEKBGUuc6eh1VSFixeXq2iq75bxUuQ95qxX4DHEngtnwrlKFaOsUtBWvd570aK/2 JhevOCug8UTojz9f2vUrQhpCDJO2Cil7jkn09M3ec/WEdzd0j2lAMoILDBskaNga WaXSYTOyLwg2NbOC9kJrB7Q+EUa9CCT85FLFOzZ8IdXDUnyj8xc/p0AKyDLpdXjr anNyXEIscAp+rncabVOGjJUM2IAcY2FwDoBmNIv1OYjbt2wzarVTNc6/vMyg3Czn nkxKp2/dqnHnwiFZz/QjvfTPy7ZbtPwKe0E+tKfYErEZa1xRsePIwL0ZGlsUvRew 8PS30Lblyj89gmfsci+5A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914402; x= 1690000802; bh=8hwUbLd2xrFl9UInVAG423gikkJRFCFmJsnUFKTnP5I=; b=A 25hUPtcLoEDuCMdxtTJ+siQ/+n7UBdgTw9NCDD11zKA9TnAOpcRGF3AlwX6nwBwj sEa1+Mt+v1FZ2R5vQLRoWcRrj/txSsXHImc09p4S4eccFoJ2idof1lmhhq8/RlW6 IdIYka020w2wjy1MABuSR+XSPZrvsYva+tRhV6WEI83ZP4ofTttOnhc8iVKzsJKF v4SsvRG7Sqq8Olfz6ArTlImkaWziFM+ZuDQ2xwLD71i2tzaZj2NoNDYAxA5LpWxP BbeBeCT9XcCiPnFNSk/9mniL8oRhqeqLHGU9LH+d8taSZdmxaXgwy4nQyu4MfYzF ePi/Wc3pMGQAOC2gzdvyQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhepieeifeehieeiueeludefgfdtveefjeffteegvdevudffffelheej tdejgeelleegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:00 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 01/16] board: traverse: ten64: recognize board revision D Date: Fri, 21 Jul 2023 04:39:16 +0000 Message-Id: <20230721043931.14188-2-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Ten64 board revision D is a variant that removes the USB hub and PCIe expander/switch, but is otherwise compatible with the main production "C" version. At the same time, revise the printf specifiers (PCB version "1064-0201%s") to reduce the number of string characters related to the boot printout. Signed-off-by: Mathew McBride Reviewed-by: Peng Fan --- board/traverse/ten64/ten64.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index 5dfb7165c0..88f22e85d7 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -47,7 +47,9 @@ static void ten64_board_retimer_ds110df410_init(void); enum { TEN64_BOARD_REV_A = 0xFF, TEN64_BOARD_REV_B = 0xFE, - TEN64_BOARD_REV_C = 0xFD + TEN64_BOARD_REV_C = 0xFD, + TEN64_BOARD_REV_D = 0xFC, + TEN64_BOARD_MAX }; #define RESV_MEM_IN_BANK(b) (gd->arch.resv_ram >= base[b] && \ @@ -75,20 +77,24 @@ int checkboard(void) switch (board_rev) { case TEN64_BOARD_REV_A: - snprintf(boardmodel, 32, "1064-0201A (Alpha)"); + snprintf(boardmodel, 32, "A (Alpha)"); break; case TEN64_BOARD_REV_B: - snprintf(boardmodel, 32, "1064-0201B (Beta)"); + snprintf(boardmodel, 32, "B (Beta)"); break; case TEN64_BOARD_REV_C: - snprintf(boardmodel, 32, "1064-0201C"); + snprintf(boardmodel, 32, "C"); + break; + case TEN64_BOARD_REV_D: + snprintf(boardmodel, 32, "D"); break; default: - snprintf(boardmodel, 32, "1064 Revision %X", (0xFF - board_rev)); + snprintf(boardmodel, 32, " Revision %X", (0xFF - board_rev)); break; } - printf("Board: %s, boot from ", boardmodel); + printf("Board: 1064-0201%s, boot from ", boardmodel); + if (src == BOOT_SOURCE_SD_MMC) puts("SD card\n"); else if (src == BOOT_SOURCE_QSPI_NOR) From patchwork Fri Jul 21 04:39:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810679 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=UjitT5Gd; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=nbDStlrj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cLZ71Ltz20Cs for ; Fri, 21 Jul 2023 14:40:38 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6C171867B7; Fri, 21 Jul 2023 06:40:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="UjitT5Gd"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="nbDStlrj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0CAC9862E9; Fri, 21 Jul 2023 06:40:11 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8A5DB8622E for ; Fri, 21 Jul 2023 06:40:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id BC3663200F49; Fri, 21 Jul 2023 00:40:06 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 21 Jul 2023 00:40:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914406; x= 1690000806; bh=36ABwBty0tf3QxhLCSk+NMMzHFUWdCVdTKMfiOPb2IA=; b=U jitT5GdDJOXFAs0EEYCqkm7TXs6dMkS5OGsTSwTeUFXyl/hhKA3r+nSrZ61EVDoe zmkk8+Qx4LutcsKqO+k+uDCk1q/nTSuTKBNTLSvcYYYf/Ys6I44nYW9ubBn2lH4p SuFNPbJqzN4Ph1KpRPoZdRLPjYhVEepsyYL6/BnCSIVUseXgUAet+tGzMucyoY4V XOzOSQ7dQhzpp+RzFJ8xG+sXzC30DcueZtd2+InK+wG4wcKDrszy1HYEskGVLwIG fODxhL1gpV2bWGg8ItU4EcrpmBVpLhRBXsM4/YlFcM05QuutTdnVU/jndqkZhPcR fS2GjhomXbLTfcYrV3LFQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914406; x= 1690000806; bh=36ABwBty0tf3QxhLCSk+NMMzHFUWdCVdTKMfiOPb2IA=; b=n bDStlrjb7lPkSdXD2oxM8KAJ+5AtZ3R99pk9gpafuYmhIbvGLzP1iiAWqucpJ9BZ jF9hsybpxXlFrSi8N+W8MfCY//bcD0DryG8lfyhe35Q76ZNw2o0DWd6LvioADzOr zcWa2c7nrsWqK35hSvwvcFwnHWfCS7KyYKxqwYRMgNWlyzol9H5935cphJOcMv19 RDVf9UiSS+uL9l2iDqi0H3ehoneZNzTD2vPHGj+mvS8rP+RdNCyI71CAp6UI9YRc UfFfw10SzdDPJx+9TaNaHb2XMpz/v9co5+4kuWGy7jJ2SOjVzUqQfZ2DlS3aIZ3W qxPQmB9mgxzHN5amMCrig== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhepieeifeehieeiueeludefgfdtveefjeffteegvdevudffffelheej tdejgeelleegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:03 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 02/16] board: traverse: ten64: ensure retimer reset is done on new board revisions Date: Fri, 21 Jul 2023 04:39:17 +0000 Message-Id: <20230721043931.14188-3-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Board revision C (production) and later require the SFP+ retimer to be turned on (or reset) on boot, by way of issuing a command to the board's microcontroller (via I2C). The comparison statement here was incorrect, as the board ID decrements every revision (from 0xFF downwards), so this was matching board RevA,B,C instead of Rev >= C. Another oops that transpired when working on this issue, is that if the board controller is not called (such as CONFIG_TEN64_CONTROLLER=n or earlier board rev), then the retimer udevice was not obtained. So the board version check has to be moved inside board_cycle_retimer (which probes/fetches the retimer device) as well. Signed-off-by: Mathew McBride --- board/traverse/ten64/ten64.c | 37 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index 88f22e85d7..df44baf24f 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -341,20 +341,27 @@ static int board_cycle_retimer(struct udevice **retim_dev) u8 loop; struct udevice *uc_dev; struct udevice *i2cbus; + u32 board_rev = ten64_get_board_rev(); ret = ten64_get_micro_udevice(&uc_dev, &i2cbus); if (ret) return ret; - ret = dm_i2c_probe(i2cbus, I2C_RETIMER_ADDR, 0, retim_dev); - if (ret == 0) { - puts("(retimer on, resetting...) "); + /* Retimer power cycle not implemented on early board + * revisions/controller firmwares + */ + if (IS_ENABLED(CONFIG_TEN64_CONTROLLER) && + board_rev <= TEN64_BOARD_REV_C) { + ret = dm_i2c_probe(i2cbus, I2C_RETIMER_ADDR, 0, retim_dev); + if (ret == 0) { + puts("(retimer on, resetting...) "); - ret = misc_call(uc_dev, TEN64_CNTRL_10G_OFF, NULL, 0, NULL, 0); - mdelay(1000); - } + ret = misc_call(uc_dev, TEN64_CNTRL_10G_OFF, NULL, 0, NULL, 0); + mdelay(1000); + } - ret = misc_call(uc_dev, TEN64_CNTRL_10G_ON, NULL, 0, NULL, 0); + ret = misc_call(uc_dev, TEN64_CNTRL_10G_ON, NULL, 0, NULL, 0); + } // Wait for retimer to come back for (loop = 0; loop < 5; loop++) { @@ -375,19 +382,13 @@ static void ten64_board_retimer_ds110df410_init(void) u8 reg; int ret; struct udevice *retim_dev; - u32 board_rev = ten64_get_board_rev(); puts("Retimer: "); - /* Retimer power cycle not implemented on early board - * revisions/controller firmwares - */ - if (IS_ENABLED(CONFIG_TEN64_CONTROLLER) && - board_rev >= TEN64_BOARD_REV_C) { - ret = board_cycle_retimer(&retim_dev); - if (ret) { - puts("Retimer power on failed\n"); - return; - } + + ret = board_cycle_retimer(&retim_dev); + if (ret) { + puts("Retimer power on failed\n"); + return; } /* Access to Control/Shared register */ From patchwork Fri Jul 21 04:39:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810680 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=KgqzbAhB; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=c4em46Di; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cLs2LXcz20Cs for ; Fri, 21 Jul 2023 14:40:52 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1331186751; Fri, 21 Jul 2023 06:40:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="KgqzbAhB"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="c4em46Di"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C03A48556F; Fri, 21 Jul 2023 06:40:14 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1F29B8630F for ; Fri, 21 Jul 2023 06:40:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 570983200F49; Fri, 21 Jul 2023 00:40:10 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 21 Jul 2023 00:40:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914409; x= 1690000809; bh=wvyqMmwohWMRE57lGpEAHnR48mVff/ILgKqKXKrEshA=; b=K gqzbAhBEWGifFiW8zzQLqLFXqTIkD53BJ71EK1RMxsCxg3d35jEb0J1przkSlJJe 3vCjxBiortk4AA5lNj+kU3qd67b3qAURrWN3iLCDFVf0vMwhkk91/AqasQeeQ8nZ T0QbVOoms1ktxc19r65nuCEbVNoTF5eQBuS+ittCadbvc/mIdpF73PZLpEGGYhPP G7sdQGaxMxA/E5MnN8WgN9JGUHLhkvzxa9viAjN0txBBd3DPUzi9LjD6Yb8jQaHZ WkYj8cdX5koUAf4h0NbJ3CP2fGz5QVtPAKq0u2c11dbmZwyDhOGICbYujGoFnUcb +gQEeU1hopcxiPhojDiJQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914409; x= 1690000809; bh=wvyqMmwohWMRE57lGpEAHnR48mVff/ILgKqKXKrEshA=; b=c 4em46Die8rwC3OIc+90VtWaMIO6MIJmV0/2cXIStHSaPTZcE65aVT+//bwW544hI xwITHBG7y3cFCk04DGfitZ3iAXiYi+Xo+RAU6xJR5A+uA8/+WRQcnhucQND2SfZm c842HGU0ka+WGug4s7DX7ciRlQjyu1gB6QtLcLE7hyqKWucfHcot4O2j+Boy4OFF b9HssYGwxm+ZBpjrQxK4WweVsGDlh2Q4I+xTAX2ScqNe4LaiyyWMgdHlorIOlkS4 v52/Fcwod/wosMdFJWW/QPVpt2wOeiKmF4kLy3cnN04GhzkzNWxdj4bSj1cTwwuN xFQQpn2Xkry8d74+QWQLA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhepieeifeehieeiueeludefgfdtveefjeffteegvdevudffffelheej tdejgeelleegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrh homhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:07 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 03/16] board: traverse: ten64: fix DPAA2 (network) DPL corruption issue Date: Fri, 21 Jul 2023 04:39:18 +0000 Message-Id: <20230721043931.14188-4-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The DPAA2 DPL (data plane layout) file was previously being loaded into 0x80300000, and set to be applied just before hand off to the kernel. When a FIT image with a load_address of 0x80000000 was booted with bootm, the DPL in memory was overwritten. Move the DPL load to 0x8E000000 (196MiB away from 0x80000000, and below the other typical load addr of 0x90000000). Ideally in the future, the DPL lazyapply command ("fsl_mc lazyapply DPL $dpl_addr") should be set to load the DPL contents into a memory area owned by U-Boot. Signed-off-by: Mathew McBride Reviewed-by: Peng Fan --- include/configs/ten64.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/configs/ten64.h b/include/configs/ten64.h index e86c163132..1601fb733e 100644 --- a/include/configs/ten64.h +++ b/include/configs/ten64.h @@ -19,11 +19,14 @@ "sf probe 0:0 && sf read 0x80000000 0x300000 0x200000 &&" \ "sf read 0x80200000 0x5C0000 0x40000 &&" \ "fsl_mc start mc 0x80000000 0x80200000 && " \ - "sf read 0x80300000 0x580000 0x40000 && fsl_mc lazyapply DPL 0x80300000\0" + "sf read 0x8E000000 0x580000 0x40000 && fsl_mc lazyapply DPL 0x8E000000 && "\ + "echo 'default DPL loaded'\0" #define SD_MC_INIT_CMD \ "mmcinfo; fatload mmc 0 0x80000000 mcfirmware/mc_ls1088a.itb; "\ "fatload mmc 0 0x80200000 dpaa2config/dpc.0x1D-0x0D.dtb; "\ - "fsl_mc start mc 0x80000000 0x80200000\0" + "fsl_mc start mc 0x80000000 0x80200000 && " \ + "fatload mmc 0 0x8E000000 dpaa2config/eth-dpl-all.dtb && " \ + "fsl_mc lazyapply DPL 0x8E000000 && echo 'default DPL loaded'\0" #define BOOT_TARGET_DEVICES(func) \ func(NVME, nvme, 0) \ @@ -45,7 +48,6 @@ BOOTENV \ "load_efi_dtb=mtd read devicetree $fdt_addr_r && fdt addr $fdt_addr_r && " \ "fdt resize && fdt boardsetup\0" \ - "bootcmd_recovery=mtd read recovery 0xa0000000; mtd read dpl 0x80100000 && " \ - "fsl_mc apply DPL 0x80100000 && bootm 0xa0000000#ten64\0" + "bootcmd_recovery=mtd read recovery 0xa0000000; && bootm 0xa0000000#ten64\0" #endif /* __TEN64_H */ From patchwork Fri Jul 21 04:39:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810681 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=nqfYyF7G; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=h8MaVmKJ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cM52BmTz20Cs for ; Fri, 21 Jul 2023 14:41:04 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8D89D867CC; Fri, 21 Jul 2023 06:40:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="nqfYyF7G"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="h8MaVmKJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A600B867CC; Fri, 21 Jul 2023 06:40:18 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B4D4586751 for ; Fri, 21 Jul 2023 06:40:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id E8B433200F89; Fri, 21 Jul 2023 00:40:13 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 21 Jul 2023 00:40:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914413; x= 1690000813; bh=3DlWGPOJqvk0txaEnFqARVQ7vKgtiX2/iuHo3MNSDdY=; b=n qfYyF7GiggA3ei7FNVfLMdhNxaCNOyyeAOqeyCUN5M+ovSHWdG4Tgl05cm46yG2M 4Fs9kb7VsCa32T6tB+Z2YcRBR5CZuueuQxz9dpJUHgHEL3Jp/bx4WeuJvVysafJJ GXAVtuFX5UOQE3iqXZmNbIDoZWQ2mjq3keJNfNliiBAbJ33Y8XUBsuNa6CIszASf MyCJDgplVwrCO/OV9yWTg/oCdrCW+W6yVaQt/t33/oOsfcp2j6jf3Oms/AxcI5Zb EtOGu47ozh/MT5CybcigTbTtx/NyuZ6fvs0HkgdYhnKuCIk76V045P5874HM+JDM wi0LKYsqa7WMSN4J3VBzA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914413; x= 1690000813; bh=3DlWGPOJqvk0txaEnFqARVQ7vKgtiX2/iuHo3MNSDdY=; b=h 8MaVmKJVjMsk2Eq6bbsiucpPFFMX0lkgRZsfWvlTYK/fmtaWFylx6WLV+i+5lpAR 2qH6IarTxj4YTQQFRb6MbqJcACJk6SdtqSepsuaVhr6sb6u2te4jn1AJff3q4prL Yh1hengOHdUUkCcWIF2rkD7e7W2Y+sKjEydFCUb14cdfY1uxjbVneiyoLg14tiY4 4jQlEOq85s5goSlAiso64QTxn8utBx16PcMWhzXxg+pFIoukvTdB5a370Q1IMsL6 13rU+YTn3YTL80+RVjUhO7XV/Q/645s3k0OY1YX9EmcQgkvrSXRqxS8lfMI4T4W6 49hP3jWGDPG+b9UDMQ8vA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenog fuuhhsphgvtghtffhomhgrihhnucdlgeelmdenucfjughrpefhvfevufffkffojghfggfg sedtkeertdertddtnecuhfhrohhmpeforghthhgvficuofgtuehrihguvgcuoehmrghtth esthhrrghvvghrshgvrdgtohhmrdgruheqnecuggftrfgrthhtvghrnheptdeufeeikeef leegueelhedvvedtteeihfegvdejjeeutddtieekudduieevvedvnecuffhomhgrihhnpe hgihhthhhusgdrihhonecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:11 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 04/16] board: traverse: ten64: update DPAA2 (network) binary path on sdcards Date: Fri, 21 Jul 2023 04:39:19 +0000 Message-Id: <20230721043931.14188-5-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Change the firmware on microSD path to "firmware/traverse/ten64" as per EBBR section 4.2[1]. The Traverse firmware tools now locate the DPAA2 firmware and configuration files under that path on the rescue SD card image. If a user then installs a standard Linux distribution over the top of that sdcard, (in theory) it will be left alone by distribution boot tooling. Signed-off-by: Mathew McBride [1] https://arm-software.github.io/ebbr/index.html#firmware-partition-filesystem Reviewed-by: Peng Fan --- include/configs/ten64.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/configs/ten64.h b/include/configs/ten64.h index 1601fb733e..63fbafd132 100644 --- a/include/configs/ten64.h +++ b/include/configs/ten64.h @@ -15,6 +15,8 @@ #define QSPI_NOR_BOOTCOMMAND "run distro_bootcmd" #define SD_BOOTCOMMAND "run distro_bootcmd" +#define SD_FIRMWARE_PATH "firmware/traverse/ten64/" + #define QSPI_MC_INIT_CMD \ "sf probe 0:0 && sf read 0x80000000 0x300000 0x200000 &&" \ "sf read 0x80200000 0x5C0000 0x40000 &&" \ @@ -22,10 +24,10 @@ "sf read 0x8E000000 0x580000 0x40000 && fsl_mc lazyapply DPL 0x8E000000 && "\ "echo 'default DPL loaded'\0" #define SD_MC_INIT_CMD \ - "mmcinfo; fatload mmc 0 0x80000000 mcfirmware/mc_ls1088a.itb; "\ - "fatload mmc 0 0x80200000 dpaa2config/dpc.0x1D-0x0D.dtb; "\ + "mmcinfo; fatload mmc 0 0x80000000 " SD_FIRMWARE_PATH "mc_ls1088a.itb; "\ + "fatload mmc 0 0x80200000 " SD_FIRMWARE_PATH "dpc.0x1D-0x0D.dtb; "\ "fsl_mc start mc 0x80000000 0x80200000 && " \ - "fatload mmc 0 0x8E000000 dpaa2config/eth-dpl-all.dtb && " \ + "fatload mmc 0 0x8E000000 " SD_FIRMWARE_PATH "eth-dpl-all.dtb && " \ "fsl_mc lazyapply DPL 0x8E000000 && echo 'default DPL loaded'\0" #define BOOT_TARGET_DEVICES(func) \ From patchwork Fri Jul 21 04:39:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810682 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=Pn4gw5HI; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=mjfAtwBR; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cMH1BV2z20Cs for ; Fri, 21 Jul 2023 14:41:15 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D0696867B2; Fri, 21 Jul 2023 06:40:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="Pn4gw5HI"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="mjfAtwBR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1B3A1865E4; Fri, 21 Jul 2023 06:40:22 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5A342867B5 for ; Fri, 21 Jul 2023 06:40:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 8048D3200F8D; Fri, 21 Jul 2023 00:40:17 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 21 Jul 2023 00:40:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914417; x= 1690000817; bh=QkDiBfGtgxs8/r+jg2tw+lDqONDA2gr/kFOIYnPn1rE=; b=P n4gw5HIMt86lfqTnTnlov5hs2VaaWJpryinayAIHH0FIIivrJ20HeHFuAj32blyA Yr3xeKtTWDtslwnrFSJWpBGj/FdxBm9gUw4aJL91inJd8QrgyxRvcMIi01z3YdR/ 4uOKT6LlEjduM2Sg6+9vMohfN+VKkqppMUQrftXXiV8loWm2BAKRG6xiGOtpnZeq Z1qXYkhJn1lWkJmtl47wo8unv7csX/dDiYyTzfTW/2PkNPkQEV1VgzMNNn2jw9Vm rf4J8vbxA/UJpGVwdekJfdDM8/eGgmRWRN4qeVuJi9cUT9nAH/xs9lnnEGHHgflN //SuKSelGKbwTUchTOxsg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914417; x= 1690000817; bh=QkDiBfGtgxs8/r+jg2tw+lDqONDA2gr/kFOIYnPn1rE=; b=m jfAtwBR42m1Hve3+CqWCFFVOXauu48X1plqeI85C9XUBRLse4wegcBFQn25CMnbl rK+fzH+iwSX68RQIcDruA++b6DilUoJXcdqQmXjVB7igKc1Vhr/EiXIpy4LRKDsX p4wMcUqn9vUQSRXWHfNXPfk0Mp5sZcx86GDHBB8qOrInzdn4cWhwSIJxpV3fqZpB YTUmBKYz5mu8Urhd3E1LG5c/jSRnFp9fJS+Kxgr9ngspsrQfbEsbj/XP5E3kJ/fJ q6k0Qy+3C7tZhl2T3BXOmwLMv9nLbzY1wfY4pQ9GnB4GnMgK6QRfcqD2D84I4nrW Z3xJzxoiW3+BFxTKXW5aQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhephfffueehtedukeevjedvieevffehjeeiteehhfefkeehgeffleef leejudekgfevnecuffhomhgrihhnpehtrhgrvhgvrhhsvgdrtghomhdrrghunecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgrthhtsehtrhgr vhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:14 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 05/16] board: traverse: ten64: specify bootargs for recovery environment Date: Fri, 21 Jul 2023 04:39:20 +0000 Message-Id: <20230721043931.14188-6-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The recovery environment[1] on the Ten64 is a OpenWrt- based ramdisk stored on the NAND intended to help with system setup tasks. Before the bootargs were not being set for the recovery command, relying instead on the existing bootargs variable. Ensure the bootargs are set correctly prior to booting recovery. Signed-off-by: Mathew McBride [1] https://ten64doc.traverse.com.au/software/recovery/ Reviewed-by: Peng Fan --- include/configs/ten64.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/configs/ten64.h b/include/configs/ten64.h index 63fbafd132..1b8b27c230 100644 --- a/include/configs/ten64.h +++ b/include/configs/ten64.h @@ -50,6 +50,7 @@ BOOTENV \ "load_efi_dtb=mtd read devicetree $fdt_addr_r && fdt addr $fdt_addr_r && " \ "fdt resize && fdt boardsetup\0" \ - "bootcmd_recovery=mtd read recovery 0xa0000000; && bootm 0xa0000000#ten64\0" + "bootcmd_recovery=mtd read recovery 0xa0000000 && " \ + "setenv bootargs \"earlycon root=/dev/ram0 ramdisk_size=0x3000000\" && bootm 0xa0000000#ten64\0" #endif /* __TEN64_H */ From patchwork Fri Jul 21 04:39:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810683 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=WzXnVs5S; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=NzJQiQml; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cMV0BTQz20Cs for ; Fri, 21 Jul 2023 14:41:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EFC8B867D1; Fri, 21 Jul 2023 06:40:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="WzXnVs5S"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="NzJQiQml"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C668867CF; Fri, 21 Jul 2023 06:40:25 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E30CD866E1 for ; Fri, 21 Jul 2023 06:40:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 1E9763200F89; Fri, 21 Jul 2023 00:40:21 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 21 Jul 2023 00:40:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914420; x= 1690000820; bh=hdvpOBiSvUcZlHjVsH9iclIzXLi+JT412YX9CMxwGB0=; b=W zXnVs5SLHV6UrsagJu+Sxby4ARgnz6i+gsn2OYz8IitUApwwHeralLpzjKxgeBmu BP7ff7CXlVR1Zh9GPb64isIDoIhUdvcfVoB4zhVhAxaDx/1vDQH6d+jWd0dkTjR0 jyVonIhdBGScebtTTSVZQnQMxCDs+i3ccNn1fgN2Gy+zAiOhGGj8G3lDGX/csLJt bUyXo5AJ0AL42P8xE4GaflewOK0hTQylM2GL/y5DpHcCKaZtxarPe/woTrm+QvZP 8U84GZq1b9GWbWMzY55TJzXJRFW4nznGq8+JyjlTfze7jYaxCmHiO0O6kThzp5W0 JnN8pa3oAlU9EPv6kS0jg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914420; x= 1690000820; bh=hdvpOBiSvUcZlHjVsH9iclIzXLi+JT412YX9CMxwGB0=; b=N zJQiQmlv8daHl8dQhYeHHR4zfElRHuPXBAzmhTUfsCsUg4DDC3C+2E5+HzoXOIq6 5WmEDq3MCrdnpBvJ7nJNopzfT8hzNwoRJB1QBhOskK+Up3Q7gZMZVtZnSskO+k+G lplg60JXqn4+RRHcM1v0eaGrXuuBZQh54gMPQSy5MB3DIAPXgO4jMV5zLuWwEbB6 1BKJahHihB0KSA8YyPCqmpGyi9cDsh+zfZVveVcvvsrrE6FWGkImaESQloyD1/t+ XS/5I0y3m4XicJApJik2mGJnXMstk6b0YDPcaCOB1vnqhE9hjqkwXqTbQ+cGiH/l 52hDEbGp2qrg/NfVN3ctA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhepieeifeehieeiueeludefgfdtveefjeffteegvdevudffffelheej tdejgeelleegnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehmrghilhhfrh homhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:18 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 06/16] board: traverse: ten64: add NAND based OpenWrt bootcmd Date: Fri, 21 Jul 2023 04:39:21 +0000 Message-Id: <20230721043931.14188-7-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The default Ten64 MTD configuration reserves two ubifs partitions for OpenWrt residing on NAND flash. Add the bootcmd for this system into the default environment. Signed-off-by: Mathew McBride Reviewed-by: Peng Fan --- include/configs/ten64.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/configs/ten64.h b/include/configs/ten64.h index 1b8b27c230..f9e800d4b6 100644 --- a/include/configs/ten64.h +++ b/include/configs/ten64.h @@ -39,6 +39,11 @@ func(PXE, pxe, 0) #include +#define OPENWRT_NAND_BOOTCMD \ + "bootcmd_openwrt_nand=ubi part ubi${openwrt_active_sys} && "\ + "ubi read $load_addr kernel && " \ + "setenv bootargs \"root=/dev/ubiblock0_1 earlycon ubi.mtd=ubi${openwrt_active_sys}\" &&"\ + "bootm $load_addr#ten64\0" #undef CFG_EXTRA_ENV_SETTINGS #define CFG_EXTRA_ENV_SETTINGS \ @@ -48,6 +53,8 @@ "kernel_addr_r=0x81000000\0" \ "load_addr=0xa0000000\0" \ BOOTENV \ + OPENWRT_NAND_BOOTCMD \ + "openwrt_active_sys=a\0" \ "load_efi_dtb=mtd read devicetree $fdt_addr_r && fdt addr $fdt_addr_r && " \ "fdt resize && fdt boardsetup\0" \ "bootcmd_recovery=mtd read recovery 0xa0000000 && " \ From patchwork Fri Jul 21 04:39:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810684 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=S+dJjRQK; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=Yk055Hoj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cMj3pBzz20Cs for ; Fri, 21 Jul 2023 14:41:37 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DC7C5867DD; Fri, 21 Jul 2023 06:40:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="S+dJjRQK"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="Yk055Hoj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C0D38867D6; Fri, 21 Jul 2023 06:40:28 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6B2C7867D0 for ; Fri, 21 Jul 2023 06:40:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id A5C163200F75; Fri, 21 Jul 2023 00:40:24 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Fri, 21 Jul 2023 00:40:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914424; x= 1690000824; bh=oxpescxDHwkEwHTMAKuZUskjaqlLO/kyqEUJghKU42g=; b=S +dJjRQKKpRCF11ePsTs3h4JxDf7CaPSJbn4axIgLL+/h2gW5DJyYG99PV+9XVd/4 7Uxw5ctztdlQWQkI99MGUArH5WZnxsKYUYgHCx4xIAAvsc7XZpbOqPtoA5VQDPfH J4/eohvhepTYHU0QxBP1tvBf9b4nACx8jVOTJFvABb4xGVnAk0dFjgDfSonsZzP3 zalFBtZHNzgAWm7yhk7Kn2kRvE/LX/oCUQ2S3w9t99yNGmyb+B9kSA30hHhJw+aJ Ahl7N1OK7l3D3MioF/a7/Enw3EBX539HEER/yRicR6/m25aIXeN/NvbFXdZ5qIxA LXG0xSm9qZyhaKEabH1rA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914424; x= 1690000824; bh=oxpescxDHwkEwHTMAKuZUskjaqlLO/kyqEUJghKU42g=; b=Y k055HojpXOM/m50LWlyf+D1I3951v1D0uyTByoVSaKFZi3WtbVlpZFZu+vxIz+JA L00Mh9W49lMQJrqE3tJiAk1qoG4bXypfjKOljsFzzVNZb7KzljedT7+i0Ja9So2/ AS65bIQgCs5TRpmRMUSXgpcxsQSjQ49MQoTIQcNQJ+/LCEB/1Jl0eKtqXSfDyn8X rB8I7MhpowdUyb69KvaR/C1E9RodPfaA2prT87VJtaCsuCqXmxBTUS7O/TbdzgNF YmXgCNdGLKoYMypVAelzZfIWgdaiSO3fYWL9qLiDj29CYMQqr7k494Fs/TNMliQ1 GS83ZtNfAxUTniL0VQPdA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhepieeifeehieeiueeludefgfdtveefjeffteegvdevudffffelheej tdejgeelleegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:21 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 07/16] board: ten64: add a bootmenu entries for NAND-based entries Date: Fri, 21 Jul 2023 04:39:22 +0000 Message-Id: <20230721043931.14188-8-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The recovery-firmware and OpenWrt-NAND do not yet have bootflow /bootstd entrypoints, so add bootmenu entries to make them accessible. Signed-off-by: Mathew McBride Reviewed-by: Peng Fan --- include/configs/ten64.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/include/configs/ten64.h b/include/configs/ten64.h index f9e800d4b6..d2bef9b6e5 100644 --- a/include/configs/ten64.h +++ b/include/configs/ten64.h @@ -46,6 +46,15 @@ "bootm $load_addr#ten64\0" #undef CFG_EXTRA_ENV_SETTINGS +#if CONFIG_IS_ENABLED(CMD_BOOTMENU) +#define DEFAULT_MENU_ENTRIES \ + "bootmenu_0=Continue standard boot=run bootcmd\0" \ + "bootmenu_1=Boot into recovery=run bootcmd_recovery\0" \ + "bootmenu_2=Boot OpenWrt from NAND=run bootcmd_openwrt_nand\0" +#else +#define DEFAULT_MENU_ENTRIES "" +#endif /* CONFIG_IS_ENABLED(CMD_BOOTMENU) */ + #define CFG_EXTRA_ENV_SETTINGS \ "BOARD=ten64\0" \ "fdt_addr_r=0x90000000\0" \ @@ -57,7 +66,8 @@ "openwrt_active_sys=a\0" \ "load_efi_dtb=mtd read devicetree $fdt_addr_r && fdt addr $fdt_addr_r && " \ "fdt resize && fdt boardsetup\0" \ - "bootcmd_recovery=mtd read recovery 0xa0000000 && " \ - "setenv bootargs \"earlycon root=/dev/ram0 ramdisk_size=0x3000000\" && bootm 0xa0000000#ten64\0" + "bootcmd_recovery=mtd read recovery 0xa0000000; " \ + "setenv bootargs \"earlycon root=/dev/ram0 ramdisk_size=0x3000000\" && bootm 0xa0000000#ten64\0" \ + DEFAULT_MENU_ENTRIES #endif /* __TEN64_H */ From patchwork Fri Jul 21 04:39:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810685 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=W3TVkPhs; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=Ny2N9u6G; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cMt4XqSz20Cs for ; Fri, 21 Jul 2023 14:41:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BDBD2867D6; Fri, 21 Jul 2023 06:40:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="W3TVkPhs"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="Ny2N9u6G"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 56527867E1; Fri, 21 Jul 2023 06:40:32 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0A5B1867DD for ; Fri, 21 Jul 2023 06:40:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 36BDC3200F49; Fri, 21 Jul 2023 00:40:28 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Fri, 21 Jul 2023 00:40:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914427; x= 1690000827; bh=yqzCQ0rsbbc4MeAarbzYybBHXB7dL780p+XHjOStGnY=; b=W 3TVkPhsqBS3O8dvNTGGnLBJP2EqivCTEAiWLMNge2LJEvzTEcyAxSnQEE5I8bV81 ZyeRVD80eoDEkHkz2jW1Lt5ZSFaoain6DZUoaBIb+cRfxiUvYXJd/FEhNJQ9y8PK sOfWmTwT4AOiK27+seM0aAirzMrrDpvUnSfFS0GMv7EUwmX5xyV55MbYySObfk6q Wq8vT9ELVSG7S8lhYjJwuWct1sskt0kBPBRQgFbtMDPA5Uf2VZRxpFXZe72bcTrl EGrORwsQP0fyNOoT3HfeRD4JdZWdnsJ/2PwVfv+lNCG0ySo9/Hf8CpWXbJwYhk+Q +9f7cnbN5w0QWPziFOBfA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914427; x= 1690000827; bh=yqzCQ0rsbbc4MeAarbzYybBHXB7dL780p+XHjOStGnY=; b=N y2N9u6GfTU95giu8DSfZNphFU7p6XnqfdAciXmhTPVneGWTCZYBJShsTamhjDinU s0er3S2Z71EgzA/HL8/A0o81Pef4d1p4OTGrF53+OaFNrV7gXi5VtF1vOtRPu5jh B2p7tmIed9l91uU1lTVRUC4G0THZ5RyaE3kR8KaJAZfgwlzFixst5gSIVj0C73l/ lAVF5nNVPn15wxlGeoenIKwjBElXkcHhs2Rm5mUT8SQohEtKaNKiRnOgUbLVt5NM W4615sxMZ9j3/AiLbos55tN5sLV05FPrjZ7RJg9wTjUTIScw7E9YDAaTEjhoOPP8 0jyOOcChrlB0dE6Uusqgw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhepieeifeehieeiueeludefgfdtveefjeffteegvdevudffffelheej tdejgeelleegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:25 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 08/16] configs: ten64: enable NVME_PCI Date: Fri, 21 Jul 2023 04:39:23 +0000 Message-Id: <20230721043931.14188-9-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean This restores NVMe functionality after PCI(e) NVMe support was split out from the NVMe driver. Signed-off-by: Mathew McBride Reviewed-by: Peng Fan --- configs/ten64_tfa_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ten64_tfa_defconfig b/configs/ten64_tfa_defconfig index 9797a343e5..7d63ee40e9 100644 --- a/configs/ten64_tfa_defconfig +++ b/configs/ten64_tfa_defconfig @@ -76,6 +76,8 @@ CONFIG_SYS_MEMAC_LITTLE_ENDIAN=y CONFIG_E1000=y CONFIG_MII=y CONFIG_NVME=y +CONFIG_NVME_PCI=y +CONFIG_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE_RC=y CONFIG_DM_RTC=y From patchwork Fri Jul 21 04:39:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810686 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=eHzVo16L; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=JNrT/u79; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cN518qZz20Cs for ; Fri, 21 Jul 2023 14:41:57 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3D9A9867E7; Fri, 21 Jul 2023 06:40:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="eHzVo16L"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="JNrT/u79"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E3CF5867E7; Fri, 21 Jul 2023 06:40:35 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 97651867D9 for ; Fri, 21 Jul 2023 06:40:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id BECF13200F49; Fri, 21 Jul 2023 00:40:31 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 21 Jul 2023 00:40:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914431; x= 1690000831; bh=cYbCoRNW9A5YDBS8sSkGBQMmHOTId6YtXvcMdPXbUtw=; b=e HzVo16La7JLXQPPOSzB4Fpg9ARXsL67HC9oHkBaZcZeAkZ+HzYGegR2q2RHt+rAO GkNMhzc/ZoB0W2qpk+0UfuWJ+3xP0DdYwWo3kYqH4yDExKqI0KI12cFR8qitxYfy xOKWxahrE1s0eEULFBTt5fgQDp0exbis2505p0tcsF54/UBtF//Cw6tLd7ELw69W PxtCCEldSNRCvV4gZMncFnN2+Utd/4ZQhqLR2aWM8wtWgSde3zJd/HSOW0uCKpba FqMi3XMvzBs05sLs0AegfNjJdsIzB8ppoMJdx5iHnIeE8HJpL41+nHKmId0mLcft 6vu1df6fdAonvm6I/xjOA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914431; x= 1690000831; bh=cYbCoRNW9A5YDBS8sSkGBQMmHOTId6YtXvcMdPXbUtw=; b=J NrT/u797q7F0fe9CxoSbvH1YGCCmk6kfYF3KauqBrfQXmdwChtRc9cA+9d738Y97 50mj0RdYorgTlDhK2tkpsZECPQQ+T0iojk3CDVp7VLaWkkNWnJMw9NzpCI0K9oto 9kYNzkix4D3JypSYiRx9Kp4yBmzHAsJpYfmN9Ss8ZMv86QpRvv+wGGKvenES7+3t 3S9Xypm0uDOEPBHAUcYQS7NMrZqUCP1TXG+Ndehkr2aDzbJBElIW5AADg8Hgabnl b1f+3ERNfoXKKw6R97lPX8X8/YeXAJ08ap4Riv4F8kLtwMU5NnK/z6oOfquNuq4v SoopbEmSk9KZEtsFW1SdQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhepieeifeehieeiueeludefgfdtveefjeffteegvdevudffffelheej tdejgeelleegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrh homhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:29 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 09/16] board: traverse: ten64: init nvme devices in late boot to ensure bootflow availability Date: Fri, 21 Jul 2023 04:39:24 +0000 Message-Id: <20230721043931.14188-10-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Ensure nvme devices are scanned before reaching the shell, otherwise extra user intervention ("nvme scan") is required before they are visible to bootdev/bootflow. Signed-off-by: Mathew McBride Reviewed-by: Peng Fan --- board/traverse/ten64/ten64.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index df44baf24f..39f0d107cd 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -184,6 +185,11 @@ void fdt_fixup_board_enet(void *fdt) int fsl_board_late_init(void) { ten64_board_retimer_ds110df410_init(); + + /* Ensure nvme storage devices are available to bootflow */ + if (IS_ENABLED(CONFIG_NVME)) + nvme_scan_namespace(); + return 0; } @@ -444,3 +450,4 @@ static void ten64_board_retimer_ds110df410_init(void) puts("OK\n"); } + From patchwork Fri Jul 21 04:39:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810687 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=SqfeYhsf; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=R0CCbAyz; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cNH4pXBz20Cs for ; Fri, 21 Jul 2023 14:42:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8A68C867EF; Fri, 21 Jul 2023 06:40:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="SqfeYhsf"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="R0CCbAyz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8C436867DE; Fri, 21 Jul 2023 06:40:39 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1DD15865E4 for ; Fri, 21 Jul 2023 06:40:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 51C673200F49; Fri, 21 Jul 2023 00:40:35 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 21 Jul 2023 00:40:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914434; x= 1690000834; bh=l83k0RlboUqX3SG4FGcCob/ZnSUEUoSHAmAY97sYv+s=; b=S qfeYhsfldqA7/7qaqV9v++DJVtGJPWbA+FDaM27qx9Ka2zfITCWodKXSLjSSIKgR UrTmqrANZpjr59QCORI5ITsnqYY1iX1nqSgClW0xoCpDTkKNk5eCDnF/sDI6a9h9 gHW9HRwSHOUUxd2u5tKypJz7qEICHnhQWo/PHnLuLbOgvVCvZkw60dC9KNfHWTtn ixUC+Qq04UNCZQ/bPzL09FUDSRkRBWkV2rbcMQZX+WEqfEU8L4ZLlXmX2H1PsTYa lma1Kf7p9Lk3TC6gB3cyX1QFFTUhzqVZif21NYwZB4uFmouDhc6jqRxMCvP7LSKN Kv5c6jfv0lg/padvCfOZA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914434; x= 1690000834; bh=l83k0RlboUqX3SG4FGcCob/ZnSUEUoSHAmAY97sYv+s=; b=R 0CCbAyz0eJC640nGOCmUvG2sOJYU6RLK10HKZDOaD3T71Uh2vRXDJ57egGayo3t/ HSkjn6VR4zlW3XNsFRmlRFfq2mHn+/x82omLGaJXu1909xWSb1pAH6ZpRupgZw1M /DLayaaM/v1jPrmmEBrwZnh+vD2pT35SmqAbuGwOlckV5tQ1It7dPwXueF1sE1Jl HrG0dUkNQHMKF0yhKYPaYrLQkjgkrqks73HX052nS5PtT0ITWE6nK8a1kuOPmjkW RXTJDKIDVWSUSl1ikxqeyExxYDPcQT9oVZvcfNFp2bX6sff3vHKtontlZIuhge2H 2wYCHJcUeH5b/oAmW1ZTg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhepieeifeehieeiueeludefgfdtveefjeffteegvdevudffffelheej tdejgeelleegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrh homhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:32 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 10/16] board: traverse: ten64: fix allocation order of MAC addresses Date: Fri, 21 Jul 2023 04:39:25 +0000 Message-Id: <20230721043931.14188-11-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean On Ten64 boards, the "serial number" is the MAC address of the first Gigabit Ethernet interface (labelled GE0 on the appliance), and counted up from there. The previous logic did not take into account U-Boot's ordering of the network interfaces. By setting aliases/ethernetX in the device tree we can ensure the U-Boot 'ethX' is the same as the labelled port order on the unit, as well as the one adopted by Linux. Signed-off-by: Mathew McBride --- arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi | 10 ++++++++++ board/traverse/ten64/ten64.c | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi b/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi index 89566bf849..4e6700d586 100644 --- a/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi @@ -6,6 +6,16 @@ /{ aliases { spi0 = &qspi; + ethernet0 = &dpmac7; + ethernet1 = &dpmac8; + ethernet2 = &dpmac9; + ethernet3 = &dpmac10; + ethernet4 = &dpmac3; + ethernet5 = &dpmac4; + ethernet6 = &dpmac5; + ethernet7 = &dpmac6; + ethernet8 = &dpmac2; + ethernet9 = &dpmac1; }; }; diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index 39f0d107cd..0febc0baf0 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -328,8 +328,8 @@ static void ten64_set_macaddrs_from_board_info(struct t64uc_board_info *boardinf this_dpmac_num = allocation_order[intfidx]; printf("DPMAC%d: %s\n", this_dpmac_num, ethaddr); snprintf(enetvar, 10, - (this_dpmac_num != 1) ? "eth%daddr" : "ethaddr", - this_dpmac_num - 1); + (intfidx != 0) ? "eth%daddr" : "ethaddr", + intfidx); macaddr++; if (!env_get(enetvar)) From patchwork Fri Jul 21 04:39:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810688 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=P/ZRfBkN; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=eg3qwj9m; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cNV3ksHz20Cs for ; Fri, 21 Jul 2023 14:42:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AB4D6867E9; Fri, 21 Jul 2023 06:40:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="P/ZRfBkN"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="eg3qwj9m"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F190F86805; Fri, 21 Jul 2023 06:40:43 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A475B867DE for ; Fri, 21 Jul 2023 06:40:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id D232F3200F75; Fri, 21 Jul 2023 00:40:38 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Fri, 21 Jul 2023 00:40:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914438; x= 1690000838; bh=mzg8xKRIR1ExRiY7/oeAk78NT/p7xAkhGHJLOd9LTO0=; b=P /ZRfBkNbKh1OcVJV9dj24sSq5G6/y3mNMF+L/3L9k8eDCg4ro5cc4I4enN5xylqU duBYFf2Ke+4xBpCOYPTb1VNYVAhlVmEhSHIpfC7JYtVU1+PrJa3dbdY0eRLkcxl4 k0S/SuzqHJVKCIMhj/G8Sa0CdwAxkccH+exSZNf4fFA6iNsFkAaTw4dIy9HunXtT F6Y3J7tjrTa/wKshoW3S3JiyU8aUYFo/BRyNg8L92Gwu0pt5MYygknnf5BVYKKNg 4c6pg3iQ5i3rLAksnLNo4aarhFpMqYnh5VKL/awpGWsvb/bK9BT4HpZ8mWkdOaLB LgX713+j+BrZrXhlyb2iw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914438; x= 1690000838; bh=mzg8xKRIR1ExRiY7/oeAk78NT/p7xAkhGHJLOd9LTO0=; b=e g3qwj9mozDRfZx7rcUPomv4WBhQK4w239TPJ0cIthi1jCexcFnYii+4Rchv2rBlR SIc4iBsVIBRvPsJro7/pNVOMgosytmDVaeu2sRCEn9h/O6WZ3oYqPCz1fGTTHEcB W6tHMLnHXErIwCe3oEQCav1LLQwI+GX/rI9Heyq0j2sqik1DGZ473AuOf67mrXo7 C/EQOrJvrpdIVSpla8sXlJWZSzXBdBAccmwa1+M/MmtoML0W2aAl7QZqVYRVlLlM pM+aD982lhm1oTHiuuvdpNHwm02kX6GmHu4ko+0z7wbLfwmDkUWF3GYvNN54jg/k 1V5Agk4Py9ALGc2BloB+Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhepieeifeehieeiueeludefgfdtveefjeffteegvdevudffffelheej tdejgeelleegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrh homhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:36 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 11/16] board: traverse: ten64: set serial# to be 'label' MAC Date: Fri, 21 Jul 2023 04:39:26 +0000 Message-Id: <20230721043931.14188-12-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The GE0 (first Gigabit Ethernet interface) is used as the 'serial number' for the board and appliance. To ensure the 'true' board S/N is available regardless of how the DPAA2 subsystem is configured, use serial# so it is passed in the device tree. Signed-off-by: Mathew McBride Reviewed-by: Peng Fan --- board/traverse/ten64/ten64.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index 0febc0baf0..17057966c8 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -296,6 +296,7 @@ static void ten64_set_macaddrs_from_board_info(struct t64uc_board_info *boardinf { char ethaddr[18]; char enetvar[10]; + char serial[18]; u8 intfidx, this_dpmac_num; u64 macaddr = 0; /* We will copy the MAC address returned from the @@ -316,6 +317,19 @@ static void ten64_set_macaddrs_from_board_info(struct t64uc_board_info *boardinf */ macaddr = __be64_to_cpu(macaddr); + /* Set serial# to GE0/DPMAC7 MAC address + * (Matches the labels on the board and appliance) + */ + snprintf(serial, 18, "%02X%02X%02X%02X%02X%02X", + MACADDRBITS(macaddr, 40), + MACADDRBITS(macaddr, 32), + MACADDRBITS(macaddr, 24), + MACADDRBITS(macaddr, 16), + MACADDRBITS(macaddr, 8), + MACADDRBITS(macaddr, 0)); + if (!env_get("serial#")) + env_set("serial#", serial); + for (intfidx = 0; intfidx < 10; intfidx++) { snprintf(ethaddr, 18, "%02X:%02X:%02X:%02X:%02X:%02X", MACADDRBITS(macaddr, 40), From patchwork Fri Jul 21 04:39:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810689 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=CSMBWX4Z; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=lzKK6GNN; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cNj0Wqyz20Cs for ; Fri, 21 Jul 2023 14:42:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EA2D9867FB; Fri, 21 Jul 2023 06:40:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="CSMBWX4Z"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="lzKK6GNN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 79CB58680B; Fri, 21 Jul 2023 06:40:46 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 35D83865E4 for ; Fri, 21 Jul 2023 06:40:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 655193200F49; Fri, 21 Jul 2023 00:40:42 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 21 Jul 2023 00:40:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914441; x= 1690000841; bh=pQlI/bqC5vH4lw+hF/mUURXYoWPKTi21x9H9GT4ZZVw=; b=C SMBWX4Zt08kkO3M9v+XkPN9hM3CtfRV/rIgz/PgNYhAJET0saUnJyVL4m01BYoYu dnR09fG9SCHdvyxYUJeijANYuECvbd473co4PSeLy4eOLj8E9xe9sJBpqvJKMSKQ 2HXSwXqZuZWYUxpd/b3fGAHq9deD0+Hekbwo2oosCfUA3IwQjQ6jHbNZsodabuNf jYIVtIEEPHH6j3pmpynVTLxGIW67qMNxzNHj0QahF9NF6780UpBw6um8jfuZp+j1 E3tO7zwZXPneP7VkpMygDbZHWxbzEYmvoMPyBRytL9SkOjtSfWAcywsHuspFj2// JF/UQmF0MPas2ej1TdvTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914441; x= 1690000841; bh=pQlI/bqC5vH4lw+hF/mUURXYoWPKTi21x9H9GT4ZZVw=; b=l zKK6GNNI54zAkUCI5Drb8pCiaH9oPuoqCXRCLMwyGfySwyCKZOR7ogewg/FYjhlL kusBYF/MYAdGGsYQ7xSBo4qXsEQ+PzIM0VX+ujOzwGMrZZFKHoEIODobDSffBvgM VRN7MJqdmThiMQRSh0c2Irg8t2MuUJl/fAhDZErBjjBbQCJr2KBIr5VFAINsiVeu XtJvCpHtvX/C4Yfv63UvEEktzsyKCMic3tXKEuzmcrcrxiSgBnqrLTfLtLupOfpW Uw0sz8aMJrWJCNPWaRA9VnS9haHTpSCwEHaAgxyXCH6iYrAOC8QPLr9HrBJDmwzs 1eViYeu7MPLf58970e+mQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhepieeifeehieeiueeludefgfdtveefjeffteegvdevudffffelheej tdejgeelleegnecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehmrghilhhfrh homhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:39 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 12/16] board: ten64: disable watchdog autostart Date: Fri, 21 Jul 2023 04:39:27 +0000 Message-Id: <20230721043931.14188-13-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The watchdog driver was previously enabled but not used until U-Boot's fsl-ls1088a.dtsi was updated to describe them. Some Linux distributions (e.g Debian 11) do not engage the SP805 watchdogs, causing unexpected resets after boot. To conserve the user experience, turn off the autostart, and we will provide a mechanism to turn them on at boot via env vars. Signed-off-by: Mathew McBride Reviewed-by: Peng Fan --- configs/ten64_tfa_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/ten64_tfa_defconfig b/configs/ten64_tfa_defconfig index 7d63ee40e9..796a826b72 100644 --- a/configs/ten64_tfa_defconfig +++ b/configs/ten64_tfa_defconfig @@ -96,6 +96,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +# CONFIG_WATCHDOG_AUTOSTART is not set CONFIG_WDT=y CONFIG_WDT_SP805=y CONFIG_TPM=y From patchwork Fri Jul 21 04:39:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810690 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=gNnqoQTN; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=DnidXNVL; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cNt2p2Kz20Cs for ; Fri, 21 Jul 2023 14:42:38 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 53E7086817; Fri, 21 Jul 2023 06:40:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="gNnqoQTN"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="DnidXNVL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CB30E867EA; Fri, 21 Jul 2023 06:40:49 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B487B867DE for ; Fri, 21 Jul 2023 06:40:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id DF9CA3200F84; Fri, 21 Jul 2023 00:40:45 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 21 Jul 2023 00:40:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914445; x= 1690000845; bh=ZqL1HBxX5dLLBU4ihQhUIyatcYzHuBoUs8OljSoubGQ=; b=g NnqoQTNIkBDFzdKP7+nbvqNxbcYDkUZENVpoPIo0e6457VoDRSRYAgThIw/ab9zy oMDTgq90xDx2wyb6IKrmCkm5bEEXhhLjPbXTV2lTvsbTXSXj+FY+V3y9H93hRugn KFLGzNlxt7v9cf1fBHUIWt6REk89+qrW4wZsaRVvYECW8k2zO8W5qktCY2L1XjRB xgHFEc6IfjkUDSN8ZrD5fo0PKNKYM5rPR95NVXyIMpHD0i1AYd5/05xkqv68Bm0a Lptmk+38cjwvDanVJxB/gbfW902aLejaKHg4dJROw6RqERZl9Th32VCHlG4kLdvs LNISXfhPLVmDa0LcUfC7w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914445; x= 1690000845; bh=ZqL1HBxX5dLLBU4ihQhUIyatcYzHuBoUs8OljSoubGQ=; b=D nidXNVLsXUp48M6rYzK8SeRrRK0GUbauXMCqXRzk9C17eyLZLAlfk0YjzA3lTw8B hcef+3r0RE9imDOAp/UMHf+NmFga0j6P7Z2J/qUQfQ1anQp2AfD9fG24DciiHxJV 85cyJQ4BvGbMWLtL1fnxYt1FMZR7v9gimwEmQ7u5f6SeSBB9vE3QZ8hVIVnm1CeI M5Ek3AUMxLHs22YAAaEg+b6VQ6VoJdx+wIIE9A6YOSgWRcbGGfYN9xLhmyGAYHdN 302PDfQHCmmxktZfLgew5QNkKa+NGoERwd8EQZstdEJpA/pgU2oI66DV49chM2mP y/ldL1VOLESkc/ng7efbA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhepieeifeehieeiueeludefgfdtveefjeffteegvdevudffffelheej tdejgeelleegnecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehmrghilhhfrh homhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:43 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 13/16] board: traverse: ten64: adopt standard boot defaults Date: Fri, 21 Jul 2023 04:39:28 +0000 Message-Id: <20230721043931.14188-14-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean With the previous updates to the device tree, Ten64 can use Standard Boot 'out of the box'. Signed-off-by: Mathew McBride Reviewed-by: Peng Fan --- configs/ten64_tfa_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/ten64_tfa_defconfig b/configs/ten64_tfa_defconfig index 796a826b72..78e05cb4b6 100644 --- a/configs/ten64_tfa_defconfig +++ b/configs/ten64_tfa_defconfig @@ -22,7 +22,9 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISTRO_DEFAULTS=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x3000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" -# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOOTSTD_FULL=y +CONFIG_BOOTSTD_DEFAULTS=y +CONFIG_BOOTSTD_BOOTCOMMAND=y CONFIG_LOGLEVEL=7 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y From patchwork Fri Jul 21 04:39:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810691 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=JZsIWvgQ; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=KhshetQQ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cP40pD2z20Cs for ; Fri, 21 Jul 2023 14:42:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8783486822; Fri, 21 Jul 2023 06:40:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="JZsIWvgQ"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="KhshetQQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D7B6B86812; Fri, 21 Jul 2023 06:40:53 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 40742867FE for ; Fri, 21 Jul 2023 06:40:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 6CA743200F75; Fri, 21 Jul 2023 00:40:49 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Fri, 21 Jul 2023 00:40:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914448; x= 1690000848; bh=QyLOMoEA8kQdH74kB6U6EfqClhWxvre4gCnDkVRoFOQ=; b=J ZsIWvgQminbRdAEIcHbc+dtIfwm7f2wBKS/hWPLd2wp39/pTp5ZyJPy1hrMt91HC HMAOySQb707OskaD8D2MIAv5abUPOHq3E8YwU//bvEwV5yfD0426GJLIJ8wfAaab cAlKH5kNLwJ52JCsr1IXFJbKVNv/fK4/GNQ7Xt2WMsjIS9JXQ0H6ohML5V1nSnmO mSrVPg3cE72piVK5G1cieTqlncwGx5ew0wDhbMplGDq+JiQ/q9ss4x28uBGaAYxp dcKm+ufP8b/hRbt47O7A9mKkHPjKVY2XwdPw+l4+FZbM8w2YxcWS0gAvBBx+iGey y13F8ZO0xFU0/Vq20crDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914448; x= 1690000848; bh=QyLOMoEA8kQdH74kB6U6EfqClhWxvre4gCnDkVRoFOQ=; b=K hshetQQnlUA8ZNWU3VDz5HAn2sc5N14Gnqept7fWmA3UAbkGIXeGGqvQMYDOUZBT 8FfiKLPXJXT9OkcTheEbQ2B5mjbgHhyyvOdPPQpuNYMHs6SVPubjFX+XgA2zpFGZ e/mm2quuhthGNESnEhNrVkKhXdO3QrHY8ZAiSNjiyR5oRd6Ce+yMBuwsUJUX5GlL k3cvGikL9X7YtgGJihwwzTMifxWyVqM1fES8OEz38tqbr9ND1wCC3EgVbWmSkYbH qUFYBv0vFf7i0PfhRyToliz6cIqjo0tXz8sJKcWfktO9/2bRsUxFujKjwSPjCpeB lMYBnx0UJdAoEKTz39RTA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhephfetheekkedtvdevjeffteelveekkeefheeiffelieekudevhedt hfekhefhffffnecuffhomhgrihhnpehoiihlrggsshdrohhrghenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghtthesthhrrghvvghrshgv rdgtohhmrdgruh X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:46 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 14/16] arch: arm: fsl-layerscape: allow "opt-out" of fsl_setenv_bootcmd Date: Fri, 21 Jul 2023 04:39:29 +0000 Message-Id: <20230721043931.14188-15-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Allow individual Layerscape boards to opt-out of fsl_setenv_bootcmd by declaring the original function as weak. fsl_setenv_bootcmd is used to change the bootcmd based on the TF-A boot source (e.g QSPI vs SD/MMC) for reasons including secure boot / integrity measurements and DPAA2 configuration loading. See previous discussion at [1]. On the Ten64 board, our bootcmd is the same across all TF-A boot sources so we don't want this behaviour. Signed-off-by: Mathew McBride [1] https://patchwork.ozlabs.org/project/uboot/patch/20211110044639.7070-3-matt@traverse.com.au/#2790037 Reviewed-by: Peng Fan --- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 359cbc0430..577a0b6098 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -810,7 +810,7 @@ int qspi_ahb_init(void) #ifdef CONFIG_TFABOOT #define MAX_BOOTCMD_SIZE 512 -int fsl_setenv_bootcmd(void) +__weak int fsl_setenv_bootcmd(void) { int ret; enum boot_src src = get_boot_src(); From patchwork Fri Jul 21 04:39:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810692 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=s2dowo5f; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=f4DcSDml; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cPG5820z20Cs for ; Fri, 21 Jul 2023 14:42:58 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27F3C8680B; Fri, 21 Jul 2023 06:41:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="s2dowo5f"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="f4DcSDml"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1AF5586825; Fri, 21 Jul 2023 06:40:57 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BA863867FE for ; Fri, 21 Jul 2023 06:40:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id EF8643200F4B; Fri, 21 Jul 2023 00:40:52 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Fri, 21 Jul 2023 00:40:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914452; x= 1690000852; bh=619PKsK/viAdJP8JulC6BK9xa6jJ4GyOK5/USE6Ih+w=; b=s 2dowo5f47sxi8g3ad+QmaVtOO4DwlLHXb32HT8DbztsEVyu+q/HOt515/lsPLVr+ ilRcwxqLY81a6eNaUr+9fVrVi4sE6p35CMioLhDlemNi7zeoJelSRixFz8UsA19J SKnOoHBUCII/FDReRlpw6fH0QYnmNmEUW1z6EactuZkV++mH6XK/L+Tb52dPp2pL hQJl4nR7MnWu80mHrCZOSkvRX283tTFkHxZ70TBxYc4Yk+z6a8Wy+IHhZjod7kGd d4JnV9E0IWKQZfdj8i7oGu/mRIs/8YIGUnvMwfZK0hAV3SvIaFrShujMnhV6vZiT iYqHYcaT4s6KNH8mUDGVA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914452; x= 1690000852; bh=619PKsK/viAdJP8JulC6BK9xa6jJ4GyOK5/USE6Ih+w=; b=f 4DcSDmloL6zhBHcWqbqKo3PARD/CH7P8BL8VIeUcLTKRMZNnOkakA9zrbYws4uTt nH7o66SKE2SdXhQfJcV+ZwS6iXTowcLrVGjt4wIWpWCDWCgZpzM3Cur6hPSbBHG/ 3g6KjiUmC+mdju4yv2DTzGvM0qwLC2fLF2AM2L34MOQF94AEKHS6C8miaQ4Nk9vj sLKyuCJFdV6cNx1uVi3rpNN8fbqwwt0NOlL0wuiTTMiom5ldfGATAOFNNm8UgLv1 5urmD1k5DOJTJXXP3jltLzWuXudG/UYMCXKemwpAmv2SYyJeX3Hgy/fc6IfSgY3B 0R/WXmATtJa1WZkJLcLQw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhepieeifeehieeiueeludefgfdtveefjeffteegvdevudffffelheej tdejgeelleegnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehmrghilhhfrh homhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:50 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 15/16] board: ten64: opt out of fsl_setenv_bootcmd Date: Fri, 21 Jul 2023 04:39:30 +0000 Message-Id: <20230721043931.14188-16-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Our bootcmd is the same regardless of where the SoC loaded it's code from, so we don't want fsl_setenv_bootcmd to do anything. Signed-off-by: Mathew McBride Reviewed-by: Peng Fan --- board/traverse/ten64/ten64.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index 17057966c8..3cb8bad855 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -465,3 +465,12 @@ static void ten64_board_retimer_ds110df410_init(void) puts("OK\n"); } +/* Opt out of the fsl_setenv_bootcmd + * in arch/arm/cpu/armv8/fsl-layerscape/soc.c + * which is invoked by board_late_init. + */ +int fsl_setenv_bootcmd(void) +{ + return 0; +} + From patchwork Fri Jul 21 04:39:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1810693 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.a=rsa-sha256 header.s=fm2 header.b=lx9cDUmf; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=RLiLlo2+; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6cPS0KJmz20Cs for ; Fri, 21 Jul 2023 14:43:08 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CF7AA8681B; Fri, 21 Jul 2023 06:41:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=traverse.com.au header.i=@traverse.com.au header.b="lx9cDUmf"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="RLiLlo2+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9199C867FE; Fri, 21 Jul 2023 06:41:00 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4BF8E8680B for ; Fri, 21 Jul 2023 06:40:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=traverse.com.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matt@traverse.com.au Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 815243200F49; Fri, 21 Jul 2023 00:40:56 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 21 Jul 2023 00:40:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=traverse.com.au; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689914456; x= 1690000856; bh=wwEaaKY/Sh0/pK0lXEmxwyV6gejtF0FFj46Ef5dFcIs=; b=l x9cDUmf5ahKg9kqWXlFrerzl+dELAvNhwzFreypSRQ7U+qavdSUPYFOJBrdGN7Gz ybkli1YidXwwybDuvjcN9fZc6+UVkW1GNwy9jGrRgYZm7tdCmSsiPQQ4+r2AsHo7 iSo+gZwD2N4vDStpKsghAhZpIZrKEh6QlJRHeeFMXGPc5v784WGZNDrhNce/ZdIx Sh0oB+lhZyf1VKaWb1qSAu7EPhd9BIs1L8BYxj12WsR3k0BEB8h6r97NnRXtUPwn 8DRrWigoLMQ9/ZKnb9VVbHokmQLwj8FrShrpvOk1isqdXzThL2Bmtu3yeUvDPvB/ HzsC4I+Wy8SxwUBMEndlQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1689914456; x= 1690000856; bh=wwEaaKY/Sh0/pK0lXEmxwyV6gejtF0FFj46Ef5dFcIs=; b=R LiLlo2+G7F+PfQbMvzaG0xwiEYPy/XACWa/KguHR0+It/FvoRoXaIL+yEqdEGl+B z+cyiXfvcjdeafQpG/K0vIYXg4n72T7EdDQWGNPx0uoQGr8m6P84etdNXYPTDPB/ lEQK75dYVvb1Rw1q8hVsJKBkUxSV5UrQFfORr6ZD80Akpc8l4McPXszE4p0AJTCS jemyqVFGj5sbUd9/d+tmCPU6/b9dDK50ZmPg7VUi7dyX6jQxn7+tfUZZyWan0zGe elpGWC675b6MYYTcMNSls7bSvov8CkZQd7qaR9gvyqJTnzP0SH5FCewqyCWP4oO0 uoLuZvluJj51NHE+tsN4w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedugdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghthhgv ficuofgtuehrihguvgcuoehmrghtthesthhrrghvvghrshgvrdgtohhmrdgruheqnecugg ftrfgrthhtvghrnhepieeifeehieeiueeludefgfdtveefjeffteegvdevudffffelheej tdejgeelleegnecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehmrghilhhfrh homhepmhgrthhtsehtrhgrvhgvrhhsvgdrtghomhdrrghu X-ME-Proxy: Feedback-ID: i426947f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jul 2023 00:40:53 -0400 (EDT) From: Mathew McBride To: u-boot@lists.denx.de, Peng Fan , Ioana Ciornei Cc: Mathew McBride Subject: [PATCH 16/16] board: ten64: strip extra u-boot compatibles from FDT Date: Fri, 21 Jul 2023 04:39:31 +0000 Message-Id: <20230721043931.14188-17-matt@traverse.com.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230721043931.14188-1-matt@traverse.com.au> References: <20230721043931.14188-1-matt@traverse.com.au> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The u-boot version of the LS1088A device tree has an extra compatible (simple-mfd) added to &fsl_mc to facilitate usage with U-Boot's device model. Unfortunately FreeBSD will only match the single "fsl,qoriq-mc" exactly when the node is a "bus" object, so we need to strip out the extra compatible before presenting it to the operating system. Signed-off-by: Mathew McBride Reviewed-by: Peng Fan --- board/traverse/ten64/ten64.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index 3cb8bad855..52daae6e24 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -174,6 +174,12 @@ void fdt_fixup_board_enet(void *fdt) return; } + /* In the U-Boot FDT, a 'simple-mfd' compatible is added. + * Remove this as FreeBSD will only match "fsl,qoriq-mc" + * exactly on the DPAA2 bus/MC node. + */ + fdt_setprop(fdt, offset, "compatible", "fsl,qoriq-mc", 12); + if (get_mc_boot_status() == 0 && (is_lazy_dpl_addr_valid() || get_dpl_apply_status() == 0)) fdt_status_okay(fdt, offset);