aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0051-sdk_dpaa-ceetm-use-the-tcf-block-infrastructure.patch
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2020-04-10 10:47:05 +0800
committerPetr Štetiar <ynezz@true.cz>2020-05-07 12:53:06 +0200
commitcddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch)
tree392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/701-net-0051-sdk_dpaa-ceetm-use-the-tcf-block-infrastructure.patch
parentd1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff)
downloadupstream-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-0051-sdk_dpaa-ceetm-use-the-tcf-block-infrastructure.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0051-sdk_dpaa-ceetm-use-the-tcf-block-infrastructure.patch126
1 files changed, 126 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0051-sdk_dpaa-ceetm-use-the-tcf-block-infrastructure.patch b/target/linux/layerscape/patches-5.4/701-net-0051-sdk_dpaa-ceetm-use-the-tcf-block-infrastructure.patch
new file mode 100644
index 0000000000..0e3d0166bf
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/701-net-0051-sdk_dpaa-ceetm-use-the-tcf-block-infrastructure.patch
@@ -0,0 +1,126 @@
+From ae72322610af7eb13fc9a67567fdac610d3d3d3d Mon Sep 17 00:00:00 2001
+From: Camelia Groza <camelia.groza@nxp.com>
+Date: Wed, 17 Jan 2018 16:44:19 +0200
+Subject: [PATCH] sdk_dpaa: ceetm: use the tcf block infrastructure
+
+Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
+---
+ .../ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c | 31 +++++++++++++++-------
+ .../ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.h | 2 ++
+ 2 files changed, 24 insertions(+), 9 deletions(-)
+
+--- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c
++++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c
+@@ -423,7 +423,7 @@ static void ceetm_cls_destroy(struct Qdi
+ free_percpu(cl->wbfs.cstats);
+ }
+
+- tcf_destroy_chain(&cl->filter_list);
++ tcf_block_put(cl->block);
+ kfree(cl);
+ }
+
+@@ -440,11 +440,13 @@ static void ceetm_destroy(struct Qdisc *
+ __func__, sch->handle);
+
+ /* All filters need to be removed before destroying the classes */
+- tcf_destroy_chain(&priv->filter_list);
++ tcf_block_put(priv->block);
+
+ for (i = 0; i < priv->clhash.hashsize; i++) {
+- hlist_for_each_entry(cl, &priv->clhash.hash[i], common.hnode)
+- tcf_destroy_chain(&cl->filter_list);
++ hlist_for_each_entry(cl, &priv->clhash.hash[i], common.hnode) {
++ tcf_block_put(cl->block);
++ cl->block = NULL;
++ }
+ }
+
+ for (i = 0; i < priv->clhash.hashsize; i++) {
+@@ -594,7 +596,7 @@ static int ceetm_init_root(struct Qdisc
+ /* Validate inputs */
+ if (sch->parent != TC_H_ROOT) {
+ pr_err("CEETM: a root ceetm qdisc can not be attached to a class\n");
+- tcf_destroy_chain(&priv->filter_list);
++ tcf_block_put(priv->block);
+ qdisc_class_hash_destroy(&priv->clhash);
+ return -EINVAL;
+ }
+@@ -1053,6 +1055,10 @@ static int ceetm_init(struct Qdisc *sch,
+ return -EINVAL;
+ }
+
++ ret = tcf_block_get(&priv->block, &priv->filter_list);
++ if (ret)
++ return ret;
++
+ ret = nla_parse_nested(tb, TCA_CEETM_QOPS, opt, ceetm_policy, NULL);
+ if (ret < 0) {
+ pr_err(KBUILD_BASENAME " : %s : tc error\n", __func__);
+@@ -1521,6 +1527,12 @@ static int ceetm_cls_change(struct Qdisc
+ if (!cl)
+ return -ENOMEM;
+
++ err = tcf_block_get(&cl->block, &cl->filter_list);
++ if (err) {
++ kfree(cl);
++ return err;
++ }
++
+ cl->type = copt->type;
+ cl->shaped = copt->shaped;
+ cl->root.rate = copt->rate;
+@@ -1585,6 +1597,7 @@ channel_err:
+ pr_err(KBUILD_BASENAME " : %s : failed to release the channel %d\n",
+ __func__, channel->idx);
+ claim_err:
++ tcf_block_put(cl->block);
+ kfree(cl);
+ return err;
+ }
+@@ -1779,15 +1792,15 @@ static int ceetm_cls_dump_stats(struct Q
+ return gnet_stats_copy_app(d, &xstats, sizeof(xstats));
+ }
+
+-static struct tcf_proto **ceetm_tcf_chain(struct Qdisc *sch, unsigned long arg)
++static struct tcf_block *ceetm_tcf_block(struct Qdisc *sch, unsigned long arg)
+ {
+ struct ceetm_qdisc *priv = qdisc_priv(sch);
+ struct ceetm_class *cl = (struct ceetm_class *)arg;
+- struct tcf_proto **fl = cl ? &cl->filter_list : &priv->filter_list;
++ struct tcf_block *block = cl ? cl->block : priv->block;
+
+ pr_debug(KBUILD_BASENAME " : %s : class %X under qdisc %X\n", __func__,
+ cl ? cl->common.classid : 0, sch->handle);
+- return fl;
++ return block;
+ }
+
+ static unsigned long ceetm_tcf_bind(struct Qdisc *sch, unsigned long parent,
+@@ -1816,7 +1829,7 @@ const struct Qdisc_class_ops ceetm_cls_o
+ .change = ceetm_cls_change,
+ .delete = ceetm_cls_delete,
+ .walk = ceetm_cls_walk,
+- .tcf_chain = ceetm_tcf_chain,
++ .tcf_block = ceetm_tcf_block,
+ .bind_tcf = ceetm_tcf_bind,
+ .unbind_tcf = ceetm_tcf_unbind,
+ .dump = ceetm_cls_dump,
+--- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.h
++++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.h
+@@ -141,6 +141,7 @@ struct ceetm_qdisc {
+ };
+ struct Qdisc_class_hash clhash;
+ struct tcf_proto *filter_list; /* qdisc attached filters */
++ struct tcf_block *block;
+ };
+
+ /* CEETM Qdisc configuration parameters */
+@@ -192,6 +193,7 @@ struct ceetm_class {
+ struct Qdisc_class_common common;
+ int refcnt; /* usage count of this class */
+ struct tcf_proto *filter_list; /* class attached filters */
++ struct tcf_block *block;
+ struct Qdisc *parent;
+ bool shaped;
+ int type; /* ROOT/PRIO/WBFS */