Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f3b3956 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

mips: use the the PCI controller's io_map_base 



commit eab90291
(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: default avatarKevin Cernekee <cernekee@gmail.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent b923650b

arch/mips/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -2356,6 +2356,7 @@ config PCI 
	depends on HW_HAS_PCI

	depends on HW_HAS_PCI

	select PCI_DOMAINS

	select PCI_DOMAINS

	select GENERIC_PCI_IOMAP

	select GENERIC_PCI_IOMAP

	select NO_GENERIC_PCI_IOPORT_MAP

	help

	help

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  bus system, i.e. the way the CPU talks to the other stuff inside

	  bus system, i.e. the way the CPU talks to the other stuff inside

arch/mips/lib/iomap-pci.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <asm/io.h>

#include <asm/io.h>





static void __iomem *ioport_map_pci(struct pci_dev *dev,

void __iomem *__pci_ioport_map(struct pci_dev *dev,

			       unsigned long port, unsigned int nr)

			       unsigned long port, unsigned int nr)

{

{

	struct pci_controller *ctrl = dev->bus->sysdata;

	struct pci_controller *ctrl = dev->bus->sysdata;