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

Commit 22246614 authored by Jack Steiner's avatar Jack Steiner Committed by Tony Luck
Browse files

[IA64] machvec support for SGI UV platform 



This patch adds the basic IA64 machvec infrastructure to support
the SGI "UV" platform.

Signed-off-by: default avatarJack Steiner <steiner@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 7868f1ed

arch/ia64/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ config IA64_GENERIC 
	  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".
@@ -170,6 +171,18 @@ config IA64_SGI_SN2 
	  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

arch/ia64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ drivers-$(CONFIG_PCI) += arch/ia64/pci/ 
drivers-$(CONFIG_IA64_HP_SIM)	+= arch/ia64/hp/sim/

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/hp/sim/ arch/ia64/sn/

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

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



boot := arch/ia64/hp/sim/boot

arch/ia64/kernel/acpi.c

+6 −1
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ acpi_get_sysname(void) 
	if (!strcmp(hdr->oem_id, "HP")) {

		return "hpzx1";

	} else if (!strcmp(hdr->oem_id, "SGI")) {

		if (!strcmp(hdr->oem_table_id + 4, "UV"))

			return "uv";

		else

			return "sn2";

	}
@@ -130,6 +133,8 @@ acpi_get_sysname(void) 
	return "hpzx1_swiotlb";

# elif defined (CONFIG_IA64_SGI_SN2)

	return "sn2";

# elif defined (CONFIG_IA64_SGI_UV)

	return "uv";

# elif defined (CONFIG_IA64_DIG)

	return "dig";

# else

arch/ia64/uv/Makefile

0 → 100644
+12 −0
Original line number Diff line number Diff line 
# arch/ia64/uv/Makefile

#

# This file is subject to the terms and conditions of the GNU General Public

# License.  See the file "COPYING" in the main directory of this archive

# for more details.

#

# Copyright (C) 2008 Silicon Graphics, Inc.  All Rights Reserved.

#

# Makefile for the sn uv subplatform

#



obj-y += kernel/

arch/ia64/uv/kernel/Makefile

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# arch/ia64/uv/kernel/Makefile

#

# This file is subject to the terms and conditions of the GNU General Public

# License.  See the file "COPYING" in the main directory of this archive

# for more details.

#

# Copyright (C) 2008 Silicon Graphics, Inc.  All Rights Reserved.

#



EXTRA_CFLAGS += -Iarch/ia64/sn/include



obj-y				+= setup.o

obj-$(CONFIG_IA64_GENERIC)      += machvec.o