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:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
        devicetree@vger.kernel.org, netdev@vger.kernel.org
Cc:     Russell King <linux@armlinux.org.uk>,
        Linus Walleij <linus.walleij@linaro.org>,
        UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Lee Jones <lee@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Rob Herring <robh+dt@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        Vladimir Oltean <olteanv@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Vladimir Oltean <vladimir.oltean@nxp.com>
Subject: [PATCH v3 net-next 01/14] net: mscc: ocelot: expose ocelot wm functions
Date:   Sun, 25 Sep 2022 17:29:15 -0700
Message-Id: <20220926002928.2744638-2-colin.foster@in-advantage.com>
In-Reply-To: <20220926002928.2744638-1-colin.foster@in-advantage.com>
References: <20220926002928.2744638-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?Qa/2bIdZTSIehx2xrp+ROKwGZPuJ3sUvMAwLOp6fGD7Y83zSposFYL4RSS4z?=
 =?us-ascii?Q?7mB8B3wUZj/dSDJUUSNzWqajx/VrhlwOBNkQUYQxto7bXXYtLizBLfSmgG4j?=
 =?us-ascii?Q?cEJKMmY60WTZczSHc+88oZhu3oO/06OSXlirjin7OWw/MIRK/x1ogbzZmhMF?=
 =?us-ascii?Q?VJ1pertS0rRm//Bq5kZZXsy7o/7J6bVrrsE0YCXYx0m5+EgGkLGNRY8CWd/F?=
 =?us-ascii?Q?t65rEFrJoqiGWNjejQrufj/FM6EinheiQ2js+KmkncV5BkAC4/FBKuVnIQOy?=
 =?us-ascii?Q?Hp4M9HlnryAB78v9rksHD2rlIVGKTEqUszzo8E5i00kgvSQP80WBulXKT+vf?=
 =?us-ascii?Q?nq3ey6i0HczeBPcjzi6Wu/ExVupL9xh4hIVqG1284TkCfS16MMbRB88Neqi8?=
 =?us-ascii?Q?UL0TWJL50ooQ5QxoeOaYv+czzr/bJ324wC6Wcd7SV3l/iw04UQNCYpMBtFmG?=
 =?us-ascii?Q?acL7hk9AXVo9BB/jNU/dU6Ewwlr+9r3BSmHUBCfAOPCO8scnvczjVKgu9uzM?=
 =?us-ascii?Q?ffR3parnAtjC2FzGE6lh3mgau1hSfhNCFZKdwekk02WrYH1s05f/L49QPQXp?=
 =?us-ascii?Q?kRiHaTJ+MkvCQ/HckL10Bj8aoHyFAICf/eFNoyqXQbW3XEcznISEQ+eWrWLZ?=
 =?us-ascii?Q?ReJBjsI3JhiY0vYjbypA/+k0wEvQVdXOS4jtdgDFesTYMATrQPg8t5I+CFTB?=
 =?us-ascii?Q?3smdJGdVpy7h7LJ+wlXLNlRyse6EKavcpR7DtrMFDdGOPRNBI3jlnPkNlOsF?=
 =?us-ascii?Q?mqLzDE0uMH+uOlNOxRidzcBLD4TRLincomyq5amXD7t5W1xPv8xa34d8i47D?=
 =?us-ascii?Q?jzRlbJj1A9gCf5/T474x4NTBSdTuX8SgWoT51eUR7yanhZUf4dw6dc6DTdnx?=
 =?us-ascii?Q?Ig28d5qWw7KaRByDjNggCnTsNwjqMdWu3KbhQVwaTnJ5wQU9Vv81kis0GiW2?=
 =?us-ascii?Q?08FYlDxA0rmgGNA33eqFumCeoZt8FF/mfCBJcUqoGsg5QumKWwyZzFzupvRe?=
 =?us-ascii?Q?LgG/kSm4NigNMYJi8DgK930ciiiw44fWhQhGJSI6wIzT6bSSMoF5eAwcfTBw?=
 =?us-ascii?Q?yNPdnfthEdICbpSIotnafbKl1CMqyjoKZ+mwZnqZtAo7SdU4yt2W2vlsEPC4?=
 =?us-ascii?Q?EdYrcSIpoCPH2VpOEDJD0PRae5oHjX8tXOYnWTsbDrIyw41Y41g1Nhf4QDqk?=
 =?us-ascii?Q?m9T/g3ZXI42K0PSKQ8a9scZ8lb4lQYq1loDQl+WF4cMRjJSDnmqUBvEk4htH?=
 =?us-ascii?Q?jtE1lMR8f0boeYLSRevgIMAN6JlK8NtpgEwbkzN/a18g7U0SNiqUvVtehREL?=
 =?us-ascii?Q?8V+zjHikh4YNnNdDnogCPXKa3D7Mu0CZglhxGINbqRFW7gWAbyS3Ow9FpvPy?=
 =?us-ascii?Q?PFD4ShD2HT1KQkm0i5i4Tdlwc5Kjo9Wr6O40YJzcVR1dteFE1v8PYHar/WD4?=
 =?us-ascii?Q?ZW6FCoAgEdoTRAsmVm8RcW6MavliDvu1vM9MyKCRzii8qgHsfaZtUGr6Nx0I?=
 =?us-ascii?Q?ctT3Ti8yai8dPNNzEBNt+MduN0jAMsXEHNlnqnKVOW+eVBRry4ZJxeJp7bP4?=
 =?us-ascii?Q?E1dUplOQfuMK7tA80WfKSA5f2n+WJe+otnkiPbSj7KdY6TEAyMWa1D/9qJE4?=
 =?us-ascii?Q?h2gmGgqzWihTfj8JD5OKEEY=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f12891e9-c8a1-48e1-271a-08da9f564893
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2022 00:30:16.7453
 (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: mrEQB5ykCuuI/aTqe48R0WneSVxMp3bYTgB67iKxjw3MzRq80Lf6ndWYrx9UFjbPPx2ccp5Cr56w+Wc2QtJLmeXgoAwCzo1FQXb2t2jSGGw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB6062
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        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

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 - v3:
    * 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 6f22aea08a64..bac0ee9126f8 100644
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -234,34 +234,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 967ba30ea636..55bbd5319128 100644
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -1145,6 +1145,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