cddd459140
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
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;
|
|
}
|