From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-phy@lists.infradead.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Russell King <linux@armlinux.org.uk>,
        Kishon Vijay Abraham I <kishon@kernel.org>,
        Vinod Koul <vkoul@kernel.org>, 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>,
        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: [PATCH v2 net-next 7/9] net: dsa: felix: allow configurable phylink_mac_config
Date:   Fri, 17 Mar 2023 11:54:13 -0700
Message-Id: <20230317185415.2000564-8-colin.foster@in-advantage.com>
In-Reply-To: <20230317185415.2000564-1-colin.foster@in-advantage.com>
References: <20230317185415.2000564-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?FixaEPj0yFs7FFqxPfm8qkDNuQCQmEGdiS2ef/GdlJaWnxZhvLUTjACyZP3f?=
 =?us-ascii?Q?ExA7yCRnzJe0P8Y4g4dd6a0BSeuy71ZHQSiTPDgAlWz5GBE9QTqXZAzy1e6O?=
 =?us-ascii?Q?ov3KMPm2ukf0OSfwTM27HkMsIyi4c6zoqDTt1iTHRmY1QC65K1/dTI2rAy9w?=
 =?us-ascii?Q?Xblw8wmioAAQGUSdkuEmt9OFcNg0frBJ40u/pKAtrdnOIDTpHUZfwh1bIf5q?=
 =?us-ascii?Q?8hf7rKfK9DtvAN267HbPvwma1186N3UfNLhJLmfoOwedHSMZF8Kf83egC+2E?=
 =?us-ascii?Q?3eNVkHXMx+Os218XS6lOYlRCDJutVe9NFT+gARyw+VgNe2rvCqU2z6xiNe/K?=
 =?us-ascii?Q?3MIiNbhFjnk233QagerkZCn2IX2GGmaPyU4vWrvx0Y5euVY7VxFmnvkLYNZO?=
 =?us-ascii?Q?pG1AC3qryK+qIMFJiyca2zrp/vgsLszFsQywHzbpUo6A6FknXgH4L4+bmMq/?=
 =?us-ascii?Q?CiITFbnirGUz9O92YGC6UJXOe1F1E+fG06ZA4Y7JX5rz5JzsCttMSS5oQg3f?=
 =?us-ascii?Q?v8622ecYEMO69/FziaOQ2dmQGp4HYOmmpF/qVEF3ojIvVANxpAIe/rB5/gjH?=
 =?us-ascii?Q?sRTz8/j/1mHd1pOtMVekvDkueSh7+MNjwtVRo0WP7um/0qydhFfzZEq1gjED?=
 =?us-ascii?Q?uIpj+Qjdi2VDkYHtySGRW/Kr7dPtDg5bufuLXp+EyHhJDYOCciOgeXc5y73f?=
 =?us-ascii?Q?orBZAAPjQ8VGlbSZLSfgICdHh5klH4V8vbWIbyhU8JIjnkci5h8IxSIa9if7?=
 =?us-ascii?Q?zOecI/aiKK06mZ2ahCjX5Uid2L+y9y7f/mW+JNDR6u0c7mP+oPR77x3vFSB6?=
 =?us-ascii?Q?ccPCWSqv81PC0dTEn8wg8Z6rdmovyuNA12QTcC3InXnsnPx0HM5Y3pwl+K7T?=
 =?us-ascii?Q?ShyiZ7XXQgm6voJsgyO/G9tCFL/bbXSG1LoW3/0KELZT21eGuG9kETBcFOX2?=
 =?us-ascii?Q?nYULN720+FejEl9Fb3nuQ2I1tLEIRxuduzBPsS5Q1IC94UggWFBvIIRf5Z2L?=
 =?us-ascii?Q?DU2Gp2CPCSH/nyweaXL8Q0OJV6cYuS96pAPfkpcohw8lTHw4RLrKYIeICEEY?=
 =?us-ascii?Q?Hr75a30LFy4dmPMCt6yoQYFRns94E9jWcAfTfPnCLAjrR+VaGYcug4i7Bswq?=
 =?us-ascii?Q?575v1jUgXRFyk1uqygFIXePFfGbAbRV80xWM/58ek2Xa40yfI+D7kipLBijf?=
 =?us-ascii?Q?Uy/FBsoZGRlL/3yysPyrwIT0G2blGD0qLovjzVFI9ML3cm5D5V6AqXlBOymh?=
 =?us-ascii?Q?4hoL94lUeTrNQ8z/kz4Qz+flLWNrKs7mKoI+iP64hDzc/aNiKlnqsIXhmHM7?=
 =?us-ascii?Q?Sotyhk7dLuh4VXzts+7qTTej9O0kkdgwak/WV0WVx4jxrdfHVAGvAUPSWGPM?=
 =?us-ascii?Q?zS5pFH+OdZTxBmfNvlJXTxjOtLmHRG6rxC+eUH5MJFjI4wMaVqsahJ1quJXB?=
 =?us-ascii?Q?XiAquqwXfMmPibfuPU/tFmG13QiFAezsr0ZOqtrcd6sF763CDCK+h7qtq0x7?=
 =?us-ascii?Q?YsAwBmcNcVKqG0fwi/BA13OhrEqfOO1leP0pXlWYUAli8DGUMz6w6O50lIOG?=
 =?us-ascii?Q?4SDMINaApl+h/pU89Ov0P13ipLH9nE9OqWwL0DQr84l+gHjfuMJUEYrRpFOm?=
 =?us-ascii?Q?l+43rqO+MZoGzQqM2SMjMGk=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e0a4937e-a1a4-433b-b737-08db27190ee3
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2023 18:54:38.2402
 (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: DK0GpjbrcuKKq8+mk9SDnQF6q0vocXkqDCFDUjXcdeIJ2EPATbrC6s3f+4qgBEsH0eYQ/3jEUqpGs8JmSIwBTjNA4/vrdQId7l9EPj0x1cA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7530
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

If a user of the Felix driver has a port running in SGMII / QSGMII mode, it
will need to utilize phylink_mac_config(). Add this configurability.

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

v2
    * New patch

---
 drivers/net/dsa/ocelot/felix.c | 12 ++++++++++++
 drivers/net/dsa/ocelot/felix.h |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index 21dcb9cadc12..845068bcbeb4 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -1056,6 +1056,17 @@ static void felix_phylink_get_caps(struct dsa_switch *ds, int port,
 		  config->supported_interfaces);
 }
 
