Commit d83e94ac authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86, io-apic: remove union about dest for log/phy 



let user decide the meaning of the bits.

This unifies the 32-bit and 64-bit io-apic code a bit.

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7a959cff

arch/x86/kernel/io_apic_32.c

+7 −11
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ static int setup_ioapic_entry(int apic, int irq, 


	entry->delivery_mode = INT_DELIVERY_MODE;

	entry->dest_mode = INT_DEST_MODE;

	entry->dest.logical.logical_dest = destination;

	entry->dest = destination;



	entry->mask = 0;                                /* enable IRQ */

	entry->trigger = trigger;
@@ -1336,7 +1336,7 @@ static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin, 
	 */

	entry.dest_mode = INT_DEST_MODE;

	entry.mask = 1;					/* mask 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;
@@ -1425,19 +1425,15 @@ __apicdebuginit(void) 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  ",

			i,

			entry.dest.logical.logical_dest,

			entry.dest.physical.physical_dest

		);

		printk(KERN_DEBUG " %02x %02X  ", i, entry.dest);



		printk("%1d    %1d    %1d   %1d   %1d    %1d    %1d    %02X\n",

			entry.mask,
@@ -1717,7 +1713,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 = read_apic_id();

		entry.dest	      = read_apic_id();



		/*

		 * Add it to the IO-APIC irq-routing table:
@@ -2185,7 +2181,7 @@ static inline void __init unlock_ExtINT_logic(void) 


	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;

include/asm-x86/io_apic.h

+0 −16
Original line number Diff line number Diff line
@@ -87,24 +87,8 @@ struct IO_APIC_route_entry { 
		mask		:  1,	/* 0: enabled, 1: disabled */

		__reserved_2	: 15;



#ifdef CONFIG_X86_32

	union {

		struct {

			__u32	__reserved_1	: 24,

				physical_dest	:  4,

				__reserved_2	:  4;

		} physical;



		struct {

			__u32	__reserved_1	: 24,

				logical_dest	:  8;

		} logical;

	} dest;

#else

	__u32	__reserved_3	: 24,

		dest		:  8;

#endif



} __attribute__ ((packed));



struct IR_IO_APIC_route_entry {