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

Commit d639bab8 authored by venkatesh.pallipadi@intel.com's avatar venkatesh.pallipadi@intel.com Committed by Ingo Molnar
Browse files

x86 PAT: ioremap_wc should take resource_size_t parameter 



Impact: fix/extend ioremap_wc() beyond 4GB aperture on 32-bit

ioremap_wc() was taking in unsigned long parameter, where as it should take
64-bit resource_size_t parameter like other ioremap variants.

Signed-off-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f3b8436a

arch/x86/include/asm/io.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ extern void unxlate_dev_mem_ptr(unsigned long phys, void *addr); 




extern int ioremap_change_attr(unsigned long vaddr, unsigned long size,

extern int ioremap_change_attr(unsigned long vaddr, unsigned long size,

				unsigned long prot_val);

				unsigned long prot_val);

extern void __iomem *ioremap_wc(unsigned long offset, unsigned long size);

extern void __iomem *ioremap_wc(resource_size_t offset, unsigned long size);





/*

/*

 * early_ioremap() and early_iounmap() are for temporary early boot-time

 * early_ioremap() and early_iounmap() are for temporary early boot-time

arch/x86/mm/ioremap.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -367,7 +367,7 @@ EXPORT_SYMBOL(ioremap_nocache); 
 *

 *

 * Must be freed with iounmap.

 * Must be freed with iounmap.

 */

 */

void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size)

void __iomem *ioremap_wc(resource_size_t phys_addr, unsigned long size)

{

{

	if (pat_enabled)

	if (pat_enabled)

		return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,

		return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,