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:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Russell King <linux@armlinux.org.uk>,
        Paolo Abeni <pabeni@redhat.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Vivien Didelot <vivien.didelot@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>,
        Lee Jones <lee@kernel.org>
Subject: [RFC v1 net-next 1/8] net: mscc: ocelot: expose ocelot wm functions
Date:   Sun, 11 Sep 2022 13:02:37 -0700
Message-Id: <20220911200244.549029-2-colin.foster@in-advantage.com>
In-Reply-To: <20220911200244.549029-1-colin.foster@in-advantage.com>
References: <20220911200244.549029-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?KW4Znoj6WvtNKZSFNFEzs84LfXtxg7JPuSMFi6gpSibVW55gVq88/PU+lEeJ?=
 =?us-ascii?Q?is+qiAYTJ51YXA5f8nymujCUGVnv6wF4v5pnxDAvEx57m49C2zMoX/rNZ0QV?=
 =?us-ascii?Q?mosltOjfgrkCVftNn2MKOUGsT4hgzc8Gd+NnKPZI/qXHmh8YSvE9ePwytRqB?=
 =?us-ascii?Q?I+jMEiVp3hhcCdiTGYMBlj0TrRHHbxyKtNP7/QcEtsBO4VEUwU6O94FpZBm+?=
 =?us-ascii?Q?nkdmZmrZJsXsj4cz8auK3iXJzRG+hda4dMmzhTAGUJ9q5q3Yd5+Nbs/JVxAI?=
 =?us-ascii?Q?5CvrckhYNNalKPheKwTQvdN02TZDmO0Ag1mkHYVgyzgVq5J/6+iFZSZuQ5w5?=
 =?us-ascii?Q?dyVVMPX3M5Iq6vbEz8rXGNXdVKYhKDG42MD/QdyDuOTWYP9rqXR1KV02w0dU?=
 =?us-ascii?Q?vywwNa6zlG1/yj1enJ01pPcw/NBME92TtvdC4ERTYn8gXg5r+e28fXPjP1js?=
 =?us-ascii?Q?s4+boNXh2JXCiIA8Az+pt5ZzuMcGu9DSCBW+5EHF45uwgSphZQei+df+GsUF?=
 =?us-ascii?Q?bGWIfzbqphdsNKJJ1X6LnkOHNLJDQAgOPkE15YDh73doh/uphVNF8b/LwrSI?=
 =?us-ascii?Q?mw8u4oDpVbQGeAEg4YkkzlD/juK2fPM+kD+/+QKrB22kNeBC0pqZn8P+x1GE?=
 =?us-ascii?Q?FjhHiuWPw/G5Y3HFger+vLZmvTb4D7dzZszSR50kxQOS03OlIQTVlZ2kMkJo?=
 =?us-ascii?Q?2GwrojbUN9aPYYRzXmykH2HZ5RywWPpdgKBLnv0zND00VKyD4QRVlNAeV8z3?=
 =?us-ascii?Q?f08vldgS3IKdvuhl5l9xnA9uPQHRr/Okst4tM6/xym5FQYsYTIBarYQGd/X5?=
 =?us-ascii?Q?jftuiEd12rCClZQsFK3MVudnVsHqZxgdqsLycXwOR9Ym3KrsdCmP3iaahqN7?=
 =?us-ascii?Q?+QBfbRBVZHHVDkvRojlID7QcP6Bk6jnwx6jpF7vHTtivdtmnIHCuienxUi0T?=
 =?us-ascii?Q?9rYNm2q7RvgjyULW5McqIFq+qTgCQ4giKbqP6eDEkGs5n6PCwk6ydlXz6gay?=
 =?us-ascii?Q?IV+a64EGTNL0v7VOOhVjeA0x/eKP/m90JNbkOtNCsV+V7NEe0SUIuJqRU5VU?=
 =?us-ascii?Q?jBi6U1fmI/rB53U2tdl8QshpaOemfBdZoOf+iXa5OCDyrVk//Yp6mtil8tww?=
 =?us-ascii?Q?Hiuly8Lhzq4jH1TPNlsqTMm7FYhOhm6zv2FCTuy7AvlwAwOg6vvR6ZG2E1mj?=
 =?us-ascii?Q?X+u4L0LFYt1paLxVuIjmXOWPhukL2c52THzws+XLrGBSU/l0y/nIYS9eVF6v?=
 =?us-ascii?Q?UwCx1dbE/sQVwXzG0GkrPoCqyaZ26gvDxHecusAHoH8x6xPdqYrsPYG5l5jn?=
 =?us-ascii?Q?VmeaxSGWvZLAhEHTHEY48RARycO/yelLi646YU2Egkh482pxp0eG2qgRcXZR?=
 =?us-ascii?Q?vrVm8trZJpSVPpxFR7ZGVW0UuG1DrKTZkJ8lQlwvJaZ6IhDp/h4P2gBKMTcv?=
 =?us-ascii?Q?A+6iK5vrub/sEA67q+g9bDSArMZcx4kB43N6cN9Aa8C84umazc6mUyVHH+mS?=
 =?us-ascii?Q?Hbcm6aVsh1oT3tJN5ViWbNkMdaHeUoES59E9jwDMtWzXGvGvbnVG6DZDA38P?=
 =?us-ascii?Q?42qyu6wvCuXrIaLhXZL19eAIWnFw2UoHXWHCkVZEVwDnNT5DtzWmKqC3CYAd?=
 =?us-ascii?Q?yESUegQ419sNrpoEvHKxfqc=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8ec766c8-008b-4cc5-cbf0-08da94309d8b
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2022 20:02:55.1059
 (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: ulclVo0JyinfMFATda+2yFdtq5VGIt1lH2W/iw8azRPsjmeDgGGsQyfvD56YwQTLcRhHOilxruWqbLQh8hTHcN4aff+I13S0HgBgzWRpY/E=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5335
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,
        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

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:
    * 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 ae42bbba5747..80e88bfd38ad 100644
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -214,34 +214,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 355cfdedc43b..17dd61f36563 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