From patchwork Wed Jun 19 12:34:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1949675 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=cJr3+vwO; 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 4W434C601Sz20Wb for ; Wed, 19 Jun 2024 22:35:23 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 855F4884AA; Wed, 19 Jun 2024 14:35:05 +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="cJr3+vwO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2264B8844B; Wed, 19 Jun 2024 14:35:02 +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.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 C4B4287923 for ; Wed, 19 Jun 2024 14:34:59 +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-xd32.google.com with SMTP id ca18e2360f4ac-7ebdb5d9915so240095939f.1 for ; Wed, 19 Jun 2024 05:34:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1718800498; x=1719405298; 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=X+GDZ8O5ppyOnlEhKFtCD7X+qzrHiUQmZ/BcTHvjrt0=; b=cJr3+vwO3Wq5Gy8GlUKYUq1MP6C0puV0NCE/INcBrBwZVsw8fPzC6/VcPWHZiBlXNn 00A7IsvxZ6XiFtnHddpQbsF28ffGS/esS7sYJXfb9Z+czSr4Ifjqr5qeyQW5VOstewIs 7GQgnk7/wkb5Xvkiya6kI8u6kUeez5+dv/JjQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718800498; x=1719405298; 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=X+GDZ8O5ppyOnlEhKFtCD7X+qzrHiUQmZ/BcTHvjrt0=; b=jiGpXf+/CKg1HdtqVlQiS2u2UKx7EMtc0e/lVCo152d/AdEA6oZx73qP0z9NnNelit cz07tKM/RTmrQBBKtO2jyArjbfLPZLhuCb7tAxq0UGXva2H6uy+jkQ0m/DIM08BfbW7B TZ+jkm86N2x35RbZK0OTBSecPZfbccqokmixF2kEk4d0eWh2JWan7Ti2teigR8xS9vap ZstO0iQsfJJ6sZ8Ak5tgOquTxUm1hXWmZM95Y9TkXRD2BbPKpepiKHvE1tzl4t3e6l3Y APhm0kUMCezVF4S2vvD0xBy1sYWiabAVgG/z4QWXHLa4yr1GcCwMZ9Mm4BUmfZkzXS06 Im/g== X-Gm-Message-State: AOJu0YwFOBHUvxwLTOSwXUlzbi+6sySnXlA7S9dV0nzMwyGxX4NO1fGr jnelRJGeelf7CITeHfWuefEr5bEkz7jra3kGUruSnMXAlsBJa7RzX01fzSWzVrrhaJ8pefInMcW AtQ== X-Google-Smtp-Source: AGHT+IHQGDJYKE2IzZ0D4qlJ1fhJVkcCO0JKV8dbRw+dhUK8CZlu7yvxCiiWSY0pPSAmvUVO+/Yw4g== X-Received: by 2002:a05:6602:3f84:b0:7eb:9697:95c9 with SMTP id ca18e2360f4ac-7f13eba7599mr290078839f.0.1718800498454; Wed, 19 Jun 2024 05:34:58 -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-4b956a20f18sm3701882173.133.2024.06.19.05.34.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 05:34:58 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Paul Menzel , Simon Glass , Bin Meng , Tom Rini Subject: [PATCH 3/3] zboot: Correct use of state_mask argument Date: Wed, 19 Jun 2024 06:34:52 -0600 Message-Id: <20240619123453.720600-3-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240619123453.720600-1-sjg@chromium.org> References: <20240619123453.720600-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 There is confusion in this function between the flag and state_mask parameters, which prevents the boot from actually happening. Correct this by using state_mask instead of flag for deciding which states to go through. This fixes booting of some 32-bit Debian kernels. Note: Some sort of CI for this is in the works. Fixes: 228c6722d44 ("x86: zboot: Avoid iteration in do_zboot_states()") Signed-off-by: Simon Glass --- cmd/x86/zboot.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/x86/zboot.c b/cmd/x86/zboot.c index c14219f19e9..94e602b8a5b 100644 --- a/cmd/x86/zboot.c +++ b/cmd/x86/zboot.c @@ -122,18 +122,18 @@ U_BOOT_SUBCMDS(zboot, int do_zboot_states(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], int state_mask) { - int ret; + int ret = 0; log_debug("state_mask %x\n", state_mask); - if (flag & ZBOOT_STATE_START) + if (state_mask & ZBOOT_STATE_START) ret = do_zboot_start(cmdtp, flag, argc, argv); - if (!ret && (flag & ZBOOT_STATE_LOAD)) + if (!ret && (state_mask & ZBOOT_STATE_LOAD)) ret = do_zboot_load(cmdtp, flag, argc, argv); - if (!ret && (flag & ZBOOT_STATE_SETUP)) + if (!ret && (state_mask & ZBOOT_STATE_SETUP)) ret = do_zboot_setup(cmdtp, flag, argc, argv); - if (!ret && (flag & ZBOOT_STATE_INFO)) + if (!ret && (state_mask & ZBOOT_STATE_INFO)) ret = do_zboot_info(cmdtp, flag, argc, argv); - if (!ret && (flag & ZBOOT_STATE_GO)) + if (!ret && (state_mask & ZBOOT_STATE_GO)) ret = do_zboot_go(cmdtp, flag, argc, argv); if (ret) return ret;