From patchwork Sat Feb 22 09:49:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt via B4 Relay X-Patchwork-Id: 13986569 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D929207657; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; cv=none; b=Bejjj3hVswxetxT2SJ8//HC16TbxuXRgTZM9nGOnCSEl4tEcv+xVRqKDgvWg0fOcZQEgENN14+rDIuoSC6mkjUmWmq6oZM/GL1AGha4rEE31W5UKUD962tDgER/EbbfmpFr+h+SOgyHdFdc+grJ4Z/VsbDydtfiqDMLZFDqSHOI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; c=relaxed/simple; bh=z15Ls+N2f4qhQa8zHLA/8pAS/OD9DivM6Ks6EyIuxMQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=soAhIqua6brDJliGz0yD0xcYQ73NypY8UV/kJxLfYUOkghpPiW2GXZBjF1IPd7+il/TFiNr11f71JtehP3JrgdQTRq5VQAhFz2yRdALO9ECYPAsa9IPjeO92cY4eakqINMALr8ThkDKC61lCavZtJCfvFBNXZYzIY9ev7uJU45s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Mt3uUksU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Mt3uUksU" Received: by smtp.kernel.org (Postfix) with ESMTPS id E59B1C4CEE6; Sat, 22 Feb 2025 09:50:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740217802; bh=z15Ls+N2f4qhQa8zHLA/8pAS/OD9DivM6Ks6EyIuxMQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Mt3uUksUeKBOfSIAGNS91FWyk0j08UZfqLigUC/CWp7aPF31ZrQ9TBrMby68LvQYC r6SKl5PvHqF/QJHHP4A4ZsANE8Ys4ZkJB8JrYspN7z8Qao4ks3phtNnN8UXtWbnsbI oS+uGMV1K2coZ+oW+rY6EmD3UafxLKSKB/DJRB5AwaT4KwDP/7lRP4koHJBlxpUJ/w SnwasQ8wUMvjsLUnQ+tsKmqM3UBjfzo1Qd3U5m60P4PgbYPrDfJEIQbGVfc4dHnl5+ fXkc0dtivZ0PNzFy2Z8uNS8Sfb2Atc7nSkS9HQg7t/jLpMuL04aixBGa2FMdNvSdsx Esz6pR5PPf6rw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF037C021B5; Sat, 22 Feb 2025 09:50:01 +0000 (UTC) From: Hans-Frieder Vogt via B4 Relay Date: Sat, 22 Feb 2025 10:49:28 +0100 Subject: [PATCH net-next v5 1/7] net: phy: Add swnode support to mdiobus_scan Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250222-tn9510-v3a-v5-1-99365047e309@gmx.net> References: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> In-Reply-To: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , FUJITA Tomonori , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hans-Frieder Vogt X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1740217800; l=1936; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=eboV90jxD+Bku0BOXjDGCNU60DTUE9kSyEbR0D3C8dU=; b=Nogcd+1D21291CGyGc6d46o9MFdESh6MrwVLG7OWMOqvmTxM2yIuQjEeOOQ7TJhfP9xBJ1QqX Segj+wdlu7qCwB+ZKnvurPEYNx1a7R4RW95HAzlPqxpbuVNENZp3F46 X-Developer-Key: i=hfdevel@gmx.net; a=ed25519; pk=s3DJ3DFe6BJDRAcnd7VGvvwPXcLgV8mrfbpt8B9coRc= X-Endpoint-Received: by B4 Relay for hfdevel@gmx.net/20240915 with auth_id=209 X-Original-From: Hans-Frieder Vogt Reply-To: hfdevel@gmx.net X-Patchwork-Delegate: kuba@kernel.org From: Hans-Frieder Vogt This patch will allow to use a swnode/fwnode defined for a phy_device. The MDIO bus (mii_bus) needs to contain nodes for the PHY devices, named "ethernet-phy@i", with i being the MDIO address (0 .. PHY_MAX_ADDR - 1). The fwnode is only attached to the phy_device if there isn't already an fwnode attached. fwnode_get_named_child_node will increase the usage counter of the fwnode. However, no new code is needed to decrease the counter again, since this is already implemented in the phy_device_release function. Signed-off-by: Hans-Frieder Vogt --- drivers/net/phy/mdio_bus.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 7e2f10182c0cf37bef4cea1820863f047b5cb466..ede596c1a69d1b2b986e9eef51c3beb4a5fbc805 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -551,6 +551,8 @@ static int mdiobus_create_device(struct mii_bus *bus, static struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr, bool c45) { struct phy_device *phydev = ERR_PTR(-ENODEV); + struct fwnode_handle *fwnode; + char node_name[16]; int err; phydev = get_phy_device(bus, addr, c45); @@ -562,6 +564,18 @@ static struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr, bool c45) */ of_mdiobus_link_mdiodev(bus, &phydev->mdio); + /* Search for a swnode for the phy in the swnode hierarchy of the bus. + * If there is no swnode for the phy provided, just ignore it. + */ + if (dev_fwnode(&bus->dev) && !dev_fwnode(&phydev->mdio.dev)) { + snprintf(node_name, sizeof(node_name), "ethernet-phy@%d", + addr); + fwnode = fwnode_get_named_child_node(dev_fwnode(&bus->dev), + node_name); + if (fwnode) + device_set_node(&phydev->mdio.dev, fwnode); + } + err = phy_device_register(phydev); if (err) { phy_device_free(phydev); From patchwork Sat Feb 22 09:49:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt via B4 Relay X-Patchwork-Id: 13986571 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D857B663; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; cv=none; b=ArRR0CMmljt1Sx7AfTeg/OmibaLedr9Vn9DfzIOe3tbhO2uWmg4r5kHcrmiVodmtrNJQZG6IPtQDZr53tC+BKWzS1yLI6y8mFvAWPM0gitYzNzh2AwwXGqXSeGScC+F8TUKTG2XXYOKdY83sZADqEf3502G+e+iwECy3/6tKsw4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; c=relaxed/simple; bh=YMuS4jq16SQY005HovXWqkuXwTsXCArwDObAf38rCgY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UMUr45/OlCfVF/KK7CvCyZolhEYDGG61d84gOPG+vtnPisJemLbCIeItjX3w/nYgH/kuy5QCH//ovVIEZVEEQ7itAvw3YRE2yLXQmm0heY61DnqoT+FgIdFCKG571whmn75zqh3FFYHEOFGt78xVBbCKXTCPx+0JMQD00GvpR3A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FEwhkXR9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FEwhkXR9" Received: by smtp.kernel.org (Postfix) with ESMTPS id EEFBBC4CEE2; Sat, 22 Feb 2025 09:50:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740217802; bh=YMuS4jq16SQY005HovXWqkuXwTsXCArwDObAf38rCgY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=FEwhkXR9LUR/bop/0d4N29ntW4WlbEk0X5MkeUJC10zXs2RpZrdYb8IvUaYH3V5wZ DHCU9/Gi/yLRVmqsV7g62W21sNFGCXGGu8uuOSRlWymc1+orXz09vjUsSX0O75MIJN Sv0cp6FU+2NcqHkOfeM/Xa/h0VRC0gIhCKQq/zrAnF14fKHnN95MBDYFxjH7VRV+Zo MwhiYuRdmhXfU8PhBOUoN7OLfZvCioDspcXOAKfyf+SN+cA9vM/CAlvc73wRqc7Elh IbnJJ9J+qUFOgytLSPGdyy76g6QyEGI5fbYgl7v3IqPxWjPI6PCRA75eyj+cY+4i2G ww0OgcWkybb9w== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E06E2C021B7; Sat, 22 Feb 2025 09:50:01 +0000 (UTC) From: Hans-Frieder Vogt via B4 Relay Date: Sat, 22 Feb 2025 10:49:29 +0100 Subject: [PATCH net-next v5 2/7] net: phy: aquantia: add probe function to aqr105 for firmware loading Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250222-tn9510-v3a-v5-2-99365047e309@gmx.net> References: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> In-Reply-To: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , FUJITA Tomonori , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hans-Frieder Vogt X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1740217800; l=900; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=vEeavGZyiKSDFemLfNRy5gMMBOs/2nb7oTqi4HS4XIQ=; b=M76uCELxw2oNUw0404E9UpC5aH3+YSASttZAWCbjW2m4nm+jr5+babv/nwMqwhx8BNvvd9QsU 5DHoScLr+kCCfr+r5wOPDkiBnpVzxdER3TXdEE6/VF8Mdx7MGWOJCMz X-Developer-Key: i=hfdevel@gmx.net; a=ed25519; pk=s3DJ3DFe6BJDRAcnd7VGvvwPXcLgV8mrfbpt8B9coRc= X-Endpoint-Received: by B4 Relay for hfdevel@gmx.net/20240915 with auth_id=209 X-Original-From: Hans-Frieder Vogt Reply-To: hfdevel@gmx.net X-Patchwork-Delegate: kuba@kernel.org From: Hans-Frieder Vogt Re-use the AQR107 probe function to load the firmware on the AQR105 (and to probe the HWMON). Signed-off-by: Hans-Frieder Vogt Reviewed-by: Andrew Lunn --- drivers/net/phy/aquantia/aquantia_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c index e42ace4e682aacf56199b7fdb9613d20f240fa27..86b0e63de5d88fa1050919a8826bdbec4bbcf8ba 100644 --- a/drivers/net/phy/aquantia/aquantia_main.c +++ b/drivers/net/phy/aquantia/aquantia_main.c @@ -912,6 +912,7 @@ static struct phy_driver aqr_driver[] = { PHY_ID_MATCH_MODEL(PHY_ID_AQR105), .name = "Aquantia AQR105", .config_aneg = aqr_config_aneg, + .probe = aqr107_probe, .config_intr = aqr_config_intr, .handle_interrupt = aqr_handle_interrupt, .read_status = aqr_read_status, From patchwork Sat Feb 22 09:49:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt via B4 Relay X-Patchwork-Id: 13986572 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 707AC20767C; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; cv=none; b=F89IBYRs4sKhR7MeS955JYD7WxJOrrc/lBJyp4DW73k+oXAupk7/Q+lKX5CtsOwJzHeLZqyfCbJXy4gBjbzHcG6EZ0R66f4PyoKC0n5e0jZgHEcivViOF5mfJcjfGikp2f7zj5/tiX8N0mNaUYqIF3/vPo5876SjxfHRA8fYgik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; c=relaxed/simple; bh=uVlmDwv5wWEDBvC4S2R9sJZkHok3EH5U4Ugh6RJb8xM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UtUWm8jFznv1qyCPP3S7VimGDQddkVUVAddDjAXj6sZai4b/3FFFdhcCiuVLoAD7tSMRYvTHQqutV09tUAgdU0mjG/gjToArQA5Yz6/3eFrug4y+mm24Fn9rdHDXGRW4FG3X8+HU5QvUbzei48iuL2dt/uGSpt8csP38wsBs7sA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=itA//Fxv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="itA//Fxv" Received: by smtp.kernel.org (Postfix) with ESMTPS id 10078C4CEE9; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740217802; bh=uVlmDwv5wWEDBvC4S2R9sJZkHok3EH5U4Ugh6RJb8xM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=itA//Fxv6WA7o4Z/OimTkX/+7Tig1Nr3Z2MqiqaoZ34aCIWkICXhStVFPi4v7gdAZ KWILh0PGYaRcLdoB4/SVw3MHnNz3eHNM9anJFPwLsJv2ZR35Ckll6JwkWNPS25SfPa JN5wUSCsuMwU752N3Xk+KyQJxBtdZG6MQ45tQWPAnjoRTr6TyHs/fNEm7hdiQK/Duq uo/3kPxmhaPj4+ZSPlzByHr5Jb3IYobRjYs+EhBcN3SdQuvwkerhi3OuuhFmuEim0p Pf6OwD1wyF+lJWeSLxrZJn0EoGBu3X3ZsjCst3hwp5ScqyXC/ZZK5GUfJt3PpnUSjE 7GMry7OIP1g0A== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 054B3C021B6; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) From: Hans-Frieder Vogt via B4 Relay Date: Sat, 22 Feb 2025 10:49:30 +0100 Subject: [PATCH net-next v5 3/7] net: phy: aquantia: search for firmware-name in fwnode Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250222-tn9510-v3a-v5-3-99365047e309@gmx.net> References: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> In-Reply-To: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , FUJITA Tomonori , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hans-Frieder Vogt X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1740217800; l=1169; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=0zRi7Vk41IU72s/8DzrXAvCvexTz79in+5DW1aumMeg=; b=w+ESjiHbOrvoQFxv3jE21IjVpHLorFg3NmMOEt25B4ZO5bLNtichdGa8ilRo4R0+FJ87ZNuMc j20GSsqvXO5C8n0g2j/FRJIyuQi5BKnhTwAbAU5zDETbxuQtAP+b85j X-Developer-Key: i=hfdevel@gmx.net; a=ed25519; pk=s3DJ3DFe6BJDRAcnd7VGvvwPXcLgV8mrfbpt8B9coRc= X-Endpoint-Received: by B4 Relay for hfdevel@gmx.net/20240915 with auth_id=209 X-Original-From: Hans-Frieder Vogt Reply-To: hfdevel@gmx.net X-Patchwork-Delegate: kuba@kernel.org From: Hans-Frieder Vogt Allow the firmware name of an Aquantia PHY alternatively be provided by the property "firmware-name" of a swnode. This software node may be provided by the MAC or MDIO driver. Signed-off-by: Hans-Frieder Vogt Reviewed-by: Andrew Lunn --- drivers/net/phy/aquantia/aquantia_firmware.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/aquantia/aquantia_firmware.c b/drivers/net/phy/aquantia/aquantia_firmware.c index dab3af80593f51ff6dc670dfb54ae358c2458c40..bbbcc9736b00e1cfa193f4398889a4c172ca27a4 100644 --- a/drivers/net/phy/aquantia/aquantia_firmware.c +++ b/drivers/net/phy/aquantia/aquantia_firmware.c @@ -328,10 +328,11 @@ static int aqr_firmware_load_fs(struct phy_device *phydev) const char *fw_name; int ret; - ret = of_property_read_string(dev->of_node, "firmware-name", - &fw_name); - if (ret) + ret = device_property_read_string(dev, "firmware-name", &fw_name); + if (ret) { + phydev_err(phydev, "failed to read firmware-name: %d\n", ret); return ret; + } ret = request_firmware(&fw, fw_name, dev); if (ret) { From patchwork Sat Feb 22 09:49:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt via B4 Relay X-Patchwork-Id: 13986573 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81D1D20767E; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; cv=none; b=jxYWqm8nZnXW48ZxxEdQbJ4aRXAxu4fp7LkBlxZ4fQBp9L5xllZqA3rJiDuDWXWX5/eCO/O5XDG5DX7e0W/681ztgaGEpWiVs/EHWxcJYSC6N1jrrRarEdGnVpotF7UnTt3/6utveLY9Mbee+pWnIAd+kIVVqZ70Gu2r6khrHOI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; c=relaxed/simple; bh=ru1kNstxvSf6KGv8E0PtDTO0CWdtfA5JURSaZjAozpo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aQr0+rj+wKkaxI8r8hxEdZ1F02UrxX91sWDEWBkT6GuU2WMeKiiYVOnIQWlp9Lbtv/oubQRbIxJlN5iBW7/BFSoxfMLXzBYJkKInKNAell2XR+fYfRRthcDwG/8yHElBE7qxd9qw8jRYC9+uIXoPjPGYeIsK68NlaMK9la1FWjw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=b4qWyNiN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="b4qWyNiN" Received: by smtp.kernel.org (Postfix) with ESMTPS id 24407C4CEEB; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740217802; bh=ru1kNstxvSf6KGv8E0PtDTO0CWdtfA5JURSaZjAozpo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=b4qWyNiNkviTZfD9TS4WxdK02jtsQmLb59X7uIHvKBbD3C3KibZWK4d/U1vHqDYHZ EIWqsHLcJLkdCx/UCs09u2rf8XtmO+LCbBWdOdpjXsLDxzsS2XiLNMCDkWlyoiC4OZ hPE0jD9DUWLbV3qKA0LxGwerS15k8T7JVrFU3bxI98D3m/2wrCwUgBCJKZdPzYYz2G Eecgt0GfmW9zIVra86+0T/dpESyHC1IdrPePsMUnoTOBsAwkWmvUucR+c5LyjCki+6 sLv/BPsZ0MeODogk06u2oEuvCkcFKr7uLxCyr19vy+9F2ZrUaWkyQ6jCYzFunwoOQM SN8GLO6byaeVw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19ECEC021B5; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) From: Hans-Frieder Vogt via B4 Relay Date: Sat, 22 Feb 2025 10:49:31 +0100 Subject: [PATCH net-next v5 4/7] net: phy: aquantia: add essential functions to aqr105 driver Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250222-tn9510-v3a-v5-4-99365047e309@gmx.net> References: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> In-Reply-To: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , FUJITA Tomonori , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hans-Frieder Vogt X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1740217800; l=9114; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=yqPALBzqBcAoxPearuB2v75dusynwLWxB0wb21C6Mfw=; b=LVqTmjEL9L7Z5IgxkJ7PbH/O4socOCARb6fX+MZN/lN6X+A0XHacyMQLDUZ9WROpecbPsGcye +VcLvmYXkuwAA6Ot3XdS/+RZlLxAuBMFAqSNDl/tLbGQ0Pj442XuEcT X-Developer-Key: i=hfdevel@gmx.net; a=ed25519; pk=s3DJ3DFe6BJDRAcnd7VGvvwPXcLgV8mrfbpt8B9coRc= X-Endpoint-Received: by B4 Relay for hfdevel@gmx.net/20240915 with auth_id=209 X-Original-From: Hans-Frieder Vogt Reply-To: hfdevel@gmx.net X-Patchwork-Delegate: kuba@kernel.org From: Hans-Frieder Vogt This patch makes functions that were provided for aqr107 applicable to aqr105, or replaces generic functions with specific ones. Since the aqr105 was introduced before NBASE-T was defined (or 802.3bz), there are a number of vendor specific registers involved in the definition of the advertisement, in auto-negotiation and in the setting of the speed. The functions have been written following the downstream driver for TN4010 cards with aqr105 PHY, and use code from aqr107 functions wherever it seemed to make sense. Signed-off-by: Hans-Frieder Vogt --- drivers/net/phy/aquantia/aquantia_main.c | 242 ++++++++++++++++++++++++++++++- 1 file changed, 240 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c index 86b0e63de5d88fa1050919a8826bdbec4bbcf8ba..38c6cf7814da1fb9a4e715f242249eee15a3cc85 100644 --- a/drivers/net/phy/aquantia/aquantia_main.c +++ b/drivers/net/phy/aquantia/aquantia_main.c @@ -33,6 +33,9 @@ #define PHY_ID_AQR115C 0x31c31c33 #define PHY_ID_AQR813 0x31c31cb2 +#define MDIO_AN_10GBT_CTRL_ADV_LTIM BIT(0) +#define ADVERTISE_XNP BIT(12) + #define MDIO_PHYXS_VEND_IF_STATUS 0xe812 #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3) #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_KR 0 @@ -50,6 +53,7 @@ #define MDIO_AN_VEND_PROV_1000BASET_HALF BIT(14) #define MDIO_AN_VEND_PROV_5000BASET_FULL BIT(11) #define MDIO_AN_VEND_PROV_2500BASET_FULL BIT(10) +#define MDIO_AN_VEND_PROV_EXC_PHYID_INFO BIT(6) #define MDIO_AN_VEND_PROV_DOWNSHIFT_EN BIT(4) #define MDIO_AN_VEND_PROV_DOWNSHIFT_MASK GENMASK(3, 0) #define MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT 4 @@ -333,6 +337,238 @@ static int aqr_read_status(struct phy_device *phydev) return genphy_c45_read_status(phydev); } +static int aqr105_get_features(struct phy_device *phydev) +{ + int ret; + + /* Normal feature discovery */ + ret = genphy_c45_pma_read_abilities(phydev); + if (ret) + return ret; + + /* The AQR105 PHY misses to indicate the 2.5G and 5G modes, so add them + * here + */ + linkmode_set_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, + phydev->supported); + linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + phydev->supported); + + /* The AQR105 PHY suppports both RJ45 and SFP+ interfaces */ + linkmode_set_bit(ETHTOOL_LINK_MODE_TP_BIT, phydev->supported); + linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->supported); + + return 0; +} + +static int aqr105_config_speed(struct phy_device *phydev) +{ + int vend = MDIO_AN_VEND_PROV_EXC_PHYID_INFO; + int ctrl10 = MDIO_AN_10GBT_CTRL_ADV_LTIM; + int adv = ADVERTISE_CSMA; + int ret; + + switch (phydev->speed) { + case SPEED_100: + adv |= ADVERTISE_100FULL; + break; + case SPEED_1000: + adv |= ADVERTISE_NPAGE; + if (phydev->duplex == DUPLEX_FULL) + vend |= MDIO_AN_VEND_PROV_1000BASET_FULL; + else + vend |= MDIO_AN_VEND_PROV_1000BASET_HALF; + break; + case SPEED_2500: + adv |= (ADVERTISE_NPAGE | ADVERTISE_XNP); + vend |= MDIO_AN_VEND_PROV_2500BASET_FULL; + break; + case SPEED_5000: + adv |= (ADVERTISE_NPAGE | ADVERTISE_XNP); + vend |= MDIO_AN_VEND_PROV_5000BASET_FULL; + break; + case SPEED_10000: + adv |= (ADVERTISE_NPAGE | ADVERTISE_XNP); + ctrl10 |= MDIO_AN_10GBT_CTRL_ADV10G; + break; + default: + return -EINVAL; + } + ret = phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE, adv); + if (ret < 0) + return ret; + ret = phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_VEND_PROV, vend); + if (ret < 0) + return ret; + ret = phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL, ctrl10); + if (ret < 0) + return ret; + + /* set by vendor driver, but should be on by default */ + ret = phy_set_bits_mmd(phydev, MDIO_MMD_AN, MDIO_CTRL1, + MDIO_AN_CTRL1_XNP); + if (ret < 0) + return ret; + + return genphy_c45_an_disable_aneg(phydev); +} + +static int aqr105_config_aneg(struct phy_device *phydev) +{ + bool changed = false; + u16 reg; + int ret; + + ret = aqr_set_mdix(phydev, phydev->mdix_ctrl); + if (ret < 0) + return ret; + if (ret > 0) + changed = true; + + if (phydev->autoneg == AUTONEG_DISABLE) + return aqr105_config_speed(phydev); + + ret = genphy_c45_an_config_aneg(phydev); + if (ret < 0) + return ret; + if (ret > 0) + changed = true; + + /* Clause 45 has no standardized support for 1000BaseT, therefore + * use vendor registers for this mode. + */ + reg = 0; + if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, + phydev->advertising)) + reg |= MDIO_AN_VEND_PROV_1000BASET_FULL; + + if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, + phydev->advertising)) + reg |= MDIO_AN_VEND_PROV_1000BASET_HALF; + + /* Handle the case when the 2.5G and 5G speeds are not advertised */ + if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + phydev->advertising)) + reg |= MDIO_AN_VEND_PROV_2500BASET_FULL; + + if (linkmode_test_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, + phydev->advertising)) + reg |= MDIO_AN_VEND_PROV_5000BASET_FULL; + + ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_VEND_PROV, + MDIO_AN_VEND_PROV_1000BASET_HALF | + MDIO_AN_VEND_PROV_1000BASET_FULL | + MDIO_AN_VEND_PROV_2500BASET_FULL | + MDIO_AN_VEND_PROV_5000BASET_FULL, reg); + if (ret < 0) + return ret; + if (ret > 0) + changed = true; + + return genphy_c45_check_and_restart_aneg(phydev, changed); +} + +static int aqr105_read_rate(struct phy_device *phydev) +{ + int val; + + val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_STATUS1); + if (val < 0) + return val; + + if (val & MDIO_AN_TX_VEND_STATUS1_FULL_DUPLEX) + phydev->duplex = DUPLEX_FULL; + else + phydev->duplex = DUPLEX_HALF; + + switch (FIELD_GET(MDIO_AN_TX_VEND_STATUS1_RATE_MASK, val)) { + case MDIO_AN_TX_VEND_STATUS1_10BASET: + phydev->speed = SPEED_10; + break; + case MDIO_AN_TX_VEND_STATUS1_100BASETX: + phydev->speed = SPEED_100; + break; + case MDIO_AN_TX_VEND_STATUS1_1000BASET: + phydev->speed = SPEED_1000; + break; + case MDIO_AN_TX_VEND_STATUS1_2500BASET: + phydev->speed = SPEED_2500; + break; + case MDIO_AN_TX_VEND_STATUS1_5000BASET: + phydev->speed = SPEED_5000; + break; + case MDIO_AN_TX_VEND_STATUS1_10GBASET: + phydev->speed = SPEED_10000; + break; + default: + phydev->speed = SPEED_UNKNOWN; + } + + return 0; +} + +static int aqr105_read_status(struct phy_device *phydev) +{ + int ret; + int val; + + ret = aqr_read_status(phydev); + if (ret) + return ret; + + if (!phydev->link || phydev->autoneg == AUTONEG_DISABLE) + return 0; + + /** + * The status register is not immediately correct on line side link up. + * Poll periodically until it reflects the correct ON state. + * Only return fail for read error, timeout defaults to OFF state. + */ + ret = phy_read_mmd_poll_timeout(phydev, MDIO_MMD_PHYXS, + MDIO_PHYXS_VEND_IF_STATUS, val, + (FIELD_GET(MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK, val) != + MDIO_PHYXS_VEND_IF_STATUS_TYPE_OFF), + AQR107_OP_IN_PROG_SLEEP, + AQR107_OP_IN_PROG_TIMEOUT, false); + if (ret && ret != -ETIMEDOUT) + return ret; + + switch (FIELD_GET(MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK, val)) { + case MDIO_PHYXS_VEND_IF_STATUS_TYPE_KR: + phydev->interface = PHY_INTERFACE_MODE_10GKR; + break; + case MDIO_PHYXS_VEND_IF_STATUS_TYPE_KX: + phydev->interface = PHY_INTERFACE_MODE_1000BASEKX; + break; + case MDIO_PHYXS_VEND_IF_STATUS_TYPE_XFI: + phydev->interface = PHY_INTERFACE_MODE_10GBASER; + break; + case MDIO_PHYXS_VEND_IF_STATUS_TYPE_USXGMII: + phydev->interface = PHY_INTERFACE_MODE_USXGMII; + break; + case MDIO_PHYXS_VEND_IF_STATUS_TYPE_XAUI: + phydev->interface = PHY_INTERFACE_MODE_XAUI; + break; + case MDIO_PHYXS_VEND_IF_STATUS_TYPE_SGMII: + phydev->interface = PHY_INTERFACE_MODE_SGMII; + break; + case MDIO_PHYXS_VEND_IF_STATUS_TYPE_RXAUI: + phydev->interface = PHY_INTERFACE_MODE_RXAUI; + break; + case MDIO_PHYXS_VEND_IF_STATUS_TYPE_OCSGMII: + phydev->interface = PHY_INTERFACE_MODE_2500BASEX; + break; + case MDIO_PHYXS_VEND_IF_STATUS_TYPE_OFF: + default: + phydev->link = false; + phydev->interface = PHY_INTERFACE_MODE_NA; + break; + } + + /* Read rate from vendor register */ + return aqr105_read_rate(phydev); +} + static int aqr107_read_rate(struct phy_device *phydev) { u32 config_reg; @@ -911,11 +1147,13 @@ static struct phy_driver aqr_driver[] = { { PHY_ID_MATCH_MODEL(PHY_ID_AQR105), .name = "Aquantia AQR105", - .config_aneg = aqr_config_aneg, + .get_features = aqr105_get_features, .probe = aqr107_probe, + .config_init = aqr107_config_init, + .config_aneg = aqr105_config_aneg, .config_intr = aqr_config_intr, .handle_interrupt = aqr_handle_interrupt, - .read_status = aqr_read_status, + .read_status = aqr105_read_status, .suspend = aqr107_suspend, .resume = aqr107_resume, }, From patchwork Sat Feb 22 09:49:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt via B4 Relay X-Patchwork-Id: 13986574 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93F1A207A27; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; cv=none; b=TeAhDi6meX5K5pCEwMxzby4+ob7rnYJk01dbTkIK7MovJ3oyvK0yeqbILvephg7FtRUdyGRdNcHLgUoJLnXgumj94Q6swegYLj3ln+uVc87gXmsQFUpqOVY0LZEA5mbOFvMA3wAoC9N7Y7V+2jrVYCLd2q/xOOejNvKIQmB5fSU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; c=relaxed/simple; bh=+dyhnz81otLKfiT/QagXTHUdWYlrIsWNclojYvheN+U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=amHm+bUqPYj5RY97PjsKQINCnuDEiSTOfDpIsFilIZ8qlJmEtV8At+fHfWCIMMIjfPalMPYemVyl9beyT5rTqtaWcsS6bfAz0Ku9amgAbx1CRwHq9yrgQhNbnOi9GwdapMe8A55mejmo7heB9K1BN/Tq4tF3T80b8apfQrlGL9c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EOIvkrjB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EOIvkrjB" Received: by smtp.kernel.org (Postfix) with ESMTPS id 33F72C4CEED; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740217802; bh=+dyhnz81otLKfiT/QagXTHUdWYlrIsWNclojYvheN+U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=EOIvkrjB2EycjLFR0kmLh8wZkodRd6lsnJJN9FMXTVll0tgCJWHsi52yzqUCo7NoK mrtPyrSVYxN1tkivlq1DXH9pQk5iAdX/b897uilYPD0Qkjj0kyYk5lUgzXe7SikLdi JCfDWLiYs5OXkNo64716GvrwBcRSNbl5k4d4qg0xxffD8mv7f7ov3Mvk5d4duZuTWc x6NTbf7282zFFpvChowjZZ/cOYBt6eZWqIQqE+nX/64UpMmguktiC6NLvpcBJH7kio FQ7xztly6iKvzRoFs9YiGAq6AYPX9yLyz9TxuURP/1Fx7kjbMJA6tFDfdcfvpHYCEt Er6+c+ed16Aaw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AA2BC021B2; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) From: Hans-Frieder Vogt via B4 Relay Date: Sat, 22 Feb 2025 10:49:32 +0100 Subject: [PATCH net-next v5 5/7] net: tn40xx: create swnode for mdio and aqr105 phy and add to mdiobus Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250222-tn9510-v3a-v5-5-99365047e309@gmx.net> References: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> In-Reply-To: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , FUJITA Tomonori , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hans-Frieder Vogt X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1740217800; l=6931; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=fDYx7GENpjvlSg10fHyG5SKAUsXKQx+K8/FQ0VJ/hhk=; b=qoa0RfjXFzR9Gsj2Lrx/BQvU+Gc0CbD6hCPr50cN61/0Ky3uxIXULWf4ToQaSbR5JzFLteYaY oTV8DB4Rm68As96D2o/NDSsuSOxAJx//sCRbhpyw0n04bgJ07WHm4UU X-Developer-Key: i=hfdevel@gmx.net; a=ed25519; pk=s3DJ3DFe6BJDRAcnd7VGvvwPXcLgV8mrfbpt8B9coRc= X-Endpoint-Received: by B4 Relay for hfdevel@gmx.net/20240915 with auth_id=209 X-Original-From: Hans-Frieder Vogt Reply-To: hfdevel@gmx.net X-Patchwork-Delegate: kuba@kernel.org From: Hans-Frieder Vogt In case of an AQR105-based device, create a software node for the mdio function, with a child node for the Aquantia AQR105 PHY, providing a firmware-name (and a bit more, which may be used for future checks) to allow the PHY to load a MAC specific firmware from the file system. The name of the PHY software node follows the naming convention suggested in the patch for the mdiobus_scan function (in the same patch series). Signed-off-by: Hans-Frieder Vogt --- drivers/net/ethernet/tehuti/tn40.c | 5 ++- drivers/net/ethernet/tehuti/tn40.h | 31 +++++++++++++ drivers/net/ethernet/tehuti/tn40_mdio.c | 78 ++++++++++++++++++++++++++++++++- 3 files changed, 111 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/tehuti/tn40.c b/drivers/net/ethernet/tehuti/tn40.c index 259bdac24cf211113b8f80934feb093d61e46f2d..a4dd04fc6d89e7f7efd77145a5dd883884b30c4b 100644 --- a/drivers/net/ethernet/tehuti/tn40.c +++ b/drivers/net/ethernet/tehuti/tn40.c @@ -1778,7 +1778,7 @@ static int tn40_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ret = tn40_phy_register(priv); if (ret) { dev_err(&pdev->dev, "failed to set up PHY.\n"); - goto err_free_irq; + goto err_cleanup_swnodes; } ret = tn40_priv_init(priv); @@ -1795,6 +1795,8 @@ static int tn40_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; err_unregister_phydev: tn40_phy_unregister(priv); +err_cleanup_swnodes: + tn40_swnodes_cleanup(priv); err_free_irq: pci_free_irq_vectors(pdev); err_unset_drvdata: @@ -1816,6 +1818,7 @@ static void tn40_remove(struct pci_dev *pdev) unregister_netdev(ndev); tn40_phy_unregister(priv); + tn40_swnodes_cleanup(priv); pci_free_irq_vectors(priv->pdev); pci_set_drvdata(pdev, NULL); iounmap(priv->regs); diff --git a/drivers/net/ethernet/tehuti/tn40.h b/drivers/net/ethernet/tehuti/tn40.h index 490781fe512053d0d2cf0d6e819fc11d078a6733..ac48c1dc555480ccea41b6815bcfafb150b0a47c 100644 --- a/drivers/net/ethernet/tehuti/tn40.h +++ b/drivers/net/ethernet/tehuti/tn40.h @@ -4,6 +4,7 @@ #ifndef _TN40_H_ #define _TN40_H_ +#include #include "tn40_regs.h" #define TN40_DRV_NAME "tn40xx" @@ -102,10 +103,39 @@ struct tn40_txdb { int size; /* Number of elements in the db */ }; +#define NODE_PROP(_NAME, _PROP) ( \ + (const struct software_node) { \ + .name = _NAME, \ + .properties = _PROP, \ + }) + +#define NODE_PAR_PROP(_NAME, _PAR, _PROP) ( \ + (const struct software_node) { \ + .name = _NAME, \ + .parent = _PAR, \ + .properties = _PROP, \ + }) + +enum tn40_swnodes { + SWNODE_MDIO, + SWNODE_PHY, + SWNODE_MAX +}; + +struct tn40_nodes { + char phy_name[32]; + char mdio_name[32]; + struct property_entry phy_props[3]; + struct software_node swnodes[SWNODE_MAX]; + const struct software_node *group[SWNODE_MAX + 1]; +}; + struct tn40_priv { struct net_device *ndev; struct pci_dev *pdev; + struct tn40_nodes nodes; + struct napi_struct napi; /* RX FIFOs: 1 for data (full) descs, and 2 for free descs */ struct tn40_rxd_fifo rxd_fifo0; @@ -225,6 +255,7 @@ static inline void tn40_write_reg(struct tn40_priv *priv, u32 reg, u32 val) int tn40_set_link_speed(struct tn40_priv *priv, u32 speed); +void tn40_swnodes_cleanup(struct tn40_priv *priv); int tn40_mdiobus_init(struct tn40_priv *priv); int tn40_phy_register(struct tn40_priv *priv); diff --git a/drivers/net/ethernet/tehuti/tn40_mdio.c b/drivers/net/ethernet/tehuti/tn40_mdio.c index af18615d64a8a290c7f79e56260b9aacf82c0386..173551ace1941bf825c9b3d1acd16be24b35eb84 100644 --- a/drivers/net/ethernet/tehuti/tn40_mdio.c +++ b/drivers/net/ethernet/tehuti/tn40_mdio.c @@ -14,6 +14,8 @@ (FIELD_PREP(TN40_MDIO_PRTAD_MASK, (port)))) #define TN40_MDIO_CMD_READ BIT(15) +#define AQR105_FIRMWARE "tehuti/aqr105-tn40xx.cld" + static void tn40_mdio_set_speed(struct tn40_priv *priv, u32 speed) { void __iomem *regs = priv->regs; @@ -111,6 +113,56 @@ static int tn40_mdio_write_c45(struct mii_bus *mii_bus, int addr, int devnum, return tn40_mdio_write(mii_bus->priv, addr, devnum, regnum, val); } +/* registers an mdio node and an aqr105 PHY at address 1 + * tn40_mdio-%id { + * ethernet-phy@1 { + * compatible = "ethernet-phy-id03a1.b4a3"; + * reg = <1>; + * firmware-name = AQR105_FIRMWARE; + * }; + * }; + */ +static int tn40_swnodes_register(struct tn40_priv *priv) +{ + struct tn40_nodes *nodes = &priv->nodes; + struct pci_dev *pdev = priv->pdev; + struct software_node *swnodes; + u32 id; + + id = pci_dev_id(pdev); + + snprintf(nodes->phy_name, sizeof(nodes->phy_name), "ethernet-phy@1"); + snprintf(nodes->mdio_name, sizeof(nodes->mdio_name), "tn40_mdio-%x", + id); + + swnodes = nodes->swnodes; + + swnodes[SWNODE_MDIO] = NODE_PROP(nodes->mdio_name, NULL); + + nodes->phy_props[0] = PROPERTY_ENTRY_STRING("compatible", + "ethernet-phy-id03a1.b4a3"); + nodes->phy_props[1] = PROPERTY_ENTRY_U32("reg", 1); + nodes->phy_props[2] = PROPERTY_ENTRY_STRING("firmware-name", + AQR105_FIRMWARE); + swnodes[SWNODE_PHY] = NODE_PAR_PROP(nodes->phy_name, + &swnodes[SWNODE_MDIO], + nodes->phy_props); + + nodes->group[SWNODE_PHY] = &swnodes[SWNODE_PHY]; + nodes->group[SWNODE_MDIO] = &swnodes[SWNODE_MDIO]; + return software_node_register_node_group(nodes->group); +} + +void tn40_swnodes_cleanup(struct tn40_priv *priv) +{ + /* cleanup of swnodes is only needed for AQR105-based cards */ + if (priv->pdev->device == 0x4025) { + fwnode_handle_put(dev_fwnode(&priv->mdio->dev)); + device_remove_software_node(&priv->mdio->dev); + software_node_unregister_node_group(priv->nodes.group); + } +} + int tn40_mdiobus_init(struct tn40_priv *priv) { struct pci_dev *pdev = priv->pdev; @@ -129,14 +181,36 @@ int tn40_mdiobus_init(struct tn40_priv *priv) bus->read_c45 = tn40_mdio_read_c45; bus->write_c45 = tn40_mdio_write_c45; + priv->mdio = bus; + + /* provide swnodes for AQR105-based cards only */ + if (pdev->device == 0x4025) { + ret = tn40_swnodes_register(priv); + if (ret) { + pr_err("swnodes failed\n"); + return ret; + } + + ret = device_add_software_node(&bus->dev, + priv->nodes.group[SWNODE_MDIO]); + if (ret) { + dev_err(&pdev->dev, + "device_add_software_node failed: %d\n", ret); + } + } ret = devm_mdiobus_register(&pdev->dev, bus); if (ret) { dev_err(&pdev->dev, "failed to register mdiobus %d %u %u\n", ret, bus->state, MDIOBUS_UNREGISTERED); - return ret; + goto err_swnodes_cleanup; } tn40_mdio_set_speed(priv, TN40_MDIO_SPEED_6MHZ); - priv->mdio = bus; return 0; + +err_swnodes_cleanup: + tn40_swnodes_cleanup(priv); + return ret; } + +MODULE_FIRMWARE(AQR105_FIRMWARE); From patchwork Sat Feb 22 09:49:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt via B4 Relay X-Patchwork-Id: 13986576 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFAD7207DE2; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; cv=none; b=A3rAKMRGPY3+uyyiYG0Mq0oFqHN1ESv2RIeArbfvmsjiELO7+zt58Y0RHu5AIn6uKKQ5Kts596M+nM2jpkYyphlZU668iZtmqPN+sYb3o27ZEyojMOX53YCUFv/pa8WTyJ6866ti5lhUmmW8pd1xkxR592ykDfMfv6rwV0NGHEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; c=relaxed/simple; bh=UUrKsZhL5vFpLPiJahoOw4BGomfwKD+WZtupeV3XsXw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oV+AkV5vkMiuBp3MxM+/emG5eHhEshixyWq4Xtq8w8Vba1gpyf4na0XUtFT6nSr6GL06XwGRyFAJrEkL6jDNkGx40WOyGtFd3H6FKlA1vCbQe0IEroI8s5P7ziaweXRYGVUcYb0yL9wyCnSafOlCsM0/CdU9RU/n/FaMI03lQTc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NSFtABSA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NSFtABSA" Received: by smtp.kernel.org (Postfix) with ESMTPS id 47461C4CEF0; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740217802; bh=UUrKsZhL5vFpLPiJahoOw4BGomfwKD+WZtupeV3XsXw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=NSFtABSACY37IFU/bMWi4MP/BLYGhl3A5b5m7Wn6ETpJ5IREUJF60+wpCZt+J+LVW owrNv5Mfq3pWD3S4yAnAohuBiMav+RzJJ0c8e2a/JJC9HLo5n8w6QebDvUL6aLsbaP tlhvzk9tLV9iNDvoRdhhL4YYpgMUljIXYcyuDbsg7YpA2r75zPGZwnYWhZaYu0a//J xN5yBu1S44uGPZKbSFavO7A+p+sthpFpGcu6NgS0IRt4JDju/KXbbR7rMYxdSw1EtI p3euivgPNfmMV1Ul9yvFs9zpdU1ZOstMLsLxe6RSFHRhV58FYgV6ezyCWD5Ml5HUtq hrgqpjFff/48g== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DAA5C021B5; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) From: Hans-Frieder Vogt via B4 Relay Date: Sat, 22 Feb 2025 10:49:33 +0100 Subject: [PATCH net-next v5 6/7] net: tn40xx: prepare tn40xx driver to find phy of the TN9510 card Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250222-tn9510-v3a-v5-6-99365047e309@gmx.net> References: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> In-Reply-To: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , FUJITA Tomonori , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hans-Frieder Vogt X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1740217800; l=1511; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=xOtJekI9s5IMvhzbCahEFjKDIz6Ma1CAyDfHNfBa2ww=; b=bGYiCcyxBeJj34gDRuTXXFoFjXIsd8mCYQ+2mPVrGxyVvF42Iv1R3VrRySBesSklPKKiEHtgD I/TmPtVaqfZCq5FobtbbD3M/Cij9zjPVH4QmRypbpWLFdv8xmNCEtMk X-Developer-Key: i=hfdevel@gmx.net; a=ed25519; pk=s3DJ3DFe6BJDRAcnd7VGvvwPXcLgV8mrfbpt8B9coRc= X-Endpoint-Received: by B4 Relay for hfdevel@gmx.net/20240915 with auth_id=209 X-Original-From: Hans-Frieder Vogt Reply-To: hfdevel@gmx.net X-Patchwork-Delegate: kuba@kernel.org From: Hans-Frieder Vogt Prepare the tn40xx driver to load for Tehuti TN9510 cards, which require bit 3 in the register TN40_REG_MDIO_CMD_STAT to be set. The function of bit 3 is unclear, but may have something to do with the length of the preamble in the MDIO communication. If bit 3 is not set, the PHY will not be found when performing a scan for PHYs. Use the available tn40_mdio_set_speed function which includes setting bit 3. Just move the function to before the devm_mdio_register function, which scans the mdio bus for PHYs. Signed-off-by: Hans-Frieder Vogt Reviewed-by: Andrew Lunn Reviewed-by: FUJITA Tomonori --- drivers/net/ethernet/tehuti/tn40_mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/tehuti/tn40_mdio.c b/drivers/net/ethernet/tehuti/tn40_mdio.c index 173551ace1941bf825c9b3d1acd16be24b35eb84..f08e6d5cf2bb0091e209214ef6aca186503c48de 100644 --- a/drivers/net/ethernet/tehuti/tn40_mdio.c +++ b/drivers/net/ethernet/tehuti/tn40_mdio.c @@ -199,13 +199,13 @@ int tn40_mdiobus_init(struct tn40_priv *priv) } } + tn40_mdio_set_speed(priv, TN40_MDIO_SPEED_6MHZ); ret = devm_mdiobus_register(&pdev->dev, bus); if (ret) { dev_err(&pdev->dev, "failed to register mdiobus %d %u %u\n", ret, bus->state, MDIOBUS_UNREGISTERED); goto err_swnodes_cleanup; } - tn40_mdio_set_speed(priv, TN40_MDIO_SPEED_6MHZ); return 0; err_swnodes_cleanup: From patchwork Sat Feb 22 09:49:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt via B4 Relay X-Patchwork-Id: 13986575 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFA5C207A3F; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; cv=none; b=N9HKf71kdiujin/O0VBm0wYH9lC7yuC4Wq+fvzIosidvCETcuFI+VTwppeW/DzKJ6VinJaSJ7iRO+WezarNHn5p4rbnRCAscyg4yy8roVmZzL7aDUAUCemPiYVS8/mw9xPibsZojNtMjlC0enQFv0VKd6HKggdeELR2N2H9Q23A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740217802; c=relaxed/simple; bh=93+PXTcdrckZb/2Nnne1jF/O10OyK0HSaybtl4UJ5hA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jeXSGnXGwL+6QpTrsKr3oyt8qA7OXP+L2xYe2rbinaqGyxYWOHqk1hwjp69UXag6NDCxHlkbNuAJoRNHAOcY9x+JYbwjk/NQzk2L/sEC1qJPOsso+DPXRmat2OVqt3vfNkyrP5qnAfWimvOVCgEhV8kK+/P0zKzYDoQ2G3cjqEc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BUb8T5z0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BUb8T5z0" Received: by smtp.kernel.org (Postfix) with ESMTPS id 5D934C4CEEF; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740217802; bh=93+PXTcdrckZb/2Nnne1jF/O10OyK0HSaybtl4UJ5hA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=BUb8T5z0tb0zj9lYbiAg8nCjTUfSGkmRTdGKFgoEy4xvYoJa9dSVTwycj2WHkzy3V 7Zst8V6naVDR8lYPZD8C8Qx5xj6B1zEYpL3XFQ793OUnLgM5jFMdXEMRGlYYP6flBw k3o71qwBxfnH4unSIZP4CiZPTUInir8pmLLnzLYVf3jgyHAymBOa0cKv3rdTX2oZX7 9mL7WsyGmrBFUSVdn/qNYvmNWR0M4LPjEuAT6FwnzJqyHEajX+fvwhLtpI9SMGQOL5 598JD9usVYyvyOgZir1wzlb+rAJOLVk26AFKPikfYUz+UBI7VLoyBlL5SP1QRDLVV1 6DW8V+EoeHbGQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50C60C021B2; Sat, 22 Feb 2025 09:50:02 +0000 (UTC) From: Hans-Frieder Vogt via B4 Relay Date: Sat, 22 Feb 2025 10:49:34 +0100 Subject: [PATCH net-next v5 7/7] net: tn40xx: add pci-id of the aqr105-based Tehuti TN4010 cards Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250222-tn9510-v3a-v5-7-99365047e309@gmx.net> References: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> In-Reply-To: <20250222-tn9510-v3a-v5-0-99365047e309@gmx.net> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , FUJITA Tomonori , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hans-Frieder Vogt X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1740217800; l=1329; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=dE9RmcpNBtcvMxg1vX89VIDp9W8qYafc8S1ojRZqfFQ=; b=Jca7171c2uczNOMWGlSjnywuy7MH4h3qJirWdBJgy1NgIZl6wUT0ArOXOYPo6xeFox8EG50uG FBwaZOTvq9KCcieSWwSm6BiO+AnNBJqM4JsTOcpkAzU+wp5SYbs5IE2 X-Developer-Key: i=hfdevel@gmx.net; a=ed25519; pk=s3DJ3DFe6BJDRAcnd7VGvvwPXcLgV8mrfbpt8B9coRc= X-Endpoint-Received: by B4 Relay for hfdevel@gmx.net/20240915 with auth_id=209 X-Original-From: Hans-Frieder Vogt Reply-To: hfdevel@gmx.net X-Patchwork-Delegate: kuba@kernel.org From: Hans-Frieder Vogt Add the PCI-ID of the AQR105-based Tehuti TN4010 cards to allow loading of the tn40xx driver on these cards. Here, I chose the detailed definition with the subvendor ID similar to the QT2025 cards with the PCI-ID TEHUTI:0x4022, because there is a card with an AQ2104 hiding amongst the AQR105 cards, and they all come with the same PCI-ID (TEHUTI:0x4025). But the AQ2104 is currently not supported. Signed-off-by: Hans-Frieder Vogt Reviewed-by: Andrew Lunn Reviewed-by: FUJITA Tomonori --- drivers/net/ethernet/tehuti/tn40.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/tehuti/tn40.c b/drivers/net/ethernet/tehuti/tn40.c index a4dd04fc6d89e7f7efd77145a5dd883884b30c4b..aaad40c916ef83f457e1b5983c01dff2de148fea 100644 --- a/drivers/net/ethernet/tehuti/tn40.c +++ b/drivers/net/ethernet/tehuti/tn40.c @@ -1835,6 +1835,10 @@ static const struct pci_device_id tn40_id_table[] = { PCI_VENDOR_ID_ASUSTEK, 0x8709) }, { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, PCI_VENDOR_ID_EDIMAX, 0x8103) }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4025, + PCI_VENDOR_ID_TEHUTI, 0x3015) }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4025, + PCI_VENDOR_ID_EDIMAX, 0x8102) }, { } };