From patchwork Wed Feb 28 09:02:35 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: 207728 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp3223163dyb; Wed, 28 Feb 2024 01:06:50 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXoGT5QcrKTSjScQ6eMEYx+W9ZPE+hj3aWP0/4+cjgb84DLsquKDw2pam47GDBOi67ercOqzrdhJj5dYWHafIT/hApwmw== X-Google-Smtp-Source: AGHT+IEs7iTZdEZeXPoAk5sARluI8y2EOVDl4fAU2b35/EmO8uLTRtsyBr1qSFH0s5JFz7Ariyea X-Received: by 2002:a17:906:e0d8:b0:a42:e8fa:f7c6 with SMTP id gl24-20020a170906e0d800b00a42e8faf7c6mr1601321ejb.14.1709111210463; Wed, 28 Feb 2024 01:06:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709111210; cv=pass; d=google.com; s=arc-20160816; b=Mua+Z1AF3AXs8t5VjgETZL6bCxwwSG+BpAp6iLryvWNSc9Q7RVoCvHJUU1oBkUYYRm hjDpHHbz5FTY7S3T2eAsetZfI6D1TLhcDjbw/BGpvPAFVfgEsx6x96DO+IWPn9I7TcQs Z0ZwTISuPvzOrUR/F5RlwrPbmTDRTYoqYk48D/7yjDdckomR5tKaIAou3pldmg9jW1Aq tJh3epM7k9N/qwAYJA6m27VM8GgPl4LQX4cF4zdDsqTQOexYQndb+YFwEnsJF+JCimqv mpLNz17nY0Bi+BxnRwSW0Hx1QZJXeYka+HVWTRGKMcFJY8i0BKN4NbXIL5CqQCwbXKUG seKA== 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=EKTC0cuvqK24zSwHv30s6Is3Z0mIEcm7KCdIKyqAsKM=; fh=xf53zEEwO8UfwqXA8rNDXb86USgBpvamfpvPadu/NTs=; b=e399baNRpzA+jtI0UXB4zNhJLYpuQ/k85SsxhK/dD5FsYUD440WnvFlUx7KfMojWTZ bZRR/X74zweSu3jC8pjktI8OOIXB/l1ZtH1z/+5RLdcnRDc/7ylrS1Q4+55lbMxPUXbE eVHQM13Q7jcuTzAJVAbkU/SVqML1oZji2hg1NVMa9V0PvVpaLDI/ovU2ckneK33UMkPH Jpk8dgQfzgssqJeVyGYtL/0WEyA8IdF/QJXvMSVH7wbxDRg7x+FkeEide1Yao+sS4vL7 48OPuR+jTvPNQ/sfYLEYceU/vaPpmIkwmOaO9JBrIU+yxL7RXDy07Acv4kxdyLcAAPrj 1t0g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZpnUeDn4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-84730-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84730-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id y22-20020a17090668d600b00a440fb646b3si175253ejr.791.2024.02.28.01.06.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 01:06:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-84730-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZpnUeDn4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-84730-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84730-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 am.mirrors.kernel.org (Postfix) with ESMTPS id E69341F219EE for ; Wed, 28 Feb 2024 09:06:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C958A4C619; Wed, 28 Feb 2024 09:02:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZpnUeDn4" 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 6C89632C8C; Wed, 28 Feb 2024 09:02:27 +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=1709110947; cv=none; b=uzWFjSWwDuNRCX1uX9jVZ4QsLcRGXS8ENU7GsrBMMub/gMKiZc7k85Y0MBk9XtCptXmosT1AiIZZbovBDP8vVw4fa32oavHrggLjcTNrAoEnsaqzilIi4tVGq49skNse+yvD45ngyAXD3nQKbTrP9aUHHtNtk6TmnqSCX09buP8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709110947; c=relaxed/simple; bh=PXHHu4UnBXig8tiL8lcq7ENkSw5+VgNGvWGNzYjLFGg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZHBRjIchEbR0n48DlwYap1wcHLY34MaeVlzUp1RGXujML1hkauMepYjE0g6pXl+n4HRaL7tgIeIAx8livEcSi2LTwlsytJOPF73VqzwEETU8iigltR0x59NK775NYeG1YOi/DpseEVgJiCZWExA1gUE7uLuuEb0G2iCcUDdmdNs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZpnUeDn4; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPS id 2684FC32788; Wed, 28 Feb 2024 09:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709110947; bh=PXHHu4UnBXig8tiL8lcq7ENkSw5+VgNGvWGNzYjLFGg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ZpnUeDn43pXJsdW6Q+St97El+Rf4R5Lz20ByYQbi97RBWc7IuNg9tXk1cA21Blg0I /jLBE+tgCQ3vgxyDfwU+KqDE4eb5TaC/Tt+JJO5/QDRkHgGEhQRkyN+VM0Ojwk3rwI GZ3ax2sDWWiNJoXnThYcsV8bXxFusyaSPKwawq1kVpsgp9JPy0/+HChQ/MIl1qP2e1 4RtfJJdOsSs7ZYcB80dgBHAsS7WzjgV5/cw9lUBAxOuek3xMGfFcMEMfwIno8WjDxp 3px9het+H5RcdmKsZhpvkE/FcQ3hv5zZXXk0G9o+tjCyVImcT9As4QGCwmt3Ou7V7q nJXKi1JI0ptjQ== 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 15757C54E55; Wed, 28 Feb 2024 09:02:27 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Wed, 28 Feb 2024 17:02:35 +0800 Subject: [PATCH net-next v6 11/11] net: hisi_femac: 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: <20240228-net-v6-11-6d78d3d598c1@outlook.com> References: <20240228-net-v6-0-6d78d3d598c1@outlook.com> In-Reply-To: <20240228-net-v6-0-6d78d3d598c1@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.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1709110945; l=7225; i=forbidden405@outlook.com; s=20240228; h=from:subject:message-id; bh=T0pLeFl9jyHKBrah+/aNNUzmDQQT/tOrG8U7+A+g/0k=; b=0HWZTzxfJeKsn2nkox9W1RdD8bb9U+Zu/7SbKMscTJwYEtEn6W5OIEj3bh88BNlie7b0NPWt2 6/yQ8vz4DzOAEtebw6rxyK7HI+XME/1QFqUM6pJjdHD5G1dZUzulkDn X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=KAWv6ZzFsT54MGllOczJgFiWB+DuayEmyn24iiVVThU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20240228 with auth_id=136 X-Original-From: Yang Xiwen Reply-To: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792132996514572137 X-GMAIL-MSGID: 1792132996514572137 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 3c5c095dad05..be2bfd06c8d2 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); @@ -947,6 +992,7 @@ static int hisi_femac_drv_resume(struct platform_device *pdev) static const struct of_device_id hisi_femac_match[] = { {.compatible = "hisilicon,hisi-femac",}, {.compatible = "hisilicon,hi3516cv300-femac",}, + {.compatible = "hisilicon,hi3798mv200-femac",}, {}, };