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 4/8] net: mscc: ocelot: expose vcap_props structure
Date:   Sun, 11 Sep 2022 13:02:40 -0700
Message-Id: <20220911200244.549029-5-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?O6CDSSHnMbf1ujOuK15oZYIwt7A5XafJp53Wbeoke1eAMRS+44qVUAneLOF6?=
 =?us-ascii?Q?3c7lDUSkmqyLGoQYjvs0aPlK6IV+HPBAayMBRGBMc9VTshyBnrtdOlPdqgMg?=
 =?us-ascii?Q?g8P9oza7jZx4l4z5FEKGfry65uDtDDDkvxiAWkA2xjsGv6uhvk8AMUFmQJ7h?=
 =?us-ascii?Q?932K1LGHHgwYlXWHYeUqgvBwmgsBUyWoTGVg+yo5yswkAYD1V7RoRotfL7SD?=
 =?us-ascii?Q?uKzsxwyWPStqnOpFls3ALe738lTPGhKImNQrjqBi0I1rjVkKHtZh+o0GM13c?=
 =?us-ascii?Q?bMPepKFVPY63YTu0/0bK9A9rTTUA0EPr6Ct2THYZ/Z52RBamieI0AQcXzy38?=
 =?us-ascii?Q?0xe0NTnlbQx6g/FyavNpVhNPIEdJk9afDSQvz4dBsv3P0HCN21A39qSxdCwo?=
 =?us-ascii?Q?XmP2sCMSS/xz62MWadpvcMc3L6GfjMlf+SNe5s0fycpyN27N5qweTCp6WVVf?=
 =?us-ascii?Q?J3N1kUJ1NF+SBPG8XSC2UYT6+MfwwVawFNc7bUvHAfd2OOvkN19l01infYtI?=
 =?us-ascii?Q?0WeSLnRPUHk6JGLf6fDtDT2kE7EOM+9BYqMgbgW4clcmwo/n9D1FTRuYN3Qu?=
 =?us-ascii?Q?2Pho6yCk3k810mqcI/yG7+hd4EH6+42qV0yFYaFL70wrnXVLKzJffKqWukCU?=
 =?us-ascii?Q?CrSyEN0MjPPEg49TGt2KZHuyXnnEvCkvHMh4h3/5iYjBgPY/6uOQTCyHeppT?=
 =?us-ascii?Q?yB2HH5L3rtQQOdB4xaVJRq0wQeJUsp/xPoUytDSS1TPQdEwOkYpNJWqeaiO+?=
 =?us-ascii?Q?TtB4h5Z1fNKA3WufXx9V3UT21fWF16Go1BXVoDStz+UtGvbYHatziS3IKx/0?=
 =?us-ascii?Q?VV7ja1EZX2m5omGkSd+elOcUlecnr3MtqSKfXwj8k+yQzguVqo5u4RWZwWOb?=
 =?us-ascii?Q?SR1M0udSpbWI0GY/TC87CtMgdgHAxBtiWN/UfFUFWL4AInlggHufI+yRGs7I?=
 =?us-ascii?Q?VvwUs2cvXqsH5HJGPWF7YQAc+J2HDCkWX5R3e+eOJYs9ts+5nVDLWQ9Pa91d?=
 =?us-ascii?Q?gZdhfRuf9n2PYGzSVw3D8Ay9ueZJlhWD1GLIOIbfqhAz0TB8qWbH5gsVsCXe?=
 =?us-ascii?Q?jcxP/MbF7AXpyNC1WbBk7PT5u/bZx7M7J2mOxUU89nyEwqljABsSu2x2WTus?=
 =?us-ascii?Q?as86x34NcXngZpI808NjfYUCMChmMCptB+GP3tSaH7fulLABABBZP0wF5QRE?=
 =?us-ascii?Q?0WCpxCLpbQ9jJznw2X6Kup0Hf4uskPOtqP46ELE28wnR0UMqQz5FQZAEzqCA?=
 =?us-ascii?Q?TI66UAKd6V5gy5CdRSY+Eev1q6jzNpjYe1OKRJg7WL+obMY8Ox4ebuc6kxho?=
 =?us-ascii?Q?EEP4Lfm/h0TsEyNoHLbfbRBCLKodfoP7XKpk2xBc7ERjLGAf+jc5fXAnKNJ9?=
 =?us-ascii?Q?a6pkxLajhWPJr/HdFQecAL2jUwee0nyjCCADvLOdoLOY+RRbkS/opk7LsoZ0?=
 =?us-ascii?Q?bRal7sb8Ge8GFZISqp47HlMATxHsWuNbVfl+gZjnt3u2Coyyen2QbCbZalMj?=
 =?us-ascii?Q?83CUPUsAiEWEH9sJJdYB9sku++CIWaSW0fmNtiZAP31txsoHvg9u5SgedCl8?=
 =?us-ascii?Q?qojQpkhrZaHNqLYWBab17EUE6GGyMsOHajeK0fBJKNk4N+1soedk1SXFCtVm?=
 =?us-ascii?Q?Tw=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d2806812-e9dc-4b76-d0b0-08da94309e77
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:56.5746
 (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: 1oCn5O154zSmhmo0AlBbO9CEsUBnR1O57W8I36u5A0e5fwipZAn5O2gKtyFSRJzUsd3F9/4kqj2ry0vVe4OpD63b8ZZ1ei70WqObvrHTjSU=
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

The vcap_props structure is common to other devices, specifically the
VSC7512 chip that can only be controlled externally. Export this structure
so it doesn't need to be recreated.

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

v1 from previous RFC:
    * No changes

---
 drivers/net/ethernet/mscc/ocelot_vsc7514.c | 43 ---------------------
 drivers/net/ethernet/mscc/vsc7514_regs.c   | 44 ++++++++++++++++++++++
 include/soc/mscc/vsc7514_regs.h            |  1 +
 3 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
index 7673ed76358b..6191bca7a9c4 100644
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -161,49 +161,6 @@ static const struct ocelot_ops ocelot_ops = {
 	.netdev_to_port		= ocelot_netdev_to_port,
 };
 
-static struct vcap_props vsc7514_vcap_props[] = {
-	[VCAP_ES0] = {
-		.action_type_width = 0,
-		.action_table = {
-			[ES0_ACTION_TYPE_NORMAL] = {
-				.width = 73, /* HIT_STICKY not included */
-				.count = 1,
-			},
-		},
-		.target = S0,
-		.keys = vsc7514_vcap_es0_keys,
-		.actions = vsc7514_vcap_es0_actions,
-	},
-	[VCAP_IS1] = {
-		.action_type_width = 0,
-		.action_table = {
-			[IS1_ACTION_TYPE_NORMAL] = {
-				.width = 78, /* HIT_STICKY not included */
-				.count = 4,
-			},
-		},
-		.target = S1,
-		.keys = vsc7514_vcap_is1_keys,
-		.actions = vsc7514_vcap_is1_actions,
-	},
-	[VCAP_IS2] = {
-		.action_type_width = 1,
-		.action_table = {
-			[IS2_ACTION_TYPE_NORMAL] = {
-				.width = 49,
-				.count = 2
-			},
-			[IS2_ACTION_TYPE_SMAC_SIP] = {
-				.width = 6,
-				.count = 4
-			},
-		},
-		.target = S2,
-		.keys = vsc7514_vcap_is2_keys,
-		.actions = vsc7514_vcap_is2_actions,
-	},
-};
-
 static struct ptp_clock_info ocelot_ptp_clock_info = {
 	.owner		= THIS_MODULE,
 	.name		= "ocelot ptp",
diff --git a/drivers/net/ethernet/mscc/vsc7514_regs.c b/drivers/net/ethernet/mscc/vsc7514_regs.c
index d665522e18c6..c943da4dd1f1 100644
--- a/drivers/net/ethernet/mscc/vsc7514_regs.c
+++ b/drivers/net/ethernet/mscc/vsc7514_regs.c
@@ -644,3 +644,47 @@ const struct vcap_field vsc7514_vcap_is2_actions[] = {
 	[VCAP_IS2_ACT_HIT_CNT]			= { 49, 32 },
 };
 EXPORT_SYMBOL(vsc7514_vcap_is2_actions);
+
+struct vcap_props vsc7514_vcap_props[] = {
+	[VCAP_ES0] = {
+		.action_type_width = 0,
+		.action_table = {
+			[ES0_ACTION_TYPE_NORMAL] = {
+				.width = 73, /* HIT_STICKY not included */
+				.count = 1,
+			},
+		},
+		.target = S0,
+		.keys = vsc7514_vcap_es0_keys,
+		.actions = vsc7514_vcap_es0_actions,
+	},
+	[VCAP_IS1] = {
+		.action_type_width = 0,
+		.action_table = {
+			[IS1_ACTION_TYPE_NORMAL] = {
+				.width = 78, /* HIT_STICKY not included */
+				.count = 4,
+			},
+		},
+		.target = S1,
+		.keys = vsc7514_vcap_is1_keys,
+		.actions = vsc7514_vcap_is1_actions,
+	},
+	[VCAP_IS2] = {
+		.action_type_width = 1,
+		.action_table = {
+			[IS2_ACTION_TYPE_NORMAL] = {
+				.width = 49,
+				.count = 2
+			},
+			[IS2_ACTION_TYPE_SMAC_SIP] = {
+				.width = 6,
+				.count = 4
+			},
+		},
+		.target = S2,
+		.keys = vsc7514_vcap_is2_keys,
+		.actions = vsc7514_vcap_is2_actions,
+	},
+};
+EXPORT_SYMBOL(vsc7514_vcap_props);
diff --git a/include/soc/mscc/vsc7514_regs.h b/include/soc/mscc/vsc7514_regs.h
index d2b5b6b86aff..a939849efd91 100644
--- a/include/soc/mscc/vsc7514_regs.h
+++ b/include/soc/mscc/vsc7514_regs.h
@@ -12,6 +12,7 @@
 #include <soc/mscc/ocelot_vcap.h>
 
 extern const struct ocelot_stat_layout vsc7514_stats_layout[];
+extern struct vcap_props vsc7514_vcap_props[];
 
 extern const struct reg_field vsc7514_regfields[REGFIELD_MAX];
 
-- 
2.25.1