lkml.org 
[lkml]   [2009]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [PATCH 2/5] powerpc: remove swiotlb_pci_dma_ops
    Date

    On Jul 23, 2009, at 10:24 PM, FUJITA Tomonori wrote:

    > 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: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

    Acked-by: Becky Bruce <beckyb@kernel.crashing.org>

    >
    > ---
    > arch/powerpc/include/asm/swiotlb.h | 1 -
    > arch/powerpc/kernel/dma-swiotlb.c | 14 --------------
    > arch/powerpc/platforms/85xx/mpc8536_ds.c | 2 +-
    > arch/powerpc/platforms/85xx/mpc85xx_ds.c | 2 +-
    > arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +-
    > arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 2 +-
    > 6 files changed, 4 insertions(+), 19 deletions(-)
    >
    > diff --git a/arch/powerpc/include/asm/swiotlb.h b/arch/powerpc/
    > include/asm/swiotlb.h
    > index 31e0e43..21ce0a3 100644
    > --- a/arch/powerpc/include/asm/swiotlb.h
    > +++ b/arch/powerpc/include/asm/swiotlb.h
    > @@ -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) {}
    >
    > diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/
    > dma-swiotlb.c
    > index c9f6a30..ca141e1 100644
    > --- a/arch/powerpc/kernel/dma-swiotlb.c
    > +++ b/arch/powerpc/kernel/dma-swiotlb.c
    > @@ -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;
    > diff --git a/arch/powerpc/platforms/85xx/mpc8536_ds.c b/arch/powerpc/
    > platforms/85xx/mpc8536_ds.c
    > index bf052c0..004b7d3 100644
    > --- a/arch/powerpc/platforms/85xx/mpc8536_ds.c
    > +++ b/arch/powerpc/platforms/85xx/mpc8536_ds.c
    > @@ -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
    > diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/
    > platforms/85xx/mpc85xx_ds.c
    > index c6f92cc..544011a 100644
    > --- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
    > +++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
    > @@ -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
    > diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/
    > powerpc/platforms/85xx/mpc85xx_mds.c
    > index 8b8e5f9..c4961ed 100644
    > --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
    > +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
    > @@ -241,7 +241,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
    > diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/
    > powerpc/platforms/86xx/mpc86xx_hpcn.c
    > index 8032301..2aa69a6 100644
    > --- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
    > +++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
    > @@ -105,7 +105,7 @@ mpc86xx_hpcn_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
    > --
    > 1.6.0.6
    >
    > --
    > To unsubscribe from this list: send the line "unsubscribe linux-
    > kernel" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html
    > Please read the FAQ at http://www.tux.org/lkml/



    \
     
     \ /
      Last update: 2009-07-27 23:07    [W:0.027 / U:61.048 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site