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>
Subject: [PATCH v3 net-next 03/14] net: mscc: ocelot: expose stats layout definition to be used by other drivers
Date:   Sun, 25 Sep 2022 17:29:17 -0700
Message-Id: <20220926002928.2744638-4-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?GixZSHPjhO6cOpjyGgxqH616tFuIm/zlSfeidtpSskMKqbrR6O47mqHZblWF?=
 =?us-ascii?Q?rUvNXbE/PixAX5jspq3di1On9FPx6R3MKC/faAAT6H/YvhHSc23nQUfsORab?=
 =?us-ascii?Q?VdvubZktGhNUomj5gbdoDwY4+9GV7YwXNlcbiBFFQ3PYFwc8R9Eo2YOoLKRq?=
 =?us-ascii?Q?+bd8jEq6iEm2CqGTaaojwgN8gYEoCLeqMRKG/FxVE58VmoRztJiY+yYQ7PF6?=
 =?us-ascii?Q?kFWl/x7r44C0SSlMZ8UaAhnb9haMYyEAHkb4LKSdFd7TVBMILu3IZk9fAGnv?=
 =?us-ascii?Q?gfhWJhBCLR2R1k5Op8SkEcj4wny2gIIR98tZU4QKvoAph28lL4BIsOMORjhp?=
 =?us-ascii?Q?MEKXUfeLJlO5JzbhFbdiR1O/gyrDc4HsfELZ5KBXBEDV8sCksJwGYL7k769t?=
 =?us-ascii?Q?KbIpJpcdO+iolbwGvlJ+xFUYhrWco47BTRfCtpB++3MQ06VmIqJp1KhWdN2z?=
 =?us-ascii?Q?Gz7Hc4rTve2sLZmJo21Ro+voIf3RD32R8x0aHUIz++Achtt6kgRZl3jALG0w?=
 =?us-ascii?Q?fPkwu2qE5wc/speQ+dN/H4NSYHxN2kl2WpTP/xjXhvz8NF6QiVTnIRNdIvxB?=
 =?us-ascii?Q?bhCuSUHoLcWTJqOaxpP33T5HPJVDrPbswRAzXL/JOXJ1C+c0uHvB3kmAsG67?=
 =?us-ascii?Q?GDwtc7C2869b9SE5PTgesepu9f++359lQsj6DitK64F1WLQA/9GCXRj+CId5?=
 =?us-ascii?Q?LhA1zaYdoYgPqWzp1MNaITSvpwBdqZPL4K3sWZCyQgKD33cSTxIO9QNsxayD?=
 =?us-ascii?Q?K+5FNWtieOrIBJxEUxmhMCBDm8XjwwgC/lr0E7TnCF7kCdaTsW72RhO0bo9U?=
 =?us-ascii?Q?nQqENud6qarn+PEqp1OA425kPGRRJpsQIt3PAMnXIlXCLJc1U8oJlL7gOjpB?=
 =?us-ascii?Q?lgUQqUEqAMDHg7KHVTKvICTRA8ktZPMSktu9u7JsZpiWuhMuLLpgemmFpKQC?=
 =?us-ascii?Q?B2IrUT9HXLCvBNJokIaO7+/6YKWr4sCGKXWxsRGeaDnH1va621MWrk9wtquW?=
 =?us-ascii?Q?tR9lidt7T/OSS2gc+KIy3XX3jLVwCZ9CVBeo19z8lf0X78SQwvxJYQ/+akcj?=
 =?us-ascii?Q?zeoEbgT/f+e3WrjJKX9A7B3WNKvOhevkWTN7V9AUA+uutxIpSPZCzP4eXJ33?=
 =?us-ascii?Q?VQGFVze7M6reUqyS+rf81Uz2Rvsw4dvEokiXl28XrM/zqzuknQxKrjPMYYpM?=
 =?us-ascii?Q?Dgd/dWfBffSESAeYlkt8zgu0EjFiBSnBjJ33IIgn+2fqZGbF1BXRCs7ERWo5?=
 =?us-ascii?Q?6H52fAWj8myGyoGyGyiGXhrIrqwDmmdFobfvsUO4SLSSZ5WHA+qFqa2Qeh9E?=
 =?us-ascii?Q?8t7283BUe/Ky3QqrwxLnjFrnz9kIindqKjdeqPkKVUnVhIuztfiyG3IEn505?=
 =?us-ascii?Q?YO1sSR5VIilrEnDlfA4RHjMChuMlxedASxGROUKQnTxE5fKU7ullLtwxMqj4?=
 =?us-ascii?Q?t11SCuW5s1EB16d3xZlEkkqq6ZoIDXJJKV65gCm9kc0bOqKadorDO4lsvFES?=
 =?us-ascii?Q?xsq0rRGs2qvBtHeNdSuluV9QQN5tsLGZ+TxtFhJHITdmwH2xcW4ngwdL0AMe?=
 =?us-ascii?Q?tkCVFWkbRSC9rcIbCDZ3A+2YsiAjbeW9FKvcgG3Qs4YG+nEjmITFS5hpxY50?=
 =?us-ascii?Q?jw=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 18a14859-f204-41db-9a8e-08da9f5649f1
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:18.9170
 (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: mgMx/n4LckT9H1hr7RyMPa9PPn2DneOeLn+jncFGpHOlk0L1Vyhu0yPgkRVZszmNLFIGSylzGhuu4QDi8w0BmgLiJB4QGui5Yjj9wwBFy6w=
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

The ocelot_stats_layout array is common between several different chips,
some of which can only be controlled externally. Export this structure so
it doesn't have to be duplicated in these other drivers.

Rename the structure as well, to follow the conventions of other shared
resources.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---

v2 & v3
    * No change

v1 from previous RFC:
    * Utilize OCELOT_COMMON_STATS

---
 drivers/net/ethernet/mscc/ocelot_vsc7514.c | 6 +-----
 drivers/net/ethernet/mscc/vsc7514_regs.c   | 5 +++++
 include/soc/mscc/vsc7514_regs.h            | 3 +++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
index 6d695375b14b..4fb525f071ac 100644
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -42,10 +42,6 @@ static const u32 *ocelot_regmap[TARGET_MAX] = {
 	[DEV_GMII] = vsc7514_dev_gmii_regmap,
 };
 
-static const struct ocelot_stat_layout ocelot_stats_layout[OCELOT_NUM_STATS] = {
-	OCELOT_COMMON_STATS,
-};
-
 static void ocelot_pll5_init(struct ocelot *ocelot)
 {
 	/* Configure PLL5. This will need a proper CCF driver
@@ -80,7 +76,7 @@ static int ocelot_chip_init(struct ocelot *ocelot, const struct ocelot_ops *ops)
 	int ret;
 
 	ocelot->map = ocelot_regmap;
-	ocelot->stats_layout = ocelot_stats_layout;
+	ocelot->stats_layout = vsc7514_stats_layout;
 	ocelot->num_mact_rows = 1024;
 	ocelot->ops = ops;
 
diff --git a/drivers/net/ethernet/mscc/vsc7514_regs.c b/drivers/net/ethernet/mscc/vsc7514_regs.c
index 123175618251..d665522e18c6 100644
--- a/drivers/net/ethernet/mscc/vsc7514_regs.c
+++ b/drivers/net/ethernet/mscc/vsc7514_regs.c
@@ -9,6 +9,11 @@
 #include <soc/mscc/vsc7514_regs.h>
 #include "ocelot.h"
 
+const struct ocelot_stat_layout vsc7514_stats_layout[OCELOT_NUM_STATS] = {
+	OCELOT_COMMON_STATS,
+};
+EXPORT_SYMBOL(vsc7514_stats_layout);
+
 const struct reg_field vsc7514_regfields[REGFIELD_MAX] = {
 	[ANA_ADVLEARN_VLAN_CHK] = REG_FIELD(ANA_ADVLEARN, 11, 11),
 	[ANA_ADVLEARN_LEARN_MIRROR] = REG_FIELD(ANA_ADVLEARN, 0, 10),
diff --git a/include/soc/mscc/vsc7514_regs.h b/include/soc/mscc/vsc7514_regs.h
index 9b40e7d00ec5..d2b5b6b86aff 100644
--- a/include/soc/mscc/vsc7514_regs.h
+++ b/include/soc/mscc/vsc7514_regs.h
@@ -8,8 +8,11 @@
 #ifndef VSC7514_REGS_H
 #define VSC7514_REGS_H
 
+#include <soc/mscc/ocelot.h>
 #include <soc/mscc/ocelot_vcap.h>
 
+extern const struct ocelot_stat_layout vsc7514_stats_layout[];
+
 extern const struct reg_field vsc7514_regfields[REGFIELD_MAX];
 
 extern const u32 vsc7514_ana_regmap[];
-- 
2.25.1