rpms/kernel/FC-5 linux-2.6-20_x86_64_xapic_8_bit_dest.patch, NONE, 1.1 kernel-2.6.spec, 1.2303, 1.2304

Thu Mar 15 16:10:26 UTC 2007

Author: cebbert

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21697

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-20_x86_64_xapic_8_bit_dest.patch 
Log Message:
* Thu Mar 15 2007 Chuck Ebbert <cebbert at redhat.com>
- Added:
	206: linux-2.6-20_x86_64_xapic_8_bit_dest.patch


linux-2.6-20_x86_64_xapic_8_bit_dest.patch:
 arch/x86_64/kernel/io_apic.c |   24 +++++++++++-------------
 include/asm-x86_64/io_apic.h |   14 ++------------
 2 files changed, 13 insertions(+), 25 deletions(-)

--- NEW FILE linux-2.6-20_x86_64_xapic_8_bit_dest.patch ---

# HG changeset patch
# User Benjamin Romer <benjamin.romer at unisys.com>
# Date 1171369585 -3600
# Node ID cf8a01523c4e29911f611438515e9d2d8e723c0f
# Parent 89cf2407b4249d70cb79c2c7f84997b399c76f5c
[PATCH] x86-64: update IO-APIC dest field to 8-bit for xAPIC

On the Unisys ES7000/ONE system, we encountered a problem where performing
a kexec reboot or dump on any cell other than cell 0 causes the system
timer to stop working, resulting in a hang during timer calibration in the
new kernel.

We traced the problem to one line of code in disable_IO_APIC(), which needs
to restore the timer's IO-APIC configuration before rebooting.  The code is
currently using the 4-bit physical destination field, rather than using the
8-bit logical destination field, and it cuts off the upper 4 bits of the
timer's APIC ID.  If we change this to use the logical destination field,
the timer works and we can kexec on the upper cells.  This was tested on
two different cells (0 and 2) in an ES7000/ONE system.

For reference, the relevant Intel xAPIC spec is kept at
ftp://download.intel.com/design/chipsets/e8501/datashts/30962001.pdf,
specifically on page 334.

Signed-off-by: Benjamin M Romer <benjamin.romer at unisys.com>
Signed-off-by: Andi Kleen <ak at suse.de>
Cc: Andi Kleen <ak at suse.de>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Vivek Goyal <vgoyal at in.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>

committer: Andi Kleen <andi at basil.nowhere.org>

