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

Commit 83c2dc15 authored by David Howells's avatar David Howells
Browse files

MN10300: Handle cacheable PCI regions in pci_iomap() 



Handle cacheable PCI regions in pci_iomap().  If IORESOURCE_CACHEABLE is set
then we AND away the 0x20000000 "flag".

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 0369c360

arch/mn10300/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static inline void __iomem *__ioremap(unsigned long offset, unsigned long size, 


static inline void __iomem *ioremap(unsigned long offset, unsigned long size)

{

	return (void __iomem *) offset;

	return (void __iomem *)(offset & ~0x20000000);

}



/*

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

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/* ASB2305 PCI I/O mapping handler

 *

 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public Licence

 * as published by the Free Software Foundation; either version

 * 2 of the Licence, or (at your option) any later version.

 */

#include <linux/pci.h>

#include <linux/module.h>



/*

 * 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 ((flags & IORESOURCE_IO) || (flags & IORESOURCE_MEM)) {

		if (flags & IORESOURCE_CACHEABLE && !(flags & IORESOURCE_IO))

			return ioremap(start, len);

		else

			return ioremap_nocache(start, len);

	}



	return NULL;

}

EXPORT_SYMBOL(pci_iomap);