0f3b3956c4
commit eab90291d3
(mips: switch to GENERIC_PCI_IOMAP)
failed to take into account the PCI controller's
io_map_base for mapping IO BARs.
This also caused a new warning on mips.
Fix this, without re-introducing code duplication,
by setting NO_GENERIC_PCI_IOPORT_MAP
and supplying a mips-specific __pci_ioport_map.
Reported-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
49 lines
1.3 KiB
C
49 lines
1.3 KiB
C
/*
|
|
* Implement the default iomap interfaces
|
|
*
|
|
* (C) Copyright 2004 Linus Torvalds
|
|
* (C) Copyright 2006 Ralf Baechle <ralf@linux-mips.org>
|
|
* (C) Copyright 2007 MIPS Technologies, Inc.
|
|
* written by Ralf Baechle <ralf@linux-mips.org>
|
|
*/
|
|
#include <linux/pci.h>
|
|
#include <linux/module.h>
|
|
#include <asm/io.h>
|
|
|
|
void __iomem *__pci_ioport_map(struct pci_dev *dev,
|
|
unsigned long port, unsigned int nr)
|
|
{
|
|
struct pci_controller *ctrl = dev->bus->sysdata;
|
|
unsigned long base = ctrl->io_map_base;
|
|
|
|
/* This will eventually become a BUG_ON but for now be gentle */
|
|
if (unlikely(!ctrl->io_map_base)) {
|
|
struct pci_bus *bus = dev->bus;
|
|
char name[8];
|
|
|
|
while (bus->parent)
|
|
bus = bus->parent;
|
|
|
|
ctrl->io_map_base = base = mips_io_port_base;
|
|
|
|
sprintf(name, "%04x:%02x", pci_domain_nr(bus), bus->number);
|
|
printk(KERN_WARNING "io_map_base of root PCI bus %s unset. "
|
|
"Trying to continue but you better\nfix this issue or "
|
|
"report it to linux-mips@linux-mips.org or your "
|
|
"vendor.\n", name);
|
|
#ifdef CONFIG_PCI_DOMAINS
|
|
panic("To avoid data corruption io_map_base MUST be set with "
|
|
"multiple PCI domains.");
|
|
#endif
|
|
}
|
|
|
|
return (void __iomem *) (ctrl->io_map_base + port);
|
|
}
|
|
|
|
void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
|
|
{
|
|
iounmap(addr);
|
|
}
|
|
|
|
EXPORT_SYMBOL(pci_iounmap);
|