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:   Sean Anderson <sean.anderson@seco.com>
To:     netdev@vger.kernel.org, Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>
Cc:     Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
        Vladimir Oltean <olteanv@gmail.com>,
        Alexandru Marginean <alexandru.marginean@nxp.com>,
        linux-kernel@vger.kernel.org,
        "David S . Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH net-next v5 3/8] net: phylink: Generate caps and convert to linkmodes separately
Date:   Tue,  6 Sep 2022 12:18:47 -0400
Message-Id: <20220906161852.1538270-4-sean.anderson@seco.com>
In-Reply-To: <20220906161852.1538270-1-sean.anderson@seco.com>
References: <20220906161852.1538270-1-sean.anderson@seco.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?S4DblGvbEr882mHy5X9ZsJw4tzB0dRcT9SKa9XklNvudOjTrbml0xy4qhlma?=
 =?us-ascii?Q?u0WjLprWzjc5k8z1K11erSy+ANITIsqg/oS+A3gXzA29ytIBa0UUiU5Xp4lL?=
 =?us-ascii?Q?5nnn34S6kNUS+TGeczpmwp/Ui0zgWAc0NnQFoKT+Abo0PKF/J1MhgAB7OP7u?=
 =?us-ascii?Q?VHzLG9/XNrI/Xb5juhpEJK1N3tAEhK7IDbVreuYJ2jqkVx629COHhW1PvbEO?=
 =?us-ascii?Q?Y3nE60HRlPzyfVn+xpfBizkYUnVV5DVMoi4QWrGYwmy9VxkGcSADNJk9ICiX?=
 =?us-ascii?Q?DimaZRV4IhhgBZVALHTYY1Q4M078VI1oJ+e2VGRnRS4tpqAZZXuEXii+9C3P?=
 =?us-ascii?Q?xc5wSBizscnXof7LmyIwOODmeFaA1dE7txWKc/2p0pqc9spO4L2w+We+1Yab?=
 =?us-ascii?Q?Y4Em2TjFPpqYAmixlE6RqvGsRcgtkANnM8WoPZaAvhPmbpGgLyM0KUn62+RR?=
 =?us-ascii?Q?7VvGnbo6crg0xatnX+syVgVeMMuC3Q29XqvZKmpQxOABo/aFdJF+87wtTsOU?=
 =?us-ascii?Q?ZrKQVfaTYSBJxZHu4hMqqw2RkKsDt0SYjM+xqS6D9iIp6JMk6NUoD8gzJoeG?=
 =?us-ascii?Q?a3Yk3t9G0rqgaB1BnapOVjlla+SzwofQZq1F2hfCmzER0KQ/LufdtX9nRghr?=
 =?us-ascii?Q?nBHRzn2f34eEwy1zyAEUL4eo2EgaN1NpcaQ6N7xTEiFmJ+M862YWucbd74M5?=
 =?us-ascii?Q?GKG43Lfm+T2uIwS2wuDtc/paLinSmpUiZkzsQS1MkcSGRfgFEIg8mPoRRAfC?=
 =?us-ascii?Q?AB4V19GavlZqof2lGuSC38lUBnVZsQUgqany++TBKlbVuKBKh6w5ndNfxXp/?=
 =?us-ascii?Q?8eLyDwz3p/b+nMCU6DBpHn5c8L2VSKixjxVeKYDDEtbMR0UbRIJVfUZBxlJp?=
 =?us-ascii?Q?uVEAH8OEcg78dIM/zZOSBnSSbkz8Zyg8DBeJQ0L2luFhzkuYI9tPds07RaDk?=
 =?us-ascii?Q?igHhqdmFrn318SsNQ3BKwBhIcL9lyF/E+bcxmvTOFb2QQlmfB6J3ZIuHlutf?=
 =?us-ascii?Q?QNcVeSwrNR4+mx67fW6RkXMKw0nyUZR04Emu1fCjoLol2LAh9J8ekPMESUgq?=
 =?us-ascii?Q?AcUhha7MdpiZZOAsakuc6lmbugzgk55E484N7Shfv+vw1oE5hZ1+ZHe5JwYp?=
 =?us-ascii?Q?JtdPC1nwsze9/MEicnuWi9Ms6g7E+HMTF2FAHqpkdrAs2t2GogttjCcQZJkg?=
 =?us-ascii?Q?Jw0BeXqIHH4QebuuGpDlFoyQlJCDVvED+IhH6eUVwwMHH465I4Drs/8mLElR?=
 =?us-ascii?Q?sZqM4KdQ9fLq33BSmE9Ge2QlyFEg/+Z88NvvMN3mXah8883xxwgQ3usY95NL?=
 =?us-ascii?Q?uVb94bHWvzQWakAZOmTBK9L99PQC5DJDysdtQ0uwzBVZvPvpPoXxctSadWT3?=
 =?us-ascii?Q?DeJjZBgcU03WIZDdxPaNDsS5ZsKsFP0zIHk739MzQ0klNWaU6vvZMFqeZJxM?=
 =?us-ascii?Q?wqOoNzo45cmPZr+A1yG1Zc+Bs+54vHewiP7qDW4I/ZfQJAtMw5dPaHszKBDX?=
 =?us-ascii?Q?/f1hUzjkiWsksBW1Ud6LkiBfY4YFXAAw0RKoFx+OfwbLUA1mQomJ8uWKrGMh?=
 =?us-ascii?Q?t6MqHAaJQES55njPhPWVDTbvdQy0C2SVbjIg68H09SVyfm94j2roj+r9dtHT?=
 =?us-ascii?Q?tg=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f0e92ac1-8766-429e-d481-08da9023867d
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 16:19:08.2713
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: kkXLY7daYZbDHi1Xg9qucyGmroFlmXWWhZ6Ubda5jBBDv80JWanfPmqqDoiwK3+HeNQDNL6G6WO1H7ZKBtOWkw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0301MB2254
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,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

