| Message ID | 1466704050-15108-4-git-send-email-nikunj@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Jun 23, 2016 at 11:17:22PM +0530, Nikunj A Dadhania wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > 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> Modulo changes that will be necessary to account for review comments on earlier patches. > --- > hw/intc/xics.c | 8 ++++++++ > hw/intc/xics_spapr.c | 7 ++++--- > 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 6ca391f..40969ee 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 48d458a..4d5adda 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 76b45ef..32ea706 100644 > --- a/include/hw/ppc/xics.h > +++ b/include/hw/ppc/xics.h > @@ -186,6 +186,7 @@ int 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,
diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 6ca391f..40969ee 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 48d458a..4d5adda 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 76b45ef..32ea706 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -186,6 +186,7 @@ int 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,