Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Michael Walle <michael@walle.cc>,
        Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Maxim Kochetkov <fido_max@inbox.ru>,
        Colin Foster <colin.foster@in-advantage.com>,
        Richie Pearn <richard.pearn@nxp.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH v2 net-next 1/4] net: dsa: felix: keep reference on entire tc-taprio config
Date:   Tue, 28 Jun 2022 17:52:35 +0300
Message-Id: <20220628145238.3247853-2-vladimir.oltean@nxp.com>
In-Reply-To: <20220628145238.3247853-1-vladimir.oltean@nxp.com>
References: <20220628145238.3247853-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?nxou2B94i2QxXo+6jmWoihpc8/61T72mgMM+8gt3Ul3iqWIC6jov5WGTufYA?=
 =?us-ascii?Q?voTwNiVDkor5jDMMdXieLaWBe+WBwR22H99OjZspyBMFh1612xtZ9Jusrepp?=
 =?us-ascii?Q?r2AVpjvI88AYJyk5BG4wK7aHulq+/0AHpX6lu4P3Ae75i8potA/bdcdTpBfy?=
 =?us-ascii?Q?ZiHW9x9S5GD8fe9kfnXmcpRhDFLrSxdCcw5uGlMebAncht0Nlf88s2YdJd9Y?=
 =?us-ascii?Q?A/Xyvd8kXfhdmmxmLmDiMz1c4lxEkDAJljK+WjJmbYd3UeFlH71VfaZJtwT+?=
 =?us-ascii?Q?vNciyb3W6PlZo4agBYvM45umxfp1XHyF64Iu54jXHVucYmmnc8fRihpMsbJs?=
 =?us-ascii?Q?joYQi82dA7MiTVZraW2DshwOv2hKlaPAJ9fJn+gYvpyOBWRS9wj2KXlmbgqd?=
 =?us-ascii?Q?CBs2Qv+WDZFHezCVgmvHd+juVBRkfPGPUhMOG6j/KMICHe/OjDKo1F1xD1Hc?=
 =?us-ascii?Q?+z8Kk07z7+MPcPrAnX5EnY4r/Wbpuei6ENA1i0RO6x9t1O+YkTJFc8sVOJSo?=
 =?us-ascii?Q?13+INW4d9l66huVsLLCKelqOGzkPWl8mYZ7FTlfRaFQTBv1SwUd2VGtD9BM/?=
 =?us-ascii?Q?CTjeX9GJSsgvgfwlcfl6N0WvVGKegjy6cKbbjlymHux2IwWQmboY6sWacPue?=
 =?us-ascii?Q?17hNVyLYla7eitXmB85RkP6GCVEnH60y8iwq/VwbZWkE0rWT995GbaORXRAT?=
 =?us-ascii?Q?Mv/dtssLmZwSM2Wi7VzX5pGH6GNVYePsUn8ZPYZqLti/ACjeIV7gBKBdLXR/?=
 =?us-ascii?Q?VUnrGRt7r5tD580QlGOOrH+X4B45k56Pn5YJLAshkJbWOIn8tUru+gQB9Ybs?=
 =?us-ascii?Q?3hZwyg0qek9vjuLpHfyuuj+sjuov+mLCN43ykGWPEA8DSQRRRjA8aGc9Ifvn?=
 =?us-ascii?Q?V184KptN3MA/SKmGGW5zCF6SRXehyuEr2F30dT6uG+6z/1gwLy1ig637mTh7?=
 =?us-ascii?Q?8TdSl1tIx5K10BmtRTVNNlSjiRg/09xjACv/+7TnceXeTtOV1L2dNOGEuENo?=
 =?us-ascii?Q?xwZPu8L/77S785roCBSLqROfBlZL/KLLxHB1LTgKiWehQdDxufTdxTFUQvQS?=
 =?us-ascii?Q?J9z0Dqb5CcVMRSak9cHOWC5L/M+XOy3pshA9pDT+ZOv0V86NgJuUelT9m8NK?=
 =?us-ascii?Q?ASCduUpiuYFis9rSFcmEJXXUWt4PVcROzdcqxeoIQKp2YsZV5r6VbIGJqxHa?=
 =?us-ascii?Q?QOIla4zBIlBDK5UrhLMU2yphy0FPbaDEwyrE21qj3Zdi7gHqC5aQJOAKQzIA?=
 =?us-ascii?Q?G66/0giooQdyhP0Fz4lTmm11CzZFIdnMeW6nG4WXz1tag8h1rjbab3GSlNGT?=
 =?us-ascii?Q?kTpxatyfJSn/+iBn4Pg1ur/S147f/+jUmOOOYv2G2FksbR9GRbMJhUsRVgYV?=
 =?us-ascii?Q?s4SQmvecmDvSrOI50+Xp3Pnu1OrGf1Gkq8+WQ+ihZr6R9Y8gslBAUEX5A+KK?=
 =?us-ascii?Q?ocf1XJWc0kN7Li8qVutJaGwzQXjCYX6Fr2ZjJ69w/pjPI7NNjlqJGkRtfy1v?=
 =?us-ascii?Q?AkHF9KTeRqjBFPrBv2Wtq0R21Gm+BcK0ve3Zu+hdgHw3+TOBkWXBhbl5a6w+?=
 =?us-ascii?Q?fEnPIvy8b38uG9X5Bvc7v8L7gVvDHMtmwZvNa1Dw8W7/95duXllfygT/IDtR?=
 =?us-ascii?Q?Dw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e2b9409f-1ec7-442d-8daf-08da5915e184
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 14:52:54.0498
 (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: iSi+tpCybxq+U0kNzD5Y/lheIZek6jv5/PF3lH8bFVwjPbEdEuxHhYymJHdlO5eAEDrR/RbmNhJqhjrHFkUAsQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3810
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

In a future change we will need to remember the entire tc-taprio config
on all ports rather than just the base time, so use the
taprio_offload_get() helper function to replace ocelot_port->base_time
with ocelot_port->taprio.

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

 drivers/net/dsa/ocelot/felix_vsc9959.c | 23 +++++++++++++----------
 include/soc/mscc/ocelot.h              |  5 ++---
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index dd9085ae0922..44bbbba4d528 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -1210,6 +1210,9 @@ static int vsc9959_qos_port_tas_set(struct ocelot *ocelot, int port,
 			       QSYS_TAG_CONFIG_INIT_GATE_STATE_M,
 			       QSYS_TAG_CONFIG, port);
 
+		taprio_offload_free(ocelot_port->taprio);
+		ocelot_port->taprio = NULL;
+
 		mutex_unlock(&ocelot->tas_lock);
 		return 0;
 	}
