Skip to contentSkip to conversation

spapr: Add RTAS sysparm UUID

PATCH Superseded Sam Bobroff 2 participants 8 messages Jun 24, 2014 1 message not in the archive

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Sam Bobroff

author
#1 lore raw

PATCH 1/4 spapr: Add rtas_st_buffer utility function

Add a function to write lengh + data into a buffer as required for the emulation of the RTAS ibm,get-system-parameter call.

If the destination is smaller than the source, the write is truncated and success is returned. This matches the behaviour of pHyp.

This will be used in following patches.

Signed-off-by Sam Bobroff <[email protected]>
---
 include/hw/ppc/spapr.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
include/hw/ppc/spapr.h +17 -0
index 08c301f..39a7764 100644
@@ -373,6 +373,23 @@ static inline void rtas_st(target_ulong phys, int n, uint32_t val)
     stl_be_phys(&address_space_memory, ppc64_phys_to_real(phys + 4*n), val);
 }
 
+
+static inline void rtas_st_buffer(target_ulong phys, target_ulong phys_len,
+                                  uint8_t *buffer, uint16_t buffer_len)
+{
+    uint16_t i;
+
+    if (phys_len < 2) {
+        return;
+    }
+    stw_be_phys(&address_space_memory,
+                ppc64_phys_to_real(phys), buffer_len);
+    for (i = 0; i < MIN(buffer_len, phys_len - 2); i++) {
+        stb_phys(&address_space_memory,
+                 ppc64_phys_to_real(phys + 2 + i), buffer[i]);
+    }
+}
+
 typedef void (*spapr_rtas_fn)(PowerPCCPU *cpu, sPAPREnvironment *spapr,
                               uint32_t token,
                               uint32_t nargs, target_ulong args,
Signature · 1 line
1.9.0
#2 lore raw

Re: [Qemu-devel] [Qemu-ppc] [PATCH 1/4] spapr: Add rtas_st_buffer utility function

Quoted 26 lines · Sam Bobroff

Add a function to write lengh + data into a buffer as required for the emulation of the RTAS ibm,get-system-parameter call.

If the destination is smaller than the source, the write is truncated and success is returned. This matches the behaviour of pHyp.

This will be used in following patches.

Signed-off-by Sam Bobroff <[email protected]>
---
  include/hw/ppc/spapr.h | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
include/hw/ppc/spapr.h +5 -0
index 08c301f..39a7764 100644
@@ -373,6 +373,23 @@ static inline void rtas_st(target_ulong phys, int n, uint32_t val)
      stl_be_phys(&address_space_memory, ppc64_phys_to_real(phys + 4*n), val);
  }
 
+
+static inline void rtas_st_buffer(target_ulong phys, target_ulong phys_len,
+                                  uint8_t *buffer, uint16_t buffer_len)
+{
+    uint16_t i;

include/hw/ppc/spapr.h static inline void rtas_st(target_ulong phys, int n, uint32_t val) · line 390

Quoted 10 lines
include/hw/ppc/spapr.h +10 -0
+
+    if (phys_len < 2) {
+        return;
+    }
+    stw_be_phys(&address_space_memory,
+                ppc64_phys_to_real(phys), buffer_len);
+    for (i = 0; i < MIN(buffer_len, phys_len - 2); i++) {
+        stb_phys(&address_space_memory,
+                 ppc64_phys_to_real(phys + 2 + i), buffer[i]);
+    }

cpu_physical_memory_write()?

Alex

author
#3 lore raw

PATCH 2/4 spapr: Add RTAS sysparm UUID

In reply to a message not in the archive

Add support for the UUID parameter to the emulated RTAS call ibm,get-system-parameter.

Return the guest's UUID as the value for the RTAS UUID system parameter, or null (a zero length result) if it is not set.

Signed-off-by Sam Bobroff <[email protected]>
---
 hw/ppc/spapr_rtas.c | 6 ++++++
 1 file changed, 6 insertions(+)
hw/ppc/spapr_rtas.c +6 -0
index ea4a2b2..4f87673 100644
@@ -225,6 +225,7 @@ static void rtas_stop_self(PowerPCCPU *cpu, sPAPREnvironment *spapr,
 }
 
 #define DIAGNOSTICS_RUN_MODE        42
+#define UUID                        48
 
 static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu,
                                           sPAPREnvironment *spapr,

@@ -244,6 +245,10 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu,
             ret = RTAS_OUT_SUCCESS;
         }
         break;
+    case UUID:
+        rtas_st_buffer(buffer, length, qemu_uuid, (qemu_uuid_set ? 16 : 0));
+        ret = RTAS_OUT_SUCCESS;
+        break;
     }
 
     rtas_st(rets, 0, ret);

@@ -260,6 +265,7 @@ static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu,
 
     switch (parameter) {
     case DIAGNOSTICS_RUN_MODE:
+    case UUID:
         ret = RTAS_OUT_NOT_AUTHORIZED;
         break;
     }
