diff options
author | Christoph Hellwig <hch@lst.de> | 2018-12-03 11:43:54 +0100 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2018-12-13 21:06:17 +0100 |
commit | 55897af63091ebc2c3f239c6a6666f748113ac50 (patch) | |
tree | 49340a30e15ae65d71fc5f453559340672064d70 /arch/x86/pci | |
parent | 17ac524719f3fc88c1a90528f4789e4b4f618512 (diff) | |
download | linux-stable-55897af63091ebc2c3f239c6a6666f748113ac50.tar.gz linux-stable-55897af63091ebc2c3f239c6a6666f748113ac50.tar.bz2 linux-stable-55897af63091ebc2c3f239c6a6666f748113ac50.zip |
dma-direct: merge swiotlb_dma_ops into the dma_direct code
While the dma-direct code is (relatively) clean and simple we actually
have to use the swiotlb ops for the mapping on many architectures due
to devices with addressing limits. Instead of keeping two
implementations around this commit allows the dma-direct
implementation to call the swiotlb bounce buffering functions and
thus share the guts of the mapping implementation. This also
simplified the dma-mapping setup on a few architectures where we
don't have to differenciate which implementation to use.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Tested-by: Jesper Dangaard Brouer <brouer@redhat.com>
Tested-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/x86/pci')
-rw-r--r-- | arch/x86/pci/sta2x11-fixup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c index 7a5bafb76d77..3cdafea55ab6 100644 --- a/arch/x86/pci/sta2x11-fixup.c +++ b/arch/x86/pci/sta2x11-fixup.c @@ -168,7 +168,6 @@ static void sta2x11_setup_pdev(struct pci_dev *pdev) return; pci_set_consistent_dma_mask(pdev, STA2X11_AMBA_SIZE - 1); pci_set_dma_mask(pdev, STA2X11_AMBA_SIZE - 1); - pdev->dev.dma_ops = &swiotlb_dma_ops; pdev->dev.archdata.is_sta2x11 = true; /* We must enable all devices as master, for audio DMA to work */ |