misc ia64 cleanups (resend)
A couple random cleanups I stumbled upon when doing dma related work.
PATCH 1/9 ia64: remove the kern_mem_attribute export
No actually used anywhere.
--- arch/ia64/kernel/efi.c | 1 - 1 file changed, 1 deletion(-)
arch/ia64/kernel/efi.c +0 -1
@@ -842,7 +842,6 @@ kern_mem_attribute (unsigned long phys_addr, unsigned long size) }while (md);return 0 ;/* never reached */ } -EXPORT_SYMBOL (kern_mem_attribute);int valid_phys_addr_range (phys_addr_t phys_addr,unsigned long size)
Signature · 1 line
2.18.0
PATCH 2/9 ia64: remove the dead iommu_sac_force variable
In reply to Christoph HellwigLooks like copy and paste from x86 that never actually got used.
--- arch/ia64/kernel/pci-dma.c | 19 ------------------- 1 file changed, 19 deletions(-)
arch/ia64/kernel/pci-dma.c +0 -19
@@ -18,8 +18,6 @@dma_addr_t bad_dma_address__read_mostly ;EXPORT_SYMBOL (bad_dma_address); -static int iommu_sac_force__read_mostly ; -int no_iommu__read_mostly ;#ifdef CONFIG_IOMMU_DEBUG int force_iommu__read_mostly =1 ;
@@ -61,23 +59,6 @@ int iommu_dma_supported(struct device *dev, u64 mask)if (mask <DMA_BIT_MASK (24 ))return 0 ; -/* Tell the device to use SAC when IOMMU force is on. This -allows the driver to use cheaper accesses in some cases. - -Problem with this is that if we overflow the IOMMU area and -return DAC as fallback address the device may not handle it -correctly. - -As a special case some controllers have a 39bit address -mode that is as efficient as 32bit (aic79xx). Don't force -SAC for these. Assume all masks <= 40 bits are of this -type. Normally this doesn't make any difference, but gives -more gentle handling of IOMMU overflow. */ -if (iommu_sac_force && (mask >=DMA_BIT_MASK (40 ))) { -dev_info (dev,"Force SAC with mask %llx\n" , mask); -return 0 ; - } -return 1 ; }EXPORT_SYMBOL (iommu_dma_supported);
Signature · 1 line
2.18.0
PATCH 3/9 ia64: remove iommu_dma_supported
In reply to Christoph HellwigThe generic dma_direct_supported helper already used by intel-iommu on x86 does a better job than the ia64 reimplementation.
--- arch/ia64/kernel/pci-dma.c | 13 ------------- drivers/iommu/intel-iommu.c | 2 -- 2 files changed, 15 deletions(-)
arch/ia64/kernel/pci-dma.c +0 -13
@@ -51,18 +51,6 @@ iommu_dma_init(void)return ; } -int iommu_dma_supported (struct device *dev,u64 mask) -{ -/* Copied from i386. Doesn't make much sense, because it will -only work for pci_alloc_coherent. -The caller just has to use GFP_DMA in this case. */ -if (mask <DMA_BIT_MASK (24 )) -return 0 ; - -return 1 ; -} -EXPORT_SYMBOL (iommu_dma_supported); -void __init pci_iommu_alloc (void ) { dma_ops = &intel_dma_ops;
@@ -71,7 +59,6 @@ void __init pci_iommu_alloc(void) intel_dma_ops.sync_sg_for_cpu = machvec_dma_sync_sg; intel_dma_ops.sync_single_for_device = machvec_dma_sync_single; intel_dma_ops.sync_sg_for_device = machvec_dma_sync_sg; - intel_dma_ops.dma_supported = iommu_dma_supported;/* * The order of these functions is important for
drivers/iommu/intel-iommu.c +0 -2
@@ -3903,9 +3903,7 @@ const struct dma_map_ops intel_dma_ops = { .map_page = intel_map_page, .unmap_page = intel_unmap_page, .mapping_error = intel_mapping_error, -#ifdef CONFIG_X86 .dma_supported = dma_direct_supported, -#endif };static inline int iommu_domain_cache_init (void )
Signature · 1 line
2.18.0
PATCH 4/9 ia64: remove the unused bad_dma_address symbol
In reply to Christoph Hellwig--- arch/ia64/kernel/pci-dma.c | 3 --- 1 file changed, 3 deletions(-)
arch/ia64/kernel/pci-dma.c +0 -3
@@ -15,9 +15,6 @@#include <linux/kernel.h> #include <asm/page.h> -dma_addr_t bad_dma_address__read_mostly ; -EXPORT_SYMBOL (bad_dma_address); -int no_iommu__read_mostly ;#ifdef CONFIG_IOMMU_DEBUG int force_iommu__read_mostly =1 ;
Signature · 1 line
2.18.0
PATCH 5/9 ia64: remove the unused pci_iommu_shutdown function
In reply to Christoph Hellwig--- arch/ia64/include/asm/iommu.h | 1 - arch/ia64/kernel/pci-dma.c | 5 ----- 2 files changed, 6 deletions(-)
arch/ia64/include/asm/iommu.h +0 -1
@@ -5,7 +5,6 @@/* 10 seconds */ #define DMAR_OPERATION_TIMEOUT (((cycles_t) local_cpu_data->itc_freq)*10) -extern void pci_iommu_shutdown (void );extern void no_iommu_init (void );#ifdef CONFIG_INTEL_IOMMU extern int force_iommu, no_iommu;
arch/ia64/kernel/pci-dma.c +0 -5
@@ -37,11 +37,6 @@ static int __init pci_iommu_init(void)/* Must execute after PCI subsystem */ fs_initcall (pci_iommu_init); -void pci_iommu_shutdown (void ) -{ -return ; -} -void __init iommu_dma_init (void ) {
Signature · 1 line
2.18.0
PATCH 6/9 ia64: remove the unused iommu_dma_init function
In reply to Christoph Hellwig--- arch/ia64/include/asm/iommu.h | 1 - arch/ia64/kernel/pci-dma.c | 6 ------ 2 files changed, 7 deletions(-)
arch/ia64/include/asm/iommu.h +0 -1
@@ -15,7 +15,6 @@ extern int iommu_detected;#define no_iommu (1)#define iommu_detected (0)#endif -extern void iommu_dma_init (void );extern void machvec_init (const char *name);#endif
arch/ia64/kernel/pci-dma.c +0 -6
@@ -37,12 +37,6 @@ static int __init pci_iommu_init(void)/* Must execute after PCI subsystem */ fs_initcall (pci_iommu_init); -void __init -iommu_dma_init (void ) -{ -return ; -} -void __init pci_iommu_alloc (void ) { dma_ops = &intel_dma_ops;
Signature · 1 line
2.18.0
PATCH 7/9 ia64/sn2: remove no-ops dma sync methods
In reply to Christoph HellwigThese do nothing but duplicating an assert that would have triggered earlier on setting the dma mask, so remove them.
--- arch/ia64/sn/pci/pci_dma.c | 29 ----------------------------- 1 file changed, 29 deletions(-)
arch/ia64/sn/pci/pci_dma.c +0 -29
@@ -314,31 +314,6 @@ static int sn_dma_map_sg(struct device *dev, struct scatterlist *sgl,return nhwentries; } -static void sn_dma_sync_single_for_cpu (struct device *dev,dma_addr_t dma_handle, -size_t size,enum dma_data_direction dir) -{ -BUG_ON (!dev_is_pci (dev)); -} - -static void sn_dma_sync_single_for_device (struct device *dev,dma_addr_t dma_handle, -size_t size, -enum dma_data_direction dir) -{ -BUG_ON (!dev_is_pci (dev)); -} - -static void sn_dma_sync_sg_for_cpu (struct device *dev,struct scatterlist *sg, -int nelems,enum dma_data_direction dir) -{ -BUG_ON (!dev_is_pci (dev)); -} - -static void sn_dma_sync_sg_for_device (struct device *dev,struct scatterlist *sg, -int nelems,enum dma_data_direction dir) -{ -BUG_ON (!dev_is_pci (dev)); -} -static int sn_dma_mapping_error (struct device *dev,dma_addr_t dma_addr) {return 0 ;
@@ -467,10 +442,6 @@ static struct dma_map_ops sn_dma_ops = { .unmap_page = sn_dma_unmap_page, .map_sg = sn_dma_map_sg, .unmap_sg = sn_dma_unmap_sg, - .sync_single_for_cpu = sn_dma_sync_single_for_cpu, - .sync_sg_for_cpu = sn_dma_sync_sg_for_cpu, - .sync_single_for_device = sn_dma_sync_single_for_device, - .sync_sg_for_device = sn_dma_sync_sg_for_device, .mapping_error = sn_dma_mapping_error, .dma_supported = sn_dma_supported, };
Signature · 1 line
2.18.0
PATCH 8/9 ia64: remove machvec_dma_sync_{single,sg}
In reply to Christoph HellwigThe original form of these was added (to the HP zx1 platform only) by the following bitkeeper commit (by the way of the historic.git tree):
commit 66b99421d118a5ddd98a72913670b0fcf0a38d45
Author: Andrew Morton <[email protected]> Date: Sat Mar 13 17:05:37 2004 -0800
[PATCH] DMA: Fill gaping hole in DMA API interfaces.
From: "David S. Miller" <[email protected]>
The commit does not explain why we'd need the memory barrier on ia64, it never included the swiotlb or SGI IOMMU based platforms, and also failed to address the map/unmap parts of the dma mapping interface, which should provide the same ordering semantics and actually are commonly used. The conclusion of this is that they were added in error and should be removed.
--- arch/ia64/hp/common/sba_iommu.c | 4 ---- arch/ia64/include/asm/dma-mapping.h | 5 ----- arch/ia64/kernel/machvec.c | 16 ---------------- arch/ia64/kernel/pci-dma.c | 5 ----- 4 files changed, 30 deletions(-)
arch/ia64/hp/common/sba_iommu.c +0 -4
@@ -2207,10 +2207,6 @@ const struct dma_map_ops sba_dma_ops = { .unmap_page = sba_unmap_page, .map_sg = sba_map_sg_attrs, .unmap_sg = sba_unmap_sg_attrs, - .sync_single_for_cpu = machvec_dma_sync_single, - .sync_sg_for_cpu = machvec_dma_sync_sg, - .sync_single_for_device = machvec_dma_sync_single, - .sync_sg_for_device = machvec_dma_sync_sg, .dma_supported = sba_dma_supported, .mapping_error = sba_dma_mapping_error, };
arch/ia64/include/asm/dma-mapping.h +0 -5
@@ -16,11 +16,6 @@ extern const struct dma_map_ops *dma_ops;extern struct ia64_machine_vector ia64_mv;extern void set_iommu_machvec (void ); -extern void machvec_dma_sync_single (struct device *,dma_addr_t ,size_t , -enum dma_data_direction ); -extern void machvec_dma_sync_sg (struct device *,struct scatterlist *,int , -enum dma_data_direction ); -static inline const struct dma_map_ops *get_arch_dma_ops (struct bus_type *bus) {return platform_dma_get_ops (NULL );
arch/ia64/kernel/machvec.c +0 -16
@@ -73,19 +73,3 @@ machvec_timer_interrupt (int irq, void *dev_id) { }EXPORT_SYMBOL (machvec_timer_interrupt); - -void -machvec_dma_sync_single (struct device *hwdev,dma_addr_t dma_handle,size_t size, -enum dma_data_direction dir) -{ -mb (); -} -EXPORT_SYMBOL (machvec_dma_sync_single); - -void -machvec_dma_sync_sg (struct device *hwdev,struct scatterlist *sg,int n, -enum dma_data_direction dir) -{ -mb (); -} -EXPORT_SYMBOL (machvec_dma_sync_sg);
arch/ia64/kernel/pci-dma.c +0 -5
@@ -41,11 +41,6 @@ void __init pci_iommu_alloc(void) { dma_ops = &intel_dma_ops; - intel_dma_ops.sync_single_for_cpu = machvec_dma_sync_single; - intel_dma_ops.sync_sg_for_cpu = machvec_dma_sync_sg; - intel_dma_ops.sync_single_for_device = machvec_dma_sync_single; - intel_dma_ops.sync_sg_for_device = machvec_dma_sync_sg; -/* * The order of these functions is important for * fall-back/fail-over reasons
Signature · 1 line
2.18.0
PATCH 9/9 intel-iommu: mark intel_dma_ops static
In reply to Christoph Hellwigia64 currently explicitly assigns it to dma_ops, but that same work is already done by intel_iommu_init a little later, so we can remove the duplicate assignment and mark the variable static.
--- arch/ia64/kernel/pci-dma.c | 4 ---- drivers/iommu/intel-iommu.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-)
arch/ia64/kernel/pci-dma.c +0 -4
@@ -24,8 +24,6 @@ int force_iommu __read_mostly;int iommu_pass_through; -extern struct dma_map_ops intel_dma_ops; -static int __init pci_iommu_init (void ) {if (iommu_detected)
@@ -39,8 +37,6 @@ fs_initcall(pci_iommu_init);void __init pci_iommu_alloc (void ) { - dma_ops = &intel_dma_ops; -/* * The order of these functions is important for * fall-back/fail-over reasons
drivers/iommu/intel-iommu.c +1 -1
@@ -3895,7 +3895,7 @@ static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)return !dma_addr; } -const struct dma_map_ops intel_dma_ops = { +static const struct dma_map_ops intel_dma_ops = { .alloc = intel_alloc_coherent, .free = intel_free_coherent, .map_sg = intel_map_sg,
Signature · 1 line
2.18.0
Quoted 1 line
A couple random cleanups I stumbled upon when doing dma related work.
Christoph,
Thanks. Applied. Will send pull request for next merge window.
-Tony