From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc:     Vladimir Oltean <vladimir.oltean@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>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Russell King <linux@armlinux.org.uk>
Subject: [PATCH v4 net-next 5/5] net: mscc: ocelot: expose ocelot wm functions
Date:   Sat,  4 Dec 2021 10:28:58 -0800
Message-Id: <20211204182858.1052710-6-colin.foster@in-advantage.com>
In-Reply-To: <20211204182858.1052710-1-colin.foster@in-advantage.com>
References: <20211204182858.1052710-1-colin.foster@in-advantage.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?jvdEDDAf3PiXEuiORBmR3PsZFaYnO6MZBIRFvwypCfpFrdcm6k+f7cG8gmC/?=
 =?us-ascii?Q?voivVbKq9/thXYnIFZZeAXBxIjD49Qzj1rqJZACaXJZ4C2Kdsj1MtHWoHDET?=
 =?us-ascii?Q?6y52PCwY9rzyKHsqkxZBs+yB0UmWNn+N9mVLyMCebFc5M6++NVClyeMZGv0k?=
 =?us-ascii?Q?FX10B1ILy2QjWZR/iX9O+wTPQ5lzYPFdzbf1hdHnmTWIwumvTkagXw6aMX2U?=
 =?us-ascii?Q?mEAfXtEieqjdM9hyjjCnkmO4lnrjfeBSrGWotR98CXOLG90f4Esl5WEGHU7Q?=
 =?us-ascii?Q?yUHfJ11RyuomnyiGT6d/8iwznph/LPcxw9t1FgOLuMPXPouiG63KEbD+mQHu?=
 =?us-ascii?Q?pdWlur4l3ml9mzt3gGBRVxnA6SBXIsUjHfK3djivFxZVnn+Ac4SfTBeOUD/S?=
 =?us-ascii?Q?XUPx1AuT18qMPvV/oOUdo8h1ynCf8n0MVIJsqVwVnT2tckdcul4EGeqAlbSg?=
 =?us-ascii?Q?5PXHn8AxwDFfFNjODI4F2DLQFQLbejVV2VRYlDyN7iCtNJLrUApCsruhvgUw?=
 =?us-ascii?Q?ReP1gJ3g8hMSpsjbiZfmOcphQpAmFazSNobmiGFi5Jj0ZxHqhJiQFTSz7AoU?=
 =?us-ascii?Q?0Nfrx3o05HHyDnBO5YjeWZ0ZLeefr0kttu62AqlaKXXu2BzpqNyR3mKVdnDJ?=
 =?us-ascii?Q?jL5OlcNrsC5xP9tmQbgWncX6rgi9GcG4rQSv9fVglYug1cLqG8Q5TqiNoxpn?=
 =?us-ascii?Q?yPLAUqeMyjj9VxZ+l4rFoyAw/AzaraSVJmBh4r8zC3zD0FZDROsNZYSYjqSL?=
 =?us-ascii?Q?5RS/gfL6sbNgmnHycQ9t82qnRsNfkl5qr0/d2iS9hlGneb/dBHBYf+4enk7A?=
 =?us-ascii?Q?h2VBJcC9sXHLT2er6Tw6lJqLpFcmdSFPy+v0trpIsWSSkdqBHVqJs0mmEuku?=
 =?us-ascii?Q?SSDVP23bRF4kyhhFCFkOYgIUDYMtMlj+7vka6BR3k6tOQOrcpXdRmWHQkupD?=
 =?us-ascii?Q?fmIefdINTyARt/7Ge5o8WIL6n4poSAic4eGFrMTTak0GbuzWkhbMWiRM05mA?=
 =?us-ascii?Q?+TFNWYMB870lqEqmQcbxD/1JcdwUfo/4ldaAHhmpRNGrTZ9m1Rm+eqU9xNKm?=
 =?us-ascii?Q?ANCjaFISGj7fpR7FNrbPNH5KTG7bGk7AVunLLItTUBWSyvpYqcXld+Toacsi?=
 =?us-ascii?Q?xKq/K1mT+hmj+nfoEdWb2MwkbhePoSAEusan4Gfntu+qzHWVNKgYVWNd0eQy?=
 =?us-ascii?Q?AjYAVRz/MfUOlMmS+INSg4GOjgd6fAP2ISbpl+pv5/xFvI91xsjOMe+M/BS/?=
 =?us-ascii?Q?qpMpniuS1pPOEVw/9y6e2CMQIM1aRyUgNzKynh8QWuY/nmEK3Xi3ZrEmMeS5?=
 =?us-ascii?Q?kOR5UcdcqJ0bFQR+3+7iIBBvgcf9uALc/2MKMjvoYIcBJx9ZSjMlIUj9o6Ba?=
 =?us-ascii?Q?bf39L/fLOmuhpy5h+Fz9iQiARKtXdLebTw23bhZ6PQetqKyl098MDK04zqO3?=
 =?us-ascii?Q?go+JLK75w2qhZm8OB1nuFdlZnZI6vdnyrOlB+2A7CPvvigQ7jcytv301H+qy?=
 =?us-ascii?Q?pptQPbdJqQlUP8ebRZoAzvxWcCiQebwPHeWMMLV+TmEwhLT0AkuJZ5BRW9Pn?=
 =?us-ascii?Q?GVmBUj2qKRr2TI4eiCrwwCB182b43JCpUjYKxtmR5oZzqIpixOe7iR1RqrJ4?=
 =?us-ascii?Q?xWdY2cHl5KGVM3qZK3jfZzBQudRj6sTp5nt3uF+paKZiWnS0KiWrC3pG8GtJ?=
 =?us-ascii?Q?fFf3+tUkABpejLbdHOdYknsX/wU=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d431c742-29e0-472e-6969-08d9b753f768
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2021 18:29:11.1998
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 2DIj1Bxtgd9ymLbYDVisItJDTGktLGchqw81grD/27WgmKmjVdaS6z2zgZkZ+zDTANm+VXXcdfAk8aiLhmQPmQjkA95+oESpGLz6f4c8VnI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2063
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Expose ocelot_wm functions so they can be shared with other drivers.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/ethernet/mscc/ocelot_devlink.c | 31 ++++++++++++++++++++++
 drivers/net/ethernet/mscc/ocelot_vsc7514.c | 28 -------------------
 include/soc/mscc/ocelot.h                  |  5 ++++
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot_devlink.c b/drivers/net/ethernet/mscc/ocelot_devlink.c
index b8737efd2a85..d9ea75a14f2f 100644
--- a/drivers/net/ethernet/mscc/ocelot_devlink.c
+++ b/drivers/net/ethernet/mscc/ocelot_devlink.c
@@ -487,6 +487,37 @@ static void ocelot_watermark_init(struct ocelot *ocelot)
 	ocelot_setup_sharing_watermarks(ocelot);
 }
 
