aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0205-dpaa2-eth-Add-Rx-error-queue.patch
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-05-20 12:15:27 +0200
committerPetr Štetiar <ynezz@true.cz>2020-05-20 15:26:22 +0200
commit1b2fefb244d7d2fd949104e743ff15d01bbe5bb0 (patch)
treef0e969c3acedfab614bfd015f7553a870866bffb /target/linux/layerscape/patches-5.4/701-net-0205-dpaa2-eth-Add-Rx-error-queue.patch
parent982d78777396731bf1abc5447100aafb09bba684 (diff)
downloadupstream-1b2fefb244d7d2fd949104e743ff15d01bbe5bb0.tar.gz
upstream-1b2fefb244d7d2fd949104e743ff15d01bbe5bb0.tar.bz2
upstream-1b2fefb244d7d2fd949104e743ff15d01bbe5bb0.zip
kernel: bump 5.4 to 5.4.42
Refreshed patches, removed upstreamed patch: generic/pending: 001-v5.4-pinctrl-qcom-fix-wrong-write-in-update_dual_edge.patch.patch Run tested: qemu-x86-64 Build tested: x86/64, ath79/nand, imx6, sunxi/a53 Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0205-dpaa2-eth-Add-Rx-error-queue.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0205-dpaa2-eth-Add-Rx-error-queue.patch6
1 files changed, 3 insertions, 3 deletions
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;