+static void felix_phylink_mac_config(struct dsa_switch *ds, int port,
+				     unsigned int mode,
+				     const struct phylink_link_state *state)
+{
+	struct ocelot *ocelot = ds->priv;
+	struct felix *felix = ocelot_to_felix(ocelot);
+
+	if (felix->info->phylink_mac_config)
+		felix->info->phylink_mac_config(ocelot, port, mode, state);
+}
+
 static struct phylink_pcs *felix_phylink_mac_select_pcs(struct dsa_switch *ds,
 							int port,
 							phy_interface_t iface)
@@ -2088,6 +2099,7 @@ const struct dsa_switch_ops felix_switch_ops = {
 	.get_sset_count			= felix_get_sset_count,
 	.get_ts_info			= felix_get_ts_info,
 	.phylink_get_caps		= felix_phylink_get_caps,
+	.phylink_mac_config		= felix_phylink_mac_config,
 	.phylink_mac_select_pcs		= felix_phylink_mac_select_pcs,
 	.phylink_mac_link_down		= felix_phylink_mac_link_down,
 	.phylink_mac_link_up		= felix_phylink_mac_link_up,
diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h
index d5d0b30c0b75..98771273512b 100644
--- a/drivers/net/dsa/ocelot/felix.h
+++ b/drivers/net/dsa/ocelot/felix.h
@@ -58,6 +58,9 @@ struct felix_info {
 	void	(*tas_guard_bands_update)(struct ocelot *ocelot, int port);
 	void	(*port_sched_speed_set)(struct ocelot *ocelot, int port,
 					u32 speed);
+	void	(*phylink_mac_config)(struct ocelot *ocelot, int port,
+				      unsigned int mode,
+				      const struct phylink_link_state *state);
 };
 
 /* Methods for initializing the hardware resources specific to a tagging
-- 
2.25.1