From patchwork Wed May 25 13:38:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pierre-Cl=C3=A9ment_Tosi?= X-Patchwork-Id: 1635451 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20210112 header.b=Htu6i0gQ; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L7XGx6SwZz9sG5 for ; Wed, 25 May 2022 23:39:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7CABB842DB; Wed, 25 May 2022 15:39:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="Htu6i0gQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 55A1B842E9; Wed, 25 May 2022 15:39:15 +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=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) (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 7760B83A1E for ; Wed, 25 May 2022 15:39:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=3fzGOYgUKBjYhlgkaYggYdW.Ugem-Tggldaklk.VWfp.VW@flex--ptosi.bounces.google.com Received: by mail-wm1-x34a.google.com with SMTP id n18-20020a05600c3b9200b0039746f3d9faso4350428wms.4 for ; Wed, 25 May 2022 06:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc :content-transfer-encoding; bh=iRcwLS43Y2U9qZVUs+Z1vPrDBj/W2jc3y18PGDhyeu8=; b=Htu6i0gQTvpEhuzU8yszKjnaBN7BpHj+NfAuvmqOyCDAhBJLZKguUJCBAnVPFJ4Dc5 6R4fKzpY5jo8VfrSuWu+zzKmZtX4pGRs6CbNCYQYz86oo6yXdJt3sxlE9fLC0k5K6wls BoiEX2st8AsRChseXX3Y5nzWrD0oqMCzxvmYpR86FK6Q+2anxmn76msulz9b1nHl3Lf3 djat0g1rdP9Ir6NTbb5vKav4Aw2EGprJCKmBEn9I9u052Lu4EIkAFx5rcShtMiptyky9 K0RNI7Hl/n1OMhIVfKt0G51xm9vFB7CpJCZI4IzZOpzkn9LfCme8JtXHpk6GJEYA+QVU nviQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc :content-transfer-encoding; bh=iRcwLS43Y2U9qZVUs+Z1vPrDBj/W2jc3y18PGDhyeu8=; b=1KfGZdaGtT6Pz/DqDW7lVUnes0IMMOD6tlkBA59MapbuEvrRjxDBo8Yv1p/oc+f7H9 ccLOmlXOGbSUqGXaxQpo8fAKZcOy94S6rA3c2VUoJ2Ao+MGpw1UkKWBmLsoRwuK158MG J1t6BvHVrv5ITXhZVppV9cRZ/LzEYvtwzImGYlLtOIrGNe+BPaNMKgzOItx1x9d34RMA dMOHx+rHZDxV2kMMBT3+8Zq0Mkfo4YgHxMktSuWFhwdq2V8O5ljgGw1ZHiRBsG7HdcxT 7d2AgMY/Iuy5KG+wc+6GhXNoY62i0mNFWR8S2QzGHqcdDIldpDEjwKKo9HDvfR+LxvdL RsUg== X-Gm-Message-State: AOAM5323TPp7vtozJ+iJaspZ+in3Jk4Gqpx7AifYDtA0VT4uL6wTVMLM AMqZRnwZAdyatcZcSrXCtrKxhPPuxEfkfY/+1JxlmttFVb2v/slHXVKrjnnkKfa6mjeAslSScqL NW8soQQVW0wsE0pwZbdIsdBxsk6sz/TVR0LMu45yP2nFONcaiMu4VMLGY X-Google-Smtp-Source: ABdhPJyxgMRU41oDKBuRX3/KYO/Zc7kB5eacFyBw/ouGETgGngYw7feg/aklqYiX0QJRl3Ie7Hyu+ctdog== X-Received: from ptosi1.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:afb]) (user=ptosi job=sendgmr) by 2002:a05:600c:3553:b0:397:4d3d:9082 with SMTP id i19-20020a05600c355300b003974d3d9082mr8174610wmq.86.1653485951858; Wed, 25 May 2022 06:39:11 -0700 (PDT) Date: Wed, 25 May 2022 14:38:55 +0100 Message-Id: <20220525133855.3335778-1-ptosi@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog Subject: [PATCH] qfw: Don't fail if setup data size is 0 From: " =?utf-8?q?Pierre-Cl=C3=A9ment_Tosi?= " To: u-boot@lists.denx.de Cc: " =?utf-8?q?Pierre-Cl=C3=A9ment_Tosi?= " , Bin Meng , Simon Glass , Andrew Walbran 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.5 at phobos.denx.de X-Virus-Status: Clean Skip missing setup data (which is valid) rather than failing with an error. Cc: Bin Meng Cc: Simon Glass Reported-by: Andrew Walbran Signed-off-by: Pierre-Clément Tosi --- cmd/qfw.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/qfw.c b/cmd/qfw.c index d58615040c..ccbc967ca9 100644 --- a/cmd/qfw.c +++ b/cmd/qfw.c @@ -25,15 +25,17 @@ static int qemu_fwcfg_cmd_setup_kernel(void *load_addr, void *initrd_addr) qfw_read_entry(qfw_dev, FW_CFG_SETUP_SIZE, 4, &setup_size); qfw_read_entry(qfw_dev, FW_CFG_KERNEL_SIZE, 4, &kernel_size); - if (setup_size == 0 || kernel_size == 0) { + if (kernel_size == 0) { printf("warning: no kernel available\n"); return -1; } data_addr = load_addr; - qfw_read_entry(qfw_dev, FW_CFG_SETUP_DATA, - le32_to_cpu(setup_size), data_addr); - data_addr += le32_to_cpu(setup_size); + if (setup_size != 0) { + qfw_read_entry(qfw_dev, FW_CFG_SETUP_DATA, + le32_to_cpu(setup_size), data_addr); + data_addr += le32_to_cpu(setup_size); + } qfw_read_entry(qfw_dev, FW_CFG_KERNEL_DATA, le32_to_cpu(kernel_size), data_addr);