+/* Watermark encode
+ * Bit 8:   Unit; 0:1, 1:16
+ * Bit 7-0: Value to be multiplied with unit
+ */
+u16 ocelot_wm_enc(u16 value)
+{
+	WARN_ON(value >= 16 * BIT(8));
+
+	if (value >= BIT(8))
+		return BIT(8) | (value / 16);
+
+	return value;
+}
+EXPORT_SYMBOL(ocelot_wm_enc);
+
+u16 ocelot_wm_dec(u16 wm)
+{
+	if (wm & BIT(8))
+		return (wm & GENMASK(7, 0)) * 16;
+
+	return wm;
+}
+EXPORT_SYMBOL(ocelot_wm_dec);
+
+void ocelot_wm_stat(u32 val, u32 *inuse, u32 *maxuse)
+{
+	*inuse = (val & GENMASK(23, 12)) >> 12;
+	*maxuse = val & GENMASK(11, 0);
+}
+EXPORT_SYMBOL(ocelot_wm_stat);
+
 /* Pool size and type are fixed up at runtime. Keeping this structure to
  * look up the cell size multipliers.
  */
diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
index 2db59060f5ab..6f2d1d58a1ed 100644
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -306,34 +306,6 @@ static int ocelot_reset(struct ocelot *ocelot)
 	return 0;
 }
 
-/* Watermark encode
- * Bit 8:   Unit; 0:1, 1:16
- * Bit 7-0: Value to be multiplied with unit
- */
-static u16 ocelot_wm_enc(u16 value)
-{
-	WARN_ON(value >= 16 * BIT(8));
-
-	if (value >= BIT(8))
-		return BIT(8) | (value / 16);
-
-	return value;
-}
-
-static u16 ocelot_wm_dec(u16 wm)
-{
-	if (wm & BIT(8))
-		return (wm & GENMASK(7, 0)) * 16;
-
-	return wm;
-}
-
-static void ocelot_wm_stat(u32 val, u32 *inuse, u32 *maxuse)
-{
-	*inuse = (val & GENMASK(23, 12)) >> 12;
-	*maxuse = val & GENMASK(11, 0);
-}
-
 static const struct ocelot_ops ocelot_ops = {
 	.reset			= ocelot_reset,
 	.wm_enc			= ocelot_wm_enc,
diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index 33f2e8c9e88b..0ac0ef116032 100644
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -806,6 +806,11 @@ void ocelot_deinit(struct ocelot *ocelot);
 void ocelot_init_port(struct ocelot *ocelot, int port);
 void ocelot_deinit_port(struct ocelot *ocelot, int port);
 
+/* Watermark interface */
+u16 ocelot_wm_enc(u16 value);
+u16 ocelot_wm_dec(u16 wm);
+void ocelot_wm_stat(u32 val, u32 *inuse, u32 *maxuse);
+
 /* DSA callbacks */
 void ocelot_get_strings(struct ocelot *ocelot, int port, u32 sset, u8 *data);
 void ocelot_get_ethtool_stats(struct ocelot *ocelot, int port, u64 *data);
-- 
2.25.1