| Message ID | 1447732444-30892-20-git-send-email-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Simon Glass |
| Headers | show |
On Tue, Nov 17, 2015 at 11:53 AM, Simon Glass <sjg@chromium.org> wrote: > 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 <sjg@chromium.org> > --- > > 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, > -- Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
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,
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 <sjg@chromium.org> --- drivers/pci/pci_common.c | 2 ++ include/pci.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)