From patchwork Wed Jan 24 21:36:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 766522 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 DC1FB13540A; Wed, 24 Jan 2024 21:36:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706132220; cv=none; b=dWJhNCC6SESb2gq9wTUCw/XtdztZYFKCw4ZApp67601sMTH5Wv1iwX7qZxHZXTiVuFDHm9LuOJEIoko0i1XCO5QJy4FfJY8aAgJHJnKGza7O/DK82IUjInqdoOB3pb0K+tjeLOXbM3/mYgiAG7cU1dZr7zM5YqGZHRHnUu8qRhI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706132220; c=relaxed/simple; bh=HiTLyQa2KKZSm3Od3FweVhdcb+fIx8SekXbCe5zH2mw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UbtqEpMZ14V76wnVMBFpzMg+zdFncmMZ9TpJ0uTqJZnpZu15vRDP0s8MgItKLPBGIvtGOkBHaowhYZKNRIasGt/gPFqdlszwbjzYax3Dlg6nCKHgohuOka/CGAVAaDCEtfuy5IG+dhNF8fDGG+NdBAsyzP0kaRZt9izmhwOveg4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QCWHre3R; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QCWHre3R" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-40eccccfce0so7827875e9.1; Wed, 24 Jan 2024 13:36:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706132217; x=1706737017; 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=tp/E23mZHgvcs3xcO6EdfWN3EmGOTFfoELajIfWpK/I=; b=QCWHre3RaI8Uok0/XoVZx0zM2CV9L2F39lj1cVsQlQSkiTHpa1etKV8KwGPbd+EC+S 9oEEqkoeHhpWEvqsUI+xL6BMjiLwVx+59MfTdVSYlY3rWXZ4aIYMx0aTFrjjsPYHQHzf aoflGQomWg0o03HMecS8/MzVvikoW3EntAHp+YBL7n6x4+8FJ7Qb9KlYtJPwscGf8TNN 8j2lHxbEY9F/FK/cKlnlrHM3QOFYsJIU0XTyLwgNY47ohkQ/P6kzr/bTppGfXMajuHKN cNH6Il0CJ4hGFkIbTWIVv35Xd2fnwYGgNLhxXFuZSPqvmsbuOhdH7fJDQrvkEg/6hGE8 qFwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706132217; x=1706737017; 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=tp/E23mZHgvcs3xcO6EdfWN3EmGOTFfoELajIfWpK/I=; b=C1WxLK+XbZe5Cy5FYyAtXUvTks6a/XMRVQTtkj0V6zwHDlbSI646Bs/+h4kgLc3+tn daH56oZD8yA7NM/1EGE4jZ/hLiPumhF0tLmEoHnbj+c2ACNGiNcUo6f8wRJ9TZdqYfqb 9dU4VWNPFO8SEDdIOcqxk0cVI5hAdxmkRwYQOBUlM8xtqynJVhIoywBha+wOhU1T22yz xeTYh0QZyIsBTXPYAwW1fCOAHtiZ6pFW/7r/rkNzMRQ1MMzvgTTa+yKQbeOM0uR8GaBs r6v0Nf71RQY2LZZ67Ti9YbJfZZUHdbZ7jguzohkj8obqVMGBToASKvx9vABDmsCNDBaD Lr6A== X-Gm-Message-State: AOJu0YwqtrLErehZqyqd7oy0ncueXCajhW1s2o5mORYrNjKAZAsggqz6 DRckgG+URZyPN49OCyjK68zcDx32C3mCnmS5ccnfs4rZzlAQ/bnC X-Google-Smtp-Source: AGHT+IE192+WYaQcaX0ef9nYySbwmu0BPx+vc1zygEDlUdqvZFcsF5n7VION2CbpxoSQ3/iOmnF9qg== X-Received: by 2002:a05:600c:5857:b0:40e:5577:17e with SMTP id ka23-20020a05600c585700b0040e5577017emr1623610wmb.57.1706132216978; Wed, 24 Jan 2024 13:36:56 -0800 (PST) Received: from localhost.localdomain (93-34-89-13.ip49.fastwebnet.it. [93.34.89.13]) by smtp.googlemail.com with ESMTPSA id q13-20020a05600c46cd00b0040e89ade84bsm339466wmo.4.2024.01.24.13.36.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 13:36:56 -0800 (PST) From: Christian Marangi To: Andy Gross , Bjorn Andersson , Konrad Dybcio , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , Heiner Kallweit , Russell King , Robert Marko , linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [net-next PATCH 2/3] net: mdio: ipq4019: add support for clock-frequency property Date: Wed, 24 Jan 2024 22:36:32 +0100 Message-ID: <20240124213640.7582-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240124213640.7582-1-ansuelsmth@gmail.com> References: <20240124213640.7582-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The IPQ4019 MDIO internally divide the clock feed by AHB based on the MDIO_MODE reg. On reset or power up, the default value for the divider is 0xff that reflect the divider set to /256. This makes the MDC run at a very low rate, that is, considering AHB is always fixed to 100Mhz, a value of 390KHz. This hasn't have been a problem as MDIO wasn't used for time sensitive operation, it is now that on IPQ807x is usually mounted with PHY that requires MDIO to load their firmware (example Aquantia PHY). To handle this problem and permit to set the correct designed MDC frequency for the SoC add support for the standard "clock-frequency" property for the MDIO node. The divider supports value from /1 to /256 and the common value are to set it to /16 to reflect 6.25Mhz or to /8 on newer platform to reflect 12.5Mhz. To scan if the requested rate is supported by the divider, loop with each supported divider and stop when the requested rate match the final rate with the current divider. An error is returned if the rate doesn't match any value. On MDIO reset, the divider is restored to the requested value to prevent any kind of downclocking caused by the divider reverting to a default value. While at is also document other bits of the MDIO_MODE reg to have a clear idea of what is actually applied there. Documentation of some BITs is skipped as they are marked as reserved and their usage is not clear (RES 11:9 GENPHY 16:13 RES1 19:17) Signed-off-by: Christian Marangi --- drivers/net/mdio/mdio-ipq4019.c | 68 ++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 5 deletions(-) diff --git a/drivers/net/mdio/mdio-ipq4019.c b/drivers/net/mdio/mdio-ipq4019.c index abd8b508ec16..a4c6cf901ac2 100644 --- a/drivers/net/mdio/mdio-ipq4019.c +++ b/drivers/net/mdio/mdio-ipq4019.c @@ -14,6 +14,20 @@ #include #define MDIO_MODE_REG 0x40 +#define MDIO_MODE_MDC_MODE BIT(12) +/* 0 = Clause 22, 1 = Clause 45 */ +#define MDIO_MODE_C45 BIT(8) +#define MDIO_MODE_DIV_MASK GENMASK(7, 0) +#define MDIO_MODE_DIV(x) FIELD_PREP(MDIO_MODE_DIV_MASK, (x) - 1) +#define MDIO_MODE_DIV_1 FIELD_PREP(MDIO_MODE_DIV_MASK, 0x0) +#define MDIO_MODE_DIV_2 FIELD_PREP(MDIO_MODE_DIV_MASK, 0x1) +#define MDIO_MODE_DIV_4 FIELD_PREP(MDIO_MODE_DIV_MASK, 0x3) +#define MDIO_MODE_DIV_8 FIELD_PREP(MDIO_MODE_DIV_MASK, 0x7) +#define MDIO_MODE_DIV_16 FIELD_PREP(MDIO_MODE_DIV_MASK, 0xf) +#define MDIO_MODE_DIV_32 FIELD_PREP(MDIO_MODE_DIV_MASK, 0x1f) +#define MDIO_MODE_DIV_64 FIELD_PREP(MDIO_MODE_DIV_MASK, 0x3f) +#define MDIO_MODE_DIV_128 FIELD_PREP(MDIO_MODE_DIV_MASK, 0x7f) +#define MDIO_MODE_DIV_256 FIELD_PREP(MDIO_MODE_DIV_MASK, 0xff) #define MDIO_ADDR_REG 0x44 #define MDIO_DATA_WRITE_REG 0x48 #define MDIO_DATA_READ_REG 0x4c @@ -26,9 +40,6 @@ #define MDIO_CMD_ACCESS_CODE_C45_WRITE 1 #define MDIO_CMD_ACCESS_CODE_C45_READ 2 -/* 0 = Clause 22, 1 = Clause 45 */ -#define MDIO_MODE_C45 BIT(8) - #define IPQ4019_MDIO_TIMEOUT 10000 #define IPQ4019_MDIO_SLEEP 10 @@ -41,6 +52,7 @@ struct ipq4019_mdio_data { void __iomem *membase; void __iomem *eth_ldo_rdy; struct clk *mdio_clk; + unsigned int mdc_rate; }; static int ipq4019_mdio_wait_busy(struct mii_bus *bus) @@ -203,6 +215,38 @@ static int ipq4019_mdio_write_c22(struct mii_bus *bus, int mii_id, int regnum, return 0; } +static int ipq4019_mdio_set_div(struct ipq4019_mdio_data *priv) +{ + unsigned long ahb_rate; + int div; + u32 val; + + /* If we don't have a clock for AHB use the fixed value */ + ahb_rate = IPQ_MDIO_CLK_RATE; + if (priv->mdio_clk) + ahb_rate = clk_get_rate(priv->mdio_clk); + + /* MDC rate is ahb_rate/(MDIO_MODE_DIV + 1) + * While supported, internal documentation doesn't + * assure correct functionality of the MDIO bus + * with divider of 1, 2 or 4. + */ + for (div = 8; div <= 256; div *= 2) { + /* The requested rate is supported by the div */ + if (priv->mdc_rate == ahb_rate / div) { + val = readl(priv->membase + MDIO_MODE_REG); + val &= ~MDIO_MODE_DIV_MASK; + val |= MDIO_MODE_DIV(div); + writel(val, priv->membase + MDIO_MODE_REG); + + return 0; + } + } + + /* The requested rate is not supported */ + return -EINVAL; +} + static int ipq_mdio_reset(struct mii_bus *bus) { struct ipq4019_mdio_data *priv = bus->priv; @@ -225,8 +269,14 @@ static int ipq_mdio_reset(struct mii_bus *bus) return ret; ret = clk_prepare_enable(priv->mdio_clk); - if (ret == 0) - mdelay(10); + if (ret) + return ret; + + mdelay(10); + + /* Restore MDC rate if previously set */ + if (priv->mdc_rate) + ret = ipq4019_mdio_set_div(priv); return ret; } @@ -252,6 +302,14 @@ static int ipq4019_mdio_probe(struct platform_device *pdev) if (IS_ERR(priv->mdio_clk)) return PTR_ERR(priv->mdio_clk); + priv->mdc_rate = 0; + if (!of_property_read_u32(pdev->dev.of_node, "clock-frequency", + &priv->mdc_rate)) { + ret = ipq4019_mdio_set_div(priv); + if (ret) + return ret; + } + /* The platform resource is provided on the chipset IPQ5018 */ /* This resource is optional */ res = platform_get_resource(pdev, IORESOURCE_MEM, 1); From patchwork Wed Jan 24 21:36:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 765668 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 7924F135A5A; Wed, 24 Jan 2024 21:37:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706132222; cv=none; b=bjdUvnPhGAeDBSFwAHl6mQUXXGREgtLQ5HGMKxXyQeAOgQHSm8Dcz1sPkEdSOZMCJCOEPYj5Y7287TgvMPT5g1HKU/rIVHkz78v15TJRqdfbG+hLEm+cNX+xqXSSRLlUuVYSdE/mo/Ck+lKAibtBSkLKfE2kED3ErKgtOmvOpuA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706132222; c=relaxed/simple; bh=AOE7n0KnewlaWwxbj8BBqxz1kEl4nUkcJEnkd3Rd1CM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UimU8fQzuxrtNAS6MO9PTGVm3MeiSGr7MSI30PSL5xzKcspHmpLNVaJnY0iFoXBfrHJnQDB+Xln4Y6cR2vJA2T1ckuUcScAvis1GnYV2IgOX2DG85D4rwsSPe70qAhqjJDYieoz3Y0n9McE7rCF13W19WOJ/sR2yVt3ctCS5J0E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Efpg5Jh2; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Efpg5Jh2" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-40d6b4e2945so70792175e9.0; Wed, 24 Jan 2024 13:37:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706132218; x=1706737018; 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=1Q3Rs7PU6VZ7DHw5oiGFQEWFBt/lSJt0fN7k2NTIpww=; b=Efpg5Jh2jxgCenaxgkIf7I/hW4yDtYNkk4j+q3gR0KoBae6r7dRYhTycs2sIiEOb9i QRWZnyWObpVrvH/2D7a0dz87cVmL3UFLwttAaMG4ElAZ923VX1sOW0Xz1NXupU5L05ZE CzH+7bU6c9bpBh5H0ZrKl9igdNOpiXVIqrMIMix0P0QpjfN1YiBW1a47E4mdWoGFzY5T KlqskRpvdyS6iANyJxUta+lpDr4CCWfCq+8URKviifYrMuxW1R0nsWwmHwmiZgRHJ5gn dwM/hck0zc2okkn7Dzz+QQu8s+w0jigCwqjXXYsNGQfBGGmT7JEKtM3M3SFWAQrGwGQw /vUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706132218; x=1706737018; 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=1Q3Rs7PU6VZ7DHw5oiGFQEWFBt/lSJt0fN7k2NTIpww=; b=TpPb3uU3FDV0b1BYYLh6T0m5SOTBq3AAp6NmPbPM5l5soCkcZJRbD4zquJ74Rj6Wl7 kP6AHRnCbzphSy/mG69N0Oscxw5piJdvjRP1rx1ZQIQC4iY8ioBGwC+HrER0rNu0qzf2 zkzhKr2MrYskVz9OFFrvhB2p4V6dKW84dtQr2ydvfJBIFanYuyWpizffw3SRmrTKvwWb 6K9bC44qWtsf0uGdFWpqxVKIZpxAY/W3iQOWbw9xRdaU4mDaZMEy2IvknLqsDc/YTmMu 7ps6TxQR75yNt9CWvP9dgblhIaFvrXiHi1JRETvbjkLTx2xx2EChYQHLRux9DKdQpW16 pECw== X-Gm-Message-State: AOJu0YyuPAHESjRY36cpv1C6lVn6GL82tgCl//oMYrBctyvl8bNhZRq3 LGRG9aOYERhwI0+LakeVudILEAC/P++fC0wYowr/kYaIVl73LUmo X-Google-Smtp-Source: AGHT+IHVdLu49ZheFyem/UbrZMcfgbfgZrLaOQv3BosrNO5JqxwttVmSuIpI0HNxLwOfbIJey2JX2A== X-Received: by 2002:a05:600c:458f:b0:40e:46f5:e5ef with SMTP id r15-20020a05600c458f00b0040e46f5e5efmr963875wmo.21.1706132218200; Wed, 24 Jan 2024 13:36:58 -0800 (PST) Received: from localhost.localdomain (93-34-89-13.ip49.fastwebnet.it. [93.34.89.13]) by smtp.googlemail.com with ESMTPSA id q13-20020a05600c46cd00b0040e89ade84bsm339466wmo.4.2024.01.24.13.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 13:36:57 -0800 (PST) From: Christian Marangi To: Andy Gross , Bjorn Andersson , Konrad Dybcio , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , Heiner Kallweit , Russell King , Robert Marko , linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [net-next PATCH 3/3] arm64: dts: qcom: ipq8074: add clock-frequency to MDIO node Date: Wed, 24 Jan 2024 22:36:33 +0100 Message-ID: <20240124213640.7582-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240124213640.7582-1-ansuelsmth@gmail.com> References: <20240124213640.7582-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add clock-frequency to MDIO node to set the MDC rate to 6.25Mhz instead of using the default value of 390KHz from MDIO default divider. Signed-off-by: Christian Marangi --- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi index 2f275c84e566..08ddfeece043 100644 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi @@ -264,6 +264,8 @@ mdio: mdio@90000 { clocks = <&gcc GCC_MDIO_AHB_CLK>; clock-names = "gcc_mdio_ahb_clk"; + clock-frequency = <6250000>; + status = "disabled"; };