mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jacky Chou <jacky_chou@aspeedtech.com>
To: <andrew+netdev@lunn.ch>, <davem@davemloft.net>,
	<edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
	<robh@kernel.org>, <krzk+dt@kernel.org>, <conor+dt@kernel.org>,
	<p.zabel@pengutronix.de>, <ratbert@faraday-tech.com>,
	<netdev@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Cc: <jacky_chou@aspeedtech.com>
Subject: [PATCH net-next v3 4/7] net: ftgmac100: Add support for AST2700
Date: Wed, 20 Nov 2024 15:50:14 +0800	[thread overview]
Message-ID: <20241120075017.2590228-5-jacky_chou@aspeedtech.com> (raw)
In-Reply-To: <20241120075017.2590228-1-jacky_chou@aspeedtech.com>

Add comptaible for AST2700 and set dma mask to 64-bit.
The ftgmac100 on AST2700 supports 64-bit DMA.

Signed-off-by: Jacky Chou <jacky_chou@aspeedtech.com>
---
 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 1840f7089676..6dfd29505d2c 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);
 	}
@@ -2023,6 +2025,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) {
-- 
2.25.1


  parent reply	other threads:[~2024-11-20  7:50 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-20  7:50 [PATCH net-next v3 0/7] Add Aspeed G7 FTGMAC100 support Jacky Chou
2024-11-20  7:50 ` [PATCH net-next v3 1/7] dt-bindings: net: ftgmac100: support for AST2700 Jacky Chou
2024-11-25 10:24   ` Philipp Zabel
2024-11-25 16:13     ` Krzysztof Kozlowski
2024-11-27  3:57       ` 回覆: " Jacky Chou
2024-11-27  3:50     ` Jacky Chou
2024-11-20  7:50 ` [PATCH net-next v3 2/7] net: faraday: Add ARM64 in FTGMAC100 " Jacky Chou
2024-11-25 16:12   ` Krzysztof Kozlowski
2024-11-20  7:50 ` [PATCH net-next v3 3/7] net: ftgmac100: Add reset toggling for Aspeed SOCs Jacky Chou
2024-11-25 10:27   ` Philipp Zabel
2024-11-27  3:48     ` 回覆: " Jacky Chou
2024-11-20  7:50 ` Jacky Chou [this message]
2024-11-20  7:50 ` [PATCH net-next v3 5/7] net: ftgmac100: add pin strap configuration for AST2700 Jacky Chou
2024-11-20  7:50 ` [PATCH net-next v3 6/7] net: ftgmac100: Add 64-bit DMA support " Jacky Chou
2024-11-20  7:50 ` [PATCH net-next v3 7/7] net: ftgmac100: remove extra newline symbols Jacky Chou
2024-11-21  8:41 ` [PATCH net-next v3 0/7] Add Aspeed G7 FTGMAC100 support Paolo Abeni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241120075017.2590228-5-jacky_chou@aspeedtech.com \
    --to=jacky_chou@aspeedtech.com \
    --cc=andrew+netdev@lunn.ch \
    --cc=conor+dt@kernel.org \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=edumazet@google.com \
    --cc=krzk+dt@kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=p.zabel@pengutronix.de \
    --cc=pabeni@redhat.com \
    --cc=ratbert@faraday-tech.com \
    --cc=robh@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®