Commit 55d68df6 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/time: Avoid using get_tbl() 



get_tbl() is confusing as it returns the content TBL register
on PPC32 but the concatenation of TBL and TBU on PPC64.

Use mftb() instead.

This will allow the removal of get_tbl() in a following patch.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/decefb47c8a2070bf55d20b096b813908c7b3110.1612866360.git.christophe.leroy@csgroup.eu
parent e1065611

arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c

+4 −4
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static irqreturn_t mpc52xx_lpbfifo_irq(int irq, void *dev_id) 
	int dma, write, poll_dma;



	spin_lock_irqsave(&lpbfifo.lock, flags);

	ts = get_tbl();

	ts = mftb();



	req = lpbfifo.req;

	if (!req) {
@@ -307,7 +307,7 @@ static irqreturn_t mpc52xx_lpbfifo_irq(int irq, void *dev_id) 
	if (irq != 0) /* don't increment on polled case */

		req->irq_count++;



	req->irq_ticks += get_tbl() - ts;

	req->irq_ticks += mftb() - ts;

	spin_unlock_irqrestore(&lpbfifo.lock, flags);



	/* Spinlock is released; it is now safe to call the callback */
@@ -330,7 +330,7 @@ static irqreturn_t mpc52xx_lpbfifo_bcom_irq(int irq, void *dev_id) 
	u32 ts;



	spin_lock_irqsave(&lpbfifo.lock, flags);

	ts = get_tbl();

	ts = mftb();



	req = lpbfifo.req;

	if (!req || (req->flags & MPC52XX_LPBFIFO_FLAG_NO_DMA)) {
@@ -361,7 +361,7 @@ static irqreturn_t mpc52xx_lpbfifo_bcom_irq(int irq, void *dev_id) 
	lpbfifo.req = NULL;



	/* Release the lock before calling out to the callback. */

	req->irq_ticks += get_tbl() - ts;

	req->irq_ticks += mftb() - ts;

	spin_unlock_irqrestore(&lpbfifo.lock, flags);



	if (req->callback)