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>,
        Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Maxim Kochetkov <fido_max@inbox.ru>,
        Colin Foster <colin.foster@in-advantage.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH net-next 1/2] net: sched: provide shim definitions for taprio_offload_{get,free}
Date:   Mon,  4 Jul 2022 22:02:40 +0300
Message-Id: <20220704190241.1288847-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?4DiNUU6/eUYgzindNOEvLNyvjd8zCEwfw6u6RU69Szi5vUdGeUUFq/gNdk+1?=
 =?us-ascii?Q?qanO6x+vbxG0WwV2yOrKFt6io9LIj3kg2zx83uu2nwy439AsKDqQHgzviceE?=
 =?us-ascii?Q?cXJ+DzqWmrJLsXm5IdeK1ISn0FB2Y/PqpMZqmmpscT8JjtB248e9Hi4YxiHs?=
 =?us-ascii?Q?SyNUuM5J8Y55hmMHZX8lX/y8Q74DkPIzxkGE71geDOiz8GtU41erm0WOvfa4?=
 =?us-ascii?Q?c/gaWDAGnAzP4JySkrHfOJYxIX9h66qLdM0gizPgIJSH4dcn9zytgBiREOWk?=
 =?us-ascii?Q?4Um2WitK2Yy4NSHwImnKnT8cC8cNRLOAZY0tFL1wvwD5s4wBTYV5FeVWdcHm?=
 =?us-ascii?Q?IOEIw0UfBvXoQQ+vM2U20FrFv2cbRRyNOhusTEV3mrqNGJQ+w+1gY5Ei72nL?=
 =?us-ascii?Q?gjU4+ST2cIobocOmhbg7GERyJhPOTItpCYwRrS/wD18jziur0bnj9Lem5GgD?=
 =?us-ascii?Q?rkZOQH1L/KmkTRrQ9R/lxw2ziDRH1e3VpQFu2jbmCeW5KLXqvXDwZLZRIiYp?=
 =?us-ascii?Q?tcRSFZ7sD/+e99NBPKZkhKSo+6RmO6B0eO4gAtH2/+7vEXgoreQBJDKxV5Z2?=
 =?us-ascii?Q?T1TU32zfiOOtWNKEPtFKa7kwOX+GbQZRTgBLU/bNPmSlDdAO7kQtLfFMSUmT?=
 =?us-ascii?Q?q0ZFbbJiNtn6myiWpvPCyZ0tG0C9hRzRW/kFZwVmb2SepGa77eeLtXYqE11i?=
 =?us-ascii?Q?BWKcNa3w78ngVvXMTpTJIkhF74oqnmDV8t0TfASVt4P5ubUpnwtg3OXzhsXh?=
 =?us-ascii?Q?7jln4yRs7McMLxlc/C+bOmsghJCRYn6ITiFgc7vhPX3QvetkBu3d224p80xa?=
 =?us-ascii?Q?5K+esDhN2I1baGwj0zSo6LpP/mV/H2nNb3OepuEBWiYexWtws3zNgQw5ejmo?=
 =?us-ascii?Q?5jeej4XuLggBBND/iFMmkk1e7hHHxwEjnHrSdtz4MPedTMt7iPZDtV0Mf9n/?=
 =?us-ascii?Q?iDw87b3rM4LQ9URqwXEpHOjUiOfcz8jDHGy5JX1eMqgzBL+kOxxrKRSwxdQB?=
 =?us-ascii?Q?zP2Q5/Gb3E/GrSTKHSwtX8a0aNuhrK8AaJyQvriiSHjpjVUpl3bCfWivayoW?=
 =?us-ascii?Q?z9t/DhGa5/Ep+/0AHkYMm7vhVfFhkqFsjr5tcP2vr0ZPi3s7blbiexHNIjE9?=
 =?us-ascii?Q?mfXZSyABwtflPWrT3PEPSY0yAwXABWYyujDr/hOp8WsuGneXdZcign8GMMKq?=
 =?us-ascii?Q?Ax4CluxLsi6GnL9r/2/83zekkiksBHg6Ex/KZ+bS6mjrbgb+6cRkFX5uHTHn?=
 =?us-ascii?Q?xUc+NAr3QD+MP9CKdkHttwjnNtA2DSHa9lcoMXZ6e9ZMJFb7hDvZZ0np6qHY?=
 =?us-ascii?Q?Da7dAxrI7yPZMrdztvGcTGrihCP/iHoFpOgINZbiUNXLcbU6GczIErX5mtgr?=
 =?us-ascii?Q?tmNsCAM6wdUBPPWE1zwja2EvN8SchPdvq+xGKZy9Q0Uk7k8CxbR9Kt8hT4V3?=
 =?us-ascii?Q?or8X6Mrn8Hltmq39KoNE0+tD9zBeCKAsjhMlG9+i6a0c19nLsV3NmVSo0R1m?=
 =?us-ascii?Q?Hvwv7bjZ6095H3vo1v/6aLrk7BYfpxIDEm9PU6Y7VnhVZgSBEmXsS1RM6UOF?=
 =?us-ascii?Q?qI/1Est7DwrJ+Im5D8U3IC0M+X9l2w64qWQ3AGpOTU30Gw9ek2GH1caFSkaa?=
 =?us-ascii?Q?tw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e4b5e65c-a6c8-4e89-1824-08da5defcf42
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2022 19:02:58.4316
 (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: Vh4ozCWLjEkgQWQn4qxkyXWqJeenQWltc5D9SKC/hdYreedtawH9vLpzbAaUizXTVoJr7+puECDV/90mghH6Pw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0401MB2483
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

All callers of taprio_offload_get() and taprio_offload_free() prior to
the blamed commit are conditionally compiled based on CONFIG_NET_SCH_TAPRIO.

felix_vsc9959.c is different; it provides vsc9959_qos_port_tas_set()
even when taprio is compiled out.

Provide shim definitions for the functions exported by taprio so that
felix_vsc9959.c is able to compile. vsc9959_qos_port_tas_set() in that
case is dead code anyway, and ocelot_port->taprio remains NULL, which is
fine for the rest of the logic.

Fixes: 1c9017e44af2 ("net: dsa: felix: keep reference on entire tc-taprio config")
Reported-by: Colin Foster <colin.foster@in-advantage.com>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 include/net/pkt_sched.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 44a35531952e..3372a1f67cf4 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -173,11 +173,28 @@ struct tc_taprio_qopt_offload {
 	struct tc_taprio_sched_entry entries[];
 };
 
+#if IS_ENABLED(CONFIG_NET_SCH_TAPRIO)
+
 /* Reference counting */
 struct tc_taprio_qopt_offload *taprio_offload_get(struct tc_taprio_qopt_offload
 						  *offload);
 void taprio_offload_free(struct tc_taprio_qopt_offload *offload);
 
+#else
+
+/* Reference counting */
+static inline struct tc_taprio_qopt_offload *
+taprio_offload_get(struct tc_taprio_qopt_offload *offload)
+{
+	return NULL;
+}
+
+static inline void taprio_offload_free(struct tc_taprio_qopt_offload *offload)
+{
+}
+
+#endif
+
 /* Ensure skb_mstamp_ns, which might have been populated with the txtime, is
  * not mistaken for a software timestamp, because this will otherwise prevent
  * the dispatch of hardware timestamps to the socket.
-- 
2.25.1