Signature · 1 line
1.9.0
author
#4 lore raw

PATCH 3/4 spapr: Fix RTAS sysparm DIAGNOSTICS_RUN_MODE

In reply to a message not in the archive

This allows the ibm,get-system-parameter RTAS call to succeed for the DIAGNOSTICS_RUN_MODE system parameter.

The problem can be seen with "ppc64_cpu --run-mode" from the powerpc-utils package which fails before this patch with "Machine does not support diagnostic run mode".

This is corrected by using the rtas_st_buffer() function to write to the buffer.

The function return value code is also slightly simplified.

Signed-off-by Sam Bobroff <[email protected]>
---
 hw/ppc/spapr_rtas.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
hw/ppc/spapr_rtas.c +5 -6
index 4f87673..8d94845 100644
@@ -236,19 +236,18 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu,
     target_ulong parameter = rtas_ld(args, 0);
     target_ulong buffer = rtas_ld(args, 1);
     target_ulong length = rtas_ld(args, 2);
-    target_ulong ret = RTAS_OUT_NOT_SUPPORTED;
+    target_ulong ret = RTAS_OUT_SUCCESS;
+    uint8_t zero = 0;
 
     switch (parameter) {
     case DIAGNOSTICS_RUN_MODE:
-        if (length == 1) {
-            rtas_st(buffer, 0, 0);
-            ret = RTAS_OUT_SUCCESS;
-        }
+        rtas_st_buffer(buffer, length, &zero, sizeof zero);
         break;
     case UUID:
         rtas_st_buffer(buffer, length, qemu_uuid, (qemu_uuid_set ? 16 : 0));
-        ret = RTAS_OUT_SUCCESS;
         break;
+    default:
+        ret = RTAS_OUT_NOT_SUPPORTED;
     }
 
     rtas_st(rets, 0, ret);
Signature · 1 line
1.9.0
#5 lore raw

Re: [Qemu-devel] [Qemu-ppc] [PATCH 3/4] spapr: Fix RTAS sysparm DIAGNOSTICS_RUN_MODE

Quoted 26 lines · Sam Bobroff

This allows the ibm,get-system-parameter RTAS call to succeed for the DIAGNOSTICS_RUN_MODE system parameter.

The problem can be seen with "ppc64_cpu --run-mode" from the powerpc-utils package which fails before this patch with "Machine does not support diagnostic run mode".

This is corrected by using the rtas_st_buffer() function to write to the buffer.

The function return value code is also slightly simplified.

Signed-off-by Sam Bobroff <[email protected]>
---
  hw/ppc/spapr_rtas.c | 11 +++++------
  1 file changed, 5 insertions(+), 6 deletions(-)
hw/ppc/spapr_rtas.c +0 -1
index 4f87673..8d94845 100644
@@ -236,19 +236,18 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu,
      target_ulong parameter = rtas_ld(args, 0);
      target_ulong buffer = rtas_ld(args, 1);
      target_ulong length = rtas_ld(args, 2);
-    target_ulong ret = RTAS_OUT_NOT_SUPPORTED;

hw/ppc/spapr_rtas.c static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu, · line 244

Quoted 10 lines
hw/ppc/spapr_rtas.c +3 -4
+    target_ulong ret = RTAS_OUT_SUCCESS;
+    uint8_t zero = 0;
 
      switch (parameter) {
      case DIAGNOSTICS_RUN_MODE:
-        if (length == 1) {
-            rtas_st(buffer, 0, 0);
-            ret = RTAS_OUT_SUCCESS;
-        }
+        rtas_st_buffer(buffer, length, &zero, sizeof zero);

Please use sizeof(zero) here :).

Alex

#6 lore raw

Re: [Qemu-devel] [Qemu-ppc] [PATCH 3/4] spapr: Fix RTAS sysparm DIAGNOSTICS_RUN_MODE

Quoted 32 lines · Alexander Graf
Quoted 30 lines · Sam Bobroff

This allows the ibm,get-system-parameter RTAS call to succeed for the DIAGNOSTICS_RUN_MODE system parameter.

The problem can be seen with "ppc64_cpu --run-mode" from the powerpc-utils package which fails before this patch with "Machine does not support diagnostic run mode".

This is corrected by using the rtas_st_buffer() function to write to the buffer.

The function return value code is also slightly simplified.

Signed-off-by Sam Bobroff <[email protected]>
---
  hw/ppc/spapr_rtas.c | 11 +++++------
  1 file changed, 5 insertions(+), 6 deletions(-)
