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:     "David S . Miller" <davem@davemloft.net>,
        Paolo Abeni <pabeni@redhat.com>,
        Vladimir Oltean <olteanv@gmail.com>,
        linux-kernel@vger.kernel.org, Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Alexandru Marginean <alexandru.marginean@nxp.com>,
        Sean Anderson <sean.anderson@seco.com>,
        Russell King <rmk+kernel@armlinux.org.uk>
Subject: [PATCH net-next v4 05/10] net: phylink: Add some helpers for working with mac caps
Date:   Thu, 18 Aug 2022 12:46:11 -0400
Message-Id: <20220818164616.2064242-6-sean.anderson@seco.com>
In-Reply-To: <20220818164616.2064242-1-sean.anderson@seco.com>
References: <20220818164616.2064242-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?uheRL4GZ8xWC0DHj2joO8gvP/XP0izzEB7rGea3li7AI51D7s/Xxk9ZZnrnY?=
 =?us-ascii?Q?h8xk0PUdRBBPBphxvqqwfZND0dmF4fhdCNya+0lqV43mj/hboOqOXhk6Z57S?=
 =?us-ascii?Q?2cpfc9pR7t/7L5SxPr9VFnNfkNuD1tdKm43CsdvJhGzG7tyL3NqPF0Ao7nc4?=
 =?us-ascii?Q?as0p/oqY/q0CMJBVkA4HvHPNkdVVeWtG/KU7eACJZN+PfNT4BsYJyWnjX+vG?=
 =?us-ascii?Q?h27UZ0qohuRDQq0An/sBQ6/rk3aa6GXXxgdAxJKuqQPi4C5ZRwe/j0Yb+600?=
 =?us-ascii?Q?FkncfHso2ieDJ6iqX/Kd17lLmS0r3zHvTLRHRX6dNqrMs0nEC/US3deQHq+F?=
 =?us-ascii?Q?D7jUqp/ZL6Qo1eWq1QJGxEoLnobq+5fsXun3KfHspHzBsM2ZCY3T+fKzsJqY?=
 =?us-ascii?Q?kvK3cGHD3U6JU7ghxmENasXewJgqA/W6PSRAl4q++1g3k6Ed0hs3xPj1P7it?=
 =?us-ascii?Q?gKYgyr3VE+445lTUWWM+5CckEk8tGb/fjRdM/chfOehfRbNPk8fr2Aty33VG?=
 =?us-ascii?Q?zLrK6Z4sfMw+lLk1fK6FviyYXHgWpKPTVX9lF3ODksVG9umG+VjexUfCcKkE?=
 =?us-ascii?Q?I+M1n+rtDrR4ZwjL8jNgfx9iq8VMpCG72dDXQZ+bQDShleQqvTHK6bGLqsry?=
 =?us-ascii?Q?uYKt3V4hpHJUTHwPWdZLpJMRGZSYwmb2C8WQf/F0mtmsCi+PWsIKMptL3ki/?=
 =?us-ascii?Q?m84afseDhiTjgbDLguhANSuKt2KsmhRgeZheSnG4G13pvJ5oMJ8sgYhIBSZb?=
 =?us-ascii?Q?ELBYolAabbOlvXxI/ddqb/YuO/nQTA+z5LMTf7BnIjDa89JY+WNHzBvHif8l?=
 =?us-ascii?Q?JHGxNk9IhGEuXbFjWuE+fdacS4yDMA1IIIEIZzJA9G5CZGo24xlYOBeb+EAs?=
 =?us-ascii?Q?XkBvqBFBsZ2BjDwTbysAnaew8bYCbSlDKz/wBZ525P0Tur1feBXzOGCsN1JR?=
 =?us-ascii?Q?flK4v4T8vDYOZAX9WouY1OQC5SGRcTK+zaBQwE7YpzuwfrJm9SPjAa9JxajW?=
 =?us-ascii?Q?8Yx/sIlg84ioROr0AKZoqrLUumWBnc2q4U4Ykpv0BMvPABBWoFhracSi75o4?=
 =?us-ascii?Q?7JDfCrfvary93/LFgbLFo4sxzGuN9vmFnUyl5iQdfXK2HwRfk5plWHDywRHA?=
 =?us-ascii?Q?9DL0lOCS/otp9dT73Ue2jRablmTuKg1mRSMrkvqffGfABNrWL4xUg7pv8gPM?=
 =?us-ascii?Q?VtCxGFvPpqPFTrTXpUkZKzClmCb1nssd93M7HtdNa5Hk1EWsbnnc3NRwbsiO?=
 =?us-ascii?Q?EGSotLRmVh31Dzz2VNT+1Rfl2Fl0u53T+1wxfX2E21sH0JJI8bQAZx4bAvJL?=
 =?us-ascii?Q?SX4w7SWcCUgtUXo7CiCrYiKSdrUfnim5ihe9d0Az3Q06Dw5q1bWyULprMD6r?=
 =?us-ascii?Q?6t/46MBEpD+4SUPmHm4X4H58XQEvMptm5AV5VKvO24layLEWVYXTj/h+ruN0?=
 =?us-ascii?Q?rSTa1T5Sq0ZhEc6WDbtQIPFe1ZtW/Mg4quWxW6EYK+b/a+gIPH/rQU2Dz+Ei?=
 =?us-ascii?Q?ZBrAOS7HDvd2wcOjHaFMgdnfP2bFoMYf9jT166vKU8so4dZt4/g1exb4dW6f?=
 =?us-ascii?Q?kVRetRQtK9YxcixFzntJBMnfb5N7Vcly9o3BwLaKKaA2nIZ/AZLZwkh0TsKB?=
 =?us-ascii?Q?oA=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5c9cc86d-a623-405f-e215-08da81393625
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2022 16:46:34.9167
 (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: Z3r+rSxyuQCKv6assLMmoOJgVYOTpg8YjaeKq7i7cq7HN3ZV0sK6sDNNCzmfger17EbOMucnrXdj3Zsnjp8Kig==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR03MB7649
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_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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

This adds a table for converting between speed/duplex and mac
capabilities. It also adds a helper for getting the max speed/duplex
from some caps. It is intended to be used by Russell King's DSA phylink
series. The table will be used directly later in this series.

Co-developed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
[ adapted to live in phylink.c ]
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---
This is adapted from [1].

[1] https://lore.kernel.org/netdev/E1oCNlE-006e3z-3T@rmk-PC.armlinux.org.uk/

Changes in v4:
- Wrap docstring to 80 columns

Changes in v3:
- New

 drivers/net/phy/phylink.c | 57 +++++++++++++++++++++++++++++++++++++++
 include/linux/phylink.h   |  2 ++
 2 files changed, 59 insertions(+)

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 68a58ab6a8ed..8a9da7449c73 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -304,6 +304,63 @@ void phylink_caps_to_linkmodes(unsigned long *linkmodes, unsigned long caps)
 }
 EXPORT_SYMBOL_GPL(phylink_caps_to_linkmodes);
 
