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

Commit b70d3a2c authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds
Browse files

iomap: fix 64 bits resources on 32 bits 



Almost all implementations of pci_iomap() in the kernel, including the generic
lib/iomap.c one, copies the content of a struct resource into unsigned long's
which will break on 32 bits platforms with 64 bits resources.

This fixes all definitions of pci_iomap() to use resource_size_t.  I also
"fixed" the 64bits arch for consistency.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 626adeb6

arch/alpha/kernel/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -514,8 +514,8 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn) 


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

{

	unsigned long start = pci_resource_start(dev, bar);

	unsigned long len = pci_resource_len(dev, bar);

	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)

arch/arm/mm/iomap.c

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ EXPORT_SYMBOL(ioport_unmap); 
#ifdef CONFIG_PCI

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

{

	unsigned long start = pci_resource_start(dev, bar);

	unsigned long len   = pci_resource_len(dev, bar);

	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)

arch/frv/mb93090-mb00/pci-iomap.c

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 


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

{

	unsigned long start = pci_resource_start(dev, bar);

	unsigned long len = pci_resource_len(dev, bar);

	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)

arch/mips/lib/iomap-pci.c

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ static void __iomem *ioport_map_pci(struct pci_dev *dev, 
 */

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

{

	unsigned long start = pci_resource_start(dev, bar);

	unsigned long len = pci_resource_len(dev, bar);

	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)

arch/mn10300/unit-asb2305/pci-iomap.c

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
 */

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

{

	unsigned long start = pci_resource_start(dev, bar);

	unsigned long len = pci_resource_len(dev, bar);

	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)