aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/layerscape/patches-5.4')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0192-dpaa2-eth-Add-support-for-Rx-traffic-classes.patch18
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch6
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0195-dpaa2-eth-Add-helper-functions.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch6
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0200-dpaa2-eth-Enable-Rx-PFC.patch6
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0201-dpaa2-eth-Enable-Tx-PFC.patch6
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch10
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch8
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0205-dpaa2-eth-Add-Rx-error-queue.patch6
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch4
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch6
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0216-dpaa2-eth-Add-autoneg-support.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch2
14 files changed, 42 insertions, 42 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0192-dpaa2-eth-Add-support-for-Rx-traffic-classes.patch b/target/linux/layerscape/patches-5.4/701-net-0192-dpaa2-eth-Add-support-for-Rx-traffic-classes.patch
index 43e9b5a722..59a36bf67f 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0192-dpaa2-eth-Add-support-for-Rx-traffic-classes.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0192-dpaa2-eth-Add-support-for-Rx-traffic-classes.patch
@@ -101,7 +101,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
}
/* For each FQ, decide on which core to process incoming frames */
-@@ -2694,7 +2699,7 @@ static int setup_rx_flow(struct dpaa2_et
+@@ -2699,7 +2704,7 @@ static int setup_rx_flow(struct dpaa2_et
int err;
err = dpni_get_queue(priv->mc_io, 0, priv->mc_token,
@@ -110,7 +110,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
if (err) {
dev_err(dev, "dpni_get_queue(RX) failed\n");
return err;
-@@ -2707,7 +2712,7 @@ static int setup_rx_flow(struct dpaa2_et
+@@ -2712,7 +2717,7 @@ static int setup_rx_flow(struct dpaa2_et
queue.destination.priority = 1;
queue.user_context = (u64)(uintptr_t)fq;
err = dpni_set_queue(priv->mc_io, 0, priv->mc_token,
@@ -119,7 +119,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
DPNI_QUEUE_OPT_USER_CTX | DPNI_QUEUE_OPT_DEST,
&queue);
if (err) {
-@@ -2716,6 +2721,10 @@ static int setup_rx_flow(struct dpaa2_et
+@@ -2721,6 +2726,10 @@ static int setup_rx_flow(struct dpaa2_et
}
/* xdp_rxq setup */
@@ -130,7 +130,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
err = xdp_rxq_info_reg(&fq->channel->xdp_rxq, priv->net_dev,
fq->flowid);
if (err) {
-@@ -2853,7 +2862,7 @@ static int config_legacy_hash_key(struct
+@@ -2858,7 +2867,7 @@ static int config_legacy_hash_key(struct
{
struct device *dev = priv->net_dev->dev.parent;
struct dpni_rx_tc_dist_cfg dist_cfg;
@@ -139,7 +139,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
memset(&dist_cfg, 0, sizeof(dist_cfg));
-@@ -2861,9 +2870,14 @@ static int config_legacy_hash_key(struct
+@@ -2866,9 +2875,14 @@ static int config_legacy_hash_key(struct
dist_cfg.dist_size = dpaa2_eth_queue_count(priv);
dist_cfg.dist_mode = DPNI_DIST_MODE_HASH;
@@ -157,7 +157,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
return err;
}
-@@ -2873,7 +2887,7 @@ static int config_hash_key(struct dpaa2_
+@@ -2878,7 +2892,7 @@ static int config_hash_key(struct dpaa2_
{
struct device *dev = priv->net_dev->dev.parent;
struct dpni_rx_dist_cfg dist_cfg;
@@ -166,7 +166,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
memset(&dist_cfg, 0, sizeof(dist_cfg));
-@@ -2881,9 +2895,15 @@ static int config_hash_key(struct dpaa2_
+@@ -2886,9 +2900,15 @@ static int config_hash_key(struct dpaa2_
dist_cfg.dist_size = dpaa2_eth_queue_count(priv);
dist_cfg.enable = 1;
@@ -185,7 +185,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
return err;
}
-@@ -2893,7 +2913,7 @@ static int config_cls_key(struct dpaa2_e
+@@ -2898,7 +2918,7 @@ static int config_cls_key(struct dpaa2_e
{
struct device *dev = priv->net_dev->dev.parent;
struct dpni_rx_dist_cfg dist_cfg;
@@ -194,7 +194,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
memset(&dist_cfg, 0, sizeof(dist_cfg));
-@@ -2901,9 +2921,15 @@ static int config_cls_key(struct dpaa2_e
+@@ -2906,9 +2926,15 @@ static int config_cls_key(struct dpaa2_e
dist_cfg.dist_size = dpaa2_eth_queue_count(priv);
dist_cfg.enable = 1;
diff --git a/target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch b/target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch
index 317ed78f25..4c9ae512a0 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch
@@ -18,7 +18,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -2603,6 +2603,118 @@ out_err:
+@@ -2608,6 +2608,118 @@ out_err:
priv->enqueue = dpaa2_eth_enqueue_qd;
}
@@ -137,7 +137,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
/* Configure the DPNI object this interface is associated with */
static int setup_dpni(struct fsl_mc_device *ls_dev)
{
-@@ -2665,6 +2777,10 @@ static int setup_dpni(struct fsl_mc_devi
+@@ -2670,6 +2782,10 @@ static int setup_dpni(struct fsl_mc_devi
goto close;
}
@@ -150,7 +150,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
if (!priv->cls_rules)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
-@@ -413,6 +413,7 @@ struct dpaa2_eth_priv {
+@@ -414,6 +414,7 @@ struct dpaa2_eth_priv {
u64 rx_cls_fields;
struct dpaa2_eth_cls_rule *cls_rules;
u8 rx_cls_enabled;
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
index a63977d08e..37cbbca727 100644
--- 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
@@ -27,7 +27,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
/* 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 {
+@@ -495,6 +495,17 @@ enum dpaa2_eth_rx_dist {
(dpaa2_eth_cmp_dpni_ver((priv), DPNI_PAUSE_VER_MAJOR, \
DPNI_PAUSE_VER_MINOR) >= 0)
diff --git a/target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch b/target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch
index 3bf2826280..2d38b6b0d6 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch
@@ -33,7 +33,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
depends on FSL_DPAA2_ETH && PTP_1588_CLOCK_QORIQ
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -3607,6 +3607,81 @@ static void del_ch_napi(struct dpaa2_eth
+@@ -3612,6 +3612,81 @@ static void del_ch_napi(struct dpaa2_eth
}
}
@@ -115,7 +115,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)
{
struct device *dev;
-@@ -3696,6 +3771,15 @@ static int dpaa2_eth_probe(struct fsl_mc
+@@ -3701,6 +3776,15 @@ static int dpaa2_eth_probe(struct fsl_mc
if (err)
goto err_alloc_rings;
@@ -141,7 +141,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
#include <linux/netdevice.h>
#include <linux/if_vlan.h>
#include <linux/fsl/mc.h>
-@@ -422,6 +423,10 @@ struct dpaa2_eth_priv {
+@@ -423,6 +424,10 @@ struct dpaa2_eth_priv {
struct dpaa2_eth_cls_rule *cls_rules;
u8 rx_cls_enabled;
u8 vlan_cls_enabled;
diff --git a/target/linux/layerscape/patches-5.4/701-net-0200-dpaa2-eth-Enable-Rx-PFC.patch b/target/linux/layerscape/patches-5.4/701-net-0200-dpaa2-eth-Enable-Rx-PFC.patch
index 69a0999d03..65d81f337d 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0200-dpaa2-eth-Enable-Rx-PFC.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0200-dpaa2-eth-Enable-Rx-PFC.patch
@@ -26,7 +26,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -3613,6 +3613,9 @@ static int dpaa2_eth_dcbnl_ieee_getpfc(s
+@@ -3618,6 +3618,9 @@ static int dpaa2_eth_dcbnl_ieee_getpfc(s
{
struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
@@ -36,7 +36,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
memcpy(pfc, &priv->pfc, sizeof(priv->pfc));
pfc->pfc_cap = dpaa2_eth_tc_count(priv);
-@@ -3623,6 +3626,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
+@@ -3628,6 +3631,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
struct ieee_pfc *pfc)
{
struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
@@ -45,7 +45,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
if (pfc->mbc || pfc->delay)
return -EOPNOTSUPP;
-@@ -3631,6 +3636,24 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
+@@ -3636,6 +3641,24 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
if (priv->pfc.pfc_en == pfc->pfc_en)
return 0;
diff --git a/target/linux/layerscape/patches-5.4/701-net-0201-dpaa2-eth-Enable-Tx-PFC.patch b/target/linux/layerscape/patches-5.4/701-net-0201-dpaa2-eth-Enable-Tx-PFC.patch
index 4efc15514d..c663578ffc 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0201-dpaa2-eth-Enable-Tx-PFC.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0201-dpaa2-eth-Enable-Tx-PFC.patch
@@ -19,7 +19,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -3622,6 +3622,47 @@ static int dpaa2_eth_dcbnl_ieee_getpfc(s
+@@ -3627,6 +3627,47 @@ static int dpaa2_eth_dcbnl_ieee_getpfc(s
return 0;
}
@@ -67,7 +67,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
static int dpaa2_eth_dcbnl_ieee_setpfc(struct net_device *net_dev,
struct ieee_pfc *pfc)
{
-@@ -3639,7 +3680,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
+@@ -3644,7 +3685,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
/* We allow PFC configuration even if it won't have any effect until
* general pause frames are enabled
*/
@@ -77,7 +77,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
netdev_warn(net_dev, "Pause support must be enabled in order for PFC to work!\n");
link_cfg.rate = priv->link_state.rate;
-@@ -3654,6 +3696,11 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
+@@ -3659,6 +3701,11 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
return err;
}
diff --git a/target/linux/layerscape/patches-5.4/701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch b/target/linux/layerscape/patches-5.4/701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch
index 513fcc4b2a..8ac8ccf9bc 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch
@@ -87,7 +87,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
/* Chech link state; speed / duplex changes are not treated yet */
if (priv->link_state.up == state.up)
-@@ -3668,6 +3683,7 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
+@@ -3673,6 +3688,7 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
{
struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
struct dpni_link_cfg link_cfg = {0};
@@ -95,7 +95,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
int err;
if (pfc->mbc || pfc->delay)
-@@ -3680,8 +3696,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
+@@ -3685,8 +3701,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
/* We allow PFC configuration even if it won't have any effect until
* general pause frames are enabled
*/
@@ -106,7 +106,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
netdev_warn(net_dev, "Pause support must be enabled in order for PFC to work!\n");
link_cfg.rate = priv->link_state.rate;
-@@ -3702,6 +3718,9 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
+@@ -3707,6 +3723,9 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
return err;
memcpy(&priv->pfc, pfc, sizeof(priv->pfc));
@@ -118,7 +118,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
}
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
-@@ -422,7 +422,8 @@ struct dpaa2_eth_priv {
+@@ -423,7 +423,8 @@ struct dpaa2_eth_priv {
struct dpaa2_eth_drv_stats __percpu *percpu_extras;
u16 mc_token;
@@ -128,7 +128,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
struct dpni_link_state link_state;
bool do_link_poll;
-@@ -434,6 +435,7 @@ struct dpaa2_eth_priv {
+@@ -435,6 +436,7 @@ struct dpaa2_eth_priv {
struct dpaa2_eth_cls_rule *cls_rules;
u8 rx_cls_enabled;
u8 vlan_cls_enabled;
diff --git a/target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch b/target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch
index e1354b10a7..73dead7363 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch
@@ -19,7 +19,7 @@ Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -3771,6 +3771,83 @@ const struct dcbnl_rtnl_ops dpaa2_eth_dc
+@@ -3776,6 +3776,83 @@ const struct dcbnl_rtnl_ops dpaa2_eth_dc
};
#endif
@@ -103,7 +103,7 @@ Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)
{
struct device *dev;
-@@ -3890,6 +3967,7 @@ static int dpaa2_eth_probe(struct fsl_mc
+@@ -3895,6 +3972,7 @@ static int dpaa2_eth_probe(struct fsl_mc
#ifdef CONFIG_DEBUG_FS
dpaa2_dbg_add(priv);
#endif
@@ -111,7 +111,7 @@ Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
dev_info(dev, "Probed interface %s\n", net_dev->name);
return 0;
-@@ -3937,6 +4015,8 @@ static int dpaa2_eth_remove(struct fsl_m
+@@ -3942,6 +4020,8 @@ static int dpaa2_eth_remove(struct fsl_m
#ifdef CONFIG_DEBUG_FS
dpaa2_dbg_remove(priv);
#endif
@@ -132,7 +132,7 @@ Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
/* Maximum number of Tx confirmation frames to be processed
* in a single NAPI call
*/
-@@ -444,6 +447,7 @@ struct dpaa2_eth_priv {
+@@ -445,6 +448,7 @@ struct dpaa2_eth_priv {
#ifdef CONFIG_DEBUG_FS
struct dpaa2_debugfs dbg;
#endif
diff --git a/target/linux/layerscape/patches-5.4/701-net-0205-dpaa2-eth-Add-Rx-error-queue.patch b/target/linux/layerscape/patches-5.4/701-net-0205-dpaa2-eth-Add-Rx-error-queue.patch
index 69124182cf..58e744354a 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0205-dpaa2-eth-Add-Rx-error-queue.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0205-dpaa2-eth-Add-Rx-error-queue.patch
@@ -113,7 +113,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
/* For each FQ, decide on which core to process incoming frames */
set_fq_affinity(priv);
}
-@@ -2939,6 +2993,40 @@ static int setup_tx_flow(struct dpaa2_et
+@@ -2944,6 +2998,40 @@ static int setup_tx_flow(struct dpaa2_et
return 0;
}
@@ -154,7 +154,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
/* Supported header fields for Rx hash distribution key */
static const struct dpaa2_eth_dist_fields dist_fields[] = {
{
-@@ -3308,7 +3396,11 @@ static int bind_dpni(struct dpaa2_eth_pr
+@@ -3313,7 +3401,11 @@ static int bind_dpni(struct dpaa2_eth_pr
/* Configure handling of error frames */
err_cfg.errors = DPAA2_FAS_RX_ERR_MASK;
err_cfg.set_frame_annotation = 1;
@@ -166,7 +166,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
err = dpni_set_errors_behavior(priv->mc_io, 0, priv->mc_token,
&err_cfg);
if (err) {
-@@ -3325,6 +3417,11 @@ static int bind_dpni(struct dpaa2_eth_pr
+@@ -3330,6 +3422,11 @@ static int bind_dpni(struct dpaa2_eth_pr
case DPAA2_TX_CONF_FQ:
err = setup_tx_flow(priv, &priv->fq[i]);
break;
diff --git a/target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch b/target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch
index 23deef6567..dfbb892c82 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch
@@ -15,7 +15,7 @@ Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -3888,7 +3888,7 @@ static ssize_t dpaa2_eth_write_tx_shapin
+@@ -3893,7 +3893,7 @@ static ssize_t dpaa2_eth_write_tx_shapin
{
int err, items;
struct dpaa2_eth_priv *priv = netdev_priv(to_net_dev(dev));
@@ -24,7 +24,7 @@ Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
items = sscanf(buf, "%u %hu", &scfg.rate_limit, &scfg.max_burst_size);
if (items != 2) {
-@@ -3902,7 +3902,8 @@ static ssize_t dpaa2_eth_write_tx_shapin
+@@ -3907,7 +3907,8 @@ static ssize_t dpaa2_eth_write_tx_shapin
return -EINVAL;
}
diff --git a/target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch b/target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch
index 3e586e457a..9246e44d7a 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch
@@ -1561,7 +1561,7 @@ Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
static const struct net_device_ops dpaa2_eth_ops = {
.ndo_open = dpaa2_eth_open,
.ndo_start_xmit = dpaa2_eth_tx,
-@@ -4166,18 +4186,27 @@ static int __init dpaa2_eth_driver_init(
+@@ -4171,18 +4191,27 @@ static int __init dpaa2_eth_driver_init(
dpaa2_eth_dbg_init();
err = fsl_mc_driver_register(&dpaa2_eth_driver);
@@ -1596,7 +1596,7 @@ Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
module_init(dpaa2_eth_driver_init);
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
-@@ -453,6 +453,8 @@ struct dpaa2_eth_priv {
+@@ -454,6 +454,8 @@ struct dpaa2_eth_priv {
struct dpaa2_debugfs dbg;
#endif
struct dpni_tx_shaping_cfg shaping_cfg;
@@ -1605,7 +1605,7 @@ Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
};
#define DPAA2_RXH_SUPPORTED (RXH_L2DA | RXH_VLAN | RXH_L3_PROTO \
-@@ -573,6 +575,11 @@ static inline unsigned int dpaa2_eth_rx_
+@@ -574,6 +576,11 @@ static inline unsigned int dpaa2_eth_rx_
return priv->tx_data_offset - DPAA2_ETH_RX_HWA_SIZE;
}
diff --git a/target/linux/layerscape/patches-5.4/701-net-0216-dpaa2-eth-Add-autoneg-support.patch b/target/linux/layerscape/patches-5.4/701-net-0216-dpaa2-eth-Add-autoneg-support.patch
index a49562e40a..b94fafae6c 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0216-dpaa2-eth-Add-autoneg-support.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0216-dpaa2-eth-Add-autoneg-support.patch
@@ -36,7 +36,7 @@ Signed-off-by: Valentin Catalin Neacsu <valentin-catalin.neacsu@nxp.com>
"dpni_get_link_state() failed\n");
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
-@@ -542,6 +542,9 @@ static inline bool dpaa2_eth_rx_pause_en
+@@ -543,6 +543,9 @@ static inline bool dpaa2_eth_rx_pause_en
return !!(link_options & DPNI_LINK_OPT_PAUSE);
}
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch
index f430d334c5..d1bde7c181 100644
--- a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch
+++ b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch
@@ -54,7 +54,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
* All 3.1 IP version constants are greater than the 3.0 IP
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
-@@ -3392,6 +3392,10 @@ int dwc3_gadget_init(struct dwc3 *dwc)
+@@ -3389,6 +3389,10 @@ int dwc3_gadget_init(struct dwc3 *dwc)
dwc->gadget.sg_supported = true;
dwc->gadget.name = "dwc3-gadget";
dwc->gadget.lpm_capable = true;
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch b/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch
index fa23167c7e..ff582f3ace 100644
--- a/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch
+++ b/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch
@@ -20,7 +20,7 @@ Signed-off-by: Li Jun <jun.li@freescale.com>
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -4728,7 +4728,8 @@ hub_port_init(struct usb_hub *hub, struc
+@@ -4729,7 +4729,8 @@ hub_port_init(struct usb_hub *hub, struc
}
if (r) {
if (r != -ENODEV)