diff mbox series

[v3,4/5] Revert "Add private HCALL to inform updated RTAS base and entry"

Message ID 20171003051523.17650-5-aik@ozlabs.ru
State Superseded
Headers show
Series fdt: Pass the resulting device tree to QEMU | expand

Commit Message

Alexey Kardashevskiy Oct. 3, 2017, 5:15 a.m. UTC 
This reverts commit f9a60de30 "Add private HCALL to inform
updated RTAS base and entry" as a bigger hammer is coming soon
which will pass the entire device tree to QEMU, not just phandles.

QEMU has never used the hcall this patch is removing so there will
be no compatibility issues.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 lib/libhvcall/libhvcall.h | 4 +---
 board-qemu/slof/rtas.fs   | 6 +-----
 lib/libhvcall/hvcall.code | 6 ------
 lib/libhvcall/hvcall.in   | 1 -
 4 files changed, 2 insertions(+), 15 deletions(-)
diff mbox series

Patch

diff --git a/lib/libhvcall/libhvcall.h b/lib/libhvcall/libhvcall.h
index 193b738..6356a62 100644
--- a/lib/libhvcall/libhvcall.h
+++ b/lib/libhvcall/libhvcall.h
@@ -24,9 +24,7 @@ 
 #define KVMPPC_H_LOGICAL_MEMOP  (KVMPPC_HCALL_BASE + 0x1)
 /* Client Architecture support */
 #define KVMPPC_H_CAS            (KVMPPC_HCALL_BASE + 0x2)
-#define KVMPPC_H_RTAS_UPDATE    (KVMPPC_HCALL_BASE + 0x3)
-#define KVMPPC_H_REPORT_MC_ERR  (KVMPPC_HCALL_BASE + 0x4)
-#define KVMPPC_HCALL_MAX        KVMPPC_H_NMI_MCE
+#define KVMPPC_HCALL_MAX        KVMPPC_H_CAS
 
 #ifndef __ASSEMBLY__
 
diff --git a/board-qemu/slof/rtas.fs b/board-qemu/slof/rtas.fs
index 0d2bf49..b17157e 100644
--- a/board-qemu/slof/rtas.fs
+++ b/board-qemu/slof/rtas.fs
@@ -172,11 +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 0 <> IF
-    ." Failed to update RTAS " cr
-    THEN
-    nip   
+    rtas-entry rtas-base - +
 ;
 
 device-end
diff --git a/lib/libhvcall/hvcall.code b/lib/libhvcall/hvcall.code
index 0ff50f2..744469f 100644
--- a/lib/libhvcall/hvcall.code
+++ b/lib/libhvcall/hvcall.code
@@ -111,12 +111,6 @@  PRIM(hv_X2d_cas)
 	TOS.u = hv_cas(vec, buf, size);
 MIRP
 
-PRIM(hv_X2d_rtas_X2d_update)
-	unsigned long rtas_entry   = TOS.u; POP;
-	unsigned long rtas_base    = TOS.u;
-	TOS.u = hv_generic(KVMPPC_H_RTAS_UPDATE, rtas_base, rtas_entry);
-MIRP
-
 PRIM(get_X2d_print_X2d_version)
 	unsigned long addr = TOS.u; POP;
 	get_print_banner(addr);
diff --git a/lib/libhvcall/hvcall.in b/lib/libhvcall/hvcall.in
index 4437b77..e99d6d1 100644
--- a/lib/libhvcall/hvcall.in
+++ b/lib/libhvcall/hvcall.in
@@ -30,5 +30,4 @@  cod(RX!)
 
 cod(hv-logical-memop)
 cod(hv-cas)
-cod(hv-rtas-update)
 cod(get-print-version)