Message ID | 20230402094532.v6.2.I10d83b8073de5058efabbf2ba2498fe008624293@changeid |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) 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=Fd24Vd7r; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PprNg6hySz1yYT for <incoming@patchwork.ozlabs.org>; Sun, 2 Apr 2023 07:47:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C49F585EFE; Sat, 1 Apr 2023 23:46: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=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="Fd24Vd7r"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3055E85EFC; Sat, 1 Apr 2023 23:46: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.1 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-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) (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 C2C3A85EFE for <u-boot@lists.denx.de>; Sat, 1 Apr 2023 23:45: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-pj1-x1031.google.com with SMTP id d13so23995612pjh.0 for <u-boot@lists.denx.de>; Sat, 01 Apr 2023 14:45:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1680385558; 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=Ni71BTgKoDuhyrTNpBJCYaDXlJcZ0gQ3cf090iW3zWA=; b=Fd24Vd7rthzr3eJXgDzYCVpj8Dt4uxMSm9BejM04FzgCinTmqF3Lw4ybc+UGubYAHm GXqErHPDeJC9ZEjeLm3LjYNEc3dclxizF9J//qX29hn4AB1hgp6Bdt/PSWADhehMKUUF 0sInBbhf4P2aLupaBIdxP+6D6z4/Oju4SzQaM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680385558; 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=Ni71BTgKoDuhyrTNpBJCYaDXlJcZ0gQ3cf090iW3zWA=; b=UkRk+kJIGvwPI2dxlu/XvZ6NJilpRbQPd5sdNijSeHeLOPRf+1TWGcUzyJF3DbWHTt nIZJaX3rnL42M0RQfMG6oQJX+rTEWo4WjsYP+kKGPkNYZjwE2wR23EtHxEjjnsGRw4fM q5I5DTzk+kGqZh9OixqVvnzVWJiavNy8fzNm9DCCZzTR9dxx4JV5UAkLPpYbGQxnZlKF fiKTNDX/3/qhGggqf5ojaXTJvxMSFG0J3pYJU71PhxMTlmJYeQpcULMbsQO6XT4E+blf 0OkBYhBpp72QT5H0Po3eO+/U7a0HKtzsfpSiEI1DdItWvtsIQClp4cB74LnY4BK912fa nP5Q== X-Gm-Message-State: AAQBX9eojSodV3j4i9/2cMAtuBRp9gPTsK6X/MaixH5ZmpqkJ9rsgr8x Kn066uLAdODSOeIaXpjtodGNfllTCrA22/9637s= X-Google-Smtp-Source: AKy350Y6+c1VkVDOvef2ozZ8Sr0AJfmtUcn9cE6MhAvV0zow12DMVBB1jHJk2D4DgTR7/5cWLs3zEA== X-Received: by 2002:a17:902:ecc2:b0:1a1:cc60:73ec with SMTP id a2-20020a170902ecc200b001a1cc6073ecmr38763746plh.38.1680385558023; Sat, 01 Apr 2023 14:45:58 -0700 (PDT) Received: from localhost.localdomain ([27.110.126.54]) by smtp.gmail.com with ESMTPSA id jl16-20020a170903135000b0019f3aec83d5sm3227235plb.296.2023.04.01.14.45.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Apr 2023 14:45:57 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, huang lin <hl@rock-chips.com>, Jeffy Chen <jeffy.chen@rock-chips.com>, Simon Glass <sjg@chromium.org>, Kever Yang <kever.yang@rock-chips.com>, Philipp Tomsich <philipp.tomsich@theobroma-systems.com>, Vagrant Cascadian <vagrant@debian.org> Subject: [PATCH v6 02/11] virtio: Ensure PCI is set up first Date: Sun, 2 Apr 2023 09:45:26 +1200 Message-Id: <20230402094532.v6.2.I10d83b8073de5058efabbf2ba2498fe008624293@changeid> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog In-Reply-To: <20230402094532.v6.1.Id5a4b4ee7b653591dfb25e75204c17215521164b@changeid> References: <20230402094532.v6.1.Id5a4b4ee7b653591dfb25e75204c17215521164b@changeid> 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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean |
Series |
[v6,01/11] bootstd: Tweak bootflow logic for device tree
|
expand
|
diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c index de9bc90359ca..918cc15b019f 100644 --- a/drivers/virtio/virtio-uclass.c +++ b/drivers/virtio/virtio-uclass.c @@ -373,6 +373,12 @@ static int virtio_bootdev_hunt(struct bootdev_hunter *info, bool show) { int ret; + if (IS_ENABLED(CONFIG_PCI)) { + ret = uclass_probe_all(UCLASS_PCI); + if (ret && ret != -ENOENT) + return log_msg_ret("pci", ret); + } + ret = uclass_probe_all(UCLASS_VIRTIO); if (ret && ret != -ENOENT) return log_msg_ret("vir", ret);
Sometimes virtio may rely on PCI, or at least that is what the distro_bootcmd script suggests. Add this in. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v5) Changes in v5: Add new patch to ensure PCI is set up first drivers/virtio/virtio-uclass.c | 6 ++++++ 1 file changed, 6 insertions(+)