Merge tag 'please-pull-ia64_for_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

	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.

====================================

SGI IOC4 PCI (multi function) device

====================================

The SGI IOC4 PCI device is a bit of a strange beast, so some notes on

it are in order.

First, even though the IOC4 performs multiple functions, such as an

IDE controller, a serial controller, a PS/2 keyboard/mouse controller,

and an external interrupt mechanism, it's not implemented as a

multifunction device.  The consequence of this from a software

standpoint is that all these functions share a single IRQ, and

they can't all register to own the same PCI device ID.  To make

matters a bit worse, some of the register blocks (and even registers

themselves) present in IOC4 are mixed-purpose between these several

functions, meaning that there's no clear "owning" device driver.

The solution is to organize the IOC4 driver into several independent

drivers, "ioc4", "sgiioc4", and "ioc4_serial".  Note that there is no

PS/2 controller driver as this functionality has never been wired up

on a shipping IO card.

ioc4

====

This is the core (or shim) driver for IOC4.  It is responsible for

initializing the basic functionality of the chip, and allocating

the PCI resources that are shared between the IOC4 functions.

This driver also provides registration functions that the other

IOC4 drivers can call to make their presence known.  Each driver

needs to provide a probe and remove function, which are invoked

by the core driver at appropriate times.  The interface of these

IOC4 function probe and remove operations isn't precisely the same

as PCI device probe and remove operations, but is logically the

same operation.

sgiioc4

=======

This is the IDE driver for IOC4.  Its name isn't very descriptive

simply for historical reasons (it used to be the only IOC4 driver

component).  There's not much to say about it other than it hooks

up to the ioc4 driver via the appropriate registration, probe, and

remove functions.

ioc4_serial

===========

This is the serial driver for IOC4.  There's not much to say about it

other than it hooks up to the ioc4 driver via the appropriate registration,

probe, and remove functions.

S:	Maintained

F:	drivers/net/ethernet/sgi/ioc3-eth.c

IOC3 SERIAL DRIVER

M:	Pat Gefre <pfg@sgi.com>

L:	linux-serial@vger.kernel.org

S:	Maintained

F:	drivers/tty/serial/ioc3_serial.c

IOMAP FILESYSTEM LIBRARY

M:	Christoph Hellwig <hch@infradead.org>

M:	Darrick J. Wong <darrick.wong@oracle.com>

	bool

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select ACPI if (!IA64_HP_SIM)

	select ARCH_SUPPORTS_ACPI if (!IA64_HP_SIM)

	select ACPI

	select ACPI_NUMA if NUMA

	select ARCH_SUPPORTS_ACPI

	select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI

	select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI

	select FORCE_PCI if (!IA64_HP_SIM)

	select FORCE_PCI

	select PCI_DOMAINS if PCI

	select PCI_MSI

	select PCI_SYSCALL if PCI

	select HAVE_UNSTABLE_SCHED_CLOCK

	select HAVE_EXIT_THREAD

	select HAVE_ARCH_TRACEHOOK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_VIRT_CPU_ACCOUNTING

	select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB

	select ARCH_HAS_SYNC_DMA_FOR_CPU if SWIOTLB

	select ARCH_HAS_DMA_COHERENT_TO_PFN

	select ARCH_HAS_SYNC_DMA_FOR_CPU

	select VIRT_TO_BUS

	select GENERIC_IRQ_PROBE

	select GENERIC_PENDING_IRQ if SMP

	select ARCH_THREAD_STACK_ALLOCATOR

	select ARCH_CLOCKSOURCE_DATA

	select GENERIC_TIME_VSYSCALL

	select SWIOTLB

	select SYSCTL_ARCH_UNALIGN_NO_WARN

	select HAVE_MOD_ARCH_SPECIFIC

	select MODULES_USE_ELF_RELA

	select HAVE_ARCH_AUDITSYSCALL

	select NEED_DMA_MAP_STATE

	select NEED_SG_DMA_LENGTH

	select NUMA if !FLATMEM

	default y

	help

	  The Itanium Processor Family is Intel's 64-bit successor to

config ZONE_DMA32

	def_bool y

	depends on !IA64_SGI_SN2

config QUICKLIST

	bool

	bool

	default y

choice

	prompt "System type"

	default IA64_GENERIC

config IA64_GENERIC

	bool "generic"

	select NUMA

	select ACPI_NUMA

	select SWIOTLB

	select PCI_MSI

	help

	  This selects the system type of your hardware.  A "generic" kernel

	  will run on any supported IA-64 system.  However, if you configure

	  a kernel for your specific system, it will be faster and smaller.

	  generic		For any supported IA-64 system

	  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-SN2		For SGI Altix systems

	  SGI-UV		For SGI UV systems

	  Ski-simulator		For the HP simulator <http://www.hpl.hp.com/research/linux/ski/>

	  If you don't know what to do, choose "generic".