If we call phylink_caps_to_linkmodes directly from
phylink_get_linkmodes, it is difficult to re-use this functionality in
MAC drivers. This is because MAC drivers must then work with an ethtool
linkmode bitmap, instead of with mac capabilities. Instead, let the
caller of phylink_get_linkmodes do the conversion. To reflect this
change, rename the function to phylink_get_capabilities.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

(no changes since v1)

 drivers/net/phy/phylink.c | 21 +++++++++++----------
 include/linux/phylink.h   |  4 ++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index c5c3f0b62d7f..1f022e5d01ba 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -305,17 +305,15 @@ void phylink_caps_to_linkmodes(unsigned long *linkmodes, unsigned long caps)
 EXPORT_SYMBOL_GPL(phylink_caps_to_linkmodes);
 
 /**
- * phylink_get_linkmodes() - get acceptable link modes
- * @linkmodes: ethtool linkmode mask (must be already initialised)
+ * phylink_get_capabilities() - get capabilities for a given MAC
  * @interface: phy interface mode defined by &typedef phy_interface_t
  * @mac_capabilities: bitmask of MAC capabilities
  *
- * Set all possible pause, speed and duplex linkmodes in @linkmodes that
- * are supported by the @interface mode and @mac_capabilities. @linkmodes
- * must have been initialised previously.
+ * Get the MAC capabilities that are supported by the @interface mode and
+ * @mac_capabilities.
  */
-void phylink_get_linkmodes(unsigned long *linkmodes, phy_interface_t interface,
-			   unsigned long mac_capabilities)
+unsigned long phylink_get_capabilities(phy_interface_t interface,
+				       unsigned long mac_capabilities)
 {
 	unsigned long caps = MAC_SYM_PAUSE | MAC_ASYM_PAUSE;
 
@@ -391,9 +389,9 @@ void phylink_get_linkmodes(unsigned long *linkmodes, phy_interface_t interface,
 		break;
 	}
 
-	phylink_caps_to_linkmodes(linkmodes, caps & mac_capabilities);
+	return caps & mac_capabilities;
 }
-EXPORT_SYMBOL_GPL(phylink_get_linkmodes);
+EXPORT_SYMBOL_GPL(phylink_get_capabilities);
 
 /**
  * phylink_generic_validate() - generic validate() callback implementation
@@ -409,11 +407,14 @@ void phylink_generic_validate(struct phylink_config *config,
 			      unsigned long *supported,
 			      struct phylink_link_state *state)
 {
+	unsigned long caps;
 	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
 
 	phylink_set_port_modes(mask);
 	phylink_set(mask, Autoneg);
-	phylink_get_linkmodes(mask, state->interface, config->mac_capabilities);
+	caps = phylink_get_capabilities(state->interface,
+					config->mac_capabilities);
+	phylink_caps_to_linkmodes(mask, caps);
 
 	linkmode_and(supported, supported, mask);
 	linkmode_and(state->advertising, state->advertising, mask);
diff --git a/include/linux/phylink.h b/include/linux/phylink.h
index 9bb088e0ef3e..c2aa49c692a0 100644
--- a/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@ -535,8 +535,8 @@ void pcs_link_up(struct phylink_pcs *pcs, unsigned int mode,
 #endif
 
 void phylink_caps_to_linkmodes(unsigned long *linkmodes, unsigned long caps);
-void phylink_get_linkmodes(unsigned long *linkmodes, phy_interface_t interface,
-			   unsigned long mac_capabilities);
+unsigned long phylink_get_capabilities(phy_interface_t interface,
+				       unsigned long mac_capabilities);
 void phylink_generic_validate(struct phylink_config *config,
 			      unsigned long *supported,
 			      struct phylink_link_state *state);
-- 
2.35.1.1320.gc452695387.dirty