From patchwork Sat Mar 22 10:45:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt X-Patchwork-Id: 14026293 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 0141C73451; Sat, 22 Mar 2025 10:46:08 +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=1742640369; cv=none; b=sa4PZIfHAHzBUq1FAadrYB26wRVqCN6I7SSu2mz+jK+Rv0pKnta2lgqrSvVILLVI7U6xR1A8r8D7G5FqY61gJFS93HaceNsaoOU//I68hnW4oualby/jGEQoMdXHYwI5VAdgQODHRL8OULNLehoQJfD/hcSsMfpijp6C7/YSBpI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742640369; 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=TVpR1irj+a0twimq9ymACsGB6MyCHh/1xmpOjXT2B8E/UZXnEMh3rmKghKHhn0qx02PkywALer3MhJjEevUp7h1j/0zth0kwcegDegf4zJxTHfjMRjk+Cm+01BJmjfip20hLP4zn5bf0e38uYq8xN8N0cIGYZIC3QAgexk+lPI8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mlVONfNv; 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="mlVONfNv" Received: by smtp.kernel.org (Postfix) with ESMTPS id 851B2C4CEEC; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742640368; bh=z15Ls+N2f4qhQa8zHLA/8pAS/OD9DivM6Ks6EyIuxMQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=mlVONfNv7v6lOm0FHNJ2Wy9ud/b7QpZH6RKeU0xASISajt7AE5QVFwO3io5Zkw3T5 4453uH0a91K0cGvcyYh/6ul1PTOvF5K78ob1KC8Z3YMqF0n5FWSUZzF/Nmb6bc+bKk tlvM3+ySlW4Vrz+sP6NqxPWht1EFvNLSakl8x7KrTsOBht8vADCM8pTGiAZx1tnDNC Y6LqjOWzsd11W9IXOkpNv1+8sUEC6A89xo1tsAMfiOsXRzzs3pIBLDRN6OZAQCQZjU wV6LR4hWhoOjv6+bntSbhEr7r9gl2dkBv2Ac6Wggyy4ajzhcu/hq0T7t3OV0UTRT+k dh+O48YmRbFOA== 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 6FA4EC36002; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) Date: Sat, 22 Mar 2025 11:45:52 +0100 Subject: [PATCH net-next v7 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: <20250322-tn9510-v3a-v7-1-672a9a3d8628@gmx.net> References: <20250322-tn9510-v3a-v7-0-672a9a3d8628@gmx.net> In-Reply-To: <20250322-tn9510-v3a-v7-0-672a9a3d8628@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=1742640367; l=1936; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=eboV90jxD+Bku0BOXjDGCNU60DTUE9kSyEbR0D3C8dU=; b=yODUcpSruP6Prn/8AAbwj8cpTWqNAPLgfym6lscc+Rxx9ioXqQomJgtb+WBzveF7mQb8VCzNo Ki8EAabHm94CIXeA/62fgaLZKx0u5WUZqZRl58mmfcZGEhcM1tox9ll 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 From: Hans-Frieder Vogt 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 Reviewed-by: Andrew Lunn --- 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 Mar 22 10:45:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt X-Patchwork-Id: 14026292 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 014BC1E98EC; Sat, 22 Mar 2025 10:46:08 +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=1742640369; cv=none; b=ao5f+D5BfmY8ikXcMm6HB0hhsP6Jn/FwAVMQQnbDn+GZ/qKW4f9dgwauWDLNAdTGeObNsnTODhaPJGdZVSA2IPx8Uq9nkac0LWMOYoNLtg17stgb/viHFz5Gy5tpEWr1AFwm5P3VjsoSWNRk8497OtgLGRfFprWR5M/9Ay5emsY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742640369; c=relaxed/simple; bh=YMuS4jq16SQY005HovXWqkuXwTsXCArwDObAf38rCgY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=luoqY3xxGl+K26q6c3t1OP5OtDkor7oJimSbFlSyyBhXrGW915t5DeAcjkx8QNAV9VlmC86M5BOCOm6UvBqRoRURIfUIr6G1KCV8xkvV3WGE/eB3vuq76CIoxdsMjsI4EXjBQTJ8qp+OXUjGjtcaRFzMoacw7bNCfy/vgPB6KJ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qN+FPRGv; 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="qN+FPRGv" Received: by smtp.kernel.org (Postfix) with ESMTPS id 8D8A9C4CEED; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742640368; bh=YMuS4jq16SQY005HovXWqkuXwTsXCArwDObAf38rCgY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=qN+FPRGvQ7jrD4mY8K9/+cs0SmExkL6nMTsNey0vo8ttPRIr0UXe4ZSPAsNisqIJF ASAch7CpEVr3/Rqn7EmOa4FOSOExQxMW6tbvrZMDKR6Ut98p0LwEiNgiBJw+tkkg6n So8ZmSBVLPw/mqOnIO3XFzQOVn33W4dafVkOnRbds5m1S1WjGdUE0zv83pfWcXDhUW 9BqbUknTVz3vt9ab6ToZ46WZ5HEbHX8anYBUHeDG63Zl6l8rNwp5FMxefMFciRC41t +LeetMDV7DjsIN6paHbwVMLkUWR/GGnH87wmSQCgueTsIWicONW7eqUsJ+bIwmFImn QASVbZiGTxXuA== 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 7FCE5C3600A; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) Date: Sat, 22 Mar 2025 11:45:53 +0100 Subject: [PATCH net-next v7 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: <20250322-tn9510-v3a-v7-2-672a9a3d8628@gmx.net> References: <20250322-tn9510-v3a-v7-0-672a9a3d8628@gmx.net> In-Reply-To: <20250322-tn9510-v3a-v7-0-672a9a3d8628@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=1742640367; l=900; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=vEeavGZyiKSDFemLfNRy5gMMBOs/2nb7oTqi4HS4XIQ=; b=NrBz3etyWZ8DkFcMAlVhUSvqUGbeYUtAKAjnx9by5Hve6YA0Nt0I9itwtk9xMmfGuewQHOJjm A76ERMrz8R0Ae5cIcH7RWbuQHAlYZNA0+qjTCmvjrKyk1Om6WkrCBmZ 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 From: Hans-Frieder Vogt 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 Mar 22 10:45:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt X-Patchwork-Id: 14026296 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 220F01F1513; Sat, 22 Mar 2025 10:46:08 +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=1742640369; cv=none; b=Mw8124rkdLIejuzI9gG2nferWId7SrOtx6FV+O966mXNLOqzTDsFTm8/O6OH0hHuLexvabZ/Bh+qsXokfVayksqUlVg5PDmm/67rvRCwWj30F4nRkNXc8ck4N34beuYh9KjZTUwJacjGBP6XvAg6REAcFm9EnJSxcE/JGWLwptM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742640369; c=relaxed/simple; bh=uVlmDwv5wWEDBvC4S2R9sJZkHok3EH5U4Ugh6RJb8xM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=P6T40J7rl92IEm7xt0PtrcExy8GwJfHXxNYKmkqgW8t2H9NiTXgAD2JiPJuaP5Z1QklErTfjxCJzJm9nO3Pq3PL6tR/vMejQVzfAp2D17Bfv/6zU8YBarByIYZY+cCQVlJDJNsy6tKFgT+D1+Kf/Bt/qXWk8CLX0uSyf4SkHWew= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I2ha+JQY; 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="I2ha+JQY" Received: by smtp.kernel.org (Postfix) with ESMTPS id 9795EC4CEEE; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742640368; bh=uVlmDwv5wWEDBvC4S2R9sJZkHok3EH5U4Ugh6RJb8xM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=I2ha+JQYe3dzev/q9ktnGVInz4y9JyTH+DDURH4ztWnOf75AO0/poddtzNt/el8Aj Sbah066bbnzQqWzhVtqntqgfBSC+fNmBKSUToiEsimmR8ah8Peil9EYctbyLcZJmqp ZN3EJ5Pf8yJBtEyKbtf0dDtUIxbbFhQdOgIRbrSew1PaS2+oY+Peeo3S9Uuk9MCCjj hr8TG8QF973JLYyHekhHRuyqCR5+YxUHc90qOp63DJ7FyKc9HTDXOtniC/8MNF8GJy 2Cwv/qsvLsaoDigrITmv/rde0UN+hUWa605XUIfnmFpYD1vcKCG3Hlp6ukzzP3ZcEk s9ZSxZyAhY5/g== 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 906BEC35FFC; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) Date: Sat, 22 Mar 2025 11:45:54 +0100 Subject: [PATCH net-next v7 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: <20250322-tn9510-v3a-v7-3-672a9a3d8628@gmx.net> References: <20250322-tn9510-v3a-v7-0-672a9a3d8628@gmx.net> In-Reply-To: <20250322-tn9510-v3a-v7-0-672a9a3d8628@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=1742640367; l=1169; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=0zRi7Vk41IU72s/8DzrXAvCvexTz79in+5DW1aumMeg=; b=sSuPYpE50VbUFZaI7BYuD57IHP6bJEcMIOy+tTBQ2MO78IvnFAjXubb9ejGSMd4ugpSBtfY5A 3OSA+wRq3s9DnQhxtHyRfXD8sWBdAxpFVEkR4y8pSEAnevNh/vCQfnU 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 From: Hans-Frieder Vogt 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 Mar 22 10:45:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt X-Patchwork-Id: 14026295 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 221481F37BC; Sat, 22 Mar 2025 10:46:08 +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=1742640369; cv=none; b=UvzrTJN8zNgE+ClC0Pg3s7/8L5DPGH4QWfYaxvXus+thOvwhCAViQiQhpTXl+AjH0JHbP/uQEg92m1ZWai+oNUsmXyJCQq9wNWcvWDrcERVufSNgKsONAaJkRWUvXbQjNighWJWrUFcLK92gb3ER9fQNbaw3OtY9WYj976ev/jA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742640369; c=relaxed/simple; bh=bGqettNRXZmJL4Cip7mfr4q6DE5gOjEM3LaboWk695c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AtYPCVRDu7yw2ejKAjwgBIrDctT9Nf+Aojcvmp9PPyr0OYMk/o10gxU4uhC3RrdUf2jHFaoRdXqv12XI8S2tVbdrb7K5MIy0fNijhI3EL5HBjKCjAvrETyv5U2hu/X6FIIXfFJMOecPzVEZJYaltCnpPJoJAynLIIXU0jyyZwSY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kaMhDkUE; 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="kaMhDkUE" Received: by smtp.kernel.org (Postfix) with ESMTPS id ADE87C4CEF2; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742640368; bh=bGqettNRXZmJL4Cip7mfr4q6DE5gOjEM3LaboWk695c=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=kaMhDkUE4QGkx1/gh1iWAYJDxu7kIQB/piPJ0e3hfEjCrlS7e5ZK3mnxoyQOJsUXo FOPzIljXJLvZ3xZwfx54vYXpTGBORChO/cF61BCA3i37OlE7E2jwNeCdw6CpKPFI/L LIpcgUBMsN1Y/wsL863NrU+VwVw2z4jVYH1joeDGNpZ7m5rtXvLqp9jkogV/VjfSMh fgjL8kkrMP8UzJTuVQ6BVaEBkEYimtbEQHqbQ5kQkEGD4PJe+aYPM2uZ+ik4zsK0q9 O7Aosm7QlbsqnMa+ilR6K8tSVOxLxwlITbKwUpe5Ijb0PNpCb0Yz634ZQQ7FmKQWp3 JkIJDJnXYaAuw== 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 A5393C36007; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) Date: Sat, 22 Mar 2025 11:45:55 +0100 Subject: [PATCH net-next v7 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: <20250322-tn9510-v3a-v7-4-672a9a3d8628@gmx.net> References: <20250322-tn9510-v3a-v7-0-672a9a3d8628@gmx.net> In-Reply-To: <20250322-tn9510-v3a-v7-0-672a9a3d8628@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=1742640367; l=8807; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=KAPiTdO3CDbhlRN/rWkN/yD2ZjIlwnsaWgECxpnc7+w=; b=IfKApVfKlhPsRCIC5lJPRLlqTQG3iqOA5BeEO9iJPP9JFMJ+Is0D7vJxos4zkDuCKaHUTbi3c BNBQngnMvX5Af2hlA5uSSi9uc+xMprl27I58fvYjoyp+pLsX4iaHUkK 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 From: Hans-Frieder Vogt 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 Reviewed-by: Andrew Lunn --- drivers/net/phy/aquantia/aquantia_main.c | 239 ++++++++++++++++++++++++++++++- 1 file changed, 237 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c index 86b0e63de5d88fa1050919a8826bdbec4bbcf8ba..08b1c9cc902b82f80be2023423f3257a1ae3aa60 100644 --- a/drivers/net/phy/aquantia/aquantia_main.c +++ b/drivers/net/phy/aquantia/aquantia_main.c @@ -50,6 +50,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 +334,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_setup_forced(struct phy_device *phydev) +{ + int vend = MDIO_AN_VEND_PROV_EXC_PHYID_INFO; + int ctrl10 = 0; + 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_RESV); + vend |= MDIO_AN_VEND_PROV_2500BASET_FULL; + break; + case SPEED_5000: + adv |= (ADVERTISE_NPAGE | ADVERTISE_RESV); + vend |= MDIO_AN_VEND_PROV_5000BASET_FULL; + break; + case SPEED_10000: + adv |= (ADVERTISE_NPAGE | ADVERTISE_RESV); + 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_setup_forced(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 +1144,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 Mar 22 10:45:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt X-Patchwork-Id: 14026298 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 2E9B31F9F51; Sat, 22 Mar 2025 10:46:09 +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=1742640369; cv=none; b=koKhbweisYEgDDxE1eP4w4IlJdZ/8vgSk4sGtiWg7DOW3CuNNmumYTkLGyeT7TsRAZhNGLMHG+Sdd5+EmQ01MUJLQdwmhamqFRCI+xmSVs7ZRG8nHkepSpylIt0u9KMWeO26CtIpKiSfXwoacAFqi6OfU1zm+azLFHR3Xbcc3Y8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742640369; c=relaxed/simple; bh=4ju8WRLxNHrxsF1h+5PX6FMW9F7XEfIhR7yFKL/lTbI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HJdKTJrBrhXLJsvAK6ddTnSH8ke9LCOsjNCAQpdvlX945MP2+9AmbpCYzvDpvqyarik/sbiwj+N0YCG4cA1igSWXKIcxHvPQZ83hA4LKQvNmEzDeEEanJi9LenpGOTcnVlC8ThXl6nih6rp4OlRmyfUP29DAngmam1/eu/Nqvsg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QJeXE+jp; 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="QJeXE+jp" Received: by smtp.kernel.org (Postfix) with ESMTPS id C1783C4CEF3; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742640368; bh=4ju8WRLxNHrxsF1h+5PX6FMW9F7XEfIhR7yFKL/lTbI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=QJeXE+jpg09aHkIzo8YBYVoRAvk7XpPSH7Yevq42eQ7MXTkihfRcBAARvZzEJNiYd i7guIr0YY4cdkp8qmj2kVnVv5mRKw1UupI0APEvJQovp308k3/Tev1kFIQ6COBBcTK CuHlfw0jihWBRAXNM+MamGLmTR3Jki9zMWVP6NIFDDMmeGtZBJfvnVI39+8DXVzWG1 eQNhPe0M5K+xLLOw3YXNTq0SrVj5K2vNQdJPwV2/F54SE5s6mpoP4bIGT9hxeI/Jtr nGNvbwUURoJ0wAj64TnsjTKgoD37rU0lFOqS76bn5Nq4537D1DCf6cgKp76PcBC3VD 2bkYSe8EEPs3A== 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 BA7F5C35FFC; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) Date: Sat, 22 Mar 2025 11:45:56 +0100 Subject: [PATCH net-next v7 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: <20250322-tn9510-v3a-v7-5-672a9a3d8628@gmx.net> References: <20250322-tn9510-v3a-v7-0-672a9a3d8628@gmx.net> In-Reply-To: <20250322-tn9510-v3a-v7-0-672a9a3d8628@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=1742640367; l=7232; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=kKphnWL61URtrcdQVqlXz7e/jcRNf9kollpPZcOzaNY=; b=YfONuevj63pIMJg837V+FQVhD5AbRsFSFBMnawvtSXplPV5j+YHde65eXQNiTCIBv5LIK/3h8 OhOz6zdlWfMATaEyOgiLOFxJNB6ttFjWwTAVmq2ix7pHFWu8e3D4GUi 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 From: Hans-Frieder Vogt 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 Reviewed-by: Andrew Lunn --- drivers/net/ethernet/tehuti/tn40.c | 5 +- drivers/net/ethernet/tehuti/tn40.h | 33 +++++++++++++ drivers/net/ethernet/tehuti/tn40_mdio.c | 82 ++++++++++++++++++++++++++++++++- 3 files changed, 117 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..25da8686d4691d31240333a5e69e95201c8f3d09 100644 --- a/drivers/net/ethernet/tehuti/tn40.h +++ b/drivers/net/ethernet/tehuti/tn40.h @@ -4,10 +4,13 @@ #ifndef _TN40_H_ #define _TN40_H_ +#include #include "tn40_regs.h" #define TN40_DRV_NAME "tn40xx" +#define PCI_DEVICE_ID_TEHUTI_TN9510 0x4025 + #define TN40_MDIO_SPEED_1MHZ (1) #define TN40_MDIO_SPEED_6MHZ (6) @@ -102,10 +105,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 +257,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..5bb0cbc87d064e3f697a88f5b96bc9a38a2ffd12 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 == PCI_DEVICE_ID_TEHUTI_TN9510) { + 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,40 @@ 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 == PCI_DEVICE_ID_TEHUTI_TN9510) { + 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); + goto err_swnodes_unregister; + } + } 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_unregister: + software_node_unregister_node_group(priv->nodes.group); + return ret; +err_swnodes_cleanup: + tn40_swnodes_cleanup(priv); + return ret; } + +MODULE_FIRMWARE(AQR105_FIRMWARE); From patchwork Sat Mar 22 10:45:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt X-Patchwork-Id: 14026297 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 625181FBE8B; Sat, 22 Mar 2025 10:46:09 +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=1742640369; cv=none; b=AdhbqLJR2gaFchy9kSsbGuuDi/+XUrm5dmrDC6fJ0Y9K8/J0uqvIjeVv066YeWj2JHe8lXQTh9q5bqZ1RWf0xMWw0Qu7cG2631S8RMYDQf+1JBQU/MvKrmLjOWj/s3PgZ5Ci52eHHr27T+ksR6mmsnIWs/PTpSbMJ83MbJeOzio= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742640369; c=relaxed/simple; bh=6YmQj1YxsDITToMqOPzQOdN+VpCzBrmn95W+WlkB1JU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SF3O8TdsWewQxEFxN4Cmn/qbxxo6Tg3xMbdmGbOXBIhozjLqoXiyLEq/f5J0Zm2GP5nT+edKP+FMWzJDsFAsZAaLT8Os+b+D4MVX2vbrymtpJY6Simt0LUNLAHyw1saoUAkSW2T9yaPaAw2neT40bkpu62V8T8agiThb+ydlzOc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=r//i78nL; 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="r//i78nL" Received: by smtp.kernel.org (Postfix) with ESMTPS id D4918C4CEF5; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742640368; bh=6YmQj1YxsDITToMqOPzQOdN+VpCzBrmn95W+WlkB1JU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=r//i78nLRLP52eGf7cJZlS1UvMff4Fx3rE6dkR8/iOkO26v5EjhbUK5iy2ZnvaPaP 63wHYavXuOelBVcqpfsDCFcEQieHl5ApdWOqIvVa/3b57TLs1q/Xqjfn60rewS3QMB EtXeCkChXZKEYCz1zkrm8Ae1NEoDV7xvNh+EtumjqGhUBPJrvjrcLIATiVPViIzkJx /U/MS7JzLQU55cMNE1wnWuEbpJfT/+Jg9VGNjyf+xwuln1bKiVQpBE+MCG1IcTtnoc 9LbYx2eACAt9imzkVpzG5wVMDz14NlervZxf1sKiSn9Ulr6T+qrV7uzoGly5/XPuGv MyR2ZxUmNI2Lg== 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 CCB5AC3600A; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) Date: Sat, 22 Mar 2025 11:45:57 +0100 Subject: [PATCH net-next v7 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: <20250322-tn9510-v3a-v7-6-672a9a3d8628@gmx.net> References: <20250322-tn9510-v3a-v7-0-672a9a3d8628@gmx.net> In-Reply-To: <20250322-tn9510-v3a-v7-0-672a9a3d8628@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=1742640367; l=1514; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=FHzhMDcYn0WJzfuyGOmQtKpwwoxyjDmyIphfAS+vBhs=; b=uQlQ8T5Hbx7d/6MmwN7+kijl2U1ZplgP0Ix453kZ3ck22Exwb2uSxqye1AQ/iR4p3qmBK4/nv xf5gH6Iw3AeDNco0sJqm5h/4IqjcWAALHkBQThKwFssRU1kAWis0GD1 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 From: Hans-Frieder Vogt 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 5bb0cbc87d064e3f697a88f5b96bc9a38a2ffd12..fb1a4a2e4dbc552a90934ab92300fcd98ef903c4 100644 --- a/drivers/net/ethernet/tehuti/tn40_mdio.c +++ b/drivers/net/ethernet/tehuti/tn40_mdio.c @@ -200,13 +200,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_unregister: From patchwork Sat Mar 22 10:45:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Frieder Vogt X-Patchwork-Id: 14026299 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 6246D1FBCB8; Sat, 22 Mar 2025 10:46:09 +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=1742640369; cv=none; b=EEFCDTRU76NbRkytUY4idTwx+iUp76Z8eyeMMgHlnF5us1qmUWGjrRIy01zVL1NJ0iLwB/zhIu9CQ8kbXykbMfBfiwh529PuSU8rWIcpk7n19eeb9e2I/8WCcs52tg8PryqIyral4teIJI+QbGUhb639w8ldCUS4+Cu/qcNyEhk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742640369; c=relaxed/simple; bh=WvsfIMCgFBv4pVF1dShM5iom4fQh6xwiwk9nAbHBOws=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WdwTBfNu+hvJ/OJDP6U3qxqyZmQmUG+bJNwPYIhFpwFpwmEd13VxOnzoI2o64FphO5ooiz3UDvJ3GpW9zg8Hc58GKV/zoXQI2n9ufiXwioyyXjySL9pBOzN0zfjBy9diKd/qJ0EftNGGuT+ZN3vbd+CD5RUTreEJ7Wpki6N89WQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sokCtSAy; 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="sokCtSAy" Received: by smtp.kernel.org (Postfix) with ESMTPS id E7597C4CEE9; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742640368; bh=WvsfIMCgFBv4pVF1dShM5iom4fQh6xwiwk9nAbHBOws=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=sokCtSAyV0oNiaHrxRyRH98M5aC+ElLAfurhvpG6jAfln73dsqObCOg1TP+YJHRzL Hx+gWDQQJiTIO3nlOIQuP7zGuB0Cz4qp+BRIQWtlJFEaDkGfbslMluSQ4/uUkQ5xha y54L9eqmV82wNRGz5YFgQL7dPQy6XNtnRioDgvSkIJ0Fx7i0PyM+LAX8BoBeTLYBAT p9H85tQ9JjxWp4AMXbYGwYZhTbjkSR/sQuH3dvycjPnctSxNGyF4xH3R4IixlE8vSS 2/xvGvGN+stn1geuXWfsbLYdz9o5fWyG0lnQjtQJ11vwNPjsz2xgHxhleaQxrb6mGN 2IocdklnVhlhw== 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 DD6EBC35FFC; Sat, 22 Mar 2025 10:46:08 +0000 (UTC) Date: Sat, 22 Mar 2025 11:45:58 +0100 Subject: [PATCH net-next v7 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: <20250322-tn9510-v3a-v7-7-672a9a3d8628@gmx.net> References: <20250322-tn9510-v3a-v7-0-672a9a3d8628@gmx.net> In-Reply-To: <20250322-tn9510-v3a-v7-0-672a9a3d8628@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=1742640367; l=1270; i=hfdevel@gmx.net; s=20240915; h=from:subject:message-id; bh=PWNMuGZpqBv+vmVUoj6REOMISB+bfZAmxP1coZ2ZFQg=; b=WsBBv9kNz/emyE5iuDsO6UJOghCNbGwmqJVuOZp841cWIRa7zZxzy6WrMmt3e/iine+x06AW8 ihuJiJ3RUROCV3Z9hDqKXud8C4+3vVOEnREANMaRAApB/55tLe67Uf6 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 From: Hans-Frieder Vogt 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 --- 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..558b791a97edddc86923f121f5fd75d9f910ac79 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, PCI_DEVICE_ID_TEHUTI_TN9510, + PCI_VENDOR_ID_TEHUTI, 0x3015) }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, PCI_DEVICE_ID_TEHUTI_TN9510, + PCI_VENDOR_ID_EDIMAX, 0x8102) }, { } };