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>, <netdev@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <jacky_chou@aspeedtech.com>
Subject: [net-next v2 4/7] net: ftgmac100: Add support for AST2700
Date: Mon, 18 Nov 2024 14:02:04 +0800 [thread overview]
Message-ID: <20241118060207.141048-5-jacky_chou@aspeedtech.com> (raw)
In-Reply-To: <20241118060207.141048-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 | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index cae23b712a6d..5b277285666a 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;
@@ -1967,7 +1968,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) {
@@ -1995,9 +1995,18 @@ static int ftgmac100_probe(struct platform_device *pdev)
}
/* 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);
+
+ if (of_device_is_compatible(np, "aspeed,ast2700-mac")) {
+ 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;
+ }
+ }
}
/* Default ring sizes */
--
2.25.1
next prev parent reply other threads:[~2024-11-18 6:02 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-18 6:02 [net-next v2 0/7] Add Aspeed G7 FTGMAC100 support Jacky Chou
2024-11-18 6:02 ` [net-next v2 1/7] dt-bindings: net: ftgmac100: support for AST2700 Jacky Chou
2024-11-19 7:40 ` Krzysztof Kozlowski
2024-11-19 11:12 ` 回覆: " Jacky Chou
2024-11-18 6:02 ` [net-next v2 2/7] net: faraday: Add ARM64 in FTGMAC100 " Jacky Chou
2024-11-18 6:02 ` [net-next v2 3/7] net: ftgmac100: Add reset toggling for Aspeed SOCs Jacky Chou
2024-11-18 6:32 ` Arnd Bergmann
2024-11-18 7:45 ` 回覆: " Jacky Chou
2024-11-18 10:03 ` Philipp Zabel
2024-11-18 10:44 ` 回覆: " Jacky Chou
2024-11-18 6:02 ` Jacky Chou [this message]
2024-11-18 6:02 ` [net-next v2 5/7] net: ftgmac100: add pin strap configuration for AST2700 Jacky Chou
2024-11-18 6:34 ` Arnd Bergmann
2024-11-18 7:51 ` 回覆: " Jacky Chou
2024-11-18 9:04 ` Arnd Bergmann
2024-11-18 9:36 ` 回覆: " Jacky Chou
2024-11-18 6:02 ` [net-next v2 6/7] net: ftgmac100: Add 64-bit DMA support " Jacky Chou
2024-11-18 6:02 ` [net-next v2 7/7] net: ftgmac100: remove extra newline symbols Jacky Chou
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=20241118060207.141048-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=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®