From patchwork Wed Jul 3 18:14:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 13722682 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F217188CBE for ; Wed, 3 Jul 2024 18:15:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720030512; cv=none; b=j8KCeom3qcB08O2ghiR57Qd5sxViehcZhcHy7E1m7OBJ+KvEv/SZqUe6LLyWcHURNsmz17DIt9YokROiwYGZxW8ZQ2PAnwngRWuM1WMQTyhQd2UxwnX5WVydVx8//eMS2KS3D4k9aTHp0eri+lyk4K0Eum8WqgdcBiPXiQywlsM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720030512; c=relaxed/simple; bh=Nzm1nEbgG1D0fKsu4Slvc8dGgaXYua6EPR3wbZL6IJQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YleZXBEhGzU+GYZ2GzuP482sC19qTRcLMlNYScYCSkpFrUgMr0NuqI+vuiSds031vZUFoCP/k2EFmgPZfybpycs0W6eQ4n8UtuCJ8cF2sqAsmPhd0mpdGUNF74iT1UswsTF//Ri2iEyxGkL8qgDO+kcBgxTf3BXwkmfLBExJjB8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=0TGKb5gA; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="0TGKb5gA" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-42564316479so34998545e9.2 for ; Wed, 03 Jul 2024 11:15:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1720030508; x=1720635308; 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=sxu9SpdSTVz3ebvxMLh70e0y0HDyyRtIxZX5+1VZmbE=; b=0TGKb5gAt2SAnpMGpEjqfITXlMPG60r/lvwJ0UBmC8GfjCkXx66SePUWfPAjjxbfEe Jpbt24EN9BF4l3pkuY6xKYUlnUnSrQMf1sJvsFDna0RudrxDA8d3LbnThJ2KQCXj1nNE A54L2kuhQNGDZFBgfbVE+rSnybbfJTomrqFoMJUGwOLxXYxBMJRUe+vjNSTcSzqimp9i uCBaAHXCvZhHX0+/XixWjqrhVvimU+4rdB/VcnGbKWFjbyrN4WHvzPqsC8lA4n1xpAqX 8weFX8neOdL5cX7XWtMuh36oSwouo9JcmHMfnh6N5MjntPMi2WjXN7qDM48BughbAR/o pjiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720030508; x=1720635308; 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=sxu9SpdSTVz3ebvxMLh70e0y0HDyyRtIxZX5+1VZmbE=; b=iRbyZ23nzdIJ0h/W+9oO77rGOr/LF1/4v8WHU/jpZVQLVYgG2/H4n9Hrl17Nu+d24d 9jSs1f2GjKRwSld0j0nkZ1m9joE0Ut3wjDNDjaCibzGB/KQkpiCSTwmFKpp7UQRM/gUx 21tlQ782TRAwZqbiM5mj6Z3owNUxCyrx5VUmseg9AlDHDufojs4tII2eHPPr0tmgwDNB PS0S+cvEP0OJQHOysnZ2l+FRjFhP2/K64gFidHiq5XZLl9nFIPdY+e9Le6bHUYTkfJjq ijOIQN06DlqjWe02uszzYsakkLYsLxI32zt46v598v6or7+aeipoBFo3DayBoMUL7YXh k2nA== X-Gm-Message-State: AOJu0Yw8nKcpR468cbhx4L9Qar0drvTpSo3/vSywfCXL+84FbRrhOmvJ yowVJ/1vBzxpmotB1at6yI49SLO7gL19zkjkPS6QAdmRljltj77hAiiZ8ingiwg= X-Google-Smtp-Source: AGHT+IEjkf41YeErUSmpNJnOMi95oDdVEgwvmMm7MFfhiFw5YUppyz+R82Mw2+TluKNGgFxKSGI00w== X-Received: by 2002:a05:600c:3b1c:b0:424:a74b:51c7 with SMTP id 5b1f17b1804b1-4257a02180cmr81882125e9.2.1720030507898; Wed, 03 Jul 2024 11:15:07 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:dc:7e00:c37f:195e:538f:bf06]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256b0c0f26sm245178845e9.39.2024.07.03.11.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 11:15:06 -0700 (PDT) From: Bartosz Golaszewski To: Andrew Lunn , Heiner Kallweit , Russell King , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH net-next v3 1/2] net: stmmac: qcom-ethqos: add support for 2.5G BASEX mode Date: Wed, 3 Jul 2024 20:14:58 +0200 Message-ID: <20240703181500.28491-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240703181500.28491-1-brgl@bgdev.pl> References: <20240703181500.28491-1-brgl@bgdev.pl> 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 From: Bartosz Golaszewski Add support for 2.5G speed in 2500BASEX mode to the QCom ethqos driver. Signed-off-by: Bartosz Golaszewski Reviewed-by: Andrew Lunn --- .../net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 80eb72bc6311..91fe57a3e59e 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -665,6 +665,14 @@ static int ethqos_configure_sgmii(struct qcom_ethqos *ethqos) return val; } +static void qcom_ethqos_speed_mode_2500(struct net_device *ndev, void *data) +{ + struct stmmac_priv *priv = netdev_priv(ndev); + + priv->plat->max_speed = 2500; + priv->plat->phy_interface = PHY_INTERFACE_MODE_2500BASEX; +} + static int ethqos_configure(struct qcom_ethqos *ethqos) { return ethqos->configure_func(ethqos); @@ -787,6 +795,9 @@ static int qcom_ethqos_probe(struct platform_device *pdev) case PHY_INTERFACE_MODE_RGMII_TXID: ethqos->configure_func = ethqos_configure_rgmii; break; + case PHY_INTERFACE_MODE_2500BASEX: + plat_dat->speed_mode_2500 = qcom_ethqos_speed_mode_2500; + fallthrough; case PHY_INTERFACE_MODE_SGMII: ethqos->configure_func = ethqos_configure_sgmii; break; From patchwork Wed Jul 3 18:14:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 13722683 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7557D18A924 for ; Wed, 3 Jul 2024 18:15:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720030513; cv=none; b=snsovkhyqP8wWbAPakEIIePtFstpXTGCZCG1SXPPDzoyOBmQWJGpNAOdP9qrQkOAWblZxMOUgVlp/Kx3upl/j+z+c/WIRatp62pMQVodf36p/Og999MXp/2MQcOQCKmYFRK7dA7L8dqF/wkAP1j8U8Z8YREvhMGxFLdkhLCryok= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720030513; c=relaxed/simple; bh=OhayV8asqA4tlrZmqZAr3hetao9MUBRw+6Zcnt3ZjBc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DTCHTbjot2H3UM8+hDY/XksnIitRQEvh7YqJczKNVsN8CRRgh0zqVo9qfS9YHjTaRy8ftAzQspXydLZDhlD8esqMI3TlzGgI8xzQNOnlxm5t4cPMSiAE8PAlhlz+IDwW0Sl75gTPjjbRnzaJcsCgK9T2yJJkUVZnt4rxDw+lzKM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=11TkfX+q; arc=none smtp.client-ip=209.85.128.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="11TkfX+q" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-425624255f3so6455045e9.0 for ; Wed, 03 Jul 2024 11:15:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1720030510; x=1720635310; 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=ASQg5AvNQNadFvEbt3zujicewyUwPXC5PJaL2UVk5WA=; b=11TkfX+q9zyJ2bLBWAZuFpQQ7ObApFip11igdtfZYbEG7DKvP9hehES8ylmhh7VAdD ksexgBArqLjH3FGWTkT95SOKcdLbDM0gu+66QM9MGLfXxJY7TM4Hma/Ji+cXWS4lrnfs ZvkfyicaeGC1oeCPoUehPFRL8cotZgecmYyxnB3ywTN8Vprg9+Bbm8bKm378sNmqNuQ6 TugoMfsSY7SuXHASDTrJXT86MZRkHqtm32P/BKRBgHnDmnJMTzonTFNwvdiPe7wgS5Uy AKTOeJxvfDBQ0YpHgFZfeSsPOE2DmgeQCendut/a/NGJuk+uyes8uztaP+SX1077VtrX DkdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720030510; x=1720635310; 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=ASQg5AvNQNadFvEbt3zujicewyUwPXC5PJaL2UVk5WA=; b=iujXo+SjKbg7AHjIj1IbrEF/OsZpQBL8bNaFpcIlmVhvi7x4znJYbJasdJPYeIjHgg deejLT2yVizZ5B1Jm+v0N3YE4DLdL/bLSbrNd8M+o0GWrcMtQldvBKR0JPcktp9AHwaE 8AC7pjGo23deNeqX6u+WE6ywa3ed090vR4TzHO74H4kqjnSXWCl6bgiLi7OBpDQl1FwW hSZDRDRfhdOh5KRJioDoPqPnO0o4R3fcJUx/oTulOfdQXKrOt2NZye/s9TBqxCC4K+Bw NFrlZq3TWm9AzwHGLFkaLWl+iOE9XK6upHFStQUCtN9Ovc6vHL+72yULtwh4oAmnY11s lgkw== X-Gm-Message-State: AOJu0Yw8IABbNUaIAI2T8kFBZ+eyNbWg4EoZNr4oAZATFONZdQk5kDU6 XOVqzS6eMyVS9JQg7mZnpfluAc77xcvTFauFK84KZJqVNEBYKcvrp00hTuaHX8I= X-Google-Smtp-Source: AGHT+IHNlfmjna3tXbxnZXAgMVKod6UX7ashoHI1BYbx3wkqgqg5H0QXcmvLJ38mwLeb04u5JC3tOA== X-Received: by 2002:a05:600c:22d7:b0:421:8234:9bb4 with SMTP id 5b1f17b1804b1-4264093f1bcmr23484975e9.19.1720030509875; Wed, 03 Jul 2024 11:15:09 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:dc:7e00:c37f:195e:538f:bf06]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256b0c0f26sm245178845e9.39.2024.07.03.11.15.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 11:15:08 -0700 (PDT) From: Bartosz Golaszewski To: Andrew Lunn , Heiner Kallweit , Russell King , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH net-next v3 2/2] net: stmmac: qcom-ethqos: enable SGMII loopback during DMA reset on sa8775p-ride-r3 Date: Wed, 3 Jul 2024 20:14:59 +0200 Message-ID: <20240703181500.28491-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240703181500.28491-1-brgl@bgdev.pl> References: <20240703181500.28491-1-brgl@bgdev.pl> 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 From: Bartosz Golaszewski On sa8775p-ride-r3 the RX clocks from the AQR115C PHY are not available at the time of the DMA reset. We can however extract the RX clock from the internal SERDES block. Once the link is up, we can revert to the previous state. The AQR115C PHY doesn't support in-band signalling so we can count on getting the link up notification and safely reuse existing callbacks which are already used by another HW quirk workaround which enables the functional clock to avoid a DMA reset due to timeout. Only enable loopback on revision 3 of the board - check the phy_mode to make sure. Signed-off-by: Bartosz Golaszewski Reviewed-by: Andrew Lunn --- .../stmicro/stmmac/dwmac-qcom-ethqos.c | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 91fe57a3e59e..e46cbacc627d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -21,6 +21,7 @@ #define RGMII_IO_MACRO_CONFIG2 0x1C #define RGMII_IO_MACRO_DEBUG1 0x20 #define EMAC_SYSTEM_LOW_POWER_DEBUG 0x28 +#define EMAC_WRAPPER_SGMII_PHY_CNTRL1 0xf4 /* RGMII_IO_MACRO_CONFIG fields */ #define RGMII_CONFIG_FUNC_CLK_EN BIT(30) @@ -79,6 +80,9 @@ #define ETHQOS_MAC_CTRL_SPEED_MODE BIT(14) #define ETHQOS_MAC_CTRL_PORT_SEL BIT(15) +/* EMAC_WRAPPER_SGMII_PHY_CNTRL1 bits */ +#define SGMII_PHY_CNTRL1_SGMII_TX_TO_RX_LOOPBACK_EN BIT(3) + #define SGMII_10M_RX_CLK_DVDR 0x31 struct ethqos_emac_por { @@ -95,6 +99,7 @@ struct ethqos_emac_driver_data { bool has_integrated_pcs; u32 dma_addr_width; struct dwmac4_addrs dwmac4_addrs; + bool needs_sgmii_loopback; }; struct qcom_ethqos { @@ -114,6 +119,7 @@ struct qcom_ethqos { unsigned int num_por; bool rgmii_config_loopback_en; bool has_emac_ge_3; + bool needs_sgmii_loopback; }; static int rgmii_readl(struct qcom_ethqos *ethqos, unsigned int offset) @@ -191,8 +197,22 @@ ethqos_update_link_clk(struct qcom_ethqos *ethqos, unsigned int speed) clk_set_rate(ethqos->link_clk, ethqos->link_clk_rate); } +static void +qcom_ethqos_set_sgmii_loopback(struct qcom_ethqos *ethqos, bool enable) +{ + if (!ethqos->needs_sgmii_loopback || + ethqos->phy_mode != PHY_INTERFACE_MODE_2500BASEX) + return; + + rgmii_updatel(ethqos, + SGMII_PHY_CNTRL1_SGMII_TX_TO_RX_LOOPBACK_EN, + enable ? SGMII_PHY_CNTRL1_SGMII_TX_TO_RX_LOOPBACK_EN : 0, + EMAC_WRAPPER_SGMII_PHY_CNTRL1); +} + static void ethqos_set_func_clk_en(struct qcom_ethqos *ethqos) { + qcom_ethqos_set_sgmii_loopback(ethqos, true); rgmii_updatel(ethqos, RGMII_CONFIG_FUNC_CLK_EN, RGMII_CONFIG_FUNC_CLK_EN, RGMII_IO_MACRO_CONFIG); } @@ -277,6 +297,7 @@ static const struct ethqos_emac_driver_data emac_v4_0_0_data = { .has_emac_ge_3 = true, .link_clk_name = "phyaux", .has_integrated_pcs = true, + .needs_sgmii_loopback = true, .dma_addr_width = 36, .dwmac4_addrs = { .dma_chan = 0x00008100, @@ -682,6 +703,7 @@ static void ethqos_fix_mac_speed(void *priv, unsigned int speed, unsigned int mo { struct qcom_ethqos *ethqos = priv; + qcom_ethqos_set_sgmii_loopback(ethqos, false); ethqos->speed = speed; ethqos_update_link_clk(ethqos, speed); ethqos_configure(ethqos); @@ -820,6 +842,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ethqos->num_por = data->num_por; ethqos->rgmii_config_loopback_en = data->rgmii_config_loopback_en; ethqos->has_emac_ge_3 = data->has_emac_ge_3; + ethqos->needs_sgmii_loopback = data->needs_sgmii_loopback; ethqos->link_clk = devm_clk_get(dev, data->link_clk_name ?: "rgmii"); if (IS_ERR(ethqos->link_clk))