sh: use the the PCI channels's io_map_base (1e05b62a) · Commits · 戴 / test

commit (sh: switch to GENERIC_PCI_IOMAP) failed to take into account the PCI channels's io_map_base for mapping IO BARs. This also caused a new warning on sh. Fix this, without re-introducing code duplication, by setting NO_GENERIC_PCI_IOPORT_MAP and supplying a sh-specific __pci_ioport_map. Reported-by:

Kevin Cernekee <cernekee@gmail.com> Signed-off-by:

Michael S. Tsirkin <mst@redhat.com>

arch/sh/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -859,6 +859,7 @@ config PCI
		depends on SYS_SUPPORTS_PCI
		select PCI_DOMAINS
		select GENERIC_PCI_IOMAP
		select NO_GENERIC_PCI_IOPORT_MAP
		help
		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

arch/sh/drivers/pci/pci.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -356,7 +356,7 @@ int pci_mmap_page_range(struct pci_dev dev, struct vm_area_struct vma,

		#ifndef CONFIG_GENERIC_IOMAP

		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)
		{
		struct pci_channel *chan = dev->sysdata;

Admin message