adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] ppc32: make usage of CONFIG_PTE_64BIT & CONFIG_PHYS_64BIT consistent

Browse source 
CONFIG_PTE_64BIT & CONFIG_PHYS_64BIT are not currently consistently used in
the code base.  Fixed up the usage such that CONFIG_PTE_64BIT is used when we
have a 64-bit PTE regardless of physical address width.  CONFIG_PHYS_64BIT is
used if the physical address width is larger than 32-bits, regardless of PTE
size.

These changes required a few sub-arch specific ifdef's to be fixed and the
introduction of a physical address format string.

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Kumar Gala 2005-04-16 15:24:21 -07:00 committed by Linus Torvalds
parent 7a1e335085
commit a85f6d4aca
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/ppc/mm/pgtable.c
View file

@ -74,7 +74,7 @@ extern unsigned long p_mapped_by_tlbcam(unsigned long pa);
#define p_mapped_by_tlbcam(x) (0UL) #define p_mapped_by_tlbcam(x) (0UL)
#endif /* HAVE_TLBCAM */ #endif /* HAVE_TLBCAM */
#ifdef CONFIG_44x #ifdef CONFIG_PTE_64BIT
/* 44x uses an 8kB pgdir because it has 8-byte Linux PTEs. */ /* 44x uses an 8kB pgdir because it has 8-byte Linux PTEs. */
#define PGDIR_ORDER 1 #define PGDIR_ORDER 1
#else #else
@ -142,13 +142,13 @@ void pte_free(struct page *ptepage)
__free_page(ptepage); __free_page(ptepage);
} }
#ifndef CONFIG_44x #ifndef CONFIG_PHYS_64BIT
void __iomem * void __iomem *
ioremap(phys_addr_t addr, unsigned long size) ioremap(phys_addr_t addr, unsigned long size)
{ {
return __ioremap(addr, size, _PAGE_NO_CACHE); return __ioremap(addr, size, _PAGE_NO_CACHE);
} }
#else /* CONFIG_44x */ #else /* CONFIG_PHYS_64BIT */
void __iomem * void __iomem *
ioremap64(unsigned long long addr, unsigned long size) ioremap64(unsigned long long addr, unsigned long size)
{ {
@ -162,7 +162,7 @@ ioremap(phys_addr_t addr, unsigned long size)
return ioremap64(addr64, size); return ioremap64(addr64, size);
} }
#endif /* CONFIG_44x */ #endif /* CONFIG_PHYS_64BIT */
void __iomem * void __iomem *
__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
@ -193,7 +193,7 @@ __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
*/ */
if ( mem_init_done && (p < virt_to_phys(high_memory)) ) if ( mem_init_done && (p < virt_to_phys(high_memory)) )
{ {
printk("__ioremap(): phys addr "PTE_FMT" is RAM lr %p\n", p, printk("__ioremap(): phys addr "PHYS_FMT" is RAM lr %p\n", p,
__builtin_return_address(0)); __builtin_return_address(0));
return NULL; return NULL;
} }

4
include/asm-ppc/mmu.h
View file

@ -15,11 +15,13 @@
* virtual/physical addressing like 32-bit virtual / 36-bit * virtual/physical addressing like 32-bit virtual / 36-bit
* physical need a larger than native word size type. -Matt * physical need a larger than native word size type. -Matt
*/ */
#ifndef CONFIG_PTE_64BIT #ifndef CONFIG_PHYS_64BIT
typedef unsigned long phys_addr_t; typedef unsigned long phys_addr_t;
#define PHYS_FMT "%.8lx"
#else #else
typedef unsigned long long phys_addr_t; typedef unsigned long long phys_addr_t;
extern phys_addr_t fixup_bigphys_addr(phys_addr_t, phys_addr_t); extern phys_addr_t fixup_bigphys_addr(phys_addr_t, phys_addr_t);
#define PHYS_FMT "%16Lx"
#endif #endif
/* Default "unsigned long" context */ /* Default "unsigned long" context */