* [PATCH 1/3] spi: mpc52xx: Avoid using get_tbl()
@ 2021-02-09 10:26 Christophe Leroy
2021-02-09 10:26 ` [PATCH 2/3] powerpc/time: " Christophe Leroy
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Christophe Leroy @ 2021-02-09 10:26 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman, broonie
Cc: linux-kernel, linuxppc-dev, linux-spi
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: Christophe Leroy <christophe.leroy@csgroup.eu>
---
drivers/spi/spi-mpc52xx.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c
index ef2f24420460..e6a30f232370 100644
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@ -120,7 +120,7 @@ static void mpc52xx_spi_start_transfer(struct mpc52xx_spi *ms)
ms->cs_change = ms->transfer->cs_change;
/* Write out the first byte */
- ms->wcol_tx_timestamp = get_tbl();
+ ms->wcol_tx_timestamp = mftb();
if (ms->tx_buf)
out_8(ms->regs + SPI_DATA, *ms->tx_buf++);
else
@@ -221,8 +221,8 @@ static int mpc52xx_spi_fsmstate_transfer(int irq, struct mpc52xx_spi *ms,
* but it can also be worked around simply by retrying the
* transfer which is what we do here. */
ms->wcol_count++;
- ms->wcol_ticks += get_tbl() - ms->wcol_tx_timestamp;
- ms->wcol_tx_timestamp = get_tbl();
+ ms->wcol_ticks += mftb() - ms->wcol_tx_timestamp;
+ ms->wcol_tx_timestamp = mftb();
data = 0;
if (ms->tx_buf)
data = *(ms->tx_buf - 1);
@@ -247,14 +247,14 @@ static int mpc52xx_spi_fsmstate_transfer(int irq, struct mpc52xx_spi *ms,
/* Is the transfer complete? */
ms->len--;
if (ms->len == 0) {
- ms->timestamp = get_tbl();
+ ms->timestamp = mftb();
ms->timestamp += ms->transfer->delay_usecs * tb_ticks_per_usec;
ms->state = mpc52xx_spi_fsmstate_wait;
return FSM_CONTINUE;
}
/* Write out the next byte */
- ms->wcol_tx_timestamp = get_tbl();
+ ms->wcol_tx_timestamp = mftb();
if (ms->tx_buf)
out_8(ms->regs + SPI_DATA, *ms->tx_buf++);
else
@@ -276,7 +276,7 @@ mpc52xx_spi_fsmstate_wait(int irq, struct mpc52xx_spi *ms, u8 status, u8 data)
dev_err(&ms->master->dev, "spurious irq, status=0x%.2x\n",
status);
- if (((int)get_tbl()) - ms->timestamp < 0)
+ if (((int)mftb()) - ms->timestamp < 0)
return FSM_POLL;
ms->message->actual_length += ms->transfer->len;
--
2.25.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] powerpc/time: Avoid using get_tbl()
2021-02-09 10:26 [PATCH 1/3] spi: mpc52xx: Avoid using get_tbl() Christophe Leroy
@ 2021-02-09 10:26 ` Christophe Leroy
2021-02-09 10:26 ` [PATCH 3/3] powerpc/time: Remove get_tbl() Christophe Leroy
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Christophe Leroy @ 2021-02-09 10:26 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman, broonie
Cc: linux-kernel, linuxppc-dev, linux-spi
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: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
index 05e19470d523..b91ebebd9ff2 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
@@ -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)
--
2.25.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] powerpc/time: Remove get_tbl()
2021-02-09 10:26 [PATCH 1/3] spi: mpc52xx: Avoid using get_tbl() Christophe Leroy
2021-02-09 10:26 ` [PATCH 2/3] powerpc/time: " Christophe Leroy
@ 2021-02-09 10:26 ` Christophe Leroy
2021-02-09 22:30 ` [PATCH 1/3] spi: mpc52xx: Avoid using get_tbl() Mark Brown
2021-02-12 0:19 ` Michael Ellerman
3 siblings, 0 replies; 5+ messages in thread
From: Christophe Leroy @ 2021-02-09 10:26 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman, broonie
Cc: linux-kernel, linuxppc-dev, linux-spi
There are no more users of get_tbl(). Remove it.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/include/asm/vdso/timebase.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/powerpc/include/asm/vdso/timebase.h b/arch/powerpc/include/asm/vdso/timebase.h
index 881f655caa0a..891c9d5eaabe 100644
--- a/arch/powerpc/include/asm/vdso/timebase.h
+++ b/arch/powerpc/include/asm/vdso/timebase.h
@@ -43,12 +43,6 @@
#define mttbl(v) asm volatile("mttbl %0":: "r"(v))
#define mttbu(v) asm volatile("mttbu %0":: "r"(v))
-/* For compatibility, get_tbl() is defined as get_tb() on ppc64 */
-static inline unsigned long get_tbl(void)
-{
- return mftb();
-}
-
static __always_inline u64 get_tb(void)
{
unsigned int tbhi, tblo, tbhi2;
--
2.25.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/3] spi: mpc52xx: Avoid using get_tbl()
2021-02-09 10:26 [PATCH 1/3] spi: mpc52xx: Avoid using get_tbl() Christophe Leroy
2021-02-09 10:26 ` [PATCH 2/3] powerpc/time: " Christophe Leroy
2021-02-09 10:26 ` [PATCH 3/3] powerpc/time: Remove get_tbl() Christophe Leroy
@ 2021-02-09 22:30 ` Mark Brown
2021-02-12 0:19 ` Michael Ellerman
3 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2021-02-09 22:30 UTC (permalink / raw)
To: Christophe Leroy
Cc: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
linux-kernel, linuxppc-dev, linux-spi
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
On Tue, Feb 09, 2021 at 10:26:21AM +0000, Christophe Leroy wrote:
> 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.
Acked-by: Mark Brown <broonie@kernel.org>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] spi: mpc52xx: Avoid using get_tbl()
2021-02-09 10:26 [PATCH 1/3] spi: mpc52xx: Avoid using get_tbl() Christophe Leroy
` (2 preceding siblings ...)
2021-02-09 22:30 ` [PATCH 1/3] spi: mpc52xx: Avoid using get_tbl() Mark Brown
@ 2021-02-12 0:19 ` Michael Ellerman
3 siblings, 0 replies; 5+ messages in thread
From: Michael Ellerman @ 2021-02-12 0:19 UTC (permalink / raw)
To: Paul Mackerras, Michael Ellerman, broonie, Christophe Leroy,
Benjamin Herrenschmidt
Cc: linux-spi, linux-kernel, linuxppc-dev
On Tue, 9 Feb 2021 10:26:21 +0000 (UTC), Christophe Leroy wrote:
> 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.
Applied to powerpc/next.
[1/3] spi: mpc52xx: Avoid using get_tbl()
https://git.kernel.org/powerpc/c/e10656114d32c659768e7ca8aebaaa6ac6e959ab
[2/3] powerpc/time: Avoid using get_tbl()
https://git.kernel.org/powerpc/c/55d68df623eb679cc91f61137f14751e7f369662
[3/3] powerpc/time: Remove get_tbl()
https://git.kernel.org/powerpc/c/132f94f133961d18af615cb3503368e59529e9a8
cheers
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-02-12 0:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-09 10:26 [PATCH 1/3] spi: mpc52xx: Avoid using get_tbl() Christophe Leroy
2021-02-09 10:26 ` [PATCH 2/3] powerpc/time: " Christophe Leroy
2021-02-09 10:26 ` [PATCH 3/3] powerpc/time: Remove get_tbl() Christophe Leroy
2021-02-09 22:30 ` [PATCH 1/3] spi: mpc52xx: Avoid using get_tbl() Mark Brown
2021-02-12 0:19 ` Michael Ellerman
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).