@@ -1258,8 +1261,6 @@ static int vsc9959_qos_port_tas_set(struct ocelot *ocelot, int port,
 		       QSYS_TAG_CONFIG_SCH_TRAFFIC_QUEUES_M,
 		       QSYS_TAG_CONFIG, port);
 
-	ocelot_port->base_time = taprio->base_time;
-
 	vsc9959_new_base_time(ocelot, taprio->base_time,
 			      taprio->cycle_time, &base_ts);
 	ocelot_write(ocelot, base_ts.tv_nsec, QSYS_PARAM_CFG_REG_1);
@@ -1282,6 +1283,10 @@ static int vsc9959_qos_port_tas_set(struct ocelot *ocelot, int port,
 	ret = readx_poll_timeout(vsc9959_tas_read_cfg_status, ocelot, val,
 				 !(val & QSYS_TAS_PARAM_CFG_CTRL_CONFIG_CHANGE),
 				 10, 100000);
+	if (ret)
+		goto err;
+
+	ocelot_port->taprio = taprio_offload_get(taprio);
 
 err:
 	mutex_unlock(&ocelot->tas_lock);
@@ -1291,17 +1296,18 @@ static int vsc9959_qos_port_tas_set(struct ocelot *ocelot, int port,
 
 static void vsc9959_tas_clock_adjust(struct ocelot *ocelot)
 {
+	struct tc_taprio_qopt_offload *taprio;
 	struct ocelot_port *ocelot_port;
 	struct timespec64 base_ts;
-	u64 cycletime;
 	int port;
 	u32 val;
 
 	mutex_lock(&ocelot->tas_lock);
 
 	for (port = 0; port < ocelot->num_phys_ports; port++) {
-		val = ocelot_read_rix(ocelot, QSYS_TAG_CONFIG, port);
-		if (!(val & QSYS_TAG_CONFIG_ENABLE))
+		ocelot_port = ocelot->ports[port];
+		taprio = ocelot_port->taprio;
+		if (!taprio)
 			continue;
 
 		ocelot_rmw(ocelot,
@@ -1315,11 +1321,8 @@ static void vsc9959_tas_clock_adjust(struct ocelot *ocelot)
 			       QSYS_TAG_CONFIG_INIT_GATE_STATE_M,
 			       QSYS_TAG_CONFIG, port);
 
-		cycletime = ocelot_read(ocelot, QSYS_PARAM_CFG_REG_4);
-		ocelot_port = ocelot->ports[port];
-
-		vsc9959_new_base_time(ocelot, ocelot_port->base_time,
-				      cycletime, &base_ts);
+		vsc9959_new_base_time(ocelot, taprio->base_time,
+				      taprio->cycle_time, &base_ts);
 
 		ocelot_write(ocelot, base_ts.tv_nsec, QSYS_PARAM_CFG_REG_1);
 		ocelot_write(ocelot, lower_32_bits(base_ts.tv_sec),
diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index 3737570116c3..ac151ecc7f19 100644
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -670,6 +670,8 @@ struct ocelot_port {
 	/* VLAN that untagged frames are classified to, on ingress */
 	const struct ocelot_bridge_vlan	*pvid_vlan;
 
+	struct tc_taprio_qopt_offload	*taprio;
+
 	phy_interface_t			phy_mode;
 
 	unsigned int			ptp_skbs_in_flight;
@@ -692,9 +694,6 @@ struct ocelot_port {
 	int				bridge_num;
 
 	int				speed;
-
-	/* Store the AdminBaseTime of EST fetched from userspace. */
-	s64				base_time;
 };
 
 struct ocelot {
-- 
2.25.1