Skip to content

L
linux
Commit fb127cb9 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files
Options

PCI: collapse pcibios_resource_to_bus 

Everybody uses the generic pcibios_resource_to_bus() supplied by the core
now, so remove the ARCH_HAS_GENERIC_PCI_OFFSETS used during conversion.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 4ba2aef3
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 53 deletions
arch/alpha/include/asm/pci.h
View file @ fb127cb9
...@@ -100,8 +100,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) ...@@ -100,8 +100,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
return channel ? 15 : 14; return channel ? 15 : 14;
} }
#define ARCH_HAS_GENERIC_PCI_OFFSETS
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
static inline int pci_proc_domain(struct pci_bus *bus) static inline int pci_proc_domain(struct pci_bus *bus)
......
arch/arm/include/asm/pci.h
View file @ fb127cb9
...@@ -57,8 +57,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, ...@@ -57,8 +57,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine); enum pci_mmap_state mmap_state, int write_combine);
#define ARCH_HAS_GENERIC_PCI_OFFSETS
/* /*
* Dummy implementation; always return 0. * Dummy implementation; always return 0.
*/ */
......
arch/ia64/include/asm/pci.h
View file @ fb127cb9
...@@ -108,8 +108,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) ...@@ -108,8 +108,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)
return (pci_domain_nr(bus) != 0); return (pci_domain_nr(bus) != 0);
} }
#define ARCH_HAS_GENERIC_PCI_OFFSETS
static inline struct resource * static inline struct resource *
pcibios_select_root(struct pci_dev *pdev, struct resource *res) pcibios_select_root(struct pci_dev *pdev, struct resource *res)
{ {
......
arch/microblaze/include/asm/pci.h
View file @ fb127cb9
...@@ -94,8 +94,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus, ...@@ -94,8 +94,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus,
*/ */
#define PCI_DMA_BUS_IS_PHYS (1) #define PCI_DMA_BUS_IS_PHYS (1)
#define ARCH_HAS_GENERIC_PCI_OFFSETS
static inline struct resource *pcibios_select_root(struct pci_dev *pdev, static inline struct resource *pcibios_select_root(struct pci_dev *pdev,
struct resource *res) struct resource *res)
{ {
......
arch/mips/include/asm/pci.h
View file @ fb127cb9
...@@ -113,8 +113,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, ...@@ -113,8 +113,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
} }
#endif #endif
#define ARCH_HAS_GENERIC_PCI_OFFSETS
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
static inline int pci_proc_domain(struct pci_bus *bus) static inline int pci_proc_domain(struct pci_bus *bus)
......
arch/mn10300/include/asm/pci.h
View file @ fb127cb9
...@@ -85,8 +85,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, ...@@ -85,8 +85,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
/* implement the pci_ DMA API in terms of the generic device dma_ one */ /* implement the pci_ DMA API in terms of the generic device dma_ one */
#include <asm-generic/pci-dma-compat.h> #include <asm-generic/pci-dma-compat.h>
#define ARCH_HAS_GENERIC_PCI_OFFSETS
static inline struct resource * static inline struct resource *
pcibios_select_root(struct pci_dev *pdev, struct resource *res) pcibios_select_root(struct pci_dev *pdev, struct resource *res)
{ {
......
arch/parisc/include/asm/pci.h
View file @ fb127cb9
...@@ -215,8 +215,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, ...@@ -215,8 +215,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
} }
#endif #endif
#define ARCH_HAS_GENERIC_PCI_OFFSETS
static inline void pcibios_penalize_isa_irq(int irq, int active) static inline void pcibios_penalize_isa_irq(int irq, int active)
{ {
/* We don't need to penalize isa irq's */ /* We don't need to penalize isa irq's */
......
arch/powerpc/include/asm/pci.h
View file @ fb127cb9
...@@ -154,8 +154,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus, ...@@ -154,8 +154,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus,
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */
#define ARCH_HAS_GENERIC_PCI_OFFSETS
extern void pcibios_claim_one_bus(struct pci_bus *b); extern void pcibios_claim_one_bus(struct pci_bus *b);
extern void pcibios_finish_adding_to_bus(struct pci_bus *bus); extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
......
arch/sh/include/asm/pci.h
View file @ fb127cb9
...@@ -114,8 +114,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, ...@@ -114,8 +114,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
/* Board-specific fixup routines. */ /* Board-specific fixup routines. */
int pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin); int pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin);
#define ARCH_HAS_GENERIC_PCI_OFFSETS
#define pci_domain_nr(bus) ((struct pci_channel *)(bus)->sysdata)->index #define pci_domain_nr(bus) ((struct pci_channel *)(bus)->sysdata)->index
static inline int pci_proc_domain(struct pci_bus *bus) static inline int pci_proc_domain(struct pci_bus *bus)
......
arch/sparc/include/asm/pci_32.h
View file @ fb127cb9
...@@ -52,8 +52,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, ...@@ -52,8 +52,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
* 64Kbytes by the Host controller. * 64Kbytes by the Host controller.
*/ */
#define ARCH_HAS_GENERIC_PCI_OFFSETS
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
{ {
return PCI_IRQ_NONE; return PCI_IRQ_NONE;
......
arch/sparc/include/asm/pci_64.h
View file @ fb127cb9
...@@ -73,8 +73,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, ...@@ -73,8 +73,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, enum pci_mmap_state mmap_state,
int write_combine); int write_combine);
#define ARCH_HAS_GENERIC_PCI_OFFSETS
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
{ {
return PCI_IRQ_NONE; return PCI_IRQ_NONE;
......
drivers/pci/probe.c
View file @ fb127cb9
...@@ -66,7 +66,7 @@ static bool resource_contains(struct resource *res1, struct resource *res2) ...@@ -66,7 +66,7 @@ static bool resource_contains(struct resource *res1, struct resource *res2)
return res1->start <= res2->start && res1->end >= res2->end; return res1->start <= res2->start && res1->end >= res2->end;
} }
void pci_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
struct resource *res) struct resource *res)
{ {
struct pci_host_bridge *bridge = pci_host_bridge(dev); struct pci_host_bridge *bridge = pci_host_bridge(dev);
...@@ -86,6 +86,7 @@ void pci_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, ...@@ -86,6 +86,7 @@ void pci_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
region->start = res->start - offset; region->start = res->start - offset;
region->end = res->end - offset; region->end = res->end - offset;
} }
EXPORT_SYMBOL(pcibios_resource_to_bus);
static bool region_contains(struct pci_bus_region *region1, static bool region_contains(struct pci_bus_region *region1,
struct pci_bus_region *region2) struct pci_bus_region *region2)
...@@ -93,7 +94,7 @@ static bool region_contains(struct pci_bus_region *region1, ...@@ -93,7 +94,7 @@ static bool region_contains(struct pci_bus_region *region1,
return region1->start <= region2->start && region1->end >= region2->end; return region1->start <= region2->start && region1->end >= region2->end;
} }
void pci_bus_to_resource(struct pci_dev *dev, struct resource *res, void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
struct pci_bus_region *region) struct pci_bus_region *region)
{ {
struct pci_host_bridge *bridge = pci_host_bridge(dev); struct pci_host_bridge *bridge = pci_host_bridge(dev);
...@@ -117,22 +118,7 @@ void pci_bus_to_resource(struct pci_dev *dev, struct resource *res, ...@@ -117,22 +118,7 @@ void pci_bus_to_resource(struct pci_dev *dev, struct resource *res,
res->start = region->start + offset; res->start = region->start + offset;
res->end = region->end + offset; res->end = region->end + offset;
} }
#ifdef ARCH_HAS_GENERIC_PCI_OFFSETS
void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
struct resource *res)
{
pci_resource_to_bus(dev, region, res);
}
EXPORT_SYMBOL(pcibios_resource_to_bus);
void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
struct pci_bus_region *region)
{
pci_bus_to_resource(dev, res, region);
}
EXPORT_SYMBOL(pcibios_bus_to_resource); EXPORT_SYMBOL(pcibios_bus_to_resource);
#endif
/* /*
* PCI Bus Class * PCI Bus Class
...@@ -309,11 +295,11 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, ...@@ -309,11 +295,11 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
pci_write_config_dword(dev, pos + 4, 0); pci_write_config_dword(dev, pos + 4, 0);
region.start = 0; region.start = 0;
region.end = sz64; region.end = sz64;
pci_bus_to_resource(dev, res, &region); pcibios_bus_to_resource(dev, res, &region);
} else { } else {
region.start = l64; region.start = l64;
region.end = l64 + sz64; region.end = l64 + sz64;
pci_bus_to_resource(dev, res, &region); pcibios_bus_to_resource(dev, res, &region);
dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n", dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n",
pos, res); pos, res);
} }
...@@ -325,7 +311,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, ...@@ -325,7 +311,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
region.start = l; region.start = l;
region.end = l + sz; region.end = l + sz;
pci_bus_to_resource(dev, res, &region); pcibios_bus_to_resource(dev, res, &region);
dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n", pos, res); dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n", pos, res);
} }
...@@ -383,7 +369,7 @@ static void __devinit pci_read_bridge_io(struct pci_bus *child) ...@@ -383,7 +369,7 @@ static void __devinit pci_read_bridge_io(struct pci_bus *child)
res->flags = (io_base_lo & PCI_IO_RANGE_TYPE_MASK) | IORESOURCE_IO; res->flags = (io_base_lo & PCI_IO_RANGE_TYPE_MASK) | IORESOURCE_IO;
region.start = base; region.start = base;
region.end = limit + 0xfff; region.end = limit + 0xfff;
pci_bus_to_resource(dev, &res2, &region); pcibios_bus_to_resource(dev, &res2, &region);
if (!res->start) if (!res->start)
res->start = res2.start; res->start = res2.start;
if (!res->end) if (!res->end)
...@@ -409,7 +395,7 @@ static void __devinit pci_read_bridge_mmio(struct pci_bus *child) ...@@ -409,7 +395,7 @@ static void __devinit pci_read_bridge_mmio(struct pci_bus *child)
res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM; res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
region.start = base; region.start = base;
region.end = limit + 0xfffff; region.end = limit + 0xfffff;
pci_bus_to_resource(dev, res, &region); pcibios_bus_to_resource(dev, res, &region);
dev_printk(KERN_DEBUG, &dev->dev, " bridge window %pR\n", res); dev_printk(KERN_DEBUG, &dev->dev, " bridge window %pR\n", res);
} }
} }
...@@ -458,7 +444,7 @@ static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child) ...@@ -458,7 +444,7 @@ static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child)
res->flags |= IORESOURCE_MEM_64; res->flags |= IORESOURCE_MEM_64;
region.start = base; region.start = base;
region.end = limit + 0xfffff; region.end = limit + 0xfffff;
pci_bus_to_resource(dev, res, &region); pcibios_bus_to_resource(dev, res, &region);
dev_printk(KERN_DEBUG, &dev->dev, " bridge window %pR\n", res); dev_printk(KERN_DEBUG, &dev->dev, " bridge window %pR\n", res);
} }
} }
...@@ -1071,24 +1057,24 @@ int pci_setup_device(struct pci_dev *dev) ...@@ -1071,24 +1057,24 @@ int pci_setup_device(struct pci_dev *dev)
region.end = 0x1F7; region.end = 0x1F7;
res = &dev->resource[0]; res = &dev->resource[0];
res->flags = LEGACY_IO_RESOURCE; res->flags = LEGACY_IO_RESOURCE;
pci_bus_to_resource(dev, res, &region); pcibios_bus_to_resource(dev, res, &region);
region.start = 0x3F6; region.start = 0x3F6;
region.end = 0x3F6; region.end = 0x3F6;
res = &dev->resource[1]; res = &dev->resource[1];
res->flags = LEGACY_IO_RESOURCE; res->flags = LEGACY_IO_RESOURCE;
pci_bus_to_resource(dev, res, &region); pcibios_bus_to_resource(dev, res, &region);
} }
if ((progif & 4) == 0) { if ((progif & 4) == 0) {
region.start = 0x170; region.start = 0x170;
region.end = 0x177; region.end = 0x177;
res = &dev->resource[2]; res = &dev->resource[2];
res->flags = LEGACY_IO_RESOURCE; res->flags = LEGACY_IO_RESOURCE;
pci_bus_to_resource(dev, res, &region); pcibios_bus_to_resource(dev, res, &region);
region.start = 0x376; region.start = 0x376;
region.end = 0x376; region.end = 0x376;
res = &dev->resource[3]; res = &dev->resource[3];
res->flags = LEGACY_IO_RESOURCE; res->flags = LEGACY_IO_RESOURCE;
pci_bus_to_resource(dev, res, &region); pcibios_bus_to_resource(dev, res, &region);
} }
} }
break; break;
......
include/asm-generic/pci.h
View file @ fb127cb9
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
#ifndef _ASM_GENERIC_PCI_H #ifndef _ASM_GENERIC_PCI_H
#define _ASM_GENERIC_PCI_H #define _ASM_GENERIC_PCI_H
#define ARCH_HAS_GENERIC_PCI_OFFSETS
static inline struct resource * static inline struct resource *
pcibios_select_root(struct pci_dev *pdev, struct resource *res) pcibios_select_root(struct pci_dev *pdev, struct resource *res)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7