+static struct {
+	unsigned long mask;
+	int speed;
+	unsigned int duplex;
+} phylink_caps_params[] = {
+	{ MAC_400000FD, SPEED_400000, DUPLEX_FULL },
+	{ MAC_200000FD, SPEED_200000, DUPLEX_FULL },
+	{ MAC_100000FD, SPEED_100000, DUPLEX_FULL },
+	{ MAC_56000FD,  SPEED_56000,  DUPLEX_FULL },
+	{ MAC_50000FD,  SPEED_50000,  DUPLEX_FULL },
+	{ MAC_40000FD,  SPEED_40000,  DUPLEX_FULL },
+	{ MAC_25000FD,  SPEED_25000,  DUPLEX_FULL },
+	{ MAC_20000FD,  SPEED_20000,  DUPLEX_FULL },
+	{ MAC_10000FD,  SPEED_10000,  DUPLEX_FULL },
+	{ MAC_5000FD,   SPEED_5000,   DUPLEX_FULL },
+	{ MAC_2500FD,   SPEED_2500,   DUPLEX_FULL },
+	{ MAC_1000FD,   SPEED_1000,   DUPLEX_FULL },
+	{ MAC_1000HD,   SPEED_1000,   DUPLEX_HALF },
+	{ MAC_100FD,    SPEED_100,    DUPLEX_FULL },
+	{ MAC_100HD,    SPEED_100,    DUPLEX_HALF },
+	{ MAC_10FD,     SPEED_10,     DUPLEX_FULL },
+	{ MAC_10HD,     SPEED_10,     DUPLEX_HALF },
+};
+
+/**
+ * phylink_caps_find_max_speed() - Find the max speed/duplex of mac capabilities
+ * @caps: A mask of mac capabilities
+ * @speed: Variable to store the maximum speed
+ * @duplex: Variable to store the maximum duplex
+ *
+ * Find the maximum speed (and associated duplex) supported by a mask of mac
+ * capabilities. @speed and @duplex are always set, even if no matching mac
+ * capability was found.
+ *
+ * Return: 0 on success, or %-EINVAL if the maximum speed/duplex could not be
+ *         determined.
+ */
+int phylink_caps_find_max_speed(unsigned long caps, int *speed,
+				unsigned int *duplex)
+{
+	int i;
+
+	*speed = SPEED_UNKNOWN;
+	*duplex = DUPLEX_UNKNOWN;
+
+	for (i = 0; i < ARRAY_SIZE(phylink_caps_params); i++) {
+		if (caps & phylink_caps_params[i].mask) {
+			*speed = phylink_caps_params[i].speed;
+			*duplex = phylink_caps_params[i].duplex;
+			return 0;
+		}
+	}
+
+	return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(phylink_caps_find_max_speed);
+
 /**
  * phylink_get_capabilities() - get capabilities for a given MAC
  * @interface: phy interface mode defined by &typedef phy_interface_t
diff --git a/include/linux/phylink.h b/include/linux/phylink.h
index 661d1d4fdbec..a5a236cfacb6 100644
--- a/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@ -535,6 +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);
+int phylink_caps_find_max_speed(unsigned long caps, int *speed,
+				unsigned int *duplex);
 unsigned long phylink_get_capabilities(phy_interface_t interface,
 				       unsigned long mac_capabilities);
 void phylink_generic_validate(struct phylink_config *config,
-- 
2.35.1.1320.gc452695387.dirty