Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp5577541imm; Tue, 12 Jun 2018 09:53:49 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLyAJXkxL17LBDrjRNO1ncgEkm2G7Xvi8i2NM6ysYx1nK8XCll7i3T1S9/qrUo1ik6K8AaU X-Received: by 2002:a65:6355:: with SMTP id p21-v6mr957070pgv.293.1528822429717; Tue, 12 Jun 2018 09:53:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528822429; cv=none; d=google.com; s=arc-20160816; b=VdNNzcnr591U5z+peTcyU5P1kxzpXFFkWhmQEegbMLD41iu3Xx60HNkic+tqIWCoqz fsJmTbrrL9Ckqz/3Ik6uUxj9r8nIaLurIUvo3FjRcRymhvjhQtXAhJt2+SWM4hsREIwJ a0TX7ZHmBR5Cr3Xtl6VbhXCczPOjNI99q4AyEEQLALKBAvrCLmdFe2GmA0H6YVT3y1dD DYQ+edyaHv0ZDScpSmdhW5kI2umClXyHP16rnrmZJmippOM7QhZdCKZOMjbBTE3M8MhR NIwgpr5O0wU03JUFkXzyeneXtAxud4p3LDUCa5SNxcO66RRVcZFRKOLbuSPetRzTB1GF HQSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=MA+RW/E2gOdOsuDw42bhY2N1NmOLQiRvVIEZiPtVwTg=; b=ah7NqnZ7rXvkCjVm1waNi62e8bUQa/zmK0Ct2DrR1VAs5VqBPaS1JmzXQloD+cbNJO LUovJODBeKwiDva/p8GjC+CqOkKSGootyqKKu3KqqQOwH50Slnun0ZrK1LPP3LAxuxUP zSGj7QraPG45EVAFYcAC3J3jTIcabny1r/I6lhfGKYIAgWrFFtHsMIzYDf9+rGOWBBdH vO53cKorEVMusYrE3MzzXZ7uX2QnPrbkun+aSXNe/6X7IpWabPCVcegVquvP60SwJv+O 945h5Y+f50nT6ZMein+SYvOf93eNKUhP834gB7GMiwRZZLLc2b8Z/AQYUb8jdKTHPSM/ zadQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="VoWET/cP"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i6-v6si442206pgt.470.2018.06.12.09.53.35; Tue, 12 Jun 2018 09:53:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="VoWET/cP"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934892AbeFLQwz (ORCPT + 99 others); Tue, 12 Jun 2018 12:52:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:48380 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935055AbeFLQwp (ORCPT ); Tue, 12 Jun 2018 12:52:45 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CF229208BA; Tue, 12 Jun 2018 16:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1528822364; bh=avp+9hWZlz1nx00jnBhnWOQsnGhE/qh8DC/EkZ/pErQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VoWET/cPvMz9Xvus6zxp/FQyASYw99kRsYhgYqP1naKlydf2Xv1t6NzGHWwbIQGjw uB6HyauPA9qYkE1+IaTQgDnm62p0Nvr1Ihr0qGBJgyRaguTnBSKg8uyYRYRojetZhK 2umLKiJr2kNwLQev03Vc+8wGkxCmrr+nn60IHKEo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Govindarajulu Varadarajan , "David S. Miller" Subject: [PATCH 4.4 11/24] enic: set DMA mask to 47 bit Date: Tue, 12 Jun 2018 18:51:55 +0200 Message-Id: <20180612164817.129520725@linuxfoundation.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180612164816.587001852@linuxfoundation.org> References: <20180612164816.587001852@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Govindarajulu Varadarajan [ 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- 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 @@ -2543,11 +2543,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) { @@ -2561,10 +2561,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;