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

Commit 440bd77f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

sata_qstor: use dma_set_mask_and_coherent 



Use the dma_set_mask_and_coherent helper to set the DMA mask.  Rely
on the relatively recent change that setting a larger than required
mask will never fail to avoid the need for the boilerplate 32-bit
fallback code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 51872b66

drivers/ata/sata_qstor.c

+7 −27
Original line number Diff line number Diff line
@@ -537,34 +537,14 @@ static void qs_host_init(struct ata_host *host, unsigned int chip_id) 
static int qs_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)

{

	u32 bus_info = readl(mmio_base + QS_HID_HPHY);

	int rc, have_64bit_bus = (bus_info & QS_HPHY_64BIT);



	if (have_64bit_bus &&

	    !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {

		rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));

		if (rc) {

			rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

			if (rc) {

				dev_err(&pdev->dev,

					"64-bit DMA enable failed\n");

				return rc;

			}

		}

	} else {

		rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));

		if (rc) {

			dev_err(&pdev->dev, "32-bit DMA enable failed\n");

			return rc;

		}

		rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

		if (rc) {

			dev_err(&pdev->dev,

				"32-bit consistent DMA enable failed\n");

	int dma_bits = (bus_info & QS_HPHY_64BIT) ? 64 : 32;

	int rc;



	rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(dma_bits));

	if (rc)

		dev_err(&pdev->dev, "%d-bit DMA enable failed\n", dma_bits);

	return rc;

}

	}

	return 0;

}



static int qs_ata_init_one(struct pci_dev *pdev,

				const struct pci_device_id *ent)