From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B9EECC636CB for ; Sat, 28 Jan 2023 22:02:29 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D40958575D; Sat, 28 Jan 2023 23:01:52 +0100 (CET) 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="lnwIFLue"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D85C9856DD; Sat, 28 Jan 2023 23:01:30 +0100 (CET) Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (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 1B0F485764 for ; Sat, 28 Jan 2023 23:01:23 +0100 (CET) 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-x129.google.com with SMTP id i17so3597685ils.11 for ; Sat, 28 Jan 2023 14:01:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=yeLfd6vvUQoEZqdqYPaI89fySu56O9Bv5VfpjyU9RxE=; b=lnwIFLuemiTPaA0lZGTUKplqoFOPJmupcx8oopT6cXoKsUHGOQI4vP6BFp+DBpXVej fIZ51VBMrsKVwd0GByfumDK6y8PIUPKXO2I1ZF18BuqmQ2p3PLmZRln4AOBrI+1qPZMD 5pBKits7qVAl7bWKkOmPtJhMB1fitS9yzQMuU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=yeLfd6vvUQoEZqdqYPaI89fySu56O9Bv5VfpjyU9RxE=; b=JI8ixDmSMvDabozaZ/kW/7IxB+YWPCntIaVL0rE3exnlJIaLB3EHolPGW5Mtfol639 INrBKdlJHtm309XCj/brqvOIf/lRm7aWNmFxxzlpoer+4MKSqxaNi3JkqxXPZpZS736B dYWOiDs0E40em8EmMknfWasIGAh2lN4DHM5FSTqjXul2sAnV74Wljhq+W3XIxU7nU35M 89nIKOfDaD1fISJXR9oPTBivz1jo9/8X9bPi3MeRxOLRPToA2kgpUTPso2KQej9c8Yj9 33VPWUebssrX0SMhsgSqebENSIaX1pIZ0ggOR3bszDy/JXWMLSKoS2g7jZC4fedU47zL DRkw== X-Gm-Message-State: AFqh2kp/yLZqZxli3dRRKs1rrYM2EplDxK8RlPED4kczAnky0ZM5zt2h /GS0N/gFLMFH0bZg8zdnmFQo0NPGd5qADp9M X-Google-Smtp-Source: AMrXdXti1n+9/zy+BWS+Ut6q5cBLCjGzx4wD4YQKuvUftIgRABwACqq46F6W9IfS3vGDLFFDGpKr7Q== X-Received: by 2002:a92:6a09:0:b0:304:d0b7:e362 with SMTP id f9-20020a926a09000000b00304d0b7e362mr33144286ilc.5.1674943269154; Sat, 28 Jan 2023 14:01:09 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id f15-20020a056e0212af00b0030f1be2e051sm2525521ilr.39.2023.01.28.14.01.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jan 2023 14:01:08 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Albert Aribaud , Ilias Apalodimas , Simon Glass Subject: [PATCH 04/13] bootstd: Probe the block device before use Date: Sat, 28 Jan 2023 15:00:19 -0700 Message-Id: <20230128220028.53575-5-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230128220028.53575-1-sjg@chromium.org> References: <20230128220028.53575-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , 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.6 at phobos.denx.de X-Virus-Status: Clean In some cases the block device is obtained but is not probed, since it is a sibling of the bootdev. Make sure it is probed, so it can be used without any trouble. This fixes a bug with virtio, where the device is accessed before it has been set up by the virtio uclass. Signed-off-by: Simon Glass Fixes: 201417d700a ("bootstd: Add the bootdev uclass") Reported-by: Ilias Apalodimas --- boot/bootdev-uclass.c | 3 +++ boot/bootflow.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c index 99ee08e3353..8103a11d1bb 100644 --- a/boot/bootdev-uclass.c +++ b/boot/bootdev-uclass.c @@ -309,6 +309,9 @@ int bootdev_get_sibling_blk(struct udevice *dev, struct udevice **blkp) if (ret) return log_msg_ret("find", ret); } + ret = device_probe(blk); + if (ret) + return log_msg_ret("act", ret); *blkp = blk; return 0; diff --git a/boot/bootflow.c b/boot/bootflow.c index dc3f1f0c731..b8fa37ee2a0 100644 --- a/boot/bootflow.c +++ b/boot/bootflow.c @@ -270,6 +270,10 @@ static int iter_incr(struct bootflow_iter *iter) if (ret) { bootflow_iter_set_dev(iter, NULL, 0); } else { + /* + * Probe the bootdev. This does not probe any attached + * block device, since they are siblings + */ ret = device_probe(dev); log_debug("probe %s %d\n", dev->name, ret); if (!log_msg_ret("probe", ret)) -- 2.39.1.456.gfc5497dd1b-goog