From: "Yuval Mintz" <yuvalmin@broadcom.com>
To: davem@davemloft.net, netdev@vger.kernel.org
Cc: ariele@broadcom.com, eilong@broadcom.com,
"Merav Sicron" <meravs@broadcom.com>,
"Yuval Mintz" <yuvalmin@broadcom.com>
Subject: [PATCH net 9/9] bnx2x: Set NETIF_F_HIGHDMA unconditionally
Date: Tue, 15 Oct 2013 16:28:55 +0200 [thread overview]
Message-ID: <1381847335-32662-10-git-send-email-yuvalmin@broadcom.com> (raw)
In-Reply-To: <1381847335-32662-1-git-send-email-yuvalmin@broadcom.com>
From: Merav Sicron <meravs@broadcom.com>
Current driver implementation incorrectly sets the flag only if 64-bit
DMA mask succeeded.
Signed-off-by: Merav Sicron <meravs@broadcom.com>
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 -
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 +---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 310c57a..c5e375d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1528,7 +1528,6 @@ struct bnx2x {
#define PCI_32BIT_FLAG (1 << 1)
#define ONE_PORT_FLAG (1 << 2)
#define NO_WOL_FLAG (1 << 3)
-#define USING_DAC_FLAG (1 << 4)
#define USING_MSIX_FLAG (1 << 5)
#define USING_MSI_FLAG (1 << 6)
#define DISABLE_MSI_FLAG (1 << 7)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index fdc65e6..a3747d1 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -12109,7 +12109,6 @@ static int bnx2x_set_coherency_mask(struct bnx2x *bp)
struct device *dev = &bp->pdev->dev;
if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) {
- bp->flags |= USING_DAC_FLAG;
if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) {
dev_err(dev, "dma_set_coherent_mask failed, aborting\n");
return -EIO;
@@ -12277,8 +12276,7 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev,
NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_HIGHDMA;
dev->features |= dev->hw_features | NETIF_F_HW_VLAN_CTAG_RX;
- if (bp->flags & USING_DAC_FLAG)
- dev->features |= NETIF_F_HIGHDMA;
+ dev->features |= NETIF_F_HIGHDMA;
/* Add Loopback capability to the device */
dev->hw_features |= NETIF_F_LOOPBACK;
--
1.8.1.227.g44fe835
prev parent reply other threads:[~2013-10-15 14:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-15 14:28 [PATCH net 0/9] bnx2x: Bug fixes patch series Yuval Mintz
2013-10-15 14:28 ` [PATCH net 1/9] bnx2x: Fix Maximum CoS estimation for VFs Yuval Mintz
2013-10-15 14:28 ` [PATCH net 2/9] bnx2x: Prevent an illegal pointer dereference during panic Yuval Mintz
2013-10-17 18:21 ` David Miller
2013-10-17 18:47 ` Eilon Greenstein
2013-10-17 20:15 ` David Miller
2013-10-15 14:28 ` [PATCH net 3/9] bnx2x: Unlock VF-PF channel on MAC/VLAN config error Yuval Mintz
2013-10-15 14:28 ` [PATCH net 4/9] bnx2x: Fix Coalescing configuration Yuval Mintz
2013-10-15 14:28 ` [PATCH net net 5/9] bnx2x: Fix config when SR-IOV and iSCSI are enabled Yuval Mintz
2013-10-15 14:28 ` [PATCH net 6/9] bnx2x: Prevent null pointer dereference on error flow Yuval Mintz
2013-10-15 14:28 ` [PATCH net 7/9] bnx2x: Lock DMAE when used by statistic flow Yuval Mintz
2013-10-15 14:28 ` [PATCH net 8/9] bnx2x: Don't pretend during register dump Yuval Mintz
2013-10-15 14:28 ` Yuval Mintz [this message]
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=1381847335-32662-10-git-send-email-yuvalmin@broadcom.com \
--to=yuvalmin@broadcom.com \
--cc=ariele@broadcom.com \
--cc=davem@davemloft.net \
--cc=eilong@broadcom.com \
--cc=meravs@broadcom.com \
--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;
as well as URLs for NNTP newsgroup(s).