pci and yenta: pcibios_bus_to_resource
Subsystems (6)
Dominik Brodowski
maintainerPATCH 8/8 pci and yenta: pcibios_bus_to_resource
In yenta_socket, we default to using the resource setting of the CardBus bridge. However, this is a PCI-bus-centric view of resources and thus needs to be converted to generic resources first. Therefore, add a call to pcibios_bus_to_resource() call in between. This function is a mere wrapper on x86 and friends, however on some others it already exists, is added in this patch (alpha, arm, ppc, ppc64) or still needs to be provided (parisc -- where is its pcibios_resource_to_bus() ?).
---
arch/alpha/kernel/pci.c | 16 ++++++++++++++++ arch/arm/kernel/bios32.c | 17 +++++++++++++++++ arch/ppc/kernel/pci.c | 15 +++++++++++++++ arch/ppc64/kernel/pci.c | 20 ++++++++++++++++++++ drivers/pcmcia/yenta_socket.c | 15 ++++++--------- include/asm-alpha/pci.h | 3 +++ include/asm-arm/pci.h | 4 ++++ include/asm-generic/pci.h | 8 ++++++++ include/asm-parisc/pci.h | 4 ++++ include/asm-ppc/pci.h | 4 ++++ include/asm-ppc64/pci.h | 4 ++++ 11 files changed, 101 insertions(+), 9 deletions(-)
include/asm-generic/pci.h +8 -0
@@ -22,6 +22,14 @@ pcibios_resource_to_bus(struct pci_dev * region->end = res->end; } +static inline void +pcibios_bus_to_resource (struct pci_dev *dev,struct resource *res, +struct pci_bus_region *region) +{ + res->start = region->start; + res->end = region->end; +} +#define pcibios_scan_all_fns (a, b) 0#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
drivers/pcmcia/yenta_socket.c +6 -9
@@ -605,9 +605,8 @@ static int yenta_search_res(struct yentastatic int yenta_allocate_res (struct yenta_socket *socket,int nr,unsigned type,int addr_start,int addr_end) { -struct pci_bus *bus;struct resource *root, *res; -u32 start, end; +struct pci_bus_region region;unsigned mask; res = socket->dev->resource +PCI_BRIDGE_RESOURCES + nr;
@@ -620,15 +619,13 @@ static int yenta_allocate_res(struct yenif (type &IORESOURCE_IO ) mask = ~3 ; - bus = socket->dev->subordinate; - res->name = bus->name; + res->name = socket->dev->subordinate->name; res->flags = type; - start =config_readl (socket, addr_start) & mask; - end =config_readl (socket, addr_end) | ~mask; -if (start && end > start && !override_bios) { - res->start = start; - res->end = end; + region.start =config_readl (socket, addr_start) & mask; + region.end =config_readl (socket, addr_end) | ~mask; +if (region.start && region.end > region.start && !override_bios) { +pcibios_bus_to_resource (socket->dev, res, ®ion); root =pci_find_parent_resource (socket->dev, res);if (root && (request_resource (root, res) ==0 ))return 0 ;
arch/arm/kernel/bios32.c +17 -0
@@ -447,9 +447,26 @@ pcibios_resource_to_bus(struct pci_dev * region->end = res->end - offset; } +void __devinit +pcibios_bus_to_resource (struct pci_dev *dev,struct resource *res, +struct pci_bus_region *region) +{ +struct pci_sys_data *root = dev->sysdata; +unsigned long offset =0 ; + +if (res->flags &IORESOURCE_IO ) + offset = root->io_offset; +if (res->flags &IORESOURCE_MEM ) + offset = root->mem_offset; + + res->start = region->start + offset; + res->end = region->end + offset; +} +#ifdef CONFIG_HOTPLUG EXPORT_SYMBOL (pcibios_fixup_bus);EXPORT_SYMBOL (pcibios_resource_to_bus); +EXPORT_SYMBOL (pcibios_bus_to_resources);#endif /*
include/asm-alpha/pci.h +3 -0
@@ -251,6 +251,9 @@ static inline int pci_get_legacy_ide_irqextern void pcibios_resource_to_bus (struct pci_dev *,struct pci_bus_region *,struct resource *); +extern void pcibios_bus_to_resource (struct pci_dev *dev,struct resource *res, +struct pci_bus_region *region); +#define pci_domain_nr (bus) ((struct pci_controller *)(bus)->sysdata)->indexstatic inline int pci_proc_domain (struct pci_bus *bus)
include/asm-arm/pci.h +4 -0
@@ -60,6 +60,10 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, struct resource *res); +extern void +pcibios_bus_to_resource (struct pci_dev *dev,struct resource *res, +struct pci_bus_region *region); +static inline void pcibios_add_platform_entries (struct pci_dev *dev) { }
arch/alpha/kernel/pci.c +16 -0
@@ -350,8 +350,24 @@ pcibios_resource_to_bus(struct pci_dev * region->end = res->end - offset; } +void pcibios_bus_to_resource (struct pci_dev *dev,struct resource *res, +struct pci_bus_region *region) +{ +struct pci_controller *hose = (struct pci_controller *)dev->sysdata; +unsigned long offset =0 ; + +if (res->flags &IORESOURCE_IO ) + offset = hose->io_space->start; +else if (res->flags &IORESOURCE_MEM ) + offset = hose->mem_space->start; + + res->start = region->start + offset; + res->end = region->end + offset; +} +#ifdef CONFIG_HOTPLUG EXPORT_SYMBOL (pcibios_resource_to_bus); +EXPORT_SYMBOL (pcibios_bus_to_resource);#endif int
include/asm-parisc/pci.h +4 -0
@@ -253,6 +253,10 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, struct resource *res); +extern void +pcibios_bus_to_resource (struct pci_dev *dev,struct resource *res, +struct pci_bus_region *region); +static inline void pcibios_add_platform_entries (struct pci_dev *dev) { }
include/asm-ppc/pci.h +4 -0
@@ -105,6 +105,10 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, struct resource *res); +extern void +pcibios_bus_to_resource (struct pci_dev *dev,struct resource *res, +struct pci_bus_region *region); +extern void pcibios_add_platform_entries (struct pci_dev *dev);struct file ;
arch/ppc/kernel/pci.c +15 -0
@@ -160,6 +160,21 @@ void pcibios_resource_to_bus(struct pci_ }EXPORT_SYMBOL (pcibios_resource_to_bus); +void pcibios_resource_to_bus (struct pci_dev *dev,struct resource *res, +struct pci_bus_region *region) +{ +unsigned long offset =0 ; +struct pci_controller *hose = dev->sysdata; + +if (hose && res->flags &IORESOURCE_IO ) + offset = (unsigned long )hose->io_base_virt - isa_io_base; +else if (hose && res->flags &IORESOURCE_MEM ) + offset = hose->pci_mem_offset; + res->start = region->start + offset; + res->end = region->end + offset; +} +EXPORT_SYMBOL (pcibios_bus_to_resource); +/* * We need to avoid collisions with `mirrored' VGA ports * and other strange ISA hardware, so we always want the
include/asm-ppc64/pci.h +4 -0
@@ -134,6 +134,10 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, struct resource *res); +extern void +pcibios_bus_to_resource (struct pci_dev *dev,struct resource *res, +struct pci_bus_region *region); +extern int unmap_bus_range (struct pci_bus *bus);
arch/ppc64/kernel/pci.c +20 -0
@@ -108,8 +108,28 @@ void pcibios_resource_to_bus(struct pci region->end = res->end - offset; } +void pcibios_bus_to_resource (struct pci_dev *dev,struct resource *res, +struct pci_bus_region *region) +{ +unsigned long offset =0 ; +struct pci_controller *hose =pci_bus_to_host (dev->bus); + +if (!hose) +return ; + +if (res->flags &IORESOURCE_IO ) + offset = (unsigned long )hose->io_base_virt - pci_io_base; + +if (res->flags &IORESOURCE_MEM ) + offset = hose->pci_mem_offset; + + res->start = region->start + offset; + res->end = region->end + offset; +} +#ifdef CONFIG_HOTPLUG EXPORT_SYMBOL (pcibios_resource_to_bus); +EXPORT_SYMBOL (pcibios_bus_to_resource);#endif /*
arch/arm/kernel/bios32.c pcibios_resource_to_bus(struct pci_dev * · line 469
Quoted 12 lines · Dominik Brodowski
arch/arm/kernel/bios32.c +3
-0@@ -447,9 +447,26 @@ pcibios_resource_to_bus(struct pci_dev * region->end = res->end - offset; } +void __devinit +pcibios_bus_to_resource (struct pci_dev *dev,struct resource *res, EXPORT_SYMBOL(pcibios_fixup_bus);EXPORT_SYMBOL (pcibios_resource_to_bus); +EXPORT_SYMBOL (pcibios_bus_to_resources);
Please look carefully at the above change. I'd appreciate it if this could be fixed. 8)
Thanks.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core
Quoted 7 lines · Dominik Brodowski
In
yenta_socket, we default to using the resource setting of the CardBus bridge. However, this is a PCI-bus-centric view of resources and thus needs to be converted to generic resources first. Therefore, add a call topcibios_bus_to_resource()call in between. This function is a mere wrapper on x86 and friends, however on some others it already exists, is added in this patch (alpha, arm, ppc, ppc64) or still needs to be provided (parisc -- where is itspcibios_resource_to_bus()?).
in arch/parisc/kernel/pci.c?
At least, it seems to be present in the 2.6.13-rc1 tree on cvs.parisc-linux.org tree.
Arnaldo De Carmelo had add-on pci-pcmcia cards working in his a500 (64-bit w/IOMMU PA-RISC) last year. ISTR a few other people have similar cards working for on B180 workstation (32-bit w/o IOMMU PARISC).
grant
Dominik Brodowski
maintainerPATCH 1/1 pcibios_bus_to_resource for parisc [Was: Re: [PATCH 8/8] pci and yenta: pcibios_bus_to_resource]
Quoted 9 lines · Grant Grundler
Quoted 7 lines · Dominik Brodowski
In
yenta_socket, we default to using the resource setting of the CardBus bridge. However, this is a PCI-bus-centric view of resources and thus needs to be converted to generic resources first. Therefore, add a call topcibios_bus_to_resource()call in between. This function is a mere wrapper on x86 and friends, however on some others it already exists, is added in this patch (alpha, arm, ppc, ppc64) or still needs to be provided (parisc -- where is itspcibios_resource_to_bus()?).
Quoted 3 lines
in
arch/parisc/kernel/pci.c?
At least, it seems to be present in the 2.6.13-rc1 tree on cvs.parisc-linux.org tree.
Oh, yes, I seem to have missed it. Sorry. Does this patch look good?
Add pcibios_bus_to_resource for parisc.
arch/parisc/kernel/pci.c +18 -0
@@ -255,8 +255,26 @@ void __devinit pcibios_resource_to_bus(spcibios_link_hba_resources (&hba->lmmio_space, bus->resource[1 ]); } +void pcibios_bus_to_resource (struct pci_dev *dev,struct resource *res, +struct pci_bus_region *region) +{ +struct pci_bus *bus = dev->bus; +struct pci_hba_data *hba =HBA_DATA (bus->bridge->platform_data); + +if (res->flags &IORESOURCE_MEM ) { + res->start =PCI_HOST_ADDR (hba, region->start); + res->end =PCI_HOST_ADDR (hba, region->end); + } + +if (res->flags &IORESOURCE_IO ) { + res->start = region->start; + res->end = region->end; + } +} +#ifdef CONFIG_HOTPLUG EXPORT_SYMBOL (pcibios_resource_to_bus); +EXPORT_SYMBOL (pcibios_bus_to_resource);#endif /*
Re: [PATCH] pcibios_bus_to_resource for parisc [Was: Re: [PATCH 8/8] pci and yenta: pcibios_bus_to_resource]
Quoted 1 line · Dominik Brodowski
Oh, yes, I seem to have missed it. Sorry. Does this patch look good?
Yes.
I'll commit this to the cvs.parisc-linux.org tree as well. Willy can let me deal with the collision if it's not trivial on his next merge.
thanks,
grant
Quoted 37 lines
Add
pcibios_bus_to_resourcefor parisc.Signed-off-by Dominik Brodowski <[email protected]>Index:
2.6.13-rc3-git2/arch/parisc/kernel/pci.c
===================================================================arch/parisc/kernel/pci.c +18
-0@@ -255,8 +255,26 @@ void __devinit pcibios_resource_to_bus(spcibios_link_hba_resources (&hba->lmmio_space, bus->resource[1 ]); } +void pcibios_bus_to_resource (struct pci_dev *dev,struct resource *res, +struct pci_bus_region *region) +{ +struct pci_bus *bus = dev->bus; +struct pci_hba_data *hba =HBA_DATA (bus->bridge->platform_data); + +if (res->flags &IORESOURCE_MEM ) { + res->start =PCI_HOST_ADDR (hba, region->start); + res->end =PCI_HOST_ADDR (hba, region->end); + } + +if (res->flags &IORESOURCE_IO ) { + res->start = region->start; + res->end = region->end; + } +} +#ifdef CONFIG_HOTPLUG EXPORT_SYMBOL (pcibios_resource_to_bus); +EXPORT_SYMBOL (pcibios_bus_to_resource);#endif /*
Quoted 9 lines · Dominik Brodowski
In
yenta_socket, we default to using the resource setting of the CardBus bridge. However, this is a PCI-bus-centric view of resources and thus needs to be converted to generic resources first. Therefore, add a call topcibios_bus_to_resource()call in between. This function is a mere wrapper on x86 and friends, however on some others it already exists, is added in this patch (alpha, arm, ppc, ppc64) or still needs to be provided (parisc -- where is itspcibios_resource_to_bus()?).Signed-off-by Dominik Brodowski <[email protected]>
Hm, I saw a few different patches here, and some odd complaints. Care to resend an updated version?
thanks,
greg k-h
Dominik Brodowski
maintainerQuoted 9 lines · Greg KH
Quoted 8 lines · Dominik Brodowski
In
yenta_socket, we default to using the resource setting of the CardBus bridge. However, this is a PCI-bus-centric view of resources and thus needs to be converted to generic resources first. Therefore, add a call topcibios_bus_to_resource()call in between. This function is a mere wrapper on x86 and friends, however on some others it already exists, is added in this patch (alpha, arm, ppc, ppc64) or still needs to be provided (parisc -- where is itspcibios_resource_to_bus()?).
Quoted 4 lines
Quoted 1 line
Signed-off-by Dominik Brodowski <[email protected]>Hm, I saw a few different patches here, and some odd complaints. Care to resend an updated version?
AFAICS, Andrew has merged all fixes into this version:
Thanks,
Dominik