[Qemu-devel] [PATCH v3 0/3] spapr: fix H_SET_MODE

[Qemu-devel] [PATCH v3 0/3] spapr: fix H_SET_MODE

[Alexey Kardashevskiy]

This fixes H_SET_MODE.

Alexey Kardashevskiy (3):
  target-ppc: introduce powerisa-207-server flag
  spapr-hcall: fix little-endian resource handling in H_SET_MODE
  spapr-hcall: add address-translation-mode-on-interrupt resource in
    H_SET_MODE

 hw/ppc/spapr_hcall.c        | 64 +++++++++++++++++++++++++++++++++++++++------
 include/hw/ppc/spapr.h      |  9 +++++--
 target-ppc/cpu.h            |  4 +++
 target-ppc/translate_init.c |  3 ++-
 4 files changed, 69 insertions(+), 11 deletions(-)

-- 
1.8.4.rc4

[Qemu-devel] [PATCH v3 1/3] target-ppc: introduce powerisa-207-server flag

[Alexey Kardashevskiy]

This flag will be used to decide whether to emulate some bits of
H_SET_MODE hypercall because some are POWER8-only.

While we are here, add 2.05 flag to POWER8 family too. POWER7/7+ already
has it.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 target-ppc/cpu.h            | 2 ++
 target-ppc/translate_init.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 51bcd4a..8e46bda 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -1875,6 +1875,8 @@ enum {
     PPC2_DBRX          = 0x0000000000000010ULL,
     /* Book I 2.05 PowerPC specification                                     */
     PPC2_ISA205        = 0x0000000000000020ULL,
+    /* PowerISA 2.07 Book3s specification                                    */
+    PPC2_ISA207S       = 0x0000000000000040ULL,
 
 #define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \
   PPC2_ISA205)
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 35470d4..7e25c35 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -7144,7 +7144,8 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data)
                        PPC_64B | PPC_ALTIVEC |
                        PPC_SEGMENT_64B | PPC_SLBI |
                        PPC_POPCNTB | PPC_POPCNTWD;
-    pcc->insns_flags2 = PPC2_VSX | PPC2_DFP | PPC2_DBRX;
+    pcc->insns_flags2 = PPC2_VSX | PPC2_DFP | PPC2_DBRX | PPC2_ISA205 |
+                        PPC2_ISA207S;
     pcc->msr_mask = 0x800000000284FF36ULL;
     pcc->mmu_model = POWERPC_MMU_2_06;
 #if defined(CONFIG_SOFTMMU)
-- 
1.8.4.rc4

[Qemu-devel] [PATCH v3 2/3] spapr-hcall: fix little-endian resource handling in H_SET_MODE

[Alexey Kardashevskiy]

This changes resource code definitions to ones used in the host kernel.

This fixes H_SET_MODE_RESOURCE_LE (switch between big endian and
little endian) to sync registers from KVM before changing LPCR value.

This adds a set_spr() helper to update an SPR in a CPU's context to avoid
possible races and makes use of it to change LPCR.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 hw/ppc/spapr_hcall.c   | 38 ++++++++++++++++++++++++++++++--------
 include/hw/ppc/spapr.h |  9 +++++++--
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index f755a53..b21d74b 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -4,6 +4,33 @@
 #include "hw/ppc/spapr.h"
 #include "mmu-hash64.h"
 
