* [Qemu-devel] [PATCH v6] spapr_hcall: add address-translation-mode-on-interrupt resource in H_SET_MODE
@ 2014-03-22 13:03 Alexey Kardashevskiy
2014-04-08 9:14 ` Alexander Graf
2014-04-08 9:28 ` Alexander Graf
0 siblings, 2 replies; 3+ messages in thread
From: Alexey Kardashevskiy @ 2014-03-22 13:03 UTC (permalink / raw)
To: qemu-devel; +Cc: Alexey Kardashevskiy, Mike Day, qemu-ppc, Alexander Graf
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>
Reviewed-by: Mike Day <ncmike@ncultra.org>
---
Changes:
v6:
* replaced "return" with "goto out"/"break" for better consistency
---
hw/ppc/spapr_hcall.c | 29 +++++++++++++++++++++++++++++
target-ppc/cpu.h | 2 ++
2 files changed, 31 insertions(+)
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index 0bae053..7e4d7ff 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -746,6 +746,35 @@ 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)) {
+ ret = H_P2;
+ goto out;
+ }
+ 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);
+ }
+ ret = H_SUCCESS;
+ break;
+
+ default:
+ ret = H_UNSUPPORTED_FLAG;
+ break;
+ }
}
out:
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 2719c08..39527e2 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -463,6 +463,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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH v6] spapr_hcall: add address-translation-mode-on-interrupt resource in H_SET_MODE
2014-03-22 13:03 [Qemu-devel] [PATCH v6] spapr_hcall: add address-translation-mode-on-interrupt resource in H_SET_MODE Alexey Kardashevskiy
@ 2014-04-08 9:14 ` Alexander Graf
2014-04-08 9:28 ` Alexander Graf
1 sibling, 0 replies; 3+ messages in thread
From: Alexander Graf @ 2014-04-08 9:14 UTC (permalink / raw)
To: Alexey Kardashevskiy, qemu-devel; +Cc: Mike Day, Jeffrey Scheel, qemu-ppc
On 22.03.14 14:03, Alexey Kardashevskiy wrote:
> 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>
> Reviewed-by: Mike Day <ncmike@ncultra.org>
Unfortunately I'm lacking a specification to verify this patch against,
so I can not apply it upstream.
Alex
> ---
> Changes:
> v6:
> * replaced "return" with "goto out"/"break" for better consistency
> ---
> hw/ppc/spapr_hcall.c | 29 +++++++++++++++++++++++++++++
> target-ppc/cpu.h | 2 ++
> 2 files changed, 31 insertions(+)
>
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index 0bae053..7e4d7ff 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -746,6 +746,35 @@ 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)) {
> + ret = H_P2;
> + goto out;
> + }
> + 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);
> + }
> + ret = H_SUCCESS;
> + break;
> +
> + default:
> + ret = H_UNSUPPORTED_FLAG;
> + break;
> + }
> }
>
> out:
> diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
> index 2719c08..39527e2 100644
> --- a/target-ppc/cpu.h
> +++ b/target-ppc/cpu.h
> @@ -463,6 +463,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)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH v6] spapr_hcall: add address-translation-mode-on-interrupt resource in H_SET_MODE
2014-03-22 13:03 [Qemu-devel] [PATCH v6] spapr_hcall: add address-translation-mode-on-interrupt resource in H_SET_MODE Alexey Kardashevskiy
2014-04-08 9:14 ` Alexander Graf
@ 2014-04-08 9:28 ` Alexander Graf
1 sibling, 0 replies; 3+ messages in thread
From: Alexander Graf @ 2014-04-08 9:28 UTC (permalink / raw)
To: Alexey Kardashevskiy, qemu-devel; +Cc: Mike Day, qemu-ppc
On 22.03.14 14:03, Alexey Kardashevskiy wrote:
> 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>
> Reviewed-by: Mike Day <ncmike@ncultra.org>
... but I can comment on style issues regardless for now ;)
> ---
> Changes:
> v6:
> * replaced "return" with "goto out"/"break" for better consistency
> ---
> hw/ppc/spapr_hcall.c | 29 +++++++++++++++++++++++++++++
> target-ppc/cpu.h | 2 ++
> 2 files changed, 31 insertions(+)
>
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index 0bae053..7e4d7ff 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -746,6 +746,35 @@ 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) {
We're slowly getting to a point where a switch() would be appropriate,
no? Maybe also extract the individual H_SET_MODE subfunctions into their
own C functions?
> + PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
> +
> + if (!(pcc->insns_flags2 & PPC2_ISA207S)) {
> + ret = H_P2;
> + goto out;
> + }
> + if (value1) {
> + ret = H_P3;
> + goto out;
> + }
> + if (value2) {
> + ret = H_P4;
> + goto out;
> + }
> + switch (mflags) {
> + case 0:
> + case 2:
> + case 3:
Magic numbers. Please give them names.
> + CPU_FOREACH(cs) {
> + set_spr(cs, SPR_LPCR, mflags << LPCR_AIL_SH, LPCR_AIL);
Please implement this bit for TCG if you accept the hcall.
Alex
> + }
> + ret = H_SUCCESS;
> + break;
> +
> + default:
> + ret = H_UNSUPPORTED_FLAG;
> + break;
> + }
> }
>
> out:
> diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
> index 2719c08..39527e2 100644
> --- a/target-ppc/cpu.h
> +++ b/target-ppc/cpu.h
> @@ -463,6 +463,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)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-08 9:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-22 13:03 [Qemu-devel] [PATCH v6] spapr_hcall: add address-translation-mode-on-interrupt resource in H_SET_MODE Alexey Kardashevskiy
2014-04-08 9:14 ` Alexander Graf
2014-04-08 9:28 ` Alexander Graf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).