new kernel patch (relative to 2.5.7-pre1)

OK, here is a bit of a weirdo patch. See, I'm still learning to get along with bitkeeper. It's been rough going, but I think it's getting closer to the point where it will actually start to save me time. In the meantime, please bear with me.

So, why is it a weird patch: well, it's relative to 2.5.7-pre1 instead of 2.5.6 as I had originally planned. Furthermore, the ia64 patch contains a couple of unrelated patches which Linus added after releasing 2.5.7-pre1. I'll spare you the details of how this happened, but for now, just ignore those minor details. I'll try to do better next time.

The good news is that 2.5 seems to be quite usable now. With this patch applied, the kernel passes all the tests in my (admittedly small) test suite. Couldn't say that for the earlier kernels. The patch has been tested with SMP on a Big Sur (gcc3.0) and UP on HP Ski simulator (gcc2.96).

As usual, the patch can be found in ftp://ftp.kernel.org/pub/linux/kernel/ports/ia64/v2.5/. The file name is:

	linux-2.5.7-pre1-ia64-020314.diff.bz2

A rough changelog is appended below (and prepended to the patch). I expect the quality of these messages to improve in the future. One notable change:
I switched over to using Rusty's approach for per-CPU variables. It makes it very easy to declare new per-CPU variables:

	int foo __per_cpu_data;

would declare "foo" as a per-CPU variable. You can then access the value that this variable has on CPU n with:

	per_cpu(foo, n)

As a special-case, you can access the value for the current CPU as:

this_cpu(foo)

This is more efficient than the logically equivalent per_cpu(foo, smp_processor_id()) because the access goes through the special per-CPU page (whose translation is pinned into the TLB).

There are two caveats:

- the total size of the per-CPU data area is currently limited to the smallest page size (4KB); we can increase this in the future if necessary, but, on the other hand, you probably shouldn't put huge variables in here either

- be careful when taking the address of this_cpu(foo); it's safe to use such a pointer on the CPU that calculated the address, but the effect of passing it to any other CPU will be implementation-dependent; if you want to get the address of a particular instance of a per-CPU variable, be sure to take the address of per_cpu(foo, n) instead.

Oh, Jack, I dropped the NUMA portion of the cpuinfo-structure. This case needs to be updated anyhow due to the new per-CPU scheme and I wasn't sure exactly what your preference would be. Also, the need for the "platform_specific" portion and the NUMA pointers in this structure should be gone now: simply declare your own per-CPU variables wherever convenient.

Over the next couple of patches, I expect much of the stuff in cpuinfo to be migrated into separate per-CPU variables, so the structure can be reverted back to its original purpose. I already moved ipi_operations.

On a final note, for those of you who want to use bitkeeper themselves, I'm trying to maintain something sensible at:

	http://lia64.bkbits.net/

If you don't want to use bitkeper, that's perfectly fine: I'll accepted patches just the same way as before so if you don't care for it, nothing at all changes for you.

Enjoy,

	--david

Summary of changes from v2.5.7-pre1 to lia64-2.5.7-pre1
===========================
<[email protected]> (02/03/09 1.375.25.1)
This patch provides a platform hook which can be used to force a successful system call return for system calls that can legitimately return (small) negative numbers.

<[email protected]> (02/03/09 1.375.26.1)
DRM fixes for IA-64.

<[email protected]> (02/03/09 1.375.27.1)
acpi.diff

<[email protected]> (02/03/09 1.375.28.1)
efi.diff

<[email protected]> (02/03/09 1.375.29.1)
qlogic.diff

<[email protected]> (02/03/09 1.375.30.1)
64-bit cleanups for sound drivers.

<[email protected]> (02/03/09 1.375.28.2)
Add GUID support to devfs.

<[email protected]> (02/03/09 1.375.31.1)
eepro100.c:
Bias Ethernet header so that IP header is (usually) aligned. Enable DMA even on word-oriented machines.

<[email protected]> (02/03/09 1.375.26.2)
agp_backend.h:
Mention INTEL_460GX as a chipset.
Add vmptr member to struct _agp_memory.

<[email protected]> (02/03/09 1.375.32.1)
timer.c, time.c:
Define and initialize time_offset variable to enable guaranteed monotonic time.

<[email protected]> (02/03/09 1.375.33.1)
irq_cpustat.h:
Rename local_irq_count() to irq_count() and local_bh_count() to bh_count(). Provide old names as deprecated alternatives
for now. Define local_*() macros to provide
local CPU efficient access to various irq_stat
members.

<[email protected]> (02/03/09 1.375.33.2)
Take advantage of CPU-local irqstat accessors.

<[email protected]> (02/03/09 1.375.31.2)

	eepro100.c:
	  Restore comment that was accidentally dropped by earlier patch.

<[email protected]> (02/03/11 1.375.26.3)
[PATCH] agpgart/DRM page_mask fix

Support both 460GX and HP's zx1 chipset without having to put kludges in DRM.

<[email protected]> (02/03/11 1.375.40.3)
[PATCH] HP Sim config patch

Offer loopback driver and network block device support for HP Sim.

<[email protected]> (02/03/11 1.375.34.8)
ide-geometry.c:
Don't include RTC headerfile for IA-64.

<[email protected]> (02/03/11 1.375.40.4)
siginfo.h:
Define SI_DETHREAD.

<[email protected]> (02/03/11 1.375.40.5)
smp.c:
Remove task-migration IPI. It's been replaced
by Ingo's migration threads.

<[email protected]> (02/03/11 1.375.40.6)
Sync with Linus' v2.5.6 tree.

<[email protected]> (02/03/12 1.388.2.2)
[PATCH] Compile fix for kernel/sched.c

Fix init_idle() to initialize preempt_count only if CONFIG_PREEMPT is set.

<[email protected]> (02/03/12 1.388.5.1)
Make sys_sendfile64() accept 64-bit fileoffsets on 64-bit platforms. Don't define sys_sendfile64() unless it's really needed.

<[email protected]> (02/03/12 1.375.36.2)
Clean up sys_prctl().

<[email protected]> (02/03/12 1.388.5.2)

	fs.h:
	  Fix typo in definition of MAX_OFF_T.

<[email protected]> (02/03/13 1.388.2.3)

	[PATCH] Fix ia64 perfmon for 2.5.6

	Fix up earlier perfmon breakage.

<[email protected]> (02/03/13 1.375.29.2)
[PATCH] Clean up qla1280 SCSI driver.

Clean up qla1280 SCSI driver.

<[email protected]> (02/03/13 1.388.2.4)
offsets.h:
Update offsets.h
defconfig:
Update defconfig.

<[email protected]> (02/03/13 1.388.2.7)
[PATCH] Move __per_cpu_data from smp.h to compiler.h.

<[email protected]> (02/03/14 1.475)
Make main-title more concise.
Rename "General setup" to "Processor type and features". Move ACPI types after the point where HP_SIM gets defined. Pick up HP Ski configuration options from arch/ia64/hp/Config.in.

<[email protected]> (02/03/14 1.473.1.2)
Pick up binfmt_elf.c SET_PERSONALITY() fix from 2.4.18.

<[email protected]> (02/03/14 1.375.29.3)

	Fix typos in qla1280.c and qla1280.h.

The latest ia64 patch relative to 2.4.18 is now available at ftp://ftp.kernel.org/pub/linux/kernel/ports/ia64/v2.4/ in file:

	linux-2.4.18-ia64-020410.diff.gz

Changelog is below, along with an approximate diff compared to the last version (except for the changes to drivers/acpi, which are big).

I hope I didn't forget or misattribute any patches.

Enjoy,

--david

