From: Fabiano Rosas <farosas@linux.ibm.com>
To: Matheus Ferst <matheus.ferst@eldorado.org.br>,
qemu-devel@nongnu.org, qemu-ppc@nongnu.org
Cc: clg@kaod.org, danielhb413@gmail.com, david@gibson.dropbear.id.au,
groug@kaod.org, fbarrat@linux.ibm.com, alex.bennee@linaro.org,
Matheus Ferst <matheus.ferst@eldorado.org.br>
Subject: Re: [RFC PATCH v2 29/29] target/ppc: move the p*_interrupt_powersave methods to excp_helper.c
Date: Mon, 03 Oct 2022 11:13:16 -0300 [thread overview]
Message-ID: <87fsg5572b.fsf@linux.ibm.com> (raw)
In-Reply-To: <20220927201544.4088567-30-matheus.ferst@eldorado.org.br>
Matheus Ferst <matheus.ferst@eldorado.org.br> writes:
> Move the methods to excp_helper.c and make them static.
>
> Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
Reviewed-by: Fabiano Rosas <farosas@linux.ibm.com>
> ---
> target/ppc/cpu_init.c | 102 ---------------------------------------
> target/ppc/excp_helper.c | 102 +++++++++++++++++++++++++++++++++++++++
> target/ppc/internal.h | 6 ---
> 3 files changed, 102 insertions(+), 108 deletions(-)
>
> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> index 4d0064c7a5..a9c2726d51 100644
> --- a/target/ppc/cpu_init.c
> +++ b/target/ppc/cpu_init.c
> @@ -5960,30 +5960,6 @@ static bool ppc_pvr_match_power7(PowerPCCPUClass *pcc, uint32_t pvr, bool best)
> return true;
> }
>
> -int p7_interrupt_powersave(CPUPPCState *env)
> -{
> - if ((env->pending_interrupts & PPC_INTERRUPT_EXT) &&
> - (env->spr[SPR_LPCR] & LPCR_P7_PECE0)) {
> - return PPC_INTERRUPT_EXT;
> - }
> - if ((env->pending_interrupts & PPC_INTERRUPT_DECR) &&
> - (env->spr[SPR_LPCR] & LPCR_P7_PECE1)) {
> - return PPC_INTERRUPT_DECR;
> - }
> - if ((env->pending_interrupts & PPC_INTERRUPT_MCK) &&
> - (env->spr[SPR_LPCR] & LPCR_P7_PECE2)) {
> - return PPC_INTERRUPT_MCK;
> - }
> - if ((env->pending_interrupts & PPC_INTERRUPT_HMI) &&
> - (env->spr[SPR_LPCR] & LPCR_P7_PECE2)) {
> - return PPC_INTERRUPT_HMI;
> - }
> - if (env->pending_interrupts & PPC_INTERRUPT_RESET) {
> - return PPC_INTERRUPT_RESET;
> - }
> - return 0;
> -}
> -
> POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(oc);
> @@ -6120,38 +6096,6 @@ static bool ppc_pvr_match_power8(PowerPCCPUClass *pcc, uint32_t pvr, bool best)
> return true;
> }
>
> -int p8_interrupt_powersave(CPUPPCState *env)
> -{
> - if ((env->pending_interrupts & PPC_INTERRUPT_EXT) &&
> - (env->spr[SPR_LPCR] & LPCR_P8_PECE2)) {
> - return PPC_INTERRUPT_EXT;
> - }
> - if ((env->pending_interrupts & PPC_INTERRUPT_DECR) &&
> - (env->spr[SPR_LPCR] & LPCR_P8_PECE3)) {
> - return PPC_INTERRUPT_DECR;
> - }
> - if ((env->pending_interrupts & PPC_INTERRUPT_MCK) &&
> - (env->spr[SPR_LPCR] & LPCR_P8_PECE4)) {
> - return PPC_INTERRUPT_MCK;
> - }
> - if ((env->pending_interrupts & PPC_INTERRUPT_HMI) &&
> - (env->spr[SPR_LPCR] & LPCR_P8_PECE4)) {
> - return PPC_INTERRUPT_HMI;
> - }
> - if ((env->pending_interrupts & PPC_INTERRUPT_DOORBELL) &&
> - (env->spr[SPR_LPCR] & LPCR_P8_PECE0)) {
> - return PPC_INTERRUPT_DOORBELL;
> - }
> - if ((env->pending_interrupts & PPC_INTERRUPT_HDOORBELL) &&
> - (env->spr[SPR_LPCR] & LPCR_P8_PECE1)) {
> - return PPC_INTERRUPT_HDOORBELL;
> - }
> - if (env->pending_interrupts & PPC_INTERRUPT_RESET) {
> - return PPC_INTERRUPT_RESET;
> - }
> - return 0;
> -}
> -
> POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(oc);
> @@ -6325,52 +6269,6 @@ static bool ppc_pvr_match_power9(PowerPCCPUClass *pcc, uint32_t pvr, bool best)
> return false;
> }
>
> -int p9_interrupt_powersave(CPUPPCState *env)
> -{
> - /* External Exception */
> - if ((env->pending_interrupts & PPC_INTERRUPT_EXT) &&
> - (env->spr[SPR_LPCR] & LPCR_EEE)) {
> - bool heic = !!(env->spr[SPR_LPCR] & LPCR_HEIC);
> - if (!heic || !FIELD_EX64_HV(env->msr) ||
> - FIELD_EX64(env->msr, MSR, PR)) {
> - return PPC_INTERRUPT_EXT;
> - }
> - }
> - /* Decrementer Exception */
> - if ((env->pending_interrupts & PPC_INTERRUPT_DECR) &&
> - (env->spr[SPR_LPCR] & LPCR_DEE)) {
> - return PPC_INTERRUPT_DECR;
> - }
> - /* Machine Check or Hypervisor Maintenance Exception */
> - if (env->spr[SPR_LPCR] & LPCR_OEE) {
> - if (env->pending_interrupts & PPC_INTERRUPT_MCK) {
> - return PPC_INTERRUPT_MCK;
> - }
> - if (env->pending_interrupts & PPC_INTERRUPT_HMI) {
> - return PPC_INTERRUPT_HMI;
> - }
> - }
> - /* Privileged Doorbell Exception */
> - if ((env->pending_interrupts & PPC_INTERRUPT_DOORBELL) &&
> - (env->spr[SPR_LPCR] & LPCR_PDEE)) {
> - return PPC_INTERRUPT_DOORBELL;
> - }
> - /* Hypervisor Doorbell Exception */
> - if ((env->pending_interrupts & PPC_INTERRUPT_HDOORBELL) &&
> - (env->spr[SPR_LPCR] & LPCR_HDEE)) {
> - return PPC_INTERRUPT_HDOORBELL;
> - }
> - /* Hypervisor virtualization exception */
> - if ((env->pending_interrupts & PPC_INTERRUPT_HVIRT) &&
> - (env->spr[SPR_LPCR] & LPCR_HVEE)) {
> - return PPC_INTERRUPT_HVIRT;
> - }
> - if (env->pending_interrupts & PPC_INTERRUPT_RESET) {
> - return PPC_INTERRUPT_RESET;
> - }
> - return 0;
> -}
> -
> POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(oc);
> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
> index 9708f82b30..57937956e4 100644
> --- a/target/ppc/excp_helper.c
> +++ b/target/ppc/excp_helper.c
> @@ -1686,6 +1686,30 @@ void ppc_cpu_do_interrupt(CPUState *cs)
> PPC_INTERRUPT_PIT | PPC_INTERRUPT_DOORBELL | PPC_INTERRUPT_HDOORBELL | \
> PPC_INTERRUPT_THERM | PPC_INTERRUPT_EBB)
>
> +static int p7_interrupt_powersave(CPUPPCState *env)
> +{
> + if ((env->pending_interrupts & PPC_INTERRUPT_EXT) &&
> + (env->spr[SPR_LPCR] & LPCR_P7_PECE0)) {
> + return PPC_INTERRUPT_EXT;
> + }
> + if ((env->pending_interrupts & PPC_INTERRUPT_DECR) &&
> + (env->spr[SPR_LPCR] & LPCR_P7_PECE1)) {
> + return PPC_INTERRUPT_DECR;
> + }
> + if ((env->pending_interrupts & PPC_INTERRUPT_MCK) &&
> + (env->spr[SPR_LPCR] & LPCR_P7_PECE2)) {
> + return PPC_INTERRUPT_MCK;
> + }
> + if ((env->pending_interrupts & PPC_INTERRUPT_HMI) &&
> + (env->spr[SPR_LPCR] & LPCR_P7_PECE2)) {
> + return PPC_INTERRUPT_HMI;
> + }
> + if (env->pending_interrupts & PPC_INTERRUPT_RESET) {
> + return PPC_INTERRUPT_RESET;
> + }
> + return 0;
> +}
> +
> static int p7_next_unmasked_interrupt(CPUPPCState *env)
> {
> PowerPCCPU *cpu = env_archcpu(env);
> @@ -1751,6 +1775,38 @@ static int p7_next_unmasked_interrupt(CPUPPCState *env)
> PPC_INTERRUPT_FIT | PPC_INTERRUPT_PIT | PPC_INTERRUPT_DOORBELL | \
> PPC_INTERRUPT_HDOORBELL | PPC_INTERRUPT_THERM)
>
> +static int p8_interrupt_powersave(CPUPPCState *env)
> +{
> + if ((env->pending_interrupts & PPC_INTERRUPT_EXT) &&
> + (env->spr[SPR_LPCR] & LPCR_P8_PECE2)) {
> + return PPC_INTERRUPT_EXT;
> + }
> + if ((env->pending_interrupts & PPC_INTERRUPT_DECR) &&
> + (env->spr[SPR_LPCR] & LPCR_P8_PECE3)) {
> + return PPC_INTERRUPT_DECR;
> + }
> + if ((env->pending_interrupts & PPC_INTERRUPT_MCK) &&
> + (env->spr[SPR_LPCR] & LPCR_P8_PECE4)) {
> + return PPC_INTERRUPT_MCK;
> + }
> + if ((env->pending_interrupts & PPC_INTERRUPT_HMI) &&
> + (env->spr[SPR_LPCR] & LPCR_P8_PECE4)) {
> + return PPC_INTERRUPT_HMI;
> + }
> + if ((env->pending_interrupts & PPC_INTERRUPT_DOORBELL) &&
> + (env->spr[SPR_LPCR] & LPCR_P8_PECE0)) {
> + return PPC_INTERRUPT_DOORBELL;
> + }
> + if ((env->pending_interrupts & PPC_INTERRUPT_HDOORBELL) &&
> + (env->spr[SPR_LPCR] & LPCR_P8_PECE1)) {
> + return PPC_INTERRUPT_HDOORBELL;
> + }
> + if (env->pending_interrupts & PPC_INTERRUPT_RESET) {
> + return PPC_INTERRUPT_RESET;
> + }
> + return 0;
> +}
> +
> static int p8_next_unmasked_interrupt(CPUPPCState *env)
> {
> PowerPCCPU *cpu = env_archcpu(env);
> @@ -1820,6 +1876,52 @@ static int p8_next_unmasked_interrupt(CPUPPCState *env)
> PPC_INTERRUPT_WDT | PPC_INTERRUPT_CDOORBELL | PPC_INTERRUPT_FIT | \
> PPC_INTERRUPT_PIT | PPC_INTERRUPT_THERM)
>
> +static int p9_interrupt_powersave(CPUPPCState *env)
> +{
> + /* External Exception */
> + if ((env->pending_interrupts & PPC_INTERRUPT_EXT) &&
> + (env->spr[SPR_LPCR] & LPCR_EEE)) {
> + bool heic = !!(env->spr[SPR_LPCR] & LPCR_HEIC);
> + if (!heic || !FIELD_EX64_HV(env->msr) ||
> + FIELD_EX64(env->msr, MSR, PR)) {
> + return PPC_INTERRUPT_EXT;
> + }
> + }
> + /* Decrementer Exception */
> + if ((env->pending_interrupts & PPC_INTERRUPT_DECR) &&
> + (env->spr[SPR_LPCR] & LPCR_DEE)) {
> + return PPC_INTERRUPT_DECR;
> + }
> + /* Machine Check or Hypervisor Maintenance Exception */
> + if (env->spr[SPR_LPCR] & LPCR_OEE) {
> + if (env->pending_interrupts & PPC_INTERRUPT_MCK) {
> + return PPC_INTERRUPT_MCK;
> + }
> + if (env->pending_interrupts & PPC_INTERRUPT_HMI) {
> + return PPC_INTERRUPT_HMI;
> + }
> + }
> + /* Privileged Doorbell Exception */
> + if ((env->pending_interrupts & PPC_INTERRUPT_DOORBELL) &&
> + (env->spr[SPR_LPCR] & LPCR_PDEE)) {
> + return PPC_INTERRUPT_DOORBELL;
> + }
> + /* Hypervisor Doorbell Exception */
> + if ((env->pending_interrupts & PPC_INTERRUPT_HDOORBELL) &&
> + (env->spr[SPR_LPCR] & LPCR_HDEE)) {
> + return PPC_INTERRUPT_HDOORBELL;
> + }
> + /* Hypervisor virtualization exception */
> + if ((env->pending_interrupts & PPC_INTERRUPT_HVIRT) &&
> + (env->spr[SPR_LPCR] & LPCR_HVEE)) {
> + return PPC_INTERRUPT_HVIRT;
> + }
> + if (env->pending_interrupts & PPC_INTERRUPT_RESET) {
> + return PPC_INTERRUPT_RESET;
> + }
> + return 0;
> +}
> +
> static int p9_next_unmasked_interrupt(CPUPPCState *env)
> {
> PowerPCCPU *cpu = env_archcpu(env);
> diff --git a/target/ppc/internal.h b/target/ppc/internal.h
> index 25827ebf6f..337a362205 100644
> --- a/target/ppc/internal.h
> +++ b/target/ppc/internal.h
> @@ -306,10 +306,4 @@ static inline int ger_pack_masks(int pmsk, int ymsk, int xmsk)
> return msk;
> }
>
> -#if defined(TARGET_PPC64)
> -int p9_interrupt_powersave(CPUPPCState *env);
> -int p8_interrupt_powersave(CPUPPCState *env);
> -int p7_interrupt_powersave(CPUPPCState *env);
> -#endif
> -
> #endif /* PPC_INTERNAL_H */
next prev parent reply other threads:[~2022-10-03 14:22 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-27 20:15 [RFC PATCH v2 00/29] PowerPC interrupt rework Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 01/29] target/ppc: define PPC_INTERRUPT_* values directly Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 02/29] target/ppc: always use ppc_set_irq to set env->pending_interrupts Matheus Ferst
2022-09-30 14:32 ` Fabiano Rosas
2022-09-27 20:15 ` [RFC PATCH v2 03/29] target/ppc: split interrupt masking and delivery from ppc_hw_interrupt Matheus Ferst
2022-09-30 15:55 ` Fabiano Rosas
2022-09-27 20:15 ` [RFC PATCH v2 04/29] target/ppc: prepare to split interrupt masking and delivery by excp_model Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 05/29] target/ppc: create an interrupt masking method for POWER9/POWER10 Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 06/29] target/ppc: remove unused interrupts from p9_pending_interrupt Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 07/29] target/ppc: create an interrupt delivery method for POWER9/POWER10 Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 08/29] target/ppc: remove unused interrupts from p9_deliver_interrupt Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 09/29] target/ppc: remove generic architecture checks " Matheus Ferst
2022-09-30 18:13 ` Fabiano Rosas
2022-10-03 15:45 ` Matheus K. Ferst
2022-10-03 16:59 ` Fabiano Rosas
2022-09-27 20:15 ` [RFC PATCH v2 10/29] target/ppc: move power-saving interrupt masking out of cpu_has_work_POWER9 Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 11/29] target/ppc: add power-saving interrupt masking logic to p9_next_unmasked_interrupt Matheus Ferst
2022-09-30 18:38 ` Fabiano Rosas
2022-10-03 15:46 ` Matheus K. Ferst
2022-10-03 17:01 ` Fabiano Rosas
2022-09-27 20:15 ` [RFC PATCH v2 12/29] target/ppc: create an interrupt masking method for POWER8 Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 13/29] target/ppc: remove unused interrupts from p8_pending_interrupt Matheus Ferst
2022-09-27 22:14 ` Fabiano Rosas
2022-10-03 15:45 ` Matheus K. Ferst
2022-09-27 20:15 ` [RFC PATCH v2 14/29] target/ppc: create an interrupt delivery method for POWER8 Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 15/29] target/ppc: remove unused interrupts from p8_deliver_interrupt Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 16/29] target/ppc: remove generic architecture checks " Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 17/29] target/ppc: move power-saving interrupt masking out of cpu_has_work_POWER8 Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 18/29] target/ppc: add power-saving interrupt masking logic to p8_next_unmasked_interrupt Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 19/29] target/ppc: create an interrupt masking method for POWER7 Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 20/29] target/ppc: remove unused interrupts from p7_pending_interrupt Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 21/29] target/ppc: create an interrupt delivery method for POWER7 Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 22/29] target/ppc: remove unused interrupts from p7_deliver_interrupt Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 23/29] target/ppc: remove generic architecture checks " Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 24/29] target/ppc: move power-saving interrupt masking out of cpu_has_work_POWER7 Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 25/29] target/ppc: add power-saving interrupt masking logic to p7_next_unmasked_interrupt Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 26/29] target/ppc: remove ppc_store_lpcr from CONFIG_USER_ONLY builds Matheus Ferst
2022-09-27 20:15 ` [RFC PATCH v2 27/29] target/ppc: introduce ppc_maybe_interrupt Matheus Ferst
2022-10-03 14:11 ` Fabiano Rosas
2022-09-27 20:15 ` [RFC PATCH v2 28/29] target/ppc: unify cpu->has_work based on cs->interrupt_request Matheus Ferst
2022-10-03 14:12 ` Fabiano Rosas
2022-09-27 20:15 ` [RFC PATCH v2 29/29] target/ppc: move the p*_interrupt_powersave methods to excp_helper.c Matheus Ferst
2022-10-03 14:13 ` Fabiano Rosas [this message]
2022-09-28 17:31 ` [RFC PATCH v2 00/29] PowerPC interrupt rework Cédric Le Goater
2022-10-03 15:45 ` Matheus K. Ferst
2022-10-03 20:58 ` Cédric Le Goater
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=87fsg5572b.fsf@linux.ibm.com \
--to=farosas@linux.ibm.com \
--cc=alex.bennee@linaro.org \
--cc=clg@kaod.org \
--cc=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=fbarrat@linux.ibm.com \
--cc=groug@kaod.org \
--cc=matheus.ferst@eldorado.org.br \
--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).