From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by ozlabs.org (Postfix) with ESMTP id 1A07C2C015E for ; Sat, 21 Sep 2013 05:51:22 +1000 (EST) Message-ID: <1379706667.1972.13.camel@jtkirshe-mobl> Subject: Re: [PATCH 07/51] DMA-API: net: intel/ixgbe: fix 32-bit DMA mask handling From: Jeff Kirsher To: Russell King Date: Fri, 20 Sep 2013 12:51:07 -0700 In-Reply-To: References: <20130919212235.GD12758@n2100.arm.linux.org.uk> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-Ffnl3xLzjnyC7fSFea2u" Mime-Version: 1.0 Cc: alsa-devel@alsa-project.org, linux-doc@vger.kernel.org, linux-mmc@vger.kernel.org, Peter P Waskiewicz Jr , linux-fbdev@vger.kernel.org, linux-nvme@lists.infradead.org, linux-ide@vger.kernel.org, Carolyn Wyborny , devel@driverdev.osuosl.org, linux-samsung-soc@vger.kernel.org, linux-scsi@vger.kernel.org, e1000-devel@lists.sourceforge.net, Don Skidmore , Jesse Brandeburg , b43-dev@lists.infradead.org, linux-media@vger.kernel.org, Alex Duyck , devicetree@vger.kernel.org, Greg Rose , dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Solarflare linux maintainers , netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-wireless@vger.kernel.org, John Ronciak , linux-crypto@vger.kernel.org, uclinux-dist-devel@blackfin.uclinux.org, Bruce Allan , linuxppc-dev@lists.ozlabs.org, Tushar Dave List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , --=-Ffnl3xLzjnyC7fSFea2u Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2013-09-19 at 22:31 +0100, Russell King wrote: > The fallback to 32-bit DMA mask is rather odd: > if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) && > !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) { > pci_using_dac =3D 1; > } else { > err =3D dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); > if (err) { > err =3D dma_set_coherent_mask(&pdev->dev, > DMA_BIT_MASK(32)); > if (err) { > dev_err(&pdev->dev, > "No usable DMA configuration, > aborting\n"); > goto err_dma; > } > } > pci_using_dac =3D 0; > } > This means we only set the coherent DMA mask in the fallback path if > the DMA mask set failed, which is silly. This fixes it to set the > coherent DMA mask only if dma_set_mask() succeeded, and to error out > if either fails. >=20 > Signed-off-by: Russell King > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 15 +++++---------- > 1 files changed, 5 insertions(+), 10 deletions(-) Acked-by: Jeff Kirsher --=-Ffnl3xLzjnyC7fSFea2u Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABCgAGBQJSPKcrAAoJEOVv75VaS+3O5wkQAJl6vEbpRaqMs6YHrykXxtT3 KlYAmYfZgASG3sUQpLwSAVQ3kmQ3+peW+gXzjftqiiarDD3bOiKK/Ax0Vaa54NwT i/HwlhahUj7jPN4KISXEsyoGSEvFg9lJ9I4P2Tdobe46WcW2SxX7GLe/O9GNuqkS t/OyfLmZEhEuSXrEUnzeYPJFZs5r6yB+hYrtYx24fkzqeZ5V1r16TSMQ64uhP6YQ 9WY8VC7oY+CnXFB1fEs3ZtD8v1SmqpYl/Tre5ZEIxBb6tVZnK2gSxWdnQyM1FXHk R5df8zkrNwDTuqwV4GJ0H1FDgoPBAg02ieCgn5rTErge9eTknJSMxsF5Sybok85Z nxGjG+B/qyrh4PPKakhpQXIi5i8CMNpTiQvimCNNztXIacrJVzXtaouP9XLkw44W I/RXTP5LN8v1bPqd0jo2dHQR0mb70XqPivZhtXMbRyjk6UzLWOHqZkjSlSiGzSHn 2XiqFdCLj3qPCRKhQV+TECQBNBI3dTAA1oZmt/5oOYML3QJ4E1Kad5826ScXg/Jx 74WZVoy4wv+g2NyiY+F703VpWHtaf0zKCiDnMDgwNRIginDaXqTp80WoLhWNMDqd 6dOWdcceVlUyg8iEBEJ7+MTgIECCGVQxxB5lJ5Z8bftA11eN8D0xplpf9JfsC1p/ BWN/CuOShCgKe3ju3DNB =NF+f -----END PGP SIGNATURE----- --=-Ffnl3xLzjnyC7fSFea2u--