--- a/arch/x86_64/kernel/io_apic.c	Tue Feb 13 13:26:25 2007 +0100
+++ b/arch/x86_64/kernel/io_apic.c	Tue Feb 13 13:26:25 2007 +0100
@@ -831,7 +831,7 @@ static void __init setup_IO_APIC_irq(int
 	entry.delivery_mode = INT_DELIVERY_MODE;
 	entry.dest_mode = INT_DEST_MODE;
 	entry.mask = 0;				/* enable IRQ */
-	entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
+	entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
 
 	entry.trigger = irq_trigger(idx);
 	entry.polarity = irq_polarity(idx);
@@ -839,7 +839,7 @@ static void __init setup_IO_APIC_irq(int
 	if (irq_trigger(idx)) {
 		entry.trigger = 1;
 		entry.mask = 1;
-		entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
+		entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
 	}
 
 	if (!apic && !IO_APIC_IRQ(irq))
@@ -851,7 +851,7 @@ static void __init setup_IO_APIC_irq(int
 		if (vector < 0)
 			return;
 
-		entry.dest.logical.logical_dest = cpu_mask_to_apicid(mask);
+		entry.dest = cpu_mask_to_apicid(mask);
 		entry.vector = vector;
 
 		ioapic_register_intr(irq, vector, IOAPIC_AUTO);
@@ -920,7 +920,7 @@ static void __init setup_ExtINT_IRQ0_pin
 	 */
 	entry.dest_mode = INT_DEST_MODE;
 	entry.mask = 0;					/* unmask IRQ now */
-	entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
+	entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
 	entry.delivery_mode = INT_DELIVERY_MODE;
 	entry.polarity = 0;
 	entry.trigger = 0;
@@ -1020,18 +1020,17 @@ void __apicdebuginit print_IO_APIC(void)
 
 	printk(KERN_DEBUG ".... IRQ redirection table:\n");
 
-	printk(KERN_DEBUG " NR Log Phy Mask Trig IRR Pol"
-			  " Stat Dest Deli Vect:   \n");
+	printk(KERN_DEBUG " NR Dst Mask Trig IRR Pol"
+			  " Stat Dmod Deli Vect:   \n");
 
 	for (i = 0; i <= reg_01.bits.entries; i++) {
 		struct IO_APIC_route_entry entry;
 
 		entry = ioapic_read_entry(apic, i);
 
-		printk(KERN_DEBUG " %02x %03X %02X  ",
+		printk(KERN_DEBUG " %02x %03X ",
 			i,
-			entry.dest.logical.logical_dest,
-			entry.dest.physical.physical_dest
+			entry.dest
 		);
 
 		printk("%1d    %1d    %1d   %1d   %1d    %1d    %1d    %02X\n",
@@ -1293,8 +1292,7 @@ void disable_IO_APIC(void)
 		entry.dest_mode       = 0; /* Physical */
 		entry.delivery_mode   = dest_ExtINT; /* ExtInt */
 		entry.vector          = 0;
-		entry.dest.physical.physical_dest =
-					GET_APIC_ID(apic_read(APIC_ID));
+		entry.dest          = GET_APIC_ID(apic_read(APIC_ID));
 
 		/*
 		 * Add it to the IO-APIC irq-routing table:
@@ -1556,7 +1554,7 @@ static inline void unlock_ExtINT_logic(v
 
 	entry1.dest_mode = 0;			/* physical delivery */
 	entry1.mask = 0;			/* unmask IRQ now */
-	entry1.dest.physical.physical_dest = hard_smp_processor_id();
+	entry1.dest = hard_smp_processor_id();
 	entry1.delivery_mode = dest_ExtINT;
 	entry1.polarity = entry0.polarity;
 	entry1.trigger = 0;
@@ -2131,7 +2129,7 @@ int io_apic_set_pci_routing (int ioapic,
 
 	entry.delivery_mode = INT_DELIVERY_MODE;
 	entry.dest_mode = INT_DEST_MODE;
-	entry.dest.logical.logical_dest = cpu_mask_to_apicid(mask);
+	entry.dest = cpu_mask_to_apicid(mask);
 	entry.trigger = triggering;
 	entry.polarity = polarity;
 	entry.mask = 1;					 /* Disabled (masked) */
--- a/include/asm-x86_64/io_apic.h	Tue Feb 13 13:26:25 2007 +0100
+++ b/include/asm-x86_64/io_apic.h	Tue Feb 13 13:26:25 2007 +0100
@@ -85,18 +85,8 @@ struct IO_APIC_route_entry {
 		mask		:  1,	/* 0: enabled, 1: disabled */
 		__reserved_2	: 15;
 
-	union {		struct { __u32
-					__reserved_1	: 24,
-					physical_dest	:  4,
-					__reserved_2	:  4;
-			} physical;
-
-			struct { __u32
-					__reserved_1	: 24,
-					logical_dest	:  8;
-			} logical;
-	} dest;
-
+	__u32	__reserved_3	: 24,
+		dest		:  8;
 } __attribute__ ((packed));
 
 /*



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2303
retrieving revision 1.2304
diff -u -r1.2303 -r1.2304
--- kernel-2.6.spec	14 Mar 2007 13:14:12 -0000	1.2303
+++ kernel-2.6.spec	15 Mar 2007 16:10:22 -0000	1.2304
@@ -329,6 +329,7 @@
 Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch204: linux-2.6-x86-apic-auto.patch
 Patch205: linux-2.6-x86_64_edac_update.patch
+Patch206: linux-2.6-20_x86_64_xapic_8_bit_dest.patch
 
 # 300 - 399   ppc(64)
 Patch301: linux-2.6-cell-mambo-drivers.patch
@@ -847,6 +848,8 @@
 #%patch204 -p1
 # K8 EDAC update for DDR2 and new CPUs
 %patch205 -p1
+# 8-bit dest field for xAPIC
+%patch206 -p1
 
 #
 # PowerPC
@@ -1777,6 +1780,10 @@
 %endif
 
 %changelog
+* Thu Mar 15 2007 Chuck Ebbert <cebbert at redhat.com>
+- Added:
+	206: linux-2.6-20_x86_64_xapic_8_bit_dest.patch
+
 * Wed Mar 14 2007 Juan Quintela <quintela at redhat.com>
 - make brew happy with new changeset.
 


