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,
        devicetree@vger.kernel.org
Cc:     Russell King <linux@armlinux.org.uk>, UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        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>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Rob Herring <robh+dt@kernel.org>, Lee Jones <lee@kernel.org>,
        Vladimir Oltean <vladimir.oltean@nxp.com>
Subject: [RFC v4 net-next 01/17] net: mscc: ocelot: expose ocelot wm functions
Date:   Sat,  8 Oct 2022 11:51:36 -0700
Message-Id: <20221008185152.2411007-2-colin.foster@in-advantage.com>
In-Reply-To: <20221008185152.2411007-1-colin.foster@in-advantage.com>
References: <20221008185152.2411007-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?8wvSoL+lXh7J99x5H9SHp5ugetJ/yAtT/mlaBleLdI2Ny0xSg9HK0dhDdb/U?=
 =?us-ascii?Q?Z1NGF91y+ovB/4QO2ksX4F+LONT4ir5Iq1vCcJtghSHCt6z1wX49lPqIKcwA?=
 =?us-ascii?Q?pz7Pyx8nFhxOiidmcDUCl71XQk3+BrxG2g4kSP+PVbzOSzI8MDQYuDK0iTGy?=
 =?us-ascii?Q?lolEeWHaTD4EeELqWeOws+BFzXpRWZL9IZ225NqzO6kHl5Q1o++zqxBK8xcN?=
 =?us-ascii?Q?pPigKFZj5verq9+za27VXH8M8JR0K5+iwtRGSXujNBtek43i8e+0E0iy7ump?=
 =?us-ascii?Q?dYUS4pZecdB9ucv2DdFAux+3QrJ78Ns48XK6pvFVhgfvSwC4KBJ5JFwHniFV?=
 =?us-ascii?Q?843y7fLi7OrHB9P6h9OwDYExR0VGBYpAS+Y6/7i4PGus4Vn52HsPn63YpIgo?=
 =?us-ascii?Q?8EITK5Tx3fCBT1m1nwg8MkkggiZ87Qq8XFByTYtzOsy9NMHow5yX+sfFREzu?=
 =?us-ascii?Q?CgIL/6YRQPZZV4a6x6k/9rU4FdWALrlQNuGQs269xxh4fVQDc0+32rL0wUih?=
 =?us-ascii?Q?yP3JLPWg7p625kIwX4WZ52XfQ4i9xRcE4mFXCGJ7GE9t8xgNtrblobpFkKcI?=
 =?us-ascii?Q?tfAbBGvpIqLIsRTWiNjvOvkm6bHaaJzGBV5++7vC8CtEFVZmCJRj/I6ThzqD?=
 =?us-ascii?Q?AePMqnXZHVSCuLwS1VMkwU4W2qtAeH6KFKGFwiv8uQuATCwUr5GdnJud5Ltj?=
 =?us-ascii?Q?9YawewJjxRANt8xl7wKEUC7li+VBGxoD9dWSCd0rrZzMCKCv0qlbJS5xZlHM?=
 =?us-ascii?Q?diaIj7s1ik/eUG0n29nH/5AEk4O74mYMvcocJNG9uL2ZUy1toa01L2piVllZ?=
 =?us-ascii?Q?mkIagBDX9Ywao2acCTgOKvWc9K4GOpym5OCQUlW0arUycufo5rn3VaI8ZSYm?=
 =?us-ascii?Q?gfggfRWIBaD5sr9luZ4KWyBsLGnZYFhfBowNSaEYc3A2Xn/EqPJWL+X2wCll?=
 =?us-ascii?Q?/JYugqiItf6s44pbeYAxSRiiWCF8iUbaeYn5NuFiDPKVXjBnpqp7ft6C1f2X?=
 =?us-ascii?Q?HkVbPKAybsCyd7ceurjeysR7HSuTJ1MeIugew8zHgkcdghWaBtXbg37pzN7g?=
 =?us-ascii?Q?k+txE3EA/wUrBF7ic7OMQ7fTNIGiU0xzyS7FfGtbguaTXQ+qFxD547SHv7Z3?=
 =?us-ascii?Q?zQwFPXci2S4p9ChWJQDiQHR3X4sdZ5d0zSlkrh5RatPM3VzU7KRWeAaPRCse?=
 =?us-ascii?Q?Vvj4dKE5CC8rb0afoTHQAM26qNp78ZO8SeBCKtGSSOn7hKtvT/2QB0laqjPc?=
 =?us-ascii?Q?9V/g9ZfFkUsr1tH4yx+C5oanao+goW49bw4Dfa/oIlLsmabppm39Ngrj2qBr?=
 =?us-ascii?Q?xRHA2D0yi4u+JyCz0F7igSPib/VfyPHiiJxSUn6vutzO8c3q10mTq7CQcI/a?=
 =?us-ascii?Q?bzElz7SJn5cknzK1rB302+JBlrja9qb2Skl3SgxDgEyy0E/oqHxB/OO/nU1o?=
 =?us-ascii?Q?lBqqonrPlOsnkRAqqveoBZIuuxLqdXGLwyXk17FRaf0ERHhmQ3BeNoNxqadR?=
 =?us-ascii?Q?nndTgJ6AkZz1CCGy5n0x8+2Cy1lT3tkNyNIYMBnaXphDKLz7PlJvD+Kvpfze?=
 =?us-ascii?Q?eT0A5Y4c5ggHcfDoXTvFI11zL4nlEWI11qQXMNRfwbyCfwZFZ4G/MlATVlzt?=
 =?us-ascii?Q?cGC89wpeV0B9GRR8Dloj00Q=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 45c85711-904d-4306-0bdf-08daa95e30d4
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2022 18:52:03.9288
 (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: 8ze5kIzNT78IQRPJjnmyEn74GPcalnpRiUNUtfSfLh4m/flPvXeLiG5EhZoEFH5x65H9Ut8+5CU7zMZyRN9gQfYJXlxjYFnNy/vIjBAq5fs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6129
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 - v4:
    * 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