aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/iosapic.c
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2008-05-19 09:13:42 -0400
committerTony Luck <tony.luck@intel.com>2008-05-27 18:10:41 -0400
commit33b39e84209b0308b572dce017df7ee9b63f086c (patch)
treee27bb8c44aa70b3172c9be846960baf7dbe98bd4 /arch/ia64/kernel/iosapic.c
parente51835d58a5abdf82211f36f500f666ca7ef9aee (diff)
[IA64] pvops: add hooks, pv_iosapic_ops, to paravirtualize iosapic.
add hooks to paravirtualize iosapic which is a real hardware resource. On virtualized environment it may be replaced something virtualized friendly. Define pv_iosapic_ops and add the hooks. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/iosapic.c')
-rw-r--r--arch/ia64/kernel/iosapic.c45
1 files changed, 29 insertions, 16 deletions
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 082c31dcfd99..587196dd84fd 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -587,6 +587,15 @@ static inline int irq_is_shared (int irq)
587 return (iosapic_intr_info[irq].count > 1); 587 return (iosapic_intr_info[irq].count > 1);
588} 588}
589 589
590struct irq_chip*
591ia64_native_iosapic_get_irq_chip(unsigned long trigger)
592{
593 if (trigger == IOSAPIC_EDGE)
594 return &irq_type_iosapic_edge;
595 else
596 return &irq_type_iosapic_level;
597}
598
590static int 599static int
591register_intr (unsigned int gsi, int irq, unsigned char delivery, 600register_intr (unsigned int gsi, int irq, unsigned char delivery,
592 unsigned long polarity, unsigned long trigger) 601 unsigned long polarity, unsigned long trigger)
@@ -637,13 +646,10 @@ register_intr (unsigned int gsi, int irq, unsigned char delivery,
637 iosapic_intr_info[irq].dmode = delivery; 646 iosapic_intr_info[irq].dmode = delivery;
638 iosapic_intr_info[irq].trigger = trigger; 647 iosapic_intr_info[irq].trigger = trigger;
639 648
640 if (trigger == IOSAPIC_EDGE) 649 irq_type = iosapic_get_irq_chip(trigger);
641 irq_type = &irq_type_iosapic_edge;
642 else
643 irq_type = &irq_type_iosapic_level;
644 650
645 idesc = irq_desc + irq; 651 idesc = irq_desc + irq;
646 if (idesc->chip != irq_type) { 652 if (irq_type != NULL && idesc->chip != irq_type) {
647 if (idesc->chip != &no_irq_type) 653 if (idesc->chip != &no_irq_type)
648 printk(KERN_WARNING 654 printk(KERN_WARNING
649 "%s: changing vector %d from %s to %s\n", 655 "%s: changing vector %d from %s to %s\n",
@@ -976,6 +982,22 @@ iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi,
976} 982}
977 983
978void __init 984void __init
985ia64_native_iosapic_pcat_compat_init(void)
986{
987 if (pcat_compat) {
988 /*
989 * Disable the compatibility mode interrupts (8259 style),
990 * needs IN/OUT support enabled.
991 */
992 printk(KERN_INFO
993 "%s: Disabling PC-AT compatible 8259 interrupts\n",
994 __func__);
995 outb(0xff, 0xA1);
996 outb(0xff, 0x21);
997 }
998}
999
1000void __init
979iosapic_system_init (int system_pcat_compat) 1001iosapic_system_init (int system_pcat_compat)
980{ 1002{
981 int irq; 1003 int irq;
@@ -989,17 +1011,8 @@ iosapic_system_init (int system_pcat_compat)
989 } 1011 }
990 1012
991 pcat_compat = system_pcat_compat; 1013 pcat_compat = system_pcat_compat;
992 if (pcat_compat) { 1014 if (pcat_compat)
993 /* 1015 iosapic_pcat_compat_init();
994 * Disable the compatibility mode interrupts (8259 style),
995 * needs IN/OUT support enabled.
996 */
997 printk(KERN_INFO
998 "%s: Disabling PC-AT compatible 8259 interrupts\n",
999 __func__);
1000 outb(0xff, 0xA1);
1001 outb(0xff, 0x21);
1002 }
1003} 1016}
1004 1017
1005static inline int 1018static inline int