Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 843e5ed6 authored by Govindarajulu Varadarajan's avatar Govindarajulu Varadarajan Committed by Greg Kroah-Hartman
Browse files

enic: set DMA mask to 47 bit 



[ Upstream commit 322eaa06d55ebc1402a4a8d140945cff536638b4 ]

In commit 624dbf55 ("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: 624dbf55 ("driver/net: enic: Try DMA 64 first, then failover to DMA")
Signed-off-by: default avatarGovindarajulu Varadarajan <gvaradar@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19775c92

drivers/net/ethernet/cisco/enic/enic_main.c

+4 −4
Original line number Diff line number Diff line
@@ -2362,11 +2362,11 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	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) {
@@ -2380,10 +2380,10 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
			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;