dma_get_required_mask tidyups
Subsystems (5)
Hi all,
the dma_get_required_mask dma API implementation has always been a little odd, in that we by default don't wire it up struct dma_map_ops, but instead hard code a default implementation. powerpc and ia64 override this default and either call a method or otherwise duplicate the default.
This series always enabled the method and just falls back to the previous default implementation when it is not available, as well as fixing up a few bits in the default implementations. This already allows removing the ia64 override of the implementation, and will also allow to remove the powerpc one together with a few additional cleanups in the powerpc code, but those will be sent separately with other powerpc DMA API patches. Last but not least the method will allow us to return a more sensible value for typical iommu dma_ops eventually, but that is left to another series as well.
PATCH 1/3 dma-mapping: make the get_required_mask method available unconditionally
This save some duplication for ia64. In the long run this method will need some additional work including moving over to kernel/dma, but that will require some additional prep work, so let's do this minimal change for now.
--- arch/ia64/include/asm/dma-mapping.h | 2 -- arch/ia64/include/asm/machvec.h | 7 ------- arch/ia64/include/asm/machvec_init.h | 1 - arch/ia64/include/asm/machvec_sn2.h | 2 -- arch/ia64/pci/pci.c | 26 -------------------------- arch/ia64/sn/pci/pci_dma.c | 4 ++-- drivers/base/platform.c | 17 +++++++++++++++-- drivers/pci/controller/vmd.c | 4 ---- include/linux/dma-direct.h | 1 + include/linux/dma-mapping.h | 2 -- 10 files changed, 18 insertions(+), 48 deletions(-)
arch/ia64/include/asm/dma-mapping.h +0 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 ();
arch/ia64/sn/pci/pci_dma.c +2 -2
@@ -344,11 +344,10 @@ static int sn_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)return 0 ; } -u64 sn_dma_get_required_mask (struct device *dev) +static u64 sn_dma_get_required_mask (struct device *dev) {return DMA_BIT_MASK (64 ); } -EXPORT_SYMBOL_GPL (sn_dma_get_required_mask);char *sn_pci_get_legacy_mem (struct pci_bus *bus) {
@@ -473,6 +472,7 @@ static struct dma_map_ops sn_dma_ops = { .sync_sg_for_device = sn_dma_sync_sg_for_device, .mapping_error = sn_dma_mapping_error, .dma_supported = sn_dma_supported, + .get_required_mask = sn_dma_get_required_mask, };void sn_dma_init (void )
drivers/base/platform.c +15 -2
@@ -1179,8 +1179,11 @@ int __init platform_bus_init(void)return error; } -#ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK -u64 dma_get_required_mask (struct device *dev) +/* +* TODO: should eventually move to dma-direct.c and be wired up explicitly, +* but that will require a little more work. +*/ +u64 dma_direct_get_required_mask (struct device *dev) {u32 low_totalram = ((max_pfn -1 ) <<PAGE_SHIFT );u32 high_totalram = ((max_pfn -1 ) >> (32 -PAGE_SHIFT ));
@@ -1198,6 +1201,16 @@ u64 dma_get_required_mask(struct device *dev) }return mask; } + +#ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK +u64 dma_get_required_mask (struct device *dev) +{ +const struct dma_map_ops *ops =get_dma_ops (dev); + +if (ops->get_required_mask) +return ops->get_required_mask (dev); +return dma_direct_get_required_mask (dev); +}EXPORT_SYMBOL_GPL (dma_get_required_mask);#endif
drivers/pci/controller/vmd.c +0 -4
@@ -404,12 +404,10 @@ static int vmd_dma_supported(struct device *dev, u64 mask)return vmd_dma_ops (dev)->dma_supported (to_vmd_dev (dev), mask); } -#ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK static u64 vmd_get_required_mask (struct device *dev) {return vmd_dma_ops (dev)->get_required_mask (to_vmd_dev (dev)); } -#endif static void vmd_teardown_dma_ops (struct vmd_dev *vmd) {
@@ -450,9 +448,7 @@ static void vmd_setup_dma_ops(struct vmd_dev *vmd)ASSIGN_VMD_DMA_OPS (source, dest, sync_sg_for_device);ASSIGN_VMD_DMA_OPS (source, dest, mapping_error);ASSIGN_VMD_DMA_OPS (source, dest, dma_supported); -#ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK ASSIGN_VMD_DMA_OPS (source, dest, get_required_mask); -#endif add_dma_domain (domain); }#undef ASSIGN_VMD_DMA_OPS
include/linux/dma-direct.h +1 -0
@@ -64,6 +64,7 @@ dma_addr_t dma_direct_map_page(struct device *dev, struct page *page, unsigned long attrs);int dma_direct_map_sg (struct device *dev,struct scatterlist *sgl,int nents,enum dma_data_direction dir,unsigned long attrs); +u64 dma_direct_get_required_mask (struct device *dev);int dma_direct_supported (struct device *dev,u64 mask);int dma_direct_mapping_error (struct device *dev,dma_addr_t dma_addr);#endif /* _LINUX_DMA_DIRECT_H */
include/linux/dma-mapping.h +0 -2
@@ -130,9 +130,7 @@ struct dma_map_ops { enum dma_data_direction direction);int (*mapping_error)(struct device *dev,dma_addr_t dma_addr);int (*dma_supported)(struct device *dev,u64 mask); -#ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK u64 (*get_required_mask)(struct device *dev); -#endif };extern const struct dma_map_ops dma_direct_ops;
Signature · 1 line
2.18.0
PATCH 2/3 dma-mapping: simplify dma_direct get_required_mask
In reply to Christoph HellwigIf we use fls64 we don't need to divide the max address into lower and upper halves.
--- drivers/base/platform.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-)
drivers/base/platform.c +3 -15
@@ -1185,21 +1185,9 @@ int __init platform_bus_init(void)*/ u64 dma_direct_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; +u64 end = ((max_pfn -1 ) <<PAGE_SHIFT ); + +return (1 << (fls64 (end) -1 )) *2 -1 ; }#ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK
Signature · 1 line
2.18.0
PATCH 3/3 dma-mapping: use phys_to_dma in dma_direct_get_required
In reply to Christoph HellwigWe need to apply an DMA offset for the function to work as expected.
--- drivers/base/platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/platform.c +2 -2
@@ -15,7 +15,7 @@#include <linux/of_irq.h> #include <linux/module.h> #include <linux/init.h> -#include <linux/dma-mapping.h> +#include <linux/dma-direct.h> #include <linux/bootmem.h> #include <linux/err.h> #include <linux/slab.h>
@@ -1185,7 +1185,7 @@ int __init platform_bus_init(void)*/ u64 dma_direct_get_required_mask (struct device *dev) { -u64 end = ((max_pfn -1 ) <<PAGE_SHIFT ); +u64 end =phys_to_dma (dev, (max_pfn -1 ) <<PAGE_SHIFT );return (1 << (fls64 (end) -1 )) *2 -1 ; }
Signature · 1 line
2.18.0
Any comments? I have a a few things piled up that base on this, so some forward progress would be great.
Quoted 7 lines · Christoph Hellwig
Hi all,
the
dma_get_required_maskdma API implementation has always been a little odd, in that we by default don't wire it up structdma_map_ops, but instead hard code a default implementation. powerpc and ia64 override this default and either call a method or otherwise duplicate the default.
Quoted 13 lines
This series always enabled the method and just falls back to the previous default implementation when it is not available, as well as fixing up a few bits in the default implementations. This already allows removing the ia64 override of the implementation, and will also allow to remove the powerpc one together with a few additional cleanups in the powerpc code, but those will be sent separately with other powerpc DMA API patches. Last but not least the method will allow us to return a more sensible value for typical iommu
dma_opseventually, but that is left to another series as well.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
---end quoted text---