net/wan/fsl_ucc_hdlc: fix reading of __be16 registers
authorRasmus Villemoes <linux@rasmusvillemoes.dk>
Thu, 28 Nov 2019 14:55:50 +0000 (15:55 +0100)
committerLi Yang <leoyang.li@nxp.com>
Mon, 9 Dec 2019 19:58:49 +0000 (13:58 -0600)
When releasing the allocated muram resource, we rely on reading back
the offsets from the riptr/tiptr registers. But those registers are
__be16 (and we indeed write them using iowrite16be), so we can't just
read them back with a normal C dereference.

This is not currently a real problem, since for now the driver is
PPC32-only. But it will soon be allowed to be used on arm and arm64 as
well.

Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
drivers/net/wan/fsl_ucc_hdlc.c

index 405b24a..8d13586 100644 (file)
@@ -732,8 +732,8 @@ static int uhdlc_open(struct net_device *dev)
 
 static void uhdlc_memclean(struct ucc_hdlc_private *priv)
 {
-       qe_muram_free(priv->ucc_pram->riptr);
-       qe_muram_free(priv->ucc_pram->tiptr);
+       qe_muram_free(ioread16be(&priv->ucc_pram->riptr));
+       qe_muram_free(ioread16be(&priv->ucc_pram->tiptr));
 
        if (priv->rx_bd_base) {
                dma_free_coherent(priv->dev,