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: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
			
				
	
	
		
			48 lines
		
	
	
	
		
			1.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			48 lines
		
	
	
	
		
			1.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Implement the sparc iomap interfaces
 | 
						|
 */
 | 
						|
#include <linux/pci.h>
 | 
						|
#include <linux/module.h>
 | 
						|
#include <asm/io.h>
 | 
						|
 | 
						|
/* Create a virtual mapping cookie for an IO port range */
 | 
						|
void __iomem *ioport_map(unsigned long port, unsigned int nr)
 | 
						|
{
 | 
						|
	return (void __iomem *) (unsigned long) port;
 | 
						|
}
 | 
						|
 | 
						|
void ioport_unmap(void __iomem *addr)
 | 
						|
{
 | 
						|
	/* Nothing to do */
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(ioport_map);
 | 
						|
EXPORT_SYMBOL(ioport_unmap);
 | 
						|
 | 
						|
/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
 | 
						|
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) {
 | 
						|
		if (flags & IORESOURCE_CACHEABLE)
 | 
						|
			return ioremap(start, len);
 | 
						|
		return ioremap_nocache(start, len);
 | 
						|
	}
 | 
						|
	/* What? */
 | 
						|
	return NULL;
 | 
						|
}
 | 
						|
 | 
						|
void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
 | 
						|
{
 | 
						|
	/* nothing to do */
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(pci_iomap);
 | 
						|
EXPORT_SYMBOL(pci_iounmap);
 |