diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2017-10-03 12:12:38 +1100 |
|---|---|---|
| committer | Alexey Kardashevskiy <aik@ozlabs.ru> | 2017-10-24 12:19:26 +1100 |
| commit | b722179cf6054e22bb0939807b66872be0ddc6a5 (patch) | |
| tree | 993168a678d0dc23c679723a617b1745d0ce4854 /board-qemu/slof | |
| parent | ea31295cf36598852b8ffea0a4f212625878f365 (diff) | |
| download | SLOF-b722179cf6054e22bb0939807b66872be0ddc6a5.zip SLOF-b722179cf6054e22bb0939807b66872be0ddc6a5.tar.gz SLOF-b722179cf6054e22bb0939807b66872be0ddc6a5.tar.bz2 | |
Revert various SLOF-to-QEMU private hypercalls
This reverts commits:
604d28cc3 "board-qemu: add private hcall to inform host on "phandle" update"
089fc18a9 "libhvcall: drop unused KVMPPC_H_REPORT_MC_ERR and KVMPPC_H_NMI_MCE defines"
1c17c13a5 "rtas: Improve error handling in instantiate-rtas"
f9a60de30 "Add private HCALL to inform updated RTAS base and entry"
A bigger hammer is coming soon which will pass the entire device
tree to QEMU, not just some random bits.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Greg Kurz <groug@kaod.org>
Diffstat (limited to 'board-qemu/slof')
| -rw-r--r-- | board-qemu/slof/fdt.fs | 14 | ||||
| -rw-r--r-- | board-qemu/slof/rtas.fs | 9 |
2 files changed, 3 insertions, 20 deletions
diff --git a/board-qemu/slof/fdt.fs b/board-qemu/slof/fdt.fs index a24e344..851645e 100644 --- a/board-qemu/slof/fdt.fs +++ b/board-qemu/slof/fdt.fs @@ -308,28 +308,18 @@ fdt-claim-reserve 3drop ; -\ Tell QEMU about the updated phandle: -: fdt-hv-update-phandle ( old new -- ) - hv-update-phandle ?dup IF - \ Ignore hcall not implemented error, print error otherwise - dup -2 <> IF ." HV-UPDATE-PHANDLE error: " . cr ELSE drop THEN - THEN -; - \ Replace one FDT phandle "val" with a OF1275 phandle "node" in the \ whole tree: : fdt-update-phandle ( val node -- ) >r FALSE TO (fdt-phandle-replaced) - r@ 2dup s" /" find-node ( val node val node root ) - fdt-replace-all-phandles ( val node ) + r@ s" /" find-node ( val node root ) + fdt-replace-all-phandles (fdt-phandle-replaced) IF - fdt-hv-update-phandle r@ set-node s" phandle" delete-property s" linux,phandle" delete-property ELSE - 2drop diagnostic-mode? IF cr ." Warning: Did not replace phandle in " r@ node>path type cr THEN diff --git a/board-qemu/slof/rtas.fs b/board-qemu/slof/rtas.fs index 54d3929..b17157e 100644 --- a/board-qemu/slof/rtas.fs +++ b/board-qemu/slof/rtas.fs @@ -172,14 +172,7 @@ rtas-node set-node : instantiate-rtas ( adr -- entry ) dup rtas-base swap rtas-size move - dup rtas-entry rtas-base - + - 2dup hv-rtas-update dup 0 <> IF - \ Ignore hcall not implemented error, print error otherwise - dup -2 <> IF ." HV-RTAS-UPDATE error: " . cr ELSE drop THEN - ELSE - drop - THEN - nip + rtas-entry rtas-base - + ; device-end |