x86, ioapic: Clean up ioapic/apic_id usage
PATCH 1/1 x86, ioapic: Clean up ioapic/apic_id usage
While checking irte dump in dmesg, the print out is confused ioapic index and real io apic id.
IOAPIC[0]: Set routing entry (1-1 -> 0x31 -> IRQ 1 Mode:0 Active:0 Dest:1)
IOAPIC[1]: Set IRTE entry (P:1 FPD:0 Dst_Mode:1 Redir_hint:1 Trig_Mode:0 Dlvry_Mode:1 Avail:0 Vector:31 Dest:00000001 SID:00FF SQ:0 SVT:1) IOAPIC[0]: Set routing entry (1-2 -> 0x30 -> IRQ 0 Mode:0 Active:0 Dest:1)
IOAPIC[1]: Set IRTE entry (P:1 FPD:0 Dst_Mode:1 Redir_hint:1 Trig_Mode:0 Dlvry_Mode:1 Avail:0 Vector:30 Dest:00000001 SID:00FF SQ:0 SVT:1)
The system first ioapic id is 1.
While looking at the code, apic_id sometime is referred to index of ioapic, but sometime is used for real apic id. and some even use apic for real apic id. It is very confusing.
So try to limit apic_id to be real apic id for ioapic. and use ioapic for ioapic index in the array.
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 186 ++++++++++++++++++++--------------------- 1 file changed, 94 insertions(+), 92 deletions(-)
arch/x86/kernel/apic/io_apic.c +94 -92
@@ -92,21 +92,21 @@ static struct ioapic {DECLARE_BITMAP (pin_programmed,MP_MAX_IOAPIC_PIN +1 ); } ioapics[MAX_IO_APICS ]; -#define mpc_ioapic_ver (id) ioapics[id].mp_config.apicver +#define mpc_ioapic_ver (ioapic) ioapics[ioapic].mp_config.apicver -int mpc_ioapic_id (int id) +int mpc_ioapic_id (int ioapic) { -return ioapics[id].mp_config.apicid; +return ioapics[ioapic].mp_config.apicid; } -unsigned int mpc_ioapic_addr (int id) +unsigned int mpc_ioapic_addr (int ioapic) { -return ioapics[id].mp_config.apicaddr; +return ioapics[ioapic].mp_config.apicaddr; } -struct mp_ioapic_gsi *mp_ioapic_gsi_routing (int id) +struct mp_ioapic_gsi *mp_ioapic_gsi_routing (int ioapic) { -return &ioapics[id].gsi_config; +return &ioapics[ioapic].gsi_config; }int nr_ioapics;
@@ -712,13 +712,13 @@ int restore_ioapic_entries(void)/* * Find the IRQ entry number of a certain pin. */ -static int find_irq_entry (int apic,int pin,int type) +static int find_irq_entry (int ioapic,int pin,int type) {int i;for (i =0 ; i < mp_irq_entries; i++)if (mp_irqs[i].irqtype == type && - (mp_irqs[i].dstapic ==mpc_ioapic_id (apic) || + (mp_irqs[i].dstapic ==mpc_ioapic_id (ioapic) || mp_irqs[i].dstapic ==MP_APIC_ALL ) && mp_irqs[i].dstirq == pin)return i;
@@ -758,10 +758,10 @@ static int __init find_isa_irq_apic(intbreak ; }if (i < mp_irq_entries) { -int apic; -for (apic =0 ; apic < nr_ioapics; apic++) { -if (mpc_ioapic_id (apic) == mp_irqs[i].dstapic) -return apic; +int ioapic; +for (ioapic =0 ; ioapic < nr_ioapics; ioapic++) { +if (mpc_ioapic_id (ioapic) == mp_irqs[i].dstapic) +return ioapic; } }
@@ -977,7 +977,7 @@ static int pin_2_irq(int idx, int apic,int IO_APIC_get_PCI_irq_vector (int bus,int slot,int pin,struct io_apic_irq_attr *irq_attr) { -int apic, i, best_guess =-1 ; +int ioapic, i, best_guess =-1 ; apic_printk(APIC_DEBUG, "querying PCI -> IRQ mapping bus:%d, slot:%d, pin:%d.\n",
@@ -990,8 +990,8 @@ int IO_APIC_get_PCI_irq_vector(int bus,for (i =0 ; i < mp_irq_entries; i++) {int lbus = mp_irqs[i].srcbus; -for (apic =0 ; apic < nr_ioapics; apic++) -if (mpc_ioapic_id (apic) == mp_irqs[i].dstapic || +for (ioapic =0 ; ioapic < nr_ioapics; ioapic++) +if (mpc_ioapic_id (ioapic) == mp_irqs[i].dstapic || mp_irqs[i].dstapic ==MP_APIC_ALL )break ;
@@ -999,13 +999,13 @@ int IO_APIC_get_PCI_irq_vector(int bus, !mp_irqs[i].irqtype && (bus == lbus) && (slot == ((mp_irqs[i].srcbusirq >> 2) & 0x1f))) { -int irq =pin_2_irq (i, apic, mp_irqs[i].dstirq); +int irq =pin_2_irq (i, ioapic, mp_irqs[i].dstirq); -if (!(apic ||IO_APIC_IRQ (irq))) +if (!(ioapic ||IO_APIC_IRQ (irq)))continue ;if (pin == (mp_irqs[i].srcbusirq &3 )) { -set_io_apic_irq_attr (irq_attr, apic, +set_io_apic_irq_attr (irq_attr, ioapic, mp_irqs[i].dstirq,irq_trigger (i),irq_polarity (i));
@@ -1016,7 +1016,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,* best-guess fuzzy result for broken mptables. */ if (best_guess <0 ) { -set_io_apic_irq_attr (irq_attr, apic, +set_io_apic_irq_attr (irq_attr, ioapic, mp_irqs[i].dstirq,irq_trigger (i),irq_polarity (i));
@@ -1255,7 +1255,7 @@ static void ioapic_register_intr(unsigne fasteoi ? "fasteoi" : "edge"); } -static int setup_ioapic_entry (int apic_id,int irq, +static int setup_ioapic_entry (int ioapic,int irq,struct IO_APIC_route_entry *entry,unsigned int destination,int trigger,int polarity,int vector,int pin)
@@ -1266,6 +1266,7 @@ static int setup_ioapic_entry(int apic_imemset (entry,0 ,sizeof (*entry));if (intr_remapping_enabled) { +int apic_id =mpc_ioapic_id (ioapic);struct intel_iommu *iommu =map_ioapic_to_ir (apic_id);struct irte irte; struct IR_IO_APIC_route_entry *ir_entry =
@@ -1301,7 +1302,7 @@ static int setup_ioapic_entry(int apic_i"Redir_hint:%d Trig_Mode:%d Dlvry_Mode:%X " "Avail:%X Vector:%02X Dest:%08X " "SID:%04X SQ:%X SVT:%X)\n" , - apic_id, irte.present, irte.fpd, irte.dst_mode, + ioapic, irte.present, irte.fpd, irte.dst_mode, irte.redir_hint, irte.trigger_mode, irte.dlvry_mode, irte.avail, irte.vector, irte.dest_id, irte.sid, irte.sq, irte.svt);
@@ -1324,7 +1325,7 @@ static int setup_ioapic_entry(int apic_ireturn 0 ; } -static void setup_ioapic_irq (int apic_id,int pin,unsigned int irq, +static void setup_ioapic_irq (int ioapic,int pin,unsigned int irq,struct irq_cfg *cfg,int trigger,int polarity) {struct IO_APIC_route_entry entry;
@@ -1348,14 +1349,14 @@ static void setup_ioapic_irq(int apic_idapic_printk (APIC_VERBOSE ,KERN_DEBUG "IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> " "IRQ %d Mode:%i Active:%i Dest:%d)\n" , - apic_id,mpc_ioapic_id (apic_id), pin, cfg->vector, + ioapic,mpc_ioapic_id (ioapic), pin, cfg->vector, irq, trigger, polarity, dest); -if (setup_ioapic_entry (mpc_ioapic_id (apic_id), irq, &entry, +if (setup_ioapic_entry (ioapic, irq, &entry, dest, trigger, polarity, cfg->vector, pin)) {printk ("Failed to setup ioapic entry for ioapic %d, pin %d\n" , -mpc_ioapic_id (apic_id), pin); +mpc_ioapic_id (ioapic), pin);__clear_irq_vector (irq, cfg);return ; }
@@ -1364,33 +1365,34 @@ static void setup_ioapic_irq(int apic_idif (irq < legacy_pic->nr_legacy_irqs) legacy_pic->mask (irq); -ioapic_write_entry (apic_id, pin, entry); +ioapic_write_entry (ioapic, pin, entry); } -static bool __init io_apic_pin_not_connected (int idx,int apic_id,int pin) +static bool __init io_apic_pin_not_connected (int idx,int ioapic,int pin) {if (idx !=-1 )return false; -apic_printk (APIC_VERBOSE ,KERN_DEBUG " apic %d pin %d not connected\n" , -mpc_ioapic_id (apic_id), pin); +apic_printk (APIC_VERBOSE ,KERN_DEBUG +" ioapic %d pin %d not connected\n" , +mpc_ioapic_id (ioapic), pin);return true; } -static void __init __io_apic_setup_irqs (unsigned int apic_id) +static void __init __io_apic_setup_irqs (unsigned int ioapic) {int idx, node =cpu_to_node (0 );struct io_apic_irq_attr attr;unsigned int pin, irq; -for (pin =0 ; pin < ioapics[apic_id].nr_registers; pin++) { - idx =find_irq_entry (apic_id, pin, mp_INT); -if (io_apic_pin_not_connected (idx, apic_id, pin)) +for (pin =0 ; pin < ioapics[ioapic].nr_registers; pin++) { + idx =find_irq_entry (ioapic, pin, mp_INT); +if (io_apic_pin_not_connected (idx, ioapic, pin))continue ; - irq =pin_2_irq (idx, apic_id, pin); + irq =pin_2_irq (idx, ioapic, pin); -if ((apic_id >0 ) && (irq >16 )) +if ((ioapic >0 ) && (irq >16 ))continue ;/*
@@ -1398,10 +1400,10 @@ static void __init __io_apic_setup_irqs(* installed and if it returns 1: */ if (apic->multi_timer_check && - apic->multi_timer_check (apic_id, irq)) + apic->multi_timer_check (ioapic, irq))continue ; -set_io_apic_irq_attr (&attr, apic_id, pin,irq_trigger (idx), +set_io_apic_irq_attr (&attr, ioapic, pin,irq_trigger (idx),irq_polarity (idx));io_apic_setup_irq_pin (irq, node, &attr);
@@ -1410,12 +1412,12 @@ static void __init __io_apic_setup_irqs(static void __init setup_IO_APIC_irqs (void ) { -unsigned int apic_id; +unsigned int ioapic;apic_printk (APIC_VERBOSE ,KERN_DEBUG "init IO_APIC IRQs\n" ); -for (apic_id =0 ; apic_id < nr_ioapics; apic_id++) -__io_apic_setup_irqs (apic_id); +for (ioapic =0 ; ioapic < nr_ioapics; ioapic++) +__io_apic_setup_irqs (ioapic); }/*
@@ -1425,28 +1427,28 @@ static void __init setup_IO_APIC_irqs(vo*/ void setup_IO_APIC_irq_extra (u32 gsi) { -int apic_id =0 , pin, idx, irq, node =cpu_to_node (0 ); +int ioapic =0 , pin, idx, irq, node =cpu_to_node (0 );struct io_apic_irq_attr attr;/* * Convert 'gsi' to 'ioapic.pin'. */ - apic_id =mp_find_ioapic (gsi); -if (apic_id <0 ) + ioapic =mp_find_ioapic (gsi); +if (ioapic <0 )return ; - pin =mp_find_ioapic_pin (apic_id, gsi); - idx =find_irq_entry (apic_id, pin, mp_INT); + pin =mp_find_ioapic_pin (ioapic, gsi); + idx =find_irq_entry (ioapic, pin, mp_INT);if (idx ==-1 )return ; - irq =pin_2_irq (idx, apic_id, pin); + irq =pin_2_irq (idx, ioapic, pin);/* Only handle the non legacy irqs on secondary ioapics */ -if (apic_id ==0 || irq <NR_IRQS_LEGACY ) +if (ioapic ==0 || irq <NR_IRQS_LEGACY )return ; -set_io_apic_irq_attr (&attr, apic_id, pin,irq_trigger (idx), +set_io_apic_irq_attr (&attr, ioapic, pin,irq_trigger (idx),irq_polarity (idx));io_apic_setup_irq_pin_once (irq, node, &attr);
@@ -1455,7 +1457,7 @@ void setup_IO_APIC_irq_extra(u32 gsi)/* * Set up the timer pin, possibly with the 8259A-master behind. */ -static void __init setup_timer_IRQ0_pin (unsigned int apic_id,unsigned int pin, +static void __init setup_timer_IRQ0_pin (unsigned int ioapic,unsigned int pin,int vector) {struct IO_APIC_route_entry entry;
@@ -1487,13 +1489,13 @@ static void __init setup_timer_IRQ0_pin(/* * Add it to the IO-APIC irq-routing table: */ -ioapic_write_entry (apic_id, pin, entry); +ioapic_write_entry (ioapic, pin, entry); }__apicdebuginit (void )print_IO_APIC (void ) { -int apic, i; +int ioapic, i;union IO_APIC_reg_00 reg_00;union IO_APIC_reg_01 reg_01;union IO_APIC_reg_02 reg_02;
@@ -1513,19 +1515,19 @@ __apicdebuginit(void) print_IO_APIC(void*/ printk (KERN_INFO "testing the IO APIC.......................\n" ); -for (apic =0 ; apic < nr_ioapics; apic++) { +for (ioapic =0 ; ioapic < nr_ioapics; ioapic++) {raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (apic,0 ); - reg_01.raw =io_apic_read (apic,1 ); + reg_00.raw =io_apic_read (ioapic,0 ); + reg_01.raw =io_apic_read (ioapic,1 );if (reg_01.bits.version >=0x10 ) - reg_02.raw =io_apic_read (apic,2 ); + reg_02.raw =io_apic_read (ioapic,2 );if (reg_01.bits.version >=0x20 ) - reg_03.raw =io_apic_read (apic,3 ); + reg_03.raw =io_apic_read (ioapic,3 );raw_spin_unlock_irqrestore (&ioapic_lock, flags);printk ("\n" ); -printk (KERN_DEBUG "IO APIC #%d......\n" ,mpc_ioapic_id (apic)); +printk (KERN_DEBUG "IO APIC #%d......\n" ,mpc_ioapic_id (ioapic));printk (KERN_DEBUG ".... register #00: %08X\n" , reg_00.raw);printk (KERN_DEBUG "....... : physical APIC id: %02X\n" , reg_00.bits.ID);printk (KERN_DEBUG "....... : Delivery Type: %X\n" , reg_00.bits.delivery_type);
@@ -1575,7 +1577,7 @@ __apicdebuginit(void) print_IO_APIC(voidstruct IO_APIC_route_entry entry;struct IR_IO_APIC_route_entry *ir_entry; - entry =ioapic_read_entry (apic, i); + entry =ioapic_read_entry (ioapic, i); ir_entry = (struct IR_IO_APIC_route_entry *) &entry; printk(KERN_DEBUG " %02x %04X ", i,
@@ -1596,7 +1598,7 @@ __apicdebuginit(void) print_IO_APIC(void }else {struct IO_APIC_route_entry entry; - entry =ioapic_read_entry (apic, i); + entry =ioapic_read_entry (ioapic, i);printk (KERN_DEBUG " %02x %02X " , i, entry.dest
@@ -1953,7 +1955,7 @@ void __init setup_ioapic_ids_from_mpc_no {union IO_APIC_reg_00 reg_00;physid_mask_t phys_id_present_map; -int apic_id; +int ioapic;int i;unsigned char old_id;unsigned long flags;
@@ -1967,21 +1969,21 @@ void __init setup_ioapic_ids_from_mpc_no/* * Set the IOAPIC ID to the value stored in the MPC table. */ -for (apic_id =0 ; apic_id < nr_ioapics; apic_id++) { +for (ioapic =0 ; ioapic < nr_ioapics; ioapic++) {/* Read the register 0 value */ raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (apic_id,0 ); + reg_00.raw =io_apic_read (ioapic,0 );raw_spin_unlock_irqrestore (&ioapic_lock, flags); - old_id =mpc_ioapic_id (apic_id); + old_id =mpc_ioapic_id (ioapic); -if (mpc_ioapic_id (apic_id) >=get_physical_broadcast ()) { +if (mpc_ioapic_id (ioapic) >=get_physical_broadcast ()) {printk (KERN_ERR "BIOS bug, IO-APIC#%d ID is %d in the MPC table!...\n" , - apic_id,mpc_ioapic_id (apic_id)); + ioapic,mpc_ioapic_id (ioapic));printk (KERN_ERR "... fixing up to %d. (tell your hw vendor)\n" , reg_00.bits.ID); - ioapics[apic_id].mp_config.apicid = reg_00.bits.ID; + ioapics[ioapic].mp_config.apicid = reg_00.bits.ID; }/*
@@ -1990,9 +1992,9 @@ void __init setup_ioapic_ids_from_mpc_no* 'stuck on smp_invalidate_needed IPI wait' messages. */ if (apic->check_apicid_used (&phys_id_present_map, -mpc_ioapic_id (apic_id))) { +mpc_ioapic_id (ioapic))) {printk (KERN_ERR "BIOS bug, IO-APIC#%d ID %d is already used!...\n" , - apic_id,mpc_ioapic_id (apic_id)); + ioapic,mpc_ioapic_id (ioapic));for (i =0 ; i <get_physical_broadcast (); i++)if (!physid_isset (i, phys_id_present_map))break ;
@@ -2001,14 +2003,14 @@ void __init setup_ioapic_ids_from_mpc_noprintk (KERN_ERR "... fixing up to %d. (tell your hw vendor)\n" , i);physid_set (i, phys_id_present_map); - ioapics[apic_id].mp_config.apicid = i; + ioapics[ioapic].mp_config.apicid = i; }else {physid_mask_t tmp; - apic->apicid_to_cpu_present (mpc_ioapic_id (apic_id), + apic->apicid_to_cpu_present (mpc_ioapic_id (ioapic), &tmp);apic_printk (APIC_VERBOSE ,"Setting %d in the " "phys_id_present_map\n" , -mpc_ioapic_id (apic_id)); +mpc_ioapic_id (ioapic));physids_or (phys_id_present_map, phys_id_present_map, tmp); }
@@ -2016,35 +2018,35 @@ void __init setup_ioapic_ids_from_mpc_no* We need to adjust the IRQ routing table * if the ID changed. */ -if (old_id !=mpc_ioapic_id (apic_id)) +if (old_id !=mpc_ioapic_id (ioapic))for (i =0 ; i < mp_irq_entries; i++)if (mp_irqs[i].dstapic == old_id) mp_irqs[i].dstapic - =mpc_ioapic_id (apic_id); + =mpc_ioapic_id (ioapic);/* * Update the ID register according to the right value * from the MPC table if they are different. */ -if (mpc_ioapic_id (apic_id) == reg_00.bits.ID) +if (mpc_ioapic_id (ioapic) == reg_00.bits.ID)continue ;apic_printk (APIC_VERBOSE ,KERN_INFO "...changing IO-APIC physical APIC ID to %d ..." , -mpc_ioapic_id (apic_id)); +mpc_ioapic_id (ioapic)); - reg_00.bits.ID =mpc_ioapic_id (apic_id); + reg_00.bits.ID =mpc_ioapic_id (ioapic);raw_spin_lock_irqsave (&ioapic_lock, flags); -io_apic_write (apic_id,0 , reg_00.raw); +io_apic_write (ioapic,0 , reg_00.raw);raw_spin_unlock_irqrestore (&ioapic_lock, flags);/* * Sanity check */ raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (apic_id,0 ); + reg_00.raw =io_apic_read (ioapic,0 );raw_spin_unlock_irqrestore (&ioapic_lock, flags); -if (reg_00.bits.ID !=mpc_ioapic_id (apic_id)) +if (reg_00.bits.ID !=mpc_ioapic_id (ioapic))printk ("could not set ID!\n" );else apic_printk (APIC_VERBOSE ," ok.\n" );
@@ -2944,27 +2946,27 @@ static int __init io_apic_bug_finalize(vlate_initcall (io_apic_bug_finalize); -static void resume_ioapic_id (int ioapic_id) +static void resume_ioapic_id (int ioapic) {unsigned long flags;union IO_APIC_reg_00 reg_00;raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (ioapic_id,0 ); -if (reg_00.bits.ID !=mpc_ioapic_id (ioapic_id)) { - reg_00.bits.ID =mpc_ioapic_id (ioapic_id); -io_apic_write (ioapic_id,0 , reg_00.raw); + reg_00.raw =io_apic_read (ioapic,0 ); +if (reg_00.bits.ID !=mpc_ioapic_id (ioapic)) { + reg_00.bits.ID =mpc_ioapic_id (ioapic); +io_apic_write (ioapic,0 , reg_00.raw); }raw_spin_unlock_irqrestore (&ioapic_lock, flags); }static void ioapic_resume (void ) { -int ioapic_id; +int ioapic; -for (ioapic_id = nr_ioapics -1 ; ioapic_id >=0 ; ioapic_id--) -resume_ioapic_id (ioapic_id); +for (ioapic = nr_ioapics -1 ; ioapic >=0 ; ioapic--) +resume_ioapic_id (ioapic);restore_ioapic_entries (); }
@@ -3574,18 +3576,18 @@ io_apic_setup_irq_pin(unsigned int irq,int io_apic_setup_irq_pin_once (unsigned int irq,int node,struct io_apic_irq_attr *attr) { -unsigned int id = attr->ioapic, pin = attr->ioapic_pin; +unsigned int ioapic = attr->ioapic, pin = attr->ioapic_pin;int ret;/* Avoid redundant programming */ -if (test_bit (pin, ioapics[id].pin_programmed)) { +if (test_bit (pin, ioapics[ioapic].pin_programmed)) {pr_debug ("Pin %d-%d already programmed\n" , -mpc_ioapic_id (id), pin); +mpc_ioapic_id (ioapic), pin);return 0 ; } ret =io_apic_setup_irq_pin (irq, node, attr);if (!ret) -set_bit (pin, ioapics[id].pin_programmed); +set_bit (pin, ioapics[ioapic].pin_programmed);return ret; }
Quoted 9 lines · Yinghai Lu
While checking irte dump in dmesg, the print out is confused ioapic index and real io apic id.
IOAPIC[0]: Set routing entry (1-1 ->
0x31-> IRQ 1 Mode:0 Active:0 Dest:1)
IOAPIC[1]: Set IRTE entry (P:1 FPD:0 Dst_Mode:1 Redir_hint:1 Trig_Mode:0 Dlvry_Mode:1 Avail:0 Vector:31 Dest:00000001 SID:00FF SQ:0 SVT:1) IOAPIC[0]: Set routing entry (1-2 ->0x30-> IRQ 0 Mode:0 Active:0 Dest:1)
IOAPIC[1]: Set IRTE entry (P:1 FPD:0 Dst_Mode:1 Redir_hint:1 Trig_Mode:0 Dlvry_Mode:1 Avail:0 Vector:30 Dest:00000001 SID:00FF SQ:0 SVT:1)
Quoted 8 lines
The system first ioapic id is 1.
While looking at the code,
apic_idsometime is referred to index of ioapic, but sometime is used for real apic id. and some even use apic for real apic id. It is very confusing.So try to limit
apic_idto be real apic id for ioapic. and use ioapic for ioapic index in the array.
It seems like this patch is doing two things at once, and it would be easier to understand & review if they were split into separate patches:
1) The code cleanup that renames parameters & local variables so
they're used consistently, but makes no difference in operation or dmesg output.
2) The printk changes to fix the dmesg output.
Bjorn
PATCH 1/2 x86, ioapic: Print out irte with right ioapic index
While checking irte dump in dmesg, the print out is confused ioapic index and real io apic id.
IOAPIC[0]: Set routing entry (1-1 -> 0x31 -> IRQ 1 Mode:0 Active:0 Dest:1)
IOAPIC[1]: Set IRTE entry (P:1 FPD:0 Dst_Mode:1 Redir_hint:1 Trig_Mode:0 Dlvry_Mode:1 Avail:0 Vector:31 Dest:00000001 SID:00FF SQ:0 SVT:1) IOAPIC[0]: Set routing entry (1-2 -> 0x30 -> IRQ 0 Mode:0 Active:0 Dest:1)
IOAPIC[1]: Set IRTE entry (P:1 FPD:0 Dst_Mode:1 Redir_hint:1 Trig_Mode:0 Dlvry_Mode:1 Avail:0 Vector:30 Dest:00000001 SID:00FF SQ:0 SVT:1)
The system first ioapic id is 1.
Try to fix it with passing ioapic idx instead of phys apic id.
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/x86/kernel/apic/io_apic.c +4 -3
@@ -1255,7 +1255,7 @@ static void ioapic_register_intr(unsigne fasteoi ? "fasteoi" : "edge"); } -static int setup_ioapic_entry (int apic_id,int irq, +static int setup_ioapic_entry (int ioapic,int irq,struct IO_APIC_route_entry *entry,unsigned int destination,int trigger,int polarity,int vector,int pin)
@@ -1266,6 +1266,7 @@ static int setup_ioapic_entry(int apic_imemset (entry,0 ,sizeof (*entry));if (intr_remapping_enabled) { +int apic_id =mpc_ioapic_id (ioapic);struct intel_iommu *iommu =map_ioapic_to_ir (apic_id);struct irte irte; struct IR_IO_APIC_route_entry *ir_entry =
@@ -1301,7 +1302,7 @@ static int setup_ioapic_entry(int apic_i"Redir_hint:%d Trig_Mode:%d Dlvry_Mode:%X " "Avail:%X Vector:%02X Dest:%08X " "SID:%04X SQ:%X SVT:%X)\n" , - apic_id, irte.present, irte.fpd, irte.dst_mode, + ioapic, irte.present, irte.fpd, irte.dst_mode, irte.redir_hint, irte.trigger_mode, irte.dlvry_mode, irte.avail, irte.vector, irte.dest_id, irte.sid, irte.sq, irte.svt);
@@ -1352,7 +1353,7 @@ static void setup_ioapic_irq(int apic_id irq, trigger, polarity, dest); -if (setup_ioapic_entry (mpc_ioapic_id (apic_id), irq, &entry, +if (setup_ioapic_entry (apic_id, irq, &entry, dest, trigger, polarity, cfg->vector, pin)) {printk ("Failed to setup ioapic entry for ioapic %d, pin %d\n" ,mpc_ioapic_id (apic_id), pin);
PATCH 2/2 x86, ioapic: Clean up ioapic/apic_id usage
While looking at the code, apic_id sometime is referred to index of ioapic, but sometime is used for real apic id. and some even use apic for real apic id. It is very confusing.
So try to limit apic_id to be real apic id for ioapic. and use ioapic for ioapic index in the array.
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 178 ++++++++++++++++++++--------------------- 1 file changed, 89 insertions(+), 89 deletions(-)
arch/x86/kernel/apic/io_apic.c +89 -89
@@ -92,21 +92,21 @@ static struct ioapic {DECLARE_BITMAP (pin_programmed,MP_MAX_IOAPIC_PIN +1 ); } ioapics[MAX_IO_APICS ]; -#define mpc_ioapic_ver (id) ioapics[id].mp_config.apicver +#define mpc_ioapic_ver (ioapic) ioapics[ioapic].mp_config.apicver -int mpc_ioapic_id (int id) +int mpc_ioapic_id (int ioapic) { -return ioapics[id].mp_config.apicid; +return ioapics[ioapic].mp_config.apicid; } -unsigned int mpc_ioapic_addr (int id) +unsigned int mpc_ioapic_addr (int ioapic) { -return ioapics[id].mp_config.apicaddr; +return ioapics[ioapic].mp_config.apicaddr; } -struct mp_ioapic_gsi *mp_ioapic_gsi_routing (int id) +struct mp_ioapic_gsi *mp_ioapic_gsi_routing (int ioapic) { -return &ioapics[id].gsi_config; +return &ioapics[ioapic].gsi_config; }int nr_ioapics;
@@ -712,13 +712,13 @@ int restore_ioapic_entries(void)/* * Find the IRQ entry number of a certain pin. */ -static int find_irq_entry (int apic,int pin,int type) +static int find_irq_entry (int ioapic,int pin,int type) {int i;for (i =0 ; i < mp_irq_entries; i++)if (mp_irqs[i].irqtype == type && - (mp_irqs[i].dstapic ==mpc_ioapic_id (apic) || + (mp_irqs[i].dstapic ==mpc_ioapic_id (ioapic) || mp_irqs[i].dstapic ==MP_APIC_ALL ) && mp_irqs[i].dstirq == pin)return i;
@@ -758,10 +758,10 @@ static int __init find_isa_irq_apic(intbreak ; }if (i < mp_irq_entries) { -int apic; -for (apic =0 ; apic < nr_ioapics; apic++) { -if (mpc_ioapic_id (apic) == mp_irqs[i].dstapic) -return apic; +int ioapic; +for (ioapic =0 ; ioapic < nr_ioapics; ioapic++) { +if (mpc_ioapic_id (ioapic) == mp_irqs[i].dstapic) +return ioapic; } }
@@ -977,7 +977,7 @@ static int pin_2_irq(int idx, int apic,int IO_APIC_get_PCI_irq_vector (int bus,int slot,int pin,struct io_apic_irq_attr *irq_attr) { -int apic, i, best_guess =-1 ; +int ioapic, i, best_guess =-1 ; apic_printk(APIC_DEBUG, "querying PCI -> IRQ mapping bus:%d, slot:%d, pin:%d.\n",
@@ -990,8 +990,8 @@ int IO_APIC_get_PCI_irq_vector(int bus,for (i =0 ; i < mp_irq_entries; i++) {int lbus = mp_irqs[i].srcbus; -for (apic =0 ; apic < nr_ioapics; apic++) -if (mpc_ioapic_id (apic) == mp_irqs[i].dstapic || +for (ioapic =0 ; ioapic < nr_ioapics; ioapic++) +if (mpc_ioapic_id (ioapic) == mp_irqs[i].dstapic || mp_irqs[i].dstapic ==MP_APIC_ALL )break ;
@@ -999,13 +999,13 @@ int IO_APIC_get_PCI_irq_vector(int bus, !mp_irqs[i].irqtype && (bus == lbus) && (slot == ((mp_irqs[i].srcbusirq >> 2) & 0x1f))) { -int irq =pin_2_irq (i, apic, mp_irqs[i].dstirq); +int irq =pin_2_irq (i, ioapic, mp_irqs[i].dstirq); -if (!(apic ||IO_APIC_IRQ (irq))) +if (!(ioapic ||IO_APIC_IRQ (irq)))continue ;if (pin == (mp_irqs[i].srcbusirq &3 )) { -set_io_apic_irq_attr (irq_attr, apic, +set_io_apic_irq_attr (irq_attr, ioapic, mp_irqs[i].dstirq,irq_trigger (i),irq_polarity (i));
@@ -1016,7 +1016,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,* best-guess fuzzy result for broken mptables. */ if (best_guess <0 ) { -set_io_apic_irq_attr (irq_attr, apic, +set_io_apic_irq_attr (irq_attr, ioapic, mp_irqs[i].dstirq,irq_trigger (i),irq_polarity (i));
@@ -1325,7 +1325,7 @@ static int setup_ioapic_entry(int ioapicreturn 0 ; } -static void setup_ioapic_irq (int apic_id,int pin,unsigned int irq, +static void setup_ioapic_irq (int ioapic,int pin,unsigned int irq,struct irq_cfg *cfg,int trigger,int polarity) {struct IO_APIC_route_entry entry;
@@ -1349,14 +1349,14 @@ static void setup_ioapic_irq(int apic_idapic_printk (APIC_VERBOSE ,KERN_DEBUG "IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> " "IRQ %d Mode:%i Active:%i Dest:%d)\n" , - apic_id,mpc_ioapic_id (apic_id), pin, cfg->vector, + ioapic,mpc_ioapic_id (ioapic), pin, cfg->vector, irq, trigger, polarity, dest); -if (setup_ioapic_entry (apic_id, irq, &entry, +if (setup_ioapic_entry (ioapic, irq, &entry, dest, trigger, polarity, cfg->vector, pin)) {printk ("Failed to setup ioapic entry for ioapic %d, pin %d\n" , -mpc_ioapic_id (apic_id), pin); +mpc_ioapic_id (ioapic), pin);__clear_irq_vector (irq, cfg);return ; }
@@ -1365,33 +1365,33 @@ static void setup_ioapic_irq(int apic_idif (irq < legacy_pic->nr_legacy_irqs) legacy_pic->mask (irq); -ioapic_write_entry (apic_id, pin, entry); +ioapic_write_entry (ioapic, pin, entry); } -static bool __init io_apic_pin_not_connected (int idx,int apic_id,int pin) +static bool __init io_apic_pin_not_connected (int idx,int ioapic,int pin) {if (idx !=-1 )return false;apic_printk (APIC_VERBOSE ,KERN_DEBUG " apic %d pin %d not connected\n" , -mpc_ioapic_id (apic_id), pin); +mpc_ioapic_id (ioapic), pin);return true; } -static void __init __io_apic_setup_irqs (unsigned int apic_id) +static void __init __io_apic_setup_irqs (unsigned int ioapic) {int idx, node =cpu_to_node (0 );struct io_apic_irq_attr attr;unsigned int pin, irq; -for (pin =0 ; pin < ioapics[apic_id].nr_registers; pin++) { - idx =find_irq_entry (apic_id, pin, mp_INT); -if (io_apic_pin_not_connected (idx, apic_id, pin)) +for (pin =0 ; pin < ioapics[ioapic].nr_registers; pin++) { + idx =find_irq_entry (ioapic, pin, mp_INT); +if (io_apic_pin_not_connected (idx, ioapic, pin))continue ; - irq =pin_2_irq (idx, apic_id, pin); + irq =pin_2_irq (idx, ioapic, pin); -if ((apic_id >0 ) && (irq >16 )) +if ((ioapic >0 ) && (irq >16 ))continue ;/*
@@ -1399,10 +1399,10 @@ static void __init __io_apic_setup_irqs(* installed and if it returns 1: */ if (apic->multi_timer_check && - apic->multi_timer_check (apic_id, irq)) + apic->multi_timer_check (ioapic, irq))continue ; -set_io_apic_irq_attr (&attr, apic_id, pin,irq_trigger (idx), +set_io_apic_irq_attr (&attr, ioapic, pin,irq_trigger (idx),irq_polarity (idx));io_apic_setup_irq_pin (irq, node, &attr);
@@ -1411,12 +1411,12 @@ static void __init __io_apic_setup_irqs(static void __init setup_IO_APIC_irqs (void ) { -unsigned int apic_id; +unsigned int ioapic;apic_printk (APIC_VERBOSE ,KERN_DEBUG "init IO_APIC IRQs\n" ); -for (apic_id =0 ; apic_id < nr_ioapics; apic_id++) -__io_apic_setup_irqs (apic_id); +for (ioapic =0 ; ioapic < nr_ioapics; ioapic++) +__io_apic_setup_irqs (ioapic); }/*
@@ -1426,28 +1426,28 @@ static void __init setup_IO_APIC_irqs(vo*/ void setup_IO_APIC_irq_extra (u32 gsi) { -int apic_id =0 , pin, idx, irq, node =cpu_to_node (0 ); +int ioapic =0 , pin, idx, irq, node =cpu_to_node (0 );struct io_apic_irq_attr attr;/* * Convert 'gsi' to 'ioapic.pin'. */ - apic_id =mp_find_ioapic (gsi); -if (apic_id <0 ) + ioapic =mp_find_ioapic (gsi); +if (ioapic <0 )return ; - pin =mp_find_ioapic_pin (apic_id, gsi); - idx =find_irq_entry (apic_id, pin, mp_INT); + pin =mp_find_ioapic_pin (ioapic, gsi); + idx =find_irq_entry (ioapic, pin, mp_INT);if (idx ==-1 )return ; - irq =pin_2_irq (idx, apic_id, pin); + irq =pin_2_irq (idx, ioapic, pin);/* Only handle the non legacy irqs on secondary ioapics */ -if (apic_id ==0 || irq <NR_IRQS_LEGACY ) +if (ioapic ==0 || irq <NR_IRQS_LEGACY )return ; -set_io_apic_irq_attr (&attr, apic_id, pin,irq_trigger (idx), +set_io_apic_irq_attr (&attr, ioapic, pin,irq_trigger (idx),irq_polarity (idx));io_apic_setup_irq_pin_once (irq, node, &attr);
@@ -1456,7 +1456,7 @@ void setup_IO_APIC_irq_extra(u32 gsi)/* * Set up the timer pin, possibly with the 8259A-master behind. */ -static void __init setup_timer_IRQ0_pin (unsigned int apic_id,unsigned int pin, +static void __init setup_timer_IRQ0_pin (unsigned int ioapic,unsigned int pin,int vector) {struct IO_APIC_route_entry entry;
@@ -1488,13 +1488,13 @@ static void __init setup_timer_IRQ0_pin(/* * Add it to the IO-APIC irq-routing table: */ -ioapic_write_entry (apic_id, pin, entry); +ioapic_write_entry (ioapic, pin, entry); }__apicdebuginit (void )print_IO_APIC (void ) { -int apic, i; +int ioapic, i;union IO_APIC_reg_00 reg_00;union IO_APIC_reg_01 reg_01;union IO_APIC_reg_02 reg_02;
@@ -1514,19 +1514,19 @@ __apicdebuginit(void) print_IO_APIC(void*/ printk (KERN_INFO "testing the IO APIC.......................\n" ); -for (apic =0 ; apic < nr_ioapics; apic++) { +for (ioapic =0 ; ioapic < nr_ioapics; ioapic++) {raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (apic,0 ); - reg_01.raw =io_apic_read (apic,1 ); + reg_00.raw =io_apic_read (ioapic,0 ); + reg_01.raw =io_apic_read (ioapic,1 );if (reg_01.bits.version >=0x10 ) - reg_02.raw =io_apic_read (apic,2 ); + reg_02.raw =io_apic_read (ioapic,2 );if (reg_01.bits.version >=0x20 ) - reg_03.raw =io_apic_read (apic,3 ); + reg_03.raw =io_apic_read (ioapic,3 );raw_spin_unlock_irqrestore (&ioapic_lock, flags);printk ("\n" ); -printk (KERN_DEBUG "IO APIC #%d......\n" ,mpc_ioapic_id (apic)); +printk (KERN_DEBUG "IO APIC #%d......\n" ,mpc_ioapic_id (ioapic));printk (KERN_DEBUG ".... register #00: %08X\n" , reg_00.raw);printk (KERN_DEBUG "....... : physical APIC id: %02X\n" , reg_00.bits.ID);printk (KERN_DEBUG "....... : Delivery Type: %X\n" , reg_00.bits.delivery_type);
@@ -1576,7 +1576,7 @@ __apicdebuginit(void) print_IO_APIC(voidstruct IO_APIC_route_entry entry;struct IR_IO_APIC_route_entry *ir_entry; - entry =ioapic_read_entry (apic, i); + entry =ioapic_read_entry (ioapic, i); ir_entry = (struct IR_IO_APIC_route_entry *) &entry; printk(KERN_DEBUG " %02x %04X ", i,
@@ -1597,7 +1597,7 @@ __apicdebuginit(void) print_IO_APIC(void }else {struct IO_APIC_route_entry entry; - entry =ioapic_read_entry (apic, i); + entry =ioapic_read_entry (ioapic, i);printk (KERN_DEBUG " %02x %02X " , i, entry.dest
@@ -1954,7 +1954,7 @@ void __init setup_ioapic_ids_from_mpc_no {union IO_APIC_reg_00 reg_00;physid_mask_t phys_id_present_map; -int apic_id; +int ioapic;int i;unsigned char old_id;unsigned long flags;
@@ -1968,21 +1968,21 @@ void __init setup_ioapic_ids_from_mpc_no/* * Set the IOAPIC ID to the value stored in the MPC table. */ -for (apic_id =0 ; apic_id < nr_ioapics; apic_id++) { +for (ioapic =0 ; ioapic < nr_ioapics; ioapic++) {/* Read the register 0 value */ raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (apic_id,0 ); + reg_00.raw =io_apic_read (ioapic,0 );raw_spin_unlock_irqrestore (&ioapic_lock, flags); - old_id =mpc_ioapic_id (apic_id); + old_id =mpc_ioapic_id (ioapic); -if (mpc_ioapic_id (apic_id) >=get_physical_broadcast ()) { +if (mpc_ioapic_id (ioapic) >=get_physical_broadcast ()) {printk (KERN_ERR "BIOS bug, IO-APIC#%d ID is %d in the MPC table!...\n" , - apic_id,mpc_ioapic_id (apic_id)); + ioapic,mpc_ioapic_id (ioapic));printk (KERN_ERR "... fixing up to %d. (tell your hw vendor)\n" , reg_00.bits.ID); - ioapics[apic_id].mp_config.apicid = reg_00.bits.ID; + ioapics[ioapic].mp_config.apicid = reg_00.bits.ID; }/*
@@ -1991,9 +1991,9 @@ void __init setup_ioapic_ids_from_mpc_no* 'stuck on smp_invalidate_needed IPI wait' messages. */ if (apic->check_apicid_used (&phys_id_present_map, -mpc_ioapic_id (apic_id))) { +mpc_ioapic_id (ioapic))) {printk (KERN_ERR "BIOS bug, IO-APIC#%d ID %d is already used!...\n" , - apic_id,mpc_ioapic_id (apic_id)); + ioapic,mpc_ioapic_id (ioapic));for (i =0 ; i <get_physical_broadcast (); i++)if (!physid_isset (i, phys_id_present_map))break ;
@@ -2002,14 +2002,14 @@ void __init setup_ioapic_ids_from_mpc_noprintk (KERN_ERR "... fixing up to %d. (tell your hw vendor)\n" , i);physid_set (i, phys_id_present_map); - ioapics[apic_id].mp_config.apicid = i; + ioapics[ioapic].mp_config.apicid = i; }else {physid_mask_t tmp; - apic->apicid_to_cpu_present (mpc_ioapic_id (apic_id), + apic->apicid_to_cpu_present (mpc_ioapic_id (ioapic), &tmp);apic_printk (APIC_VERBOSE ,"Setting %d in the " "phys_id_present_map\n" , -mpc_ioapic_id (apic_id)); +mpc_ioapic_id (ioapic));physids_or (phys_id_present_map, phys_id_present_map, tmp); }
@@ -2017,35 +2017,35 @@ void __init setup_ioapic_ids_from_mpc_no* We need to adjust the IRQ routing table * if the ID changed. */ -if (old_id !=mpc_ioapic_id (apic_id)) +if (old_id !=mpc_ioapic_id (ioapic))for (i =0 ; i < mp_irq_entries; i++)if (mp_irqs[i].dstapic == old_id) mp_irqs[i].dstapic - =mpc_ioapic_id (apic_id); + =mpc_ioapic_id (ioapic);/* * Update the ID register according to the right value * from the MPC table if they are different. */ -if (mpc_ioapic_id (apic_id) == reg_00.bits.ID) +if (mpc_ioapic_id (ioapic) == reg_00.bits.ID)continue ;apic_printk (APIC_VERBOSE ,KERN_INFO "...changing IO-APIC physical APIC ID to %d ..." , -mpc_ioapic_id (apic_id)); +mpc_ioapic_id (ioapic)); - reg_00.bits.ID =mpc_ioapic_id (apic_id); + reg_00.bits.ID =mpc_ioapic_id (ioapic);raw_spin_lock_irqsave (&ioapic_lock, flags); -io_apic_write (apic_id,0 , reg_00.raw); +io_apic_write (ioapic,0 , reg_00.raw);raw_spin_unlock_irqrestore (&ioapic_lock, flags);/* * Sanity check */ raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (apic_id,0 ); + reg_00.raw =io_apic_read (ioapic,0 );raw_spin_unlock_irqrestore (&ioapic_lock, flags); -if (reg_00.bits.ID !=mpc_ioapic_id (apic_id)) +if (reg_00.bits.ID !=mpc_ioapic_id (ioapic))printk ("could not set ID!\n" );else apic_printk (APIC_VERBOSE ," ok.\n" );
@@ -2945,27 +2945,27 @@ static int __init io_apic_bug_finalize(vlate_initcall (io_apic_bug_finalize); -static void resume_ioapic_id (int ioapic_id) +static void resume_ioapic_id (int ioapic) {unsigned long flags;union IO_APIC_reg_00 reg_00;raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (ioapic_id,0 ); -if (reg_00.bits.ID !=mpc_ioapic_id (ioapic_id)) { - reg_00.bits.ID =mpc_ioapic_id (ioapic_id); -io_apic_write (ioapic_id,0 , reg_00.raw); + reg_00.raw =io_apic_read (ioapic,0 ); +if (reg_00.bits.ID !=mpc_ioapic_id (ioapic)) { + reg_00.bits.ID =mpc_ioapic_id (ioapic); +io_apic_write (ioapic,0 , reg_00.raw); }raw_spin_unlock_irqrestore (&ioapic_lock, flags); }static void ioapic_resume (void ) { -int ioapic_id; +int ioapic; -for (ioapic_id = nr_ioapics -1 ; ioapic_id >=0 ; ioapic_id--) -resume_ioapic_id (ioapic_id); +for (ioapic = nr_ioapics -1 ; ioapic >=0 ; ioapic--) +resume_ioapic_id (ioapic);restore_ioapic_entries (); }
@@ -3575,18 +3575,18 @@ io_apic_setup_irq_pin(unsigned int irq,int io_apic_setup_irq_pin_once (unsigned int irq,int node,struct io_apic_irq_attr *attr) { -unsigned int id = attr->ioapic, pin = attr->ioapic_pin; +unsigned int ioapic = attr->ioapic, pin = attr->ioapic_pin;int ret;/* Avoid redundant programming */ -if (test_bit (pin, ioapics[id].pin_programmed)) { +if (test_bit (pin, ioapics[ioapic].pin_programmed)) {pr_debug ("Pin %d-%d already programmed\n" , -mpc_ioapic_id (id), pin); +mpc_ioapic_id (ioapic), pin);return 0 ; } ret =io_apic_setup_irq_pin (irq, node, attr);if (!ret) -set_bit (pin, ioapics[id].pin_programmed); +set_bit (pin, ioapics[ioapic].pin_programmed);return ret; }
Re: [PATCH 1/2] x86, ioapic: Print out irte with right ioapic index
In reply to Yinghai LuQuoted 33 lines · Yinghai Lu
While checking irte dump in dmesg, the print out is confused ioapic index and real io apic id.
IOAPIC[0]: Set routing entry (1-1 ->
0x31-> IRQ 1 Mode:0 Active:0 Dest:1)
IOAPIC[1]: Set IRTE entry (P:1 FPD:0 Dst_Mode:1 Redir_hint:1 Trig_Mode:0 Dlvry_Mode:1 Avail:0 Vector:31 Dest:00000001 SID:00FF SQ:0 SVT:1) IOAPIC[0]: Set routing entry (1-2 ->0x30-> IRQ 0 Mode:0 Active:0 Dest:1)
IOAPIC[1]: Set IRTE entry (P:1 FPD:0 Dst_Mode:1 Redir_hint:1 Trig_Mode:0 Dlvry_Mode:1 Avail:0 Vector:30 Dest:00000001 SID:00FF SQ:0 SVT:1)The system first ioapic id is 1.
Try to fix it with passing ioapic idx instead of phys apic id.
Signed-off-by Yinghai Lu <[email protected]>--- arch/x86/kernel/apic/io_apic.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)Index:
linux-2.6/arch/x86/kernel/apic/io_apic.c
===================================================================arch/x86/kernel/apic/io_apic.c +1
-1@@ -1255,7 +1255,7 @@ static void ioapic_register_intr(unsigne fasteoi ? "fasteoi" : "edge"); } -static int setup_ioapic_entry (int apic_id,int irq, +static int setup_ioapic_entry (int ioapic,int irq,struct IO_APIC_route_entry *entry,unsigned int destination,int trigger,int polarity,int vector,int pin)
arch/x86/kernel/apic/io_apic.c static int setup_ioapic_entry(int apic_i · line 1272
Quoted 7 lines
arch/x86/kernel/apic/io_apic.c +1
-0@@ -1266,6 +1266,7 @@ static int setup_ioapic_entry(int apic_imemset (entry,0 ,sizeof (*entry));if (intr_remapping_enabled) { +int apic_id =mpc_ioapic_id (ioapic);struct intel_iommu *iommu =map_ioapic_to_ir (apic_id);struct irte irte; struct IR_IO_APIC_route_entry *ir_entry =
Patch looks good to me in principle, but please clean up this code before we put more effort into it.
Firstly, your patch introduces an uncleanliness. I'm not telling you what it is because you made that mistake so many times in the past that i must assume that you are using me as a coding style compiler in essence - that's not very efficient for me, please avoid repeat mistakes and improve your patches.
Secondly, the code it modifies has a couple of easily visible uncleanlinesses and structure problems which should be fixed first in a separate patch, before the printout fix is applied. The function it modifies is too large (and has a few style errors in it), etc. etc.
Thanks,
Ingo
Quoted 7 lines · Yinghai Lu
While looking at the code,
apic_idsometime is referred to index of ioapic, but sometime is used for real apic id. and some even use apic for real apic id. It is very confusing.So try to limit
apic_idto be real apic id for ioapic. and use ioapic for ioapic index in the array.
Yes, consistency and unambiguity is good - please make it ioapic_id and ioapic_idx.
('apic_id' can be confused with a local APIC id, and 'ioapic' can be confused with an ioapic ID.)
Thanks,
Ingo
cover x86, ioapic: Clean up ioapic idx and apic id usage
In reply to Ingo MolnarPlease check x86/ioapic clean up patches.
it will make sure ioapic_idx is used instead of ioapic or apic_idx to used as index.
[PATCH 1/5] x86, ioapic: Passing irq_attr struct pointer with setup_ioapic_irq() [PATCH 2/5] x86, ioapic: Split setup_ioapic_entry for interrupt remapped version [PATCH 3/5] x86, ioapic: Print out irte with right ioapic index [PATCH 4/5] x86, ioapic: Seperate print_IO_APIC() to only print one io apic [PATCH 5/5] x86, ioapic: Clean up ioapic/apic_id usage
patch1, 2, 4, 5 are cleanup related
patch3 fixes the one idx printout.
Thanks
Yinghai Lu
PATCH 1/5 x86, ioapic: Passing irq_attr struct pointer with setup_ioapic_irq()
In reply to a message not in the archiveDo not expand that struct, and just pass pointer to reduce the parameters in related functions.
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/x86/kernel/apic/io_apic.c +11 -11
@@ -1324,8 +1324,8 @@ static int setup_ioapic_entry(int apic_ireturn 0 ; } -static void setup_ioapic_irq (int apic_id,int pin,unsigned int irq, -struct irq_cfg *cfg,int trigger,int polarity) +static void setup_ioapic_irq (unsigned int irq,struct irq_cfg *cfg, +struct io_apic_irq_attr *attr) {struct IO_APIC_route_entry entry;unsigned int dest;
@@ -1348,23 +1348,24 @@ static void setup_ioapic_irq(int apic_idapic_printk (APIC_VERBOSE ,KERN_DEBUG "IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> " "IRQ %d Mode:%i Active:%i Dest:%d)\n" , - apic_id,mpc_ioapic_id (apic_id), pin, cfg->vector, - irq, trigger, polarity, dest); + attr->ioapic,mpc_ioapic_id (attr->ioapic), attr->ioapic_pin, + cfg->vector, irq, attr->trigger, attr->polarity, dest); -if (setup_ioapic_entry (mpc_ioapic_id (apic_id), irq, &entry, - dest, trigger, polarity, cfg->vector, pin)) { +if (setup_ioapic_entry (mpc_ioapic_id (attr->ioapic), irq, &entry, + dest, attr->trigger, attr->polarity, cfg->vector, + attr->ioapic_pin)) {printk ("Failed to setup ioapic entry for ioapic %d, pin %d\n" , -mpc_ioapic_id (apic_id), pin); +mpc_ioapic_id (attr->ioapic), attr->ioapic_pin);__clear_irq_vector (irq, cfg);return ; } -ioapic_register_intr (irq, cfg, trigger); +ioapic_register_intr (irq, cfg, attr->trigger);if (irq < legacy_pic->nr_legacy_irqs) legacy_pic->mask (irq); -ioapic_write_entry (apic_id, pin, entry); +ioapic_write_entry (attr->ioapic, attr->ioapic_pin, entry); }static bool __init io_apic_pin_not_connected (int idx,int apic_id,int pin)
@@ -3566,8 +3567,7 @@ io_apic_setup_irq_pin(unsigned int irq,return -EINVAL ; ret =__add_pin_to_irq_node (cfg, node, attr->ioapic, attr->ioapic_pin);if (!ret) -setup_ioapic_irq (attr->ioapic, attr->ioapic_pin, irq, cfg, - attr->trigger, attr->polarity); +setup_ioapic_irq (irq, cfg, attr);return ret; }
PATCH 2/5 x86, ioapic: Split setup_ioapic_entry for interrupt remapped version
In reply to a message not in the archiveIngo pointed out that setup_ioapic_entry is way too big now.
Try split into intr-remap related to setup_ir_ioapic_entry().
Also passing io_apic_irq_attr struct pointer instead of 5 parameters in those two functions.
At last in setup_ir_ioapic_entry(), don't need to panic.
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 147 +++++++++++++++++++++++------------------ 1 file changed, 84 insertions(+), 63 deletions(-)
arch/x86/kernel/apic/io_apic.c +84 -63
@@ -1255,72 +1255,95 @@ static void ioapic_register_intr(unsigne fasteoi ? "fasteoi" : "edge"); } -static int setup_ioapic_entry (int apic_id,int irq, -struct IO_APIC_route_entry *entry, -unsigned int destination,int trigger, -int polarity,int vector,int pin) + +static int setup_ir_ioapic_entry (int irq, +struct IR_IO_APIC_route_entry *entry, +unsigned int destination,int vector, +struct io_apic_irq_attr *attr) { -/* -* add it to the IO-APIC irq-routing table: -*/ -memset (entry,0 ,sizeof (*entry)); +int index; +struct irte irte; +int apic_id =mpc_ioapic_id (attr->ioapic); +struct intel_iommu *iommu =map_ioapic_to_ir (apic_id); + +if (!iommu) { +pr_warn ("No mapping iommu for ioapic %d\n" , apic_id); +return -ENODEV ; + } -if (intr_remapping_enabled) { -struct intel_iommu *iommu =map_ioapic_to_ir (apic_id); -struct irte irte; -struct IR_IO_APIC_route_entry *ir_entry = - (struct IR_IO_APIC_route_entry *) entry; -int index; - -if (!iommu) -panic ("No mapping iommu for ioapic %d\n" , apic_id); - - index =alloc_irte (iommu, irq,1 ); -if (index <0 ) -panic ("Failed to allocate IRTE for ioapic %d\n" , apic_id); - -prepare_irte (&irte, vector, destination); - -/* Set source-id of interrupt request */ -set_ioapic_sid (&irte, apic_id); - -modify_irte (irq, &irte); - - ir_entry->index2 = (index >>15 ) &0x1 ; - ir_entry->zero =0 ; - ir_entry->format =1 ; - ir_entry->index = (index &0x7fff ); -/* -* IO-APIC RTE will be configured with virtual vector. -* irq handler will do the explicit EOI to the io-apic. -*/ - ir_entry->vector = pin; - -apic_printk (APIC_VERBOSE ,KERN_DEBUG "IOAPIC[%d]: " -"Set IRTE entry (P:%d FPD:%d Dst_Mode:%d " -"Redir_hint:%d Trig_Mode:%d Dlvry_Mode:%X " -"Avail:%X Vector:%02X Dest:%08X " -"SID:%04X SQ:%X SVT:%X)\n" , - apic_id, irte.present, irte.fpd, irte.dst_mode, - irte.redir_hint, irte.trigger_mode, irte.dlvry_mode, - irte.avail, irte.vector, irte.dest_id, - irte.sid, irte.sq, irte.svt); - }else { - entry->delivery_mode = apic->irq_delivery_mode; - entry->dest_mode = apic->irq_dest_mode; - entry->dest = destination; - entry->vector = vector; + index =alloc_irte (iommu, irq,1 ); +if (index <0 ) { +pr_warn ("Failed to allocate IRTE for ioapic %d\n" , apic_id); +return -ENOMEM ; } - entry->mask =0 ;/* enable IRQ */ - entry->trigger = trigger; - entry->polarity = polarity; +prepare_irte (&irte, vector, destination); + +/* Set source-id of interrupt request */ +set_ioapic_sid (&irte, apic_id); + +modify_irte (irq, &irte); + +apic_printk (APIC_VERBOSE ,KERN_DEBUG "IOAPIC[%d]: " +"Set IRTE entry (P:%d FPD:%d Dst_Mode:%d " +"Redir_hint:%d Trig_Mode:%d Dlvry_Mode:%X " +"Avail:%X Vector:%02X Dest:%08X " +"SID:%04X SQ:%X SVT:%X)\n" , + apic_id, irte.present, irte.fpd, irte.dst_mode, + irte.redir_hint, irte.trigger_mode, irte.dlvry_mode, + irte.avail, irte.vector, irte.dest_id, + irte.sid, irte.sq, irte.svt); + +memset (entry,0 ,sizeof (*entry)); + + entry->index2 = (index >>15 ) &0x1 ; + entry->zero =0 ; + entry->format =1 ; + entry->index = (index &0x7fff ); +/* +* IO-APIC RTE will be configured with virtual vector. +* irq handler will do the explicit EOI to the io-apic. +*/ + entry->vector = attr->ioapic_pin; + entry->mask =0 ;/* enable IRQ */ + entry->trigger = attr->trigger; + entry->polarity = attr->polarity;/* Mask level triggered irqs. * Use IRQ_DELAYED_DISABLE for edge triggered irqs. */ -if (trigger) +if (attr->trigger) + entry->mask =1 ; + +return 0 ; +} + +static int setup_ioapic_entry (int irq,struct IO_APIC_route_entry *entry, +unsigned int destination,int vector, +struct io_apic_irq_attr *attr) +{ +if (intr_remapping_enabled) +return setup_ir_ioapic_entry (irq, + (struct IR_IO_APIC_route_entry *)entry, + destination, vector, attr); + +memset (entry,0 ,sizeof (*entry)); + + entry->delivery_mode = apic->irq_delivery_mode; + entry->dest_mode = apic->irq_dest_mode; + entry->dest = destination; + entry->vector = vector; + entry->mask =0 ;/* enable IRQ */ + entry->trigger = attr->trigger; + entry->polarity = attr->polarity; + +/* +* Mask level triggered irqs. +* Use IRQ_DELAYED_DISABLE for edge triggered irqs. +*/ +if (attr->trigger) entry->mask =1 ; +return 0 ; }
@@ -1351,13 +1374,11 @@ static void setup_ioapic_irq(unsigned in attr->ioapic,mpc_ioapic_id (attr->ioapic), attr->ioapic_pin, cfg->vector, irq, attr->trigger, attr->polarity, dest); - -if (setup_ioapic_entry (mpc_ioapic_id (attr->ioapic), irq, &entry, - dest, attr->trigger, attr->polarity, cfg->vector, - attr->ioapic_pin)) { -printk ("Failed to setup ioapic entry for ioapic %d, pin %d\n" , -mpc_ioapic_id (attr->ioapic), attr->ioapic_pin); +if (setup_ioapic_entry (irq, &entry, dest, cfg->vector, attr)) { +pr_warn ("Failed to setup ioapic entry for ioapic %d, pin %d\n" , +mpc_ioapic_id (attr->ioapic), attr->ioapic_pin);__clear_irq_vector (irq, cfg); +return ; }
PATCH 3/5 x86, ioapic: Print out irte with right ioapic index
In reply to a message not in the archiveWhile checking irte dump in dmesg, the print out is confusing ioapic index with real io apic id.
IOAPIC[0]: Set routing entry (1-1 -> 0x31 -> IRQ 1 Mode:0 Active:0 Dest:1)
IOAPIC[1]: Set IRTE entry (P:1 FPD:0 Dst_Mode:1 Redir_hint:1 Trig_Mode:0 Dlvry_Mode:1 Avail:0 Vector:31 Dest:00000001 SID:00FF SQ:0 SVT:1) IOAPIC[0]: Set routing entry (1-2 -> 0x30 -> IRQ 0 Mode:0 Active:0 Dest:1)
IOAPIC[1]: Set IRTE entry (P:1 FPD:0 Dst_Mode:1 Redir_hint:1 Trig_Mode:0 Dlvry_Mode:1 Avail:0 Vector:30 Dest:00000001 SID:00FF SQ:0 SVT:1)
The system first ioapic id is 1.
Those irte print out is from:
| commit 3040db92ee1b6c5b6b6d73f8cdcad54c0da11563 | Author: Naga Chumbalkar <[email protected]> | Date: Tue Jul 12 21:17:41 2011 +0000 | | x86, ioapic: Print IRTE when IR is enabled
it uses apic_id in setup_ioapic_entry(), and think it is ioapic idx. actually it is ioapic apic id.
So need to use ioapic idx instead to get right printout.
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -1289,7 +1289,7 @@ static int setup_ir_ioapic_entry(int irq"Redir_hint:%d Trig_Mode:%d Dlvry_Mode:%X " "Avail:%X Vector:%02X Dest:%08X " "SID:%04X SQ:%X SVT:%X)\n" , - apic_id, irte.present, irte.fpd, irte.dst_mode, + attr->ioapic, irte.present, irte.fpd, irte.dst_mode, irte.redir_hint, irte.trigger_mode, irte.dlvry_mode, irte.avail, irte.vector, irte.dest_id, irte.sid, irte.sq, irte.svt);
PATCH 4/5 x86, ioapic: Seperate print_IO_APIC() to only print one io apic
In reply to a message not in the archiveIt is getting too big after interrupt remaping entries debug print out was added.
Original print_IO_APIC become print_IO_APICs. New print_IO_APIC will only print one ioapic registers
it will make checpatch.pl happy with removing indent warning..
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 46 +++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 22 deletions(-)
arch/x86/kernel/apic/io_apic.c +24 -22
@@ -1512,30 +1512,14 @@ static void __init setup_timer_IRQ0_pin(ioapic_write_entry (apic_id, pin, entry); } - -__apicdebuginit (void )print_IO_APIC (void ) +__apicdebuginit (void )print_IO_APIC (int apic) { -int apic, i; +int i;union IO_APIC_reg_00 reg_00;union IO_APIC_reg_01 reg_01;union IO_APIC_reg_02 reg_02;union IO_APIC_reg_03 reg_03;unsigned long flags; -struct irq_cfg *cfg; -unsigned int irq; - -printk (KERN_DEBUG "number of MP IRQ sources: %d.\n" , mp_irq_entries); -for (i =0 ; i < nr_ioapics; i++) -printk (KERN_DEBUG "number of IO-APIC #%d registers: %d.\n" , -mpc_ioapic_id (i), ioapics[i].nr_registers); - -/* -* We are a bit conservative about what we expect. We have to -* know about every hardware change ASAP. -*/ -printk (KERN_INFO "testing the IO APIC.......................\n" ); - -for (apic =0 ; apic < nr_ioapics; apic++) {raw_spin_lock_irqsave (&ioapic_lock, flags); reg_00.raw =io_apic_read (apic,0 );
@@ -1636,7 +1620,27 @@ __apicdebuginit(void) print_IO_APIC(void ); } } - } +} + +__apicdebuginit (void )print_IO_APICs (void ) +{ +int apic, i; +struct irq_cfg *cfg; +unsigned int irq; + +printk (KERN_DEBUG "number of MP IRQ sources: %d.\n" , mp_irq_entries); +for (i =0 ; i < nr_ioapics; i++) +printk (KERN_DEBUG "number of IO-APIC #%d registers: %d.\n" , +mpc_ioapic_id (i), ioapics[i].nr_registers); + +/* +* We are a bit conservative about what we expect. We have to +* know about every hardware change ASAP. +*/ +printk (KERN_INFO "testing the IO APIC.......................\n" ); + +for (apic =0 ; apic < nr_ioapics; apic++) +print_IO_APIC (apic);printk (KERN_DEBUG "IRQ to pin mappings:\n" );for_each_active_irq (irq) {
@@ -1655,8 +1659,6 @@ __apicdebuginit(void) print_IO_APIC(void }printk (KERN_INFO ".................................... done.\n" ); - -return ; }__apicdebuginit (void )print_APIC_field (int base)
@@ -1850,7 +1852,7 @@ __apicdebuginit(int) print_ICs(void)return 0 ;print_local_APICs (show_lapic); -print_IO_APIC (); +print_IO_APICs ();return 0 ; }
PATCH 5/5 x86, ioapic: Clean up ioapic/apic_id usage
In reply to a message not in the archiveWhile looking at the code, apic_id sometime is referred to index of ioapic, but sometime is used for phys apic id. and some even use apic for real apic id. It is very confusing.
So try to limit apic_id or ioapic_id to be real apic id for ioapic. and use ioapic_idx for ioapic index in the array.
-v2: according to Ingo, to use ioapic_idx instead of ioapic
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 189 ++++++++++++++++++++--------------------- 1 file changed, 95 insertions(+), 94 deletions(-)
arch/x86/kernel/apic/io_apic.c +95 -94
@@ -92,21 +92,21 @@ static struct ioapic {DECLARE_BITMAP (pin_programmed,MP_MAX_IOAPIC_PIN +1 ); } ioapics[MAX_IO_APICS ]; -#define mpc_ioapic_ver (id) ioapics[id].mp_config.apicver +#define mpc_ioapic_ver (ioapic_idx) ioapics[ioapic_idx].mp_config.apicver -int mpc_ioapic_id (int id) +int mpc_ioapic_id (int ioapic_idx) { -return ioapics[id].mp_config.apicid; +return ioapics[ioapic_idx].mp_config.apicid; } -unsigned int mpc_ioapic_addr (int id) +unsigned int mpc_ioapic_addr (int ioapic_idx) { -return ioapics[id].mp_config.apicaddr; +return ioapics[ioapic_idx].mp_config.apicaddr; } -struct mp_ioapic_gsi *mp_ioapic_gsi_routing (int id) +struct mp_ioapic_gsi *mp_ioapic_gsi_routing (int ioapic_idx) { -return &ioapics[id].gsi_config; +return &ioapics[ioapic_idx].gsi_config; }int nr_ioapics;
@@ -712,13 +712,13 @@ int restore_ioapic_entries(void)/* * Find the IRQ entry number of a certain pin. */ -static int find_irq_entry (int apic,int pin,int type) +static int find_irq_entry (int ioapic_idx,int pin,int type) {int i;for (i =0 ; i < mp_irq_entries; i++)if (mp_irqs[i].irqtype == type && - (mp_irqs[i].dstapic ==mpc_ioapic_id (apic) || + (mp_irqs[i].dstapic ==mpc_ioapic_id (ioapic_idx) || mp_irqs[i].dstapic ==MP_APIC_ALL ) && mp_irqs[i].dstirq == pin)return i;
@@ -758,10 +758,10 @@ static int __init find_isa_irq_apic(intbreak ; }if (i < mp_irq_entries) { -int apic; -for (apic =0 ; apic < nr_ioapics; apic++) { -if (mpc_ioapic_id (apic) == mp_irqs[i].dstapic) -return apic; +int ioapic_idx; +for (ioapic_idx =0 ; ioapic_idx < nr_ioapics; ioapic_idx++) { +if (mpc_ioapic_id (ioapic_idx) == mp_irqs[i].dstapic) +return ioapic_idx; } }
@@ -977,7 +977,7 @@ static int pin_2_irq(int idx, int apic,int IO_APIC_get_PCI_irq_vector (int bus,int slot,int pin,struct io_apic_irq_attr *irq_attr) { -int apic, i, best_guess =-1 ; +int ioapic_idx, i, best_guess =-1 ; apic_printk(APIC_DEBUG, "querying PCI -> IRQ mapping bus:%d, slot:%d, pin:%d.\n",
@@ -990,8 +990,8 @@ int IO_APIC_get_PCI_irq_vector(int bus,for (i =0 ; i < mp_irq_entries; i++) {int lbus = mp_irqs[i].srcbus; -for (apic =0 ; apic < nr_ioapics; apic++) -if (mpc_ioapic_id (apic) == mp_irqs[i].dstapic || +for (ioapic_idx =0 ; ioapic_idx < nr_ioapics; ioapic_idx++) +if (mpc_ioapic_id (ioapic_idx) == mp_irqs[i].dstapic || mp_irqs[i].dstapic ==MP_APIC_ALL )break ;
@@ -999,13 +999,13 @@ int IO_APIC_get_PCI_irq_vector(int bus, !mp_irqs[i].irqtype && (bus == lbus) && (slot == ((mp_irqs[i].srcbusirq >> 2) & 0x1f))) { -int irq =pin_2_irq (i, apic, mp_irqs[i].dstirq); +int irq =pin_2_irq (i, ioapic_idx, mp_irqs[i].dstirq); -if (!(apic ||IO_APIC_IRQ (irq))) +if (!(ioapic_idx ||IO_APIC_IRQ (irq)))continue ;if (pin == (mp_irqs[i].srcbusirq &3 )) { -set_io_apic_irq_attr (irq_attr, apic, +set_io_apic_irq_attr (irq_attr, ioapic_idx, mp_irqs[i].dstirq,irq_trigger (i),irq_polarity (i));
@@ -1016,7 +1016,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,* best-guess fuzzy result for broken mptables. */ if (best_guess <0 ) { -set_io_apic_irq_attr (irq_attr, apic, +set_io_apic_irq_attr (irq_attr, ioapic_idx, mp_irqs[i].dstirq,irq_trigger (i),irq_polarity (i));
@@ -1263,24 +1263,24 @@ static int setup_ir_ioapic_entry(int irq {int index;struct irte irte; -int apic_id =mpc_ioapic_id (attr->ioapic); -struct intel_iommu *iommu =map_ioapic_to_ir (apic_id); +int ioapic_id =mpc_ioapic_id (attr->ioapic); +struct intel_iommu *iommu =map_ioapic_to_ir (ioapic_id);if (!iommu) { -pr_warn ("No mapping iommu for ioapic %d\n" , apic_id); +pr_warn ("No mapping iommu for ioapic %d\n" , ioapic_id);return -ENODEV ; } index =alloc_irte (iommu, irq,1 );if (index <0 ) { -pr_warn ("Failed to allocate IRTE for ioapic %d\n" , apic_id); +pr_warn ("Failed to allocate IRTE for ioapic %d\n" , ioapic_id);return -ENOMEM ; }prepare_irte (&irte, vector, destination);/* Set source-id of interrupt request */ -set_ioapic_sid (&irte, apic_id); +set_ioapic_sid (&irte, ioapic_id);modify_irte (irq, &irte);
@@ -1389,30 +1389,30 @@ static void setup_ioapic_irq(unsigned inioapic_write_entry (attr->ioapic, attr->ioapic_pin, entry); } -static bool __init io_apic_pin_not_connected (int idx,int apic_id,int pin) +static bool __init io_apic_pin_not_connected (int idx,int ioapic_idx,int pin) {if (idx !=-1 )return false;apic_printk (APIC_VERBOSE ,KERN_DEBUG " apic %d pin %d not connected\n" , -mpc_ioapic_id (apic_id), pin); +mpc_ioapic_id (ioapic_idx), pin);return true; } -static void __init __io_apic_setup_irqs (unsigned int apic_id) +static void __init __io_apic_setup_irqs (unsigned int ioapic_idx) {int idx, node =cpu_to_node (0 );struct io_apic_irq_attr attr;unsigned int pin, irq; -for (pin =0 ; pin < ioapics[apic_id].nr_registers; pin++) { - idx =find_irq_entry (apic_id, pin, mp_INT); -if (io_apic_pin_not_connected (idx, apic_id, pin)) +for (pin =0 ; pin < ioapics[ioapic_idx].nr_registers; pin++) { + idx =find_irq_entry (ioapic_idx, pin, mp_INT); +if (io_apic_pin_not_connected (idx, ioapic_idx, pin))continue ; - irq =pin_2_irq (idx, apic_id, pin); + irq =pin_2_irq (idx, ioapic_idx, pin); -if ((apic_id >0 ) && (irq >16 )) +if ((ioapic_idx >0 ) && (irq >16 ))continue ;/*
@@ -1420,10 +1420,10 @@ static void __init __io_apic_setup_irqs(* installed and if it returns 1: */ if (apic->multi_timer_check && - apic->multi_timer_check (apic_id, irq)) + apic->multi_timer_check (ioapic_idx, irq))continue ; -set_io_apic_irq_attr (&attr, apic_id, pin,irq_trigger (idx), +set_io_apic_irq_attr (&attr, ioapic_idx, pin,irq_trigger (idx),irq_polarity (idx));io_apic_setup_irq_pin (irq, node, &attr);
@@ -1432,12 +1432,12 @@ static void __init __io_apic_setup_irqs(static void __init setup_IO_APIC_irqs (void ) { -unsigned int apic_id; +unsigned int ioapic_idx;apic_printk (APIC_VERBOSE ,KERN_DEBUG "init IO_APIC IRQs\n" ); -for (apic_id =0 ; apic_id < nr_ioapics; apic_id++) -__io_apic_setup_irqs (apic_id); +for (ioapic_idx =0 ; ioapic_idx < nr_ioapics; ioapic_idx++) +__io_apic_setup_irqs (ioapic_idx); }/*
@@ -1447,28 +1447,28 @@ static void __init setup_IO_APIC_irqs(vo*/ void setup_IO_APIC_irq_extra (u32 gsi) { -int apic_id =0 , pin, idx, irq, node =cpu_to_node (0 ); +int ioapic_idx =0 , pin, idx, irq, node =cpu_to_node (0 );struct io_apic_irq_attr attr;/* * Convert 'gsi' to 'ioapic.pin'. */ - apic_id =mp_find_ioapic (gsi); -if (apic_id <0 ) + ioapic_idx =mp_find_ioapic (gsi); +if (ioapic_idx <0 )return ; - pin =mp_find_ioapic_pin (apic_id, gsi); - idx =find_irq_entry (apic_id, pin, mp_INT); + pin =mp_find_ioapic_pin (ioapic_idx, gsi); + idx =find_irq_entry (ioapic_idx, pin, mp_INT);if (idx ==-1 )return ; - irq =pin_2_irq (idx, apic_id, pin); + irq =pin_2_irq (idx, ioapic_idx, pin);/* Only handle the non legacy irqs on secondary ioapics */ -if (apic_id ==0 || irq <NR_IRQS_LEGACY ) +if (ioapic_idx ==0 || irq <NR_IRQS_LEGACY )return ; -set_io_apic_irq_attr (&attr, apic_id, pin,irq_trigger (idx), +set_io_apic_irq_attr (&attr, ioapic_idx, pin,irq_trigger (idx),irq_polarity (idx));io_apic_setup_irq_pin_once (irq, node, &attr);
@@ -1477,8 +1477,8 @@ void setup_IO_APIC_irq_extra(u32 gsi)/* * Set up the timer pin, possibly with the 8259A-master behind. */ -static void __init setup_timer_IRQ0_pin (unsigned int apic_id,unsigned int pin, -int vector) +static void __init setup_timer_IRQ0_pin (unsigned int ioapic_idx, +unsigned int pin,int vector) {struct IO_APIC_route_entry entry;
@@ -1509,10 +1509,10 @@ static void __init setup_timer_IRQ0_pin(/* * Add it to the IO-APIC irq-routing table: */ -ioapic_write_entry (apic_id, pin, entry); +ioapic_write_entry (ioapic_idx, pin, entry); } -__apicdebuginit (void )print_IO_APIC (int apic) +__apicdebuginit (void )print_IO_APIC (int ioapic_idx) {int i;union IO_APIC_reg_00 reg_00;
@@ -1522,16 +1522,16 @@ __apicdebuginit(void) print_IO_APIC(intunsigned long flags;raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (apic,0 ); - reg_01.raw =io_apic_read (apic,1 ); + reg_00.raw =io_apic_read (ioapic_idx,0 ); + reg_01.raw =io_apic_read (ioapic_idx,1 );if (reg_01.bits.version >=0x10 ) - reg_02.raw =io_apic_read (apic,2 ); + reg_02.raw =io_apic_read (ioapic_idx,2 );if (reg_01.bits.version >=0x20 ) - reg_03.raw =io_apic_read (apic,3 ); + reg_03.raw =io_apic_read (ioapic_idx,3 );raw_spin_unlock_irqrestore (&ioapic_lock, flags);printk ("\n" ); -printk (KERN_DEBUG "IO APIC #%d......\n" ,mpc_ioapic_id (apic)); +printk (KERN_DEBUG "IO APIC #%d......\n" ,mpc_ioapic_id (ioapic_idx));printk (KERN_DEBUG ".... register #00: %08X\n" , reg_00.raw);printk (KERN_DEBUG "....... : physical APIC id: %02X\n" , reg_00.bits.ID);printk (KERN_DEBUG "....... : Delivery Type: %X\n" , reg_00.bits.delivery_type);
@@ -1581,7 +1581,7 @@ __apicdebuginit(void) print_IO_APIC(intstruct IO_APIC_route_entry entry;struct IR_IO_APIC_route_entry *ir_entry; - entry =ioapic_read_entry (apic, i); + entry =ioapic_read_entry (ioapic_idx, i); ir_entry = (struct IR_IO_APIC_route_entry *) &entry; printk(KERN_DEBUG " %02x %04X ", i,
@@ -1602,7 +1602,7 @@ __apicdebuginit(void) print_IO_APIC(int }else {struct IO_APIC_route_entry entry; - entry =ioapic_read_entry (apic, i); + entry =ioapic_read_entry (ioapic_idx, i);printk (KERN_DEBUG " %02x %02X " , i, entry.dest
@@ -1624,14 +1624,15 @@ __apicdebuginit(void) print_IO_APIC(int__apicdebuginit (void )print_IO_APICs (void ) { -int apic, i; +int ioapic_idx;struct irq_cfg *cfg;unsigned int irq;printk (KERN_DEBUG "number of MP IRQ sources: %d.\n" , mp_irq_entries); -for (i =0 ; i < nr_ioapics; i++) +for (ioapic_idx =0 ; ioapic_idx < nr_ioapics; ioapic_idx++)printk (KERN_DEBUG "number of IO-APIC #%d registers: %d.\n" , -mpc_ioapic_id (i), ioapics[i].nr_registers); +mpc_ioapic_id (ioapic_idx), + ioapics[ioapic_idx].nr_registers);/* * We are a bit conservative about what we expect. We have to
@@ -1639,8 +1640,8 @@ __apicdebuginit(void) print_IO_APICs(voi*/ printk (KERN_INFO "testing the IO APIC.......................\n" ); -for (apic =0 ; apic < nr_ioapics; apic++) -print_IO_APIC (apic); +for (ioapic_idx =0 ; ioapic_idx < nr_ioapics; ioapic_idx++) +print_IO_APIC (ioapic_idx);printk (KERN_DEBUG "IRQ to pin mappings:\n" );for_each_active_irq (irq) {
@@ -1977,7 +1978,7 @@ void __init setup_ioapic_ids_from_mpc_no {union IO_APIC_reg_00 reg_00;physid_mask_t phys_id_present_map; -int apic_id; +int ioapic_idx;int i;unsigned char old_id;unsigned long flags;
@@ -1991,21 +1992,21 @@ void __init setup_ioapic_ids_from_mpc_no/* * Set the IOAPIC ID to the value stored in the MPC table. */ -for (apic_id =0 ; apic_id < nr_ioapics; apic_id++) { +for (ioapic_idx =0 ; ioapic_idx < nr_ioapics; ioapic_idx++) {/* Read the register 0 value */ raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (apic_id,0 ); + reg_00.raw =io_apic_read (ioapic_idx,0 );raw_spin_unlock_irqrestore (&ioapic_lock, flags); - old_id =mpc_ioapic_id (apic_id); + old_id =mpc_ioapic_id (ioapic_idx); -if (mpc_ioapic_id (apic_id) >=get_physical_broadcast ()) { +if (mpc_ioapic_id (ioapic_idx) >=get_physical_broadcast ()) {printk (KERN_ERR "BIOS bug, IO-APIC#%d ID is %d in the MPC table!...\n" , - apic_id,mpc_ioapic_id (apic_id)); + ioapic_idx,mpc_ioapic_id (ioapic_idx));printk (KERN_ERR "... fixing up to %d. (tell your hw vendor)\n" , reg_00.bits.ID); - ioapics[apic_id].mp_config.apicid = reg_00.bits.ID; + ioapics[ioapic_idx].mp_config.apicid = reg_00.bits.ID; }/*
@@ -2014,9 +2015,9 @@ void __init setup_ioapic_ids_from_mpc_no* 'stuck on smp_invalidate_needed IPI wait' messages. */ if (apic->check_apicid_used (&phys_id_present_map, -mpc_ioapic_id (apic_id))) { +mpc_ioapic_id (ioapic_idx))) {printk (KERN_ERR "BIOS bug, IO-APIC#%d ID %d is already used!...\n" , - apic_id,mpc_ioapic_id (apic_id)); + ioapic_idx,mpc_ioapic_id (ioapic_idx));for (i =0 ; i <get_physical_broadcast (); i++)if (!physid_isset (i, phys_id_present_map))break ;
@@ -2025,14 +2026,14 @@ void __init setup_ioapic_ids_from_mpc_noprintk (KERN_ERR "... fixing up to %d. (tell your hw vendor)\n" , i);physid_set (i, phys_id_present_map); - ioapics[apic_id].mp_config.apicid = i; + ioapics[ioapic_idx].mp_config.apicid = i; }else {physid_mask_t tmp; - apic->apicid_to_cpu_present (mpc_ioapic_id (apic_id), + apic->apicid_to_cpu_present (mpc_ioapic_id (ioapic_idx), &tmp);apic_printk (APIC_VERBOSE ,"Setting %d in the " "phys_id_present_map\n" , -mpc_ioapic_id (apic_id)); +mpc_ioapic_id (ioapic_idx));physids_or (phys_id_present_map, phys_id_present_map, tmp); }
@@ -2040,35 +2041,35 @@ void __init setup_ioapic_ids_from_mpc_no* We need to adjust the IRQ routing table * if the ID changed. */ -if (old_id !=mpc_ioapic_id (apic_id)) +if (old_id !=mpc_ioapic_id (ioapic_idx))for (i =0 ; i < mp_irq_entries; i++)if (mp_irqs[i].dstapic == old_id) mp_irqs[i].dstapic - =mpc_ioapic_id (apic_id); + =mpc_ioapic_id (ioapic_idx);/* * Update the ID register according to the right value * from the MPC table if they are different. */ -if (mpc_ioapic_id (apic_id) == reg_00.bits.ID) +if (mpc_ioapic_id (ioapic_idx) == reg_00.bits.ID)continue ;apic_printk (APIC_VERBOSE ,KERN_INFO "...changing IO-APIC physical APIC ID to %d ..." , -mpc_ioapic_id (apic_id)); +mpc_ioapic_id (ioapic_idx)); - reg_00.bits.ID =mpc_ioapic_id (apic_id); + reg_00.bits.ID =mpc_ioapic_id (ioapic_idx);raw_spin_lock_irqsave (&ioapic_lock, flags); -io_apic_write (apic_id,0 , reg_00.raw); +io_apic_write (ioapic_idx,0 , reg_00.raw);raw_spin_unlock_irqrestore (&ioapic_lock, flags);/* * Sanity check */ raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (apic_id,0 ); + reg_00.raw =io_apic_read (ioapic_idx,0 );raw_spin_unlock_irqrestore (&ioapic_lock, flags); -if (reg_00.bits.ID !=mpc_ioapic_id (apic_id)) +if (reg_00.bits.ID !=mpc_ioapic_id (ioapic_idx))printk ("could not set ID!\n" );else apic_printk (APIC_VERBOSE ," ok.\n" );
@@ -2968,27 +2969,27 @@ static int __init io_apic_bug_finalize(vlate_initcall (io_apic_bug_finalize); -static void resume_ioapic_id (int ioapic_id) +static void resume_ioapic_id (int ioapic_idx) {unsigned long flags;union IO_APIC_reg_00 reg_00;raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (ioapic_id,0 ); -if (reg_00.bits.ID !=mpc_ioapic_id (ioapic_id)) { - reg_00.bits.ID =mpc_ioapic_id (ioapic_id); -io_apic_write (ioapic_id,0 , reg_00.raw); + reg_00.raw =io_apic_read (ioapic_idx,0 ); +if (reg_00.bits.ID !=mpc_ioapic_id (ioapic_idx)) { + reg_00.bits.ID =mpc_ioapic_id (ioapic_idx); +io_apic_write (ioapic_idx,0 , reg_00.raw); }raw_spin_unlock_irqrestore (&ioapic_lock, flags); }static void ioapic_resume (void ) { -int ioapic_id; +int ioapic_idx; -for (ioapic_id = nr_ioapics -1 ; ioapic_id >=0 ; ioapic_id--) -resume_ioapic_id (ioapic_id); +for (ioapic_idx = nr_ioapics -1 ; ioapic_idx >=0 ; ioapic_idx--) +resume_ioapic_id (ioapic_idx);restore_ioapic_entries (); }
@@ -3597,18 +3598,18 @@ io_apic_setup_irq_pin(unsigned int irq,int io_apic_setup_irq_pin_once (unsigned int irq,int node,struct io_apic_irq_attr *attr) { -unsigned int id = attr->ioapic, pin = attr->ioapic_pin; +unsigned int ioapic_idx = attr->ioapic, pin = attr->ioapic_pin;int ret;/* Avoid redundant programming */ -if (test_bit (pin, ioapics[id].pin_programmed)) { +if (test_bit (pin, ioapics[ioapic_idx].pin_programmed)) {pr_debug ("Pin %d-%d already programmed\n" , -mpc_ioapic_id (id), pin); +mpc_ioapic_id (ioapic_idx), pin);return 0 ; } ret =io_apic_setup_irq_pin (irq, node, attr);if (!ret) -set_bit (pin, ioapics[id].pin_programmed); +set_bit (pin, ioapics[ioapic_idx].pin_programmed);return ret; }
cover x86, ioapic: Clean up ioapic idx and apic id usage
In reply to Ingo MolnarResending x86/ioapic clean up patches.
it will make sure ioapic_idx is used instead of ioapic or apic_idx to used as index.
[PATCH 1/5] x86, ioapic: Passing irq_attr struct pointer with setup_ioapic_irq() [PATCH 2/5] x86, ioapic: Split setup_ioapic_entry for interrupt remapped version [PATCH 3/5] x86, ioapic: Print out irte with right ioapic index [PATCH 4/5] x86, ioapic: Seperate print_IO_APIC() to only print one io apic [PATCH 5/5] x86, ioapic: Clean up ioapic/apic_id usage
patch1, 2, 4, 5 are cleanup related
patch3 fixes the one idx printout.
Thanks
Yinghai Lu
PATCH 1/5 x86, ioapic: Passing irq_attr struct pointer with setup_ioapic_irq()
In reply to a message not in the archiveDo not expand that struct, and just pass pointer to reduce the parameters number in related functions.
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/x86/kernel/apic/io_apic.c +11 -11
@@ -1324,8 +1324,8 @@ static int setup_ioapic_entry(int apic_ireturn 0 ; } -static void setup_ioapic_irq (int apic_id,int pin,unsigned int irq, -struct irq_cfg *cfg,int trigger,int polarity) +static void setup_ioapic_irq (unsigned int irq,struct irq_cfg *cfg, +struct io_apic_irq_attr *attr) {struct IO_APIC_route_entry entry;unsigned int dest;
@@ -1348,23 +1348,24 @@ static void setup_ioapic_irq(int apic_idapic_printk (APIC_VERBOSE ,KERN_DEBUG "IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> " "IRQ %d Mode:%i Active:%i Dest:%d)\n" , - apic_id,mpc_ioapic_id (apic_id), pin, cfg->vector, - irq, trigger, polarity, dest); + attr->ioapic,mpc_ioapic_id (attr->ioapic), attr->ioapic_pin, + cfg->vector, irq, attr->trigger, attr->polarity, dest); -if (setup_ioapic_entry (mpc_ioapic_id (apic_id), irq, &entry, - dest, trigger, polarity, cfg->vector, pin)) { +if (setup_ioapic_entry (mpc_ioapic_id (attr->ioapic), irq, &entry, + dest, attr->trigger, attr->polarity, cfg->vector, + attr->ioapic_pin)) {printk ("Failed to setup ioapic entry for ioapic %d, pin %d\n" , -mpc_ioapic_id (apic_id), pin); +mpc_ioapic_id (attr->ioapic), attr->ioapic_pin);__clear_irq_vector (irq, cfg);return ; } -ioapic_register_intr (irq, cfg, trigger); +ioapic_register_intr (irq, cfg, attr->trigger);if (irq < legacy_pic->nr_legacy_irqs) legacy_pic->mask (irq); -ioapic_write_entry (apic_id, pin, entry); +ioapic_write_entry (attr->ioapic, attr->ioapic_pin, entry); }static bool __init io_apic_pin_not_connected (int idx,int apic_id,int pin)
@@ -3566,8 +3567,7 @@ io_apic_setup_irq_pin(unsigned int irq,return -EINVAL ; ret =__add_pin_to_irq_node (cfg, node, attr->ioapic, attr->ioapic_pin);if (!ret) -setup_ioapic_irq (attr->ioapic, attr->ioapic_pin, irq, cfg, - attr->trigger, attr->polarity); +setup_ioapic_irq (irq, cfg, attr);return ret; }
PATCH 2/5 x86, ioapic: Split setup_ioapic_entry for interrupt remapped version
In reply to a message not in the archiveIngo pointed out that setup_ioapic_entry is way too big now.
Try split into intr-remap related to setup_ir_ioapic_entry().
Also passing io_apic_irq_attr struct pointer instead of 5 parameters in those two functions.
At last in setup_ir_ioapic_entry(), don't need to panic.
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 147 +++++++++++++++++++++++------------------ 1 file changed, 84 insertions(+), 63 deletions(-)
arch/x86/kernel/apic/io_apic.c +84 -63
@@ -1255,72 +1255,95 @@ static void ioapic_register_intr(unsigne fasteoi ? "fasteoi" : "edge"); } -static int setup_ioapic_entry (int apic_id,int irq, -struct IO_APIC_route_entry *entry, -unsigned int destination,int trigger, -int polarity,int vector,int pin) + +static int setup_ir_ioapic_entry (int irq, +struct IR_IO_APIC_route_entry *entry, +unsigned int destination,int vector, +struct io_apic_irq_attr *attr) { -/* -* add it to the IO-APIC irq-routing table: -*/ -memset (entry,0 ,sizeof (*entry)); +int index; +struct irte irte; +int apic_id =mpc_ioapic_id (attr->ioapic); +struct intel_iommu *iommu =map_ioapic_to_ir (apic_id); + +if (!iommu) { +pr_warn ("No mapping iommu for ioapic %d\n" , apic_id); +return -ENODEV ; + } -if (intr_remapping_enabled) { -struct intel_iommu *iommu =map_ioapic_to_ir (apic_id); -struct irte irte; -struct IR_IO_APIC_route_entry *ir_entry = - (struct IR_IO_APIC_route_entry *) entry; -int index; - -if (!iommu) -panic ("No mapping iommu for ioapic %d\n" , apic_id); - - index =alloc_irte (iommu, irq,1 ); -if (index <0 ) -panic ("Failed to allocate IRTE for ioapic %d\n" , apic_id); - -prepare_irte (&irte, vector, destination); - -/* Set source-id of interrupt request */ -set_ioapic_sid (&irte, apic_id); - -modify_irte (irq, &irte); - - ir_entry->index2 = (index >>15 ) &0x1 ; - ir_entry->zero =0 ; - ir_entry->format =1 ; - ir_entry->index = (index &0x7fff ); -/* -* IO-APIC RTE will be configured with virtual vector. -* irq handler will do the explicit EOI to the io-apic. -*/ - ir_entry->vector = pin; - -apic_printk (APIC_VERBOSE ,KERN_DEBUG "IOAPIC[%d]: " -"Set IRTE entry (P:%d FPD:%d Dst_Mode:%d " -"Redir_hint:%d Trig_Mode:%d Dlvry_Mode:%X " -"Avail:%X Vector:%02X Dest:%08X " -"SID:%04X SQ:%X SVT:%X)\n" , - apic_id, irte.present, irte.fpd, irte.dst_mode, - irte.redir_hint, irte.trigger_mode, irte.dlvry_mode, - irte.avail, irte.vector, irte.dest_id, - irte.sid, irte.sq, irte.svt); - }else { - entry->delivery_mode = apic->irq_delivery_mode; - entry->dest_mode = apic->irq_dest_mode; - entry->dest = destination; - entry->vector = vector; + index =alloc_irte (iommu, irq,1 ); +if (index <0 ) { +pr_warn ("Failed to allocate IRTE for ioapic %d\n" , apic_id); +return -ENOMEM ; } - entry->mask =0 ;/* enable IRQ */ - entry->trigger = trigger; - entry->polarity = polarity; +prepare_irte (&irte, vector, destination); + +/* Set source-id of interrupt request */ +set_ioapic_sid (&irte, apic_id); + +modify_irte (irq, &irte); + +apic_printk (APIC_VERBOSE ,KERN_DEBUG "IOAPIC[%d]: " +"Set IRTE entry (P:%d FPD:%d Dst_Mode:%d " +"Redir_hint:%d Trig_Mode:%d Dlvry_Mode:%X " +"Avail:%X Vector:%02X Dest:%08X " +"SID:%04X SQ:%X SVT:%X)\n" , + apic_id, irte.present, irte.fpd, irte.dst_mode, + irte.redir_hint, irte.trigger_mode, irte.dlvry_mode, + irte.avail, irte.vector, irte.dest_id, + irte.sid, irte.sq, irte.svt); + +memset (entry,0 ,sizeof (*entry)); + + entry->index2 = (index >>15 ) &0x1 ; + entry->zero =0 ; + entry->format =1 ; + entry->index = (index &0x7fff ); +/* +* IO-APIC RTE will be configured with virtual vector. +* irq handler will do the explicit EOI to the io-apic. +*/ + entry->vector = attr->ioapic_pin; + entry->mask =0 ;/* enable IRQ */ + entry->trigger = attr->trigger; + entry->polarity = attr->polarity;/* Mask level triggered irqs. * Use IRQ_DELAYED_DISABLE for edge triggered irqs. */ -if (trigger) +if (attr->trigger) + entry->mask =1 ; + +return 0 ; +} + +static int setup_ioapic_entry (int irq,struct IO_APIC_route_entry *entry, +unsigned int destination,int vector, +struct io_apic_irq_attr *attr) +{ +if (intr_remapping_enabled) +return setup_ir_ioapic_entry (irq, + (struct IR_IO_APIC_route_entry *)entry, + destination, vector, attr); + +memset (entry,0 ,sizeof (*entry)); + + entry->delivery_mode = apic->irq_delivery_mode; + entry->dest_mode = apic->irq_dest_mode; + entry->dest = destination; + entry->vector = vector; + entry->mask =0 ;/* enable IRQ */ + entry->trigger = attr->trigger; + entry->polarity = attr->polarity; + +/* +* Mask level triggered irqs. +* Use IRQ_DELAYED_DISABLE for edge triggered irqs. +*/ +if (attr->trigger) entry->mask =1 ; +return 0 ; }
@@ -1351,13 +1374,11 @@ static void setup_ioapic_irq(unsigned in attr->ioapic,mpc_ioapic_id (attr->ioapic), attr->ioapic_pin, cfg->vector, irq, attr->trigger, attr->polarity, dest); - -if (setup_ioapic_entry (mpc_ioapic_id (attr->ioapic), irq, &entry, - dest, attr->trigger, attr->polarity, cfg->vector, - attr->ioapic_pin)) { -printk ("Failed to setup ioapic entry for ioapic %d, pin %d\n" , -mpc_ioapic_id (attr->ioapic), attr->ioapic_pin); +if (setup_ioapic_entry (irq, &entry, dest, cfg->vector, attr)) { +pr_warn ("Failed to setup ioapic entry for ioapic %d, pin %d\n" , +mpc_ioapic_id (attr->ioapic), attr->ioapic_pin);__clear_irq_vector (irq, cfg); +return ; }
PATCH 3/5 x86, ioapic: Print out irte with right ioapic index
In reply to a message not in the archiveWhile checking irte dump in dmesg, the print out is confusing ioapic index with real io apic id.
IOAPIC[0]: Set routing entry (1-1 -> 0x31 -> IRQ 1 Mode:0 Active:0 Dest:1)
IOAPIC[1]: Set IRTE entry (P:1 FPD:0 Dst_Mode:1 Redir_hint:1 Trig_Mode:0 Dlvry_Mode:1 Avail:0 Vector:31 Dest:00000001 SID:00FF SQ:0 SVT:1) IOAPIC[0]: Set routing entry (1-2 -> 0x30 -> IRQ 0 Mode:0 Active:0 Dest:1)
IOAPIC[1]: Set IRTE entry (P:1 FPD:0 Dst_Mode:1 Redir_hint:1 Trig_Mode:0 Dlvry_Mode:1 Avail:0 Vector:30 Dest:00000001 SID:00FF SQ:0 SVT:1)
The system first ioapic id is 1.
Those irte print out is from:
| commit 3040db92ee1b6c5b6b6d73f8cdcad54c0da11563 | Author: Naga Chumbalkar <[email protected]> | Date: Tue Jul 12 21:17:41 2011 +0000 | | x86, ioapic: Print IRTE when IR is enabled
it uses apic_id in setup_ioapic_entry(), and think it is ioapic idx. actually it is ioapic apic id.
So need to use ioapic idx instead to get right printout.
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -1289,7 +1289,7 @@ static int setup_ir_ioapic_entry(int irq"Redir_hint:%d Trig_Mode:%d Dlvry_Mode:%X " "Avail:%X Vector:%02X Dest:%08X " "SID:%04X SQ:%X SVT:%X)\n" , - apic_id, irte.present, irte.fpd, irte.dst_mode, + attr->ioapic, irte.present, irte.fpd, irte.dst_mode, irte.redir_hint, irte.trigger_mode, irte.dlvry_mode, irte.avail, irte.vector, irte.dest_id, irte.sid, irte.sq, irte.svt);
PATCH 4/5 x86, ioapic: Seperate print_IO_APIC() to only print one io apic
In reply to a message not in the archiveIt is getting too big after interrupt remaping entries debug print out was added.
Original print_IO_APIC become print_IO_APICs. New print_IO_APIC will only print one ioapic registers
It will make checpatch.pl happy with removing indent warning..
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 46 +++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 22 deletions(-)
arch/x86/kernel/apic/io_apic.c +24 -22
@@ -1512,30 +1512,14 @@ static void __init setup_timer_IRQ0_pin(ioapic_write_entry (apic_id, pin, entry); } - -__apicdebuginit (void )print_IO_APIC (void ) +__apicdebuginit (void )print_IO_APIC (int apic) { -int apic, i; +int i;union IO_APIC_reg_00 reg_00;union IO_APIC_reg_01 reg_01;union IO_APIC_reg_02 reg_02;union IO_APIC_reg_03 reg_03;unsigned long flags; -struct irq_cfg *cfg; -unsigned int irq; - -printk (KERN_DEBUG "number of MP IRQ sources: %d.\n" , mp_irq_entries); -for (i =0 ; i < nr_ioapics; i++) -printk (KERN_DEBUG "number of IO-APIC #%d registers: %d.\n" , -mpc_ioapic_id (i), ioapics[i].nr_registers); - -/* -* We are a bit conservative about what we expect. We have to -* know about every hardware change ASAP. -*/ -printk (KERN_INFO "testing the IO APIC.......................\n" ); - -for (apic =0 ; apic < nr_ioapics; apic++) {raw_spin_lock_irqsave (&ioapic_lock, flags); reg_00.raw =io_apic_read (apic,0 );
@@ -1636,7 +1620,27 @@ __apicdebuginit(void) print_IO_APIC(void ); } } - } +} + +__apicdebuginit (void )print_IO_APICs (void ) +{ +int apic, i; +struct irq_cfg *cfg; +unsigned int irq; + +printk (KERN_DEBUG "number of MP IRQ sources: %d.\n" , mp_irq_entries); +for (i =0 ; i < nr_ioapics; i++) +printk (KERN_DEBUG "number of IO-APIC #%d registers: %d.\n" , +mpc_ioapic_id (i), ioapics[i].nr_registers); + +/* +* We are a bit conservative about what we expect. We have to +* know about every hardware change ASAP. +*/ +printk (KERN_INFO "testing the IO APIC.......................\n" ); + +for (apic =0 ; apic < nr_ioapics; apic++) +print_IO_APIC (apic);printk (KERN_DEBUG "IRQ to pin mappings:\n" );for_each_active_irq (irq) {
@@ -1655,8 +1659,6 @@ __apicdebuginit(void) print_IO_APIC(void }printk (KERN_INFO ".................................... done.\n" ); - -return ; }__apicdebuginit (void )print_APIC_field (int base)
@@ -1850,7 +1852,7 @@ __apicdebuginit(int) print_ICs(void)return 0 ;print_local_APICs (show_lapic); -print_IO_APIC (); +print_IO_APICs ();return 0 ; }
PATCH 5/5 x86, ioapic: Clean up ioapic/apic_id usage
In reply to a message not in the archiveWhile looking at the code, apic_id sometime is referred to index of ioapic, but sometime is used for phys apic id. and some even use apic for real apic id. It is very confusing.
So try to limit apic_id or ioapic_id to be real apic id for ioapic. and use ioapic_idx for ioapic index in the array.
-v2: according to Ingo, to use ioapic_idx instead of ioapic
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 194 ++++++++++++++++++++--------------------- 1 file changed, 97 insertions(+), 97 deletions(-)
arch/x86/kernel/apic/io_apic.c +97 -97
@@ -92,21 +92,21 @@ static struct ioapic {DECLARE_BITMAP (pin_programmed,MP_MAX_IOAPIC_PIN +1 ); } ioapics[MAX_IO_APICS ]; -#define mpc_ioapic_ver (id) ioapics[id].mp_config.apicver +#define mpc_ioapic_ver (ioapic_idx) ioapics[ioapic_idx].mp_config.apicver -int mpc_ioapic_id (int id) +int mpc_ioapic_id (int ioapic_idx) { -return ioapics[id].mp_config.apicid; +return ioapics[ioapic_idx].mp_config.apicid; } -unsigned int mpc_ioapic_addr (int id) +unsigned int mpc_ioapic_addr (int ioapic_idx) { -return ioapics[id].mp_config.apicaddr; +return ioapics[ioapic_idx].mp_config.apicaddr; } -struct mp_ioapic_gsi *mp_ioapic_gsi_routing (int id) +struct mp_ioapic_gsi *mp_ioapic_gsi_routing (int ioapic_idx) { -return &ioapics[id].gsi_config; +return &ioapics[ioapic_idx].gsi_config; }int nr_ioapics;
@@ -712,13 +712,13 @@ int restore_ioapic_entries(void)/* * Find the IRQ entry number of a certain pin. */ -static int find_irq_entry (int apic,int pin,int type) +static int find_irq_entry (int ioapic_idx,int pin,int type) {int i;for (i =0 ; i < mp_irq_entries; i++)if (mp_irqs[i].irqtype == type && - (mp_irqs[i].dstapic ==mpc_ioapic_id (apic) || + (mp_irqs[i].dstapic ==mpc_ioapic_id (ioapic_idx) || mp_irqs[i].dstapic ==MP_APIC_ALL ) && mp_irqs[i].dstirq == pin)return i;
@@ -757,12 +757,13 @@ static int __init find_isa_irq_apic(int (mp_irqs[i].srcbusirq == irq))break ; } +if (i < mp_irq_entries) { -int apic; -for (apic =0 ; apic < nr_ioapics; apic++) { -if (mpc_ioapic_id (apic) == mp_irqs[i].dstapic) -return apic; - } +int ioapic_idx; + +for (ioapic_idx =0 ; ioapic_idx < nr_ioapics; ioapic_idx++) +if (mpc_ioapic_id (ioapic_idx) == mp_irqs[i].dstapic) +return ioapic_idx; }return -1 ;
@@ -977,7 +978,7 @@ static int pin_2_irq(int idx, int apic,int IO_APIC_get_PCI_irq_vector (int bus,int slot,int pin,struct io_apic_irq_attr *irq_attr) { -int apic, i, best_guess =-1 ; +int ioapic_idx, i, best_guess =-1 ; apic_printk(APIC_DEBUG, "querying PCI -> IRQ mapping bus:%d, slot:%d, pin:%d.\n",
@@ -990,8 +991,8 @@ int IO_APIC_get_PCI_irq_vector(int bus,for (i =0 ; i < mp_irq_entries; i++) {int lbus = mp_irqs[i].srcbus; -for (apic =0 ; apic < nr_ioapics; apic++) -if (mpc_ioapic_id (apic) == mp_irqs[i].dstapic || +for (ioapic_idx =0 ; ioapic_idx < nr_ioapics; ioapic_idx++) +if (mpc_ioapic_id (ioapic_idx) == mp_irqs[i].dstapic || mp_irqs[i].dstapic ==MP_APIC_ALL )break ;
@@ -999,13 +1000,13 @@ int IO_APIC_get_PCI_irq_vector(int bus, !mp_irqs[i].irqtype && (bus == lbus) && (slot == ((mp_irqs[i].srcbusirq >> 2) & 0x1f))) { -int irq =pin_2_irq (i, apic, mp_irqs[i].dstirq); +int irq =pin_2_irq (i, ioapic_idx, mp_irqs[i].dstirq); -if (!(apic ||IO_APIC_IRQ (irq))) +if (!(ioapic_idx ||IO_APIC_IRQ (irq)))continue ;if (pin == (mp_irqs[i].srcbusirq &3 )) { -set_io_apic_irq_attr (irq_attr, apic, +set_io_apic_irq_attr (irq_attr, ioapic_idx, mp_irqs[i].dstirq,irq_trigger (i),irq_polarity (i));
@@ -1016,7 +1017,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,* best-guess fuzzy result for broken mptables. */ if (best_guess <0 ) { -set_io_apic_irq_attr (irq_attr, apic, +set_io_apic_irq_attr (irq_attr, ioapic_idx, mp_irqs[i].dstirq,irq_trigger (i),irq_polarity (i));
@@ -1263,24 +1264,24 @@ static int setup_ir_ioapic_entry(int irq {int index;struct irte irte; -int apic_id =mpc_ioapic_id (attr->ioapic); -struct intel_iommu *iommu =map_ioapic_to_ir (apic_id); +int ioapic_id =mpc_ioapic_id (attr->ioapic); +struct intel_iommu *iommu =map_ioapic_to_ir (ioapic_id);if (!iommu) { -pr_warn ("No mapping iommu for ioapic %d\n" , apic_id); +pr_warn ("No mapping iommu for ioapic %d\n" , ioapic_id);return -ENODEV ; } index =alloc_irte (iommu, irq,1 );if (index <0 ) { -pr_warn ("Failed to allocate IRTE for ioapic %d\n" , apic_id); +pr_warn ("Failed to allocate IRTE for ioapic %d\n" , ioapic_id);return -ENOMEM ; }prepare_irte (&irte, vector, destination);/* Set source-id of interrupt request */ -set_ioapic_sid (&irte, apic_id); +set_ioapic_sid (&irte, ioapic_id);modify_irte (irq, &irte);
@@ -1389,30 +1390,30 @@ static void setup_ioapic_irq(unsigned inioapic_write_entry (attr->ioapic, attr->ioapic_pin, entry); } -static bool __init io_apic_pin_not_connected (int idx,int apic_id,int pin) +static bool __init io_apic_pin_not_connected (int idx,int ioapic_idx,int pin) {if (idx !=-1 )return false;apic_printk (APIC_VERBOSE ,KERN_DEBUG " apic %d pin %d not connected\n" , -mpc_ioapic_id (apic_id), pin); +mpc_ioapic_id (ioapic_idx), pin);return true; } -static void __init __io_apic_setup_irqs (unsigned int apic_id) +static void __init __io_apic_setup_irqs (unsigned int ioapic_idx) {int idx, node =cpu_to_node (0 );struct io_apic_irq_attr attr;unsigned int pin, irq; -for (pin =0 ; pin < ioapics[apic_id].nr_registers; pin++) { - idx =find_irq_entry (apic_id, pin, mp_INT); -if (io_apic_pin_not_connected (idx, apic_id, pin)) +for (pin =0 ; pin < ioapics[ioapic_idx].nr_registers; pin++) { + idx =find_irq_entry (ioapic_idx, pin, mp_INT); +if (io_apic_pin_not_connected (idx, ioapic_idx, pin))continue ; - irq =pin_2_irq (idx, apic_id, pin); + irq =pin_2_irq (idx, ioapic_idx, pin); -if ((apic_id >0 ) && (irq >16 )) +if ((ioapic_idx >0 ) && (irq >16 ))continue ;/*
@@ -1420,10 +1421,10 @@ static void __init __io_apic_setup_irqs(* installed and if it returns 1: */ if (apic->multi_timer_check && - apic->multi_timer_check (apic_id, irq)) + apic->multi_timer_check (ioapic_idx, irq))continue ; -set_io_apic_irq_attr (&attr, apic_id, pin,irq_trigger (idx), +set_io_apic_irq_attr (&attr, ioapic_idx, pin,irq_trigger (idx),irq_polarity (idx));io_apic_setup_irq_pin (irq, node, &attr);
@@ -1432,12 +1433,12 @@ static void __init __io_apic_setup_irqs(static void __init setup_IO_APIC_irqs (void ) { -unsigned int apic_id; +unsigned int ioapic_idx;apic_printk (APIC_VERBOSE ,KERN_DEBUG "init IO_APIC IRQs\n" ); -for (apic_id =0 ; apic_id < nr_ioapics; apic_id++) -__io_apic_setup_irqs (apic_id); +for (ioapic_idx =0 ; ioapic_idx < nr_ioapics; ioapic_idx++) +__io_apic_setup_irqs (ioapic_idx); }/*
@@ -1447,28 +1448,28 @@ static void __init setup_IO_APIC_irqs(vo*/ void setup_IO_APIC_irq_extra (u32 gsi) { -int apic_id =0 , pin, idx, irq, node =cpu_to_node (0 ); +int ioapic_idx =0 , pin, idx, irq, node =cpu_to_node (0 );struct io_apic_irq_attr attr;/* * Convert 'gsi' to 'ioapic.pin'. */ - apic_id =mp_find_ioapic (gsi); -if (apic_id <0 ) + ioapic_idx =mp_find_ioapic (gsi); +if (ioapic_idx <0 )return ; - pin =mp_find_ioapic_pin (apic_id, gsi); - idx =find_irq_entry (apic_id, pin, mp_INT); + pin =mp_find_ioapic_pin (ioapic_idx, gsi); + idx =find_irq_entry (ioapic_idx, pin, mp_INT);if (idx ==-1 )return ; - irq =pin_2_irq (idx, apic_id, pin); + irq =pin_2_irq (idx, ioapic_idx, pin);/* Only handle the non legacy irqs on secondary ioapics */ -if (apic_id ==0 || irq <NR_IRQS_LEGACY ) +if (ioapic_idx ==0 || irq <NR_IRQS_LEGACY )return ; -set_io_apic_irq_attr (&attr, apic_id, pin,irq_trigger (idx), +set_io_apic_irq_attr (&attr, ioapic_idx, pin,irq_trigger (idx),irq_polarity (idx));io_apic_setup_irq_pin_once (irq, node, &attr);
@@ -1477,8 +1478,8 @@ void setup_IO_APIC_irq_extra(u32 gsi)/* * Set up the timer pin, possibly with the 8259A-master behind. */ -static void __init setup_timer_IRQ0_pin (unsigned int apic_id,unsigned int pin, -int vector) +static void __init setup_timer_IRQ0_pin (unsigned int ioapic_idx, +unsigned int pin,int vector) {struct IO_APIC_route_entry entry;
@@ -1509,10 +1510,10 @@ static void __init setup_timer_IRQ0_pin(/* * Add it to the IO-APIC irq-routing table: */ -ioapic_write_entry (apic_id, pin, entry); +ioapic_write_entry (ioapic_idx, pin, entry); } -__apicdebuginit (void )print_IO_APIC (int apic) +__apicdebuginit (void )print_IO_APIC (int ioapic_idx) {int i;union IO_APIC_reg_00 reg_00;
@@ -1522,16 +1523,16 @@ __apicdebuginit(void) print_IO_APIC(intunsigned long flags;raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (apic,0 ); - reg_01.raw =io_apic_read (apic,1 ); + reg_00.raw =io_apic_read (ioapic_idx,0 ); + reg_01.raw =io_apic_read (ioapic_idx,1 );if (reg_01.bits.version >=0x10 ) - reg_02.raw =io_apic_read (apic,2 ); + reg_02.raw =io_apic_read (ioapic_idx,2 );if (reg_01.bits.version >=0x20 ) - reg_03.raw =io_apic_read (apic,3 ); + reg_03.raw =io_apic_read (ioapic_idx,3 );raw_spin_unlock_irqrestore (&ioapic_lock, flags);printk ("\n" ); -printk (KERN_DEBUG "IO APIC #%d......\n" ,mpc_ioapic_id (apic)); +printk (KERN_DEBUG "IO APIC #%d......\n" ,mpc_ioapic_id (ioapic_idx));printk (KERN_DEBUG ".... register #00: %08X\n" , reg_00.raw);printk (KERN_DEBUG "....... : physical APIC id: %02X\n" , reg_00.bits.ID);printk (KERN_DEBUG "....... : Delivery Type: %X\n" , reg_00.bits.delivery_type);
@@ -1581,7 +1582,7 @@ __apicdebuginit(void) print_IO_APIC(intstruct IO_APIC_route_entry entry;struct IR_IO_APIC_route_entry *ir_entry; - entry =ioapic_read_entry (apic, i); + entry =ioapic_read_entry (ioapic_idx, i); ir_entry = (struct IR_IO_APIC_route_entry *) &entry; printk(KERN_DEBUG " %02x %04X ", i,
@@ -1602,7 +1603,7 @@ __apicdebuginit(void) print_IO_APIC(int }else {struct IO_APIC_route_entry entry; - entry =ioapic_read_entry (apic, i); + entry =ioapic_read_entry (ioapic_idx, i);printk (KERN_DEBUG " %02x %02X " , i, entry.dest
@@ -1624,14 +1625,15 @@ __apicdebuginit(void) print_IO_APIC(int__apicdebuginit (void )print_IO_APICs (void ) { -int apic, i; +int ioapic_idx;struct irq_cfg *cfg;unsigned int irq;printk (KERN_DEBUG "number of MP IRQ sources: %d.\n" , mp_irq_entries); -for (i =0 ; i < nr_ioapics; i++) +for (ioapic_idx =0 ; ioapic_idx < nr_ioapics; ioapic_idx++)printk (KERN_DEBUG "number of IO-APIC #%d registers: %d.\n" , -mpc_ioapic_id (i), ioapics[i].nr_registers); +mpc_ioapic_id (ioapic_idx), + ioapics[ioapic_idx].nr_registers);/* * We are a bit conservative about what we expect. We have to
@@ -1639,8 +1641,8 @@ __apicdebuginit(void) print_IO_APICs(voi*/ printk (KERN_INFO "testing the IO APIC.......................\n" ); -for (apic =0 ; apic < nr_ioapics; apic++) -print_IO_APIC (apic); +for (ioapic_idx =0 ; ioapic_idx < nr_ioapics; ioapic_idx++) +print_IO_APIC (ioapic_idx);printk (KERN_DEBUG "IRQ to pin mappings:\n" );for_each_active_irq (irq) {
@@ -1977,7 +1979,7 @@ void __init setup_ioapic_ids_from_mpc_no {union IO_APIC_reg_00 reg_00;physid_mask_t phys_id_present_map; -int apic_id; +int ioapic_idx;int i;unsigned char old_id;unsigned long flags;
@@ -1991,21 +1993,20 @@ void __init setup_ioapic_ids_from_mpc_no/* * Set the IOAPIC ID to the value stored in the MPC table. */ -for (apic_id =0 ; apic_id < nr_ioapics; apic_id++) { - +for (ioapic_idx =0 ; ioapic_idx < nr_ioapics; ioapic_idx++) {/* Read the register 0 value */ raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (apic_id,0 ); + reg_00.raw =io_apic_read (ioapic_idx,0 );raw_spin_unlock_irqrestore (&ioapic_lock, flags); - old_id =mpc_ioapic_id (apic_id); + old_id =mpc_ioapic_id (ioapic_idx); -if (mpc_ioapic_id (apic_id) >=get_physical_broadcast ()) { +if (mpc_ioapic_id (ioapic_idx) >=get_physical_broadcast ()) {printk (KERN_ERR "BIOS bug, IO-APIC#%d ID is %d in the MPC table!...\n" , - apic_id,mpc_ioapic_id (apic_id)); + ioapic_idx,mpc_ioapic_id (ioapic_idx));printk (KERN_ERR "... fixing up to %d. (tell your hw vendor)\n" , reg_00.bits.ID); - ioapics[apic_id].mp_config.apicid = reg_00.bits.ID; + ioapics[ioapic_idx].mp_config.apicid = reg_00.bits.ID; }/*
@@ -2014,9 +2015,9 @@ void __init setup_ioapic_ids_from_mpc_no* 'stuck on smp_invalidate_needed IPI wait' messages. */ if (apic->check_apicid_used (&phys_id_present_map, -mpc_ioapic_id (apic_id))) { +mpc_ioapic_id (ioapic_idx))) {printk (KERN_ERR "BIOS bug, IO-APIC#%d ID %d is already used!...\n" , - apic_id,mpc_ioapic_id (apic_id)); + ioapic_idx,mpc_ioapic_id (ioapic_idx));for (i =0 ; i <get_physical_broadcast (); i++)if (!physid_isset (i, phys_id_present_map))break ;
@@ -2025,14 +2026,14 @@ void __init setup_ioapic_ids_from_mpc_noprintk (KERN_ERR "... fixing up to %d. (tell your hw vendor)\n" , i);physid_set (i, phys_id_present_map); - ioapics[apic_id].mp_config.apicid = i; + ioapics[ioapic_idx].mp_config.apicid = i; }else {physid_mask_t tmp; - apic->apicid_to_cpu_present (mpc_ioapic_id (apic_id), + apic->apicid_to_cpu_present (mpc_ioapic_id (ioapic_idx), &tmp);apic_printk (APIC_VERBOSE ,"Setting %d in the " "phys_id_present_map\n" , -mpc_ioapic_id (apic_id)); +mpc_ioapic_id (ioapic_idx));physids_or (phys_id_present_map, phys_id_present_map, tmp); }
@@ -2040,35 +2041,35 @@ void __init setup_ioapic_ids_from_mpc_no* We need to adjust the IRQ routing table * if the ID changed. */ -if (old_id !=mpc_ioapic_id (apic_id)) +if (old_id !=mpc_ioapic_id (ioapic_idx))for (i =0 ; i < mp_irq_entries; i++)if (mp_irqs[i].dstapic == old_id) mp_irqs[i].dstapic - =mpc_ioapic_id (apic_id); + =mpc_ioapic_id (ioapic_idx);/* * Update the ID register according to the right value * from the MPC table if they are different. */ -if (mpc_ioapic_id (apic_id) == reg_00.bits.ID) +if (mpc_ioapic_id (ioapic_idx) == reg_00.bits.ID)continue ;apic_printk (APIC_VERBOSE ,KERN_INFO "...changing IO-APIC physical APIC ID to %d ..." , -mpc_ioapic_id (apic_id)); +mpc_ioapic_id (ioapic_idx)); - reg_00.bits.ID =mpc_ioapic_id (apic_id); + reg_00.bits.ID =mpc_ioapic_id (ioapic_idx);raw_spin_lock_irqsave (&ioapic_lock, flags); -io_apic_write (apic_id,0 , reg_00.raw); +io_apic_write (ioapic_idx,0 , reg_00.raw);raw_spin_unlock_irqrestore (&ioapic_lock, flags);/* * Sanity check */ raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (apic_id,0 ); + reg_00.raw =io_apic_read (ioapic_idx,0 );raw_spin_unlock_irqrestore (&ioapic_lock, flags); -if (reg_00.bits.ID !=mpc_ioapic_id (apic_id)) +if (reg_00.bits.ID !=mpc_ioapic_id (ioapic_idx))printk ("could not set ID!\n" );else apic_printk (APIC_VERBOSE ," ok.\n" );
@@ -2968,27 +2969,26 @@ static int __init io_apic_bug_finalize(vlate_initcall (io_apic_bug_finalize); -static void resume_ioapic_id (int ioapic_id) +static void resume_ioapic_id (int ioapic_idx) {unsigned long flags;union IO_APIC_reg_00 reg_00; -raw_spin_lock_irqsave (&ioapic_lock, flags); - reg_00.raw =io_apic_read (ioapic_id,0 ); -if (reg_00.bits.ID !=mpc_ioapic_id (ioapic_id)) { - reg_00.bits.ID =mpc_ioapic_id (ioapic_id); -io_apic_write (ioapic_id,0 , reg_00.raw); + reg_00.raw =io_apic_read (ioapic_idx,0 ); +if (reg_00.bits.ID !=mpc_ioapic_id (ioapic_idx)) { + reg_00.bits.ID =mpc_ioapic_id (ioapic_idx); +io_apic_write (ioapic_idx,0 , reg_00.raw); }raw_spin_unlock_irqrestore (&ioapic_lock, flags); }static void ioapic_resume (void ) { -int ioapic_id; +int ioapic_idx; -for (ioapic_id = nr_ioapics -1 ; ioapic_id >=0 ; ioapic_id--) -resume_ioapic_id (ioapic_id); +for (ioapic_idx = nr_ioapics -1 ; ioapic_idx >=0 ; ioapic_idx--) +resume_ioapic_id (ioapic_idx);restore_ioapic_entries (); }
@@ -3597,18 +3597,18 @@ io_apic_setup_irq_pin(unsigned int irq,int io_apic_setup_irq_pin_once (unsigned int irq,int node,struct io_apic_irq_attr *attr) { -unsigned int id = attr->ioapic, pin = attr->ioapic_pin; +unsigned int ioapic_idx = attr->ioapic, pin = attr->ioapic_pin;int ret;/* Avoid redundant programming */ -if (test_bit (pin, ioapics[id].pin_programmed)) { +if (test_bit (pin, ioapics[ioapic_idx].pin_programmed)) {pr_debug ("Pin %d-%d already programmed\n" , -mpc_ioapic_id (id), pin); +mpc_ioapic_id (ioapic_idx), pin);return 0 ; } ret =io_apic_setup_irq_pin (irq, node, attr);if (!ret) -set_bit (pin, ioapics[id].pin_programmed); +set_bit (pin, ioapics[ioapic_idx].pin_programmed);return ret; }
Ingo Molnar
AppliedRe: [PATCH 0/5 resend] x86, ioapic: Clean up ioapic idx and apic id usage
In reply to Yinghai LuQuoted 4 lines · Yinghai Lu
Resending x86/ioapic clean up patches.
it will make sure
ioapic_idxis used instead of ioapic orapic_idxto used as index.
Quoted 8 lines
[PATCH 1/5] x86, ioapic: Passing
irq_attrstruct pointer withsetup_ioapic_irq()[PATCH 2/5] x86, ioapic: Splitsetup_ioapic_entryfor interrupt remapped version [PATCH 3/5] x86, ioapic: Print out irte with right ioapic index [PATCH 4/5] x86, ioapic: Seperateprint_IO_APIC()to only print one io apic [PATCH 5/5] x86, ioapic: Clean up ioapic/apic_id usagepatch1, 2, 4, 5 are cleanup related
patch3 fixes the one idx printout.
Applied to tip:x86/apic, thanks!
Another io_apic.c issue that Thomas raised is that we should standardize arch/x86 on SPARSE_IRQ=y and get rid of all SPARSE_IRQ=n complications.
Thanks,
Ingo