From patchwork Sun Jun 23 20:30:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951314 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=XIU/F+/V; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jR15X95z1ydW for ; Mon, 24 Jun 2024 06:30:53 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5B620882F9; Sun, 23 Jun 2024 22:30:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="XIU/F+/V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B978588405; Sun, 23 Jun 2024 22:30:41 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 50533882E2 for ; Sun, 23 Jun 2024 22:30:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2a.google.com with SMTP id ca18e2360f4ac-7eb01106015so143424539f.1 for ; Sun, 23 Jun 2024 13:30:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174638; x=1719779438; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PqWjVuQJCqVOZF9dUg365Y0q5FGRMWVG6yjYRoEh8Rk=; b=XIU/F+/V/+80EPY34O2j7E33NYqfkj7qYjahKV0u6ExXoBzQktdnPcES9zAOAFBNVQ RNetFHNjm0yqxftnw65T3XEmnJVLc6VLhhEUWm5Vcy/Ep1ANYTTJdTqxsxk3TS+h1Pew iqDu26cAbOFrHHfxKhvqvQAzmR+NYUG+dpi2M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174638; x=1719779438; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PqWjVuQJCqVOZF9dUg365Y0q5FGRMWVG6yjYRoEh8Rk=; b=R1WgbRA8nVj3CcsnvQ2wLlUirOlxiVRWHsMeOB7EbIw41dTwczkfSf8qH0bZ/qKhb6 T6L2IA6ilxrToQkDZ9ZunT5FR/ZA1v014TFOCZ6hkIMcr9NzlC9jYpiR+Yb0/g+E4/mo VfCZ1lXyne+DqjNjm3NJdxOr6G1lhrzpqTCZjGrcpmqcE7mnDXL8EfM5kCoHe+ayiLwU tA1M85onEEUV8WPd4bHa9aMgtNAWR/J6kMw5eqfves0UajkUzOkhPUPbwik6lKqkNWBA cYHZnyPIfdmCbrv1Xz5RdrmMwx2XZYCuULPIiqaYj7mlS3Cj2gqexAzmg90V5G3RkY1z fiDg== X-Gm-Message-State: AOJu0YyWcjsdgqEU1Y58MAE4SQj8j/zD1LeCmF4UEKLxF9YXyc3cxlvm 7DPLZyXWlw6qYYCkC4pA++nJLBy/XQ1LXaEIk0jQcGdWre5sMnUwt69iFc7jCp+3lByaT1Zqn8f yQw== X-Google-Smtp-Source: AGHT+IFeHbz6wO2B/nyEfiZ9rhT49GjrHF/1WcV8BLA6mQ8XPtwEoq5d3s2tcUleoXTsbQrkJlZLlQ== X-Received: by 2002:a05:6602:1688:b0:7eb:7bc9:7fc9 with SMTP id ca18e2360f4ac-7f3a74d757bmr353018539f.4.1719174637850; Sun, 23 Jun 2024 13:30:37 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:37 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Caleb Connolly , Sughosh Ganu Subject: [PATCH 01/14] trace: Update test to tolerate different trace-cmd version Date: Sun, 23 Jun 2024 14:30:20 -0600 Message-Id: <20240623203033.1566505-2-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 Some versions of trace-cmd (or some machines?) show one less dot in the CPU list. Signed-off-by: Simon Glass --- (no changes since v1) test/py/tests/test_trace.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/py/tests/test_trace.py b/test/py/tests/test_trace.py index 7c5696ce747..f41d4cf71f0 100644 --- a/test/py/tests/test_trace.py +++ b/test/py/tests/test_trace.py @@ -12,7 +12,7 @@ import u_boot_utils as util TMPDIR = '/tmp/test_trace' # Decode a function-graph line -RE_LINE = re.compile(r'.*0\.\.\.\.\. \s*([0-9.]*): func.*[|](\s*)(\S.*)?([{};])$') +RE_LINE = re.compile(r'.*0\.\.\.\.\.? \s*([0-9.]*): func.*[|](\s*)(\S.*)?([{};])$') def collect_trace(cons): From patchwork Sun Jun 23 20:30:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951316 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=fr1gBYep; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jRC733Cz1ydW for ; Mon, 24 Jun 2024 06:31:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B74318845A; Sun, 23 Jun 2024 22:30:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="fr1gBYep"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 17DE387D07; Sun, 23 Jun 2024 22:30:42 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 02D7F87572 for ; Sun, 23 Jun 2024 22:30:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-7ebe508fa34so209019839f.2 for ; Sun, 23 Jun 2024 13:30:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174638; x=1719779438; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/BrGCttK0D/bhbJe5rvYXokoCvR8XBVm1DG5Ii3qYzE=; b=fr1gBYepPz8xFv5C46QlCZw5PTmhfTHsqGOE9en+yyUcXZL+X3Yl/iAmDQGJ2XLxx3 Oi6YnjdbcN7u0ASRfjZvElCr+kmV+o17XDa5FOJeOUMrnM7vweDXVzn7AOUaVMg5kfyM eNfMpvPU+6i1QTumkGpq/F9Qwya2GJY4Wpeb8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174638; x=1719779438; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/BrGCttK0D/bhbJe5rvYXokoCvR8XBVm1DG5Ii3qYzE=; b=iOG5qiicSCaIOaQ511ZhPMPKwnxy/gLJUn9n547MC2xHdeyVYadg2KYUA6JK7wQSxF UTaET1bxFDb+/De7MURAVI9OnjIbjJnY1Xn6OsMTQHmjD7AUM1jC8yryo6rvJrg99smu avriWrMxDVvB+mEba2og1LBTmyyevK03xbEYZmrsJIUnxm0z3Amg9P1o9xVsdmOVM7d5 tduSf27HhwAJueXDqja2qjFtabqTYetJoLvI4H6IM0NJ4bapdL3gS2QEA3+Ry67eKwug Zau+EBfHG3IgeTsFabgLZ2pKCKmh+VWVlkOtRhWhD2IuP0etwQjsMPbZelGmzZ40N0rZ fhqw== X-Gm-Message-State: AOJu0Yyp4DYyivo92IftLskt5ehTpfZeu+kuTfjWdzJFW7dswxSrqIEl n95HsovAbv2mgv9y0tM5t38VFGFYtArGo70GcmRtbm6OGFz5AghYb3uM3KWq6WDIc9B+NZQpqdb Vtw== X-Google-Smtp-Source: AGHT+IHHeVfAlNGIbJ54k+eeoXk8Q2yT1QloSLT7wGyDKs/YwvpHxR94vH6SXRGoTrWEsu0sCmsP2Q== X-Received: by 2002:a05:6602:150d:b0:7f1:3e1a:db4c with SMTP id ca18e2360f4ac-7f3a78044e1mr440442339f.16.1719174638693; Sun, 23 Jun 2024 13:30:38 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:38 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Marek Vasut , Pavel Herrmann Subject: [PATCH 02/14] dm: core: Enhance comments on bind_drivers_pass() Date: Sun, 23 Jun 2024 14:30:21 -0600 Message-Id: <20240623203033.1566505-3-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 part of driver model is a little subtle, so add some more comments to promote better understanding. Signed-off-by: Simon Glass --- (no changes since v1) drivers/core/lists.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/core/lists.c b/drivers/core/lists.c index 2839a9b7371..a84e6a98cb1 100644 --- a/drivers/core/lists.c +++ b/drivers/core/lists.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY LOGC_DM +#include #include #include #include @@ -50,6 +51,21 @@ struct uclass_driver *lists_uclass_lookup(enum uclass_id id) return NULL; } +/** + * bind_drivers_pass() - Perform a pass of driver binding + * + * Work through the driver_info records binding a driver for each one. If the + * binding fails, continue binding others, but return the error. + * + * For OF_PLATDATA we must bind parent devices before their children. So only + * children of bound parents are bound on each call to this function. When a + * child is left unbound, -EAGAIN is returned, indicating that this function + * should be called again + * + * @parent: Parent device to use when binding each child device + * Return: 0 if OK, -EAGAIN if unbound children exist, -ENOENT if there is no + * driver for one of the devices, other -ve on other error + */ static int bind_drivers_pass(struct udevice *parent, bool pre_reloc_only) { struct driver_info *info = From patchwork Sun Jun 23 20:30:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951317 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=K12qvn/g; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jRP6Xwyz1ydW for ; Mon, 24 Jun 2024 06:31:13 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2AA6E884BE; Sun, 23 Jun 2024 22:30:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="K12qvn/g"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9B76B8843A; Sun, 23 Jun 2024 22:30: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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B70FC882A5 for ; Sun, 23 Jun 2024 22:30:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-7eba486df76so108359939f.0 for ; Sun, 23 Jun 2024 13:30:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174639; x=1719779439; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ooBER8KresWFK5aE58J9ZGYyYKZCAYkwPknAO0n10g4=; b=K12qvn/gYUCionetHbtSYL/ThgAxkfwCT13c9tjPWBz4+JQ2GMOI1tFlxWGfORir7D uhpKeBeOT0/5xEIw19abgjfDoh0WhtL+ofsChu6sv33hRJB8rXpvFOueZDij67CFrdhA Do0R/W5SgetHONY7VMW0QSzhjUQBQKCiMbXoY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174639; x=1719779439; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ooBER8KresWFK5aE58J9ZGYyYKZCAYkwPknAO0n10g4=; b=nfPPcBPIAJ+8jBugyIXiAadJxCmJpH2F4LM8eAopx+SNT3i76GS41anuAizsGS+A8p 05AWwxuejzj+ISDsW0q1NCXGpd7yoJ7Z3AqGle+cgyZiRsxHXBmNxwsX+4sPJsaOUhq5 0UHPaeZJKgRGVqphP5Bp/88DlQnj21C3eDDhYu7bF2TomwuYpXtzei+JcuJNuhGtGIBr 5gC4TJ6jnzZhcvIB2ve3vvJCDTWPUVzEa6EsLE5BtUrTobpPujzu/AgMkwaQtqDjnkmu ffT8Lhzx8iVrPmpw7iBXhhQaZ8HcyKEccvKrjjET7Ustvr4EPEi/WkXx5qG4hGsGCZo1 FD1Q== X-Gm-Message-State: AOJu0YyjSs3A7+G3e5biJV++CnSUTYeOWmzPPaTctorm35gvaktGSVVV z1TSTUIiz0zchMf4cDDULW9HYErecJpz565Ij74+emcFfZgGUaP4yb9tUMPyTZf5cm9x+nYwwtx E+w== X-Google-Smtp-Source: AGHT+IFF0CiUgbD4kBuCenhIGJI/6/XuKXVuGy17byH+GcEx2UqJRyAFPbRTWAHeenyjpnqR6P7N8w== X-Received: by 2002:a05:6602:3609:b0:7f3:a415:c736 with SMTP id ca18e2360f4ac-7f3a415cad3mr141895739f.8.1719174639401; Sun, 23 Jun 2024 13:30:39 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:39 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Caleb Connolly , Dan Carpenter , Marek Vasut , Sughosh Ganu Subject: [PATCH 03/14] initcall: Correct use of relocation offset Date: Sun, 23 Jun 2024 14:30:22 -0600 Message-Id: <20240623203033.1566505-4-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 relocation offset can change in some initcall sequences. Handle this and make sure it is used for all debugging statements in init_run_list() Update the trace test to match. Signed-off-by: Simon Glass Reviewed-by: Caleb Connolly --- (no changes since v1) lib/initcall.c | 6 ++++-- test/py/tests/test_trace.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/initcall.c b/lib/initcall.c index c8e2b0f6a38..2686b9aed5c 100644 --- a/lib/initcall.c +++ b/lib/initcall.c @@ -49,13 +49,14 @@ static int initcall_is_event(init_fnc_t func) */ int initcall_run_list(const init_fnc_t init_sequence[]) { - ulong reloc_ofs = calc_reloc_ofs(); + ulong reloc_ofs; const init_fnc_t *ptr; enum event_t type; init_fnc_t func; int ret = 0; for (ptr = init_sequence; func = *ptr, func; ptr++) { + reloc_ofs = calc_reloc_ofs(); type = initcall_is_event(func); if (type) { @@ -84,7 +85,8 @@ int initcall_run_list(const init_fnc_t init_sequence[]) sprintf(buf, "event %d/%s", type, event_type_name(type)); } else { - sprintf(buf, "call %p", func); + sprintf(buf, "call %p", + (char *)func - reloc_ofs); } printf("initcall failed at %s (err=%dE)\n", buf, ret); diff --git a/test/py/tests/test_trace.py b/test/py/tests/test_trace.py index f41d4cf71f0..ec1e624722c 100644 --- a/test/py/tests/test_trace.py +++ b/test/py/tests/test_trace.py @@ -175,7 +175,7 @@ def check_funcgraph(cons, fname, proftool, map_fname, trace_dat): # Then look for this: # u-boot-1 0..... 282.101375: funcgraph_exit: 0.006 us | } # Then check for this: - # u-boot-1 0..... 282.101375: funcgraph_entry: 0.000 us | initcall_is_event(); + # u-boot-1 0..... 282.101375: funcgraph_entry: 0.000 us | calc_reloc_ofs(); expected_indent = None found_start = False @@ -199,7 +199,7 @@ def check_funcgraph(cons, fname, proftool, map_fname, trace_dat): # The next function after initf_bootstage() exits should be # initcall_is_event() - assert upto == 'initcall_is_event()' + assert upto == 'calc_reloc_ofs()' # Now look for initf_dm() and dm_timer_init() so we can check the bootstage # time From patchwork Sun Jun 23 20:30:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951319 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=cW1vgNLP; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jRc3Hd2z1ydW for ; Mon, 24 Jun 2024 06:31:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B783B8851C; Sun, 23 Jun 2024 22:30:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="cW1vgNLP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9DBE288387; Sun, 23 Jun 2024 22:30: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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 773C8883C8 for ; Sun, 23 Jun 2024 22:30:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-7eba486df76so108360039f.0 for ; Sun, 23 Jun 2024 13:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174640; x=1719779440; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mfBAPrVQyw9HTglRcmtpn2r9tm3bxLQG3CM4EjSO9NI=; b=cW1vgNLPluYs2c2rnE7LbRUS7kzKqxUcy8bkKdjWYo/YRD50fVfXS+2hcWHklu6ByL LxHtijl+pqwQ5avPRGJqO3qBTIeGhxTsc78TXWm+4QnSyTsYAs0ZnOzdEXLKSVyaAPWt c2Kd3wpMmp6LTgnMf8T1diCFN/G0ARWLbGi7I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174640; x=1719779440; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mfBAPrVQyw9HTglRcmtpn2r9tm3bxLQG3CM4EjSO9NI=; b=wg2YIYD9lXKdi7t7gAxui9tAoxU2QMExin9bnCG4sgtQxIzEhAqFHnxRQfoL6X3UeB C6njkjfUKwZMyFbRjQpKkc8fa8gLVKpFSLbUMw8XGhlUEUKQDoMPZjR+ZLWIu/35Z02o 8v2qPg51eXm+V74b+crTAsgpYp0bQPHfooT976acLpMRxYee3uS2su6t387lRQhDbOZK U0C4Eus4b2TRMYOYDYNvw/qneJSa4Wren6l5x12JZ0o7oCDJZ8MqM6a6f04nZEjfhnTd mge+hRcLuu7xc/asmjtdH9cOCsggn8jYQOsfiMwh6aCreVNvTI96uQyZ7aFCJ+Zdq3k6 SsdQ== X-Gm-Message-State: AOJu0YzXGkLwD5pXAvc319zE/zS1n4oJnRNzdgx+OTEkcFr3KalGhzq6 BKjG4Rvk2N/o9GEGFttMaGv3JCBEpWZ8lmGoPp9Mx6lOZf/6GlOPziWS4fS2CIjDQuq82dcbMz7 Fcw== X-Google-Smtp-Source: AGHT+IHeo5Ajfx1vtwl21Yv0Uy45uPEU19AMROfA9IFTj8Uz6Xm81hYdC2EqGqQJZbJAce6cXJakbw== X-Received: by 2002:a92:ca4e:0:b0:375:a3eb:bfcd with SMTP id e9e14a558f8ab-37639edb0e5mr18829955ab.8.1719174640095; Sun, 23 Jun 2024 13:30:40 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:39 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , =?utf-8?q?Michal_Such=C3=A1nek?= , Nishanth Menon , Trevor Woerner Subject: [PATCH 04/14] am33xx: Provide a function to set up the debug UART Date: Sun, 23 Jun 2024 14:30:23 -0600 Message-Id: <20240623203033.1566505-5-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 Since commit 0dba45864b2a ("arm: Init the debug UART") the debug UART is set up in _main() before early_system_init() is called. Add a suitable board_debug_uart_init() function to set up the UART in SPL. Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/mach-omap2/am33xx/board.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c index 78c1e965c9f..84a60dedd72 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++ b/arch/arm/mach-omap2/am33xx/board.c @@ -490,9 +490,6 @@ void early_system_init(void) */ save_omap_boot_params(); #endif -#ifdef CONFIG_DEBUG_UART_OMAP - debug_uart_init(); -#endif #ifdef CONFIG_SPL_BUILD spl_early_init(); @@ -533,3 +530,18 @@ static int am33xx_dm_post_init(void) return 0; } EVENT_SPY_SIMPLE(EVT_DM_POST_INIT_F, am33xx_dm_post_init); + +#ifdef CONFIG_DEBUG_UART_BOARD_INIT +void board_debug_uart_init(void) +{ + if (u_boot_first_phase()) { + hw_data_init(); + set_uart_mux_conf(); + setup_early_clocks(); + uart_soft_reset(); + + /* avoid uart gibberish by allowing the clocks to settle */ + mdelay(50); + } +} +#endif From patchwork Sun Jun 23 20:30:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951320 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=HAjtyXLF; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jRt6yPZz1ydW for ; Mon, 24 Jun 2024 06:31:38 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 286788855B; Sun, 23 Jun 2024 22:30:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="HAjtyXLF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 487C0884FF; Sun, 23 Jun 2024 22:30:44 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2F4B787572 for ; Sun, 23 Jun 2024 22:30:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-36da84df7adso10039995ab.1 for ; Sun, 23 Jun 2024 13:30:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174641; x=1719779441; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lq3h+GuSAudu1LsYAUPVwxxmFzpl9EXiEjgaRzLffT0=; b=HAjtyXLF0bOEiJc/5jjERA53mgGUbMYngY/tLeg0l5QdlESFzKr+z2Kxz/hWeC8hBn SsxktUD6bJR56yHE2Wk/i/PJXpbEBu2ooRqN6vuzdt2WoF8e7ZTz3Uoq/vL3vwfqzAIb 7jDtWA6ssrBnmRfTl0CrLYR0bGe6TxEILPTXc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174641; x=1719779441; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lq3h+GuSAudu1LsYAUPVwxxmFzpl9EXiEjgaRzLffT0=; b=VXBuvKiTadwKnd8m5lmMTB6xZD/ge+njKAG97nD4EHRgqx/bEM6RmGgRgveFVPjDjO 5Qiuflu2olFAuf+Gf4lqyBhrZqnXyY4ptZRuLve6GOSTyphgnHOVKOs7RLeeQJG/AEeI BUqoQeqCQpj0xdEXl1hY4RaPvakYp1kstwI63tbPkxB7cB5lhlX2XOEHgkewRJxzlzPS Tb1OJnm8W2MVeG2X8oiVhhuhUWFRNZtZeaDNdTkk1z7wTRpHZ0LZvqB1EXfeDbmJo3g0 OitqB2mY0MLLjOIbxsKVPGZbJI9tNYs3Kzu9znuNifjk6fQKqnLjZBAt2G0XanVmOFal ko2A== X-Gm-Message-State: AOJu0Yxf43l/yx6rdOng5dNLI3eHKteMS8yEUvQesEunIjzo5V2gErcc KmnM8OhBLiBOplwCsJCBkB1MmM0Kv3qMN6c/dggTd4huRisCnlo8EOKZ41xGF8kBqg1x4FUNEKe cxw== X-Google-Smtp-Source: AGHT+IE+TWt+QNlTLH/90jZ6UoMZDlfxwZX9QE7u92qNdK12juRomUx2jeGmyUU836ipvAL3GWGyWA== X-Received: by 2002:a05:6e02:1845:b0:376:2a41:5f42 with SMTP id e9e14a558f8ab-37639f690f6mr20615335ab.10.1719174640761; Sun, 23 Jun 2024 13:30:40 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:40 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Andre Przywara , Jagan Teki , Samuel Holland Subject: [PATCH 05/14] sunxi: Mark scp as optional Date: Sun, 23 Jun 2024 14:30:24 -0600 Message-Id: <20240623203033.1566505-6-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 binary does not prevent the system from booting. Mark it optional so that U-Boot can be built without it. Signed-off-by: Simon Glass Reviewed-by: Andre Przywara --- (no changes since v1) arch/arm/dts/sunxi-u-boot.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index 0909a67883e..e1a9a7f5d4c 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -90,6 +90,7 @@ scp { filename = "scp.bin"; missing-msg = "scp-sunxi"; + optional; }; }; #endif From patchwork Sun Jun 23 20:30:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951321 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=HW5JIrmv; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jS32lmHz1ydW for ; Mon, 24 Jun 2024 06:31:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8E7748855C; Sun, 23 Jun 2024 22:30:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="HW5JIrmv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8392188405; Sun, 23 Jun 2024 22:30:45 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0268F882E6 for ; Sun, 23 Jun 2024 22:30:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-7eb671a835fso208616039f.2 for ; Sun, 23 Jun 2024 13:30:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174641; x=1719779441; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0hAiRelrVOZnPfOazKAh9FmD+FFz1kkIBB4AvlCjCqs=; b=HW5JIrmv2OqZ3qSbNkYaNwF+1379cOKKyNzPXdxz+7xVMzka5bM2HoO6JhMlkEybqJ sW2qV5A4sWvWEzFO+Brs0evTsH+NUzF6xWP765Jp+c/X+K6Oyb8nkRhNjHQc1/m4PTbQ 5Xk47leATOD2PbjcdGqUKoSaO0gaTHv7LzHR8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174641; x=1719779441; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0hAiRelrVOZnPfOazKAh9FmD+FFz1kkIBB4AvlCjCqs=; b=j7YQcLicWe077p30Uk9a/vFTo8iZDPJQDa34ppA1pdwV6xCGMc/mXHgSNKg0JAWueW ECHVk3HCUlPpXSFW4atO8vAgLAinDD2kTrRzT6/1mj2AcYEvwWFq2cU2M33owt+LVmU8 VZVKV1u9QuenDbCvSfpeRSyIDbOnw4MRHugJGDF9ySM4EsuG0PDcwfNaIUsqxOvhWUef bajZUObtdOYtoMGkdpBXxtrgj6dG1Sd6N1iG64Mjqs6AmgrrJs/Ls1dAejHP9EjcsRcp 1w1MEX/q9c0xwGMuOSO6iniC3fu55M4ivSUhu7w8xCOf+ka4S061lhxxjhJA9yg6yN3h Grlw== X-Gm-Message-State: AOJu0YzDUNB1YauKz8wIWUcLiHkYWnqudMB0vG+MbkkbZzOGVKlDBt74 sGL/lE1NyQLrDA1bkOIHcsIyaMaulfcWJXBMbZhhQIMSsh8ZQy1gAK9QOIckQQUQvkV1e0mLj9v +Bw== X-Google-Smtp-Source: AGHT+IEIWNpX7BkNnC03abdRohAlnutJFu8yGRFQgly4AYVyOvHxYFU33MIdhnsikp/t083j26PrEA== X-Received: by 2002:a05:6602:1541:b0:7eb:4770:6ea2 with SMTP id ca18e2360f4ac-7f3a4dccd1dmr328417739f.5.1719174641613; Sun, 23 Jun 2024 13:30:41 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:41 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Ilias Apalodimas , Allen Martin , Bin Meng , Jaehoon Chung , Marcel Ziswiler , Peter Robinson , Svyatoslav Ryhel Subject: [PATCH 06/14] google: Disable TPMv2 on most Chromebooks Date: Sun, 23 Jun 2024 14:30:25 -0600 Message-Id: <20240623203033.1566505-7-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 feature is not present on older Chromebooks, so disable the setting. Signed-off-by: Simon Glass Reviewed-by: Ilias Apalodimas --- (no changes since v1) configs/chromebook_link64_defconfig | 1 + configs/chromebook_link_defconfig | 1 + configs/chromebook_samus_defconfig | 1 + configs/chromebook_samus_tpl_defconfig | 1 + configs/nyan-big_defconfig | 4 +--- configs/snow_defconfig | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig index 7cf23b29e46..9583f87bf0f 100644 --- a/configs/chromebook_link64_defconfig +++ b/configs/chromebook_link64_defconfig @@ -80,6 +80,7 @@ CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550_PORT_MAPPED=y CONFIG_SPI=y CONFIG_TPM_TIS_LPC=y +# CONFIG_TPM_V2 is not set CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index 1a72fd178a8..e10fabd92d8 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -72,6 +72,7 @@ CONFIG_SYS_NS16550_PORT_MAPPED=y CONFIG_SOUND=y CONFIG_SPI=y CONFIG_TPM_TIS_LPC=y +# CONFIG_TPM_V2 is not set CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_VIDEO_COPY=y diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig index 40cc449b9b3..8cdad8d2344 100644 --- a/configs/chromebook_samus_defconfig +++ b/configs/chromebook_samus_defconfig @@ -74,6 +74,7 @@ CONFIG_SOUND_I8254=y CONFIG_SOUND_RT5677=y CONFIG_SPI=y CONFIG_TPM_TIS_LPC=y +# CONFIG_TPM_V2 is not set CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_VIDEO_COPY=y diff --git a/configs/chromebook_samus_tpl_defconfig b/configs/chromebook_samus_tpl_defconfig index 3e7298f16af..1be57560f89 100644 --- a/configs/chromebook_samus_tpl_defconfig +++ b/configs/chromebook_samus_tpl_defconfig @@ -96,6 +96,7 @@ CONFIG_SOUND_RT5677=y CONFIG_SPI=y CONFIG_TPL_SYSRESET=y CONFIG_TPM_TIS_LPC=y +# CONFIG_TPM_V2 is not set CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index 4dec710cf8d..78fb7580da7 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -11,8 +11,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big" CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_SPL_STACK=0x800ffffc CONFIG_BOOTSTAGE_STASH_ADDR=0x83000000 -CONFIG_DEBUG_UART_BASE=0x70006000 -CONFIG_DEBUG_UART_CLOCK=408000000 CONFIG_TEGRA124=y CONFIG_TARGET_NYAN_BIG=y CONFIG_TEGRA_GPU=y @@ -75,7 +73,6 @@ CONFIG_DM_REGULATOR=y CONFIG_REGULATOR_AS3722=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_PWM_TEGRA=y -CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_SOUND=y CONFIG_I2S=y @@ -83,6 +80,7 @@ CONFIG_I2S_TEGRA=y CONFIG_SOUND_MAX98090=y CONFIG_TEGRA114_SPI=y CONFIG_TPM_TIS_INFINEON=y +# CONFIG_TPM_V2 is not set CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_TEGRA=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index 3a617c6cf40..2c0757194bd 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -88,6 +88,7 @@ CONFIG_SOUND_MAX98095=y CONFIG_SOUND_WM8994=y CONFIG_EXYNOS_SPI=y CONFIG_TPM_TIS_INFINEON=y +# CONFIG_TPM_V2 is not set CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y From patchwork Sun Jun 23 20:30:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951322 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=OkV1UdIP; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jSF3tgdz1ydW for ; Mon, 24 Jun 2024 06:31:57 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 08B0788572; Sun, 23 Jun 2024 22:30:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="OkV1UdIP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DE5C088405; Sun, 23 Jun 2024 22:30:45 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AFA33883C8 for ; Sun, 23 Jun 2024 22:30:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-7eee5740aceso137746539f.3 for ; Sun, 23 Jun 2024 13:30:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174642; x=1719779442; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vd1lgyE0323kxHzqwAr6nvI90PDCPp9kU72jIBe8uLY=; b=OkV1UdIPVlQwRq3EkCoTIZk3yKMc4/7ESmAa4IXbQj6mggG/tCSyRNyl5TmsmIi9Yu u08CB5dDvrZwZwO51J05OGkAkJu86Ama2A6ZtwuQff9OL0PNWZn0jHJqLPfvqbE9Cc1U scl58DLu0dtKckcBpoAIESiwZYV7tl1cNmPOk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174642; x=1719779442; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vd1lgyE0323kxHzqwAr6nvI90PDCPp9kU72jIBe8uLY=; b=XHzHGLMWkp6l/uiaZ+Bv9rtzjgFyFv63ibjfrlQRtyNwecv2ZIs11jK0zH8T3N2W+p egh43QFklv9qa3EJrjo+lCO4P0bZQNhzFDHTlZqUdYIw5sez17+k+ubhkBd31gOBolTs GvheJcBYL7QGWkBpPJleSuvC5R9TJPSfl4yf5o880VQCZL6NFJI7vyO/Lk82RUW8T/lm X4jfKk5VT6LR6GEpI9oB82Ti3qt3TRGdH+8u8FCylHvAXr7fwVgC38E3Fe9I2Yu46t9i EzfiA58BQ7RSiZ0st9sQJFdQh86s2/H96fBKXK80elVRVTYyhdMfUvV3fr/dZMtTY0Rq 8UZA== X-Gm-Message-State: AOJu0YxZaaXpmren5qxticBfeAcMwxDuwgSo6Mo/HDuuUFyNk3KcyigJ FYRETrcfm9s9i9Jq+CmO9B+TTFQhjyWlGOGgLcMS3LE2EZQjrC8e9JBg6EtfwCFU/RlQSjtvxWV lLg== X-Google-Smtp-Source: AGHT+IE7rOLpp2AelnhD22UJwqptSga16Q1uTfEp2DgRww7QnNCc0zWyQgG5LtQWxXQa5UB80vNG5g== X-Received: by 2002:a05:6602:13d5:b0:7e1:a7e8:eecb with SMTP id ca18e2360f4ac-7f3a74be807mr273672739f.6.1719174642356; Sun, 23 Jun 2024 13:30:42 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:42 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Neil Armstrong , Jerome Brunet , Peter Robinson , u-boot-amlogic@groups.io Subject: [PATCH 07/14] meson: Correct driver declaration for meson_axg_gpio Date: Sun, 23 Jun 2024 14:30:26 -0600 Message-Id: <20240623203033.1566505-8-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 should use the driver macros so that the driver appears in the linker list. Fix this. Fixes: 8587839f19d ("pinctrl: meson: add axg support") Reviewed-by: Neil Armstrong Signed-off-by: Simon Glass --- (no changes since v1) drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-axg.c | 4 ++-- drivers/pinctrl/meson/pinctrl-meson-axg.h | 2 +- drivers/pinctrl/meson/pinctrl-meson-g12a.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c index 52c726cf038..15ebd574ef1 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c +++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c @@ -179,7 +179,7 @@ static const struct dm_gpio_ops meson_axg_gpio_ops = { .direction_output = meson_gpio_direction_output, }; -const struct driver meson_axg_gpio_driver = { +U_BOOT_DRIVER(meson_axg_gpio) = { .name = "meson-axg-gpio", .id = UCLASS_GPIO, .probe = meson_gpio_probe, diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c index 94e09cd3f8a..ed3f92b2d75 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg.c +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c @@ -939,7 +939,7 @@ struct meson_pinctrl_data meson_axg_periphs_pinctrl_data = { .num_groups = ARRAY_SIZE(meson_axg_periphs_groups), .num_funcs = ARRAY_SIZE(meson_axg_periphs_functions), .num_banks = ARRAY_SIZE(meson_axg_periphs_banks), - .gpio_driver = &meson_axg_gpio_driver, + .gpio_driver = DM_DRIVER_REF(meson_axg_gpio), .pmx_data = &meson_axg_periphs_pmx_banks_data, }; @@ -953,7 +953,7 @@ struct meson_pinctrl_data meson_axg_aobus_pinctrl_data = { .num_groups = ARRAY_SIZE(meson_axg_aobus_groups), .num_funcs = ARRAY_SIZE(meson_axg_aobus_functions), .num_banks = ARRAY_SIZE(meson_axg_aobus_banks), - .gpio_driver = &meson_axg_gpio_driver, + .gpio_driver = DM_DRIVER_REF(meson_axg_gpio), .pmx_data = &meson_axg_aobus_pmx_banks_data, }; diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.h b/drivers/pinctrl/meson/pinctrl-meson-axg.h index c8d2b3af036..a6581bab500 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg.h +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.h @@ -61,6 +61,6 @@ struct meson_pmx_axg_data { } extern const struct pinctrl_ops meson_axg_pinctrl_ops; -extern const struct driver meson_axg_gpio_driver; +extern U_BOOT_DRIVER(meson_axg_gpio); #endif /* __PINCTRL_MESON_AXG_H__ */ diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c index 24f47f82558..67114df6824 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c @@ -1253,7 +1253,7 @@ static struct meson_pinctrl_data meson_g12a_periphs_pinctrl_data = { .num_groups = ARRAY_SIZE(meson_g12a_periphs_groups), .num_funcs = ARRAY_SIZE(meson_g12a_periphs_functions), .num_banks = ARRAY_SIZE(meson_g12a_periphs_banks), - .gpio_driver = &meson_axg_gpio_driver, + .gpio_driver = DM_DRIVER_REF(meson_axg_gpio), .pmx_data = &meson_g12a_periphs_pmx_banks_data, }; @@ -1267,7 +1267,7 @@ static struct meson_pinctrl_data meson_g12a_aobus_pinctrl_data = { .num_groups = ARRAY_SIZE(meson_g12a_aobus_groups), .num_funcs = ARRAY_SIZE(meson_g12a_aobus_functions), .num_banks = ARRAY_SIZE(meson_g12a_aobus_banks), - .gpio_driver = &meson_axg_gpio_driver, + .gpio_driver = DM_DRIVER_REF(meson_axg_gpio), .pmx_data = &meson_g12a_aobus_pmx_banks_data, }; From patchwork Sun Jun 23 20:30:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951323 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=citVApA4; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jSR67gsz1ydW for ; Mon, 24 Jun 2024 06:32:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 79F2D882E2; Sun, 23 Jun 2024 22:30:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="citVApA4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7BD9788405; Sun, 23 Jun 2024 22:30: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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5EFC887D07 for ; Sun, 23 Jun 2024 22:30:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2b.google.com with SMTP id ca18e2360f4ac-7eee7728b00so140423039f.3 for ; Sun, 23 Jun 2024 13:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174643; x=1719779443; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZxLbNXGoaXJvLvumbBY4pNS0+jFG7Ox/AWRsfxKB3CY=; b=citVApA4uyr9BJzfo+LXSFsV7jAXyS/qInZWXlKyO2lwqektc+lDPddk92JttCYsyn ZN6kg4Kf/kyO0jJGPzlVPXVsgTo/rd3XtpezXwKQqks1dQSJ1dy97r6wuAv+cuKQcyH1 ChWRSm0RHgLbn965Q+LxjRbMhpAuorHp9B8j0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174643; x=1719779443; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZxLbNXGoaXJvLvumbBY4pNS0+jFG7Ox/AWRsfxKB3CY=; b=KFk0wy0lzmtvfrWLAm29CJhmg3H5sER8U16umZa8EpIcjVqbcnqWMPLutYUH9tbz/x rBhpegcgFm8/TW4sUshOLxs/eGeR3NNKw6QJ9p8uUZi77r6WvfhcXMfM97r5DgTA3yuZ SBFC8Ae3y9hzJNzmZHmUYhf/iAUbIwwtM1jwupGb2dfnH/0muzoAIwPSGGvOj/xI5Ai+ 9kfLvJFm6zO3kU7VFn0SoM0jgcppybKzu729r1J6J+fyL4tYii5md8bJiFK+rCt0hOl7 LdrTqzyjsDYp9wHOPX/ESgw1A4YLXHPxAkxo3QFvNmPYhRrHGfwK3gdmjevTGWg9IxqU H2+A== X-Gm-Message-State: AOJu0YyoJ/dwWjUaFnVy0ZOH4nsbpU0WOtUJgfi3y/X8kwJtgyvB2Alo UIdtIVjnv5tYnpgQGF5empLXkMbHtCKO+1VlK2OoOCWYxNRQw/Y10r8ySwdnOTeexD3f3JBL75M 3/g== X-Google-Smtp-Source: AGHT+IHL4xGuod3l4fzZPsLC5KclCniWjLABnGGTq6pU4pLdvQ6qnipSbzWf4Ss9vVmvJDpm18P36A== X-Received: by 2002:a05:6602:6b86:b0:7e1:e022:9e46 with SMTP id ca18e2360f4ac-7f3a75faec7mr308227939f.21.1719174643058; Sun, 23 Jun 2024 13:30:43 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:42 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Alexander Gendin , Francis Laniel Subject: [PATCH 08/14] test: Make bootstd init run only on sandbox Date: Sun, 23 Jun 2024 14:30:27 -0600 Message-Id: <20240623203033.1566505-9-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 Tests for standard boot need disks to be set up, which can only be done on sandbox, since adjusting disks on real hardware is not currently supported. Mark the init function as sandbox-only. Signed-off-by: Simon Glass --- (no changes since v1) test/py/tests/test_ut.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py index c169c835e38..58205066ec8 100644 --- a/test/py/tests/test_ut.py +++ b/test/py/tests/test_ut.py @@ -470,6 +470,7 @@ def test_ut_dm_init(u_boot_console): fh.write(data) @pytest.mark.buildconfigspec('cmd_bootflow') +@pytest.mark.buildconfigspec('sandbox') def test_ut_dm_init_bootstd(u_boot_console): """Initialise data for bootflow tests""" From patchwork Sun Jun 23 20:30:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951324 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=h40tm5cX; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jSd6Wxnz1ydW for ; Mon, 24 Jun 2024 06:32:17 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D43DC88477; Sun, 23 Jun 2024 22:30:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="h40tm5cX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 36E8B8855C; Sun, 23 Jun 2024 22:30:48 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0DF0E88528 for ; Sun, 23 Jun 2024 22:30:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-7eb7a2f062cso143199939f.0 for ; Sun, 23 Jun 2024 13:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174644; x=1719779444; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wB8IlpEyasJ77UcuVJ/mSH9PPTejySs9mrOW63czuxA=; b=h40tm5cX9OsVac2lQWp8UzUD9dNk6N7zX8865XguLPr9h7AtgBCdewPyb2s7XkuEVv 5soyfcA+s7hjX6PpwKHRONLWSNqwPbPHDXLsMmJhDSVxvuHlboq6jKTFtuVahX62tDrL Q/RPHb0s/7Ivri7Fh5gzMg1AmY39X08DYpKFw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174644; x=1719779444; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wB8IlpEyasJ77UcuVJ/mSH9PPTejySs9mrOW63czuxA=; b=ESjy4a+Hhx1Cf3AcLcv7YQYlgy6vxSwWR2NA4B4lm5PFRCYChBCi+2JplirTRwSeH8 MKRTFBTdlC6sqGPgLC5CtA77FI/mAmtt0zPEu3xpAIDJw2PqvqhUa6ctADUnI2ldXGs3 I5W6IqhihjNszxlMRlhwwD1d4I1PEnzd6H8q+Z7XAMEKH+Y6Vj+zpwP1xAxv06dCaEy4 T8ChGi/vKwWHFMyNWt37fbigeyYF2JjgkI7Ms9qrze9C31Rvp7jId51LxOeZiSCxwjZH kN4jgS40OzVyRo/txzTSRFZOd1U7Enweg9pgJGoHXuiOjNCWBsji/BgRQMikQFjGLPuh 2nug== X-Gm-Message-State: AOJu0YxXDRWnqIWu4HQMouu+qpJw9SwiltPWO5uEMFwXm+sYuq6T9eSr oYYA2umiZXSMKloPyjH5+8Ee4qxqfz24KaH2WPt2xXWMe4VYNGcy+o1PhOYk+qziDRmqfncI63S jug== X-Google-Smtp-Source: AGHT+IHhvHQzdIo1kieH3RigX5pbhiY2n9vLfJXDzuKII7FAnnxh0UUsWACarAa8Aqca+uErDl7LGQ== X-Received: by 2002:a05:6602:6d8e:b0:7ea:da27:e59e with SMTP id ca18e2360f4ac-7f3a7554742mr294903539f.12.1719174643690; Sun, 23 Jun 2024 13:30:43 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:43 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 09/14] log: Allow tests to pass with CONFIG_LOGF_FUNC_PAD set Date: Sun, 23 Jun 2024 14:30:28 -0600 Message-Id: <20240623203033.1566505-10-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 setting pads out the function names. Adjust the test to handle this, since some boards use it. Signed-off-by: Simon Glass --- (no changes since v1) test/py/tests/test_log.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/py/tests/test_log.py b/test/py/tests/test_log.py index 140dcb9aa2b..79808674bbe 100644 --- a/test/py/tests/test_log.py +++ b/test/py/tests/test_log.py @@ -27,13 +27,16 @@ def test_log_format(u_boot_console): cons = u_boot_console with cons.log.section('format'): - run_with_format('all', 'NOTICE.arch,file.c:123-func() msg') + pad = int(u_boot_console.config.buildconfig.get('config_logf_func_pad')) + padding = ' ' * (pad - len('func')) + + run_with_format('all', f'NOTICE.arch,file.c:123-{padding}func() msg') output = cons.run_command('log format') assert output == 'Log format: clFLfm' - run_with_format('fm', 'func() msg') - run_with_format('clfm', 'NOTICE.arch,func() msg') - run_with_format('FLfm', 'file.c:123-func() msg') + run_with_format('fm', f'{padding}func() msg') + run_with_format('clfm', f'NOTICE.arch,{padding}func() msg') + run_with_format('FLfm', f'file.c:123-{padding}func() msg') run_with_format('lm', 'NOTICE. msg') run_with_format('m', 'msg') From patchwork Sun Jun 23 20:30:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951325 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=WVw7BN6v; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jSq1pdyz1ydW for ; Mon, 24 Jun 2024 06:32:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3C4B688548; Sun, 23 Jun 2024 22:30:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="WVw7BN6v"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4446788477; Sun, 23 Jun 2024 22:30: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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9E8E1882EF for ; Sun, 23 Jun 2024 22:30:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-7ebe019b9cdso138613339f.0 for ; Sun, 23 Jun 2024 13:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174644; x=1719779444; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4tbJLNnm3Z118ihDJe+gI1HEGhxpJQOMu7FJdqi+hsQ=; b=WVw7BN6vpnsI3Xl27/948lmO2MsQNdohf6xvxrEzDI7eZTzPYkYbptsSyxNU85vY9y XVJ+D4XQx8Qq0Iq1WkHzkm1qaDo+EQplXR7OKsMZq7DVPMfvpbqn0Aaytvz46TayJQZ6 He2NPvQ6ewR9w3SF3e7uWuPiYouhW7osZz+04= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174644; x=1719779444; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4tbJLNnm3Z118ihDJe+gI1HEGhxpJQOMu7FJdqi+hsQ=; b=Ts2f3mpDK4j/ZWVIiWEuBcESFeHXErlmNxVPGsideEA+Ko24r6ZYaHISRC1wYLZxA/ 4XwIbjaGLGiWjf1PSV5kvMWa7Q2daA7+yrU8uz9vwAyuOKTATHcWmmNtzS0MYmoB5RTJ 8+MUN/MxMsgonp7rp6R3GV+O9xKPbGTSXbR37Ymly2ijwzT8iAcWLYsIUO0Djd+/dHVL EFJhqgETQqpWfLFJPa1GuiqYo/8jqakh3e6aFIo8jhu3BXbG3Dd8BZjx3wg0wjPmmL/d wZqxdRkabtyPhnf3okSeAcp3P15l0LvzoxwpRvZTaPByk7owg+enKsMeitBAV3TKkBZI EIsQ== X-Gm-Message-State: AOJu0YzBce8Tn0hYPEFeKyPt+GfqJaiqVEZ1Z206NzIUozuP28On5tia 80xMOLwsXtt/rCtbF1e3fVTb9ttXVfoa9zcMZ7Ew459Vvi1gmV3JqvUiuboBTB6iw4W3sXfeyx9 1sg== X-Google-Smtp-Source: AGHT+IGyTshpPS2u2DY/rJEwD7qWMgd2Yal2t7KcgleqNpIA5W0AoXAreVAINnWX+FMgGWMrKOwgOQ== X-Received: by 2002:a05:6602:14c2:b0:7eb:6cbc:8856 with SMTP id ca18e2360f4ac-7f3a7480881mr354060039f.2.1719174644292; Sun, 23 Jun 2024 13:30:44 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:44 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Marek Vasut , Pavel Herrmann Subject: [PATCH 10/14] test: dm: Show failing driver name Date: Sun, 23 Jun 2024 14:30:29 -0600 Message-Id: <20240623203033.1566505-11-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 When a driver is not registered properly it is not clear which one it is. Adjust test_dm_compat() to show this. Signed-off-by: Simon Glass --- (no changes since v1) test/py/tests/test_dm.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/py/tests/test_dm.py b/test/py/tests/test_dm.py index 68d4ea12235..be94971e455 100644 --- a/test/py/tests/test_dm.py +++ b/test/py/tests/test_dm.py @@ -13,8 +13,11 @@ def test_dm_compat(u_boot_console): for line in response[:-1].split('\n')[2:]) response = u_boot_console.run_command('dm compat') + bad_drivers = set() for driver in drivers: - assert driver in response + if not driver in response: + bad_drivers.add(driver) + assert not bad_drivers # check sorting - output looks something like this: # testacpi 0 [ ] testacpi_drv |-- acpi-test From patchwork Sun Jun 23 20:30:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951326 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=BdJg5Px/; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jT11npwz1ydW for ; Mon, 24 Jun 2024 06:32:37 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9BB5D88577; Sun, 23 Jun 2024 22:30:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="BdJg5Px/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AB462883C8; Sun, 23 Jun 2024 22:30: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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7BF6C884B2 for ; Sun, 23 Jun 2024 22:30:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2f.google.com with SMTP id ca18e2360f4ac-7ea0b5e0977so152989239f.2 for ; Sun, 23 Jun 2024 13:30:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174645; x=1719779445; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rDqR2ev7V1mshcmHUcnU4wdYWDp399Tm/OL8d9oKlac=; b=BdJg5Px/sxGYYlEjrhQKqL10D2QAA6BBigZULhZb99tOaTpn3uFtqmyoEWTmXDZAYz PyHIqHModIT1kJpYwUhcund+wXsgD9wsl9XvEnSQDKGRjDJQn9dJTLfozcqErkCWuW8t /cqdzLfZdof+Q2ZMKLJuPkX6fUIerO7cG792I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174645; x=1719779445; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rDqR2ev7V1mshcmHUcnU4wdYWDp399Tm/OL8d9oKlac=; b=LaiTTD7UdFQwgUovrJ92OVvGVlAvi6u7VeAHT+uXQ1TwgskOcmTvQPuq/9wXem6vo4 qS+eFlF2vzDObi0hOjUlWxVTWuYnlFTWzn0BE1zlYD7PBBPrrvuXTyvQyOSy8/Fmc6tR WXC3PVhrUNxFyq4iBPu9TAbTdnNo7OSjdK7HgRx53wATsZeVq0LxMbcbyFPTkseh6z1F rBjQdh7TVOGBiJoTvYnD9WVqk+EreIZ+MpaLpHE9j3U6muqdNWHwGDunS3XjNh6/kMDK F3PZTQQIx/YcyxH3G/oLw2pOEK1NPnwpSwEBrxcSwLYgsARWHTO+MzxRq5k4Jz0mjTCA ep3w== X-Gm-Message-State: AOJu0Yx33wNUmnEB85SuJZooRtpfYEVdcYY8cOhmoPwuz6YguBxmya3W 098gxwGCi/JmZsK855kI90bpGzUhtvWO7Yo4fByQK3Zy1k2A8nfI0H1wI6A6lzdIXTRf23R44sh DMw== X-Google-Smtp-Source: AGHT+IFF7uUarULV/hc4mtMXDTxptvZ6oZ0q0EkkSp7LCBf4V2uwjQ0zqtxm+eB7bpFb55UBcqlIJQ== X-Received: by 2002:a05:6602:60c1:b0:7eb:8015:3ec6 with SMTP id ca18e2360f4ac-7f3a7481166mr323981039f.4.1719174645030; Sun, 23 Jun 2024 13:30:45 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:44 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 11/14] test: Decode exceptions only with sandbox Date: Sun, 23 Jun 2024 14:30:30 -0600 Message-Id: <20240623203033.1566505-12-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 When a real board fails we don't want to decode the exception. Reserve that behaviour for sandbox. Also avoid raising a new exception on failure - just re-raise the existing one. Signed-off-by: Simon Glass --- (no changes since v1) test/py/u_boot_console_sandbox.py | 2 +- test/py/u_boot_spawn.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/py/u_boot_console_sandbox.py b/test/py/u_boot_console_sandbox.py index 27c6db8d719..7bc44c78b8b 100644 --- a/test/py/u_boot_console_sandbox.py +++ b/test/py/u_boot_console_sandbox.py @@ -58,7 +58,7 @@ class ConsoleSandbox(ConsoleBase): if self.use_dtb: cmd += ['-d', self.config.dtb] cmd += self.sandbox_flags - return Spawn(cmd, cwd=self.config.source_dir) + return Spawn(cmd, cwd=self.config.source_dir, decode_signal=True) def restart_uboot_with_flags(self, flags, expect_reset=False, use_dtb=True): """Run U-Boot with the given command-line flags diff --git a/test/py/u_boot_spawn.py b/test/py/u_boot_spawn.py index 7c48d96210e..97e95e07c80 100644 --- a/test/py/u_boot_spawn.py +++ b/test/py/u_boot_spawn.py @@ -24,18 +24,20 @@ class Spawn: output: accumulated output from expect() """ - def __init__(self, args, cwd=None): + def __init__(self, args, cwd=None, decode_signal=False): """Spawn (fork/exec) the sub-process. Args: args: array of processs arguments. argv[0] is the command to execute. cwd: the directory to run the process in, or None for no change. + decode_signal (bool): True to indicate the exception number when + something goes wrong Returns: Nothing. """ - + self.decode_signal = decode_signal self.waited = False self.exit_code = 0 self.exit_info = '' @@ -197,12 +199,12 @@ class Spawn: # With sandbox, try to detect when U-Boot exits when it # shouldn't and explain why. This is much more friendly than # just dying with an I/O error - if err.errno == 5: # Input/output error + if self.decode_signal and err.errno == 5: # I/O error alive, _, info = self.checkalive() if alive: raise err raise ValueError('U-Boot exited with %s' % info) - raise err + raise if self.logfile_read: self.logfile_read.write(c) self.buf += c From patchwork Sun Jun 23 20:30:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951327 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=mIoseX50; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jTC4M4qz1ydW for ; Mon, 24 Jun 2024 06:32:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0432B8857E; Sun, 23 Jun 2024 22:30:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="mIoseX50"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1CFF487572; Sun, 23 Jun 2024 22:30:50 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 34677884D4 for ; Sun, 23 Jun 2024 22:30:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2c.google.com with SMTP id ca18e2360f4ac-7ec00e71a57so141390239f.3 for ; Sun, 23 Jun 2024 13:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174646; x=1719779446; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hjl01oo/zYgNsESARtjMuhhXIjsgTRhjuyoEbdCHLeY=; b=mIoseX50vyCC3kCTlH4kXHFQN8DqjddLwagLq5dDd1ilT5QHCK+w3mLaC/zheyC7Z2 jPi3p5PlKJosnmJphy1+k1akA0a/oM3rM/T5aK4IyZHv+GCavV0Fnz797pVk51kf41/8 sZnY6LgdMcvRzkTHv/ZHu1+Cw0+v7569S0q08= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174646; x=1719779446; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hjl01oo/zYgNsESARtjMuhhXIjsgTRhjuyoEbdCHLeY=; b=OiCjqnHvErRMyKc0YzJcnvmFzBRWMPW5hVuVU5lY5rEp1LOWhdIoX3zjhfML2t89OX 5clytG0+WOYWy+XVbMpLeqp8p2harKxL7yUuv0mzWNIfOWPw9FzLzHeJH4IxpKVXdnzd M2nyA3Cb7Gmizp2odJYQv7/pLjeKmcR8sbpLxtr2ajYb8bUmM4WcnEzmBKVwBHTizdmW 7YYa5W+tiwYSQ+kMpp43O6UCYxMKud6ui1eeU3od0WXXgrtQFuto1i0ou3FBKsJekYat aPBdZDStt5zjiyTamFHZ61/yPN9GC+rtNfCHCm266LOBh5hAYQ7kmrCxjEOsp7OrXJIx WbCg== X-Gm-Message-State: AOJu0Yyqddn6Bmj8nv97aiV9oTzR3xKyhEVI3uecI/yWbmUGnlEBC8yE RCdDyJOUauIQy+KvhhPdi/ld/x8IJ2OOS0lmrkaf6aA/RIENXyeXLBkQHXg/8yh3vC/4QIqnQOV J7w== X-Google-Smtp-Source: AGHT+IHSFaiPKG2dYwRA2W5PDJxkeqmImzjZJ/O+CdSjeDrN6Ezjjh+KAHGadY+lzyGNAS4Sg7UbUQ== X-Received: by 2002:a05:6602:1655:b0:7eb:f3c8:c59b with SMTP id ca18e2360f4ac-7f3a7592b5amr481180539f.2.1719174645869; Sun, 23 Jun 2024 13:30:45 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:45 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 12/14] test: Check help output Date: Sun, 23 Jun 2024 14:30:31 -0600 Message-Id: <20240623203033.1566505-13-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 current test doesn't check anything about the output. If a bug results in junk before the output, this is not currently detected. Add a check for the first line being the one expected. Signed-off-by: Simon Glass --- (no changes since v1) test/py/tests/test_help.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/py/tests/test_help.py b/test/py/tests/test_help.py index 153133cf28f..2325ff69229 100644 --- a/test/py/tests/test_help.py +++ b/test/py/tests/test_help.py @@ -7,7 +7,11 @@ import pytest def test_help(u_boot_console): """Test that the "help" command can be executed.""" - u_boot_console.run_command('help') + lines = u_boot_console.run_command('help') + if u_boot_console.config.buildconfig.get('config_cmd_2048', 'n') == 'y': + assert lines.splitlines()[0] == "2048 - The 2048 game" + else: + assert lines.splitlines()[0] == "? - alias for 'help'" @pytest.mark.boardspec('sandbox') def test_help_no_devicetree(u_boot_console): From patchwork Sun Jun 23 20:30:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951328 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ko4ZJN40; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jTP4wJ7z1ydW for ; Mon, 24 Jun 2024 06:32:57 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 62D1588585; Sun, 23 Jun 2024 22:30:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ko4ZJN40"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2998187D10; Sun, 23 Jun 2024 22:30:50 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D26BC882E2 for ; Sun, 23 Jun 2024 22:30:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-7eeea388a8eso146538139f.2 for ; Sun, 23 Jun 2024 13:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174646; x=1719779446; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aKYwqY+IHEHV9jkrjdhvX/VMk/xHorMv05GeBADBFuk=; b=ko4ZJN40Mp5Iwuj1trIRRsnARLlxRCM3IJU3NBPALyQD1KiPfyAnyrj6EDdfQJjkwe K/owbsdtyxX4CfFJXqCBf7h56jOrncFu4CmPNG9R/Uito1y0LlsSPH/PtZkYJspYbM14 4M2sfo4irA2Ef6oTLyKW1lDX3DpuQnmZu6mYg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174646; x=1719779446; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aKYwqY+IHEHV9jkrjdhvX/VMk/xHorMv05GeBADBFuk=; b=iv3G+g4BWIYBQMzK4XFCuAkuUQZBK4LAsNg5CCoPfH0mD72JcaLqdnJiGvsQkOLarU btAtLq2FiGzcfOLS90eKbHcakA6WRO23GlaJDqUeElB36UlXPgeFiL6YO8lB9nyGHvJq 8u0hvVvEubqgz2Vm6s/6wAq9x02gNMmX0hnrzgYJGTZJC2XDpUnU/mK5MhK3Tk8j1lxl S6NY+HacvOypQGx6XN6aqFx3a6E1+uk36rqXZOLGPhiODhiBpBYhnnS5nS42wcQXEVfU XB2Z0mskpvgMKXzVJIEIe5fZ3j7vy+odPpt6jJAMzU9NgZ66CNR+IdJfskoduyyB1WZY Xg7w== X-Gm-Message-State: AOJu0YxnY/TvYa30DdX1yeRUePzhp3iQNaRAUwYnpUY+RG9Q8d8NFNfV 43UktriHAAdELQeMjKXiZ8GmQYUfMg7vGi00w8ASbqaUlntXE4qW20Pr4WXuCNu7MQ1A3ec3ww4 jEQ== X-Google-Smtp-Source: AGHT+IFmsqnOC1l9fB2kPG/9PcbB9g5Phr21vHOPhyUCufGg7CbhM9KpEFJRpTCzLUvlJs8NQN/XMg== X-Received: by 2002:a05:6602:1481:b0:7f3:a80e:8cf5 with SMTP id ca18e2360f4ac-7f3a80e8d73mr293847639f.1.1719174646561; Sun, 23 Jun 2024 13:30:46 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:46 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 13/14] Update u-boot.cfg to include CFG also Date: Sun, 23 Jun 2024 14:30:32 -0600 Message-Id: <20240623203033.1566505-14-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 Some configuration is now in variables with a CFG_ prefix. Add these to the .cfg file so that we can see everything in one place. Sort the options so they are easier to find and compare. Signed-off-by: Simon Glass --- Changes in v2: - Add new patch to update u-boot.cfg with CFG_... options scripts/Makefile.autoconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index b42f9b525fe..65ff11ea508 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -71,7 +71,7 @@ quiet_cmd_autoconf = GEN $@ quiet_cmd_u_boot_cfg = CFG $@ cmd_u_boot_cfg = \ $(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM include/config.h > $@.tmp && { \ - grep 'define CONFIG_' $@.tmp | \ + egrep 'define (CONFIG_|CFG_)' $@.tmp | sort | \ sed '/define CONFIG_IS_ENABLED(/d;/define CONFIG_IF_ENABLED_INT(/d;/define CONFIG_VAL(/d;' > $@; \ rm $@.tmp; \ } || { \ From patchwork Sun Jun 23 20:30:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1951329 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=KePWrxQk; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W6jTb4Cjwz1ydW for ; Mon, 24 Jun 2024 06:33:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C317888591; Sun, 23 Jun 2024 22:30:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="KePWrxQk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 91FBB87D07; Sun, 23 Jun 2024 22:30:51 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9F26088569 for ; Sun, 23 Jun 2024 22:30:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd44.google.com with SMTP id ca18e2360f4ac-7eb75c0d0a7so127998539f.3 for ; Sun, 23 Jun 2024 13:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1719174647; x=1719779447; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B+ashUbIN25qKsnBwZRuLHdB7K6Nj39S33p92ZbbXXA=; b=KePWrxQkHN0n0G7OEaaHX4L1Xjq01phWmZUcCtARlmTCkvXiSL1dK4nmjnq69Y4hqU f23o0ynkAVcx9EC139MkZCJIHclbpV+Rw/8vZKZiGg0r4TYwcLSOWx69YX1yyeIwu1DO HtOQgFTr/gBLOTgs5JdMFV3vqKkOBh+7LhZA8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719174647; x=1719779447; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B+ashUbIN25qKsnBwZRuLHdB7K6Nj39S33p92ZbbXXA=; b=dzFGpzLS5g76yEf/sP3+S4W2XL0YGXOV3c42YuPlV3wFxjl6+ttMAOBsOjk9qedjV3 XYRjTRvVn925afyUsxbVSYyrbWYfktDHe5obSdTi1+9BT3euitIuhiARSjN1Jn5lEh2n TGfWRNwYdCGZxkZ5B0fMKC/ODB56GGU7RrkobqXvaNJtilNMia3gdXzmt+9cqMBe11bh xQ4MFZqhctOG3yE8aWKXo1Yu+SyE4TNxICgvaAvnb/W3lP6uifMgJvJc0Uy9Or0DXrEQ NmSpRANZjcouWpg/fxLPuaNoEAPTJWIIRRaP2n//LCAopMOiTGVzM+XrrPbJcs2oQUh8 lGeg== X-Gm-Message-State: AOJu0YyENFSj5B+ijIzTQv+dZFG69Uk0O8yn+H1DoixADertQ6Cr7S35 tAKhS64/TQh/hKMR3Grt6DoR6GJVtvJQTeHJX6lT0OJJ4zT+LALjvcNFFhLL1iAVxXrdRbcBT3X s2VLj X-Google-Smtp-Source: AGHT+IFxLuM2hvruVivlmICnMePxFQWXEQouYMwYrfPUwBB18VjJrizaWprQ7OpeLm499TP0zzSS2Q== X-Received: by 2002:a05:6602:2ccc:b0:7eb:7351:8beb with SMTP id ca18e2360f4ac-7f3a4d5d227mr339301339f.0.1719174647272; Sun, 23 Jun 2024 13:30:47 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b9d110ffb6sm1627335173.58.2024.06.23.13.30.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 13:30:47 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas , Michal Simek , Peter Robinson Subject: [PATCH 14/14] smbios: Correct error handling when writing tables Date: Sun, 23 Jun 2024 14:30:33 -0600 Message-Id: <20240623203033.1566505-15-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240623203033.1566505-1-sjg@chromium.org> References: <20240623203033.1566505-1-sjg@chromium.org> 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 Since write_smbios_table() returns an address, we cannot use it to return and error number. Also, failing on sysinfo_detect() breaks existing boards, e.g. chromebook_link Correct this by logging and swallowing the error. Signed-off-by: Simon Glass Fixes: a5a57562856 ("lib: smbios: Detect system properties via...") --- (no changes since v1) lib/smbios.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/smbios.c b/lib/smbios.c index fb6eaf1d5ca..4126466e34a 100644 --- a/lib/smbios.c +++ b/lib/smbios.c @@ -5,6 +5,8 @@ * Adapted from coreboot src/arch/x86/smbios.c */ +#define LOG_CATEGORY LOGC_BOARD + #include #include #include @@ -596,8 +598,12 @@ ulong write_smbios_table(ulong addr) parent_node = dev_read_subnode(ctx.dev, "smbios"); ret = sysinfo_detect(ctx.dev); - if (ret) - return ret; + + /* + * ignore the error since many boards don't implement + * this and we can still use the info in the devicetree + */ + ret = log_msg_ret("sys", ret); } } else { ctx.dev = NULL;