+struct spr_sync_struct {
+    CPUState *cs;
+    int spr;
+    target_ulong value;
+    target_ulong mask;
+};
+
+static void do_spr_sync(void *arg)
+{
+    struct spr_sync_struct *s = arg;
+    PowerPCCPU *cp = POWERPC_CPU(s->cs);
+    CPUPPCState *env = &cp->env;
+
+    cpu_synchronize_state(s->cs);
+    env->spr[s->spr] &= ~s->mask;
+    env->spr[s->spr] |= s->value;
+}
+
+static void set_spr(CPUState *cs, int spr, target_ulong value,
+                    target_ulong mask)
+{
+    struct spr_sync_struct s = {
+        .cs = cs, .spr = spr, .value = value, .mask = mask
+    };
+    run_on_cpu(cs, do_spr_sync, &s);
+}
+
 static target_ulong compute_tlbie_rb(target_ulong v, target_ulong r,
                                      target_ulong pte_index)
 {
@@ -667,7 +694,7 @@ static target_ulong h_set_mode(PowerPCCPU *cpu, sPAPREnvironment *spapr,
     target_ulong value2 = args[3];
     target_ulong ret = H_P2;
 
-    if (resource == H_SET_MODE_ENDIAN) {
+    if (resource == H_SET_MODE_RESOURCE_LE) {
         if (value1) {
             ret = H_P3;
             goto out;
@@ -676,22 +703,17 @@ static target_ulong h_set_mode(PowerPCCPU *cpu, sPAPREnvironment *spapr,
             ret = H_P4;
             goto out;
         }
-
         switch (mflags) {
         case H_SET_MODE_ENDIAN_BIG:
             CPU_FOREACH(cs) {
-                PowerPCCPU *cp = POWERPC_CPU(cs);
-                CPUPPCState *env = &cp->env;
-                env->spr[SPR_LPCR] &= ~LPCR_ILE;
+                set_spr(cs, SPR_LPCR, 0, LPCR_ILE);
             }
             ret = H_SUCCESS;
             break;
 
         case H_SET_MODE_ENDIAN_LITTLE:
             CPU_FOREACH(cs) {
-                PowerPCCPU *cp = POWERPC_CPU(cs);
-                CPUPPCState *env = &cp->env;
-                env->spr[SPR_LPCR] |= LPCR_ILE;
+                set_spr(cs, SPR_LPCR, LPCR_ILE, LPCR_ILE);
             }
             ret = H_SUCCESS;
             break;
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index b2f11e9..526faab 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -153,8 +153,13 @@ typedef struct sPAPREnvironment {
 #define H_PP1             (1ULL<<(63-62))
 #define H_PP2             (1ULL<<(63-63))
 
-/* H_SET_MODE flags */
-#define H_SET_MODE_ENDIAN        4
+/* Values for 2nd argument to H_SET_MODE */
+#define H_SET_MODE_RESOURCE_SET_CIABR           1
+#define H_SET_MODE_RESOURCE_SET_DAWR            2
+#define H_SET_MODE_RESOURCE_ADDR_TRANS_MODE     3
+#define H_SET_MODE_RESOURCE_LE                  4
+
+/* Flags for H_SET_MODE_RESOURCE_LE */
 #define H_SET_MODE_ENDIAN_BIG    0
 #define H_SET_MODE_ENDIAN_LITTLE 1
 
-- 
1.8.4.rc4

[Qemu-devel] [PATCH v3 3/3] spapr-hcall: add address-translation-mode-on-interrupt resource in H_SET_MODE

[Alexey Kardashevskiy]

This adds handling of the RESOURCE_ADDR_TRANS_MODE resource from
the H_SET_MODE, for POWER8 (PowerISA 2.07) only.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 hw/ppc/spapr_hcall.c | 26 ++++++++++++++++++++++++++
 target-ppc/cpu.h     |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index b21d74b..7e4fc5f 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -721,6 +721,32 @@ static target_ulong h_set_mode(PowerPCCPU *cpu, sPAPREnvironment *spapr,
         default:
             ret = H_UNSUPPORTED_FLAG;
         }
+    } else if (resource == H_SET_MODE_RESOURCE_ADDR_TRANS_MODE) {
+        PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
+
+        if (!(pcc->insns_flags2 & PPC2_ISA207S)) {
+            return H_P2;
+        }
+        if (value1) {
+            ret = H_P3;
+            goto out;
+        }
+        if (value2) {
+            ret = H_P4;
+            goto out;
+        }
+        switch (mflags) {
+        case 0:
+        case 2:
+        case 3:
+            CPU_FOREACH(cs) {
+                set_spr(cs, SPR_LPCR, mflags << LPCR_AIL_SH, LPCR_AIL);
+            }
+            return H_SUCCESS;
+
+        default:
+            return H_UNSUPPORTED_FLAG;
+        }
     }
 
 out:
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 8e46bda..e1692b1 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -458,6 +458,8 @@ struct ppc_slb_t {
 #define MSR_LE   0  /* Little-endian mode                           1 hflags */
 
 #define LPCR_ILE (1 << (63-38))
+#define LPCR_AIL      0x01800000      /* Alternate interrupt location */
+#define LPCR_AIL_SH   (63-40)
 
 #define msr_sf   ((env->msr >> MSR_SF)   & 1)
 #define msr_isf  ((env->msr >> MSR_ISF)  & 1)
-- 
1.8.4.rc4

Re: [Qemu-devel] [PATCH v3 3/3] spapr-hcall: add address-translation-mode-on-interrupt resource in H_SET_MODE

[Aneesh Kumar K.V]

Alexey Kardashevskiy <aik@ozlabs.ru> writes:

> This adds handling of the RESOURCE_ADDR_TRANS_MODE resource from
> the H_SET_MODE, for POWER8 (PowerISA 2.07) only.
>
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
>  hw/ppc/spapr_hcall.c | 26 ++++++++++++++++++++++++++
>  target-ppc/cpu.h     |  2 ++
>  2 files changed, 28 insertions(+)
>
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index b21d74b..7e4fc5f 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -721,6 +721,32 @@ static target_ulong h_set_mode(PowerPCCPU *cpu, sPAPREnvironment *spapr,
>          default:
>              ret = H_UNSUPPORTED_FLAG;
>          }
> +    } else if (resource == H_SET_MODE_RESOURCE_ADDR_TRANS_MODE) {
> +        PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
> +
> +        if (!(pcc->insns_flags2 & PPC2_ISA207S)) {
> +            return H_P2;
> +        }
> +        if (value1) {
> +            ret = H_P3;
> +            goto out;
> +        }
> +        if (value2) {
> +            ret = H_P4;
> +            goto out;
> +        }
> +        switch (mflags) {
> +        case 0:

Shouldn't case 0 clear the LPCR_AIL bit ?

> +        case 2:
> +        case 3:
> +            CPU_FOREACH(cs) {
> +                set_spr(cs, SPR_LPCR, mflags << LPCR_AIL_SH, LPCR_AIL);
> +            }
> +            return H_SUCCESS;
> +
> +        default:
> +            return H_UNSUPPORTED_FLAG;
> +        }
>      }
>  

-aneesh

Re: [Qemu-devel] [PATCH v3 3/3] spapr-hcall: add address-translation-mode-on-interrupt resource in H_SET_MODE

[Alexey Kardashevskiy]

On 01/23/2014 07:26 PM, Aneesh Kumar K.V wrote:
> Alexey Kardashevskiy <aik@ozlabs.ru> writes:
> 
>> This adds handling of the RESOURCE_ADDR_TRANS_MODE resource from
>> the H_SET_MODE, for POWER8 (PowerISA 2.07) only.
>>
>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>> ---
>>  hw/ppc/spapr_hcall.c | 26 ++++++++++++++++++++++++++
>>  target-ppc/cpu.h     |  2 ++
>>  2 files changed, 28 insertions(+)
>>
>> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
>> index b21d74b..7e4fc5f 100644
>> --- a/hw/ppc/spapr_hcall.c
>> +++ b/hw/ppc/spapr_hcall.c
>> @@ -721,6 +721,32 @@ static target_ulong h_set_mode(PowerPCCPU *cpu, sPAPREnvironment *spapr,
>>          default:
>>              ret = H_UNSUPPORTED_FLAG;
>>          }
>> +    } else if (resource == H_SET_MODE_RESOURCE_ADDR_TRANS_MODE) {
>> +        PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
>> +
>> +        if (!(pcc->insns_flags2 & PPC2_ISA207S)) {
>> +            return H_P2;
>> +        }
>> +        if (value1) {
>> +            ret = H_P3;
>> +            goto out;
>> +        }
>> +        if (value2) {
>> +            ret = H_P4;
>> +            goto out;
>> +        }
>> +        switch (mflags) {
>> +        case 0:
> 
> Shouldn't case 0 clear the LPCR_AIL bit ?

Does not it?


>> +        case 2:
>> +        case 3:
>> +            CPU_FOREACH(cs) {
>> +                set_spr(cs, SPR_LPCR, mflags << LPCR_AIL_SH, LPCR_AIL);
>> +            }
>> +            return H_SUCCESS;
>> +
>> +        default:
>> +            return H_UNSUPPORTED_FLAG;
>> +        }
>>      }
>>  
> 
> -aneesh
> 


-- 
Alexey

Re: [Qemu-devel] [PATCH v3 0/3] spapr: fix H_SET_MODE

[Alexey Kardashevskiy]

On 01/22/2014 04:43 PM, Alexey Kardashevskiy wrote:
> This fixes H_SET_MODE.
> 
> Alexey Kardashevskiy (3):
>   target-ppc: introduce powerisa-207-server flag
>   spapr-hcall: fix little-endian resource handling in H_SET_MODE
>   spapr-hcall: add address-translation-mode-on-interrupt resource in
>     H_SET_MODE
> 
>  hw/ppc/spapr_hcall.c        | 64 +++++++++++++++++++++++++++++++++++++++------
>  include/hw/ppc/spapr.h      |  9 +++++--
>  target-ppc/cpu.h            |  4 +++
>  target-ppc/translate_init.c |  3 ++-
>  4 files changed, 69 insertions(+), 11 deletions(-)

Ping?


-- 
Alexey

Re: [Qemu-devel] [PATCH v3 0/3] spapr: fix H_SET_MODE

[Alexander Graf]

On 02/11/2014 08:44 AM, Alexey Kardashevskiy wrote:
> On 01/22/2014 04:43 PM, Alexey Kardashevskiy wrote:
>> This fixes H_SET_MODE.
>>
>> Alexey Kardashevskiy (3):
>>    target-ppc: introduce powerisa-207-server flag
>>    spapr-hcall: fix little-endian resource handling in H_SET_MODE
>>    spapr-hcall: add address-translation-mode-on-interrupt resource in
>>      H_SET_MODE
>>
>>   hw/ppc/spapr_hcall.c        | 64 +++++++++++++++++++++++++++++++++++++++------
>>   include/hw/ppc/spapr.h      |  9 +++++--
>>   target-ppc/cpu.h            |  4 +++
>>   target-ppc/translate_init.c |  3 ++-
>>   4 files changed, 69 insertions(+), 11 deletions(-)
> Ping?

Why are you pinging? There were review comments on this patch set, no?


Alex

Re: [Qemu-devel] [PATCH v3 0/3] spapr: fix H_SET_MODE

[Alexey Kardashevskiy]

On 02/11/2014 11:12 PM, Alexander Graf wrote:
> On 02/11/2014 08:44 AM, Alexey Kardashevskiy wrote:
>> On 01/22/2014 04:43 PM, Alexey Kardashevskiy wrote:
>>> This fixes H_SET_MODE.
>>>
>>> Alexey Kardashevskiy (3):
>>>    target-ppc: introduce powerisa-207-server flag
>>>    spapr-hcall: fix little-endian resource handling in H_SET_MODE
>>>    spapr-hcall: add address-translation-mode-on-interrupt resource in
>>>      H_SET_MODE
>>>
>>>   hw/ppc/spapr_hcall.c        | 64
>>> +++++++++++++++++++++++++++++++++++++++------
>>>   include/hw/ppc/spapr.h      |  9 +++++--
>>>   target-ppc/cpu.h            |  4 +++
>>>   target-ppc/translate_init.c |  3 ++-
>>>   4 files changed, 69 insertions(+), 11 deletions(-)
>> Ping?
> 
> Why are you pinging? There were review comments on this patch set, no?


I saw question from Aneesh (which does not require a change, I believe) and
that is it. What did I miss?


-- 
Alexey

Re: [Qemu-devel] [PATCH v3 0/3] spapr: fix H_SET_MODE

[Alexey Kardashevskiy]

On 02/11/2014 11:16 PM, Alexey Kardashevskiy wrote:
> On 02/11/2014 11:12 PM, Alexander Graf wrote:
>> On 02/11/2014 08:44 AM, Alexey Kardashevskiy wrote:
>>> On 01/22/2014 04:43 PM, Alexey Kardashevskiy wrote:
>>>> This fixes H_SET_MODE.
>>>>
>>>> Alexey Kardashevskiy (3):
>>>>    target-ppc: introduce powerisa-207-server flag
>>>>    spapr-hcall: fix little-endian resource handling in H_SET_MODE
>>>>    spapr-hcall: add address-translation-mode-on-interrupt resource in
>>>>      H_SET_MODE
>>>>
>>>>   hw/ppc/spapr_hcall.c        | 64
>>>> +++++++++++++++++++++++++++++++++++++++------
>>>>   include/hw/ppc/spapr.h      |  9 +++++--
>>>>   target-ppc/cpu.h            |  4 +++
>>>>   target-ppc/translate_init.c |  3 ++-
>>>>   4 files changed, 69 insertions(+), 11 deletions(-)
>>> Ping?
>>
>> Why are you pinging? There were review comments on this patch set, no?


Have I answered these questions? Or am I still missing some review
comments? Or what? Thanks.


> 
> 
> I saw question from Aneesh (which does not require a change, I believe) and
> that is it. What did I miss?



-- 
Alexey

Re: [Qemu-devel] [PATCH v3 0/3] spapr: fix H_SET_MODE

[Alexey Kardashevskiy]

On 02/14/2014 08:30 PM, Alexey Kardashevskiy wrote:
> On 02/11/2014 11:16 PM, Alexey Kardashevskiy wrote:
>> On 02/11/2014 11:12 PM, Alexander Graf wrote:
>>> On 02/11/2014 08:44 AM, Alexey Kardashevskiy wrote:
>>>> On 01/22/2014 04:43 PM, Alexey Kardashevskiy wrote:
>>>>> This fixes H_SET_MODE.
>>>>>
>>>>> Alexey Kardashevskiy (3):
>>>>>    target-ppc: introduce powerisa-207-server flag
>>>>>    spapr-hcall: fix little-endian resource handling in H_SET_MODE
>>>>>    spapr-hcall: add address-translation-mode-on-interrupt resource in
>>>>>      H_SET_MODE
>>>>>
>>>>>   hw/ppc/spapr_hcall.c        | 64
>>>>> +++++++++++++++++++++++++++++++++++++++------
>>>>>   include/hw/ppc/spapr.h      |  9 +++++--
>>>>>   target-ppc/cpu.h            |  4 +++
>>>>>   target-ppc/translate_init.c |  3 ++-
>>>>>   4 files changed, 69 insertions(+), 11 deletions(-)
>>>> Ping?
>>>
>>> Why are you pinging? There were review comments on this patch set, no?
> 
> 
> Have I answered these questions? Or am I still missing some review
> comments? Or what? Thanks.
> 
> 
>>
>>
>> I saw question from Aneesh (which does not require a change, I believe) and
>> that is it. What did I miss?

Ping?

I really (really) do not understand what comments were meant. Thanks.


-- 
Alexey