mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org,
	Govindarajulu Varadarajan <gvaradar@cisco.com>,
	"David S. Miller" <davem@davemloft.net>
Subject: [PATCH 4.9 10/31] enic: set DMA mask to 47 bit
Date: Tue, 12 Jun 2018 18:46:13 +0200	[thread overview]
Message-ID: <20180612164621.197259901@linuxfoundation.org> (raw)
In-Reply-To: <20180612164620.797338191@linuxfoundation.org>

4.9-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Govindarajulu Varadarajan <gvaradar@cisco.com>

[ Upstream commit 322eaa06d55ebc1402a4a8d140945cff536638b4 ]

In commit 624dbf55a359b ("driver/net: enic: Try DMA 64 first, then
failover to DMA") DMA mask was changed from 40 bits to 64 bits.
Hardware actually supports only 47 bits.

Fixes: 624dbf55a359b ("driver/net: enic: Try DMA 64 first, then failover to DMA")
Signed-off-by: Govindarajulu Varadarajan <gvaradar@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/ethernet/cisco/enic/enic_main.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2541,11 +2541,11 @@ static int enic_probe(struct pci_dev *pd
 	pci_set_master(pdev);
 
 	/* Query PCI controller on system for DMA addressing
-	 * limitation for the device.  Try 64-bit first, and
+	 * limitation for the device.  Try 47-bit first, and
 	 * fail to 32-bit.
 	 */
 
-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
+	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(47));
 	if (err) {
 		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
 		if (err) {
@@ -2559,10 +2559,10 @@ static int enic_probe(struct pci_dev *pd
 			goto err_out_release_regions;
 		}
 	} else {
-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
+		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(47));
 		if (err) {
 			dev_err(dev, "Unable to obtain %u-bit DMA "
-				"for consistent allocations, aborting\n", 64);
+				"for consistent allocations, aborting\n", 47);
 			goto err_out_release_regions;
 		}
 		using_dac = 1;



  parent reply	other threads:[~2018-06-12 17:05 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-12 16:46 [PATCH 4.9 00/31] 4.9.108-stable review Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 01/31] tpm: do not suspend/resume if power stays on Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 02/31] tpm: self test failure should not cause suspend to fail Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 03/31] mmap: introduce sane default mmap limits Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 04/31] mmap: relax file size limit for regular files Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 05/31] btrfs: define SUPER_FLAG_METADUMP_V2 Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 07/31] drm: set FMODE_UNSIGNED_OFFSET for drm files Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 08/31] bnx2x: use the right constant Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 09/31] dccp: dont free ccid2_hc_tx_sock struct in dccp_disconnect() Greg Kroah-Hartman
2018-06-12 16:46 ` Greg Kroah-Hartman [this message]
2018-06-12 16:46 ` [PATCH 4.9 11/31] ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table succeeds Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 12/31] ipv4: remove warning in ip_recv_error Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 13/31] isdn: eicon: fix a missing-check bug Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 14/31] kcm: Fix use-after-free caused by clonned sockets Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 15/31] netdev-FAQ: clarify DaveMs position for stable backports Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 16/31] net/packet: refine check for priv area size Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 18/31] packet: fix reserve calculation Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 19/31] qed: Fix mask for physical address in ILT entry Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 20/31] sctp: not allow transport timeout value less than HZ/5 for hb_timer Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 21/31] team: use netdev_features_t instead of u32 Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 22/31] vhost: synchronize IOTLB message with dev cleanup Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 23/31] vrf: check the original netdevice for generating redirect Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 24/31] net/mlx4: Fix irq-unsafe spinlock usage Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 25/31] rtnetlink: validate attributes in do_setlink() Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 26/31] net: phy: broadcom: Fix bcm_write_exp() Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 27/31] net: metrics: add proper netlink validation Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 28/31] KVM: VMX: Expose SSBD properly to guests, 4.9 supplement Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 29/31] dm bufio: avoid false-positive Wmaybe-uninitialized warning Greg Kroah-Hartman
2018-06-12 16:46 ` [PATCH 4.9 30/31] objtool: Fix gcov check for older versions of GCC Greg Kroah-Hartman
2018-06-12 17:10 ` [PATCH 4.9 00/31] 4.9.108-stable review Nathan Chancellor
2018-06-12 17:45   ` Greg Kroah-Hartman
2018-06-12 20:58 ` Shuah Khan
2018-06-13  4:41   ` Greg Kroah-Hartman
2018-06-13 13:49 ` Guenter Roeck
2018-06-13 14:13 ` Rafael Tinoco
2018-06-13 14:42   ` Greg Kroah-Hartman

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=20180612164621.197259901@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=davem@davemloft.net \
    --cc=gvaradar@cisco.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@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

all inboxes | Powered by JetHome®