[06/33] pci: Drop DM_PCI check from fdtdec

Message ID	20210726133440.634682-7-sjg@chromium.org
State	Superseded
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org> Subject: [PATCH 06/33] pci: Drop DM_PCI check from fdtdec Date: Mon, 26 Jul 2021 07:34:12 -0600 Message-Id: <20210726133440.634682-7-sjg@chromium.org> In-Reply-To: <20210726133440.634682-1-sjg@chromium.org> References: <20210726133440.634682-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	pci: Drop all pre-driver model code \| expand [00/33] pci: Drop all pre-driver model code [01/33] configs: Resync with savedefconfig [02/33] pci: Drop old code from pci command [03/33] ppc: Remove UCP1020 board [04/33] pci: Drop old code from header file [05/33] pci: Remove guard around compatibility functions [06/33] pci: Drop DM_PCI check from fdtdec [07/33] pci: Drop DM_PCI check from pci_common [08/33] ppc: Drop CONFIG_SYS_PCI_SUBSYS_VENDORID [09/33] pci: powerpc: Drop old code [10/33] pci: freescale: Drop old code [11/33] pci: dm: core: Drop DM_PCI check from devfdt_get_addr_pci() [12/33] ppc: Drop DM_PCI from config files [13/33] pci: acpi: Drop DM_PCI check from ahci [14/33] pci: usb: Drop DM_PCI from ohci [15/33] ppc: malta: Drop use of DM_PCI [16/33] ppc: socrates: Drop use of DM_PCI [17/33] pci: gt64120: Drop use of DM_PCI [18/33] pci: msc01: Drop use of DM_PCI [19/33] pci: imx: Drop use of DM_PCI [20/33] pci: scsi: pci: Drop DM_PCI check from scsi [21/33] pci: Drop DM_PCI check from bios_emul [22/33] net: Drop DM_PCI check from designware driver [23/33] pci: imx: Drop DM_PCI check from cpu driver [24/33] pci: arm: mvebu: Drop DM_PCI check from [25/33] pci: sata_sil: Drop DM_PCI checks [26/33] distro_bootcmd: Drop DM_PCI check [27/33] pci: Drop pci_init_board() [28/33] pci: ppc: Drop ftpci100 driver [29/33] ppc: Drop idt8t49n222a_serdes_clk driver [30/33] ppc: Drop t4qds and b4860qds references [31/33] pci: Drop PCI_INDIRECT_BRIDGE [32/33] pci: Drop DM_PCI [33/33] pci: Drop migration method

Message ID

20210726133440.634682-7-sjg@chromium.org

State

Superseded

Delegated to:

Tom Rini

Headers

From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Tom Rini <trini@konsulko.com>,
	Simon Glass <sjg@chromium.org>
Subject: [PATCH 06/33] pci: Drop DM_PCI check from fdtdec
Date: Mon, 26 Jul 2021 07:34:12 -0600
Message-Id: <20210726133440.634682-7-sjg@chromium.org>
In-Reply-To: <20210726133440.634682-1-sjg@chromium.org>
References: <20210726133440.634682-1-sjg@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

pci: Drop all pre-driver model code | expand

Commit Message

Simon Glass July 26, 2021, 1:34 p.m. UTC

We don't need this check anymore since when PCI is enabled, driver model
is always used.

Sadly this doesn't work with nds32 for some reason to do with the
toolchain. Add a work-around for that.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 lib/fdtdec.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 4b097fb588e..d12c6d340a0 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -192,7 +192,6 @@  fdt_addr_t fdtdec_get_addr(const void *blob, int node, const char *prop_name)
 	return fdtdec_get_addr_size(blob, node, prop_name, NULL);
 }
 
-#if CONFIG_IS_ENABLED(PCI) && defined(CONFIG_DM_PCI)
 int fdtdec_get_pci_vendev(const void *blob, int node, u16 *vendor, u16 *device)
 {
 	const char *list, *end;
@@ -240,7 +239,15 @@  int fdtdec_get_pci_bar32(const struct udevice *dev, struct fdt_pci_addr *addr,
 		return -EINVAL;
 
 	barnum = (barnum - PCI_BASE_ADDRESS_0) / 4;
+
+	/*
+	 * There is a strange toolchain bug with nds32 which complains about
+	 * an undefined reference here, even if fdtdec_get_pci_bar32() is never
+	 * called. An #ifdef seems to be the only fix!
+	 */
+#if !IS_ENABLED(CONFIG_NDS32)
 	*bar = dm_pci_read_bar32(dev, barnum);
+#endif
 
 	return 0;
 }
@@ -260,7 +267,6 @@  int fdtdec_get_pci_bus_range(const void *blob, int node,
 
 	return 0;
 }
-#endif
 
 uint64_t fdtdec_get_uint64(const void *blob, int node, const char *prop_name,
 			   uint64_t default_val)

[06/33] pci: Drop DM_PCI check from fdtdec

Commit Message

Patch