Commit 6e559c01 authored by Jiangfeng Xiao's avatar Jiangfeng Xiao Committed by Khalid Elmously

net: hisilicon: Fix dma_map_single failed on arm64

BugLink: https://bugs.launchpad.net/bugs/1845036

[ Upstream commit 96a50c0d ]

On the arm64 platform, executing "ifconfig eth0 up" will fail,
returning "ifconfig: SIOCSIFFLAGS: Input/output error."

ndev->dev is not initialized, dma_map_single->get_dma_ops->
dummy_dma_ops->__dummy_map_page will return DMA_ERROR_CODE
directly, so when we use dma_map_single, the first parameter
is to use the device of platform_device.
Signed-off-by: default avatarJiangfeng Xiao <xiaojiangfeng@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarConnor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent 0c0e7602
...@@ -157,6 +157,7 @@ struct hip04_priv { ...@@ -157,6 +157,7 @@ struct hip04_priv {
unsigned int reg_inten; unsigned int reg_inten;
struct napi_struct napi; struct napi_struct napi;
struct device *dev;
struct net_device *ndev; struct net_device *ndev;
struct tx_desc *tx_desc; struct tx_desc *tx_desc;
...@@ -387,7 +388,7 @@ static int hip04_tx_reclaim(struct net_device *ndev, bool force) ...@@ -387,7 +388,7 @@ static int hip04_tx_reclaim(struct net_device *ndev, bool force)
} }
if (priv->tx_phys[tx_tail]) { if (priv->tx_phys[tx_tail]) {
dma_unmap_single(&ndev->dev, priv->tx_phys[tx_tail], dma_unmap_single(priv->dev, priv->tx_phys[tx_tail],
priv->tx_skb[tx_tail]->len, priv->tx_skb[tx_tail]->len,
DMA_TO_DEVICE); DMA_TO_DEVICE);
priv->tx_phys[tx_tail] = 0; priv->tx_phys[tx_tail] = 0;
...@@ -437,8 +438,8 @@ static int hip04_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev) ...@@ -437,8 +438,8 @@ static int hip04_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
return NETDEV_TX_BUSY; return NETDEV_TX_BUSY;
} }
phys = dma_map_single(&ndev->dev, skb->data, skb->len, DMA_TO_DEVICE); phys = dma_map_single(priv->dev, skb->data, skb->len, DMA_TO_DEVICE);
if (dma_mapping_error(&ndev->dev, phys)) { if (dma_mapping_error(priv->dev, phys)) {
dev_kfree_skb(skb); dev_kfree_skb(skb);
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
...@@ -506,7 +507,7 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget) ...@@ -506,7 +507,7 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget)
if (unlikely(!skb)) if (unlikely(!skb))
net_dbg_ratelimited("build_skb failed\n"); net_dbg_ratelimited("build_skb failed\n");
dma_unmap_single(&ndev->dev, priv->rx_phys[priv->rx_head], dma_unmap_single(priv->dev, priv->rx_phys[priv->rx_head],
RX_BUF_SIZE, DMA_FROM_DEVICE); RX_BUF_SIZE, DMA_FROM_DEVICE);
priv->rx_phys[priv->rx_head] = 0; priv->rx_phys[priv->rx_head] = 0;
...@@ -534,9 +535,9 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget) ...@@ -534,9 +535,9 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget)
buf = netdev_alloc_frag(priv->rx_buf_size); buf = netdev_alloc_frag(priv->rx_buf_size);
if (!buf) if (!buf)
goto done; goto done;
phys = dma_map_single(&ndev->dev, buf, phys = dma_map_single(priv->dev, buf,
RX_BUF_SIZE, DMA_FROM_DEVICE); RX_BUF_SIZE, DMA_FROM_DEVICE);
if (dma_mapping_error(&ndev->dev, phys)) if (dma_mapping_error(priv->dev, phys))
goto done; goto done;
priv->rx_buf[priv->rx_head] = buf; priv->rx_buf[priv->rx_head] = buf;
priv->rx_phys[priv->rx_head] = phys; priv->rx_phys[priv->rx_head] = phys;
...@@ -639,9 +640,9 @@ static int hip04_mac_open(struct net_device *ndev) ...@@ -639,9 +640,9 @@ static int hip04_mac_open(struct net_device *ndev)
for (i = 0; i < RX_DESC_NUM; i++) { for (i = 0; i < RX_DESC_NUM; i++) {
dma_addr_t phys; dma_addr_t phys;
phys = dma_map_single(&ndev->dev, priv->rx_buf[i], phys = dma_map_single(priv->dev, priv->rx_buf[i],
RX_BUF_SIZE, DMA_FROM_DEVICE); RX_BUF_SIZE, DMA_FROM_DEVICE);
if (dma_mapping_error(&ndev->dev, phys)) if (dma_mapping_error(priv->dev, phys))
return -EIO; return -EIO;
priv->rx_phys[i] = phys; priv->rx_phys[i] = phys;
...@@ -675,7 +676,7 @@ static int hip04_mac_stop(struct net_device *ndev) ...@@ -675,7 +676,7 @@ static int hip04_mac_stop(struct net_device *ndev)
for (i = 0; i < RX_DESC_NUM; i++) { for (i = 0; i < RX_DESC_NUM; i++) {
if (priv->rx_phys[i]) { if (priv->rx_phys[i]) {
dma_unmap_single(&ndev->dev, priv->rx_phys[i], dma_unmap_single(priv->dev, priv->rx_phys[i],
RX_BUF_SIZE, DMA_FROM_DEVICE); RX_BUF_SIZE, DMA_FROM_DEVICE);
priv->rx_phys[i] = 0; priv->rx_phys[i] = 0;
} }
...@@ -826,6 +827,7 @@ static int hip04_mac_probe(struct platform_device *pdev) ...@@ -826,6 +827,7 @@ static int hip04_mac_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
priv = netdev_priv(ndev); priv = netdev_priv(ndev);
priv->dev = d;
priv->ndev = ndev; priv->ndev = ndev;
platform_set_drvdata(pdev, ndev); platform_set_drvdata(pdev, ndev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment