evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

powerpc/boot: Rework of_claim() to make it 64bit friendly

Browse source 
This patch fixes 64bit compile warnings and updates the wrapper code
to converge the kernel code in prom_init.

Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Cédric Le Goater 2014-04-24 09:23:30 +02:00 • committed by Benjamin Herrenschmidt
parent 9cc36bb0ac
commit 034e55e6c2
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/powerpc/boot/of.c
View file

@ -40,8 +40,8 @@ static void *of_try_claim(unsigned long size)
#ifdef DEBUG #ifdef DEBUG
printf(" trying: 0x%08lx\n\r", claim_base); printf(" trying: 0x%08lx\n\r", claim_base);
#endif #endif
addr = (unsigned long)of_claim(claim_base, size, 0); addr = (unsigned long) of_claim(claim_base, size, 0);
if ((void *)addr != (void *)-1) if (addr != PROM_ERROR)
break; break;
} }
if (addr == 0) if (addr == 0)

3
arch/powerpc/boot/of.h
View file

@ -6,7 +6,8 @@ typedef void *ihandle;
void of_init(void *promptr); void of_init(void *promptr);
int of_call_prom(const char *service, int nargs, int nret, ...); int of_call_prom(const char *service, int nargs, int nret, ...);
void *of_claim(unsigned long virt, unsigned long size, unsigned long align); unsigned int of_claim(unsigned long virt, unsigned long size,
unsigned long align);
void *of_vmlinux_alloc(unsigned long size); void *of_vmlinux_alloc(unsigned long size);
void of_exit(void); void of_exit(void);
void *of_finddevice(const char *name); void *of_finddevice(const char *name);

15
arch/powerpc/boot/oflib.c
View file

@ -147,7 +147,8 @@ static int check_of_version(void)
return 1; return 1;
} }
void *of_claim(unsigned long virt, unsigned long size, unsigned long align) unsigned int of_claim(unsigned long virt, unsigned long size,
unsigned long align)
{ {
int ret; int ret;
prom_arg_t result; prom_arg_t result;
@ -155,32 +156,32 @@ void *of_claim(unsigned long virt, unsigned long size, unsigned long align)
if (need_map < 0) if (need_map < 0)
need_map = check_of_version(); need_map = check_of_version();
if (align || !need_map) if (align || !need_map)
return (void *) of_call_prom("claim", 3, 1, virt, size, align); return of_call_prom("claim", 3, 1, virt, size, align);
ret = of_call_prom_ret("call-method", 5, 2, &result, "claim", memory, ret = of_call_prom_ret("call-method", 5, 2, &result, "claim", memory,
align, size, virt); align, size, virt);
if (ret != 0 || result == -1) if (ret != 0 || result == -1)
return (void *) -1; return -1;
ret = of_call_prom_ret("call-method", 5, 2, &result, "claim", chosen_mmu, ret = of_call_prom_ret("call-method", 5, 2, &result, "claim", chosen_mmu,
align, size, virt); align, size, virt);
/* 0x12 == coherent + read/write */ /* 0x12 == coherent + read/write */
ret = of_call_prom("call-method", 6, 1, "map", chosen_mmu, ret = of_call_prom("call-method", 6, 1, "map", chosen_mmu,
0x12, size, virt, virt); 0x12, size, virt, virt);
return (void *) virt; return virt;
} }
void *of_vmlinux_alloc(unsigned long size) void *of_vmlinux_alloc(unsigned long size)
{ {
unsigned long start = (unsigned long)_start, end = (unsigned long)_end; unsigned long start = (unsigned long)_start, end = (unsigned long)_end;
void *addr; unsigned long addr;
void *p; void *p;
/* With some older POWER4 firmware we need to claim the area the kernel /* With some older POWER4 firmware we need to claim the area the kernel
* will reside in. Newer firmwares don't need this so we just ignore * will reside in. Newer firmwares don't need this so we just ignore
* the return value. * the return value.
*/ */
addr = of_claim(start, end - start, 0); addr = (unsigned long) of_claim(start, end - start, 0);
printf("Trying to claim from 0x%lx to 0x%lx (0x%lx) got %p\r\n", printf("Trying to claim from 0x%lx to 0x%lx (0x%lx) got %lx\r\n",
start, end, end - start, addr); start, end, end - start, addr);
p = malloc(size); p = malloc(size);