aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0018-sdk_dpaa-use-new-api-ethtool_ksettings_-get-set.patch
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2020-04-10 10:47:05 +0800
committerPetr Štetiar <ynezz@true.cz>2020-05-07 12:53:06 +0200
commitcddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch)
tree392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/701-net-0018-sdk_dpaa-use-new-api-ethtool_ksettings_-get-set.patch
parentd1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff)
downloadupstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip
layerscape: add patches-5.4
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>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0018-sdk_dpaa-use-new-api-ethtool_ksettings_-get-set.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0018-sdk_dpaa-use-new-api-ethtool_ksettings_-get-set.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0018-sdk_dpaa-use-new-api-ethtool_ksettings_-get-set.patch b/target/linux/layerscape/patches-5.4/701-net-0018-sdk_dpaa-use-new-api-ethtool_ksettings_-get-set.patch
new file mode 100644
index 0000000000..0df382e7d9
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/701-net-0018-sdk_dpaa-use-new-api-ethtool_ksettings_-get-set.patch
@@ -0,0 +1,65 @@
+From c77e142beed7241a1360f2dedbe34e2f697512c9 Mon Sep 17 00:00:00 2001
+From: Madalin Bucur <madalin.bucur@nxp.com>
+Date: Tue, 29 Aug 2017 09:51:45 +0300
+Subject: [PATCH] sdk_dpaa: use new api ethtool_ksettings_{get|set}
+
+Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
+---
+ .../net/ethernet/freescale/sdk_dpaa/dpaa_ethtool.c | 20 +++++++++-----------
+ 1 file changed, 9 insertions(+), 11 deletions(-)
+
+--- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_ethtool.c
++++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_ethtool.c
+@@ -84,8 +84,8 @@ static char dpa_stats_global[][ETH_GSTRI
+ #define DPA_STATS_PERCPU_LEN ARRAY_SIZE(dpa_stats_percpu)
+ #define DPA_STATS_GLOBAL_LEN ARRAY_SIZE(dpa_stats_global)
+
+-static int __cold dpa_get_settings(struct net_device *net_dev,
+- struct ethtool_cmd *et_cmd)
++static int __cold dpa_get_ksettings(struct net_device *net_dev,
++ struct ethtool_link_ksettings *cmd)
+ {
+ int _errno;
+ struct dpa_priv_s *priv;
+@@ -101,15 +101,13 @@ static int __cold dpa_get_settings(struc
+ return 0;
+ }
+
+- _errno = phy_ethtool_gset(priv->mac_dev->phy_dev, et_cmd);
+- if (unlikely(_errno < 0))
+- netdev_err(net_dev, "phy_ethtool_gset() = %d\n", _errno);
++ phy_ethtool_ksettings_get(priv->mac_dev->phy_dev, cmd);
+
+ return _errno;
+ }
+
+-static int __cold dpa_set_settings(struct net_device *net_dev,
+- struct ethtool_cmd *et_cmd)
++static int __cold dpa_set_ksettings(struct net_device *net_dev,
++ struct ethtool_link_ksettings *cmd)
+ {
+ int _errno;
+ struct dpa_priv_s *priv;
+@@ -125,9 +123,9 @@ static int __cold dpa_set_settings(struc
+ return -ENODEV;
+ }
+
+- _errno = phy_ethtool_sset(priv->mac_dev->phy_dev, et_cmd);
++ _errno = phy_ethtool_ksettings_set(priv->mac_dev->phy_dev, cmd);
+ if (unlikely(_errno < 0))
+- netdev_err(net_dev, "phy_ethtool_sset() = %d\n", _errno);
++ netdev_err(net_dev, "phy_ethtool_ksettings_set() = %d\n", _errno);
+
+ return _errno;
+ }
+@@ -522,8 +520,8 @@ static void dpa_get_strings(struct net_d
+ }
+
+ const struct ethtool_ops dpa_ethtool_ops = {
+- .get_settings = dpa_get_settings,
+- .set_settings = dpa_set_settings,
++ .get_link_ksettings = dpa_get_ksettings,
++ .set_link_ksettings = dpa_set_ksettings,
+ .get_drvinfo = dpa_get_drvinfo,
+ .get_msglevel = dpa_get_msglevel,
+ .set_msglevel = dpa_set_msglevel,