Attachment 146542 Details for Bug 224373 – [PATCH 2.6.19.2 1/1] kexec: update IO-APIC dest field to 8-bitfor xAPIC

[patch] [PATCH 2.6.19.2 1/1] kexec: update IO-APIC dest field to 8-bitfor xAPIC

diff.txt (text/plain), 4.51 KB, created by Ben Romer on 2007-01-25 14:09:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Romer

Created: 2007-01-25 14:09:09 UTC

Size: 4.51 KB

patch

obsolete

>diff -ru linux-2.6.19.2-orig/arch/x86_64/kernel/io_apic.c linux-2.6.19.2/arch/x86_64/kernel/io_apic.c
>--- linux-2.6.19.2-orig/arch/x86_64/kernel/io_apic.c	2007-03-18 12:29:52.000000000 -0400
>+++ linux-2.6.19.2/arch/x86_64/kernel/io_apic.c	2007-03-18 13:15:26.000000000 -0400
>@@ -814,7 +814,7 @@
> 		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);
> 
> 		idx = find_irq_entry(apic,pin,mp_INT);
> 		if (idx == -1) {
>@@ -832,7 +832,7 @@
> 		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);
> 		}
> 
> 		irq = pin_2_irq(idx, apic, pin);
>@@ -847,7 +847,7 @@
> 			if (vector < 0)
> 				continue;
> 
>-			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);
>@@ -888,7 +888,7 @@
> 	 */
> 	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;
>@@ -988,18 +988,17 @@
> 
> 	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",
>@@ -1261,8 +1260,7 @@
> 		entry.dest_mode       = 0; /* Physical */
> 		entry.delivery_mode   = dest_ExtINT; /* ExtInt */
> 		entry.vector          = 0;
>-		entry.dest.logical.logical_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:
>@@ -1524,7 +1522,7 @@
> 
> 	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;
>@@ -2092,7 +2090,7 @@
> 
> 	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) */
>diff -ru linux-2.6.19.2-orig/include/asm-x86_64/io_apic.h linux-2.6.19.2/include/asm-x86_64/io_apic.h
>--- linux-2.6.19.2-orig/include/asm-x86_64/io_apic.h	2007-03-18 12:30:07.000000000 -0400
>+++ linux-2.6.19.2/include/asm-x86_64/io_apic.h	2007-03-18 12:58:37.000000000 -0400
>@@ -72,31 +72,21 @@
> };
> 
> struct IO_APIC_route_entry {
>-	__u32	vector		:  8,
>-		delivery_mode	:  3,	/* 000: FIXED
>-					 * 001: lowest prio
>-					 * 111: ExtINT
>-					 */
>-		dest_mode	:  1,	/* 0: physical, 1: logical */
>-		delivery_status	:  1,
>-		polarity	:  1,
>-		irr		:  1,
>-		trigger		:  1,	/* 0: edge, 1: level */
>-		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   vector          :  8,
>+                delivery_mode   :  3,   /* 000: FIXED
>+                                         * 001: lowest prio
>+                                         * 111: ExtINT
>+                                         */
>+                dest_mode       :  1,   /* 0: physical, 1: logical */
>+                delivery_status :  1,
>+                polarity        :  1,
>+                irr             :  1,
>+                trigger         :  1,   /* 0: edge, 1: level */
>+                mask            :  1,   /* 0: enabled, 1: disabled */
>+                __reserved_2    : 15;
> 
>+        __u32   __reserved_3    : 24,
>+                dest          :  8;
> } __attribute__ ((packed));
> 
> /*

Actions: View | Diff

Attachments on bug 224373: 146542 | 190441 | 191881 | 192911