From patchwork Wed Oct  2 19:57:39 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Patrick Wildt <patrick@blueri.se>
X-Patchwork-Id: 1170899
Return-Path: <u-boot-bounces@lists.denx.de>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org;
	spf=none (mailfrom) smtp.mailfrom=lists.denx.de
	(client-ip=81.169.180.215; helo=lists.denx.de;
	envelope-from=u-boot-bounces@lists.denx.de;
	receiver=<UNKNOWN>)
Authentication-Results: ozlabs.org;
	dmarc=none (p=none dis=none) header.from=blueri.se
Received: from lists.denx.de (dione.denx.de [81.169.180.215])
	by ozlabs.org (Postfix) with ESMTP id 46k6PZ0Xzpz9sN1
	for <incoming@patchwork.ozlabs.org>;
	Thu,  3 Oct 2019 05:57:54 +1000 (AEST)
Received: by lists.denx.de (Postfix, from userid 105)
	id C0A5CC21E74; Wed,  2 Oct 2019 19:57:44 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de
X-Spam-Level: 
X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable
	autolearn_force=no version=3.4.0
Received: from lists.denx.de (localhost [IPv6:::1])
	by lists.denx.de (Postfix) with ESMTP id 86E67C21D56;
	Wed,  2 Oct 2019 19:57:42 +0000 (UTC)
Received: by lists.denx.de (Postfix, from userid 105)
	id 9EE3AC21D56; Wed,  2 Oct 2019 19:57:41 +0000 (UTC)
Received: from pwildt.genua.de (pwildt.genua.de [80.154.94.49])
	by lists.denx.de (Postfix) with ESMTPS id 3ADA1C21C38
	for <u-boot@lists.denx.de>; Wed,  2 Oct 2019 19:57:41 +0000 (UTC)
Received: from nox.fritz.box
	(p200300C1C72B820075BC87459EDC8AC6.dip0.t-ipconnect.de
	[IPv6:2003:c1:c72b:8200:75bc:8745:9edc:8ac6])
	by pwildt.genua.de (OpenSMTPD) with ESMTPSA id c161d419
	(TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO)
	for <u-boot@lists.denx.de>; Wed, 2 Oct 2019 21:57:40 +0200 (CEST)
Date: Wed, 2 Oct 2019 21:57:39 +0200
From: Patrick Wildt <patrick@blueri.se>
To: u-boot@lists.denx.de
Message-ID: <20191002195739.GA43446@nox.fritz.box>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.12.2 (2019-09-21)
Subject: [U-Boot] [PATCH] NVMe: do PCI enumerate before nvme scan
X-BeenThere: u-boot@lists.denx.de
X-Mailman-Version: 2.1.18
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: <http://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>

Make sure that the PCI busses are enumerated before trying to
find a NVMe device.

Signed-off-by: Patrick Wildt <patrick@blueri.se>

diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index 3570a32dff..563f1bf5fa 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -185,6 +185,7 @@
 	"nvme_init=" \
 		"if ${nvme_need_init}; then " \
 			"setenv nvme_need_init false; " \
+			BOOTENV_RUN_PCI_ENUM \
 			"nvme scan; " \
 		"fi\0" \
 	\