From patchwork Mon Nov 14 14:37:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Chiu X-Patchwork-Id: 13042441 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7E26DC4332F for ; Mon, 14 Nov 2022 14:40:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TkD60WePL77hLmsHv7uMGQDcoA9Slha8Bo9VGkyCUsc=; b=SCcAWTZ1DAr2LH qK5sAYPwYqtcgtUBNuc6zKSzy6v1fql8MoIkzIrJs6xbIwFiVTE8wdDneQDw9ePwLa56yjUTz2sum 4B+C1FxDAInrpXtW7qqvojk/6ln+q/Tnrsl7x9znnl6u5y+bfH+XXJ1m9KvREiJSNRCfwDbLJhou6 rpHXSNB9yfqUosTeiXtTtAN59QlKyrN3hFjlxDbJnU5qfysCugN0Y5oEs15to5OUPiq4k1cgyoeHA CCG/4PRzC2aAlQuWwlA0Cxk7EmZ+4AtnlRmmskK91KDcIPvm1TBK6Z2bt2+qR3BS+a2fckFDEOswx L97DnBXO4XKGgilKI14g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ouabz-001nxz-Ac; Mon, 14 Nov 2022 14:38:59 +0000 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ouabh-001nnq-Rx for linux-arm-kernel@lists.infradead.org; Mon, 14 Nov 2022 14:38:44 +0000 Received: by mail-pf1-x431.google.com with SMTP id m6so11195407pfb.0 for ; Mon, 14 Nov 2022 06:38:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; 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=IASNZHNwvbWHeDpezdCT15D5MRNvDyxMNfFoWg+ExSg=; b=hL9j3AtMy5bx0Y0uWWBzf6YyDwvcW0cIyaKhvEKjw1Mpw9qsrfIUeXOeZKDFChooe+ /VDSgixJ5JujcKccehrW78bzG03/Bax8WVceod614StD5cj6MQft/TvLfSzEG1EtKviI 1jNUpvAzsnO0I/gAAuovjtOCO6OopzD2QSp9ljD12Lpp06rx9d4eBr5A3CkllCWYK2Jg kJIizc+Gif2ywNknvPCwddiYPHRkz0AalVWhRWg3TI2jvYc6oCpbMUnCVojPjEBe64SO mITlgH6SDmS+hRKAcuUB0vO1rsg3PiHbRX7YLNPE9Qwy4+nuoBYkUv5JrVp9DQOL/b2Z utug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=IASNZHNwvbWHeDpezdCT15D5MRNvDyxMNfFoWg+ExSg=; b=JY+HjIoSjR3zlojyk14DdhBpeJBfdvm6TQzqhL1e6+Q4MhgBQPVIZgJfnsbcqHvha8 Z2UXmrNsioz7i9akkE1aVANfsDYo8H9pCZwd0ZfrYn76inYfmW5tjoQ6yTeNNaUY3ezs B/Mi+uP0WRCwjLfbaXXCM7NBHXtavwnSW6M1OGvzuHCqeklkTOhquYzSHlM8LRwGO5wW +sT6Cwa8xwCLxy3UDGmwINrNb0AeT1+yvxUjKcy43XHN/OkAEKJGJSNCCmsEcc51jY/p y0ZPzZcz8QvyrFcgFcx2thrcv6GQBzBYlkNTD4EU2reWe/c5rXAkxaLMm85Q2wQe9YjP 73hA== X-Gm-Message-State: ANoB5pm9vOolaY2rizjNj3fHJMpvNt4ICRhHLYvd1JFrhO92boOyAUad mnKL5/1StVTX4yw9qYwQ3IUpag== X-Google-Smtp-Source: AA0mqf6sFKJBnp73HD0eLFqrTm4SVnI6bm+urfRxkPBidbvGikwEw/HhGG/p8QhmxKGhSNbqYikEPQ== X-Received: by 2002:a05:6a00:4199:b0:56b:bb06:7dd5 with SMTP id ca25-20020a056a00419900b0056bbb067dd5mr14360225pfb.3.1668436719615; Mon, 14 Nov 2022 06:38:39 -0800 (PST) Received: from archlinux.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id h12-20020a056a00000c00b0056bc742d21esm6977381pfk.176.2022.11.14.06.38.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 06:38:39 -0800 (PST) From: Andy Chiu To: davem@davemloft.net, andrew@lunn.ch, kuba@kernel.org, michal.simek@xilinx.com, radhey.shyam.pandey@xilinx.com Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, pabeni@redhat.com, edumazet@google.com, andy.chiu@sifive.com, greentime.hu@sifive.com Subject: [PATCH v3 RESEND net-next 2/3] net: axienet: set mdio clock according to bus-frequency Date: Mon, 14 Nov 2022 22:37:54 +0800 Message-Id: <20221114143755.1241466-3-andy.chiu@sifive.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20221114143755.1241466-1-andy.chiu@sifive.com> References: <20221114143755.1241466-1-andy.chiu@sifive.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221114_063841_934682_2810DC1A X-CRM114-Status: GOOD ( 19.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Some FPGA platforms have 80KHz MDIO bus frequency constraint when connecting Ethernet to its on-board external Marvell PHY. Thus, we may have to set MDIO clock according to the DT. Otherwise, use the default 2.5 MHz, as specified by 802.3, if the entry is not present. Signed-off-by: Andy Chiu Reviewed-by: Greentime Hu Reviewed-by: Andrew Lunn --- .../net/ethernet/xilinx/xilinx_axienet_mdio.c | 46 +++++++++++++------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c index e1f51a071888..5e1619ce8074 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c @@ -147,15 +147,18 @@ static int axienet_mdio_write(struct mii_bus *bus, int phy_id, int reg, /** * axienet_mdio_enable - MDIO hardware setup function * @lp: Pointer to axienet local data structure. + * @np: Pointer to mdio device tree node. * * Return: 0 on success, -ETIMEDOUT on a timeout. * * Sets up the MDIO interface by initializing the MDIO clock and enabling the * MDIO interface in hardware. **/ -static int axienet_mdio_enable(struct axienet_local *lp) +static int axienet_mdio_enable(struct axienet_local *lp, struct device_node *np) { + u32 mdio_freq = MAX_MDIO_FREQ; u32 host_clock; + u32 clk_div; lp->mii_clk_div = 0; @@ -184,6 +187,12 @@ static int axienet_mdio_enable(struct axienet_local *lp) host_clock); } + if (np) + of_property_read_u32(np, "clock-frequency", &mdio_freq); + if (mdio_freq != MAX_MDIO_FREQ) + netdev_info(lp->ndev, "Setting non-standard mdio bus frequency to %u Hz\n", + mdio_freq); + /* clk_div can be calculated by deriving it from the equation: * fMDIO = fHOST / ((1 + clk_div) * 2) * @@ -209,13 +218,20 @@ static int axienet_mdio_enable(struct axienet_local *lp) * "clock-frequency" from the CPU */ - lp->mii_clk_div = (host_clock / (MAX_MDIO_FREQ * 2)) - 1; + clk_div = (host_clock / (mdio_freq * 2)) - 1; /* If there is any remainder from the division of - * fHOST / (MAX_MDIO_FREQ * 2), then we need to add + * fHOST / (mdio_freq * 2), then we need to add * 1 to the clock divisor or we will surely be above 2.5 MHz */ - if (host_clock % (MAX_MDIO_FREQ * 2)) - lp->mii_clk_div++; + if (host_clock % (mdio_freq * 2)) + clk_div++; + + /* Check for overflow of mii_clk_div */ + if (clk_div & ~XAE_MDIO_MC_CLOCK_DIVIDE_MAX) { + netdev_warn(lp->ndev, "MDIO clock divisor overflow\n"); + return -EOVERFLOW; + } + lp->mii_clk_div = (u8)clk_div; netdev_dbg(lp->ndev, "Setting MDIO clock divisor to %u/%u Hz host clock.\n", @@ -242,10 +258,6 @@ int axienet_mdio_setup(struct axienet_local *lp) struct mii_bus *bus; int ret; - ret = axienet_mdio_enable(lp); - if (ret < 0) - return ret; - bus = mdiobus_alloc(); if (!bus) return -ENOMEM; @@ -261,15 +273,21 @@ int axienet_mdio_setup(struct axienet_local *lp) lp->mii_bus = bus; mdio_node = of_get_child_by_name(lp->dev->of_node, "mdio"); + ret = axienet_mdio_enable(lp, mdio_node); + if (ret < 0) + goto unregister; ret = of_mdiobus_register(bus, mdio_node); + if (ret) + goto unregister; of_node_put(mdio_node); - if (ret) { - mdiobus_free(bus); - lp->mii_bus = NULL; - return ret; - } axienet_mdio_mdc_disable(lp); return 0; + +unregister: + of_node_put(mdio_node); + mdiobus_free(bus); + lp->mii_bus = NULL; + return ret; } /**