diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2006-06-23 18:20:13 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-06-28 11:59:48 +1000 |
commit | 458148c00b97864a27ecf528a1d45a8e5ebd9bbc (patch) | |
tree | cd32ceb1cddc32e501a1aeebd0f0f88dbdd950a5 /arch/powerpc/kernel/rtas.c | |
parent | ab3ab74d9b6b3920be70f502b40cb3f7f08d23fa (diff) | |
download | op-kernel-dev-458148c00b97864a27ecf528a1d45a8e5ebd9bbc.zip op-kernel-dev-458148c00b97864a27ecf528a1d45a8e5ebd9bbc.tar.gz |
[POWERPC] Setup RTAS values earlier, to enable rtas_call() earlier
Althought RTAS is instantiated when we enter the kernel, we can't actually
call into it until we know its entry point address. Currently we grab that
in rtas_initialize(), however that's quite late in the boot sequence.
To enable rtas_call() earlier, we can grab the RTAS entry etc. values while
we're scanning the flattened device tree. There's existing code to retrieve
the values from /chosen, however we don't store them there anymore, so remove
that code.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/rtas.c')
-rw-r--r-- | arch/powerpc/kernel/rtas.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index b6aed76..061d8af 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -801,3 +801,25 @@ void __init rtas_initialize(void) rtas_last_error_token = rtas_token("rtas-last-error"); #endif } + +int __init early_init_dt_scan_rtas(unsigned long node, + const char *uname, int depth, void *data) +{ + u32 *basep, *entryp, *sizep; + + if (depth != 1 || strcmp(uname, "rtas") != 0) + return 0; + + basep = of_get_flat_dt_prop(node, "linux,rtas-base", NULL); + entryp = of_get_flat_dt_prop(node, "linux,rtas-entry", NULL); + sizep = of_get_flat_dt_prop(node, "rtas-size", NULL); + + if (basep && entryp && sizep) { + rtas.base = *basep; + rtas.entry = *entryp; + rtas.size = *sizep; + } + + /* break now */ + return 1; +} |