Skip to content

Commit

Permalink
x86, io_apic: Move irq_remapping_enabled checks out of check_timer()
Browse files Browse the repository at this point in the history
Move these checks to IRQ remapping code by introducing the
panic_on_irq_remap() function.

Signed-off-by: Joerg Roedel <joro@8bytes.org>
Acked-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  • Loading branch information
Joerg Roedel committed Jan 28, 2013
1 parent a6a25dd commit 6a9f5de
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
5 changes: 5 additions & 0 deletions arch/x86/include/asm/irq_remapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ extern void compose_remapped_msi_msg(struct pci_dev *pdev,
unsigned int irq, unsigned int dest,
struct msi_msg *msg, u8 hpet_id);
extern int setup_hpet_msi_remapped(unsigned int irq, unsigned int id);
extern void panic_if_irq_remap(const char *msg);

#else /* CONFIG_IRQ_REMAP */

Expand Down Expand Up @@ -75,6 +76,10 @@ static inline int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
{
return -ENODEV;
}

static inline void panic_if_irq_remap(const char *msg)
{
}
#endif /* CONFIG_IRQ_REMAP */

#endif /* __X86_IRQ_REMAPPING_H */
6 changes: 2 additions & 4 deletions arch/x86/kernel/apic/io_apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -2777,8 +2777,7 @@ static inline void __init check_timer(void)
* 8259A.
*/
if (pin1 == -1) {
if (irq_remapping_enabled)
panic("BIOS bug: timer not connected to IO-APIC");
panic_if_irq_remap("BIOS bug: timer not connected to IO-APIC");
pin1 = pin2;
apic1 = apic2;
no_pin1 = 1;
Expand Down Expand Up @@ -2810,8 +2809,7 @@ static inline void __init check_timer(void)
clear_IO_APIC_pin(0, pin1);
goto out;
}
if (irq_remapping_enabled)
panic("timer doesn't work through Interrupt-remapped IO-APIC");
panic_if_irq_remap("timer doesn't work through Interrupt-remapped IO-APIC");
local_irq_disable();
clear_IO_APIC_pin(apic1, pin1);
if (!no_pin1)
Expand Down
6 changes: 6 additions & 0 deletions drivers/iommu/irq_remapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -321,3 +321,9 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)

return remap_ops->setup_hpet_msi(irq, id);
}

void panic_if_irq_remap(const char *msg)
{
if (irq_remapping_enabled)
panic(msg);
}

0 comments on commit 6a9f5de

Please sign in to comment.