From: Doug Berger <opendmb@gmail.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Doug Berger <opendmb@gmail.com>
Subject: [PATCH net-next 1/8] net: bcmgenet: enable NETIF_F_HIGHDMA flag
Date: Tue, 17 Dec 2019 13:02:22 -0800 [thread overview]
Message-ID: <1576616549-39097-2-git-send-email-opendmb@gmail.com> (raw)
In-Reply-To: <1576616549-39097-1-git-send-email-opendmb@gmail.com>
This commit configures the DMA masks for the GENET driver and
sets the NETIF_F_HIGHDMA flag to report support of the feature.
Signed-off-by: Doug Berger <opendmb@gmail.com>
---
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 32f1245a69e2..d9defb8b1e5f 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2,7 +2,7 @@
/*
* Broadcom GENET (Gigabit Ethernet) controller driver
*
- * Copyright (c) 2014-2017 Broadcom
+ * Copyright (c) 2014-2019 Broadcom
*/
#define pr_fmt(fmt) "bcmgenet: " fmt
@@ -3537,7 +3537,7 @@ static int bcmgenet_probe(struct platform_device *pdev)
/* Set hardware features */
dev->hw_features |= NETIF_F_SG | NETIF_F_IP_CSUM |
- NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM;
+ NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA | NETIF_F_RXCSUM;
/* Request the WOL interrupt and advertise suspend if available */
priv->wol_irq_disabled = true;
@@ -3574,6 +3574,14 @@ static int bcmgenet_probe(struct platform_device *pdev)
bcmgenet_set_hw_params(priv);
+ err = -EIO;
+ if (priv->hw_params->flags & GENET_HAS_40BITS)
+ err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(40));
+ if (err)
+ err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+ if (err)
+ goto err;
+
/* Mii wait queue */
init_waitqueue_head(&priv->wq);
/* Always use RX_BUF_LENGTH (2KB) buffer for all chips */
--
2.7.4
next prev parent reply other threads:[~2019-12-17 21:05 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 21:02 [PATCH net-next 0/8] net: bcmgenet: Turn on offloads by default Doug Berger
2019-12-17 21:02 ` Doug Berger [this message]
2019-12-17 22:51 ` [PATCH net-next 1/8] net: bcmgenet: enable NETIF_F_HIGHDMA flag Florian Fainelli
2019-12-17 21:02 ` [PATCH net-next 2/8] net: bcmgenet: enable NETIF_F_HW_CSUM feature Doug Berger
2019-12-17 21:02 ` [PATCH net-next 3/8] net: bcmgenet: use CHECKSUM_COMPLETE for NETIF_F_RXCSUM Doug Berger
2019-12-17 21:16 ` David Miller
2019-12-17 22:52 ` Florian Fainelli
2019-12-17 23:21 ` David Miller
2019-12-17 22:52 ` Florian Fainelli
2019-12-17 23:36 ` Doug Berger
2019-12-17 23:08 ` Jakub Kicinski
2019-12-25 23:39 ` kbuild test robot
2019-12-17 21:02 ` [PATCH net-next 4/8] net: bcmgenet: Refactor bcmgenet_set_features() Doug Berger
2019-12-17 23:02 ` Florian Fainelli
2019-12-17 21:02 ` [PATCH net-next 5/8] net: bcmgenet: Utilize bcmgenet_set_features() during resume/open Doug Berger
2019-12-17 23:01 ` Florian Fainelli
2019-12-17 21:02 ` [PATCH net-next 6/8] net: bcmgenet: Turn on offloads by default Doug Berger
2019-12-17 23:02 ` Florian Fainelli
2019-12-17 21:02 ` [PATCH net-next 7/8] net: bcmgenet: Be drop monitor friendly while re-allocating headroom Doug Berger
2019-12-17 23:00 ` Florian Fainelli
2019-12-17 21:02 ` [PATCH net-next 8/8] net: bcmgenet: Add software counters to track reallocations Doug Berger
2019-12-17 23:00 ` Florian Fainelli
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=1576616549-39097-2-git-send-email-opendmb@gmail.com \
--to=opendmb@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.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