diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2016-06-29 00:35:14 +0530 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-07-01 13:41:47 +1000 |
| commit | 1cbd22205594c4cf024c50cb437755c64f385da1 (patch) | |
| tree | 6789479942e0909dfce26ef4a70e974cdd87f5c8 | |
| parent | 9c7027ba947d95dedaa760758cc378c8496e0316 (diff) | |
| download | qemu-1cbd22205594c4cf024c50cb437755c64f385da1.zip qemu-1cbd22205594c4cf024c50cb437755c64f385da1.tar.gz qemu-1cbd22205594c4cf024c50cb437755c64f385da1.tar.bz2 | |
ppc/xics: Implement H_IPOLL using an accessor
None of the other presenter functions directly mucks with the
internal state, so don't do it there either.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | hw/intc/xics.c | 8 | ||||
| -rw-r--r-- | hw/intc/xics_spapr.c | 7 | ||||
| -rw-r--r-- | include/hw/ppc/xics.h | 1 |
3 files changed, 13 insertions, 3 deletions
diff --git a/hw/intc/xics.c b/hw/intc/xics.c index f01af08..f43f98a 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -288,6 +288,14 @@ uint32_t icp_accept(ICPState *ss) return xirr; } +uint32_t icp_ipoll(ICPState *ss, uint32_t *mfrr) +{ + if (mfrr) { + *mfrr = ss->mfrr; + } + return ss->xirr; +} + void icp_eoi(XICSState *icp, int server, uint32_t xirr) { ICPState *ss = icp->ss + server; diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 89190ef..94571dd 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -99,10 +99,11 @@ static target_ulong h_ipoll(PowerPCCPU *cpu, sPAPRMachineState *spapr, target_ulong opcode, target_ulong *args) { CPUState *cs = CPU(cpu); - ICPState *ss = &spapr->icp->ss[cs->cpu_index]; + uint32_t mfrr; + uint32_t xirr = icp_ipoll(spapr->icp->ss + cs->cpu_index, &mfrr); - args[0] = ss->xirr; - args[1] = ss->mfrr; + args[0] = xirr; + args[1] = mfrr; return H_SUCCESS; } diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 3349006..7445a14 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -186,6 +186,7 @@ int xics_get_cpu_index_by_dt_id(int cpu_dt_id); void icp_set_cppr(XICSState *icp, int server, uint8_t cppr); void icp_set_mfrr(XICSState *icp, int server, uint8_t mfrr); uint32_t icp_accept(ICPState *ss); +uint32_t icp_ipoll(ICPState *ss, uint32_t *mfrr); void icp_eoi(XICSState *icp, int server, uint32_t xirr); void ics_write_xive(ICSState *ics, int nr, int server, |