Commit df43acac authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tony Luck
Browse files

ia64: remove the zx1 swiotlb machvec 



The aim of this machvec is to support devices with < 32-bit dma
masks.  But given that ia64 only has a ZONE_DMA32 and not a ZONE_DMA
that isn't supported by swiotlb either.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20190813072514.23299-21-hch@lst.de


Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 2e0f2b16

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -2373,7 +2373,7 @@ 


	machvec=	[IA-64] Force the use of a particular machine-vector

			(machvec) in a generic kernel.

			Example: machvec=hpzx1_swiotlb

			Example: machvec=hpzx1



	machtype=	[Loongson] Share the same kernel image file between different

			 yeeloong laptop.

arch/ia64/Kconfig

+1 −12
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ config IA64_GENERIC 
	  DIG-compliant		For DIG ("Developer's Interface Guide") compliant systems

	  DIG+Intel+IOMMU	For DIG systems with Intel IOMMU

	  HP-zx1/sx1000		For HP systems

	  HP-zx1/sx1000+swiotlb	For HP systems with (broken) DMA-constrained devices.

	  SGI-UV		For SGI UV systems



	  If you don't know what to do, choose "generic".
@@ -158,16 +157,6 @@ config IA64_HP_ZX1 
	  Build a kernel that runs on HP zx1 and sx1000 systems.  This adds

	  support for the HP I/O MMU.



config IA64_HP_ZX1_SWIOTLB

	bool "HP-zx1/sx1000 with software I/O TLB"

	select SWIOTLB

	help

	  Build a kernel that runs on HP zx1 and sx1000 systems even when they

	  have broken PCI devices which cannot DMA to full 32 bits.  Apart

	  from support for the HP I/O MMU, this includes support for the software

	  I/O TLB, which allows supporting the broken devices at the expense of

	  wasting some kernel memory (about 2MB by default).



config IA64_SGI_UV

	bool "SGI-UV"

	select NUMA
@@ -350,7 +339,7 @@ config ARCH_SPARSEMEM_ENABLE 
	select SPARSEMEM_VMEMMAP_ENABLE



config ARCH_DISCONTIGMEM_DEFAULT

	def_bool y if (IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB)

	def_bool y if (IA64_GENERIC || IA64_HP_ZX1)

	depends on ARCH_DISCONTIGMEM_ENABLE



config NUMA

arch/ia64/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ config IA64_GRANULE_16MB 


config IA64_GRANULE_64MB

	bool "64MB"

	depends on !(IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB)

	depends on !(IA64_GENERIC || IA64_HP_ZX1)



endchoice

arch/ia64/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -54,12 +54,10 @@ core-$(CONFIG_IA64_DIG) += arch/ia64/dig/ 
core-$(CONFIG_IA64_DIG_VTD) 	+= arch/ia64/dig/

core-$(CONFIG_IA64_GENERIC) 	+= arch/ia64/dig/

core-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/dig/

core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/

core-$(CONFIG_IA64_SGI_UV)	+= arch/ia64/uv/



drivers-y			+= arch/ia64/pci/

drivers-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/

drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/

drivers-$(CONFIG_IA64_GENERIC)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/uv/

drivers-$(CONFIG_OPROFILE)	+= arch/ia64/oprofile/

arch/ia64/hp/common/Makefile

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



obj-y := sba_iommu.o

obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += hwsw_iommu.o

obj-$(CONFIG_IA64_GENERIC) += hwsw_iommu.o

obj-$(CONFIG_IA64_HP_AML_NFW) += aml_nfw.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE