From: David Gibson <david@gibson.dropbear.id.au>
To: Fabiano Rosas <farosas@linux.ibm.com>
Cc: danielhb413@gmail.com, qemu-ppc@nongnu.org,
qemu-devel@nongnu.org, clg@kaod.org
Subject: Re: [RFC v2 04/12] target/ppc: powerpc_excp: Stop passing excp_model around
Date: Sat, 25 Dec 2021 17:33:55 +1100 [thread overview]
Message-ID: <Yca7U2CK8jcbz4HE@yekko> (raw)
In-Reply-To: <20211220181903.3456898-5-farosas@linux.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 8239 bytes --]
On Mon, Dec 20, 2021 at 03:18:55PM -0300, Fabiano Rosas wrote:
> We can just access it directly in powerpc_excp.
>
> Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> target/ppc/excp_helper.c | 43 ++++++++++++++++++++--------------------
> 1 file changed, 21 insertions(+), 22 deletions(-)
>
> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
> index 7bdc1e8410..45641f6d1d 100644
> --- a/target/ppc/excp_helper.c
> +++ b/target/ppc/excp_helper.c
> @@ -293,10 +293,11 @@ static inline void powerpc_set_excp_state(PowerPCCPU *cpu,
> * Note that this function should be greatly optimized when called
> * with a constant excp, from ppc_hw_interrupt
> */
> -static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp)
> +static inline void powerpc_excp(PowerPCCPU *cpu, int excp)
> {
> CPUState *cs = CPU(cpu);
> CPUPPCState *env = &cpu->env;
> + int excp_model = env->excp_model;
> target_ulong msr, new_msr, vector;
> int srr0, srr1, lev = -1;
>
> @@ -878,9 +879,8 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp)
> void ppc_cpu_do_interrupt(CPUState *cs)
> {
> PowerPCCPU *cpu = POWERPC_CPU(cs);
> - CPUPPCState *env = &cpu->env;
>
> - powerpc_excp(cpu, env->excp_model, cs->exception_index);
> + powerpc_excp(cpu, cs->exception_index);
> }
>
> static void ppc_hw_interrupt(CPUPPCState *env)
> @@ -891,20 +891,20 @@ static void ppc_hw_interrupt(CPUPPCState *env)
> /* External reset */
> if (env->pending_interrupts & (1 << PPC_INTERRUPT_RESET)) {
> env->pending_interrupts &= ~(1 << PPC_INTERRUPT_RESET);
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_RESET);
> + powerpc_excp(cpu, POWERPC_EXCP_RESET);
> return;
> }
> /* Machine check exception */
> if (env->pending_interrupts & (1 << PPC_INTERRUPT_MCK)) {
> env->pending_interrupts &= ~(1 << PPC_INTERRUPT_MCK);
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_MCHECK);
> + powerpc_excp(cpu, POWERPC_EXCP_MCHECK);
> return;
> }
> #if 0 /* TODO */
> /* External debug exception */
> if (env->pending_interrupts & (1 << PPC_INTERRUPT_DEBUG)) {
> env->pending_interrupts &= ~(1 << PPC_INTERRUPT_DEBUG);
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_DEBUG);
> + powerpc_excp(cpu, POWERPC_EXCP_DEBUG);
> return;
> }
> #endif
> @@ -924,7 +924,7 @@ static void ppc_hw_interrupt(CPUPPCState *env)
> if ((async_deliver || msr_hv == 0) && hdice) {
> /* HDEC clears on delivery */
> env->pending_interrupts &= ~(1 << PPC_INTERRUPT_HDECR);
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_HDECR);
> + powerpc_excp(cpu, POWERPC_EXCP_HDECR);
> return;
> }
> }
> @@ -934,7 +934,7 @@ static void ppc_hw_interrupt(CPUPPCState *env)
> /* LPCR will be clear when not supported so this will work */
> bool hvice = !!(env->spr[SPR_LPCR] & LPCR_HVICE);
> if ((async_deliver || msr_hv == 0) && hvice) {
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_HVIRT);
> + powerpc_excp(cpu, POWERPC_EXCP_HVIRT);
> return;
> }
> }
> @@ -946,14 +946,14 @@ static void ppc_hw_interrupt(CPUPPCState *env)
> /* HEIC blocks delivery to the hypervisor */
> if ((async_deliver && !(heic && msr_hv && !msr_pr)) ||
> (env->has_hv_mode && msr_hv == 0 && !lpes0)) {
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_EXTERNAL);
> + powerpc_excp(cpu, POWERPC_EXCP_EXTERNAL);
> return;
> }
> }
> if (msr_ce != 0) {
> /* External critical interrupt */
> if (env->pending_interrupts & (1 << PPC_INTERRUPT_CEXT)) {
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_CRITICAL);
> + powerpc_excp(cpu, POWERPC_EXCP_CRITICAL);
> return;
> }
> }
> @@ -961,24 +961,24 @@ static void ppc_hw_interrupt(CPUPPCState *env)
> /* Watchdog timer on embedded PowerPC */
> if (env->pending_interrupts & (1 << PPC_INTERRUPT_WDT)) {
> env->pending_interrupts &= ~(1 << PPC_INTERRUPT_WDT);
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_WDT);
> + powerpc_excp(cpu, POWERPC_EXCP_WDT);
> return;
> }
> if (env->pending_interrupts & (1 << PPC_INTERRUPT_CDOORBELL)) {
> env->pending_interrupts &= ~(1 << PPC_INTERRUPT_CDOORBELL);
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_DOORCI);
> + powerpc_excp(cpu, POWERPC_EXCP_DOORCI);
> return;
> }
> /* Fixed interval timer on embedded PowerPC */
> if (env->pending_interrupts & (1 << PPC_INTERRUPT_FIT)) {
> env->pending_interrupts &= ~(1 << PPC_INTERRUPT_FIT);
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_FIT);
> + powerpc_excp(cpu, POWERPC_EXCP_FIT);
> return;
> }
> /* Programmable interval timer on embedded PowerPC */
> if (env->pending_interrupts & (1 << PPC_INTERRUPT_PIT)) {
> env->pending_interrupts &= ~(1 << PPC_INTERRUPT_PIT);
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_PIT);
> + powerpc_excp(cpu, POWERPC_EXCP_PIT);
> return;
> }
> /* Decrementer exception */
> @@ -986,32 +986,32 @@ static void ppc_hw_interrupt(CPUPPCState *env)
> if (ppc_decr_clear_on_delivery(env)) {
> env->pending_interrupts &= ~(1 << PPC_INTERRUPT_DECR);
> }
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_DECR);
> + powerpc_excp(cpu, POWERPC_EXCP_DECR);
> return;
> }
> if (env->pending_interrupts & (1 << PPC_INTERRUPT_DOORBELL)) {
> env->pending_interrupts &= ~(1 << PPC_INTERRUPT_DOORBELL);
> if (is_book3s_arch2x(env)) {
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_SDOOR);
> + powerpc_excp(cpu, POWERPC_EXCP_SDOOR);
> } else {
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_DOORI);
> + powerpc_excp(cpu, POWERPC_EXCP_DOORI);
> }
> return;
> }
> if (env->pending_interrupts & (1 << PPC_INTERRUPT_HDOORBELL)) {
> env->pending_interrupts &= ~(1 << PPC_INTERRUPT_HDOORBELL);
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_SDOOR_HV);
> + powerpc_excp(cpu, POWERPC_EXCP_SDOOR_HV);
> return;
> }
> if (env->pending_interrupts & (1 << PPC_INTERRUPT_PERFM)) {
> env->pending_interrupts &= ~(1 << PPC_INTERRUPT_PERFM);
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_PERFM);
> + powerpc_excp(cpu, POWERPC_EXCP_PERFM);
> return;
> }
> /* Thermal interrupt */
> if (env->pending_interrupts & (1 << PPC_INTERRUPT_THERM)) {
> env->pending_interrupts &= ~(1 << PPC_INTERRUPT_THERM);
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_THERM);
> + powerpc_excp(cpu, POWERPC_EXCP_THERM);
> return;
> }
> }
> @@ -1036,9 +1036,8 @@ static void ppc_hw_interrupt(CPUPPCState *env)
> void ppc_cpu_do_system_reset(CPUState *cs)
> {
> PowerPCCPU *cpu = POWERPC_CPU(cs);
> - CPUPPCState *env = &cpu->env;
>
> - powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_RESET);
> + powerpc_excp(cpu, POWERPC_EXCP_RESET);
> }
>
> void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector)
--
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 --]
next prev parent reply other threads:[~2021-12-25 7:05 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-20 18:18 [RFC v2 00/12] target/ppc: powerpc_excp improvements Fabiano Rosas
2021-12-20 18:18 ` [RFC v2 01/12] target/ppc: powerpc_excp: Set alternate SRRs directly Fabiano Rosas
2021-12-21 23:32 ` Richard Henderson
2021-12-22 6:46 ` Cédric Le Goater
2021-12-23 4:39 ` David Gibson
2021-12-20 18:18 ` [RFC v2 02/12] target/ppc: powerpc_excp: Set vector earlier Fabiano Rosas
2021-12-22 6:48 ` Cédric Le Goater
2021-12-25 10:45 ` Nicholas Piggin
2021-12-24 0:11 ` Richard Henderson
2021-12-24 11:14 ` Fabiano Rosas
2021-12-20 18:18 ` [RFC v2 03/12] target/ppc: powerpc_excp: Move system call vectored code together Fabiano Rosas
2021-12-22 6:48 ` Cédric Le Goater
2021-12-24 0:12 ` Richard Henderson
2021-12-20 18:18 ` [RFC v2 04/12] target/ppc: powerpc_excp: Stop passing excp_model around Fabiano Rosas
2021-12-22 6:48 ` Cédric Le Goater
2021-12-24 0:13 ` Richard Henderson
2021-12-25 6:33 ` David Gibson [this message]
2021-12-20 18:18 ` [RFC v2 05/12] target/ppc: powerpc_excp: Standardize arguments to interrupt code Fabiano Rosas
2021-12-25 6:35 ` David Gibson
2021-12-27 17:13 ` Fabiano Rosas
2021-12-20 18:18 ` [RFC v2 06/12] target/ppc: Extract interrupt routines into a new file Fabiano Rosas
2021-12-20 18:18 ` [RFC v2 07/12] target/ppc: Introduce PPCInterrupt Fabiano Rosas
2021-12-20 18:18 ` [RFC v2 08/12] target/ppc: Remove unimplemented interrupt code Fabiano Rosas
2021-12-20 18:19 ` [RFC v2 09/12] target/ppc: Use common code for Hypervisor interrupts Fabiano Rosas
2021-12-20 18:19 ` [RFC v2 10/12] target/ppc: Split powerpc_excp into book3s, booke and 32 bit Fabiano Rosas
2021-12-20 18:19 ` [RFC v2 11/12] target/ppc: Create new files for book3s, booke and ppc32 exception code Fabiano Rosas
2021-12-20 18:19 ` [RFC v2 12/12] target/ppc: Do not enable all interrupts when running KVM Fabiano Rosas
2021-12-26 16:48 ` [RFC v2 00/12] target/ppc: powerpc_excp improvements Cédric Le Goater
2021-12-29 14:18 ` Fabiano Rosas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yca7U2CK8jcbz4HE@yekko \
--to=david@gibson.dropbear.id.au \
--cc=clg@kaod.org \
--cc=danielhb413@gmail.com \
--cc=farosas@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).