Received: by 2002:a05:7412:cfc7:b0:fc:a2b0:25d7 with SMTP id by7csp1340066rdb; Mon, 19 Feb 2024 11:59:18 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUjPWhvbMk1H5khzR1DIdbziNyZbMBfy0h7iXCQ+TM1wTX4n59bnB/7UJiWwk8EM65Ak4cedkBvizEAY5j9JdDOzoQMqmztlGLdWw1SVg== X-Google-Smtp-Source: AGHT+IFORaWmg0zOSonqFfr3bciVhQqBjy0jT5ga+G2P3fUuS12rMGetvPodnMdPv1lLLx9TkM3X X-Received: by 2002:a05:6358:988e:b0:17a:d7c3:96ea with SMTP id q14-20020a056358988e00b0017ad7c396eamr18027653rwa.11.1708372757923; Mon, 19 Feb 2024 11:59:17 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708372757; cv=pass; d=google.com; s=arc-20160816; b=XFlsL4e47rRcCf1CWJzOCoNdWeKf8MbJMeeEyPcVfki2gkYXGJf/f14hwHhCvnu/9w WSQETTem3Ph1ACtEfVfpuR20BXkCsY/4vlDD47DAOCHTvD4wdIiKVtZGu6ZfxUi08VRg iuHooRpkPkhnhF+wrJe86tq2GajATs5CC0Jk5Mb/cQCcL9pYloNYf6RvUG5xmQ85JnZ9 T6d2uwvXFsOQb5wJz1lT9DCDEXu+iFBfdJRN8FCmSHVYxW3FnmdTdSLBHGJO+zHobAsE WfPwH8piebH4qcSQAzLl3hXI12TJTA8q7gfTVPqRpQGvPPqsvQ0JQKF6QjlrXqfVFpOS 32AQ== 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=Tv/tZl0H/5oFHYDuN7/KrFOke0p6d711VUrpYZgA5dE=; fh=xf53zEEwO8UfwqXA8rNDXb86USgBpvamfpvPadu/NTs=; b=aAchQQ+NkPxoFQ1rOnVC6VXHvtnQ2NnHhekP0U4Hm8VRjNyd5GRs2dhTqot4sZxELq DbcpYLckGUfyV0MKDh+8gWTkWrKPcZJY6WaofKi1VVQGGJZND0gP4XwarSmNEMDX7tvO DEcCisThIyzdVcuBua492uHy+JplKhhCpYkJXChXVGfyGGi6zh2YtljYTp/VrEIhCVgu QrXGoShWS7WjE9t/d9KPd3LKMIOc6JrVRc7D+zyMyJAVGp+1atP/IPqsVQbCrLebq0oR rj4pzdOx84CsuLvyHBIDM/MPXtqfuWauu7FpPfsR4C5V5J/6XNQmezq8dOx4UQZzrjaI vHNQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SyJVSckQ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-71930-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71930-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id s28-20020a63925c000000b005cee9118a7asi4917040pgn.600.2024.02.19.11.59.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 11:59:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71930-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SyJVSckQ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-71930-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71930-linux.lists.archive=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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 94B16281CD0 for ; Mon, 19 Feb 2024 19:59:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 27E9756B6F; Mon, 19 Feb 2024 19:57:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SyJVSckQ" 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 353AC51C59; Mon, 19 Feb 2024 19:57:36 +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=1708372657; cv=none; b=cu7TJc3OsTXu+3yuR/dgQjO9+k1J+85ie5ngC5gp7qggsvqxLKmhMEixgKqMubPJbyDXWPY+NhC6NtbnB0BRsnNkjgZXphOt44pMXRvNFM69DerXCv8T6BNWUMuu5+teqJdD2zmzkOCWIhxSVYCgv0qkPphiVYkchycT+J0xr0Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708372657; c=relaxed/simple; bh=lkE+nJafSbSS+sWJQAO8lM1Z0gsqsKJ4xjPAvAQp9Po=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eMka27swcVwbb259PewTV7kb5WHx7kSuGKhJXJXC9yubRkc5+kqijhRIwjjgZz+TWjAm0cn8kFL4AWI9r3T5wMjazAoRlf342xq689DJsxPwjm/n2ZXQbp7ygeAu6+u9Tx2+8Ya8ey7mlg6/HuS4tc/dQMNmGavTtyQqTWjxrcM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SyJVSckQ; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPS id C0318C43330; Mon, 19 Feb 2024 19:57:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708372656; bh=lkE+nJafSbSS+sWJQAO8lM1Z0gsqsKJ4xjPAvAQp9Po=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=SyJVSckQVuTitcoJXdrsyw0c8wTwkWCMQc+5cmFn6PD/ZV94ozZVdmm+ot6axGVSi uD4oP5Kz8/LliTOdQ6tBOkoKHDMeswGsOBmfIfqB5M0o8rAMz5cGrhlmc+nQB0eO57 zBaWy1hYnIVc9d0pWwz+kQNw0RAKkAuJmlB8v9Jg4lwhmBpkgRX8fiaiWBFz/Q8LiQ 5SPVm0nw6Q+df1gRvfLKFur+s2CaFweSeDrwKU9I8/GpVNQDDNSPmI5nP4iTxGnpuo Njf1q/6PrI3GcBG4RABTj48iwZBh0X1fTCjJAKduRtR3M2Zkqdbf/+OW4+PWKiuDJO 0lXJA6zSM5ntw== 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 A99F0C5478B; Mon, 19 Feb 2024 19:57:36 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Tue, 20 Feb 2024 03:57:38 +0800 Subject: [PATCH net-next v3 3/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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240220-net-v3-3-b68e5b75e765@outlook.com> References: <20240220-net-v3-0-b68e5b75e765@outlook.com> In-Reply-To: <20240220-net-v3-0-b68e5b75e765@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=1708372656; l=7437; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=Pnrm52kA78VWruPcIH3FwKYMhoBNHxMHWexU8vqTlc8=; b=Aw8ZpT4GtvEBPmkyonppHyzMAB5wJvp+iVnUz5LRzuMrAasJaLe+Wlj7xz9f6YPQcSxPcjljP REJAIlx3YSvDbtcu1jl06/knD4QJUE3ZwKYPe0+a4F8gCPwpHKBKGTW 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: 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 | 77 +++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c index 2406263c9dd3..fedfc7219fad 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,23 +816,22 @@ 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); + dev_err(dev, "failed to enable clk bulk: %d\n", ret); goto out_free_netdev; } priv->mac_rst = devm_reset_control_get(dev, "mac"); if (IS_ERR(priv->mac_rst)) { ret = PTR_ERR(priv->mac_rst); - goto out_disable_clk; + goto out_free_netdev; } hisi_femac_core_reset(priv); @@ -826,15 +844,34 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) priv->phy_reset_delays, DELAYS_NUM); if (ret) - goto out_disable_clk; + goto out_free_netdev; 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_free_netdev; + } + mdio_registered = true; + break; + } + of_node_put(mdio_np); + } + + 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 +922,8 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) out_disconnect_phy: netif_napi_del(&priv->napi); phy_disconnect(phy); -out_disable_clk: - clk_disable_unprepare(priv->clk); +out_unregister_mdio_bus: + platform_device_unregister(priv->mdio_pdev); out_free_netdev: free_netdev(ndev); @@ -902,7 +939,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 +957,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 +966,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 +992,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",}, {}, }; -- 2.43.0