| From 13296e938da191216395952cf49ddda96e67359c Mon Sep 17 00:00:00 2001 |
| From: Laurentiu Tudor <laurentiu.tudor@nxp.com> |
| Date: Thu, 5 Apr 2018 12:37:57 +0300 |
| Subject: [PATCH] dpaa_eth: base dma mappings on the fman rx port |
| |
| The dma transactions initiator is the rx fman port so that's the device |
| that the dma mappings should be done. Previously the mappings were done |
| through the MAC device which makes no sense because it's neither dma-able |
| nor connected in any way to smmu. |
| |
| Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> |
| Acked-by: Madalin Bucur <madalin.bucur@nxp.com> |
| --- |
| drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 18 +++++++++--------- |
| 1 file changed, 9 insertions(+), 9 deletions(-) |
| |
| --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c |
| +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c |
| @@ -2978,8 +2978,15 @@ static int dpaa_eth_probe(struct platfor |
| return -ENODEV; |
| } |
| |
| + mac_dev = dpaa_mac_dev_get(pdev); |
| + if (IS_ERR(mac_dev)) { |
| + dev_err(&pdev->dev, "dpaa_mac_dev_get() failed\n"); |
| + err = PTR_ERR(mac_dev); |
| + goto probe_err; |
| + } |
| + |
| /* device used for DMA mapping */ |
| - dev = pdev->dev.parent; |
| + dev = fman_port_get_device(mac_dev->port[RX]); |
| err = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(40)); |
| if (err) { |
| dev_err(dev, "dma_coerce_mask_and_coherent() failed\n"); |
| @@ -3004,13 +3011,6 @@ static int dpaa_eth_probe(struct platfor |
| |
| priv->msg_enable = netif_msg_init(debug, DPAA_MSG_DEFAULT); |
| |
| - mac_dev = dpaa_mac_dev_get(pdev); |
| - if (IS_ERR(mac_dev)) { |
| - dev_err(dev, "dpaa_mac_dev_get() failed\n"); |
| - err = PTR_ERR(mac_dev); |
| - goto free_netdev; |
| - } |
| - |
| /* If fsl_fm_max_frm is set to a higher value than the all-common 1500, |
| * we choose conservatively and let the user explicitly set a higher |
| * MTU via ifconfig. Otherwise, the user may end up with different MTUs |
| @@ -3146,9 +3146,9 @@ delete_egress_cgr: |
| qman_release_cgrid(priv->cgr_data.cgr.cgrid); |
| free_dpaa_bps: |
| dpaa_bps_free(priv); |
| -free_netdev: |
| dev_set_drvdata(dev, NULL); |
| free_netdev(net_dev); |
| +probe_err: |
| |
| return err; |
| } |