Commit c6d43812 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-mapping: make the get_required_mask method available unconditionally 



This save some duplication for ia64, and makes the interface more
general.  In the long run we want each dma_map_ops instance to fill this
out, but this will take a little more prep work.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent b733116f

arch/ia64/include/asm/dma-mapping.h

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
#include <linux/scatterlist.h>

#include <linux/dma-debug.h>



#define ARCH_HAS_DMA_GET_REQUIRED_MASK



extern const struct dma_map_ops *dma_ops;

extern struct ia64_machine_vector ia64_mv;

extern void set_iommu_machvec(void);

arch/ia64/include/asm/machvec.h

+0 −7
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ typedef void ia64_mv_kernel_launch_event_t(void); 


/* DMA-mapping interface: */

typedef void ia64_mv_dma_init (void);

typedef u64 ia64_mv_dma_get_required_mask (struct device *);

typedef const struct dma_map_ops *ia64_mv_dma_get_ops(struct device *);



/*
@@ -127,7 +126,6 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *); 
#  define platform_global_tlb_purge	ia64_mv.global_tlb_purge

#  define platform_tlb_migrate_finish	ia64_mv.tlb_migrate_finish

#  define platform_dma_init		ia64_mv.dma_init

#  define platform_dma_get_required_mask ia64_mv.dma_get_required_mask

#  define platform_dma_get_ops		ia64_mv.dma_get_ops

#  define platform_irq_to_vector	ia64_mv.irq_to_vector

#  define platform_local_vector_to_irq	ia64_mv.local_vector_to_irq
@@ -171,7 +169,6 @@ struct ia64_machine_vector { 
	ia64_mv_global_tlb_purge_t *global_tlb_purge;

	ia64_mv_tlb_migrate_finish_t *tlb_migrate_finish;

	ia64_mv_dma_init *dma_init;

	ia64_mv_dma_get_required_mask *dma_get_required_mask;

	ia64_mv_dma_get_ops *dma_get_ops;

	ia64_mv_irq_to_vector *irq_to_vector;

	ia64_mv_local_vector_to_irq *local_vector_to_irq;
@@ -211,7 +208,6 @@ struct ia64_machine_vector { 
	platform_global_tlb_purge,		\

	platform_tlb_migrate_finish,		\

	platform_dma_init,			\

	platform_dma_get_required_mask,		\

	platform_dma_get_ops,			\

	platform_irq_to_vector,			\

	platform_local_vector_to_irq,		\
@@ -286,9 +282,6 @@ extern const struct dma_map_ops *dma_get_ops(struct device *); 
#ifndef platform_dma_get_ops

# define platform_dma_get_ops		dma_get_ops

#endif

#ifndef platform_dma_get_required_mask

# define  platform_dma_get_required_mask	ia64_dma_get_required_mask

#endif

#ifndef platform_irq_to_vector

# define platform_irq_to_vector		__ia64_irq_to_vector

#endif

arch/ia64/include/asm/machvec_init.h

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


extern ia64_mv_send_ipi_t ia64_send_ipi;

extern ia64_mv_global_tlb_purge_t ia64_global_tlb_purge;

extern ia64_mv_dma_get_required_mask ia64_dma_get_required_mask;

extern ia64_mv_irq_to_vector __ia64_irq_to_vector;

extern ia64_mv_local_vector_to_irq __ia64_local_vector_to_irq;

extern ia64_mv_pci_get_legacy_mem_t ia64_pci_get_legacy_mem;

arch/ia64/include/asm/machvec_sn2.h

+0 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ extern ia64_mv_readb_t __sn_readb_relaxed; 
extern ia64_mv_readw_t __sn_readw_relaxed;

extern ia64_mv_readl_t __sn_readl_relaxed;

extern ia64_mv_readq_t __sn_readq_relaxed;

extern ia64_mv_dma_get_required_mask	sn_dma_get_required_mask;

extern ia64_mv_dma_init			sn_dma_init;

extern ia64_mv_migrate_t		sn_migrate;

extern ia64_mv_kernel_launch_event_t	sn_kernel_launch_event;
@@ -100,7 +99,6 @@ extern ia64_mv_pci_fixup_bus_t sn_pci_fixup_bus; 
#define platform_pci_get_legacy_mem	sn_pci_get_legacy_mem

#define platform_pci_legacy_read	sn_pci_legacy_read

#define platform_pci_legacy_write	sn_pci_legacy_write

#define platform_dma_get_required_mask	sn_dma_get_required_mask

#define platform_dma_init		sn_dma_init

#define platform_migrate		sn_migrate

#define platform_kernel_launch_event    sn_kernel_launch_event

arch/ia64/pci/pci.c

+0 −26
Original line number Diff line number Diff line
@@ -568,32 +568,6 @@ static void __init set_pci_dfl_cacheline_size(void) 
	pci_dfl_cache_line_size = (1 << cci.pcci_line_size) / 4;

}



u64 ia64_dma_get_required_mask(struct device *dev)

{

	u32 low_totalram = ((max_pfn - 1) << PAGE_SHIFT);

	u32 high_totalram = ((max_pfn - 1) >> (32 - PAGE_SHIFT));

	u64 mask;



	if (!high_totalram) {

		/* convert to mask just covering totalram */

		low_totalram = (1 << (fls(low_totalram) - 1));

		low_totalram += low_totalram - 1;

		mask = low_totalram;

	} else {

		high_totalram = (1 << (fls(high_totalram) - 1));

		high_totalram += high_totalram - 1;

		mask = (((u64)high_totalram) << 32) + 0xffffffff;

	}

	return mask;

}

EXPORT_SYMBOL_GPL(ia64_dma_get_required_mask);



u64 dma_get_required_mask(struct device *dev)

{

	return platform_dma_get_required_mask(dev);

}

EXPORT_SYMBOL_GPL(dma_get_required_mask);



static int __init pcibios_init(void)

{

	set_pci_dfl_cacheline_size();

CRA Git | Maintained and supported by SUSTech CRA and CCSE