Commit 3603ab2b authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] mm 10: allow memory type to be specified with ioremap 



__ioremap() took a set of page table flags (specifically the cacheable
and bufferable bits) to control the mapping type.  However, with
the advent of ARMv6, this is far too limited.

Replace the page table flags with a memory type index, so that the
desired attributes can be selected from the mem_type table.

Finally, to prevent silent miscompilation due to the differing
arguments, rename the __ioremap() and __ioremap_pfn() functions.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0af92bef

arch/arm/mach-iop13xx/io.c

+5 −5
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ void * __iomem __iop13xx_io(unsigned long io_addr) 
EXPORT_SYMBOL(__iop13xx_io);



void * __iomem __iop13xx_ioremap(unsigned long cookie, size_t size,

	unsigned long flags)

	unsigned int mtype)

{

	void __iomem * retval;
@@ -61,9 +61,9 @@ void * __iomem __iop13xx_ioremap(unsigned long cookie, size_t size, 
			         (cookie - IOP13XX_PCIE_LOWER_MEM_RA));

		break;

	case IOP13XX_PBI_LOWER_MEM_RA ... IOP13XX_PBI_UPPER_MEM_RA:

		retval = __ioremap(IOP13XX_PBI_LOWER_MEM_PA +

		retval = __arm_ioremap(IOP13XX_PBI_LOWER_MEM_PA +

				       (cookie - IOP13XX_PBI_LOWER_MEM_RA),

				  size, flags);

				       size, mtype);

		break;

	case IOP13XX_PCIE_LOWER_IO_PA ... IOP13XX_PCIE_UPPER_IO_PA:

		retval = (void *) IOP13XX_PCIE_IO_PHYS_TO_VIRT(cookie);
@@ -75,7 +75,7 @@ void * __iomem __iop13xx_ioremap(unsigned long cookie, size_t size, 
		retval = (void *) IOP13XX_PMMR_PHYS_TO_VIRT(cookie);

		break;

	default:

		retval = __ioremap(cookie, size, flags);

		retval = __arm_ioremap(cookie, size, mtype);

	}



	return retval;

arch/arm/mach-iop13xx/pci.c

+4 −4
Original line number Diff line number Diff line
@@ -88,9 +88,9 @@ void iop13xx_map_pci_memory(void) 


				if (end) {

					iop13xx_atux_mem_base =

					(u32) __ioremap_pfn(

					(u32) __arm_ioremap_pfn(

					__phys_to_pfn(IOP13XX_PCIX_LOWER_MEM_PA)

					, 0, iop13xx_atux_mem_size, 0);

					, 0, iop13xx_atux_mem_size, MT_DEVICE);

					if (!iop13xx_atux_mem_base) {

						printk("%s: atux allocation "

						       "failed\n", __FUNCTION__);
@@ -114,9 +114,9 @@ void iop13xx_map_pci_memory(void) 


				if (end) {

					iop13xx_atue_mem_base =

					(u32) __ioremap_pfn(

					(u32) __arm_ioremap_pfn(

					__phys_to_pfn(IOP13XX_PCIE_LOWER_MEM_PA)

					, 0, iop13xx_atue_mem_size, 0);

					, 0, iop13xx_atue_mem_size, MT_DEVICE);

					if (!iop13xx_atue_mem_base) {

						printk("%s: atue allocation "

						       "failed\n", __FUNCTION__);

arch/arm/mm/ioremap.c

+9 −11
Original line number Diff line number Diff line
@@ -262,11 +262,10 @@ remap_area_supersections(unsigned long virt, unsigned long pfn, 
 * mapping.  See include/asm-arm/proc-armv/pgtable.h for more information.

 */

void __iomem *

__ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,

	      unsigned long flags)

__arm_ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,

		  unsigned int mtype)

{

	const struct mem_type *type;

	struct mem_type t;

	int err;

	unsigned long addr;

 	struct vm_struct * area;
@@ -277,10 +276,9 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size, 
	if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))

		return NULL;



	t = *get_mem_type(MT_DEVICE);

	t.prot_sect |= flags;

	t.prot_pte |= flags;

	type = &t;

	type = get_mem_type(mtype);

	if (!type)

		return NULL;



	size = PAGE_ALIGN(size);
@@ -311,10 +309,10 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size, 
	flush_cache_vmap(addr, addr + size);

	return (void __iomem *) (offset + addr);

}

EXPORT_SYMBOL(__ioremap_pfn);

EXPORT_SYMBOL(__arm_ioremap_pfn);



void __iomem *

__ioremap(unsigned long phys_addr, size_t size, unsigned long flags)

__arm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)

{

	unsigned long last_addr;

 	unsigned long offset = phys_addr & ~PAGE_MASK;
@@ -332,9 +330,9 @@ __ioremap(unsigned long phys_addr, size_t size, unsigned long flags) 
	 */

	size = PAGE_ALIGN(last_addr + 1) - phys_addr;



 	return __ioremap_pfn(pfn, offset, size, flags);

 	return __arm_ioremap_pfn(pfn, offset, size, mtype);

}

EXPORT_SYMBOL(__ioremap);

EXPORT_SYMBOL(__arm_ioremap);



void __iounmap(volatile void __iomem *addr)

{

arch/arm/mm/nommu.c

+6 −6
Original line number Diff line number Diff line
@@ -62,21 +62,21 @@ void flush_dcache_page(struct page *page) 
}

EXPORT_SYMBOL(flush_dcache_page);



void __iomem *__ioremap_pfn(unsigned long pfn, unsigned long offset,

			    size_t size, unsigned long flags)

void __iomem *__arm_ioremap_pfn(unsigned long pfn, unsigned long offset,

				size_t size, unsigned int mtype)

{

	if (pfn >= (0x100000000ULL >> PAGE_SHIFT))

		return NULL;

	return (void __iomem *) (offset + (pfn << PAGE_SHIFT));

}

EXPORT_SYMBOL(__ioremap_pfn);

EXPORT_SYMBOL(__arm_ioremap_pfn);



void __iomem *__ioremap(unsigned long phys_addr, size_t size,

			unsigned long flags)

void __iomem *__arm_ioremap(unsigned long phys_addr, size_t size,

			    unsigned int mtype)

{

	return (void __iomem *)phys_addr;

}

EXPORT_SYMBOL(__ioremap);

EXPORT_SYMBOL(__arm_ioremap);



void __iounmap(volatile void __iomem *addr)

{

arch/arm/plat-iop/io.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <asm/io.h>



void * __iomem __iop3xx_ioremap(unsigned long cookie, size_t size,

	unsigned long flags)

	unsigned int mtype)

{

	void __iomem * retval;
@@ -34,7 +34,7 @@ void * __iomem __iop3xx_ioremap(unsigned long cookie, size_t size, 
		retval = (void *) IOP3XX_PMMR_PHYS_TO_VIRT(cookie);

		break;

	default:

		retval = __ioremap(cookie, size, flags);

		retval = __arm_ioremap(cookie, size, mtype);

	}



	return retval;

CRA Git | Maintained and supported by SUSTech CRA and CCSE