From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Jamal Hadi Salim <jhs@mojatatu.com>,
        Cong Wang <xiyou.wangcong@gmail.com>,
        Jiri Pirko <jiri@resnulli.us>,
        Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Gerhard Engleder <gerhard@engleder-embedded.com>,
        Amritha Nambiar <amritha.nambiar@intel.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Ferenc Fejes <ferenc.fejes@ericsson.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        Roger Quadros <rogerq@kernel.org>,
        Pranavi Somisetty <pranavi.somisetty@amd.com>,
        Harini Katakam <harini.katakam@amd.com>,
        linux-kernel@vger.kernel.org,
        Giuseppe Cavallaro <peppe.cavallaro@st.com>,
        Alexandre Torgue <alexandre.torgue@foss.st.com>,
        Jose Abreu <joabreu@synopsys.com>,
        Wong Vee Khee <vee.khee.wong@linux.intel.com>,
        Michael Sit Wei Hong <michael.wei.hong.sit@intel.com>,
        Jacob Keller <jacob.e.keller@intel.com>
Subject: [PATCH v2 net-next 02/12] net: mscc: ocelot: add support for mqprio offload
Date:   Sun, 19 Feb 2023 15:52:58 +0200
Message-Id: <20230219135309.594188-3-vladimir.oltean@nxp.com>
In-Reply-To: <20230219135309.594188-1-vladimir.oltean@nxp.com>
References: <20230219135309.594188-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aDBJSRvxdgWDK3r5GsKUMga64n1kH6m0/AV8a9MrvjS8do8AMRTbAhD5d4G9?=
 =?us-ascii?Q?NepEzKE+wV0CIhWZw4Pb/fA2os/JWOm+uHSl+oEj4EgHB7rAgF0Sb0Z2Gt3O?=
 =?us-ascii?Q?0hbAiOl3iLMGWC58Rg2wVCjmdr5f05vLLKwogZ0Ad/ChfmtBIV+9qW9+czuJ?=
 =?us-ascii?Q?Ou6shk0bVgyqrY2GrAg/7cnKi9eCD8O8+FDgUUDspGSvaDpM4+KE/0TqP/bf?=
 =?us-ascii?Q?UtlWxW3AyoQcy48INT3bZC+iCGI6p3Ngwl+cgAzgIr1xI08wpTKeiX1/ql3F?=
 =?us-ascii?Q?XmUJyArUc2Bdn6V2v0VCc3NFROHffmKZ+viL4eNcWjYMMw/+r1BIS8WAAcqG?=
 =?us-ascii?Q?f9jJdhaS58OAJtJkH0BzOQ8fyEkop9HHxuJ3NtpICNdTXDEVfu+v/d4RNtme?=
 =?us-ascii?Q?NslVDKqDNxTHd8eMmNbhpPFYqR299Gh8zvlbZVQDx+MX3iMwl17zQ4fRib5o?=
 =?us-ascii?Q?+NGe5fTrjFUgPTqxhg9NbIcm8GKGiB4PuZko1cqAO86oejVorXBH6zTK0eM5?=
 =?us-ascii?Q?6PP8KJQQKp7W/pdMojKCUjQWpa5EIg90EElId/vBirg7tPtznQQeTOh1ZpVk?=
 =?us-ascii?Q?X38Rk6ThLA992+NdkJ5QXKlVdLHFOzx/LYEHUgaDaoON1M8SVXAulJ2QxKEA?=
 =?us-ascii?Q?d3dGJvC+YOZE/EFyLkyDBa3Bz+RVG54xu6N/o1TWq0OiWNGpj4XPu8NbqbXx?=
 =?us-ascii?Q?FF/ReJeelnqmv6Iq4IlB25+Qk9jgTxygrKFL2n3lyD+TTHMU6HhBEoccWq3s?=
 =?us-ascii?Q?b4dMa2R1OcCFnjnfvJkg/UInGf6ygDl6E3/zx+JzJRvIMN41f/5qQaoLHlNH?=
 =?us-ascii?Q?RpOv7BeLKnFr7Ve/zIYtIuO52pDj+iFjgqP1JP8fV9fj0CjNO+HkskQ5G84h?=
 =?us-ascii?Q?LHUJpyrdFkfr8kM/PHl0pt5K6tXHU0M9ej9zY2fVjF24pYssi9ti5WAzZn6m?=
 =?us-ascii?Q?ru98YQ939ZHYps2hrRLi4szfa9xhQYpvD8IC1jJsqOs1mZEBtWXiCOAJ+WGZ?=
 =?us-ascii?Q?4Wxg8Z7d2FlTpgd1F8pJcSWRFflZYWkvKjmopFFWrclIvSdHZ2F9cIw62F6a?=
 =?us-ascii?Q?MvTzJIJTei9EbvRiIR4RBm3jen6QzJRoy4n8ayLmf8aNe4syrjjrT9PSSu+f?=
 =?us-ascii?Q?lE6E90XzJ7xeuOn+uk194AXuiLOF/+inr0XvFVGPF+4HP2blI4erjjgGtyJ3?=
 =?us-ascii?Q?3H6iUukOJ/OOzRFkgq3BxT08a2mKNFJHqGBqc0hSNzeVJQcEHrtNyFVSIU9T?=
 =?us-ascii?Q?QYUNOPNFB7jwh6L60fKHEkZRuzidP3TziVkgkSssUO+KCFvTRhdwkQhDYcA2?=
 =?us-ascii?Q?yzFudo3CobQQugJT/ynAApOKugdlyhXl/uBbnrSzmqc58I/X+XVKoIVptKvS?=
 =?us-ascii?Q?JP8MAmRhMcr9sdHA3Hg5tQvi8eBQddZn4TG65o1iGJtSbw8j/53X7C6hlWFp?=
 =?us-ascii?Q?dRw97BF83mf74woYmIYhFvj/LrLNn6M5/I4rpJeMDFDXzuMFQIuvVbQDoy7x?=
 =?us-ascii?Q?EASe9VgTJ12A1tkamqyyqOexe8wT5tLBJHsunB/RM79mSHCXW0/8vLQFgK23?=
 =?us-ascii?Q?2swJEihfXQ8EEnYLvpC5UCrbZHjuVp076nCDsmacBtquUjfGfJ4GJh31QBRD?=
 =?us-ascii?Q?ZA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 46cde5f2-fa84-405b-0ae3-08db1280b527
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2023 13:53:40.9280
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: t5sjtOhkCTOpNmIJ+tlzZ3nKNBkWshgBHM5aJb1sXWvo785rgi8bHotH7i+L6ZjERx3dLCKM/rAnvbddid9WBg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8238
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This doesn't apply anything to hardware and in general doesn't do
anything that the software variant doesn't do, except for checking that
there isn't more than 1 TXQ per TC (TXQs for a DSA switch are a dubious
concept anyway). The reason we add this is to be able to parse one more
field added to struct tc_mqprio_qopt_offload, namely preemptible_tcs.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
v1->v2: none

 drivers/net/dsa/ocelot/felix_vsc9959.c |  9 +++++
 drivers/net/ethernet/mscc/ocelot.c     | 48 ++++++++++++++++++++++++++
 include/soc/mscc/ocelot.h              |  4 +++
 3 files changed, 61 insertions(+)

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 354aa3dbfde7..3df71444dde1 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -1612,6 +1612,13 @@ static int vsc9959_qos_port_cbs_set(struct dsa_switch *ds, int port,
 static int vsc9959_qos_query_caps(struct tc_query_caps_base *base)
 {
 	switch (base->type) {
+	case TC_SETUP_QDISC_MQPRIO: {
+		struct tc_mqprio_caps *caps = base->caps;
+
+		caps->validate_queue_counts = true;
+
+		return 0;
+	}
 	case TC_SETUP_QDISC_TAPRIO: {
 		struct tc_taprio_caps *caps = base->caps;
 
@@ -1635,6 +1642,8 @@ static int vsc9959_port_setup_tc(struct dsa_switch *ds, int port,
 		return vsc9959_qos_query_caps(type_data);
 	case TC_SETUP_QDISC_TAPRIO:
 		return vsc9959_qos_port_tas_set(ocelot, port, type_data);
+	case TC_SETUP_QDISC_MQPRIO:
+		return ocelot_port_mqprio(ocelot, port, type_data);
 	case TC_SETUP_QDISC_CBS:
 		return vsc9959_qos_port_cbs_set(ds, port, type_data);
 	default:
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 08acb7b89086..20557a9c46e6 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -7,6 +7,7 @@
 #include <linux/dsa/ocelot.h>
 #include <linux/if_bridge.h>
 #include <linux/iopoll.h>
+#include <net/pkt_sched.h>
 #include <soc/mscc/ocelot_vcap.h>
 #include "ocelot.h"
 #include "ocelot_vcap.h"
@@ -2602,6 +2603,53 @@ void ocelot_port_mirror_del(struct ocelot *ocelot, int from, bool ingress)
 }
 EXPORT_SYMBOL_GPL(ocelot_port_mirror_del);
 
+static void ocelot_port_reset_mqprio(struct ocelot *ocelot, int port)
+{
+	struct net_device *dev = ocelot->ops->port_to_netdev(ocelot, port);
+
+	netdev_reset_tc(dev);
+}
+
+int ocelot_port_mqprio(struct ocelot *ocelot, int port,
+		       struct tc_mqprio_qopt_offload *mqprio)
+{
+	struct net_device *dev = ocelot->ops->port_to_netdev(ocelot, port);
+	struct tc_mqprio_qopt *qopt = &mqprio->qopt;
+	int num_tc = qopt->num_tc;
+	int tc, err;
+
+	if (!num_tc) {
+		ocelot_port_reset_mqprio(ocelot, port);
+		return 0;
+	}
+
+	err = netdev_set_num_tc(dev, num_tc);
+	if (err)
+		return err;
+
+	for (tc = 0; tc < num_tc; tc++) {
+		if (qopt->count[tc] != 1) {
+			netdev_err(dev, "Only one TXQ per TC supported\n");
+			return -EINVAL;
+		}
+
+		err = netdev_set_tc_queue(dev, tc, 1, qopt->offset[tc]);
+		if (err)
+			goto err_reset_tc;
+	}
+
+	err = netif_set_real_num_tx_queues(dev, num_tc);
+	if (err)
+		goto err_reset_tc;
+
+	return 0;
+
+err_reset_tc:
+	ocelot_port_reset_mqprio(ocelot, port);
+	return err;
+}
+EXPORT_SYMBOL_GPL(ocelot_port_mqprio);
+
 void ocelot_init_port(struct ocelot *ocelot, int port)
 {
 	struct ocelot_port *ocelot_port = ocelot->ports[port];
diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index 2080879e4134..27ff770a6c53 100644
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -11,6 +11,8 @@
 #include <linux/regmap.h>
 #include <net/dsa.h>
 
+struct tc_mqprio_qopt_offload;
+
 /* Port Group IDs (PGID) are masks of destination ports.
  *
  * For L2 forwarding, the switch performs 3 lookups in the PGID table for each
@@ -1145,6 +1147,8 @@ int ocelot_port_set_mm(struct ocelot *ocelot, int port,
 		       struct netlink_ext_ack *extack);
 int ocelot_port_get_mm(struct ocelot *ocelot, int port,
 		       struct ethtool_mm_state *state);
+int ocelot_port_mqprio(struct ocelot *ocelot, int port,
+		       struct tc_mqprio_qopt_offload *mqprio);
 
 #if IS_ENABLED(CONFIG_BRIDGE_MRP)
 int ocelot_mrp_add(struct ocelot *ocelot, int port,
-- 
2.34.1