From patchwork Thu Dec 5 07:20:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacky Chou X-Patchwork-Id: 13894774 X-Patchwork-Delegate: kuba@kernel.org Received: from TWMBX01.aspeed.com (mail.aspeedtech.com [211.20.114.72]) (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 619C71AF0CA; Thu, 5 Dec 2024 07:26:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.20.114.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383563; cv=none; b=CTBnZqDEO/uIy0Vhsg9onz69KAcE7usQofREJs5Y5QswL+kB9mwv6Hl8ZFiWlFrVgT2/e/+O9q9XJdd8ingAp6mgLV9dX+H5N0x5Lab0RIUh6t7rd//mbMRhd1d7UImcrk+OA7oWy1giC0FQkFFbZW4E9LP1Mov3jh+EJS67TIk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383563; c=relaxed/simple; bh=2dNPKqiux3/kj1Fj+yBtelMlWhVcE7qftmpzglA4vfE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rve5vmt+r369dSOIjcWs3+k8xPnIeF2U++9msFClfr1iAL0P1oQXr8nsqH1AdF+Xd1ZqFTa6IoWalNsSzN/Mgfvafb58So512DkSgFuQt5/mazu8QBKP7LFejRMZTh8TXPY4/IL0PHQ1UQHv3+w27UOlx1iub0lOrOYjvx3pK1g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com; spf=pass smtp.mailfrom=aspeedtech.com; arc=none smtp.client-ip=211.20.114.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aspeedtech.com Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Thu, 5 Dec 2024 15:20:48 +0800 Received: from mail.aspeedtech.com (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Thu, 5 Dec 2024 15:20:48 +0800 From: Jacky Chou To: , , , , , , , , , , , CC: , Conor Dooley Subject: [PATCH net-next v4 1/7] dt-bindings: net: ftgmac100: support for AST2700 Date: Thu, 5 Dec 2024 15:20:42 +0800 Message-ID: <20241205072048.1397570-2-jacky_chou@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> References: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The AST2700 is the 7th generation SoC from Aspeed. Add compatible support and resets property for AST2700 in yaml. Signed-off-by: Jacky Chou Acked-by: Conor Dooley --- .../bindings/net/faraday,ftgmac100.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/faraday,ftgmac100.yaml b/Documentation/devicetree/bindings/net/faraday,ftgmac100.yaml index 9bcbacb6640d..3bba8eee83d6 100644 --- a/Documentation/devicetree/bindings/net/faraday,ftgmac100.yaml +++ b/Documentation/devicetree/bindings/net/faraday,ftgmac100.yaml @@ -21,6 +21,7 @@ properties: - aspeed,ast2400-mac - aspeed,ast2500-mac - aspeed,ast2600-mac + - aspeed,ast2700-mac - const: faraday,ftgmac100 reg: @@ -33,7 +34,7 @@ properties: minItems: 1 items: - description: MAC IP clock - - description: RMII RCLK gate for AST2500/2600 + - description: RMII RCLK gate for AST2500/2600/2700 clock-names: minItems: 1 @@ -73,6 +74,20 @@ required: unevaluatedProperties: false +if: + properties: + compatible: + contains: + const: aspeed,ast2700-mac +then: + properties: + resets: + maxItems: 1 + items: + - description: MAC IP reset for AST2700 + required: + - resets + examples: - | ethernet@1e660000 { From patchwork Thu Dec 5 07:20:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacky Chou X-Patchwork-Id: 13894775 X-Patchwork-Delegate: kuba@kernel.org Received: from TWMBX01.aspeed.com (mail.aspeedtech.com [211.20.114.72]) (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 4D9A11B3949; Thu, 5 Dec 2024 07:26:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.20.114.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383564; cv=none; b=MxxeeTEl3E+5UECDtVGA4tpiZbC8oC/OCKWLWiIthptnWvtjxkUGS9HN8REuqDWUyWG0MxUWT/4Anbdo9nxDyNGYlja2qnb7NzzbDQYF60qrLyOv/5A5hQ5OsgR5+Gv732UbfYDZK6LkuvYA2NoHhnaotKOvcrxlZYQP6fN1ZDw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383564; c=relaxed/simple; bh=bYNHC34m5WU0qugxK/Dcp3ZF8tDOpLyZgAgm2euoXK0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gS7UqzEf0r4iQb26IkjQ38abdMvUuoSkt96SuBVJrbajZd4iSqEXacAvje83mWWfSzdtR+PVOJkglu5NYnW3UmwtSSdaL4GP4caGbMZzFmP9Wbh03t0uuPZ38MDQjeHdcU19XlKfuEO7ZThCoawl3L+hDh9hScZdcyeio6fncfc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com; spf=pass smtp.mailfrom=aspeedtech.com; arc=none smtp.client-ip=211.20.114.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aspeedtech.com Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Thu, 5 Dec 2024 15:20:48 +0800 Received: from mail.aspeedtech.com (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Thu, 5 Dec 2024 15:20:48 +0800 From: Jacky Chou To: , , , , , , , , , , , CC: Subject: [PATCH net-next v4 2/7] net: faraday: Add ARM64 in FTGMAC100 for AST2700 Date: Thu, 5 Dec 2024 15:20:43 +0800 Message-ID: <20241205072048.1397570-3-jacky_chou@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> References: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org AST2700 is a ARM 64-bit SoC and ftgmac100 adds support 64-bit DMA capability in AST2700. The ftgmac100 on Aspeed Soc 6th generation and above seperates MDIO controller from MAC. It cannot add ARCH_ASPEED_G7 configuration at ARM64, so here changes to select MDIO_ASPEED by ARCH_ARCH_ASPEED for Aspeed 6th generation and above. And remove not 64BIT and BROKEN dependency from FTGMAC100 config. These are added for NDS32 architecture and now this NDS32 support has been removed. Therefore, here does not need it anymore. The ftgmac100 of AST2700 supports 64-bit operation, '!BIT64' dependency will limit 64-bit support. Signed-off-by: Jacky Chou --- drivers/net/ethernet/faraday/Kconfig | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/faraday/Kconfig b/drivers/net/ethernet/faraday/Kconfig index c699bd6bcbb9..c765663c0bbb 100644 --- a/drivers/net/ethernet/faraday/Kconfig +++ b/drivers/net/ethernet/faraday/Kconfig @@ -6,7 +6,7 @@ config NET_VENDOR_FARADAY bool "Faraday devices" default y - depends on ARM || COMPILE_TEST + depends on ARM || ARM64 || COMPILE_TEST help If you have a network (Ethernet) card belonging to this class, say Y. @@ -28,10 +28,9 @@ config FTMAC100 config FTGMAC100 tristate "Faraday FTGMAC100 Gigabit Ethernet support" - depends on ARM || COMPILE_TEST - depends on !64BIT || BROKEN + depends on ARM || ARM64 || COMPILE_TEST select PHYLIB - select MDIO_ASPEED if MACH_ASPEED_G6 + select MDIO_ASPEED if ARCH_ASPEED select CRC32 help This driver supports the FTGMAC100 Gigabit Ethernet controller From patchwork Thu Dec 5 07:20:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacky Chou X-Patchwork-Id: 13894772 X-Patchwork-Delegate: kuba@kernel.org Received: from TWMBX01.aspeed.com (mail.aspeedtech.com [211.20.114.72]) (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 9BF2E1B85D7; Thu, 5 Dec 2024 07:22:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.20.114.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383336; cv=none; b=i0/+wSoQP6ewbayeukY249pl1vb4U2ypw3KqPjk7ScUAglSh3GzdVJcrgz/JC+elSiMyhj6dbg1VjmNxZCdLR5LDqmDvQS99wSawP7u2uM49jVvv2YbMhkgsAc8/sbT4nN4zqcezJK4yYEsdRk0C8NBi32oUEpytqztgP1EX0x4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383336; c=relaxed/simple; bh=r9NYc8MfyGenoK5VR4Xw9lt9XWCXnQGy/+CYZVZ2k/Y=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cAxD3a6CI1E0HlNYNFajxp1vGUEBLUq3iMZ/3nYXWl2OxQ6duu9v1y8+B+1BDyIHP52Lzh6aA9hD3qSockM7cMRXdqGw6+6epn4EKfV3jFld6RHEQdBg7QPVEqRHHC1QFVy7G89GVESx75/9xVvc5c4aSCR2ztGOYcPuY93j9hQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com; spf=pass smtp.mailfrom=aspeedtech.com; arc=none smtp.client-ip=211.20.114.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aspeedtech.com Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Thu, 5 Dec 2024 15:20:48 +0800 Received: from mail.aspeedtech.com (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Thu, 5 Dec 2024 15:20:48 +0800 From: Jacky Chou To: , , , , , , , , , , , CC: Subject: [PATCH net-next v4 3/7] net: ftgmac100: Add reset toggling for Aspeed SOCs Date: Thu, 5 Dec 2024 15:20:44 +0800 Message-ID: <20241205072048.1397570-4-jacky_chou@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> References: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Toggle the SCU reset before hardware initialization. Signed-off-by: Jacky Chou --- drivers/net/ethernet/faraday/ftgmac100.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 17ec35e75a65..96c1eee547c4 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -9,6 +9,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include +#include #include #include #include @@ -98,6 +99,7 @@ struct ftgmac100 { struct work_struct reset_task; struct mii_bus *mii_bus; struct clk *clk; + struct reset_control *rst; /* AST2500/AST2600 RMII ref clock gate */ struct clk *rclk; @@ -1979,6 +1981,22 @@ static int ftgmac100_probe(struct platform_device *pdev) priv->base + FTGMAC100_OFFSET_TM); } + priv->rst = devm_reset_control_get_optional_exclusive(priv->dev, NULL); + if (IS_ERR(priv->rst)) + goto err_register_netdev; + + err = reset_control_assert(priv->rst); + if (err) { + dev_err(priv->dev, "Failed to reset mac (%d)\n", err); + goto err_register_netdev; + } + usleep_range(10000, 20000); + err = reset_control_deassert(priv->rst); + if (err) { + dev_err(priv->dev, "Failed to deassert mac reset (%d)\n", err); + goto err_register_netdev; + } + /* Default ring sizes */ priv->rx_q_entries = priv->new_rx_q_entries = DEF_RX_QUEUE_ENTRIES; priv->tx_q_entries = priv->new_tx_q_entries = DEF_TX_QUEUE_ENTRIES; From patchwork Thu Dec 5 07:20:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacky Chou X-Patchwork-Id: 13894768 X-Patchwork-Delegate: kuba@kernel.org Received: from TWMBX01.aspeed.com (mail.aspeedtech.com [211.20.114.72]) (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 B201D2391AB; Thu, 5 Dec 2024 07:22:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.20.114.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383327; cv=none; b=jrNin/VXricmYyK4daDK+VX1SdCdQLh1evg6rXksabQ3LDKL1l0afxNhMx5bcpcbOO31AX9HWuAgp5LwNsEXvsoB8tgI1K8a2ExewjOgH5Z+gMO0FRcB1p8peL4odAZPCuF7s5rnUbwl7DiDiZQhIK/CdjTF9jqcT6HKquoJH/Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383327; c=relaxed/simple; bh=EOv2FiJhNAPI4O0zuh+HzDvaif58ZEgV2F+TDgHsj0g=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YarBrFcNQhr0EbfbLvdGeLyOwMq501s3mIprjR2ZqiMY0NOl9ufgP5W1a7KMoLLqISu74KWSUBG1HMNfF8Ok7MwYVm9Ge6FtSSHesllvE1i6UB8RQKbkAecZ94t7c8AfM17ird9tw6xVXmyhTrNRq6K+VEoSaKL6Wc8ZWaQmWHw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com; spf=pass smtp.mailfrom=aspeedtech.com; arc=none smtp.client-ip=211.20.114.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aspeedtech.com Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Thu, 5 Dec 2024 15:20:49 +0800 Received: from mail.aspeedtech.com (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Thu, 5 Dec 2024 15:20:49 +0800 From: Jacky Chou To: , , , , , , , , , , , CC: Subject: [PATCH net-next v4 4/7] net: ftgmac100: Add support for AST2700 Date: Thu, 5 Dec 2024 15:20:45 +0800 Message-ID: <20241205072048.1397570-5-jacky_chou@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> References: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Add comptaible for AST2700 and set dma mask to 64-bit. The ftgmac100 on AST2700 supports 64-bit DMA. Signed-off-by: Jacky Chou --- drivers/net/ethernet/faraday/ftgmac100.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 96c1eee547c4..c0540645d151 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -1884,7 +1884,8 @@ static int ftgmac100_probe(struct platform_device *pdev) np = pdev->dev.of_node; if (np && (of_device_is_compatible(np, "aspeed,ast2400-mac") || of_device_is_compatible(np, "aspeed,ast2500-mac") || - of_device_is_compatible(np, "aspeed,ast2600-mac"))) { + of_device_is_compatible(np, "aspeed,ast2600-mac") || + of_device_is_compatible(np, "aspeed,ast2700-mac"))) { priv->rxdes0_edorr_mask = BIT(30); priv->txdes0_edotr_mask = BIT(30); priv->is_aspeed = true; @@ -1976,7 +1977,8 @@ static int ftgmac100_probe(struct platform_device *pdev) goto err_phy_connect; /* Disable ast2600 problematic HW arbitration */ - if (of_device_is_compatible(np, "aspeed,ast2600-mac")) + if (of_device_is_compatible(np, "aspeed,ast2600-mac") || + of_device_is_compatible(np, "aspeed,ast2700-mac")) iowrite32(FTGMAC100_TM_DEFAULT, priv->base + FTGMAC100_OFFSET_TM); } @@ -2021,6 +2023,12 @@ static int ftgmac100_probe(struct platform_device *pdev) netdev->hw_features &= ~(NETIF_F_HW_CSUM | NETIF_F_RXCSUM); netdev->features |= netdev->hw_features; + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); + if (err) { + dev_err(&pdev->dev, "64-bit DMA enable failed\n"); + goto err_register_netdev; + } + /* register network device */ err = register_netdev(netdev); if (err) { From patchwork Thu Dec 5 07:20:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacky Chou X-Patchwork-Id: 13894769 X-Patchwork-Delegate: kuba@kernel.org Received: from TWMBX01.aspeed.com (mail.aspeedtech.com [211.20.114.72]) (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 30DFE1AB510; Thu, 5 Dec 2024 07:22:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.20.114.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383330; cv=none; b=Vg4ZLGvouSAMjHOsADcmSMP2c7pJmsXWblQxqZunGC9/9WTWbHT5n6sEsHN8E2tPOtB5rlegqlbqWE5ryKnsDD/+P5C4WCSsB8MnancGM4AomVU2ABSqrjEz6sP5Nzs5wAiOQLBlYkcqg1gL9x8pCps/+gZsY85OGdrRob2XBNI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383330; c=relaxed/simple; bh=Dj9AAR6qPKTUh2KtZ7JY6BYTjL6njVKcVqNOH11sqfc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZGlqDdLk0JG7bD0VQWHPQtsYLAX3gk5pMP1tjnihPAJmrHQQscXcC1OccIlpLuxpFxIafg+4qaC/Kabd1iAvYQvSaHoXRkomYIdtFoY/0ZnF4GkeOCj2wE3OGSrLVdTyNhj3ZLnki8EMv4tpyfHlTxpjnZODUjcqqOrlHUIOX0Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com; spf=pass smtp.mailfrom=aspeedtech.com; arc=none smtp.client-ip=211.20.114.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aspeedtech.com Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Thu, 5 Dec 2024 15:20:49 +0800 Received: from mail.aspeedtech.com (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Thu, 5 Dec 2024 15:20:49 +0800 From: Jacky Chou To: , , , , , , , , , , , CC: Subject: [PATCH net-next v4 5/7] net: ftgmac100: add pin strap configuration for AST2700 Date: Thu, 5 Dec 2024 15:20:46 +0800 Message-ID: <20241205072048.1397570-6-jacky_chou@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> References: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org On AST2700, the RMII/RGMII pin strap is configured by setting MAC 0x50 bit 20. Set to 0 is RGMII and set to 1 is RMII. Use compatible property to distinguish different generations for configuration. Signed-off-by: Jacky Chou --- drivers/net/ethernet/faraday/ftgmac100.c | 5 +++++ drivers/net/ethernet/faraday/ftgmac100.h | 1 + 2 files changed, 6 insertions(+) diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index c0540645d151..abee1ef1e293 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -323,6 +323,7 @@ static void ftgmac100_init_hw(struct ftgmac100 *priv) static void ftgmac100_start_hw(struct ftgmac100 *priv) { u32 maccr = ioread32(priv->base + FTGMAC100_OFFSET_MACCR); + struct phy_device *phydev = priv->netdev->phydev; /* Keep the original GMAC and FAST bits */ maccr &= (FTGMAC100_MACCR_FAST_MODE | FTGMAC100_MACCR_GIGA_MODE); @@ -351,6 +352,10 @@ static void ftgmac100_start_hw(struct ftgmac100 *priv) if (priv->netdev->features & NETIF_F_HW_VLAN_CTAG_RX) maccr |= FTGMAC100_MACCR_RM_VLAN; + if (of_device_is_compatible(priv->dev->of_node, "aspeed,ast2700-mac") && + phydev && phydev->interface == PHY_INTERFACE_MODE_RMII) + maccr |= FTGMAC100_MACCR_RMII_ENABLE; + /* Hit the HW */ iowrite32(maccr, priv->base + FTGMAC100_OFFSET_MACCR); } diff --git a/drivers/net/ethernet/faraday/ftgmac100.h b/drivers/net/ethernet/faraday/ftgmac100.h index 4968f6f0bdbc..c87aa7d7f14c 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.h +++ b/drivers/net/ethernet/faraday/ftgmac100.h @@ -166,6 +166,7 @@ #define FTGMAC100_MACCR_RX_MULTIPKT (1 << 16) #define FTGMAC100_MACCR_RX_BROADPKT (1 << 17) #define FTGMAC100_MACCR_DISCARD_CRCERR (1 << 18) +#define FTGMAC100_MACCR_RMII_ENABLE (1 << 20) /* defined in ast2700 */ #define FTGMAC100_MACCR_FAST_MODE (1 << 19) #define FTGMAC100_MACCR_SW_RST (1 << 31) From patchwork Thu Dec 5 07:20:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacky Chou X-Patchwork-Id: 13894770 X-Patchwork-Delegate: kuba@kernel.org Received: from TWMBX01.aspeed.com (mail.aspeedtech.com [211.20.114.72]) (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 4BD4F1B2194; Thu, 5 Dec 2024 07:22:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.20.114.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383332; cv=none; b=OP970ea50dt9FpXgEmqpn3AYTXqmfjFUjd1N1uVllXo/9TRYE+KNc+GqW6KewUG/X9be75QT5Nsf4uXE9hE64ZAZn1RndDlr2xzAIoKsfZbftMGBMIBeb+h/GG2tBY0hdobBVQK/O0xpwifoMfRcVPwn7ebf/jKPlFSSdRtVgLg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383332; c=relaxed/simple; bh=TGpKUxiN3tXZ0dN2+1GOV5WymAQo95c1XOXWJxWJqVM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eRob6jvcHON617pZduMC8Bhev6o1Qxv8NEq4yme56a64sSVe3hyMiIrFTiGoznIB8lNQUU7L1VF76idLIT7WXaucE78tu/DopRGgZGht47Le+pHG4vuZsIyUBL4x4/2pKIfMXGygpMV2NHl8x6m8yY4IfWGnTSG/DTcvx9KLlYA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com; spf=pass smtp.mailfrom=aspeedtech.com; arc=none smtp.client-ip=211.20.114.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aspeedtech.com Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Thu, 5 Dec 2024 15:20:49 +0800 Received: from mail.aspeedtech.com (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Thu, 5 Dec 2024 15:20:49 +0800 From: Jacky Chou To: , , , , , , , , , , , CC: Subject: [PATCH net-next v4 6/7] net: ftgmac100: Add 64-bit DMA support for AST2700 Date: Thu, 5 Dec 2024 15:20:47 +0800 Message-ID: <20241205072048.1397570-7-jacky_chou@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> References: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org In 7th generation of Aspeed, the ftgmac100 supports 64-bit DMA operations because it is 64-bit SoC. Add the high address base registers for TX/RX description and add the high address base fields for packet buffer in TX/RX description. These added registers and fields are reserved in older generations and they will not affect older hardware for accessing read/write operations to them. We have verified these patches in older generations, link AST2600. Run iperf3, tftp, ping and dhcp etc. to confirm that it works normally on the new generation and older generation. In TX/RX description, software will reuse the packet buffer address fields to construct the dma information to unmap these dma region. Filling in these high address fields in tx/rxdesc2 is software, and the hardware just use it to do DMA operation and it does not modify these fields. And, in older generation, the software will assign to ZERO to the fields that added in 7th gereration. Because these older SoCs are 32-bit platforms, the high address will always be ZERO. Therefore, avoid using a lot of conditions to set the physical address on old and new generations. Signed-off-by: Jacky Chou --- drivers/net/ethernet/faraday/ftgmac100.c | 35 ++++++++++++++++++------ drivers/net/ethernet/faraday/ftgmac100.h | 9 ++++++ 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index abee1ef1e293..11a81f75ed4e 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -267,10 +267,12 @@ static void ftgmac100_init_hw(struct ftgmac100 *priv) iowrite32(reg, priv->base + FTGMAC100_OFFSET_ISR); /* Setup RX ring buffer base */ - iowrite32(priv->rxdes_dma, priv->base + FTGMAC100_OFFSET_RXR_BADR); + iowrite32(lower_32_bits(priv->rxdes_dma), priv->base + FTGMAC100_OFFSET_RXR_BADR); + iowrite32(upper_32_bits(priv->rxdes_dma), priv->base + FTGMAC100_OFFSET_RXR_BADDR_HIGH); /* Setup TX ring buffer base */ - iowrite32(priv->txdes_dma, priv->base + FTGMAC100_OFFSET_NPTXR_BADR); + iowrite32(lower_32_bits(priv->txdes_dma), priv->base + FTGMAC100_OFFSET_NPTXR_BADR); + iowrite32(upper_32_bits(priv->txdes_dma), priv->base + FTGMAC100_OFFSET_TXR_BADDR_HIGH); /* Configure RX buffer size */ iowrite32(FTGMAC100_RBSR_SIZE(RX_BUF_SIZE), @@ -432,7 +434,9 @@ static int ftgmac100_alloc_rx_buf(struct ftgmac100 *priv, unsigned int entry, priv->rx_skbs[entry] = skb; /* Store DMA address into RX desc */ - rxdes->rxdes3 = cpu_to_le32(map); + rxdes->rxdes2 = cpu_to_le32(FIELD_PREP(FTGMAC100_RXDES2_RXBUF_BADR_HI, + upper_32_bits(map))); + rxdes->rxdes3 = cpu_to_le32(lower_32_bits(map)); /* Ensure the above is ordered vs clearing the OWN bit */ dma_wmb(); @@ -558,7 +562,8 @@ static bool ftgmac100_rx_packet(struct ftgmac100 *priv, int *processed) csum_vlan & 0xffff); /* Tear down DMA mapping, do necessary cache management */ - map = le32_to_cpu(rxdes->rxdes3); + map = le32_to_cpu(rxdes->rxdes3) | + ((le32_to_cpu(rxdes->rxdes2) & FTGMAC100_RXDES2_RXBUF_BADR_HI) << 16); #if defined(CONFIG_ARM) && !defined(CONFIG_ARM_DMA_USE_IOMMU) /* When we don't have an iommu, we can save cycles by not @@ -635,9 +640,12 @@ static void ftgmac100_free_tx_packet(struct ftgmac100 *priv, struct ftgmac100_txdes *txdes, u32 ctl_stat) { - dma_addr_t map = le32_to_cpu(txdes->txdes3); + dma_addr_t map; size_t len; + map = le32_to_cpu(txdes->txdes3) | + ((le32_to_cpu(txdes->txdes2) & FTGMAC100_TXDES2_TXBUF_BADR_HI) << 16); + if (ctl_stat & FTGMAC100_TXDES0_FTS) { len = skb_headlen(skb); dma_unmap_single(priv->dev, map, len, DMA_TO_DEVICE); @@ -791,7 +799,9 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, f_ctl_stat |= FTGMAC100_TXDES0_FTS; if (nfrags == 0) f_ctl_stat |= FTGMAC100_TXDES0_LTS; - txdes->txdes3 = cpu_to_le32(map); + txdes->txdes2 = cpu_to_le32(FIELD_PREP(FTGMAC100_TXDES2_TXBUF_BADR_HI, + upper_32_bits((ulong)map))); + txdes->txdes3 = cpu_to_le32(lower_32_bits(map)); txdes->txdes1 = cpu_to_le32(csum_vlan); /* Next descriptor */ @@ -819,7 +829,9 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, ctl_stat |= FTGMAC100_TXDES0_LTS; txdes->txdes0 = cpu_to_le32(ctl_stat); txdes->txdes1 = 0; - txdes->txdes3 = cpu_to_le32(map); + txdes->txdes2 = cpu_to_le32(FIELD_PREP(FTGMAC100_TXDES2_TXBUF_BADR_HI, + upper_32_bits((ulong)map))); + txdes->txdes3 = cpu_to_le32(lower_32_bits(map)); /* Next one */ pointer = ftgmac100_next_tx_pointer(priv, pointer); @@ -894,7 +906,10 @@ static void ftgmac100_free_buffers(struct ftgmac100 *priv) for (i = 0; i < priv->rx_q_entries; i++) { struct ftgmac100_rxdes *rxdes = &priv->rxdes[i]; struct sk_buff *skb = priv->rx_skbs[i]; - dma_addr_t map = le32_to_cpu(rxdes->rxdes3); + dma_addr_t map; + + map = le32_to_cpu(rxdes->rxdes3) | + ((le32_to_cpu(rxdes->rxdes2) & FTGMAC100_RXDES2_RXBUF_BADR_HI) << 16); if (!skb) continue; @@ -993,7 +1008,9 @@ static void ftgmac100_init_rings(struct ftgmac100 *priv) for (i = 0; i < priv->rx_q_entries; i++) { rxdes = &priv->rxdes[i]; rxdes->rxdes0 = 0; - rxdes->rxdes3 = cpu_to_le32(priv->rx_scratch_dma); + rxdes->rxdes2 = cpu_to_le32(FIELD_PREP(FTGMAC100_RXDES2_RXBUF_BADR_HI, + upper_32_bits(priv->rx_scratch_dma))); + rxdes->rxdes3 = cpu_to_le32(lower_32_bits(priv->rx_scratch_dma)); } /* Mark the end of the ring */ rxdes->rxdes0 |= cpu_to_le32(priv->rxdes0_edorr_mask); diff --git a/drivers/net/ethernet/faraday/ftgmac100.h b/drivers/net/ethernet/faraday/ftgmac100.h index c87aa7d7f14c..ac39b864a80c 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.h +++ b/drivers/net/ethernet/faraday/ftgmac100.h @@ -57,6 +57,13 @@ #define FTGMAC100_OFFSET_RX_RUNT 0xc0 #define FTGMAC100_OFFSET_RX_CRCER_FTL 0xc4 #define FTGMAC100_OFFSET_RX_COL_LOST 0xc8 +/* reserved 0xcc - 0x174 */ +#define FTGMAC100_OFFSET_TXR_BADDR_LOW 0x178 /* ast2700 */ +#define FTGMAC100_OFFSET_TXR_BADDR_HIGH 0x17c /* ast2700 */ +#define FTGMAC100_OFFSET_HPTXR_BADDR_LOW 0x180 /* ast2700 */ +#define FTGMAC100_OFFSET_HPTXR_BADDR_HIGH 0x184 /* ast2700 */ +#define FTGMAC100_OFFSET_RXR_BADDR_LOW 0x188 /* ast2700 */ +#define FTGMAC100_OFFSET_RXR_BADDR_HIGH 0x18C /* ast2700 */ /* * Interrupt status register & interrupt enable register @@ -226,6 +233,7 @@ struct ftgmac100_txdes { #define FTGMAC100_TXDES1_TX2FIC (1 << 30) #define FTGMAC100_TXDES1_TXIC (1 << 31) +#define FTGMAC100_TXDES2_TXBUF_BADR_HI GENMASK(18, 16) /* * Receive descriptor, aligned to 16 bytes */ @@ -272,4 +280,5 @@ struct ftgmac100_rxdes { #define FTGMAC100_RXDES1_UDP_CHKSUM_ERR (1 << 26) #define FTGMAC100_RXDES1_IP_CHKSUM_ERR (1 << 27) +#define FTGMAC100_RXDES2_RXBUF_BADR_HI GENMASK(18, 16) #endif /* __FTGMAC100_H */ From patchwork Thu Dec 5 07:20:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacky Chou X-Patchwork-Id: 13894771 X-Patchwork-Delegate: kuba@kernel.org Received: from TWMBX01.aspeed.com (mail.aspeedtech.com [211.20.114.72]) (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 CECE51B4F0F; Thu, 5 Dec 2024 07:22:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.20.114.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383334; cv=none; b=CRkRjb/OyazDupuhBybx/yPXciV2qGBCnLtVg3CkS4E/8z+pnmsactVn7sJ7JNli95Nf7KpMpv13B8yt4HWJgAXJkWSIM7xTcblNSlPhHo8yYbzizwjRC8zkQQc6k24mqRfRJXvaeis80qvkstNlyEcnDnI+a0L6CC9dQhwgaoc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733383334; c=relaxed/simple; bh=CYrgK0GZef4qd4DylejgFhuD+iymzjGbUbnw1d4ueFA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sZa2IFkdbdb7WSM54N3W7NP1OP2eoHPHAlIdBb1w1BCQgelc4kPHPMxwOP7BgnzOExxVLBHic5GcD/60ULKGHXopUpWesJcTpC4jSrgHA8yrpd810M12pE83M/+QudPJDk7oK1eMkkQIAxSmjGmIuXhANtcbzTYa5XRZOv/AgJI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com; spf=pass smtp.mailfrom=aspeedtech.com; arc=none smtp.client-ip=211.20.114.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aspeedtech.com Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Thu, 5 Dec 2024 15:20:49 +0800 Received: from mail.aspeedtech.com (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Thu, 5 Dec 2024 15:20:49 +0800 From: Jacky Chou To: , , , , , , , , , , , CC: Subject: [PATCH net-next v4 7/7] net: ftgmac100: remove extra newline symbols Date: Thu, 5 Dec 2024 15:20:48 +0800 Message-ID: <20241205072048.1397570-8-jacky_chou@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> References: <20241205072048.1397570-1-jacky_chou@aspeedtech.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Remove some unnecessary newline symbols in code. Signed-off-by: Jacky Chou --- drivers/net/ethernet/faraday/ftgmac100.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 11a81f75ed4e..5a0a94c3b1eb 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -575,7 +575,6 @@ static bool ftgmac100_rx_packet(struct ftgmac100 *priv, int *processed) dma_unmap_single(priv->dev, map, RX_BUF_SIZE, DMA_FROM_DEVICE); #endif - /* Resplenish rx ring */ ftgmac100_alloc_rx_buf(priv, pointer, rxdes, GFP_ATOMIC); priv->rx_pointer = ftgmac100_next_rx_pointer(priv, pointer); @@ -1273,7 +1272,6 @@ static int ftgmac100_poll(struct napi_struct *napi, int budget) more = ftgmac100_rx_packet(priv, &work_done); } while (more && work_done < budget); - /* The interrupt is telling us to kick the MAC back to life * after an RX overflow */ @@ -1363,7 +1361,6 @@ static void ftgmac100_reset(struct ftgmac100 *priv) if (priv->mii_bus) mutex_lock(&priv->mii_bus->mdio_lock); - /* Check if the interface is still up */ if (!netif_running(netdev)) goto bail; @@ -1462,7 +1459,6 @@ static void ftgmac100_adjust_link(struct net_device *netdev) if (netdev->phydev) mutex_lock(&netdev->phydev->lock); - } static int ftgmac100_mii_probe(struct net_device *netdev) @@ -1990,7 +1986,6 @@ static int ftgmac100_probe(struct platform_device *pdev) dev_err(priv->dev, "MII probe failed!\n"); goto err_ncsi_dev; } - } if (priv->is_aspeed) {