diff options
| author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2019-11-28 15:55:50 +0100 |
|---|---|---|
| committer | Li Yang <leoyang.li@nxp.com> | 2019-12-09 13:58:49 -0600 |
| commit | 49b865b332a610f2a9d098eaad4b418f2a09ddd4 (patch) | |
| tree | 915bccf74198a854ddca4e3d8f8a7743e1adfd3b | |
| parent | be2e9415f8b366abbe786b703436bfedf2012c21 (diff) | |
| download | linux-49b865b332a610f2a9d098eaad4b418f2a09ddd4.tar.gz linux-49b865b332a610f2a9d098eaad4b418f2a09ddd4.tar.bz2 linux-49b865b332a610f2a9d098eaad4b418f2a09ddd4.zip | |
net/wan/fsl_ucc_hdlc: fix reading of __be16 registers
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>
| -rw-r--r-- | drivers/net/wan/fsl_ucc_hdlc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c index 405b24a5a60d..8d13586bb774 100644 --- a/drivers/net/wan/fsl_ucc_hdlc.c +++ b/drivers/net/wan/fsl_ucc_hdlc.c @@ -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, |