kernel: bump 5.4 to 5.4.69

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 701-net-0192-dpaa2-eth-Add-support-for-Rx-traffic-classes.patch

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 59a36bf67f09a8e0385ef60245fc4fb761a570ab..0ec6133fcaf5c6be054be8ce8f46c2951e7ac8d0 100644 (file)
--- 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 */
-@@ -2699,7 +2704,7 @@ static int setup_rx_flow(struct dpaa2_et
+@@ -2701,7 +2706,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;
-@@ -2712,7 +2717,7 @@ static int setup_rx_flow(struct dpaa2_et
+@@ -2714,7 +2719,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) {
-@@ -2721,6 +2726,10 @@ static int setup_rx_flow(struct dpaa2_et
+@@ -2723,6 +2728,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) {
-@@ -2858,7 +2867,7 @@ static int config_legacy_hash_key(struct
+@@ -2860,7 +2869,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));
  
-@@ -2866,9 +2875,14 @@ static int config_legacy_hash_key(struct
+@@ -2868,9 +2877,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;
  }
-@@ -2878,7 +2892,7 @@ static int config_hash_key(struct dpaa2_
+@@ -2880,7 +2894,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));
  
-@@ -2886,9 +2900,15 @@ static int config_hash_key(struct dpaa2_
+@@ -2888,9 +2902,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;
  }
-@@ -2898,7 +2918,7 @@ static int config_cls_key(struct dpaa2_e
+@@ -2900,7 +2920,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));
  
-@@ -2906,9 +2926,15 @@ static int config_cls_key(struct dpaa2_e
+@@ -2908,9 +2928,15 @@ static int config_cls_key(struct dpaa2_e
        dist_cfg.dist_size = dpaa2_eth_queue_count(priv);
        dist_cfg.enable = 1;