From patchwork Thu Feb 22 12:43:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 204751 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:aa16:b0:108:e6aa:91d0 with SMTP id by22csp226698dyb; Thu, 22 Feb 2024 04:49:42 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUNFkHDbiORRHlCRtPt+4dnznjtXm3XfknrYqxxPraGzkVSi3Gsb1SNIe+AiuIIXrpdFsz1iNNmqN7jLiKIk/Pj6qeGKQ== X-Google-Smtp-Source: AGHT+IFwuAHlqA0Wl5UU5W9JMHTxkiHMeKHRDb8PBU7xRuiauq4zP6iqvtWL6k0T2HT3h9YPot4Y X-Received: by 2002:a17:90a:9a94:b0:299:1777:134c with SMTP id e20-20020a17090a9a9400b002991777134cmr16376835pjp.33.1708606182130; Thu, 22 Feb 2024 04:49:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708606182; cv=pass; d=google.com; s=arc-20160816; b=dybi74q4cNu60g7FrUpEnjyKExvzCyd+yKkC14l/7ARHb2wO/SMaaNFNwtEa6Oy+ZZ gEKxIASb1gYqGXWwOUUUeqCCSkv6DHBPTtcvWdRAWUORr/XQ9XusyUy7vcl4MMRiR0H+ xYwRgxJNjOrQSdc2Pzo0E8t1vX6171HaEWBYEAzgsLltEYY6SvPbD2i9XCpBH6wL8ayN cnmfCu+XWE5l/g4cUzq5x821zOxczD7eZnHzJB3IkucKTQQPkQLk0qHEqv8I/mUygRdv V0Hz7T6iXdpU6HhmywoNPLwATN6gzGxT83rd3bC9Gs7jqccJMwK5RHToR+FO2LCzTfpb gapw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=reply-to:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:subject:date:from:dkim-signature; bh=lPf/vtLpIO478uLt6O/SjEyRujqy3WikxTOLtOc8Uag=; fh=xf53zEEwO8UfwqXA8rNDXb86USgBpvamfpvPadu/NTs=; b=ZnT1DGmoibLCh+aUksrw2p9+UCvv7hjNinR5PP9Q/pIfCdkc0xEO93dHXBYkFt75RR dNkfCvWT2Z9AXRo33yKBHSI3hYtIGh6XrhZl/w0o+0dsjWn17wduDlpyZYA3m9xLizk3 nUvdVVIZISOw3RdtVvIfkhrA4DAZgkF5ywAAOkhgsk6qdIOMrzPpgb41UrNYauCkt8iY S1fq4bM4Cct5VsPaLj5HbkFoiuMNa/A4A49dYbyv+ou0ThgApkfTzB3MZJRSNuI5sagh eU150tbtlF4JWoyQO7/u4gdb7AWtroVOI+iWwmVa8d7x/cpZBXXlOckdFcul8jhturkm 1wIg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VjI0ffNX; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-76533-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76533-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id bu5-20020a17090aee4500b002995cc18356si3476543pjb.67.2024.02.22.04.49.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 04:49:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76533-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VjI0ffNX; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-76533-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76533-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 1BB1CB270B6 for ; Thu, 22 Feb 2024 12:46:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F187D1482E9; Thu, 22 Feb 2024 12:43:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VjI0ffNX" 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 8D1C912EBC0; Thu, 22 Feb 2024 12:43:42 +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=1708605822; cv=none; b=G4nMAzoXO8zQGhg+uWa2v8PIzhlFi3JPBsxC3MeHMCnh8/QT0HbdAgkSC3Jqu4yRKCqPsp78s7telx/k7r8uyV0/FPJc+qjOmBn2zYUYxAE6ecFcK/oK4KRfFeIvqp4UhENjdso8wLFk4j22jXTz+tL+OnshLmFIjHNhyVl0ZlQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708605822; c=relaxed/simple; bh=GBaheOhdznjtGRKp6u9ZnNvUhBZp5GtwDt/jdqgbVr4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nfMqg+4eO0H72LnTLg2ZrY7I6eSJLhPmuGKezY4pen27CZDDN+8H/zOXolbqnxTbRGkJ/f1Yp88t2aK3fAtD4vPMxxvHQ8mw+6xmwnJPojTWg9MuZEZ6F3TLgig/w8QpmEXW4gxPPuS/8TEHDH1g6NUxpBZB5AcGSVoBVJDuhvU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VjI0ffNX; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPS id 02B90C43141; Thu, 22 Feb 2024 12:43:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708605822; bh=GBaheOhdznjtGRKp6u9ZnNvUhBZp5GtwDt/jdqgbVr4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=VjI0ffNXQxse6B5ys3SS6NpPPP9Os+d3MsLKoYwdfqpN6kS4NC4J3gQ5iegdVR/fh GSqaIkk4VelmuApnz7Z/xZWLoU7GXtuTxNWuYKMLz+kQfwU4F6xrdMUn/6RpuupB1U KXJvWDEFP/budn2076so8dxh+BlSdVKR4Hdjpx8JYZqx3PEQ8fSW2hyNM8SXy/wKbz 3dZ2uSXmYbDnrzPkF0j/zfPnzgBAnPb5VqN1TehvJ1At/BOqoXDw02K0TJEUnLanao p7Xv8GGmdNuU1tOHDv3VCaidVZK33ocU2G2+pSTpTrJBrlJ7z5II0/1FvMx7/WabNX chvHJLS3kKeSA== 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 E6366C48BF8; Thu, 22 Feb 2024 12:43:41 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Thu, 22 Feb 2024 20:43:25 +0800 Subject: [PATCH net-next v4 5/6] net: hisilicon: add support for hisi_femac core on Hi3798MV200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240222-net-v4-5-eea68f93f090@outlook.com> References: <20240222-net-v4-0-eea68f93f090@outlook.com> In-Reply-To: <20240222-net-v4-0-eea68f93f090@outlook.com> To: Yisen Zhuang , Salil Mehta , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Lunn , Heiner Kallweit , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708605802; l=7210; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=/txku2bb14pGE8xgSS0aeGHZMyxLoNFPUgd/T9v5WGE=; b=VFa7gyMfDcxQO+jhkyA0pP3gSCsFbZqGhi6gqpkmIrVxzIwKm3lo/MuQnYMODdt0zsfDVQtS/ OzOwmvr5bMgCYK2dMmcfQGL46PtIikSJLbViTL4qyNw2uqsxWYXayAS X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791603436284090224 X-GMAIL-MSGID: 1791603436284090224 From: Yang Xiwen Register the sub MDIO bus if it is found. Also implement the internal PHY reset procedure as needed. Note it's unable to put the MDIO bus node outside of MAC controller (i.e. at the same level in the parent bus node). Because we need to control all clocks and resets in FEMAC driver due to the phy reset procedure. So the clocks can't be assigned to MDIO bus device, which is an essential resource for the MDIO bus to work. No backward compatibility is maintained since the only existing user(Hi3516DV300) has not received any updates from HiSilicon for about 8 years already. And till today, no mainline dts for this SoC is found. It seems unlikely that there are still existing mainline Hi3516DV300 users. The effort to maintain the old binding seems gain a little. Signed-off-by: Yang Xiwen --- drivers/net/ethernet/hisilicon/hisi_femac.c | 74 +++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c index 2406263c9dd3..eab91e011d11 100644 --- a/drivers/net/ethernet/hisilicon/hisi_femac.c +++ b/drivers/net/ethernet/hisilicon/hisi_femac.c @@ -10,8 +10,10 @@ #include #include #include +#include #include #include +#include #include #include @@ -97,6 +99,13 @@ enum phy_reset_delays { DELAYS_NUM, }; +enum clk_type { + CLK_MAC, + CLK_MACIF, + CLK_PHY, + CLK_NUM, +}; + struct hisi_femac_queue { struct sk_buff **skb; dma_addr_t *dma_phys; @@ -108,7 +117,7 @@ struct hisi_femac_queue { struct hisi_femac_priv { void __iomem *port_base; void __iomem *glb_base; - struct clk *clk; + struct clk_bulk_data *clks; struct reset_control *mac_rst; struct reset_control *phy_rst; u32 phy_reset_delays[DELAYS_NUM]; @@ -116,6 +125,7 @@ struct hisi_femac_priv { struct device *dev; struct net_device *ndev; + struct platform_device *mdio_pdev; struct hisi_femac_queue txq; struct hisi_femac_queue rxq; @@ -693,6 +703,7 @@ static const struct net_device_ops hisi_femac_netdev_ops = { static void hisi_femac_core_reset(struct hisi_femac_priv *priv) { reset_control_assert(priv->mac_rst); + usleep_range(200, 300); reset_control_deassert(priv->mac_rst); } @@ -712,6 +723,10 @@ static void hisi_femac_sleep_us(u32 time_us) static void hisi_femac_phy_reset(struct hisi_femac_priv *priv) { + /* MAC clock must be disabled before PHY reset + */ + clk_disable(priv->clks[CLK_MAC].clk); + clk_disable(priv->clks[CLK_MACIF].clk); /* To make sure PHY hardware reset success, * we must keep PHY in deassert state first and * then complete the hardware reset operation @@ -727,6 +742,9 @@ static void hisi_femac_phy_reset(struct hisi_femac_priv *priv) reset_control_deassert(priv->phy_rst); /* delay some time to ensure later MDIO access */ hisi_femac_sleep_us(priv->phy_reset_delays[POST_DELAY]); + + clk_enable(priv->clks[CLK_MAC].clk); + clk_enable(priv->clks[CLK_MACIF].clk); } static void hisi_femac_port_init(struct hisi_femac_priv *priv) @@ -768,11 +786,12 @@ static void hisi_femac_port_init(struct hisi_femac_priv *priv) static int hisi_femac_drv_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct device_node *node = dev->of_node; + struct device_node *node = dev->of_node, *mdio_np; struct net_device *ndev; struct hisi_femac_priv *priv; struct phy_device *phy; int ret; + bool mdio_registered = false; ndev = alloc_etherdev(sizeof(*priv)); if (!ndev) @@ -797,17 +816,16 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) goto out_free_netdev; } - priv->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(priv->clk)) { - dev_err(dev, "failed to get clk\n"); - ret = -ENODEV; + ret = devm_clk_bulk_get_all(&pdev->dev, &priv->clks); + if (ret < 0 || ret != CLK_NUM) { + dev_err(dev, "failed to get clk bulk: %d\n", ret); goto out_free_netdev; } - ret = clk_prepare_enable(priv->clk); + ret = clk_bulk_prepare_enable(CLK_NUM, priv->clks); if (ret) { - dev_err(dev, "failed to enable clk %d\n", ret); - goto out_free_netdev; + dev_err(dev, "failed to enable clk bulk: %d\n", ret); + goto out_disable_clk; } priv->mac_rst = devm_reset_control_get(dev, "mac"); @@ -830,11 +848,29 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) hisi_femac_phy_reset(priv); } + // Register the optional MDIO bus + for_each_available_child_of_node(node, mdio_np) { + if (of_node_name_prefix(mdio_np, "mdio")) { + priv->mdio_pdev = of_platform_device_create(mdio_np, NULL, dev); + of_node_put(mdio_np); + if (!priv->mdio_pdev) { + dev_err(dev, "failed to register MDIO bus device\n"); + ret = -ENODEV; + goto out_disable_clk; + } + mdio_registered = true; + break; + } + } + + if (!mdio_registered) + dev_warn(dev, "MDIO subnode not found. This is usually a bug.\n"); + phy = of_phy_get_and_connect(ndev, node, hisi_femac_adjust_link); if (!phy) { dev_err(dev, "connect to PHY failed!\n"); ret = -ENODEV; - goto out_disable_clk; + goto out_unregister_mdio_bus; } phy_attached_print(phy, "phy_id=0x%.8lx, phy_mode=%s\n", @@ -885,8 +921,10 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) out_disconnect_phy: netif_napi_del(&priv->napi); phy_disconnect(phy); +out_unregister_mdio_bus: + platform_device_unregister(priv->mdio_pdev); out_disable_clk: - clk_disable_unprepare(priv->clk); + clk_bulk_disable_unprepare(CLK_NUM, priv->clks); out_free_netdev: free_netdev(ndev); @@ -902,7 +940,8 @@ static void hisi_femac_drv_remove(struct platform_device *pdev) unregister_netdev(ndev); phy_disconnect(ndev->phydev); - clk_disable_unprepare(priv->clk); + platform_device_unregister(priv->mdio_pdev); + clk_bulk_disable_unprepare(CLK_NUM, priv->clks); free_netdev(ndev); } @@ -919,7 +958,7 @@ static int hisi_femac_drv_suspend(struct platform_device *pdev, netif_device_detach(ndev); } - clk_disable_unprepare(priv->clk); + clk_bulk_disable_unprepare(CLK_NUM, priv->clks); return 0; } @@ -928,8 +967,14 @@ static int hisi_femac_drv_resume(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); struct hisi_femac_priv *priv = netdev_priv(ndev); + int ret; + + ret = clk_bulk_prepare_enable(CLK_NUM, priv->clks); + if (ret) { + dev_err(&pdev->dev, "failed to enable clk bulk: %d\n", ret); + return ret; + } - clk_prepare_enable(priv->clk); if (priv->phy_rst) hisi_femac_phy_reset(priv); @@ -948,6 +993,7 @@ static const struct of_device_id hisi_femac_match[] = { {.compatible = "hisilicon,hisi-femac-v1",}, {.compatible = "hisilicon,hisi-femac-v2",}, {.compatible = "hisilicon,hi3516cv300-femac",}, + {.compatible = "hisilicon,hi3798mv200-femac",}, {}, };