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

Commit 3702977f authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Benjamin Herrenschmidt
Browse files

powerpc: Remove swiotlb_pci_dma_ops 



Now swiotlb_pci_dma_ops is identical to swiotlb_dma_ops; we can use
swiotlb_dma_ops with any devices. This removes swiotlb_pci_dma_ops.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarBecky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 762afb73

arch/powerpc/include/asm/swiotlb.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/swiotlb.h>



extern struct dma_mapping_ops swiotlb_dma_ops;

extern struct dma_mapping_ops swiotlb_pci_dma_ops;



static inline void dma_mark_clean(void *addr, size_t size) {}

arch/powerpc/kernel/dma-swiotlb.c

+0 −14
Original line number Diff line number Diff line
@@ -45,20 +45,6 @@ struct dma_mapping_ops swiotlb_dma_ops = { 
	.sync_sg_for_device = swiotlb_sync_sg_for_device

};



struct dma_mapping_ops swiotlb_pci_dma_ops = {

	.alloc_coherent = dma_direct_alloc_coherent,

	.free_coherent = dma_direct_free_coherent,

	.map_sg = swiotlb_map_sg_attrs,

	.unmap_sg = swiotlb_unmap_sg_attrs,

	.dma_supported = swiotlb_dma_supported,

	.map_page = swiotlb_map_page,

	.unmap_page = swiotlb_unmap_page,

	.sync_single_range_for_cpu = swiotlb_sync_single_range_for_cpu,

	.sync_single_range_for_device = swiotlb_sync_single_range_for_device,

	.sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,

	.sync_sg_for_device = swiotlb_sync_sg_for_device

};



void pci_dma_dev_setup_swiotlb(struct pci_dev *pdev)

{

	struct pci_controller *hose;

arch/powerpc/platforms/85xx/mpc8536_ds.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static void __init mpc8536_ds_setup_arch(void) 
#ifdef CONFIG_SWIOTLB

	if (lmb_end_of_DRAM() > max) {

		ppc_swiotlb_enable = 1;

		set_pci_dma_ops(&swiotlb_pci_dma_ops);

		set_pci_dma_ops(&swiotlb_dma_ops);

		ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;

	}

#endif

arch/powerpc/platforms/85xx/mpc85xx_ds.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static void __init mpc85xx_ds_setup_arch(void) 
#ifdef CONFIG_SWIOTLB

	if (lmb_end_of_DRAM() > max) {

		ppc_swiotlb_enable = 1;

		set_pci_dma_ops(&swiotlb_pci_dma_ops);

		set_pci_dma_ops(&swiotlb_dma_ops);

		ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;

	}

#endif

arch/powerpc/platforms/85xx/mpc85xx_mds.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static void __init mpc85xx_mds_setup_arch(void) 
#ifdef CONFIG_SWIOTLB

	if (lmb_end_of_DRAM() > max) {

		ppc_swiotlb_enable = 1;

		set_pci_dma_ops(&swiotlb_pci_dma_ops);

		set_pci_dma_ops(&swiotlb_dma_ops);

		ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;

	}

#endif