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

Commit 4fac8076 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

ia64: clean up swiotlb support 



Move the few remaining bits of swiotlb glue towards their callers,
and remove the pointless on ia64 swiotlb variable.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
parent 543cea9a

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

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 */

#include <asm/machvec.h>

#include <linux/scatterlist.h>

#include <asm/swiotlb.h>

#include <linux/dma-debug.h>



#define ARCH_HAS_DMA_GET_REQUIRED_MASK

arch/ia64/include/asm/swiotlb.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef ASM_IA64__SWIOTLB_H

#define ASM_IA64__SWIOTLB_H



#include <linux/dma-mapping.h>

#include <linux/swiotlb.h>



#ifdef CONFIG_SWIOTLB

extern int swiotlb;

extern void pci_swiotlb_init(void);

#else

#define swiotlb 0

static inline void pci_swiotlb_init(void)

{

}

#endif



#endif /* ASM_IA64__SWIOTLB_H */

arch/ia64/kernel/dma-mapping.c

+9 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/dma-mapping.h>

#include <linux/swiotlb.h>

#include <linux/export.h>



/* Set this to 1 if there is a HW IOMMU in the system */
@@ -23,3 +24,11 @@ const struct dma_map_ops *dma_get_ops(struct device *dev) 
	return dma_ops;

}

EXPORT_SYMBOL(dma_get_ops);



#ifdef CONFIG_SWIOTLB

void __init swiotlb_dma_init(void)

{

	dma_ops = &swiotlb_dma_ops;

	swiotlb_init(1);

}

#endif

arch/ia64/kernel/pci-dma.c

+10 −2
Original line number Diff line number Diff line
@@ -104,8 +104,16 @@ void __init pci_iommu_alloc(void) 
	detect_intel_iommu();



#ifdef CONFIG_SWIOTLB

	pci_swiotlb_init();

#endif

	if (!iommu_detected) {

#ifdef CONFIG_IA64_GENERIC

		printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");

		machvec_init("dig");

		swiotlb_dma_init();

#else

		panic("Unable to find Intel IOMMU");

#endif /* CONFIG_IA64_GENERIC */

	}

#endif /* CONFIG_SWIOTLB */

}



#endif

arch/ia64/kernel/pci-swiotlb.c

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Glue code to lib/swiotlb.c */



#include <linux/pci.h>

#include <linux/gfp.h>

#include <linux/cache.h>

#include <linux/module.h>

#include <linux/dma-mapping.h>

#include <linux/swiotlb.h>

#include <asm/dma.h>

#include <asm/iommu.h>

#include <asm/machvec.h>



int swiotlb __read_mostly;

EXPORT_SYMBOL(swiotlb);



void __init swiotlb_dma_init(void)

{

	dma_ops = &swiotlb_dma_ops;

	swiotlb_init(1);

}



void __init pci_swiotlb_init(void)

{

	if (!iommu_detected) {

#ifdef CONFIG_IA64_GENERIC

		swiotlb = 1;

		printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");

		machvec_init("dig");

		swiotlb_init(1);

		dma_ops = &swiotlb_dma_ops;

#else

		panic("Unable to find Intel IOMMU");

#endif

	}

}