From:   Colin Foster <colin.foster@in-advantage.com>
To:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        devicetree@vger.kernel.org
Cc:     Russell King <linux@armlinux.org.uk>,
        Richard Cochran <richardcochran@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>, UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Vladimir Oltean <vladimir.oltean@nxp.com>,
        Paolo Abeni <pabeni@redhat.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Rob Herring <robh+dt@kernel.org>, Lee Jones <lee@kernel.org>
Subject: [PATCH v5 net-next 01/13] net: mscc: ocelot: expose ocelot wm functions
Date:   Fri, 27 Jan 2023 11:35:47 -0800
Message-Id: <20230127193559.1001051-2-colin.foster@in-advantage.com>
In-Reply-To: <20230127193559.1001051-1-colin.foster@in-advantage.com>
References: <20230127193559.1001051-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?WtB1Hy9w75+JeLPElhMPHhYR7MuY88IU3FmJQDWBGh9t00uqD3Q4svmIe9mU?=
 =?us-ascii?Q?IPYxVKAULpewAJlBa/bP/r2IGgp6q2x2lYFbR6en2C2vrj+7B/CFFAs1U7BU?=
 =?us-ascii?Q?g3pgKaNPbmJQeMTI6s+U5nt7F8ciU6vYXO41Vs/uo2O6AroohGLCCEkWEWqi?=
 =?us-ascii?Q?1a1r21fiHKGlvH8y2WaiFn5dSkWrKwMI2jymQXhiTc68+OO3xinfccIZ/Ypn?=
 =?us-ascii?Q?b5tTX2NKrF8nLTZnLYKuCZsPfmFzKUnrysnBacwVted8PnogSJktxCwVtk89?=
 =?us-ascii?Q?BPnYX0IXxQsfQ/9DZ5ZwfyQnWpXmiW8rC8cH8FbAo43JgB3fZNrYy7w+Fqvs?=
 =?us-ascii?Q?3CAQMLccxuBjswcDw0d7A7iBuwz8hlvs3JpBCahVjC4INB/2q9Jy29cxbDQB?=
 =?us-ascii?Q?41VSVpkxCWazeBfkLC4Eb34ceE3Ce4HxCK+CC2YhFx48eBQoln0KrvpcsPdU?=
 =?us-ascii?Q?OgjwO5/Ferb8YrAnJeBc8vvcx2ep7oR1oPtgdmKDfwVXc8tyOOrfTfTExrSo?=
 =?us-ascii?Q?vKmpjAc0QZCNTDThtl5sY7gPdapPR3y3keH/OnjDfByuQOiF1319ufHEFRXm?=
 =?us-ascii?Q?6XPrXoxh9nCVHpdcjFTRprSaBzsVP+VDvXn/sXqVv3gm4tb0MVPTrMXBU6Bi?=
 =?us-ascii?Q?c8tiTn7SZ15jncDWRC9F6sUHvkIkWb7+WUJ1zj9YEwC9VcSnDsj9erW0sCZT?=
 =?us-ascii?Q?ltms+DqhJ0lNqHgsubEdnN23vAl090cmuALSdCi/Z6pgt2WYvADCsD2feFgb?=
 =?us-ascii?Q?3nNyJkA+zG0UpFHh0LCUcH5bvBpW/sgoD59xfqDukAkbrOIVSvVVtqJOoSww?=
 =?us-ascii?Q?bmZQ373jaNspVSjCQhEUebNmlWMP/zdYGGcOEqNNZjw9lYF8XO5ELbv/ZgQS?=
 =?us-ascii?Q?9QSARKfyfIhgACj4EXjN8XIl0pVtFtTJZFubbrJARalVYaDjYZNBo31wWgR4?=
 =?us-ascii?Q?r54iNc182LUsnOSoTrlK8OuCJa5o2C/jQ8JB46nZ1XUI1OJjL/6o41vtFpQo?=
 =?us-ascii?Q?TJwAGBq2/+gs1qzfi36MqulntovR6MziupzxUSEfgvUdwCCrTDKT7YvT/vVO?=
 =?us-ascii?Q?jDWKu094V1zGP2KEaSbQZMMIjPKuji6U7kTWVgKX3Ro1jZEvctKqEa05bJEn?=
 =?us-ascii?Q?YstgAqIazL6eBFI5vJB37jXxSfWnndrwDDzhOJdt3ZtVpqrjwKTXzlXCBrud?=
 =?us-ascii?Q?ZsfkKomxFyrcxn9KhrQquNrSI/O86T/kfijp7AocivR0mjdizcFoIfoonPjH?=
 =?us-ascii?Q?MiOeTIaQ0MjOhM7D84CEBSbQv0H9DzNM6NMeNV9CeJq+ozJsAT955UlFlLBZ?=
 =?us-ascii?Q?4b3BdrGotmYjTU3EcQkRHZ/+zQTREnrDsZG41S3jKd1V3iIpuveYT3dGupVn?=
 =?us-ascii?Q?KeCwBCknY/hY/BFsgc4Zn3naEJzmHSdxF7jh8Chs1DbyGAxV5V4ySCE7mKzb?=
 =?us-ascii?Q?BpLfIyjFCMj3KhWzWjyPkZ8pfa6Wz8HhhYqrraW+iWADrGvUIDPOXDhvKBsk?=
 =?us-ascii?Q?CtdDgUFGrLJ7CyIcmLxK1ZuokMOcaK6s1h7Jlg/qppUHLhYgmtelFUKq5hmn?=
 =?us-ascii?Q?1b0F56GbCP7L0vCnqDuvZPamXTTs1CBYQKe8lCl8PmJrBEbou0ywez+4in/U?=
 =?us-ascii?Q?rlPH1ES4KouazwpAqnh/2Fc=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9b025a91-e30a-433b-a009-08db009dbf74
X-MS-Exchange-CrossTenant-AuthSource: DM5PR1001MB2345.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 19:36:12.7513
 (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: 1h1UH5Nrl4w61PftJQYjVZUnOpNO3QeIeRPFQNi8a0Ku6XyROw70OF1BxRHJpMFFosSNEhnnoDMI81h04X4tIyQDsCN1U/vMw0fnZn3/0u8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4636
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>
---

v1 - v5:
    * No changes since previous RFC

---
 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 b097fd4a4061..a3a36de063e5 100644
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -229,34 +229,6 @@ static int ocelot_reset(struct ocelot *ocelot)
 	return regmap_field_write(ocelot->regfields[SYS_RESET_CFG_CORE_ENA], 1);
 }
 
-/* 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 afb11680a793..0edb16b6087f 100644
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -978,6 +978,11 @@ void ocelot_port_assign_dsa_8021q_cpu(struct ocelot *ocelot, int port, int cpu);
 void ocelot_port_unassign_dsa_8021q_cpu(struct ocelot *ocelot, int port);
 u32 ocelot_port_assigned_dsa_8021q_cpu_mask(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