hw/ppc/spapr_rtas.c +2 -1
index 4f87673..8d94845 100644
@@ -236,19 +236,18 @@ static void 
 rtas_ibm_get_system_parameter(PowerPCCPU *cpu,
      target_ulong parameter = rtas_ld(args, 0);
      target_ulong buffer = rtas_ld(args, 1);
      target_ulong length = rtas_ld(args, 2);
-    target_ulong ret = RTAS_OUT_NOT_SUPPORTED;
+    target_ulong ret = RTAS_OUT_SUCCESS;
+    uint8_t zero = 0;
        switch (parameter) {
Quoted 8 lines

hw/ppc/spapr_rtas.c static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu, · line 244

Quoted 6 lines
hw/ppc/spapr_rtas.c +1 -4
      case DIAGNOSTICS_RUN_MODE:
-        if (length == 1) {
-            rtas_st(buffer, 0, 0);
-            ret = RTAS_OUT_SUCCESS;
-        }
+        rtas_st_buffer(buffer, length, &zero, sizeof zero);

Please use sizeof(zero) here :).

Also while at it, please make the code slightly more readable. We don't pass in "zero", we pass in DIAGNOSTICS_RUN_MODE_DISABLED, no? Please define the possible values in a header file and set it accordingly here.

Since it's limited to DIAGNOSTICS_RUN_MODE, please also make the variable limited to that scope then.

Alex

author
#7 lore raw

PATCH 4/4 spapr: Add RTAS sysparm SPLPAR Characteristics

In reply to a message not in the archive

Add support for the SPLPAR Characteristics parameter to the emulated RTAS call ibm,get-system-parameter.

The support provides just enough information to allow "cat /proc/powerpc/lparcfg" to succeed without generating a kernel error message.

Without this patch the above command will produce the following kernel
message: arch/powerpc/platforms/pseries/lparcfg.c \
parse_system_parameter_string Error calling get-system-parameter \
(0xfffffffd)

Signed-off-by Sam Bobroff <[email protected]>
---
 hw/ppc/spapr_rtas.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
hw/ppc/spapr_rtas.c +13 -0
index 8d94845..4270e7a 100644
@@ -224,6 +224,7 @@ static void rtas_stop_self(PowerPCCPU *cpu, sPAPREnvironment *spapr,
     env->msr = 0;
 }
 
+#define SPLPAR_CHARACTERISTICS      20
 #define DIAGNOSTICS_RUN_MODE        42
 #define UUID                        48
 

@@ -238,8 +239,20 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu,
     target_ulong length = rtas_ld(args, 2);
     target_ulong ret = RTAS_OUT_SUCCESS;
     uint8_t zero = 0;
+    uint8_t param_buf[64];
+    int param_len;
 
     switch (parameter) {
+    case SPLPAR_CHARACTERISTICS:
+        param_len = snprintf((char *)param_buf, sizeof param_buf,
+                             "MaxEntCap=%d,MaxPlatProcs=%d",
+                             max_cpus, smp_cpus);
+        if (param_len >= 0) {
+            rtas_st_buffer(buffer, length, param_buf, param_len);
+        } else {
+            ret = RTAS_OUT_HW_ERROR;
+        }
+        break;
     case DIAGNOSTICS_RUN_MODE:
         rtas_st_buffer(buffer, length, &zero, sizeof zero);
         break;
Signature · 1 line
1.9.0
#8 lore raw

Re: [Qemu-devel] [Qemu-ppc] [PATCH 4/4] spapr: Add RTAS sysparm SPLPAR Characteristics

Quoted 31 lines · Sam Bobroff

Add support for the SPLPAR Characteristics parameter to the emulated RTAS call ibm,get-system-parameter.

The support provides just enough information to allow "cat /proc/powerpc/lparcfg" to succeed without generating a kernel error message.

Without this patch the above command will produce the following kernel
message: arch/powerpc/platforms/pseries/lparcfg.c \
parse_system_parameter_string Error calling get-system-parameter \
(0xfffffffd)

Signed-off-by Sam Bobroff <[email protected]>
---
  hw/ppc/spapr_rtas.c | 13 +++++++++++++
  1 file changed, 13 insertions(+)
hw/ppc/spapr_rtas.c +1 -0
index 8d94845..4270e7a 100644
@@ -224,6 +224,7 @@ static void rtas_stop_self(PowerPCCPU *cpu, sPAPREnvironment *spapr,
      env->msr = 0;
  }
 
+#define SPLPAR_CHARACTERISTICS      20
  #define DIAGNOSTICS_RUN_MODE        42
  #define UUID                        48
 

@@ -238,8 +239,20 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu,
      target_ulong length = rtas_ld(args, 2);

hw/ppc/spapr_rtas.c static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu, · line 249

Quoted 10 lines
hw/ppc/spapr_rtas.c +6 -0
      target_ulong ret = RTAS_OUT_SUCCESS;
      uint8_t zero = 0;
+    uint8_t param_buf[64];
+    int param_len;
 
      switch (parameter) {
+    case SPLPAR_CHARACTERISTICS:
+        param_len = snprintf((char *)param_buf, sizeof param_buf,
+                             "MaxEntCap=%d,MaxPlatProcs=%d",
+                             max_cpus, smp_cpus);

We have a nice g_strdup_printf() helper function that allocates memory for us automatically based on the printf size. Just use that one here ;).

Alex