From 786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 21 Mar 2022 01:16:48 +0000 Subject: kernel: delete Linux 5.4 config and patches As the upcoming release will be based on Linux 5.10 only, remove all kernel configuration as well as patches for Linux 5.4. There were no targets still actively using Linux 5.4. Signed-off-by: Daniel Golle (cherry picked from commit 3a14580411adfb75f9a44eded9f41245b9e44606) --- ...1-net-0195-dpaa2-eth-Add-helper-functions.patch | 61 ---------------------- 1 file changed, 61 deletions(-) delete mode 100644 target/linux/layerscape/patches-5.4/701-net-0195-dpaa2-eth-Add-helper-functions.patch (limited to 'target/linux/layerscape/patches-5.4/701-net-0195-dpaa2-eth-Add-helper-functions.patch') 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 deleted file mode 100644 index 37cbbca727..0000000000 --- a/target/linux/layerscape/patches-5.4/701-net-0195-dpaa2-eth-Add-helper-functions.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 1ffb57beaefe23ceeb526bc238351f7725502571 Mon Sep 17 00:00:00 2001 -From: Ioana Radulescu -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 ---- - 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 -@@ -495,6 +495,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; - } - -- cgit v1.2.3