config IA64_DIG

	bool "DIG-compliant"

	select SWIOTLB

config IA64_DIG_VTD

	bool "DIG+Intel+IOMMU"

	select INTEL_IOMMU

	select PCI_MSI

config IA64_HP_ZX1

	bool "HP-zx1/sx1000"

	help

	  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_SN2

	bool "SGI-SN2"

	select NUMA

	select ACPI_NUMA

	help

	  Selecting this option will optimize the kernel for use on sn2 based

	  systems, but the resulting kernel binary will not run on other

	  types of ia64 systems.  If you have an SGI Altix system, it's safe

	  to select this option.  If in doubt, select ia64 generic support

	  instead.

config IA64_SGI_UV

	bool "SGI-UV"

	select NUMA

	select ACPI_NUMA

	select SWIOTLB

	help

	  Selecting this option will optimize the kernel for use on UV based

	  systems, but the resulting kernel binary will not run on other

	  types of ia64 systems.  If you have an SGI UV system, it's safe

	  to select this option.  If in doubt, select ia64 generic support

	  instead.

config IA64_HP_SIM

	bool "Ski-simulator"

	select SWIOTLB

	depends on !PM

endchoice

choice

	prompt "Processor type"

	default ITANIUM

endchoice

if IA64_HP_SIM

config HZ

	default 32

endif

if !IA64_HP_SIM

source "kernel/Kconfig.hz"

endif

config IA64_BRL_EMU

	bool

	default "7" if MCKINLEY

	default "6" if ITANIUM

config IA64_SGI_UV

	bool "SGI-UV support"

	help

	  Selecting this option will add specific support for running on SGI

	  UV based systems.  If you have an SGI UV system or are building a

	  distro kernel, select this option.

config IA64_HP_SBA_IOMMU

	bool "HP SBA IOMMU support"

	default y

	help

	  Say Y here to add support for the SBA IOMMU found on HP zx1 and

	  sx1000 systems.  If you're unsure, answer Y.

config IA64_CYCLONE

	bool "Cyclone (EXA) Time Source support"

	help

	  Say Y here to enable support for IBM EXA Cyclone time source.

	  If you're unsure, answer N.

config IOSAPIC

	bool

	depends on !IA64_HP_SIM

	default y

config FORCE_MAX_ZONEORDER

	int "MAX_ORDER (11 - 17)"  if !HUGETLB_PAGE

	range 11 17  if !HUGETLB_PAGE

	select SPARSEMEM_VMEMMAP_ENABLE

config ARCH_DISCONTIGMEM_DEFAULT

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

	def_bool y

	depends on ARCH_DISCONTIGMEM_ENABLE

config NUMA

	bool "NUMA support"

	depends on !IA64_HP_SIM && !FLATMEM

	default y if IA64_SGI_SN2

	select ACPI_NUMA if ACPI

	depends on !FLATMEM

	help

	  Say Y to compile the kernel to support NUMA (Non-Uniform Memory

	  Access).  This option is for configuring high-end multiprocessor

config VIRTUAL_MEM_MAP

	bool "Virtual mem map"

	depends on !SPARSEMEM

	default y if !IA64_HP_SIM

	default y

	help

	  Say Y to compile the kernel with support for a virtual mem map.

	  This code also only takes effect if a memory hole of greater than

	  If you're unsure, do not select this option.

config SGI_SN

	def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)

config IA64_ESI

	bool "ESI (Extensible SAL Interface) support"

	help

	  the "force" module parameter, e.g., with the "aml_nfw.force"

	  kernel command line option.

source "drivers/sn/Kconfig"

config KEXEC

	bool "kexec system call"

	depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)

	depends on !SMP || HOTPLUG_CPU

	select KEXEC_CORE

	help

	  kexec is a system call that implements the ability to shutdown your

config CRASH_DUMP

	  bool "kernel crash dumps"

	  depends on IA64_MCA_RECOVERY && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)

	  depends on IA64_MCA_RECOVERY && (!SMP || HOTPLUG_CPU)

	  help

	    Generate crash dump after being started by kexec.

endmenu

source "arch/ia64/hp/sim/Kconfig"

config MSPEC

	tristate "Memory special operations driver"

	depends on IA64

config IA64_GRANULE_64MB

	bool "64MB"

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

	depends on BROKEN

endchoice