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 04/14] net: mscc: ocelot: expose vcap_props structure
Date:   Sun, 25 Sep 2022 17:29:18 -0700
Message-Id: <20220926002928.2744638-5-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?SJadmQZwkdF+UaIFSP4HEDGKCiJXPWXEuKwtX1NthyFjxsM2ptvpwnDayZNQ?=
 =?us-ascii?Q?E15aKMom/U3s7Msnw07pSHfC6F9iHW3PK4Cj8g9GYgyLuOj9YwA2vRamFzvs?=
 =?us-ascii?Q?3YhrkjJMBi3i8nESya5xYbqjsO6wzjsFCOlMrFmMejMTBla1x8wOewRcl1Z4?=
 =?us-ascii?Q?ykqGujFK22LhXQDCF02oxWUQRUZUJC1WslyoqMtDanf8MvqIBr4UQBTAxfdk?=
 =?us-ascii?Q?aIi0/6ZsxexRsDjo76pXE7kPTdIrY4ievJwbQup1uCVHtoGgDK+6nHn43lRU?=
 =?us-ascii?Q?ll36OnA1jGncIcf4g4NNGb95+TuNHW83QRgy//jV/fQhDMR2o1yQJZawJ8He?=
 =?us-ascii?Q?vAh8af9PRCxykG8BJ8H2CiJveQzAs22GYN9b3Xw9p9XKixrZ7YdpVlYuOV5i?=
 =?us-ascii?Q?B37xkca7B9l6dcihpNotyfW6wnTXgqfhkPHOWTnB7rugtjzI8YrBYxXrrYyT?=
 =?us-ascii?Q?MvSWdOETtpcZ2vQpXvK/9cnobZ1MFWVoEaqtU6rjqbhNi1zeqqypQMeLEFeY?=
 =?us-ascii?Q?gT1y0vY1dwd9CNCJgavpvy3jEpgpvuDhHwaaN2es7ZaomrPCAxah1JofIWBi?=
 =?us-ascii?Q?Un9VcO6PiEjaOlFfB9Hd2RKcbHTD+7tO7AOyG06YGL/DkhYc3X9YGNk90XBl?=
 =?us-ascii?Q?HVmzjki98LSSmYyIMC3GutcV+JmTQNFLLiTBVigjCGfYk1/1pAxRV0aiCmxF?=
 =?us-ascii?Q?TFiltKpY9JX5BOfavWQUT1Yj5hJYudOnBm45BeYyh+mINPEwvQ4ZZ8hrVwDu?=
 =?us-ascii?Q?6+y6ALTmsPdXTQBxwC4lyd5hW8RHGo6ub+oSUoAgkZe1/cQwwu0xTcFY5WTy?=
 =?us-ascii?Q?JCdATkXxIN/mf95pUABs/CP2C4b5dmVXDxW4rhzJK34764l5gFKKEF8Q8tIi?=
 =?us-ascii?Q?VTchedwo87ug/iZKw/vaGIh7zRiOIm4nw6U5AyxCYOTw1Frt4/VhJ31fFXfl?=
 =?us-ascii?Q?OCkAZT1crQZGuise7t/g+W+ujTH47zizLrwEwBsw+K6h8eZC9hn3GsAfs548?=
 =?us-ascii?Q?6vIEAdfh0ipYQAsHg09MVxgogmQC7qYI8xMV1lx/zc7/TgyiICiLEhd3A/8H?=
 =?us-ascii?Q?yq61ouMLniTzPTK3LE1xIPS0V6twGvtnsH1Yc5eJGFJbLRd+qYVZFHN/2cvz?=
 =?us-ascii?Q?6PPksMfu8TqchneQagDPWPz7agHWQVdxtiY9kDhefgE0b6eWQ7kVyuD82zU0?=
 =?us-ascii?Q?koIKfOnHUHkkjv1wDbdP4QULSjxFg1tQdRIFYVtCIqlw8PiyE5UKD9MzjuYQ?=
 =?us-ascii?Q?9fEqrsQK9rw/zYezF/jVniXvn2E6WSbqFdfmChzxZ6G3QEB9/5E1jTzGQNLI?=
 =?us-ascii?Q?nWrWh9pKEV0YrdvBJNkY/z2G6ePWmrzbphzKMR4t81aReb32ua9+rVgSETNQ?=
 =?us-ascii?Q?0vIAOJ2CTzTeybP6pE0sElyXiDthWcrtpW0jwOpxnrTc0dQERrJheC12TLIc?=
 =?us-ascii?Q?XOj29HKRWDPXtwewErKq95iwxI8BGQuIBN/hFegwA+VFfiEA3ogPK3SsXBNO?=
 =?us-ascii?Q?+pqWKVlBnDvtVnfRBWyliv1YyQmvrgA8uItff0um1O/Aq8plD4wdHUzwOSiW?=
 =?us-ascii?Q?q+nOQ+FZ+KaVncXKErcUHqWKyPKo72Qi7MikidqIpA9vpe0MHse612rs7dnz?=
 =?us-ascii?Q?6w=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6f884599-2477-4da1-9f3e-08da9f564add
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:20.4950
 (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: cxc8GQxzQozIqtBrBbs9AuFSD7xCef9l3VR/pExPryucjKTQRE9txYiGTYoI+ftIXNBBjnTEjjuqsrBTpqsahCDHi7ayWLeQU3CMNqeomnw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4849
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 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 - v3 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 4fb525f071ac..19e5486d1dbd 100644
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -181,49 +181,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