* [PATCH v4] hw/ppc: moved has_spr to cpu.h
@ 2021-05-07 16:41 Lucas Mateus Castro (alqotel)
2021-05-07 17:20 ` Richard Henderson
2021-05-08 6:42 ` David Gibson
0 siblings, 2 replies; 3+ messages in thread
From: Lucas Mateus Castro (alqotel) @ 2021-05-07 16:41 UTC (permalink / raw)
To: qemu-devel, qemu-ppc; +Cc: bruno.larsen, Lucas Mateus Castro (alqotel), david
Moved has_spr to cpu.h as ppc_has_spr and turned it into an inline function.
Change spr verification in pnv.c and spapr.c to a version that can
compile in a !TCG environment.
Signed-off-by: Lucas Mateus Castro (alqotel) <lucas.araujo@eldorado.org.br>
---
hw/ppc/pnv.c | 2 +-
hw/ppc/spapr.c | 4 ++--
hw/ppc/spapr_hcall.c | 12 +++---------
target/ppc/cpu.h | 6 ++++++
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index ffe01977cd..d16dd2d080 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -196,7 +196,7 @@ static void pnv_dt_core(PnvChip *chip, PnvCore *pc, void *fdt)
_FDT((fdt_setprop_string(fdt, offset, "status", "okay")));
_FDT((fdt_setprop(fdt, offset, "64-bit", NULL, 0)));
- if (env->spr_cb[SPR_PURR].oea_read) {
+ if (ppc_has_spr(cpu, SPR_PURR)) {
_FDT((fdt_setprop(fdt, offset, "ibm,purr", NULL, 0)));
}
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 4db448d63e..c23bcc4490 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -703,10 +703,10 @@ static void spapr_dt_cpu(CPUState *cs, void *fdt, int offset,
_FDT((fdt_setprop_string(fdt, offset, "status", "okay")));
_FDT((fdt_setprop(fdt, offset, "64-bit", NULL, 0)));
- if (env->spr_cb[SPR_PURR].oea_read) {
+ if (ppc_has_spr(cpu, SPR_PURR)) {
_FDT((fdt_setprop_cell(fdt, offset, "ibm,purr", 1)));
}
- if (env->spr_cb[SPR_SPURR].oea_read) {
+ if (ppc_has_spr(cpu, SPR_PURR)) {
_FDT((fdt_setprop_cell(fdt, offset, "ibm,spurr", 1)));
}
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index 6dbaa93d15..f25014afda 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -20,12 +20,6 @@
#include "mmu-book3s-v3.h"
#include "hw/mem/memory-device.h"
-static bool has_spr(PowerPCCPU *cpu, int spr)
-{
- /* We can test whether the SPR is defined by checking for a valid name */
- return cpu->env.spr_cb[spr].name != NULL;
-}
-
bool is_ram_address(SpaprMachineState *spapr, hwaddr addr)
{
MachineState *machine = MACHINE(spapr);
@@ -212,12 +206,12 @@ static target_ulong h_set_sprg0(PowerPCCPU *cpu, SpaprMachineState *spapr,
static target_ulong h_set_dabr(PowerPCCPU *cpu, SpaprMachineState *spapr,
target_ulong opcode, target_ulong *args)
{
- if (!has_spr(cpu, SPR_DABR)) {
+ if (!ppc_has_spr(cpu, SPR_DABR)) {
return H_HARDWARE; /* DABR register not available */
}
cpu_synchronize_state(CPU(cpu));
- if (has_spr(cpu, SPR_DABRX)) {
+ if (ppc_has_spr(cpu, SPR_DABRX)) {
cpu->env.spr[SPR_DABRX] = 0x3; /* Use Problem and Privileged state */
} else if (!(args[0] & 0x4)) { /* Breakpoint Translation set? */
return H_RESERVED_DABR;
@@ -232,7 +226,7 @@ static target_ulong h_set_xdabr(PowerPCCPU *cpu, SpaprMachineState *spapr,
{
target_ulong dabrx = args[1];
- if (!has_spr(cpu, SPR_DABR) || !has_spr(cpu, SPR_DABRX)) {
+ if (!ppc_has_spr(cpu, SPR_DABR) || !ppc_has_spr(cpu, SPR_DABRX)) {
return H_HARDWARE;
}
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index a976e7f7b0..98fcf1c4d6 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -2642,6 +2642,12 @@ static inline ppc_avr_t *cpu_avr_ptr(CPUPPCState *env, int i)
return (ppc_avr_t *)((uintptr_t)env + avr_full_offset(i));
}
+static inline bool ppc_has_spr(PowerPCCPU *cpu, int spr)
+{
+ /* We can test whether the SPR is defined by checking for a valid name */
+ return cpu->env.spr_cb[spr].name != NULL;
+}
+
void dump_mmu(CPUPPCState *env);
void ppc_maybe_bswap_register(CPUPPCState *env, uint8_t *mem_buf, int len);
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v4] hw/ppc: moved has_spr to cpu.h
2021-05-07 16:41 [PATCH v4] hw/ppc: moved has_spr to cpu.h Lucas Mateus Castro (alqotel)
@ 2021-05-07 17:20 ` Richard Henderson
2021-05-08 6:42 ` David Gibson
1 sibling, 0 replies; 3+ messages in thread
From: Richard Henderson @ 2021-05-07 17:20 UTC (permalink / raw)
To: Lucas Mateus Castro (alqotel), qemu-devel, qemu-ppc; +Cc: bruno.larsen, david
On 5/7/21 9:41 AM, Lucas Mateus Castro (alqotel) wrote:
> Moved has_spr to cpu.h as ppc_has_spr and turned it into an inline function.
> Change spr verification in pnv.c and spapr.c to a version that can
> compile in a !TCG environment.
>
> Signed-off-by: Lucas Mateus Castro (alqotel)<lucas.araujo@eldorado.org.br>
> ---
> hw/ppc/pnv.c | 2 +-
> hw/ppc/spapr.c | 4 ++--
> hw/ppc/spapr_hcall.c | 12 +++---------
> target/ppc/cpu.h | 6 ++++++
> 4 files changed, 12 insertions(+), 12 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v4] hw/ppc: moved has_spr to cpu.h
2021-05-07 16:41 [PATCH v4] hw/ppc: moved has_spr to cpu.h Lucas Mateus Castro (alqotel)
2021-05-07 17:20 ` Richard Henderson
@ 2021-05-08 6:42 ` David Gibson
1 sibling, 0 replies; 3+ messages in thread
From: David Gibson @ 2021-05-08 6:42 UTC (permalink / raw)
To: Lucas Mateus Castro (alqotel); +Cc: bruno.larsen, qemu-ppc, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 4305 bytes --]
On Fri, May 07, 2021 at 01:41:46PM -0300, Lucas Mateus Castro (alqotel) wrote:
> Moved has_spr to cpu.h as ppc_has_spr and turned it into an inline function.
> Change spr verification in pnv.c and spapr.c to a version that can
> compile in a !TCG environment.
>
> Signed-off-by: Lucas Mateus Castro (alqotel)
> <lucas.araujo@eldorado.org.br>
Applied to ppc-for-6.1, thanks.
> ---
> hw/ppc/pnv.c | 2 +-
> hw/ppc/spapr.c | 4 ++--
> hw/ppc/spapr_hcall.c | 12 +++---------
> target/ppc/cpu.h | 6 ++++++
> 4 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index ffe01977cd..d16dd2d080 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -196,7 +196,7 @@ static void pnv_dt_core(PnvChip *chip, PnvCore *pc, void *fdt)
> _FDT((fdt_setprop_string(fdt, offset, "status", "okay")));
> _FDT((fdt_setprop(fdt, offset, "64-bit", NULL, 0)));
>
> - if (env->spr_cb[SPR_PURR].oea_read) {
> + if (ppc_has_spr(cpu, SPR_PURR)) {
> _FDT((fdt_setprop(fdt, offset, "ibm,purr", NULL, 0)));
> }
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 4db448d63e..c23bcc4490 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -703,10 +703,10 @@ static void spapr_dt_cpu(CPUState *cs, void *fdt, int offset,
> _FDT((fdt_setprop_string(fdt, offset, "status", "okay")));
> _FDT((fdt_setprop(fdt, offset, "64-bit", NULL, 0)));
>
> - if (env->spr_cb[SPR_PURR].oea_read) {
> + if (ppc_has_spr(cpu, SPR_PURR)) {
> _FDT((fdt_setprop_cell(fdt, offset, "ibm,purr", 1)));
> }
> - if (env->spr_cb[SPR_SPURR].oea_read) {
> + if (ppc_has_spr(cpu, SPR_PURR)) {
> _FDT((fdt_setprop_cell(fdt, offset, "ibm,spurr", 1)));
> }
>
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index 6dbaa93d15..f25014afda 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -20,12 +20,6 @@
> #include "mmu-book3s-v3.h"
> #include "hw/mem/memory-device.h"
>
> -static bool has_spr(PowerPCCPU *cpu, int spr)
> -{
> - /* We can test whether the SPR is defined by checking for a valid name */
> - return cpu->env.spr_cb[spr].name != NULL;
> -}
> -
> bool is_ram_address(SpaprMachineState *spapr, hwaddr addr)
> {
> MachineState *machine = MACHINE(spapr);
> @@ -212,12 +206,12 @@ static target_ulong h_set_sprg0(PowerPCCPU *cpu, SpaprMachineState *spapr,
> static target_ulong h_set_dabr(PowerPCCPU *cpu, SpaprMachineState *spapr,
> target_ulong opcode, target_ulong *args)
> {
> - if (!has_spr(cpu, SPR_DABR)) {
> + if (!ppc_has_spr(cpu, SPR_DABR)) {
> return H_HARDWARE; /* DABR register not available */
> }
> cpu_synchronize_state(CPU(cpu));
>
> - if (has_spr(cpu, SPR_DABRX)) {
> + if (ppc_has_spr(cpu, SPR_DABRX)) {
> cpu->env.spr[SPR_DABRX] = 0x3; /* Use Problem and Privileged state */
> } else if (!(args[0] & 0x4)) { /* Breakpoint Translation set? */
> return H_RESERVED_DABR;
> @@ -232,7 +226,7 @@ static target_ulong h_set_xdabr(PowerPCCPU *cpu, SpaprMachineState *spapr,
> {
> target_ulong dabrx = args[1];
>
> - if (!has_spr(cpu, SPR_DABR) || !has_spr(cpu, SPR_DABRX)) {
> + if (!ppc_has_spr(cpu, SPR_DABR) || !ppc_has_spr(cpu, SPR_DABRX)) {
> return H_HARDWARE;
> }
>
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index a976e7f7b0..98fcf1c4d6 100644
> --- a/target/ppc/cpu.h
> +++ b/target/ppc/cpu.h
> @@ -2642,6 +2642,12 @@ static inline ppc_avr_t *cpu_avr_ptr(CPUPPCState *env, int i)
> return (ppc_avr_t *)((uintptr_t)env + avr_full_offset(i));
> }
>
> +static inline bool ppc_has_spr(PowerPCCPU *cpu, int spr)
> +{
> + /* We can test whether the SPR is defined by checking for a valid name */
> + return cpu->env.spr_cb[spr].name != NULL;
> +}
> +
> void dump_mmu(CPUPPCState *env);
>
> void ppc_maybe_bswap_register(CPUPPCState *env, uint8_t *mem_buf, int len);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-08 6:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-07 16:41 [PATCH v4] hw/ppc: moved has_spr to cpu.h Lucas Mateus Castro (alqotel)
2021-05-07 17:20 ` Richard Henderson
2021-05-08 6:42 ` David Gibson
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).