[PATCH 03/10] powerpc/xive: rename xive_poke_esb in xive_esb_read

[David Gibson]

On Wed, Aug 09, 2017 at 09:12:29AM +0200, Cédric Le Goater wrote:
> On 08/09/2017 05:55 AM, David Gibson wrote:
> > On Tue, Aug 08, 2017 at 10:56:13AM +0200, Cédric Le Goater wrote:
> >> xive_poke_esb() is performing a load/read so it is better named as
> >> xive_esb_read().
> > 
> > Uh, patch seems to mismatch the comment here, calling it
> > xive_peek_esb() instead.
> 
> euh yes. oops. 
> 
> > Does reading the ESB had a side effect on the hardware?  If so "poke"
> > might be an appropriate name.
> 
> ok. I want to introduce a 'write' method. should I name them
> load and store ?

Either read/write or load/store.  I don't really care, don't know if
BenH has an opinion.


> 
> Thanks,
> 
> C. 
> 
> >> Also introduce a XIVE_ESB_LOAD_EOI read when EOI'ing
> >> LSI interrupts.
> >>
> >> Signed-off-by: Cédric Le Goater <clg at kaod.org>
> >> ---
> >>  arch/powerpc/sysdev/xive/common.c | 20 ++++++++++----------
> >>  1 file changed, 10 insertions(+), 10 deletions(-)
> >>
> >> diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/common.c
> >> index 6595462b1fc8..e6b245bb9602 100644
> >> --- a/arch/powerpc/sysdev/xive/common.c
> >> +++ b/arch/powerpc/sysdev/xive/common.c
> >> @@ -190,7 +190,7 @@ static u32 xive_scan_interrupts(struct xive_cpu *xc, bool just_peek)
> >>   * This is used to perform the magic loads from an ESB
> >>   * described in xive.h
> >>   */
> >> -static u8 xive_poke_esb(struct xive_irq_data *xd, u32 offset)
> >> +static u8 xive_peek_esb(struct xive_irq_data *xd, u32 offset)
> >>  {
> >>  	u64 val;
> >>  
> >> @@ -227,7 +227,7 @@ void xmon_xive_do_dump(int cpu)
> >>  	xive_dump_eq("IRQ", &xc->queue[xive_irq_priority]);
> >>  #ifdef CONFIG_SMP
> >>  	{
> >> -		u64 val = xive_poke_esb(&xc->ipi_data, XIVE_ESB_GET);
> >> +		u64 val = xive_peek_esb(&xc->ipi_data, XIVE_ESB_GET);
> >>  		xmon_printf("  IPI state: %x:%c%c\n", xc->hw_ipi,
> >>  			val & XIVE_ESB_VAL_P ? 'P' : 'p',
> >>  			val & XIVE_ESB_VAL_P ? 'Q' : 'q');
> >> @@ -326,9 +326,9 @@ void xive_do_source_eoi(u32 hw_irq, struct xive_irq_data *xd)
> >>  		 * properly.
> >>  		 */
> >>  		if (xd->flags & XIVE_IRQ_FLAG_LSI)
> >> -			in_be64(xd->eoi_mmio);
> >> +			xive_peek_esb(xd, XIVE_ESB_LOAD_EOI);
> >>  		else {
> >> -			eoi_val = xive_poke_esb(xd, XIVE_ESB_SET_PQ_00);
> >> +			eoi_val = xive_peek_esb(xd, XIVE_ESB_SET_PQ_00);
> >>  			DBG_VERBOSE("eoi_val=%x\n", offset, eoi_val);
> >>  
> >>  			/* Re-trigger if needed */
> >> @@ -383,12 +383,12 @@ static void xive_do_source_set_mask(struct xive_irq_data *xd,
> >>  	 * ESB accordingly on unmask.
> >>  	 */
> >>  	if (mask) {
> >> -		val = xive_poke_esb(xd, XIVE_ESB_SET_PQ_01);
> >> +		val = xive_peek_esb(xd, XIVE_ESB_SET_PQ_01);
> >>  		xd->saved_p = !!(val & XIVE_ESB_VAL_P);
> >>  	} else if (xd->saved_p)
> >> -		xive_poke_esb(xd, XIVE_ESB_SET_PQ_10);
> >> +		xive_peek_esb(xd, XIVE_ESB_SET_PQ_10);
> >>  	else
> >> -		xive_poke_esb(xd, XIVE_ESB_SET_PQ_00);
> >> +		xive_peek_esb(xd, XIVE_ESB_SET_PQ_00);
> >>  }
> >>  
> >>  /*
> >> @@ -768,7 +768,7 @@ static int xive_irq_retrigger(struct irq_data *d)
> >>  	 * To perform a retrigger, we first set the PQ bits to
> >>  	 * 11, then perform an EOI.
> >>  	 */
> >> -	xive_poke_esb(xd, XIVE_ESB_SET_PQ_11);
> >> +	xive_peek_esb(xd, XIVE_ESB_SET_PQ_11);
> >>  
> >>  	/*
> >>  	 * Note: We pass "0" to the hw_irq argument in order to
> >> @@ -803,7 +803,7 @@ static int xive_irq_set_vcpu_affinity(struct irq_data *d, void *state)
> >>  		irqd_set_forwarded_to_vcpu(d);
> >>  
> >>  		/* Set it to PQ=10 state to prevent further sends */
> >> -		pq = xive_poke_esb(xd, XIVE_ESB_SET_PQ_10);
> >> +		pq = xive_peek_esb(xd, XIVE_ESB_SET_PQ_10);
> >>  
> >>  		/* No target ? nothing to do */
> >>  		if (xd->target == XIVE_INVALID_TARGET) {
> >> @@ -832,7 +832,7 @@ static int xive_irq_set_vcpu_affinity(struct irq_data *d, void *state)
> >>  		 * for sure the queue slot is no longer in use.
> >>  		 */
> >>  		if (pq & 2) {
> >> -			pq = xive_poke_esb(xd, XIVE_ESB_SET_PQ_11);
> >> +			pq = xive_peek_esb(xd, XIVE_ESB_SET_PQ_11);
> >>  			xd->saved_p = true;
> >>  
> >>  			/*
> > 
> 

-- 
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20170809/999656da/attachment-0001.sig>