2021-02-24 10:14:20

by Álvaro Fernández Rojas

Subject: [PATCH v2 1/2] leds: bcm6328: improve write and read functions

This is proven to work in BMIPS BE/LE and ARM BE/LE, as used in bcm2835-rng
and bcmgenet drivers.
Both should also be inline functions.

Signed-off-by: Álvaro Fernández Rojas <[email protected]>
---
v2: Fix comment style.

drivers/leds/leds-bcm6328.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/drivers/leds/leds-bcm6328.c b/drivers/leds/leds-bcm6328.c
index 226d17d253ed..595da15fc505 100644
--- a/drivers/leds/leds-bcm6328.c
+++ b/drivers/leds/leds-bcm6328.c
@@ -75,22 +75,24 @@ struct bcm6328_led {
bool active_low;
};

-static void bcm6328_led_write(void __iomem *reg, unsigned long data)
+static inline void bcm6328_led_write(void __iomem *reg, unsigned long data)
{
-#ifdef CONFIG_CPU_BIG_ENDIAN
- iowrite32be(data, reg);
-#else
- writel(data, reg);
-#endif
+ /*
+ * MIPS chips strapped for BE will automagically configure the
+ * peripheral registers for CPU-native byte order.
+ */
+ if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))
+ __raw_writel(data, reg);
+ else
+ writel_relaxed(data, reg);
}

-static unsigned long bcm6328_led_read(void __iomem *reg)
+static inline unsigned long bcm6328_led_read(void __iomem *reg)
{
-#ifdef CONFIG_CPU_BIG_ENDIAN
- return ioread32be(reg);
-#else
- return readl(reg);
-#endif
+ if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))
+ return __raw_readl(reg);
+ else
+ return readl_relaxed(reg);
}

/**
--
2.20.1

2021-02-24 15:58:14

by Florian Fainelli

Subject: Re: [PATCH v2 1/2] leds: bcm6328: improve write and read functions

On 2/24/2021 2:11 AM, Álvaro Fernández Rojas wrote:
> This is proven to work in BMIPS BE/LE and ARM BE/LE, as used in bcm2835-rng
> and bcmgenet drivers.
> Both should also be inline functions.
>
> Signed-off-by: Álvaro Fernández Rojas <[email protected]>

Acked-by: Florian Fainelli <[email protected]>
--
Florian