o Big ACPI update (Paul Diefenbaugh)
o Added support for HP's zx1 McKinley platform (Alex Williamson, Bjorn Helgaas, et al).
o Fix GENERIC build (Bjorn Helgaas)
o Fix GCC version-detection for cross-compilation (Gary Hade)
o Make loopback device and ram disk support available for HP Ski simulator (Peter Chubb)
o Correct IA-32 Loacked Data reference fault from 3 to 4 (NOMURA, Jun'ichi)
o Update efivars from v0.04 to v0.05 (Matt Domsch)
o Tune stacked-register clearing loop for McKinley.
o Make __ia64_init_fpu() both smaller and faster.
o Tweak memset() to call __bzero() if we can determine at compile time that the value is zero.
o Update perfmon to latest version (Stephane Eranian).
o Fix ia64_iobase initialization on APs (Bjorn Helgaas), clean up code to use ioremap() (me).
o Fix VGA legacy initialization (Bjorn Helgaas, Alex Williamson).
o Fix bug which prevent mmap() at the very end of the page-table-mapped space. Bug reported by Peter A. Buhr.
o Consolidate exception handling with SEARCH_EXCEPTION_TABLE() macro (Keith Owens).
o McKinley-tuned clear_page() (Ken Chen)
o McKinley-tuned copy_page().
o Fix softare I/O TLB to return <4GB addresses for coherent buffers (reported by Dave Miller).
o AGP/DRM cleanup (Bjorn Helgaas)
o Make PC keyboard handle graciously the case where no legacy keyboard exists (Alex Williamson, I think)
o EFI update and clean up (Matt Domsch)
o Don't fail on kernel modules with no unwind data (Andreas Schwab)
o Add back flush_icache_page() for easier compatibility with vanilla 2.4 kernel.
o Drop include/linux/crc32.h and lib/crc32.c (suggested by Matt Domsch).

diff -urN linux-davidm/Documentation/Configure.help lia64-2.4/Documentation/Configure.help
@@ -14978,24 +14978,6 @@
   were partitioned using EFI GPT.  Presently only useful on the
   IA-64 platform.
 
-/dev/guid support (EXPERIMENTAL)
-CONFIG_DEVFS_GUID
-  Say Y here if you would like to access disks and partitions by
-  their Globally Unique Identifiers (GUIDs) which will appear as
-  symbolic links in /dev/guid.
-
-Intel EFI GUID partition support
-CONFIG_EFI_PARTITION
-  Say Y here if you would like to use hard disks under Linux which
-  were partitioned using EFI GPT.  Presently only useful on the
-  IA-64 platform.
-
-/dev/guid support (EXPERIMENTAL)
-CONFIG_DEVFS_GUID
-  Say Y here if you would like to access disks and partitions by
-  their Globally Unique Identifiers (GUIDs) which will appear as
-  symbolic links in /dev/guid.
-
 Ultrix partition table support
 CONFIG_ULTRIX_PARTITION
   Say Y here if you would like to be able to read the hard disk

@@ -23805,12 +23787,18 @@
 
   HP-simulator   For the HP simulator
                  (<http://software.hp.com/ia64linux/>).
+  HP-zx1         For HP zx1 Platforms.
   SN1            For SGI SN1 Platforms.
   SN2            For SGI SN2 Platforms.
   DIG-compliant  For DIG ("Developer's Interface Guide") compliant
-                 system.
+                 systems.
 
   If you don't know what to do, choose "generic".
+
+CONFIG_IA64_HP_ZX1
+  Build a kernel that runs on HP zx1-based systems.  This adds support
+  for the zx1 IOMMU and makes root bus bridges appear in PCI config space
+  (required for zx1 agpgart support).
 
 CONFIG_IA64_SGI_SN_SIM
   Build a kernel that runs on both the SGI simulator AND on hardware.

diff -urN linux-davidm/Makefile lia64-2.4/Makefile
@@ -88,7 +88,7 @@
 
 CPPFLAGS := -D__KERNEL__ -I$(HPATH)
 
-CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
+CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -g -O2 \
 	  -fomit-frame-pointer -fno-strict-aliasing -fno-common
 AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS)
 

diff -urN linux-davidm/arch/ia64/Makefile lia64-2.4/arch/ia64/Makefile
@@ -22,7 +22,7 @@
 # -ffunction-sections
 CFLAGS_KERNEL := -mconstant-gp
 
-GCC_VERSION=$(shell $(CROSS_COMPILE)$(HOSTCC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')
+GCC_VERSION=$(shell $(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')
 
 ifneq ($(GCC_VERSION),2)
 	CFLAGS += -frename-registers --param max-inline-insns 00

@@ -33,16 +33,11 @@
 endif
 
 ifdef CONFIG_IA64_GENERIC
-	CORE_FILES      :=      arch/$(ARCH)/hp/hp.a	\
-				arch/$(ARCH)/sn/sn.o	\
-				arch/$(ARCH)/dig/dig.a	\
-				arch/$(ARCH)/sn/io/sgiio.o \
+	CORE_FILES      :=      arch/$(ARCH)/hp/hp.o			\
+				arch/$(ARCH)/dig/dig.a			\
 				$(CORE_FILES)
 	SUBDIRS		:=	arch/$(ARCH)/hp		\
-				arch/$(ARCH)/sn/sn1	\
-				arch/$(ARCH)/sn		\
 				arch/$(ARCH)/dig	\
-				arch/$(ARCH)/sn/io	\
 				$(SUBDIRS)
 
 else # !GENERIC

@@ -50,7 +45,16 @@
 ifdef CONFIG_IA64_HP_SIM
         SUBDIRS         :=      arch/$(ARCH)/hp		\
                                 $(SUBDIRS)
-        CORE_FILES      :=      arch/$(ARCH)/hp/hp.a	\
+        CORE_FILES      :=      arch/$(ARCH)/hp/hp.o	\
+                                $(CORE_FILES)
+endif
+
+ifdef CONFIG_IA64_HP_ZX1
+        SUBDIRS         :=      arch/$(ARCH)/hp				\
+				arch/$(ARCH)/dig			\
+                                $(SUBDIRS)
+        CORE_FILES      :=      arch/$(ARCH)/hp/hp.o			\
+				arch/$(ARCH)/dig/dig.a			\
                                 $(CORE_FILES)
 endif
 

diff -urN linux-davidm/arch/ia64/config.in lia64-2.4/arch/ia64/config.in
@@ -41,6 +41,7 @@
 	"generic		CONFIG_IA64_GENERIC		\
 	 DIG-compliant		CONFIG_IA64_DIG			\
 	 HP-simulator		CONFIG_IA64_HP_SIM		\
+	 HP-zx1			CONFIG_IA64_HP_ZX1		\
 	 SGI-SN1		CONFIG_IA64_SGI_SN1		\
 	 SGI-SN2		CONFIG_IA64_SGI_SN2" generic
 

@@ -68,7 +69,8 @@
 	fi
 fi
 
-if [ "$CONFIG_IA64_DIG" = "y" ]; then
+if [ "$CONFIG_IA64_GENERIC" = "y" ] || [ "$CONFIG_IA64_DIG" = "y" ] \
+   || [ "$CONFIG_IA64_HP_ZX1" = "y" ]; then
 	bool '  Enable IA-64 Machine Check Abort' CONFIG_IA64_MCA
 	define_bool CONFIG_PM y
 fi

@@ -152,6 +154,17 @@
 fi
 endmenu
 
+else # ! HP_SIM
+mainmenu_option next_comment
+comment 'Block devices'
+tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP
+dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET
+
+tristate 'RAM disk support' CONFIG_BLK_DEV_RAM
+if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then
+   int '  Default RAM disk size' CONFIG_BLK_DEV_RAM_SIZE 4096
+fi
+endmenu
 fi # !HP_SIM
 
 mainmenu_option next_comment

diff -urN linux-davidm/arch/ia64/defconfig lia64-2.4/arch/ia64/defconfig
@@ -672,7 +672,6 @@
 # CONFIG_SOLARIS_X86_PARTITION is not set
 # CONFIG_UNIXWARE_DISKLABEL is not set
 CONFIG_EFI_PARTITION=y
-# CONFIG_DEVFS_GUID is not set
 # CONFIG_LDM_PARTITION is not set
 # CONFIG_SGI_PARTITION is not set
 # CONFIG_ULTRIX_PARTITION is not set

diff -urN linux-davidm/arch/ia64/dig/setup.c lia64-2.4/arch/ia64/dig/setup.c
@@ -33,8 +33,7 @@
  * is sufficient (the IDE driver will autodetect the drive geometry).
  */
 char drive_info[4*16];
-
-unsigned char aux_device_present = 0xaa;	/* XXX remove this when legacy I/O is gone */
+extern int pcat_compat;
 
 void __init
 dig_setup (char **cmdline_p)

@@ -81,13 +80,7 @@
 	screen_info.orig_video_ega_bx = 3;	/* XXX fake */
 }
 
-void
+void __init
 dig_irq_init (void)
 {
-	/*
-	 * Disable the compatibility mode interrupts (8259 style), needs IN/OUT support
-	 * enabled.
-	 */
-	outb(0xff, 0xA1);
-	outb(0xff, 0x21);
 }

diff -urN linux-davidm/arch/ia64/hp/Makefile lia64-2.4/arch/ia64/hp/Makefile
@@ -1,17 +1,15 @@
-#
-# ia64/platform/hp/Makefile
-#
-# Copyright (C) 1999 Silicon Graphics, Inc.
-# Copyright (C) Srinivasa Thirumalachar ([email protected])
-#
+# arch/ia64/hp/Makefile
+# Copyright (c) 2002 Matthew Wilcox for Hewlett Packard
 
-all: hp.a
+ALL_SUB_DIRS := sim zx1 common
 
-O_TARGET := hp.a
+O_TARGET := hp.o
 
-obj-y := hpsim_console.o hpsim_irq.o hpsim_setup.o
-obj-$(CONFIG_IA64_GENERIC) += hpsim_machvec.o
+subdir-$(CONFIG_IA64_GENERIC) += $(ALL_SUB_DIRS)
+subdir-$(CONFIG_IA64_HP_SIM) += sim
+subdir-$(CONFIG_IA64_HP_ZX1) += zx1 common
 
-clean::
+SUB_DIRS := $(subdir-y)
+obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o))
 
 include $(TOPDIR)/Rules.make

diff -urN linux-davidm/arch/ia64/hp/common/Makefile lia64-2.4/arch/ia64/hp/common/Makefile
@@ -0,0 +1,14 @@
+#
+# ia64/platform/hp/common/Makefile
+#
+# Copyright (C) 2002 Hewlett Packard
+# Copyright (C) Alex Williamson ([email protected])
+#
+
+O_TARGET := common.o
+
+export-objs := sba_iommu.o
+
+obj-y := sba_iommu.o
+
+include $(TOPDIR)/Rules.make

diff -urN linux-davidm/arch/ia64/hp/hpsim_machvec.c lia64-2.4/arch/ia64/hp/hpsim_machvec.c
@@ -1,2 +0,0 @@
-#define MACHVEC_PLATFORM_NAME	hpsim
-#include <asm/machvec_init.h>

diff -urN linux-davidm/arch/ia64/hp/hpsim_ssc.h lia64-2.4/arch/ia64/hp/hpsim_ssc.h
@@ -1,36 +0,0 @@
-/*
- * Platform dependent support for HP simulator.
- *
- * Copyright (C) 1998, 1999 Hewlett-Packard Co
- * Copyright (C) 1998, 1999 David Mosberger-Tang <[email protected]>
- * Copyright (C) 1999 Vijay Chander <[email protected]>
- */
-#ifndef _IA64_PLATFORM_HPSIM_SSC_H
-#define _IA64_PLATFORM_HPSIM_SSC_H
-
-/* Simulator system calls: */
-
-#define SSC_CONSOLE_INIT		20
-#define SSC_GETCHAR			21
-#define SSC_PUTCHAR			31
-#define SSC_CONNECT_INTERRUPT		58
-#define SSC_GENERATE_INTERRUPT		59
-#define SSC_SET_PERIODIC_INTERRUPT	60
-#define SSC_GET_RTC			65
-#define SSC_EXIT			66
-#define SSC_LOAD_SYMBOLS		69
-#define SSC_GET_TOD			74
-#define SSC_CTL_TRACE			76
-
-#define SSC_NETDEV_PROBE		100
-#define SSC_NETDEV_SEND			101
-#define SSC_NETDEV_RECV			102
-#define SSC_NETDEV_ATTACH		103
-#define SSC_NETDEV_DETACH		104
-
-/*
- * Simulator system call.
- */
-extern long ia64_ssc (long arg0, long arg1, long arg2, long arg3, int nr);
-
-#endif /* _IA64_PLATFORM_HPSIM_SSC_H */

diff -urN linux-davidm/arch/ia64/hp/sim/Makefile lia64-2.4/arch/ia64/hp/sim/Makefile
@@ -0,0 +1,13 @@
+#
+# ia64/platform/hp/sim/Makefile
+#
+# Copyright (C) 1999 Silicon Graphics, Inc.
+# Copyright (C) Srinivasa Thirumalachar ([email protected])
+#
+
+O_TARGET := sim.o
+
+obj-y := hpsim_console.o hpsim_irq.o hpsim_setup.o
+obj-$(CONFIG_IA64_GENERIC) += hpsim_machvec.o
+
+include $(TOPDIR)/Rules.make

diff -urN linux-davidm/arch/ia64/hp/sim/hpsim_machvec.c lia64-2.4/arch/ia64/hp/sim/hpsim_machvec.c
@@ -0,0 +1,2 @@
+#define MACHVEC_PLATFORM_NAME	hpsim
+#include <asm/machvec_init.h>

diff -urN linux-davidm/arch/ia64/hp/sim/hpsim_ssc.h lia64-2.4/arch/ia64/hp/sim/hpsim_ssc.h
@@ -0,0 +1,36 @@
+/*
+ * Platform dependent support for HP simulator.
+ *
+ * Copyright (C) 1998, 1999 Hewlett-Packard Co
+ * Copyright (C) 1998, 1999 David Mosberger-Tang <[email protected]>
+ * Copyright (C) 1999 Vijay Chander <[email protected]>
+ */
+#ifndef _IA64_PLATFORM_HPSIM_SSC_H
+#define _IA64_PLATFORM_HPSIM_SSC_H
+
+/* Simulator system calls: */
+
+#define SSC_CONSOLE_INIT		20
+#define SSC_GETCHAR			21
+#define SSC_PUTCHAR			31
+#define SSC_CONNECT_INTERRUPT		58
+#define SSC_GENERATE_INTERRUPT		59
+#define SSC_SET_PERIODIC_INTERRUPT	60
+#define SSC_GET_RTC			65
+#define SSC_EXIT			66
+#define SSC_LOAD_SYMBOLS		69
+#define SSC_GET_TOD			74
+#define SSC_CTL_TRACE			76
+
+#define SSC_NETDEV_PROBE		100
+#define SSC_NETDEV_SEND			101
+#define SSC_NETDEV_RECV			102
+#define SSC_NETDEV_ATTACH		103
+#define SSC_NETDEV_DETACH		104
+
+/*
+ * Simulator system call.
+ */
+extern long ia64_ssc (long arg0, long arg1, long arg2, long arg3, int nr);
+
+#endif /* _IA64_PLATFORM_HPSIM_SSC_H */

diff -urN linux-davidm/arch/ia64/hp/zx1/Makefile lia64-2.4/arch/ia64/hp/zx1/Makefile
@@ -0,0 +1,13 @@
+#
+# ia64/platform/hp/zx1/Makefile
+#
+# Copyright (C) 2002 Hewlett Packard
+# Copyright (C) Alex Williamson ([email protected])
+#
+
+O_TARGET := zx1.o
+
+obj-y := hpzx1_misc.o
+obj-$(CONFIG_IA64_GENERIC) += hpzx1_machvec.o
+
+include $(TOPDIR)/Rules.make

diff -urN linux-davidm/arch/ia64/hp/zx1/hpzx1_machvec.c lia64-2.4/arch/ia64/hp/zx1/hpzx1_machvec.c
@@ -0,0 +1,2 @@
+#define MACHVEC_PLATFORM_NAME	hpzx1
+#include <asm/machvec_init.h>

diff -urN linux-davidm/arch/ia64/ia32/ia32_traps.c lia64-2.4/arch/ia64/ia32/ia32_traps.c
@@ -20,7 +20,7 @@
 {
 	switch ((isr >> 16) & 0xff) {
 	      case 0:	/* Instruction intercept fault */
-	      case 3:	/* Locked Data reference fault */
+	      case 4:	/* Locked Data reference fault */
 	      case 1:	/* Gate intercept trap */
 		return -1;
 

diff -urN linux-davidm/arch/ia64/kernel/Makefile lia64-2.4/arch/ia64/kernel/Makefile
@@ -17,6 +17,7 @@
 	 machvec.o pal.o process.o perfmon.o ptrace.o sal.o salinfo.o semaphore.o setup.o	 \
 	 signal.o sys_ia64.o traps.o time.o unaligned.o unwind.o
 obj-$(CONFIG_IA64_GENERIC) += iosapic.o
+obj-$(CONFIG_IA64_HP_ZX1) += iosapic.o
 obj-$(CONFIG_IA64_DIG) += iosapic.o
 obj-$(CONFIG_IA64_PALINFO) += palinfo.o
 obj-$(CONFIG_EFI_VARS) += efivars.o

diff -urN linux-davidm/arch/ia64/kernel/efivars.c lia64-2.4/arch/ia64/kernel/efivars.c

diff -urN linux-davidm/arch/ia64/kernel/ia64_ksyms.c lia64-2.4/arch/ia64/kernel/ia64_ksyms.c

diff -urN linux-davidm/arch/ia64/kernel/irq.c lia64-2.4/arch/ia64/kernel/irq.c

diff -urN linux-davidm/arch/ia64/kernel/mca.c lia64-2.4/arch/ia64/kernel/mca.c

diff -urN linux-davidm/arch/ia64/kernel/minstate.h lia64-2.4/arch/ia64/kernel/minstate.h

diff -urN linux-davidm/arch/ia64/kernel/pal.S lia64-2.4/arch/ia64/kernel/pal.S

diff -urN linux-davidm/arch/ia64/kernel/perfmon_generic.h lia64-2.4/arch/ia64/kernel/perfmon_generic.h

diff -urN linux-davidm/arch/ia64/kernel/smpboot.c lia64-2.4/arch/ia64/kernel/smpboot.c

diff -urN linux-davidm/arch/ia64/kernel/sys_ia64.c lia64-2.4/arch/ia64/kernel/sys_ia64.c

diff -urN linux-davidm/arch/ia64/kernel/unaligned.c lia64-2.4/arch/ia64/kernel/unaligned.c

diff -urN linux-davidm/arch/ia64/kernel/unwind_i.h lia64-2.4/arch/ia64/kernel/unwind_i.h

diff -urN linux-davidm/arch/ia64/lib/Makefile lia64-2.4/arch/ia64/lib/Makefile

diff -urN linux-davidm/arch/ia64/lib/memset.S lia64-2.4/arch/ia64/lib/memset.S

diff -urN linux-davidm/arch/ia64/lib/swiotlb.c lia64-2.4/arch/ia64/lib/swiotlb.c

diff -urN linux-davidm/arch/ia64/mm/fault.c lia64-2.4/arch/ia64/mm/fault.c

diff -urN linux-davidm/arch/ia64/mm/tlb.c lia64-2.4/arch/ia64/mm/tlb.c

diff -urN linux-davidm/drivers/char/agp/agp.h lia64-2.4/drivers/char/agp/agp.h

diff -urN linux-davidm/drivers/char/drm/drm_vm.h lia64-2.4/drivers/char/drm/drm_vm.h

diff -urN linux-davidm/drivers/char/pc_keyb.c lia64-2.4/drivers/char/pc_keyb.c

diff -urN linux-davidm/drivers/pci/pci.ids lia64-2.4/drivers/pci/pci.ids

diff -urN linux-davidm/fs/devfs/base.c lia64-2.4/fs/devfs/base.c

diff -urN linux-davidm/fs/partitions/Config.in lia64-2.4/fs/partitions/Config.in

diff -urN linux-davidm/fs/partitions/msdos.c lia64-2.4/fs/partitions/msdos.c

diff -urN linux-davidm/include/asm-ia64/acpikcfg.h lia64-2.4/include/asm-ia64/acpikcfg.h

diff -urN linux-davidm/include/asm-ia64/cache.h lia64-2.4/include/asm-ia64/cache.h

diff -urN linux-davidm/include/asm-ia64/current.h lia64-2.4/include/asm-ia64/current.h

diff -urN linux-davidm/include/asm-ia64/efi.h lia64-2.4/include/asm-ia64/efi.h

diff -urN linux-davidm/include/asm-ia64/hw_irq.h lia64-2.4/include/asm-ia64/hw_irq.h

diff -urN linux-davidm/include/asm-ia64/machvec.h lia64-2.4/include/asm-ia64/machvec.h

diff -urN linux-davidm/include/asm-ia64/machvec_hpzx1.h lia64-2.4/include/asm-ia64/machvec_hpzx1.h

diff -urN linux-davidm/include/asm-ia64/machvec_init.h lia64-2.4/include/asm-ia64/machvec_init.h

diff -urN linux-davidm/include/asm-ia64/module.h lia64-2.4/include/asm-ia64/module.h

diff -urN linux-davidm/include/asm-ia64/pci.h lia64-2.4/include/asm-ia64/pci.h

diff -urN linux-davidm/include/asm-ia64/pgalloc.h lia64-2.4/include/asm-ia64/pgalloc.h

diff -urN linux-davidm/include/asm-ia64/sal.h lia64-2.4/include/asm-ia64/sal.h

diff -urN linux-davidm/include/asm-ia64/string.h lia64-2.4/include/asm-ia64/string.h

diff -urN linux-davidm/include/asm-ia64/system.h lia64-2.4/include/asm-ia64/system.h

diff -urN linux-davidm/include/asm-ia64/uaccess.h lia64-2.4/include/asm-ia64/uaccess.h

diff -urN linux-davidm/include/linux/acpi_serial.h lia64-2.4/include/linux/acpi_serial.h

diff -urN linux-davidm/include/linux/crc32.h lia64-2.4/include/linux/crc32.h

diff -urN linux-davidm/include/linux/devfs_fs_kernel.h lia64-2.4/include/linux/devfs_fs_kernel.h

diff -urN linux-davidm/include/linux/genhd.h lia64-2.4/include/linux/genhd.h

diff -urN linux-davidm/include/linux/pci_ids.h lia64-2.4/include/linux/pci_ids.h

diff -urN linux-davidm/init/main.c lia64-2.4/init/main.c

diff -urN linux-davidm/lib/Makefile lia64-2.4/lib/Makefile

diff -urN linux-davidm/mm/memory.c lia64-2.4/mm/memory.c

Part of the diff is not shown here. View the raw message.

To All,

You need this extra perfmon patch to get the Itanium working. I gave David the wrong version of perfmon_itanium.h. Apply the attached small patch on top of David's linux-2.4.18-ia64-020410.diff.gz patch.

Sorry for the inconvience.

--
-Stephane

@@ -11,15 +11,15 @@
 /* pmc1  */ { PFM_REG_CONTROL, 0, NULL, NULL, {0UL,0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
 /* pmc2  */ { PFM_REG_CONTROL, 0, NULL, NULL, {0UL,0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
 /* pmc3  */ { PFM_REG_CONTROL, 0, NULL, NULL, {0UL,0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
-/* pmc4  */ { PFM_REG_COUNTING, 0, NULL, NULL, {RDEP(4),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
-/* pmc5  */ { PFM_REG_COUNTING, 0, NULL, NULL, {RDEP(5),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
-/* pmc6  */ { PFM_REG_COUNTING, 0, NULL, NULL, {RDEP(6),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
-/* pmc7  */ { PFM_REG_COUNTING, 0, NULL, NULL, {RDEP(7),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
+/* pmc4  */ { PFM_REG_COUNTING, 6, NULL, NULL, {RDEP(4),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
+/* pmc5  */ { PFM_REG_COUNTING, 6, NULL, NULL, {RDEP(5),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
+/* pmc6  */ { PFM_REG_COUNTING, 6, NULL, NULL, {RDEP(6),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
+/* pmc7  */ { PFM_REG_COUNTING, 6, NULL, NULL, {RDEP(7),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
 /* pmc8  */ { PFM_REG_CONFIG, 0, NULL, NULL, {0UL,0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
 /* pmc9  */ { PFM_REG_CONFIG, 0, NULL, NULL, {0UL,0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
-/* pmc10 */ { PFM_REG_MONITOR, 0, NULL, NULL, {RDEP(0)|RDEP(1),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
-/* pmc11 */ { PFM_REG_MONITOR, 0, NULL, pfm_ita_pmc_check, {RDEP(2)|RDEP(3)|RDEP(17),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
-/* pmc12 */ { PFM_REG_MONITOR, 0, NULL, NULL, {RDEP(8)|RDEP(9)|RDEP(10)|RDEP(11)|RDEP(12)|RDEP(13)|RDEP(14)|RDEP(15)|RDEP(16),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
+/* pmc10 */ { PFM_REG_MONITOR, 6, NULL, NULL, {RDEP(0)|RDEP(1),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
+/* pmc11 */ { PFM_REG_MONITOR, 6, NULL, pfm_ita_pmc_check, {RDEP(2)|RDEP(3)|RDEP(17),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
+/* pmc12 */ { PFM_REG_MONITOR, 6, NULL, NULL, {RDEP(8)|RDEP(9)|RDEP(10)|RDEP(11)|RDEP(12)|RDEP(13)|RDEP(14)|RDEP(15)|RDEP(16),0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
 /* pmc13 */ { PFM_REG_CONFIG, 0, NULL, pfm_ita_pmc_check, {0UL,0UL, 0UL, 0UL}, {0UL,0UL, 0UL, 0UL}},
 	    { PFM_REG_NONE, 0, NULL, NULL, {0,}, {0,}}, /* end marker */
 };

Stephane,

I'm building for McKinley. What about the missing perfmon_mckinley.h?

Thanks,

Chris

Hi Chris,

McKinley information still requires NDA and hence it cannot be mailed on this public mailing lists.

Thanks
Sunil

-----Original Message-----
From: Chris McDermott [mailto:[email protected]]
Sent: Thursday, April 11, 2002 11:22 AM
To: [email protected]
Cc: [email protected]
Subject: Re: [Linux-ia64] new kernel patch (relative to 2.4.18)

Stephane,

I'm building for McKinley. What about the missing perfmon_mckinley.h?

Thanks,

Chris

Apr 10 11:16:59 2002

Apr 10 15:15:23 2002

The latest ia64 patch relative to 2.5.8-pre3 is now available at ftp://ftp.kernel.org/pub/linux/kernel/ports/ia64/v2.5/ in file:

	linux-2.5.8-pre3-ia64-020411.diff.gz

The reason this one is relative to a pre-patch again is that I tried 2.5.7 and had problems with lost IDE interrupts. I didn't trust the IDE drivers that were in 2.5.7, so I updated to 2.5.8-pre3 only to find that this still doesn't fix the problem. In the end, I found that turning off CONFIG_BLK_DEV_PIIX fixed the problem. Could someone more knowledgable with IDE look into this?

Below is a summary of changes relative to Linus's tree. The patch is actually getting smaller primarily due to the ACPI merge! Thanks to Paul Diefenbaugh for his work here! Let's hope the ACPI code will stay synced.

Next on my list is DRM. Also, Jes could you talk Linus into accepting your qlogic drivers? He started hacking on them, which caused some conflicts. I'd rather have him your cleaned up drivers. ;-)

Please give it a try and let me know how it goes.

Enjoy,

	--david

 arch/ia64/hp/hpsim_console.c            |   64 
 arch/ia64/hp/hpsim_irq.c                |   46 
 arch/ia64/hp/hpsim_machvec.c            |    2 
 arch/ia64/hp/hpsim_setup.c              |   58 
 arch/ia64/hp/hpsim_ssc.h                |   36 
 arch/ia64/hp/simeth.c                   |  533 -
 arch/ia64/hp/simscsi.c                  |  368 
 arch/ia64/hp/simscsi.h                  |   39 
 arch/ia64/hp/simserial.c                | 1104 --
 include/asm-ia64/acpi-ext.h             |  323 
 include/asm-ia64/acpikcfg.h             |   30 
 Documentation/mmio_barrier.txt          |   15 
 Makefile                                |    2 
 arch/i386/mm/fault.c                    |    2 
 arch/ia64/Config.help                   |   34 
 arch/ia64/Makefile                      |   22 
 arch/ia64/config.in                     |    3 
 arch/ia64/defconfig                     |   80 
 arch/ia64/dig/setup.c                   |   15 
 arch/ia64/hp/Config.in                  |    9 
 arch/ia64/hp/Makefile                   |   32 
 arch/ia64/hp/common/Makefile            |   28 
 arch/ia64/hp/common/sba_iommu.c         | 3700 +++++++++
 arch/ia64/hp/sim/Makefile               |   43 
 arch/ia64/hp/sim/hpsim_console.c        |   64 
 arch/ia64/hp/sim/hpsim_irq.c            |   46 
 arch/ia64/hp/sim/hpsim_machvec.c        |    2 
 arch/ia64/hp/sim/hpsim_setup.c          |   58 
 arch/ia64/hp/sim/hpsim_ssc.h            |   36 
 arch/ia64/hp/sim/simeth.c               |  533 +
 arch/ia64/hp/sim/simscsi.c              |  368 
 arch/ia64/hp/sim/simscsi.h              |   39 
 arch/ia64/hp/sim/simserial.c            | 1104 ++
 arch/ia64/hp/zx1/Makefile               |   26 
 arch/ia64/hp/zx1/hpzx1_machvec.c        |    4 
 arch/ia64/hp/zx1/hpzx1_misc.c           |  806 ++
 arch/ia64/ia32/binfmt_elf32.c           |    2 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/Makefile               |    1 
 arch/ia64/kernel/acpi.c                 | 1153 +-
 arch/ia64/kernel/brl_emu.c              |    6 
 arch/ia64/kernel/efi.c                  |   64 
 arch/ia64/kernel/efivars.c              |   21 
 arch/ia64/kernel/entry.S                |  148 
 arch/ia64/kernel/head.S                 |  239 
 arch/ia64/kernel/ia64_ksyms.c           |    9 
 arch/ia64/kernel/iosapic.c              |  116 
 arch/ia64/kernel/irq.c                  |   17 
 arch/ia64/kernel/mca.c                  |   34 
 arch/ia64/kernel/minstate.h             |   98 
 arch/ia64/kernel/pci.c                  |  186 
 arch/ia64/kernel/process.c              |    6 
 arch/ia64/kernel/semaphore.c            |    5 
 arch/ia64/kernel/setup.c                |   69 
 arch/ia64/kernel/signal.c               |    6 
 arch/ia64/kernel/smp.c                  |    3 
 arch/ia64/kernel/smpboot.c              |    6 
 arch/ia64/kernel/sys_ia64.c             |    6 
 arch/ia64/kernel/unwind_i.h             |    2 
 arch/ia64/lib/Makefile                  |    3 
 arch/ia64/lib/copy_page_mck.S           |  239 
 arch/ia64/lib/do_csum.S                 |  102 
 arch/ia64/lib/swiotlb.c                 |   11 
 arch/ia64/mm/fault.c                    |    8 
 arch/ia64/mm/init.c                     |    9 
 arch/ia64/mm/tlb.c                      |    5 
 arch/parisc/kernel/traps.c              |    1 
 drivers/acpi/acpi_system.c              |    4 
 drivers/acpi/include/platform/aclinux.h |    2 
 drivers/char/Config.help                |    4 
 drivers/char/Config.in                  |    4 
 drivers/char/agp/agp.h                  |   33 
 drivers/char/agp/agpgart_be.c           | 1290 ++-
 drivers/char/drm/Config.in              |   15 
 drivers/char/drm/ati_pcigart.h          |   17 
 drivers/char/drm/drmP.h                 |   12 
 drivers/char/drm/drm_agpsupport.h       |    3 
 drivers/char/drm/drm_bufs.h             |    6 
 drivers/char/drm/drm_drv.h              |    2 
 drivers/char/drm/drm_memory.h           |   52 
 drivers/char/drm/drm_scatter.h          |    6 
 drivers/char/drm/drm_vm.h               |   70 
 drivers/char/drm/i810_dma.c             |    9 
 drivers/char/drm/mga_dma.c              |   12 
 drivers/char/drm/r128_cce.c             |   77 
 drivers/char/drm/radeon_cp.c            |   61 
 drivers/char/mem.c                      |    1 
 drivers/media/radio/Makefile            |    2 
 drivers/media/radio/dummy.c             |    1 
 drivers/media/video/Makefile            |    2 
 drivers/media/video/dummy.c             |    1 
 drivers/net/eepro100.c                  |   34 
 drivers/pci/pci.ids                     |    3 
 drivers/scsi/Config.in                  |    1 
 drivers/scsi/Makefile                   |    1 
 drivers/scsi/ql12160_fw.h               | 3125 ++++---
 drivers/scsi/ql1280_fw.h                | 3774 ++++-----
 drivers/scsi/ql2100_fw.h                | 4740 +++++++++++
 drivers/scsi/ql2200_fw.h                | 5179 ++++++++++++
 drivers/scsi/ql2300_fw.h                | 5486 +++++++++++++
 drivers/scsi/qla1280.c                  | 5215 ++++++-------
 drivers/scsi/qla1280.h                  |  550 -
 drivers/scsi/qla2x00.c                  |12823 ++++++++++++++++++++++++++++++++
 drivers/scsi/qla2x00.h                  | 2492 ++++++
 drivers/scsi/qla2x00exioct.h            |  823 ++
 drivers/scsi/qla2x00exioctln.h          |  131 
 drivers/scsi/qla2x00ioctl.c             | 1179 ++
 drivers/scsi/qlavendor.c                |  325 
 drivers/scsi/scsi_ioctl.c               |   13 
 drivers/usb/uhci.c                      |    2 
 drivers/usb/usb-ohci.c                  |   10 
 fs/binfmt_elf.c                         |    4 
 fs/fcntl.c                              |    1 
 fs/nfsd/nfsctl.c                        |    1 
 fs/proc/base.c                          |   17 
 include/asm-i386/hw_irq.h               |    2 
 include/asm-i386/page.h                 |    4 
 include/asm-i386/ptrace.h               |    1 
 include/asm-ia64/acpi.h                 |   49 
 include/asm-ia64/cacheflush.h           |   49 
 include/asm-ia64/efi.h                  |   43 
 include/asm-ia64/hw_irq.h               |    2 
 include/asm-ia64/ide.h                  |   32 
 include/asm-ia64/machvec.h              |    4 
 include/asm-ia64/machvec_hpzx1.h        |   74 
 include/asm-ia64/machvec_init.h         |    5 
 include/asm-ia64/module.h               |    3 
 include/asm-ia64/offsets.h              |    6 
 include/asm-ia64/pci.h                  |    5 
 include/asm-ia64/percpu.h               |   24 
 include/asm-ia64/pgalloc.h              |  117 
 include/asm-ia64/pgtable.h              |  104 
 include/asm-ia64/processor.h            |   11 
 include/asm-ia64/sal.h                  |   36 
 include/asm-ia64/thread_info.h          |    7 
 include/asm-ia64/tlbflush.h             |   83 
 include/asm-ia64/uaccess.h              |    5 
 include/asm-ia64/unistd.h               |    3 
 include/linux/acpi.h                    |    2 
 include/linux/acpi_serial.h             |    2 
 include/linux/agp_backend.h             |    5 
 include/linux/compiler.h                |    3 
 include/linux/fs.h                      |   13 
 include/linux/highmem.h                 |    4 
 include/linux/irq.h                     |    4 
 include/linux/irq_cpustat.h             |   22 
 include/linux/kernel.h                  |    9 
 include/linux/pci_ids.h                 |    3 
 include/linux/percpu.h                  |    4 
 include/linux/prctl.h                   |    6 
 include/linux/sched.h                   |    4 
 include/linux/smp.h                     |    5 
 kernel/exec_domain.c                    |    2 
 kernel/fork.c                           |    9 
 kernel/ksyms.c                          |    4 
 kernel/printk.c                         |   78 
 kernel/sched.c                          |    4 
 kernel/softirq.c                        |   26 
 kernel/sys.c                            |   62 
 kernel/time.c                           |    4 
 kernel/timer.c                          |    7 
 lib/brlock.c                            |    2 
 mm/filemap.c                            |    8 
 mm/memory.c                             |    2 
 sound/oss/cs4281/cs4281m.c              |   71 
 sound/oss/cs4281/cs4281pm-24.c          |   12 
 166 files changed, 50042 insertions(+), 10870 deletions(-)

through these ChangeSets:

<[email protected]> (02/04/11 1.456.1.2)
ia64: Add AGP support for HP zx1 platform. Fix physical-address calculation.

<[email protected]> (02/04/11 1.458.1.2)
ia64: make 2.5.8-pre3 work on SMP ia64.

<[email protected]> (02/04/11 1.456.6.3)
ia64: Minor fixups.

<[email protected]> (02/04/11 1.458.1.1)
ia64: Make v2.5.8-pre3 work on ia64.

<[email protected]> (02/04/10 1.458)
ia64: Add asm/cacheflush.h and asm/tlbflush.h.

<[email protected]> (02/04/10 1.369.99.29)
minstate.h:
Add mising include of <asm/cache.h>.

<[email protected]> (02/04/10 1.369.99.28)

   Cset exclude: [email protected]|ChangeSet|20020411000006|41013

<[email protected]> (02/04/10 1.369.99.27)
ia64: Misc fixups.

<[email protected]> (02/04/10 1.369.48.9)
nfsctl.c:
Add missing include of <linux/init.h>.

<[email protected]> (02/04/10 1.369.99.26)
setup.c:
Move disabling of 8259 irqs into iosapic.c.

<[email protected]> (02/04/10 1.369.99.25)
smpboot.c:
Declare ia64_iobase.

<[email protected]> (02/04/10 1.369.99.24)
minstate.h:
Add missing include of <asm/cache.h>.

<[email protected]> (02/04/10 1.369.99.23)
acpi.c:
Paul's ACPI update.

<[email protected]> (02/04/10 1.369.99.22)
Manual merge with Paul's 2.4.18 ACPI update.

<[email protected]> (02/04/10 1.369.99.21)
More McKinley tuning and minor do_csum() cleanup.

<[email protected]> (02/04/10 1.369.99.20)
More EFI fixes.

<[email protected]> (02/04/10 1.369.99.19)
[PATCH] This patch against 2.4.18+ia64-020226 removes a legacy VGA dependency. Non-legacy systems may have system memory at 0xA0000, and if that's the case, we don't want to install the VGA console.

Restructured conswitchp init slightly so that if both CONFIG_DUMMY_CONSOLE and CONFIG_VGA_CONSOLE
are defined, conswitchp is always set to something, even if we don't find VGA at 0xA0000.

This work is due to Alex Williamson ([email protected]).

<[email protected]> (02/04/10 1.369.99.18)
Tune __ia64_init_fpu() for better performance and smaller size.

<[email protected]> (02/04/08 1.369.99.17)
[PATCH] The kernel cannot cope with modules without unwind data, which happens with data-only modules like the fs/nls modules when compiling with gcc 3.1. This patch fixes the problem.

<[email protected]> (02/04/08 1.369.99.16)
Misc fixes.

<[email protected]> (02/04/05 1.369.99.15)
Fix HP simulator Makefile for merge conflict with zx1 support patch.

<[email protected]> (02/04/05 1.369.99.14)
[PATCH] Add support for HP zx1 systems.

<[email protected]> (02/04/05 1.369.99.13)
New files for HP zx1 systems.

<[email protected]> (02/04/05 1.369.99.12)
Fix software I/O TLB to always return <4GB memory for alloc_consistent().

<[email protected]> (02/04/02 1.369.99.11)
arch/ia64/lib/copy_page_mck.S:
Tweak for better performance when data is in L2 or L3 cache.

<[email protected]> (02/04/02 1.369.99.10)
[PATCH] arch/ia64/Makefile tweak

<[email protected]> (02/04/02 1.369.99.9)
[PATCH] Wouldn't you know it, but Richard Hirst found that I was *again* unparsing

Patch below should apply to both the 2.5.7-pre1 and 2.4.18 trees.

<[email protected]> (02/04/02 1.369.99.8)
(arch/ia64/kernel/unwind_i.h): Fix typo in comment.

<[email protected]> (02/04/01 1.369.99.7)
Initialize ar.k0 with physical I/O base not just on BP but also on all APs (based on patch by Bjorn Helgaas).

<[email protected]> (02/03/28 1.369.99.6)
[PATCH] IA-64 specific part of Matt's patch:

changes:
* EFI_GUID macro defined per your suggestion - efi_guid_t is now a struct of char[16]. Fixed all GUID definitions.
* Made one unified efi_guid_unparse() static inline in asm-ia64/efi.h. Removed three other definitions of similar in efivars.c and mca.c.
* fixed endianness of fs/partitions/efi.c - thanks to Richard Hirst and his GPT work in Parted.
* cleaned up find_valid_gpt() to make it easier to see what's going on and avoid future NULL ptr deref cases if this code gets modified yet again.
* Only use partition table slots 0..max_p. The previous behaviour would let you delete a partition in the middle of the table, and on next boot all the partition numbers above that would switch down. This change makes it consistent with the MSDOS concept of primary partitions. /dev/sdaX exists iff the partition type is not NULL.
* Moved CONFIG_PARTITION_EFI help text to fs/partitions/Config.help

<[email protected]> (02/03/28 1.369.99.5)
[PATCH] This patch adds 5 help texts to arch/ia64/Config.help. The texts were obtained from Eric S. Raymond's v2.97 Configure.help.

<[email protected]> (02/03/28 1.369.99.4)
[PATCH] First part of sync with 2.5.7 (ACPI still broken, Ski OK)..

<[email protected]> (02/03/28 1.369.99.3)
arch/ia64/defconfig:
Update for v2.5.7.

<[email protected]> (02/03/27 1.369.99.2)
Minor tweaks for McKinley-optimized copy_page(). Fix configuration for HP Ski simulator.

<[email protected]> (02/03/27 1.369.77.6)
Fix ia64-version of thread_info. Add McKinley-optimized copy_page().

<[email protected]> (02/03/15 1.369.77.5)

   Cset exclude: [email protected]|ChangeSet|20020312081510|17850

<[email protected]> (02/03/14 1.369.43.3)
Fix typos in qla1280.c and qla1280.h.

<[email protected]> (02/03/14 1.369.78.2)
Pick up binfmt_elf.c SET_PERSONALITY() fix from 2.4.18.

<[email protected]> (02/03/13 1.369.66.7)
[PATCH] Move __per_cpu_data from smp.h to compiler.h.

<[email protected]> (02/03/13 1.369.43.2)
[PATCH] Clean up qla1280 SCSI driver.

Clean up qla1280 SCSI driver.

<[email protected]> (02/03/12 1.369.71.2)
fs.h:
Fix typo in definition of MAX_OFF_T.

<[email protected]> (02/03/12 1.369.50.2)
Clean up sys_prctl().

<[email protected]> (02/03/12 1.369.71.1)
Make sys_sendfile64() accept 64-bit fileoffsets on 64-bit platforms. Don't define sys_sendfile64() unless it's really needed.

<[email protected]> (02/03/11 1.369.48.8)
ide-geometry.c:
Don't include RTC headerfile for IA-64.

<[email protected]> (02/03/11 1.369.42.3)
[PATCH] agpgart/DRM page_mask fix

Support both 460GX and HP's zx1 chipset without having to put kludges in DRM.

<[email protected]> (02/03/09 1.369.48.7)
mmio_barrier.txt:
new file

<[email protected]> (02/03/09 1.369.45.2)
eepro100.c:
Restore comment that was accidentally dropped by earlier patch.

<[email protected]> (02/03/09 1.369.53.6)
config:
Update repo config.

<[email protected]> (02/03/09 1.369.53.5)
open.diff

<[email protected]> (02/03/09 1.369.53.4)
o3

<[email protected]> (02/03/09 1.369.53.3)
o2

<[email protected]> (02/03/09 1.369.53.2)
o1

<[email protected]> (02/03/09 1.369.53.1)
o0

<[email protected]> (02/03/09 1.369.48.6)
tmp-hacks5a

<[email protected]> (02/03/09 1.369.52.1)
early-printk.diff

<[email protected]> (02/03/09 1.369.48.5)
tmp-hacks5

<[email protected]> (02/03/09 1.369.48.4)
tmp-hacks4

<[email protected]> (02/03/09 1.369.48.3)
tmp-hacks

<[email protected]> (02/03/09 1.369.51.1)
console.diff

<[email protected]> (02/03/09 1.369.50.1)
fpemul.diff

<[email protected]> (02/03/09 1.369.49.1)
userpage.diff

<[email protected]> (02/03/09 1.369.48.2)
tmp-hacks2.diff

<[email protected]> (02/03/09 1.369.48.1)
tmp-hacks.diff

<[email protected]> (02/03/09 1.369.47.2)
Take advantage of CPU-local irqstat accessors.

<[email protected]> (02/03/09 1.369.47.1)
irq_cpustat.h:
Rename local_irq_count() to irq_count() and local_bh_count() to bh_count(). Provide old names as deprecated alternatives
for now. Define local_*() macros to provide
local CPU efficient access to various irq_stat
members.

<[email protected]> (02/03/09 1.369.46.1)
timer.c, time.c:
Define and initialize time_offset variable to enable guaranteed monotonic time.

<[email protected]> (02/03/09 1.369.42.2)
agp_backend.h:
Mention INTEL_460GX as a chipset.
Add vmptr member to struct _agp_memory.

<[email protected]> (02/03/09 1.369.45.1)
eepro100.c:
Bias Ethernet header so that IP header is (usually) aligned. Enable DMA even on word-oriented machines.

<[email protected]> (02/03/09 1.369.44.1)
64-bit cleanups for sound drivers.

<[email protected]> (02/03/09 1.369.43.1)
qlogic.diff

<[email protected]> (02/03/09 1.369.42.1)
DRM fixes for IA-64.

<[email protected]> (02/03/09 1.369.41.1)
This patch provides a platform hook which can be used to force a successful system call return for system calls that can legitimately return (small) negative numbers.

These diffs aren't in this patch. Is this the correct diffstat output for this patch?

And any reason you still have the uhci.c patch in your tree? It should work properly without that patch. And I don't see a patch for usb-ohci.c.

thanks,

greg k-h

Greg> On Thu, Apr 11, 2002 at 04:49:51PM -0700, David Mosberger

Greg> These diffs aren't in this patch. Is this the correct Greg> diffstat output for this patch?

Apparently not. ;-)

I used to bk-make-sum script to create it, perhaps it has a bug. The final authority is the patch on kernel.org. If you see something wrong there, please let me know.

	--david

Hi David

I just looked at the changes from Linus' tree and they can be safely ignored. It's basically to deal with virt_to_bus() going away and thats handled properly in the new driver.

However, I have finally received new GPL'ed firmware images for the card so I think it's time now to officially submit all the changes to Linus and get the new driver properly integrated. I will try and get something to him RSN.

Cheers,
Jes

I think the patch on kernel.org for usb-uhci.c is not needed anymore. Do you want me to send you a changeset against your ia64.bkbits.net tree?

bk-make-sum shows what is needed to send to Linus to sync with your tree. As the USB subsystem had a bunch of files moved around, the diff generated is a bit odd.

You could generate the patch directly by doing:

	bk export -tpatch -rv2.5.8-pre3..+ -h > patch

instead of diffing against the two tree.

thanks,

greg k-h

Greg> I think the patch on kernel.org for usb-uhci.c is not needed Greg> anymore. Do you want me to send you a changeset against your Greg> ia64.bkbits.net tree?

There is no change for usb-uhci.c. There was one in the past, which resulted in a conflict when pulling from Linus' 2.5.8-pre3 tree. During the merge, I opted to use Linus' version. I don't know why it's showing up in the changeset.

Greg> You could generate the patch directly by doing: bk export Greg> -tpatch -rv2.5.8-pre3..+ -h > patch instead of diffing against Greg> the two tree.

Ah, thanks for the tip.

	--david

There is a uhci.c (sorry, meant to say this, instead of usb-uhci.c) change in the patch you just posted on kernel.org. Your diffstat says there is also a change to usb-ohci.c, but that doesn't show up in your patch.

And it looks like the ia64.bkbits.net/to-linus-2.5 doesn't contain all of the changes you have listed in the patch you just posted, right?

Is there a bk tree somewhere I can clone that matches up with your working tree right now? I'd like to get that usb patch out of there :)

thanks,

greg k-h

Heh, yeah it is. As the usb maintainer, I like it if people who have patches to the subsystem let me know about it :)

Thanks for doing this.

greg k-h

Greg> There is a uhci.c (sorry, meant to say this, instead of Greg> usb-uhci.c) change in the patch you just posted on kernel.org. Greg> Your diffstat says there is also a change to usb-ohci.c, but Greg> that doesn't show up in your patch.

This is really bugging you, eh? ;-)

Greg> And it looks like the ia64.bkbits.net/to-linus-2.5 doesn't Greg> contain all of the changes you have listed in the patch you Greg> just posted, right?

Like I said: it's simply what the script produced.

Greg> Is there a bk tree somewhere I can clone that matches up with Greg> your working tree right now? I'd like to get that usb patch Greg> out of there :)

No, the lia64 patch is a union of about a dozen bk trees. I'm chipping away one tree after another, as Linus merges stuff, until at the end only to-linus-2.5 is left. I did make the union tree available in the past, but it was a pain to maintain (it's a throwaway tree and bkbits.net isn't well setup to handle that, as far as I can tell).

Anyhow, I modified the tree containing the temporary hacks to omit the uhci.c change. I'm not sure whether the comment will be gone (I suspect not, given bk's tendency never to forget anything), but the patch should be correct.

	--david

The latest patch adds the '-g' switch to the main Makefile. When doing 'make', the size of the resulted binary is ~55M. Without the '-g', its size is ~8M. Was this switch added as a workaround for some problem, or can it be removed safely ?

Thanks,
Yoav.

-----Original Message-----
From: David Mosberger [mailto:[email protected]]
Sent: Thursday, April 11, 2002 0:42 AM
To: [email protected]
Subject: [Linux-ia64] new kernel patch (relative to 2.4.18)

The latest ia64 patch relative to 2.4.18 is now available at ftp://ftp.kernel.org/pub/linux/kernel/ports/ia64/v2.4/ in file:

	linux-2.4.18-ia64-020410.diff.gz

Yoav-

Simple answer: Yes, it can be safely removed.

Longer answer: David likes to use gdb' to track down bugs, it makes life easier to take a fault address and use gdb' to find the exact source line that caused the error. I personally don't like the size of the boot image file that this creates so one of the first things I've always done after applying all of the IA64 patches is remove this flag. Use it or not, whatever you prefer.

Don Dugger
"Censeo Toto nos in Kansa esse decisse." - D. Gale
[email protected]
Ph: 303/652-0870x117

[email protected] writes:

|> Yoav-
|> 
|> Simple answer: Yes, it can be safely removed.
|> 
|> Longer answer:  David likes to use `gdb' to track down bugs, it makes life
|> easier to take a fault address and use `gdb' to find the exact source line
|> that caused the error.  I personally don't like the size of the boot image
|> file that this creates so one of the first things I've always done after
|> applying all of the IA64 patches is remove this flag.  Use it or not,
|> whatever you prefer.

Or just use "strip -g".

Andreas.

Andreas Schwab, SuSE Labs, [email protected]
SuSE GmbH, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Andreas> [email protected] writes: |> Yoav- |> |> Simple answer:
Andreas> Yes, it can be safely removed. |> |> Longer answer: David Andreas> likes to use gdb' to track down bugs, it makes life |> Andreas> easier to take a fault address and use gdb' to find the Andreas> exact source line |> that caused the error. I personally Andreas> don't like the size of the boot image |> file that this Andreas> creates so one of the first things I've always done after Andreas> |> applying all of the IA64 patches is remove this flag. Andreas> Use it or not, |> whatever you prefer.

Andreas> Or just use "strip -g".

Or "make compressed", which will give you vmlinux (with debug info), and vmlinux.gz (without debug info).

	--david

True, but with both of these solutions all of the .o's will still have the debug info and will therefore be very large. I think I'll keep removing the -g' flag.

Don Dugger
"Censeo Toto nos in Kansa esse decisse." - D. Gale
[email protected]
Ph: 303/652-0870x117

I'm building with CONFIG_IA64_GENERIC. This is what I get :

kallsyms pass 1
ld -static -T arch/ia64/vmlinux.lds arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o init/main.o init/version.o --start-group arch/ia64/kernel/kernel.o arch/ia64/mm/mm.o arch/ia64/ia32/ia32.o arch/ia64/hp/hp.o arch/ia64/dig/dig.a kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o kdb/kdb.o drivers/acpi/acpi.o drivers/char/char.o drivers/block/block.o drivers/misc/misc.o drivers/net/net.o drivers/media/media.o drivers/char/drm/drm.o drivers/net/appletalk/appletalk.o drivers/atm/atm.o drivers/ide/idedriver.o drivers/scsi/scsidrv.o drivers/cdrom/driver.o drivers/pci/driver.o drivers/video/video.o drivers/md/mddev.o drivers/sensors/sensor.o net/network.o /usr/src/redhat/BUILD/linux/arch/ia64/lib/lib.a /usr/src/redhat/BUILD/linux/lib/lib.a /usr/src/redhat/BUILD/linux/arch/ia64/kdb/kdba.o /usr/src/redhat/BUILD/linux/arch/ia64/lib/lib.a --end-group -o .tmp_vmlinux1 arch/ia64/hp/hp.o: In function `hp_csr_space':
arch/ia64/hp/hp.o(.text+0x3d82): undefined reference to acpi_get_crs' arch/ia64/hp/hp.o(.text+0x3df2): undefined reference to acpi_get_crs_type' arch/ia64/hp/hp.o(.text+0x3e52): undefined reference to acpi_dispose_crs' arch/ia64/hp/hp.o(.text+0x3fa2): undefined reference to acpi_dispose_crs' arch/ia64/hp/hp.o(.text+0x4062): undefined reference to acpi_dispose_crs' arch/ia64/hp/hp.o: In function hpzx1_lba_probe':
arch/ia64/hp/hp.o(.text+0x4322): undefined reference to acpi_cf_evaluate_method' arch/ia64/hp/hp.o: In function hpzx1_acpi_dev_init':
arch/ia64/hp/hp.o(.text+0x44f2): undefined reference to `pci_conf'

I can see that they are ZX1 related. Is this due to some missing files because of NDA requirement too, or is there another public fix out there ?

Regards,

  Steffen Persvold   | Scalable Linux Systems |   Try out the world's best
 mailto:[email protected] |  http://www.scali.com  | performing MPI implementation:
Tel: (+47) 2262 8950 |   Olaf Helsets vei 6   |      - ScaMPI 1.13.8 -
Fax: (+47) 2262 8951 |   N0621 Oslo, NORWAY   | >320MBytes/s and <4uS latency

I had this, I then re-read the system type info in Xconfig and set it to DIG_compliant. This solved the linking problem, could not get it to load though.

Ross

-----Original Message-----
From: Steffen Persvold [mailto:[email protected]]
Sent: 02 May 2002 18:42
To: Saxena, Sunil
Cc: 'Chris McDermott'; [email protected]; [email protected]
Subject: RE: [Linux-ia64] new kernel patch (relative to 2.4.18)

I'm building with CONFIG_IA64_GENERIC. This is what I get :

kallsyms pass 1
ld -static -T arch/ia64/vmlinux.lds arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o init/main.o init/version.o --start-group arch/ia64/kernel/kernel.o arch/ia64/mm/mm.o arch/ia64/ia32/ia32.o arch/ia64/hp/hp.o arch/ia64/dig/dig.a kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o kdb/kdb.o drivers/acpi/acpi.o drivers/char/char.o drivers/block/block.o drivers/misc/misc.o drivers/net/net.o drivers/media/media.o drivers/char/drm/drm.o drivers/net/appletalk/appletalk.o drivers/atm/atm.o drivers/ide/idedriver.o drivers/scsi/scsidrv.o drivers/cdrom/driver.o drivers/pci/driver.o drivers/video/video.o drivers/md/mddev.o drivers/sensors/sensor.o net/network.o /usr/src/redhat/BUILD/linux/arch/ia64/lib/lib.a /usr/src/redhat/BUILD/linux/lib/lib.a /usr/src/redhat/BUILD/linux/arch/ia64/kdb/kdba.o /usr/src/redhat/BUILD/linux/arch/ia64/lib/lib.a --end-group -o .tmp_vmlinux1 arch/ia64/hp/hp.o: In function `hp_csr_space':
arch/ia64/hp/hp.o(.text+0x3d82): undefined reference to acpi_get_crs' arch/ia64/hp/hp.o(.text+0x3df2): undefined reference to acpi_get_crs_type' arch/ia64/hp/hp.o(.text+0x3e52): undefined reference to acpi_dispose_crs' arch/ia64/hp/hp.o(.text+0x3fa2): undefined reference to acpi_dispose_crs' arch/ia64/hp/hp.o(.text+0x4062): undefined reference to acpi_dispose_crs' arch/ia64/hp/hp.o: In function hpzx1_lba_probe':
arch/ia64/hp/hp.o(.text+0x4322): undefined reference to `acpi_cf_evaluate_method'
arch/ia64/hp/hp.o: In function `hpzx1_acpi_dev_init':
arch/ia64/hp/hp.o(.text+0x44f2): undefined reference to `pci_conf'

I can see that they are ZX1 related. Is this due to some missing files because of NDA requirement too, or is there another public fix out there ?

Regards,

  Steffen Persvold   | Scalable Linux Systems |   Try out the world's best
 mailto:[email protected] |  http://www.scali.com  | performing MPI
implementation:
Tel: (+47) 2262 8950 |   Olaf Helsets vei 6   |      - ScaMPI 1.13.8 -
Fax: (+47) 2262 8951 |   N0621 Oslo, NORWAY   | >320MBytes/s and <4uS
latency


_______________________________________________
Linux-IA64 mailing list
[email protected]
http://lists.linuxia64.org/lists/listinfo/linux-ia64


********************************************************************
This email and any attachments are confidential to the intended
recipient and may also be privileged. If you are not the intended
recipient please delete it from your system and notify the sender.
You should not copy it or use it for any purpose nor disclose or
distribute its contents to any other person.

This footnote also confirms that this email message has been swept by
MIMEsweeper for the presence of computer viruses using 
Mcafee Virusscan.

********************************************************************

Ross> I had this, I then re-read the system type info in Xconfig and Ross> set it to DIG_compliant. This solved the linking problem, Ross> could not get it to load though.

With the current patch, you'll have to ignore memory above the 1GB boundary. You can do this with the mem=1G kernel command line option. Even so, I'm not sure whether the current patch will work. The next one should.

	--david

And how far away is this next patch ? Will it be against 2.4.18 too ?

Regards,

Steffen Persvold   | Scalable Linux Systems |   Try out the world's best
 mailto:[email protected] |  http://www.scali.com  | performing MPI implementation:
Tel: (+47) 2262 8950 |   Olaf Helsets vei 6   |      - ScaMPI 1.13.8 -
Fax: (+47) 2262 8951 |   N0621 Oslo, NORWAY   | >320MBytes/s and <4uS latency

An updated ia64 patch for 2.4.18 is now at ftp://ftp.kernel.org/pub/linux/kernel/ports/ia64/v2.4 in file:

	linux-2.4.18-ia64-020508.diff.gz

Most of the changes are backports of 2.5 changes. For those, see the changelog entries at

http://lia64.bkbits.net:8080/to-linus-2.5/ChangeSet@-7d?nav=index.html

Summary of other changes:

o Rename "McKinley" to "Itanium 2" (only for user-level visible stuff, CONFIG_MCKINLEY will stay).
o Offer 64KB page size only for Itanium 2.
o Change local_irq_restore() to restore ONLY the psr.i bit.
o Add ia64_set_psr() as the new way for setting psr.l.
o Perfmon-update from Stephane (sans McKinley support, until the necessary info gets released publically).
o Updated Fusion driver (needed for some of HP's zx1 platforms)
o Fixed scsi_dma.c to support 64KB page size

Some notes/caveats: the 64KB page size seems to work fine on McKinley/Itanium 2 except that "swapon" still hangs for me. I haven't had time to look into this. If you look at the patch, you'll also see that I started merging the "mem_map in virtual memory" patch (CONFIG_VIRTUAL_MEM_MAP), which is currently needed on zx1 platforms with >1GB of memory. However, the merge isn't complete and the new code isn't working yet. If you are one of those lucky folks with such a machine, you'll have to do the following for now:

o configure for generic DIG platform (this means you won't get support for the zx1 hardware I/O TLB)
o boot with kernel command line option mem=1G (will ignore all memory above 1GB)

These issues will get fixed over time, but for now the above should at least give you a working kernel.

A slightly earlier version of this patch (without the perfmon update) has been tested on the Ski simulator, Big Sur, and the HP zx1 platform.

Enjoy,

	--david

David,

When I started working on a new discontigmem patch for ia64, Kanoj Sarcar dissuaded me from a virtual mem_map with a lot of fast handwaving on the cost of TLB faults to access page structures. He stated (and I agreed) that there wasn't much reason to expect good locality of reference to page structs ... so this could have a measurable impact. Sadly, neither of us actually made any measurements to back up this belief.

Have you looked at the possible performance effect of this change?

Would the discontigmem patch meet the needs of the zx1 platform?

-Tony Luck

Tony> When I started working on a new discontigmem patch for ia64, Tony> Kanoj Sarcar dissuaded me from a virtual mem_map with a lot of Tony> fast handwaving on the cost of TLB faults to access page Tony> structures. He stated (and I agreed) that there wasn't much Tony> reason to expect good locality of reference to page structs Tony> ... so this could have a measurable impact. Sadly, neither of Tony> us actually made any measurements to back up this belief.

Tony> Have you looked at the possible performance effect of this Tony> change?

The person who wrote this code (John Marvin) did look into this and for the test he looked at (which included lmbench and kernel compilation), couldn't find a noticable performance difference.

Nevertheless, I'm not completely comfortable with this approach. The reason is that (a) it's not completely general (there could be machine configurations where the mem_map is so large that it would exceed the mappable space in region 5) and (b) increasing the TLB pressure is just about the last thing I want to do (I'm not just worried about the cost of accessing mem_map per se, but about thrashing the TLB and kicking out more useful translations).

On the other hand, the virtual mem_map implementation has a compelling simplicity to it and is more general than most everything else I have seen so far.

Tony> Would the discontigmem patch meet the needs of the zx1 Tony> platform?

The patches I have seen so far always assume that you *know* where the holes are. That just doesn't cut it. DIG makes absolutely no guarantees about the physical memory layout and we need a kernel that can work on all (reasonable) DIG machines.

There have been discussions on this topic on the lkml recently and different solutions have been proposed. I don't really care too much which solution is used in the end as long as it is able to accommodate arbitrary physical layouts and has no dramatic performance impact. For now, the virtual mem-map approach is working (modulo my merging goofs) and it should be interesting to compare it to other approaches.

	--david

Agree.

I dont think the latest discontig patch makes any assumptions about memory layout and where memory holes appear. This info is passed to the kernel in the ACPI tables. There are also platform specific macros defined in a platform mmzone_xxx file that are used to provide platform abstractions.

Can the zx1 platform provide the necessary ACPI tables?? If so, it would be interesting to see what the asm/mmzone_zx1.h file would look like (assuming it could be done).

Agree. I'm certainly happy with any approach that satisfies these requirements.

Thanks

Jack Steiner    (651-683-5302)   (vnet 233-5302)      [email protected]

Jack> I dont think the latest discontig patch makes any assumptions Jack> about memory layout and where memory holes appear. This info Jack> is passed to the kernel in the ACPI tables. There are also Jack> platform specific macros defined in a platform mmzone_xxx file Jack> that are used to provide platform abstractions.

The discontig patch would be a lot more acceptable to me if it didn't drag in all the other NUMA stuff. As it stands, it's overkill.

Also, the discontig patch has a buch of hardcoded limits (e.g., maximum number of nodes, max. "clumps" per node, etc.), so it's really not all that general by itself. It's just more tweakable.

Jack> Can the zx1 platform provide the necessary ACPI tables?? If Jack> so, it would be interesting to see what the asm/mmzone_zx1.h Jack> file would look like (assuming it could be done).

All the info needed for discontiguous memory is in the EFI memory table. The ACPI tables should be needed only for locality info, which has very little to do with discontinuity (one usually implies the other, but not vice versa).

Jack> Agree. I'm certainly happy with any approach that satisfies Jack> these requirements.

I think it would be interesting to see a discontig patch which leaves out all the NUMA stuff. I really believe it would actually help clean up that patch a lot.

	--david

Without using a virtual mem_map, it would still have many of the warts. The trickiest part is making sure that "virt_to_page()" is implemented efficiently ... and with no constraints on how the physical memory can be arranged on a DIG platform this becomes a hard problem (which we evaded with the discontigmem patch by pushing some of the macros into platform dependent files, and having our hardcoded limits ... clumps per node etc).

Now that you have virtual mem_map working, it will be interesting to look at whether it adds significantly to TLB pressure (or has a measureable impact on any other performance measurement). If it doesn't, then it becomes a viable way to clean up the discontig/numa code, so long as we can persuade the platform designers to keep their hands off the very high order physical bits. SGI/sn2 physical memory layout (which is the current worst case that I'm aware of) will be able to fit the virtual mem_map it needs into region 5 (2^42 bytes ... works ok unless you want to use a 4K page size).

-Tony