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 v2 net-next 5/5] net: mscc: ocelot: expose ocelot wm functions
Date:   Fri,  3 Dec 2021 17:00:50 -0800
Message-Id: <20211204010050.1013718-6-colin.foster@in-advantage.com>
In-Reply-To: <20211204010050.1013718-1-colin.foster@in-advantage.com>
References: <20211204010050.1013718-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?auwuI5reP9eYGQcJ4t9HxcngjMZ5rcHeeYDgdZy2/uEcH8FNufpdeEPEAeXv?=
 =?us-ascii?Q?F3Ynf7TuZK+m8YKPQ+cndcZ8luL77ilf9AEng5wiki3EqQ4EV18haikCn6l/?=
 =?us-ascii?Q?bqOdwbB5nLg7lwcebGoXgU7Tu8swkeCd2BH/YekeDEMr8NZk3OmvONqkrPVS?=
 =?us-ascii?Q?B7yfDtvfa+qVrRCFOGLkbOr9WiYeqwXO8ejNLcVoK3opx/+Yzgg/5IFKzrd1?=
 =?us-ascii?Q?BFneAo1faq5ZejpUwuwjlfbFI5+3Hg14UnkZFGo1CVZ/ahi0TRkbtcDbupFe?=
 =?us-ascii?Q?7f3ph7rLhGHkbME+x+Z6z978yXF2axtPUh0robSqkYvdeVuUd4tgfOekFLeC?=
 =?us-ascii?Q?y/3WBiF3vuC5iZv7Ln2KlOi6CAjnHt8h+o0aeEGg+d/RnoMBggS1K8cZI1YX?=
 =?us-ascii?Q?Ie1LLCAA/GY+mD01SfUDtYggYy7mp9AVq2RheIg39oQVMtu71xmpwqqwRvJu?=
 =?us-ascii?Q?QF71zrKOVIz9KfVOHmbSe+h16+P3dhnWrEYFfHhTzC1YmEbncgJ2qLtQQdWp?=
 =?us-ascii?Q?G+X9Jo3mzvLVVWeOap2e0UuK62jFhSBM6WIglZwTGlAgOE9SUfiossieJsMk?=
 =?us-ascii?Q?m1Z4FElijEKyyVBwAGS98noMCAWz6f+9eXQ6OMsTN5/tRwDOhq3byHNu3gAB?=
 =?us-ascii?Q?VgldP8EMhotwxFEX3YPrCu3OlUNmd8gYwNAyMAbfBV+OKjsa80iLPG+CYIgl?=
 =?us-ascii?Q?kdqYdBSfaSu0l8H0wds1tvGYpvujKSuWgjmw10G9u+lxDlgGDM7p9WhDxyho?=
 =?us-ascii?Q?QKiYQxfc1qpN1wywJZiTeh1LnXzhYjFxR9v4DZoZ5Tx3GwQGEkMCcalBxqoc?=
 =?us-ascii?Q?xrd4ZgeVVhmi2w6P2fjHm5QQRaLOAjHHVxvNGnGoF6m3qKyGNgXINabZKFuv?=
 =?us-ascii?Q?lsjKEiYA8IUghwPNE4xFFxC8+S/0SjaaoXRYGiDIw/2CNClmZd/LPFoS7eBJ?=
 =?us-ascii?Q?5HeyTcgxW3GWUuPgJ1J0SR8LaHc0g5nbZP/JPHsZAzTRmw5eZ87Rok2taoCA?=
 =?us-ascii?Q?GQHXIeKy4ESfq6t/hN6xRA4CSWltfdk9+VR8k+ubBwrBn9/RHrEcxzl4Hfxk?=
 =?us-ascii?Q?9YgW0b9/P7egX6YyjBDW37iOLmurWJqDyhAGqX16T4MFl10BtVjV6WddIIrt?=
 =?us-ascii?Q?fa2Z5CoSWPPu1PXuMlUEr3KQ0M3yL+U2bsPn5tuLML2b7xUp9DOdAc9iEcbQ?=
 =?us-ascii?Q?0R8i5tUVwzaXu0Uiw9YCsKTvXW/UsVz1YyHlCFW41EedsqhDSw1GKBnkFkJ9?=
 =?us-ascii?Q?9Wl0J19SO9C4CDGIyMpfV2ilNeW/g40nOqAZcYP4BgHRjd9cUscB0gZOXqb1?=
 =?us-ascii?Q?mrYRSylL7p0YKJPAkpjwH8w5ZOj4kl8jyeWY6Eudzm30LXzmXjzpUmolRQEF?=
 =?us-ascii?Q?EQVQLR3r6lozDpjUpODtb8bpmpD4ViliO/Z2LvTPRUZS0U/H2t8oXEHY9f7f?=
 =?us-ascii?Q?fg5+wQW8sI3NZIE7SUo14WS0XDaDxaflPPIb9k0zr2dFqq3CZhOt4nJik+Jd?=
 =?us-ascii?Q?TCwi0XOTY5sHPRRS6sBhendg05fsoxW6J+quhwRRuBHvCESmGVtwjW3XAy82?=
 =?us-ascii?Q?Rfbq6z5ujaA60D/ZKgiQo04nmn99h6RLkTVRpVHaJMKGzyATb/rOeFO0AaS4?=
 =?us-ascii?Q?btrvE5maLnYKk9e3eMw7mBtPs53/Vzdw8FEI2xth1GcNWCf3b6rJ9Ltvp9nX?=
 =?us-ascii?Q?4SucsBzjqP5twLxgLS8gSZDPGzY=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 394383b3-0d8d-4016-01a7-08d9b6c18ca4
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2021 01:01:05.5716
 (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: bKt8gVOWdXirKoNDG57ehasKzHe/F6SiPyOREATll1bS235dt0zHPxOk8PmqWqgEgad/nRdkezMlkr2Na9qUoCXaniKNGlOc1hzVzTOgP5U=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5701
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