From: Fabiano Rosas <farosas@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: richard.henderson@linaro.org, danielhb413@gmail.com,
qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au
Subject: [PATCH 4/9] target/ppc: Add HV support to ppc_interrupts_little_endian
Date: Mon, 3 Jan 2022 19:07:41 -0300 [thread overview]
Message-ID: <20220103220746.3916246-5-farosas@linux.ibm.com> (raw)
In-Reply-To: <20220103220746.3916246-1-farosas@linux.ibm.com>
The ppc_interrupts_little_endian function could be used for interrupts
delivered in Hypervisor mode, so add support for powernv8 and powernv9
to it.
Also drop the comment because it is inaccurate, all CPUs that can run
little endian can have interrupts in little endian. The point is
whether they can take interrupts in an endianness different from
MSR_LE.
This change has no functional impact.
Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
---
target/ppc/arch_dump.c | 2 +-
target/ppc/cpu.h | 21 +++++++++++++--------
target/ppc/excp_helper.c | 2 +-
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/target/ppc/arch_dump.c b/target/ppc/arch_dump.c
index bb392f6d88..12cde198a3 100644
--- a/target/ppc/arch_dump.c
+++ b/target/ppc/arch_dump.c
@@ -237,7 +237,7 @@ int cpu_get_dump_info(ArchDumpInfo *info,
info->d_machine = PPC_ELF_MACHINE;
info->d_class = ELFCLASS;
- if (ppc_interrupts_little_endian(cpu)) {
+ if (ppc_interrupts_little_endian(cpu, false)) {
info->d_endian = ELFDATA2LSB;
} else {
info->d_endian = ELFDATA2MSB;
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index fc66c3561d..a991da4e74 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -2723,19 +2723,24 @@ static inline bool ppc_has_spr(PowerPCCPU *cpu, int spr)
return cpu->env.spr_cb[spr].name != NULL;
}
-static inline bool ppc_interrupts_little_endian(PowerPCCPU *cpu)
+static inline bool ppc_interrupts_little_endian(PowerPCCPU *cpu, bool hv)
{
PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
+ CPUPPCState *env = &cpu->env;
+ bool ile = false;
- /*
- * Only models that have an LPCR and know about LPCR_ILE can do little
- * endian.
- */
- if (pcc->lpcr_mask & LPCR_ILE) {
- return !!(cpu->env.spr[SPR_LPCR] & LPCR_ILE);
+ if (hv) {
+ if (is_isa300(pcc)) {
+ ile = !!(env->spr[SPR_HID0] & HID0_POWER9_HILE);
+ } else {
+ ile = !!(env->spr[SPR_HID0] & HID0_HILE);
+ }
+
+ } else if (pcc->lpcr_mask & LPCR_ILE) {
+ ile = !!(env->spr[SPR_LPCR] & LPCR_ILE);
}
- return false;
+ return ile;
}
void dump_mmu(CPUPPCState *env);
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 160e06e3a3..0dbadc5d07 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -997,7 +997,7 @@ void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector)
*/
msr = (1ULL << MSR_ME);
msr |= env->msr & (1ULL << MSR_SF);
- if (ppc_interrupts_little_endian(cpu)) {
+ if (ppc_interrupts_little_endian(cpu, false)) {
msr |= (1ULL << MSR_LE);
}
--
2.33.1
next prev parent reply other threads:[~2022-01-03 22:09 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-03 22:07 [PATCH 0/9] target/ppc: powerpc_excp improvements (2/n) Fabiano Rosas
2022-01-03 22:07 ` [PATCH 1/9] target/ppc: powerpc_excp: Extract software TLB logging into a function Fabiano Rosas
2022-01-04 9:32 ` Cédric Le Goater
2022-01-03 22:07 ` [PATCH 2/9] target/ppc: powerpc_excp: Keep 60x soft MMU logs active Fabiano Rosas
2022-01-04 9:33 ` Cédric Le Goater
2022-01-03 22:07 ` [PATCH 3/9] target/ppc: powerpc_excp: Group unimplemented exceptions Fabiano Rosas
2022-01-04 9:39 ` Cédric Le Goater
2022-01-03 22:07 ` Fabiano Rosas [this message]
2022-01-03 22:07 ` [PATCH 5/9] target/ppc: Use ppc_interrupts_little_endian in powerpc_excp Fabiano Rosas
2022-01-04 10:09 ` Cédric Le Goater
2022-01-04 14:11 ` Fabiano Rosas
2022-01-04 17:30 ` Cédric Le Goater
2022-01-03 22:07 ` [PATCH 6/9] target/ppc: powerpc_excp: Preserve MSR_LE bit Fabiano Rosas
2022-01-04 20:51 ` Fabiano Rosas
2022-01-03 22:07 ` [PATCH 7/9] target/ppc: powerpc_excp: Move ILE setting into a function Fabiano Rosas
2022-01-03 22:07 ` [PATCH 8/9] target/ppc: powerpc_excp: Move AIL under a Book3s block Fabiano Rosas
2022-01-03 22:07 ` [PATCH 9/9] target/ppc: Introduce a wrapper for powerpc_excp 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=20220103220746.3916246-5-farosas@linux.ibm.com \
--to=farosas@linux.ibm.com \
--cc=clg@kaod.org \
--cc=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=richard.henderson@linaro.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).