diff options
author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/701-net-0195-dpaa2-eth-Add-helper-functions.patch | |
parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
download | upstream-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-0195-dpaa2-eth-Add-helper-functions.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0195-dpaa2-eth-Add-helper-functions.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0195-dpaa2-eth-Add-helper-functions.patch b/target/linux/layerscape/patches-5.4/701-net-0195-dpaa2-eth-Add-helper-functions.patch new file mode 100644 index 0000000000..a63977d08e --- /dev/null +++ b/target/linux/layerscape/patches-5.4/701-net-0195-dpaa2-eth-Add-helper-functions.patch @@ -0,0 +1,61 @@ +From 1ffb57beaefe23ceeb526bc238351f7725502571 Mon Sep 17 00:00:00 2001 +From: Ioana Radulescu <ruxandra.radulescu@nxp.com> +Date: Mon, 16 Sep 2019 21:04:49 +0300 +Subject: [PATCH] dpaa2-eth: Add helper functions + +Add convenient helper functions that determines whether Rx/Tx pause +frames are enabled based on link state flags received from firmware. + +Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com> +--- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 3 +-- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 11 +++++++++++ + drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 5 ++--- + 3 files changed, 14 insertions(+), 5 deletions(-) + +--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c ++++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +@@ -1276,8 +1276,7 @@ static int link_state_update(struct dpaa + * Rx FQ taildrop configuration as well. We configure taildrop + * only when pause frame generation is disabled. + */ +- tx_pause = !!(state.options & DPNI_LINK_OPT_PAUSE) ^ +- !!(state.options & DPNI_LINK_OPT_ASYM_PAUSE); ++ tx_pause = dpaa2_eth_tx_pause_enabled(state.options); + dpaa2_eth_set_rx_taildrop(priv, !tx_pause); + + /* Chech link state; speed / duplex changes are not treated yet */ +--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h ++++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +@@ -494,6 +494,17 @@ enum dpaa2_eth_rx_dist { + (dpaa2_eth_cmp_dpni_ver((priv), DPNI_PAUSE_VER_MAJOR, \ + DPNI_PAUSE_VER_MINOR) >= 0) + ++static inline bool dpaa2_eth_tx_pause_enabled(u64 link_options) ++{ ++ return !!(link_options & DPNI_LINK_OPT_PAUSE) ^ ++ !!(link_options & DPNI_LINK_OPT_ASYM_PAUSE); ++} ++ ++static inline bool dpaa2_eth_rx_pause_enabled(u64 link_options) ++{ ++ return !!(link_options & DPNI_LINK_OPT_PAUSE); ++} ++ + static inline + unsigned int dpaa2_eth_needed_headroom(struct dpaa2_eth_priv *priv, + struct sk_buff *skb) +--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c ++++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c +@@ -99,9 +99,8 @@ static void dpaa2_eth_get_pauseparam(str + struct dpaa2_eth_priv *priv = netdev_priv(net_dev); + u64 link_options = priv->link_state.options; + +- pause->rx_pause = !!(link_options & DPNI_LINK_OPT_PAUSE); +- pause->tx_pause = pause->rx_pause ^ +- !!(link_options & DPNI_LINK_OPT_ASYM_PAUSE); ++ pause->rx_pause = dpaa2_eth_rx_pause_enabled(link_options); ++ pause->tx_pause = dpaa2_eth_tx_pause_enabled(link_options); + pause->autoneg = AUTONEG_DISABLE; + } + |