aboutsummaryrefslogtreecommitdiff
path: root/arch/ppc
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-12-15 15:00:57 +1100
committerPaul Mackerras <paulus@samba.org>2006-01-09 15:05:56 +1100
commitf2c4583a381c584c8c025048071a120cc9562ded (patch)
tree53d6a1d30a3be72f021738c97853cff55a800070 /arch/ppc
parenta04c8780fd234aeeba5e87f7e37beffd05ef21ae (diff)
[PATCH] powerpc: pci_address_to_pio fix
This fixes pci_address_to_pio() to return an unsigned long (to be safe) and fixes a bug in the implementation that caused it to return a bogus IO port number Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/kernel/pci.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 8de320308e8..c8b48f17169 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -1811,7 +1811,7 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
EXPORT_SYMBOL(pci_iomap);
EXPORT_SYMBOL(pci_iounmap);
-unsigned int pci_address_to_pio(phys_addr_t address)
+unsigned long pci_address_to_pio(phys_addr_t address)
{
struct pci_controller* hose = hose_head;
@@ -1819,9 +1819,11 @@ unsigned int pci_address_to_pio(phys_addr_t address)
unsigned int size = hose->io_resource.end -
hose->io_resource.start + 1;
if (address >= hose->io_base_phys &&
- address < (hose->io_base_phys + size))
- return (unsigned int)hose->io_base_virt +
- (address - hose->io_base_phys);
+ address < (hose->io_base_phys + size)) {
+ unsigned long base =
+ (unsigned long)hose->io_base_virt - _IO_BASE;
+ return base + (address - hose->io_base_phys);
+
}
return (unsigned int)-1;
}