From: matthias.bgg@kernel.org
To: Florian Fainelli <f.fainelli@gmail.com>,
"David S . Miller" <davem@davemloft.net>
Cc: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
Matthias Brugger <matthias.bgg@kernel.org>,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
Stefan Wahren <wahrenst@gmx.net>,
Matthias Brugger <mbrugger@suse.com>,
Doug Berger <opendmb@gmail.com>,
bcm-kernel-feedback-list@broadcom.com,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH v1 2/3] net: bcmgenet: use optional max DMA burst size property
Date: Fri, 11 Oct 2019 20:48:20 +0200 [thread overview]
Message-ID: <20191011184822.866-3-matthias.bgg@kernel.org> (raw)
In-Reply-To: <20191011184822.866-1-matthias.bgg@kernel.org>
From: Matthias Brugger <mbrugger@suse.com>
Depending on the HW, the maximal usable DMA burst size can vary.
If not set accordingly a timeout in the transmit queue happens and no
package can be sent. Read to optional max-burst-sz property, if not
present, fallback to the standard value.
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 13 +++++++++++--
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 +
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 12cb77ef1081..a7bb822a6d83 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2576,7 +2576,8 @@ static int bcmgenet_init_dma(struct bcmgenet_priv *priv)
}
/* Init rDma */
- bcmgenet_rdma_writel(priv, DMA_MAX_BURST_LENGTH, DMA_SCB_BURST_SIZE);
+ bcmgenet_rdma_writel(priv, priv->dma_max_burst_length,
+ DMA_SCB_BURST_SIZE);
/* Initialize Rx queues */
ret = bcmgenet_init_rx_queues(priv->dev);
@@ -2589,7 +2590,8 @@ static int bcmgenet_init_dma(struct bcmgenet_priv *priv)
}
/* Init tDma */
- bcmgenet_tdma_writel(priv, DMA_MAX_BURST_LENGTH, DMA_SCB_BURST_SIZE);
+ bcmgenet_tdma_writel(priv, priv->dma_max_burst_length,
+ DMA_SCB_BURST_SIZE);
/* Initialize Tx queues */
bcmgenet_init_tx_queues(priv->dev);
@@ -3522,6 +3524,13 @@ static int bcmgenet_probe(struct platform_device *pdev)
clk_prepare_enable(priv->clk);
+ if (dn) {
+ of_property_read_u32(dn, "dma-burst-sz",
+ &priv->dma_max_burst_length);
+ } else {
+ priv->dma_max_burst_length = DMA_MAX_BURST_LENGTH;
+ }
+
bcmgenet_set_hw_params(priv);
/* Mii wait queue */
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
index 4a8fc03d82fd..897f356eb376 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
@@ -663,6 +663,7 @@ struct bcmgenet_priv {
bool crc_fwd_en;
unsigned int dma_rx_chk_bit;
+ unsigned int dma_max_burst_length;
u32 msg_enable;
--
2.23.0
next prev parent reply other threads:[~2019-10-11 18:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-11 18:48 [PATCH v1 0/3] This series adds ethernet support for RPi4 matthias.bgg
2019-10-11 18:48 ` [PATCH v1 1/3] dt-bindings: net: bcmgenet add property for max DMA burst size matthias.bgg
2019-10-11 19:07 ` Florian Fainelli
2019-10-11 18:48 ` matthias.bgg [this message]
2019-10-11 19:01 ` [PATCH v1 2/3] net: bcmgenet: use optional max DMA burst size property Nicolas Saenz Julienne
2019-10-11 18:48 ` [PATCH v1 3/3] ARM: dts: bcm2711: Enable GENET support for the RPi4 matthias.bgg
2019-10-11 19:31 ` Florian Fainelli
2019-10-13 18:41 ` Stefan Wahren
2019-10-13 19:19 ` Florian Fainelli
2019-10-15 19:35 ` Stefan Wahren
2019-10-15 19:39 ` Florian Fainelli
2019-10-11 23:09 ` Stefan Wahren
2019-10-11 23:11 ` Florian Fainelli
2019-10-12 17:05 ` Stefan Wahren
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=20191011184822.866-3-matthias.bgg@kernel.org \
--to=matthias.bgg@kernel.org \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=mbrugger@suse.com \
--cc=netdev@vger.kernel.org \
--cc=nsaenzjulienne@suse.de \
--cc=opendmb@gmail.com \
--cc=wahrenst@gmx.net \
/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;
as well as URLs for NNTP newsgroup(s).