From patchwork Tue Nov 17 03:53:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 545348 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 8C254141463 for ; Tue, 17 Nov 2015 14:58: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=ExHHUoZG; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E9BCB4B6B3; Tue, 17 Nov 2015 04:56:16 +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 3aTQXkNaGKg6; Tue, 17 Nov 2015 04:56:16 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 80AF74B6BD; Tue, 17 Nov 2015 04:55:56 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DEBB34B64D for ; Tue, 17 Nov 2015 04:54:36 +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 89Q68u7l7tMy for ; Tue, 17 Nov 2015 04:54:36 +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-ig0-f176.google.com (mail-ig0-f176.google.com [209.85.213.176]) by theia.denx.de (Postfix) with ESMTPS id B97FE4B694 for ; Tue, 17 Nov 2015 04:54:26 +0100 (CET) Received: by igvg19 with SMTP id g19so88605964igv.1 for ; Mon, 16 Nov 2015 19:54:25 -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=eHyX5/Nhh2f7glVW9flxwpm93r97lAGFF1+DuA5UBnw=; b=ExHHUoZGDPlWpHIGNIRjvvjMyb7z//smbrCm+rG5WRiQfj3B5WdXY/wnKIgPO6ETHJ mPWXMuKGTuI7iAgr47ZmkT5WeXDzhim5c1AJSU3/Nc+aAFavlxgahxuwzs5F2ISrQ7xC ESbLTxerfcXF12v1xC+QNNTsiyllD+QJrA6b9VwbZzdUFWgfdlCq+RJZYxFo9KC/QvXk oy3ZfCR1WaNhD98l9qUOA3HIuJg0vVWLxSg2sqyggVss4BodZuR622xAmBFC+usEThXf CDmt84tSoLQeOKlRU2s6r0g85XRq4xqEaZIHP0qagio4i3vjEQRC5/8QnV4o5PWk+Rvr X5/A== 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=eHyX5/Nhh2f7glVW9flxwpm93r97lAGFF1+DuA5UBnw=; b=Gpo77QEfKpdDp0P+c4AY8obKmR1QHETJVpQpwKWDsdrjGeI2kTjl73D24HHjXtXVn8 gXi/9MSDsCnNEU+4JBeVDqowzNM4aNcNQV2bcHFHK5o+VEp5lA5FTv2SXiJ3nFZVUbES bTH2jKWUb4oVWtExdha/pKRAMjRxdOZ2ua7iwdgcfT3vQ7in3VkfHLMMNDsp1yAWWlZ/ i3fI9A8YWd8coqoGnxg3IxuFp1daogl+X3klu+otNnNZohPaJKCQvyprz+neWm7Tc2mk x4llYT4DG4xg6W+Ba1nqbBKsbOOJwvpnfasRvdo6ixMTcviNtXzp0K/Sg4YWQ078Aw1x 5U/w== X-Gm-Message-State: ALoCoQnlYUC+1wC1sHAOQb5CqBZ+ggU8GDRCAb+GhBPG53lVhy020eIlHXhKAVPVpbn/AWBEDByn X-Received: by 10.50.85.34 with SMTP id e2mr182741igz.81.1447732465312; Mon, 16 Nov 2015 19:54:25 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id 126sm4360855ion.32.2015.11.16.19.54.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Nov 2015 19:54:23 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id AE80022340B; Mon, 16 Nov 2015 20:54:17 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Mon, 16 Nov 2015 20:53:57 -0700 Message-Id: <1447732444-30892-20-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1447732444-30892-1-git-send-email-sjg@chromium.org> References: <1447732444-30892-1-git-send-email-sjg@chromium.org> Cc: Stephen Warren , Cheng Gu , Joe Hershberger , Masahiro Yamada Subject: [U-Boot] [PATCH 19/25] dm: pci: Switch to DM API for PCI address mapping 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" We should use the new address mapping functions unless we are in compatibility mode. Disable the old functions by default. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- drivers/pci/pci_common.c | 2 ++ include/pci.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c index b46be1b..c685541 100644 --- a/drivers/pci/pci_common.c +++ b/drivers/pci/pci_common.c @@ -99,6 +99,7 @@ __weak int pci_skip_dev(struct pci_controller *hose, pci_dev_t dev) return 0; } +#if !defined(CONFIG_DM_PCI) || defined(CONFIG_DM_PCI_COMPAT) /* Get a virtual address associated with a BAR region */ void *pci_map_bar(pci_dev_t pdev, int bar, int flags) { @@ -270,3 +271,4 @@ pci_addr_t pci_hose_phys_to_bus(struct pci_controller *hose, return bus_addr; } +#endif /* !CONFIG_DM_PCI || CONFIG_DM_PCI_COMPAT */ diff --git a/include/pci.h b/include/pci.h index ddf6b66..3584ccb 100644 --- a/include/pci.h +++ b/include/pci.h @@ -621,6 +621,7 @@ static inline void pci_set_ops(struct pci_controller *hose, extern void pci_setup_indirect(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data); #endif +#if !defined(CONFIG_DM_PCI) || defined(CONFIG_DM_PCI_COMPAT) extern phys_addr_t pci_hose_bus_to_phys(struct pci_controller* hose, pci_addr_t addr, unsigned long flags); extern pci_addr_t pci_hose_phys_to_bus(struct pci_controller* hose, @@ -656,7 +657,6 @@ extern pci_addr_t pci_hose_phys_to_bus(struct pci_controller* hose, pci_bus_to_virt((dev), (addr), PCI_REGION_IO, (len), (map_flags)) /* For driver model these are defined in macros in pci_compat.c */ -#if !defined(CONFIG_DM_PCI) || defined(CONFIG_DM_PCI_COMPAT) extern int pci_hose_read_config_byte(struct pci_controller *hose, pci_dev_t dev, int where, u8 *val); extern int pci_hose_read_config_word(struct pci_controller *hose,