From patchwork Sun Nov 29 20:17:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 549796 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id CE2E8140297 for ; Mon, 30 Nov 2015 07:19:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=gRFNI6CB; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 694354B7C3; Sun, 29 Nov 2015 21:18:54 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id II_6uDQu2AU6; Sun, 29 Nov 2015 21:18:54 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5DA994B786; Sun, 29 Nov 2015 21:18:38 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 509034B746 for ; Sun, 29 Nov 2015 21:18:29 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sAkzFimcf4I2 for ; Sun, 29 Nov 2015 21:18:29 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ob0-f181.google.com (mail-ob0-f181.google.com [209.85.214.181]) by theia.denx.de (Postfix) with ESMTPS id 06CCB4B774 for ; Sun, 29 Nov 2015 21:18:23 +0100 (CET) Received: by obbww6 with SMTP id ww6so112830467obb.0 for ; Sun, 29 Nov 2015 12:18:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=E6n5cj2nlB9j1p+k/k9D+/s3AFivm6BsdlIbMIcGrIw=; b=gRFNI6CBzIFui1tug4WeOkX0XOI9odhMv1Y+m5hEAh6Wyp42MgHc7tHEz1x5QjMSrE aKcvCH5Ddud5sUiY6GQ2bRCll2MOZEH/fhSKYkKH+Z+EDropRH764D8Iq8Ju3ZCR8LQ+ 8q4+y1+PYKDgvj7b2mfEjOZP9r40uTjvThMnt0PqAiv4UExWPD0IlpTRAgrSoXwp4vuH BXS+L8Q7pBeBGHRII5WgYYLonJmqO2lSzRcyyzv9bupFzDJwTL1LqDMLNN8vJA06kOq3 GocLjd3Q1DHPdhBdRSR7mu1wl/IzKES58ppm/e9p5xplUeZZD+P3YDFGtREi2XpltzvB uDOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=E6n5cj2nlB9j1p+k/k9D+/s3AFivm6BsdlIbMIcGrIw=; b=TFfIKN3NzS1SVBJc+7aQz5ljXfMMPeDlwVwZrHqCr1OQwJ9lzjul3Kk9HhyE976apU eWu7rQwNimh5kd6HENk32KVsD70XutFy1tftJOxowjsEGcCwWxXHWfHDzwDwIn1oZUue Vnw6r2XCS4uUa5ObkoD/5AGZs/IQSa0jY0LMbICbxzTsBQz/ChTL4L3dJIiuSuYpf8i5 GnrXtEiEhdmT4l+K9msRJzGOfdzm5HhtHAbLOBdbRtFu57sz6fwkeOcQGaieKIIiYWNp NjCETgeR14CtzQg33chbUaWHPbjPJCaQm3GjNud6sKEup8mjA+GjbHreFY9cewV+dh/8 qhDg== X-Gm-Message-State: ALoCoQlpTmQNOOkADQeD8T7seD7mnZ4bg3q4g7c4GSL83dVLvfDIJ2QwVJ7+0GXRMQn2V5oO0utR X-Received: by 10.60.39.200 with SMTP id r8mr27692233oek.81.1448828302660; Sun, 29 Nov 2015 12:18:22 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id oj2sm19859517oeb.8.2015.11.29.12.18.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Nov 2015 12:18:21 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 96275220D3A; Sun, 29 Nov 2015 13:18:20 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sun, 29 Nov 2015 13:17:47 -0700 Message-Id: <1448828291-12660-3-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1448828291-12660-1-git-send-email-sjg@chromium.org> References: <1448828291-12660-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH v2 02/26] dm: pci: Add a dm_ prefix to pci_get_bdf() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Most driver model PCI functions have a dm_ prefix. At some point, when the old code is converted to driver model and the old functions are removed, we will drop that prefix. For consistency, we should use the dm_ prefix for all driver model functions. Update pci_get_bdf() accordingly. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- Changes in v2: None drivers/net/designware.c | 2 +- drivers/net/e1000.c | 4 ++-- drivers/net/pch_gbe.c | 2 +- drivers/net/rtl8169.c | 11 ++++++----- drivers/pci/pci-uclass.c | 9 +++++---- drivers/pci/pci_compat.c | 2 +- drivers/usb/host/ehci-pci.c | 2 +- include/pci.h | 4 ++-- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/net/designware.c b/drivers/net/designware.c index a6c39c3..df853af 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -588,7 +588,7 @@ static int designware_eth_probe(struct udevice *dev) * or via a PCI bridge, fill in platdata before we probe the hardware. */ if (device_is_on_pci_bus(dev)) { - pci_dev_t bdf = pci_get_bdf(dev); + pci_dev_t bdf = dm_pci_get_bdf(dev); dm_pci_read_config32(dev, PCI_BASE_ADDRESS_0, &iobase); iobase &= PCI_BASE_ADDRESS_MEM_MASK; diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 2ba03ed..195833a 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -5628,8 +5628,8 @@ static int e1000_eth_probe(struct udevice *dev) int ret; hw->name = dev->name; - ret = e1000_init_one(hw, trailing_strtol(dev->name), pci_get_bdf(dev), - plat->enetaddr); + ret = e1000_init_one(hw, trailing_strtol(dev->name), + dm_pci_get_bdf(dev), plat->enetaddr); if (ret < 0) { printf(pr_fmt("failed to initialize card: %d\n"), ret); return ret; diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c index dfc0100..1b4dd56 100644 --- a/drivers/net/pch_gbe.c +++ b/drivers/net/pch_gbe.c @@ -424,7 +424,7 @@ int pch_gbe_probe(struct udevice *dev) pci_dev_t devno; u32 iobase; - devno = pci_get_bdf(dev); + devno = dm_pci_get_bdf(dev); /* * The priv structure contains the descriptors and frame buffers which diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index 19422c4..f210005 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -576,7 +576,7 @@ int rtl8169_eth_recv(struct udevice *dev, int flags, uchar **packetp) { struct rtl8169_private *priv = dev_get_priv(dev); - return rtl_recv_common(pci_get_bdf(dev), priv->iobase, packetp); + return rtl_recv_common(dm_pci_get_bdf(dev), priv->iobase, packetp); } #else static int rtl_recv(struct eth_device *dev) @@ -661,7 +661,8 @@ int rtl8169_eth_send(struct udevice *dev, void *packet, int length) { struct rtl8169_private *priv = dev_get_priv(dev); - return rtl_send_common(pci_get_bdf(dev), priv->iobase, packet, length); + return rtl_send_common(dm_pci_get_bdf(dev), priv->iobase, packet, + length); } #else @@ -837,7 +838,7 @@ static int rtl8169_eth_start(struct udevice *dev) { struct eth_pdata *plat = dev_get_platdata(dev); - rtl8169_common_start(pci_get_bdf(dev), plat->enetaddr); + rtl8169_common_start(dm_pci_get_bdf(dev), plat->enetaddr); return 0; } @@ -1130,10 +1131,10 @@ static int rtl8169_eth_probe(struct udevice *dev) region = 1; break; } - pci_read_config32(pci_get_bdf(dev), PCI_BASE_ADDRESS_0 + region * 4, + pci_read_config32(dm_pci_get_bdf(dev), PCI_BASE_ADDRESS_0 + region * 4, &iobase); iobase &= ~0xf; - priv->iobase = (int)pci_mem_to_phys(pci_get_bdf(dev), iobase); + priv->iobase = (int)pci_mem_to_phys(dm_pci_get_bdf(dev), iobase); ret = rtl_init(priv->iobase, dev->name, plat->enetaddr); if (ret < 0) { diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 5fe3072..f6ca58b 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -61,7 +61,7 @@ struct udevice *pci_get_controller(struct udevice *dev) return dev; } -pci_dev_t pci_get_bdf(struct udevice *dev) +pci_dev_t dm_pci_get_bdf(struct udevice *dev) { struct pci_child_platdata *pplat = dev_get_parent_platdata(dev); struct udevice *bus = dev->parent; @@ -225,7 +225,8 @@ int dm_pci_write_config(struct udevice *dev, int offset, unsigned long value, for (bus = dev; device_is_on_pci_bus(bus);) bus = bus->parent; - return pci_bus_write_config(bus, pci_get_bdf(dev), offset, value, size); + return pci_bus_write_config(bus, dm_pci_get_bdf(dev), offset, value, + size); } @@ -290,7 +291,7 @@ int dm_pci_read_config(struct udevice *dev, int offset, unsigned long *valuep, for (bus = dev; device_is_on_pci_bus(bus);) bus = bus->parent; - return pci_bus_read_config(bus, pci_get_bdf(dev), offset, valuep, + return pci_bus_read_config(bus, dm_pci_get_bdf(dev), offset, valuep, size); } @@ -403,7 +404,7 @@ int pci_auto_config_devices(struct udevice *bus) int ret; debug("%s: device %s\n", __func__, dev->name); - ret = pciauto_config_device(hose, pci_get_bdf(dev)); + ret = pciauto_config_device(hose, dm_pci_get_bdf(dev)); if (ret < 0) return ret; max_bus = ret; diff --git a/drivers/pci/pci_compat.c b/drivers/pci/pci_compat.c index 712c48f..dd15eb1 100644 --- a/drivers/pci/pci_compat.c +++ b/drivers/pci/pci_compat.c @@ -34,5 +34,5 @@ pci_dev_t pci_find_devices(struct pci_device_id *ids, int index) if (pci_find_device_id(ids, index, &dev)) return -1; - return pci_get_bdf(dev); + return dm_pci_get_bdf(dev); } diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 0cb9fcc..d607088 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -94,7 +94,7 @@ static int ehci_pci_probe(struct udevice *dev) struct ehci_hccr *hccr; struct ehci_hcor *hcor; - ehci_pci_common_init(pci_get_bdf(dev), &hccr, &hcor); + ehci_pci_common_init(dm_pci_get_bdf(dev), &hccr, &hcor); return ehci_register(dev, hccr, hcor, NULL, 0, USB_INIT_HOST); } diff --git a/include/pci.h b/include/pci.h index 2adca85..5d45cdc 100644 --- a/include/pci.h +++ b/include/pci.h @@ -862,12 +862,12 @@ struct dm_pci_ops { #define pci_get_ops(dev) ((struct dm_pci_ops *)(dev)->driver->ops) /** - * pci_get_bdf() - Get the BDF value for a device + * dm_pci_get_bdf() - Get the BDF value for a device * * @dev: Device to check * @return bus/device/function value (see PCI_BDF()) */ -pci_dev_t pci_get_bdf(struct udevice *dev); +pci_dev_t dm_pci_get_bdf(struct udevice *dev); /** * pci_bind_bus_devices() - scan a PCI bus and bind devices