Commit e343a895 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

lib: use generic pci_iomap on all architectures

Many architectures don't want to pull in iomap.c,
so they ended up duplicating pci_iomap from that file.
That function isn't trivial, and we are going to modify it
https://lkml.org/lkml/2011/11/14/183
so the duplication hurts.

This reduces the scope of the problem significantly,
by moving pci_iomap to a separate file and
referencing that from all architectures.

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  alpha: drop pci_iomap/pci_iounmap from pci-noop.c
  mn10300: switch to GENERIC_PCI_IOMAP
  mn10300: add missing __iomap markers
  frv: switch to GENERIC_PCI_IOMAP
  tile: switch to GENERIC_PCI_IOMAP
  tile: don't panic on iomap
  sparc: switch to GENERIC_PCI_IOMAP
  sh: switch to GENERIC_PCI_IOMAP
  powerpc: switch to GENERIC_PCI_IOMAP
  parisc: switch to GENERIC_PCI_IOMAP
  mips: switch to GENERIC_PCI_IOMAP
  microblaze: switch to GENERIC_PCI_IOMAP
  arm: switch to GENERIC_PCI_IOMAP
  alpha: switch to GENERIC_PCI_IOMAP
  lib: add GENERIC_PCI_IOMAP
  lib: move GENERIC_IOMAP to lib/Kconfig

Fix up trivial conflicts due to changes nearby in arch/{m68k,score}/Kconfig
parents 06792c4d 193a667f

arch/alpha/Kconfig

+1 −4
Original line number Original line Diff line number Diff line
@@ -70,10 +70,6 @@ config GENERIC_ISA_DMA 
	bool

	bool

	default y

	default y





config GENERIC_IOMAP

	bool

	default n



source "init/Kconfig"

source "init/Kconfig"

source "kernel/Kconfig.freezer"

source "kernel/Kconfig.freezer"
@@ -319,6 +315,7 @@ config ISA_DMA_API 
config PCI

config PCI

	bool

	bool

	depends on !ALPHA_JENSEN

	depends on !ALPHA_JENSEN

	select GENERIC_PCI_IOMAP

	default y

	default y

	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

arch/alpha/kernel/pci-noop.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -185,15 +185,3 @@ struct dma_map_ops alpha_noop_ops = { 




struct dma_map_ops *dma_ops = &alpha_noop_ops;

struct dma_map_ops *dma_ops = &alpha_noop_ops;

EXPORT_SYMBOL(dma_ops);
 
EXPORT_SYMBOL(dma_ops);
 


void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)

{

	return NULL;

}



void pci_iounmap(struct pci_dev *dev, void __iomem * addr)

{

}



EXPORT_SYMBOL(pci_iomap);

EXPORT_SYMBOL(pci_iounmap);

arch/alpha/kernel/pci.c

+1 −25
Original line number Original line Diff line number Diff line
@@ -508,30 +508,7 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn) 
	return -EOPNOTSUPP;

	return -EOPNOTSUPP;

}

}





/* Create an __iomem token from a PCI BAR.  Copied from lib/iomap.c with

/* Destroy an __iomem token.  Not copied from lib/iomap.c.  */

   no changes, since we don't want the other things in that object file.  */



void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)

{

	resource_size_t start = pci_resource_start(dev, bar);

	resource_size_t len = pci_resource_len(dev, bar);

	unsigned long flags = pci_resource_flags(dev, bar);



	if (!len || !start)

		return NULL;

	if (maxlen && len > maxlen)

		len = maxlen;

	if (flags & IORESOURCE_IO)

		return ioport_map(start, len);

	if (flags & IORESOURCE_MEM) {

		/* Not checking IORESOURCE_CACHEABLE because alpha does

		   not distinguish between ioremap and ioremap_nocache.  */

		return ioremap(start, len);

	}

	return NULL;

}



/* Destroy that token.  Not copied from lib/iomap.c.  */





void pci_iounmap(struct pci_dev *dev, void __iomem * addr)

void pci_iounmap(struct pci_dev *dev, void __iomem * addr)

{

{
@@ -539,7 +516,6 @@ void pci_iounmap(struct pci_dev *dev, void __iomem * addr) 
		iounmap(addr);

		iounmap(addr);

}

}





EXPORT_SYMBOL(pci_iomap);

EXPORT_SYMBOL(pci_iounmap);

EXPORT_SYMBOL(pci_iounmap);





/* FIXME: Some boxes have multiple ISA bridges! */

/* FIXME: Some boxes have multiple ISA bridges! */

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ config ARM 
	select HAVE_SPARSE_IRQ

	select HAVE_SPARSE_IRQ

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW

	select CPU_PM if (SUSPEND || CPU_IDLE)

	select CPU_PM if (SUSPEND || CPU_IDLE)

	select GENERIC_PCI_IOMAP

	help

	help

	  The ARM series is a line of low-power-consumption RISC chip designs

	  The ARM series is a line of low-power-consumption RISC chip designs

	  licensed by ARM Ltd and targeted at embedded applications and

	  licensed by ARM Ltd and targeted at embedded applications and

arch/arm/include/asm/io.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <asm/byteorder.h>

#include <asm/byteorder.h>

#include <asm/memory.h>

#include <asm/memory.h>

#include <asm/system.h>

#include <asm/system.h>

#include <asm-generic/pci_iomap.h>





/*

/*

 * ISA I/O bus memory addresses are 1:1 with the physical address.

 * ISA I/O bus memory addresses are 1:1 with the physical address.
@@ -306,7 +307,6 @@ extern void ioport_unmap(void __iomem *addr); 




struct pci_dev;

struct pci_dev;





extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen);

extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr);

extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr);





/*

/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE