From patchwork Fri Nov 17 10:05:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Marko X-Patchwork-Id: 13458744 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VhASmIP3" Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF45FA6; Fri, 17 Nov 2023 02:08:52 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-53e751aeb3cso2598846a12.2; Fri, 17 Nov 2023 02:08:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700215731; x=1700820531; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=EbmgR2wWjkRCjoHXAmGAF8yTKa5Bp0SAasTthhu3X1w=; b=VhASmIP3iTphEAWMfz1ZyJ8teYhhq70fay9LNZzcNhpIeSnGDnXxJIvk9C07CS38Wf T6xqW6kxM0wIrUwDDmXiORQBAAmQbAVNLXwQpXZWdc0qmqGsskqki9g1aEWTKR7iAozP F6ji+yLJRPt9YVKNvCNj2AehyfC1sITgkqqdAIWI7U3f+D1uJzTp8iseDXdVPScMqpQT 2qMj1rUh4KnnSWBfM/RnOOJQctxzXBXNzc4z8UzYLmVlTRRDsI1W1wxGrUgHrJnNkbik 0G+CdXgC84dMeWuprD8tTzqqBTKQnQTNaAN53y08IhOQiU6fCIiUCsGUppoBEGMYA8o3 7hWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700215731; x=1700820531; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=EbmgR2wWjkRCjoHXAmGAF8yTKa5Bp0SAasTthhu3X1w=; b=QxvjRoMAr87X0XFfh1gBXRBKVosuD9pIJi/8vGtLLt+zaVoeVe6DqLGk3IbFrXxlLE bb9yREnmZahY37y3lW/znnmIrCJXcyRK3leZzhcdu3wnthHR3u/Uw4B7HOX9YtIWPF9q xa8UiFdLs9gjuKQ9+1qAYtRZCc6uCyGA2TysE4NDmdBMM2Utyu4ggGPlYNTW6dnuo5oS O15XOjH6R51kcqP3Bb14mJ/MWByE5w/OBwxO8QyHsl8+Ig8YZX49ob0M7TawtfFzsn8M ZER1r05tjRprwnrSbhd+taiiooQS28ORxEW/NXykKYAVmTi3+gOLwvol5JdQvENnTw0L rEHA== X-Gm-Message-State: AOJu0Yz4/DtRs1ryHuea1fZFLGcvVXF69rjKiUe6LgUpv8wOHbQZUMTW r/n9LshexRu+TCk96RiQAyQ= X-Google-Smtp-Source: AGHT+IECgkxdQdU9bxD60OX+sU3zhWfKV3n8cBsWD4ljTBzUxmLZEmKXWQeY91gOusS4DVmThHuXFQ== X-Received: by 2002:aa7:d801:0:b0:545:5601:414e with SMTP id v1-20020aa7d801000000b005455601414emr14671872edq.5.1700215730944; Fri, 17 Nov 2023 02:08:50 -0800 (PST) Received: from fedora.. (dh207-97-146.xnet.hr. [88.207.97.146]) by smtp.googlemail.com with ESMTPSA id n26-20020a056402061a00b0054358525a5bsm554368edv.62.2023.11.17.02.08.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 02:08:50 -0800 (PST) From: Robert Marko To: andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ansuelsmth@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Robert Marko Subject: [PATCH 1/2] net: phy: aquantia: validate PHY mode on AQR107 Date: Fri, 17 Nov 2023 11:05:04 +0100 Message-ID: <20231117100848.424372-1-robimarko@gmail.com> X-Mailer: git-send-email 2.42.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The Aquantia driver is not setting the PHY mode itself, but it does however still check if the PHY mode set in DTS is one of the supported modes. However, the set PHY mode does not have to match the actual one, so lets add update the PHY mode during .config_init and warn if they differ. Signed-off-by: Robert Marko --- drivers/net/phy/aquantia/aquantia_main.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c index cc4a97741c4a..7711e052e737 100644 --- a/drivers/net/phy/aquantia/aquantia_main.c +++ b/drivers/net/phy/aquantia/aquantia_main.c @@ -505,6 +505,21 @@ static void aqr107_chip_info(struct phy_device *phydev) fw_major, fw_minor, build_id, prov_id); } +static void aqr107_validate_mode(struct phy_device *phydev, + phy_interface_t dts_mode) +{ + int ret; + + /* Get the actual PHY mode */ + ret = aqr107_read_status(phydev); + if (ret) + return; + + if (dts_mode != phydev->interface) + phydev_info(phydev, "%s mode is set in DTS while %s mode is actual. Please update your devicetree.\n", + phy_modes(dts_mode), phy_modes(phydev->interface)); +} + static int aqr107_config_init(struct phy_device *phydev) { int ret; @@ -528,6 +543,8 @@ static int aqr107_config_init(struct phy_device *phydev) if (!ret) aqr107_chip_info(phydev); + aqr107_validate_mode(phydev, phydev->interface); + return aqr107_set_downshift(phydev, MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT); } From patchwork Fri Nov 17 10:05:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Marko X-Patchwork-Id: 13458745 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XvzdDW0s" Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB707C1; Fri, 17 Nov 2023 02:08:53 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-5482df11e73so924953a12.0; Fri, 17 Nov 2023 02:08:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700215732; x=1700820532; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qkMOHJc0OcMmrqNaANsP5Qp8DkKGD0Xp7KJHYY+XOZs=; b=XvzdDW0sRMHzXueMg0eHjspxUcFzEJPGrHvxFTPcCasCjCcwPKB4Xgj/nPOBwq/8/P UHjLaIjpjNb39l8SwcTyK+qtUnMTQrtkcYAVz+YN9X9eqkEvLexIwsEkAvJEdDYDNOxz KWZWYsY10Uap3jwrR0FuJUAkGeCtjvVCT/qdQOXzhGP3xYb7wuWm648ouE3gI2TvhGQl 0vzXyvV+bp7ilkFbKdr4Dddls+tCZ5rbOX5E5W7u3hkMeSs9fRvmIqjw6fF0ruDMg9yL 0VmThdy849m738EKnwmWsjsC/pVVAHZ/y+4rXD3PqYqyxbYazE9gH5+D4EwJMzsvqwgl nqfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700215732; x=1700820532; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qkMOHJc0OcMmrqNaANsP5Qp8DkKGD0Xp7KJHYY+XOZs=; b=F+fB3Uo9/fjW0pKoJH7bNd6WOWO6dfq8vl6OwfQoX1dQ3irsro2eWopUS1KLMCFqAC /1CxrJMXa+fxkZkIj08Um7YTg8W49O/I0fIVoGwQDhSq0/x/7m6QpH++MAJU/54p0Xuo 1ptq4LR2U/B7WOPcgy02icbVdBthF6FVjK0WM6Zfl0EDeWUuZluOsAKj19wY/A2c8ljT 4DoUYLa781tD873KtJxlZ2pCtxByajMxMLK8OQEwTc9mq3+x2zizvp5X5sFc1RXVXq2N PlFGa08pGOnxDCxJKX+DD/SGm7fVgw2i0vbNucb4BdxaiKMN5MLC+LAZDexHu40PjCNY 3Lsg== X-Gm-Message-State: AOJu0Yyd9ZdlUQ6Gt/n0srRd2JLuLgGohfS39M1Oa2XAY7DAKMmVOgu0 x/GKDHUFziVLA94cHLLqmp4= X-Google-Smtp-Source: AGHT+IEXFgmjWud9XyeYKnvw0NYmjgEYy4RVIYs041mCHThwIfWZcP4Z8jQlyhW9ixt9GcFYE18bBg== X-Received: by 2002:a50:ff10:0:b0:53d:a7d9:5149 with SMTP id a16-20020a50ff10000000b0053da7d95149mr10863567edu.6.1700215732251; Fri, 17 Nov 2023 02:08:52 -0800 (PST) Received: from fedora.. (dh207-97-146.xnet.hr. [88.207.97.146]) by smtp.googlemail.com with ESMTPSA id n26-20020a056402061a00b0054358525a5bsm554368edv.62.2023.11.17.02.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 02:08:51 -0800 (PST) From: Robert Marko To: andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ansuelsmth@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Robert Marko Subject: [PATCH 2/2] net: phy: aquantia: enable USXGMII autoneg on AQR107 Date: Fri, 17 Nov 2023 11:05:05 +0100 Message-ID: <20231117100848.424372-2-robimarko@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231117100848.424372-1-robimarko@gmail.com> References: <20231117100848.424372-1-robimarko@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org In case USXGMII is being used as the PHY interface mode then USXGMII autoneg must be enabled as well. HW defaults to USXGMII autoneg being disabled which then results in autoneg timeout, so enable it in case USXGMII is used. Signed-off-by: Robert Marko --- drivers/net/phy/aquantia/aquantia_main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c index 7711e052e737..c602873052a0 100644 --- a/drivers/net/phy/aquantia/aquantia_main.c +++ b/drivers/net/phy/aquantia/aquantia_main.c @@ -26,6 +26,9 @@ #define PHY_ID_AQR412 0x03a1b712 #define PHY_ID_AQR113C 0x31c31c12 +#define MDIO_PHYXS_XAUI_RX_VEND2 0xc441 +#define MDIO_PHYXS_XAUI_RX_VEND2_USX_AUTONEG_EN BIT(3) + #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 @@ -545,6 +548,15 @@ static int aqr107_config_init(struct phy_device *phydev) aqr107_validate_mode(phydev, phydev->interface); + if (phydev->interface == PHY_INTERFACE_MODE_USXGMII) { + ret = phy_modify_mmd(phydev, MDIO_MMD_PHYXS, + MDIO_PHYXS_XAUI_RX_VEND2, + MDIO_PHYXS_XAUI_RX_VEND2_USX_AUTONEG_EN, + MDIO_PHYXS_XAUI_RX_VEND2_USX_AUTONEG_EN); + if (ret) + return ret; + } + return aqr107_set_downshift(phydev, MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT); }