diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2007-09-04 03:43:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2007-09-04 03:43:57 -0400 |
commit | ea3c4b126ad63bd782c7bb5266bb4fd88e203169 (patch) | |
tree | 1b1dedd3ee501c165910389aea9082fb96a9e8f4 /arch | |
parent | a5229e6b3fb77ef92ff585e17ba4aa8a3e945727 (diff) | |
parent | 7b3166dbc3df5b72f2ba4ea130f4461e318a3838 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/hp/sim/hpsim_console.c | 16 | ||||
-rw-r--r-- | arch/ia64/hp/sim/hpsim_setup.c | 9 | ||||
-rw-r--r-- | arch/ia64/hp/sim/simeth.c | 12 | ||||
-rw-r--r-- | arch/ia64/hp/sim/simscsi.c | 3 | ||||
-rw-r--r-- | arch/ia64/kernel/irq_ia64.c | 28 | ||||
-rw-r--r-- | arch/ia64/kernel/setup.c | 13 | ||||
-rw-r--r-- | arch/ia64/kernel/smpboot.c | 6 | ||||
-rw-r--r-- | arch/ia64/mm/contig.c | 3 | ||||
-rw-r--r-- | arch/ia64/mm/discontig.c | 3 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/huberror.c | 14 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/irq.c | 15 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/sn2/sn2_smp.c | 26 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/sn2/sn_hwperf.c | 3 | ||||
-rw-r--r-- | arch/ia64/sn/pci/pcibr/pcibr_provider.c | 1 | ||||
-rw-r--r-- | arch/ia64/sn/pci/tioca_provider.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/pci/tioce_provider.c | 1 |
16 files changed, 118 insertions, 37 deletions
diff --git a/arch/ia64/hp/sim/hpsim_console.c b/arch/ia64/hp/sim/hpsim_console.c index 6e149c8ab835..01663bc42b1a 100644 --- a/arch/ia64/hp/sim/hpsim_console.c +++ b/arch/ia64/hp/sim/hpsim_console.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <asm/machvec.h> | 21 | #include <asm/machvec.h> |
22 | #include <asm/pgtable.h> | 22 | #include <asm/pgtable.h> |
23 | #include <asm/sal.h> | 23 | #include <asm/sal.h> |
24 | #include <asm/hpsim.h> | ||
24 | 25 | ||
25 | #include "hpsim_ssc.h" | 26 | #include "hpsim_ssc.h" |
26 | 27 | ||
@@ -28,7 +29,7 @@ static int simcons_init (struct console *, char *); | |||
28 | static void simcons_write (struct console *, const char *, unsigned); | 29 | static void simcons_write (struct console *, const char *, unsigned); |
29 | static struct tty_driver *simcons_console_device (struct console *, int *); | 30 | static struct tty_driver *simcons_console_device (struct console *, int *); |
30 | 31 | ||
31 | struct console hpsim_cons = { | 32 | static struct console hpsim_cons = { |
32 | .name = "simcons", | 33 | .name = "simcons", |
33 | .write = simcons_write, | 34 | .write = simcons_write, |
34 | .device = simcons_console_device, | 35 | .device = simcons_console_device, |
@@ -58,7 +59,18 @@ simcons_write (struct console *cons, const char *buf, unsigned count) | |||
58 | 59 | ||
59 | static struct tty_driver *simcons_console_device (struct console *c, int *index) | 60 | static struct tty_driver *simcons_console_device (struct console *c, int *index) |
60 | { | 61 | { |
61 | extern struct tty_driver *hp_simserial_driver; | ||
62 | *index = c->index; | 62 | *index = c->index; |
63 | return hp_simserial_driver; | 63 | return hp_simserial_driver; |
64 | } | 64 | } |
65 | |||
66 | int simcons_register(void) | ||
67 | { | ||
68 | if (!ia64_platform_is("hpsim")) | ||
69 | return 1; | ||
70 | |||
71 | if (hpsim_cons.flags & CON_ENABLED) | ||
72 | return 1; | ||
73 | |||
74 | register_console(&hpsim_cons); | ||
75 | return 0; | ||
76 | } | ||
diff --git a/arch/ia64/hp/sim/hpsim_setup.c b/arch/ia64/hp/sim/hpsim_setup.c index f2297192a582..f629e903ebc7 100644 --- a/arch/ia64/hp/sim/hpsim_setup.c +++ b/arch/ia64/hp/sim/hpsim_setup.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <asm/machvec.h> | 21 | #include <asm/machvec.h> |
22 | #include <asm/pgtable.h> | 22 | #include <asm/pgtable.h> |
23 | #include <asm/sal.h> | 23 | #include <asm/sal.h> |
24 | #include <asm/hpsim.h> | ||
24 | 25 | ||
25 | #include "hpsim_ssc.h" | 26 | #include "hpsim_ssc.h" |
26 | 27 | ||
@@ -41,11 +42,5 @@ hpsim_setup (char **cmdline_p) | |||
41 | { | 42 | { |
42 | ROOT_DEV = Root_SDA1; /* default to first SCSI drive */ | 43 | ROOT_DEV = Root_SDA1; /* default to first SCSI drive */ |
43 | 44 | ||
44 | #ifdef CONFIG_HP_SIMSERIAL_CONSOLE | 45 | simcons_register(); |
45 | { | ||
46 | extern struct console hpsim_cons; | ||
47 | if (ia64_platform_is("hpsim")) | ||
48 | register_console(&hpsim_cons); | ||
49 | } | ||
50 | #endif | ||
51 | } | 46 | } |
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c index f26077a773d5..4017696ada63 100644 --- a/arch/ia64/hp/sim/simeth.c +++ b/arch/ia64/hp/sim/simeth.c | |||
@@ -22,6 +22,9 @@ | |||
22 | #include <linux/bitops.h> | 22 | #include <linux/bitops.h> |
23 | #include <asm/system.h> | 23 | #include <asm/system.h> |
24 | #include <asm/irq.h> | 24 | #include <asm/irq.h> |
25 | #include <asm/hpsim.h> | ||
26 | |||
27 | #include "hpsim_ssc.h" | ||
25 | 28 | ||
26 | #define SIMETH_RECV_MAX 10 | 29 | #define SIMETH_RECV_MAX 10 |
27 | 30 | ||
@@ -35,12 +38,6 @@ | |||
35 | #define SIMETH_FRAME_SIZE ETH_FRAME_LEN | 38 | #define SIMETH_FRAME_SIZE ETH_FRAME_LEN |
36 | 39 | ||
37 | 40 | ||
38 | #define SSC_NETDEV_PROBE 100 | ||
39 | #define SSC_NETDEV_SEND 101 | ||
40 | #define SSC_NETDEV_RECV 102 | ||
41 | #define SSC_NETDEV_ATTACH 103 | ||
42 | #define SSC_NETDEV_DETACH 104 | ||
43 | |||
44 | #define NETWORK_INTR 8 | 41 | #define NETWORK_INTR 8 |
45 | 42 | ||
46 | struct simeth_local { | 43 | struct simeth_local { |
@@ -124,9 +121,6 @@ simeth_probe (void) | |||
124 | return r; | 121 | return r; |
125 | } | 122 | } |
126 | 123 | ||
127 | extern long ia64_ssc (long, long, long, long, int); | ||
128 | extern void ia64_ssc_connect_irq (long intr, long irq); | ||
129 | |||
130 | static inline int | 124 | static inline int |
131 | netdev_probe(char *name, unsigned char *ether) | 125 | netdev_probe(char *name, unsigned char *ether) |
132 | { | 126 | { |
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c index e62694f8ef75..4552a1cf5b33 100644 --- a/arch/ia64/hp/sim/simscsi.c +++ b/arch/ia64/hp/sim/simscsi.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
15 | #include <linux/timer.h> | 15 | #include <linux/timer.h> |
16 | #include <asm/irq.h> | 16 | #include <asm/irq.h> |
17 | #include "hpsim_ssc.h" | ||
17 | 18 | ||
18 | #include <scsi/scsi.h> | 19 | #include <scsi/scsi.h> |
19 | #include <scsi/scsi_cmnd.h> | 20 | #include <scsi/scsi_cmnd.h> |
@@ -59,8 +60,6 @@ struct disk_stat { | |||
59 | unsigned count; | 60 | unsigned count; |
60 | }; | 61 | }; |
61 | 62 | ||
62 | extern long ia64_ssc (long arg0, long arg1, long arg2, long arg3, int nr); | ||
63 | |||
64 | static int desc[16] = { | 63 | static int desc[16] = { |
65 | -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 | 64 | -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 |
66 | }; | 65 | }; |
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c index c47c8acc96e3..00a4599e5f47 100644 --- a/arch/ia64/kernel/irq_ia64.c +++ b/arch/ia64/kernel/irq_ia64.c | |||
@@ -82,7 +82,7 @@ struct irq_cfg irq_cfg[NR_IRQS] __read_mostly = { | |||
82 | }; | 82 | }; |
83 | 83 | ||
84 | DEFINE_PER_CPU(int[IA64_NUM_VECTORS], vector_irq) = { | 84 | DEFINE_PER_CPU(int[IA64_NUM_VECTORS], vector_irq) = { |
85 | [0 ... IA64_NUM_VECTORS - 1] = IA64_SPURIOUS_INT_VECTOR | 85 | [0 ... IA64_NUM_VECTORS - 1] = -1 |
86 | }; | 86 | }; |
87 | 87 | ||
88 | static cpumask_t vector_table[IA64_NUM_VECTORS] = { | 88 | static cpumask_t vector_table[IA64_NUM_VECTORS] = { |
@@ -179,7 +179,7 @@ static void __clear_irq_vector(int irq) | |||
179 | domain = cfg->domain; | 179 | domain = cfg->domain; |
180 | cpus_and(mask, cfg->domain, cpu_online_map); | 180 | cpus_and(mask, cfg->domain, cpu_online_map); |
181 | for_each_cpu_mask(cpu, mask) | 181 | for_each_cpu_mask(cpu, mask) |
182 | per_cpu(vector_irq, cpu)[vector] = IA64_SPURIOUS_INT_VECTOR; | 182 | per_cpu(vector_irq, cpu)[vector] = -1; |
183 | cfg->vector = IRQ_VECTOR_UNASSIGNED; | 183 | cfg->vector = IRQ_VECTOR_UNASSIGNED; |
184 | cfg->domain = CPU_MASK_NONE; | 184 | cfg->domain = CPU_MASK_NONE; |
185 | irq_status[irq] = IRQ_UNUSED; | 185 | irq_status[irq] = IRQ_UNUSED; |
@@ -249,7 +249,7 @@ void __setup_vector_irq(int cpu) | |||
249 | 249 | ||
250 | /* Clear vector_irq */ | 250 | /* Clear vector_irq */ |
251 | for (vector = 0; vector < IA64_NUM_VECTORS; ++vector) | 251 | for (vector = 0; vector < IA64_NUM_VECTORS; ++vector) |
252 | per_cpu(vector_irq, cpu)[vector] = IA64_SPURIOUS_INT_VECTOR; | 252 | per_cpu(vector_irq, cpu)[vector] = -1; |
253 | /* Mark the inuse vectors */ | 253 | /* Mark the inuse vectors */ |
254 | for (irq = 0; irq < NR_IRQS; ++irq) { | 254 | for (irq = 0; irq < NR_IRQS; ++irq) { |
255 | if (!cpu_isset(cpu, irq_cfg[irq].domain)) | 255 | if (!cpu_isset(cpu, irq_cfg[irq].domain)) |
@@ -432,10 +432,18 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs) | |||
432 | } else if (unlikely(IS_RESCHEDULE(vector))) | 432 | } else if (unlikely(IS_RESCHEDULE(vector))) |
433 | kstat_this_cpu.irqs[vector]++; | 433 | kstat_this_cpu.irqs[vector]++; |
434 | else { | 434 | else { |
435 | int irq = local_vector_to_irq(vector); | ||
436 | |||
435 | ia64_setreg(_IA64_REG_CR_TPR, vector); | 437 | ia64_setreg(_IA64_REG_CR_TPR, vector); |
436 | ia64_srlz_d(); | 438 | ia64_srlz_d(); |
437 | 439 | ||
438 | generic_handle_irq(local_vector_to_irq(vector)); | 440 | if (unlikely(irq < 0)) { |
441 | printk(KERN_ERR "%s: Unexpected interrupt " | ||
442 | "vector %d on CPU %d is not mapped " | ||
443 | "to any IRQ!\n", __FUNCTION__, vector, | ||
444 | smp_processor_id()); | ||
445 | } else | ||
446 | generic_handle_irq(irq); | ||
439 | 447 | ||
440 | /* | 448 | /* |
441 | * Disable interrupts and send EOI: | 449 | * Disable interrupts and send EOI: |
@@ -483,6 +491,7 @@ void ia64_process_pending_intr(void) | |||
483 | kstat_this_cpu.irqs[vector]++; | 491 | kstat_this_cpu.irqs[vector]++; |
484 | else { | 492 | else { |
485 | struct pt_regs *old_regs = set_irq_regs(NULL); | 493 | struct pt_regs *old_regs = set_irq_regs(NULL); |
494 | int irq = local_vector_to_irq(vector); | ||
486 | 495 | ||
487 | ia64_setreg(_IA64_REG_CR_TPR, vector); | 496 | ia64_setreg(_IA64_REG_CR_TPR, vector); |
488 | ia64_srlz_d(); | 497 | ia64_srlz_d(); |
@@ -493,8 +502,15 @@ void ia64_process_pending_intr(void) | |||
493 | * it will work. I hope it works!. | 502 | * it will work. I hope it works!. |
494 | * Probably could shared code. | 503 | * Probably could shared code. |
495 | */ | 504 | */ |
496 | vectors_in_migration[local_vector_to_irq(vector)]=0; | 505 | if (unlikely(irq < 0)) { |
497 | generic_handle_irq(local_vector_to_irq(vector)); | 506 | printk(KERN_ERR "%s: Unexpected interrupt " |
507 | "vector %d on CPU %d not being mapped " | ||
508 | "to any IRQ!!\n", __FUNCTION__, vector, | ||
509 | smp_processor_id()); | ||
510 | } else { | ||
511 | vectors_in_migration[irq]=0; | ||
512 | generic_handle_irq(irq); | ||
513 | } | ||
498 | set_irq_regs(old_regs); | 514 | set_irq_regs(old_regs); |
499 | 515 | ||
500 | /* | 516 | /* |
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 407efea04bf5..9e392a30d197 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
@@ -60,6 +60,7 @@ | |||
60 | #include <asm/smp.h> | 60 | #include <asm/smp.h> |
61 | #include <asm/system.h> | 61 | #include <asm/system.h> |
62 | #include <asm/unistd.h> | 62 | #include <asm/unistd.h> |
63 | #include <asm/hpsim.h> | ||
63 | 64 | ||
64 | #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE) | 65 | #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE) |
65 | # error "struct cpuinfo_ia64 too big!" | 66 | # error "struct cpuinfo_ia64 too big!" |
@@ -389,13 +390,8 @@ early_console_setup (char *cmdline) | |||
389 | if (!efi_setup_pcdp_console(cmdline)) | 390 | if (!efi_setup_pcdp_console(cmdline)) |
390 | earlycons++; | 391 | earlycons++; |
391 | #endif | 392 | #endif |
392 | #ifdef CONFIG_HP_SIMSERIAL_CONSOLE | 393 | if (!simcons_register()) |
393 | { | ||
394 | extern struct console hpsim_cons; | ||
395 | register_console(&hpsim_cons); | ||
396 | earlycons++; | 394 | earlycons++; |
397 | } | ||
398 | #endif | ||
399 | 395 | ||
400 | return (earlycons) ? 0 : -1; | 396 | return (earlycons) ? 0 : -1; |
401 | } | 397 | } |
@@ -960,6 +956,11 @@ cpu_init (void) | |||
960 | 956 | ||
961 | /* clear TPR & XTP to enable all interrupt classes: */ | 957 | /* clear TPR & XTP to enable all interrupt classes: */ |
962 | ia64_setreg(_IA64_REG_CR_TPR, 0); | 958 | ia64_setreg(_IA64_REG_CR_TPR, 0); |
959 | |||
960 | /* Clear any pending interrupts left by SAL/EFI */ | ||
961 | while (ia64_get_ivr() != IA64_SPURIOUS_INT_VECTOR) | ||
962 | ia64_eoi(); | ||
963 | |||
963 | #ifdef CONFIG_SMP | 964 | #ifdef CONFIG_SMP |
964 | normal_xtp(); | 965 | normal_xtp(); |
965 | #endif | 966 | #endif |
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 62209dcf06d3..308772f7cddc 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
@@ -58,6 +58,7 @@ | |||
58 | #include <asm/system.h> | 58 | #include <asm/system.h> |
59 | #include <asm/tlbflush.h> | 59 | #include <asm/tlbflush.h> |
60 | #include <asm/unistd.h> | 60 | #include <asm/unistd.h> |
61 | #include <asm/sn/arch.h> | ||
61 | 62 | ||
62 | #define SMP_DEBUG 0 | 63 | #define SMP_DEBUG 0 |
63 | 64 | ||
@@ -730,6 +731,11 @@ int __cpu_disable(void) | |||
730 | return (-EBUSY); | 731 | return (-EBUSY); |
731 | } | 732 | } |
732 | 733 | ||
734 | if (ia64_platform_is("sn2")) { | ||
735 | if (!sn_cpu_disable_allowed(cpu)) | ||
736 | return -EBUSY; | ||
737 | } | ||
738 | |||
733 | cpu_clear(cpu, cpu_online_map); | 739 | cpu_clear(cpu, cpu_online_map); |
734 | 740 | ||
735 | if (migrate_platform_irqs(cpu)) { | 741 | if (migrate_platform_irqs(cpu)) { |
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index 7ac8592a35b6..d3c538be466c 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/bootmem.h> | 17 | #include <linux/bootmem.h> |
18 | #include <linux/efi.h> | 18 | #include <linux/efi.h> |
19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
20 | #include <linux/nmi.h> | ||
20 | #include <linux/swap.h> | 21 | #include <linux/swap.h> |
21 | 22 | ||
22 | #include <asm/meminit.h> | 23 | #include <asm/meminit.h> |
@@ -56,6 +57,8 @@ void show_mem(void) | |||
56 | present = pgdat->node_present_pages; | 57 | present = pgdat->node_present_pages; |
57 | for(i = 0; i < pgdat->node_spanned_pages; i++) { | 58 | for(i = 0; i < pgdat->node_spanned_pages; i++) { |
58 | struct page *page; | 59 | struct page *page; |
60 | if (unlikely(i % MAX_ORDER_NR_PAGES == 0)) | ||
61 | touch_nmi_watchdog(); | ||
59 | if (pfn_valid(pgdat->node_start_pfn + i)) | 62 | if (pfn_valid(pgdat->node_start_pfn + i)) |
60 | page = pfn_to_page(pgdat->node_start_pfn + i); | 63 | page = pfn_to_page(pgdat->node_start_pfn + i); |
61 | else { | 64 | else { |
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index 0dbf0e81f8c0..0d34585058c8 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c | |||
@@ -16,6 +16,7 @@ | |||
16 | 16 | ||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
19 | #include <linux/nmi.h> | ||
19 | #include <linux/swap.h> | 20 | #include <linux/swap.h> |
20 | #include <linux/bootmem.h> | 21 | #include <linux/bootmem.h> |
21 | #include <linux/acpi.h> | 22 | #include <linux/acpi.h> |
@@ -533,6 +534,8 @@ void show_mem(void) | |||
533 | present = pgdat->node_present_pages; | 534 | present = pgdat->node_present_pages; |
534 | for(i = 0; i < pgdat->node_spanned_pages; i++) { | 535 | for(i = 0; i < pgdat->node_spanned_pages; i++) { |
535 | struct page *page; | 536 | struct page *page; |
537 | if (unlikely(i % MAX_ORDER_NR_PAGES == 0)) | ||
538 | touch_nmi_watchdog(); | ||
536 | if (pfn_valid(pgdat->node_start_pfn + i)) | 539 | if (pfn_valid(pgdat->node_start_pfn + i)) |
537 | page = pfn_to_page(pgdat->node_start_pfn + i); | 540 | page = pfn_to_page(pgdat->node_start_pfn + i); |
538 | else { | 541 | else { |
diff --git a/arch/ia64/sn/kernel/huberror.c b/arch/ia64/sn/kernel/huberror.c index 2c3f9dfca78b..b663168da55c 100644 --- a/arch/ia64/sn/kernel/huberror.c +++ b/arch/ia64/sn/kernel/huberror.c | |||
@@ -185,11 +185,14 @@ void hubiio_crb_error_handler(struct hubdev_info *hubdev_info) | |||
185 | */ | 185 | */ |
186 | void hub_error_init(struct hubdev_info *hubdev_info) | 186 | void hub_error_init(struct hubdev_info *hubdev_info) |
187 | { | 187 | { |
188 | |||
188 | if (request_irq(SGI_II_ERROR, hub_eint_handler, IRQF_SHARED, | 189 | if (request_irq(SGI_II_ERROR, hub_eint_handler, IRQF_SHARED, |
189 | "SN_hub_error", (void *)hubdev_info)) | 190 | "SN_hub_error", (void *)hubdev_info)) { |
190 | printk("hub_error_init: Failed to request_irq for 0x%p\n", | 191 | printk("hub_error_init: Failed to request_irq for 0x%p\n", |
191 | hubdev_info); | 192 | hubdev_info); |
192 | return; | 193 | return; |
194 | } | ||
195 | sn_set_err_irq_affinity(SGI_II_ERROR); | ||
193 | } | 196 | } |
194 | 197 | ||
195 | 198 | ||
@@ -202,11 +205,14 @@ void hub_error_init(struct hubdev_info *hubdev_info) | |||
202 | */ | 205 | */ |
203 | void ice_error_init(struct hubdev_info *hubdev_info) | 206 | void ice_error_init(struct hubdev_info *hubdev_info) |
204 | { | 207 | { |
208 | |||
205 | if (request_irq | 209 | if (request_irq |
206 | (SGI_TIO_ERROR, (void *)hub_eint_handler, IRQF_SHARED, "SN_TIO_error", | 210 | (SGI_TIO_ERROR, (void *)hub_eint_handler, IRQF_SHARED, "SN_TIO_error", |
207 | (void *)hubdev_info)) | 211 | (void *)hubdev_info)) { |
208 | printk("ice_error_init: request_irq() error hubdev_info 0x%p\n", | 212 | printk("ice_error_init: request_irq() error hubdev_info 0x%p\n", |
209 | hubdev_info); | 213 | hubdev_info); |
210 | return; | 214 | return; |
215 | } | ||
216 | sn_set_err_irq_affinity(SGI_TIO_ERROR); | ||
211 | } | 217 | } |
212 | 218 | ||
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index 360047389449..0f9b12683bf3 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <asm/sn/pcidev.h> | 19 | #include <asm/sn/pcidev.h> |
20 | #include <asm/sn/shub_mmr.h> | 20 | #include <asm/sn/shub_mmr.h> |
21 | #include <asm/sn/sn_sal.h> | 21 | #include <asm/sn/sn_sal.h> |
22 | #include <asm/sn/sn_feature_sets.h> | ||
22 | 23 | ||
23 | static void force_interrupt(int irq); | 24 | static void force_interrupt(int irq); |
24 | static void register_intr_pda(struct sn_irq_info *sn_irq_info); | 25 | static void register_intr_pda(struct sn_irq_info *sn_irq_info); |
@@ -233,6 +234,20 @@ static void sn_set_affinity_irq(unsigned int irq, cpumask_t mask) | |||
233 | (void)sn_retarget_vector(sn_irq_info, nasid, slice); | 234 | (void)sn_retarget_vector(sn_irq_info, nasid, slice); |
234 | } | 235 | } |
235 | 236 | ||
237 | #ifdef CONFIG_SMP | ||
238 | void sn_set_err_irq_affinity(unsigned int irq) | ||
239 | { | ||
240 | /* | ||
241 | * On systems which support CPU disabling (SHub2), all error interrupts | ||
242 | * are targetted at the boot CPU. | ||
243 | */ | ||
244 | if (is_shub2() && sn_prom_feature_available(PRF_CPU_DISABLE_SUPPORT)) | ||
245 | set_irq_affinity_info(irq, cpu_physical_id(0), 0); | ||
246 | } | ||
247 | #else | ||
248 | void sn_set_err_irq_affinity(unsigned int irq) { } | ||
249 | #endif | ||
250 | |||
236 | static void | 251 | static void |
237 | sn_mask_irq(unsigned int irq) | 252 | sn_mask_irq(unsigned int irq) |
238 | { | 253 | { |
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c index 033c8a9f000e..f3c69329e145 100644 --- a/arch/ia64/sn/kernel/sn2/sn2_smp.c +++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <asm/sn/shub_mmr.h> | 40 | #include <asm/sn/shub_mmr.h> |
41 | #include <asm/sn/nodepda.h> | 41 | #include <asm/sn/nodepda.h> |
42 | #include <asm/sn/rw_mmr.h> | 42 | #include <asm/sn/rw_mmr.h> |
43 | #include <asm/sn/sn_feature_sets.h> | ||
43 | 44 | ||
44 | DEFINE_PER_CPU(struct ptc_stats, ptcstats); | 45 | DEFINE_PER_CPU(struct ptc_stats, ptcstats); |
45 | DECLARE_PER_CPU(struct ptc_stats, ptcstats); | 46 | DECLARE_PER_CPU(struct ptc_stats, ptcstats); |
@@ -429,6 +430,31 @@ void sn2_send_IPI(int cpuid, int vector, int delivery_mode, int redirect) | |||
429 | sn_send_IPI_phys(nasid, physid, vector, delivery_mode); | 430 | sn_send_IPI_phys(nasid, physid, vector, delivery_mode); |
430 | } | 431 | } |
431 | 432 | ||
433 | #ifdef CONFIG_HOTPLUG_CPU | ||
434 | /** | ||
435 | * sn_cpu_disable_allowed - Determine if a CPU can be disabled. | ||
436 | * @cpu - CPU that is requested to be disabled. | ||
437 | * | ||
438 | * CPU disable is only allowed on SHub2 systems running with a PROM | ||
439 | * that supports CPU disable. It is not permitted to disable the boot processor. | ||
440 | */ | ||
441 | bool sn_cpu_disable_allowed(int cpu) | ||
442 | { | ||
443 | if (is_shub2() && sn_prom_feature_available(PRF_CPU_DISABLE_SUPPORT)) { | ||
444 | if (cpu != 0) | ||
445 | return true; | ||
446 | else | ||
447 | printk(KERN_WARNING | ||
448 | "Disabling the boot processor is not allowed.\n"); | ||
449 | |||
450 | } else | ||
451 | printk(KERN_WARNING | ||
452 | "CPU disable is not supported on this system.\n"); | ||
453 | |||
454 | return false; | ||
455 | } | ||
456 | #endif /* CONFIG_HOTPLUG_CPU */ | ||
457 | |||
432 | #ifdef CONFIG_PROC_FS | 458 | #ifdef CONFIG_PROC_FS |
433 | 459 | ||
434 | #define PTC_BASENAME "sgi_sn/ptc_statistics" | 460 | #define PTC_BASENAME "sgi_sn/ptc_statistics" |
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c index df8d5bed6119..1a8e49607f11 100644 --- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c | |||
@@ -66,7 +66,8 @@ static int sn_hwperf_enum_objects(int *nobj, struct sn_hwperf_object_info **ret) | |||
66 | } | 66 | } |
67 | 67 | ||
68 | sz = sn_hwperf_obj_cnt * sizeof(struct sn_hwperf_object_info); | 68 | sz = sn_hwperf_obj_cnt * sizeof(struct sn_hwperf_object_info); |
69 | if ((objbuf = (struct sn_hwperf_object_info *) vmalloc(sz)) == NULL) { | 69 | objbuf = vmalloc(sz); |
70 | if (objbuf == NULL) { | ||
70 | printk("sn_hwperf_enum_objects: vmalloc(%d) failed\n", (int)sz); | 71 | printk("sn_hwperf_enum_objects: vmalloc(%d) failed\n", (int)sz); |
71 | e = -ENOMEM; | 72 | e = -ENOMEM; |
72 | goto out; | 73 | goto out; |
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c index 42485ad50ceb..ab3eaf85fe4d 100644 --- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c +++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c | |||
@@ -145,6 +145,7 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont | |||
145 | printk(KERN_WARNING | 145 | printk(KERN_WARNING |
146 | "pcibr cannot allocate interrupt for error handler\n"); | 146 | "pcibr cannot allocate interrupt for error handler\n"); |
147 | } | 147 | } |
148 | sn_set_err_irq_affinity(SGI_PCIASIC_ERROR); | ||
148 | 149 | ||
149 | /* | 150 | /* |
150 | * Update the Bridge with the "kernel" pagesize | 151 | * Update the Bridge with the "kernel" pagesize |
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c index d798dd4d0dc4..ef048a674772 100644 --- a/arch/ia64/sn/pci/tioca_provider.c +++ b/arch/ia64/sn/pci/tioca_provider.c | |||
@@ -654,6 +654,8 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont | |||
654 | __FUNCTION__, SGI_TIOCA_ERROR, | 654 | __FUNCTION__, SGI_TIOCA_ERROR, |
655 | (int)tioca_common->ca_common.bs_persist_busnum); | 655 | (int)tioca_common->ca_common.bs_persist_busnum); |
656 | 656 | ||
657 | sn_set_err_irq_affinity(SGI_TIOCA_ERROR); | ||
658 | |||
657 | /* Setup locality information */ | 659 | /* Setup locality information */ |
658 | controller->node = tioca_kern->ca_closest_node; | 660 | controller->node = tioca_kern->ca_closest_node; |
659 | return tioca_common; | 661 | return tioca_common; |
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c index 84b72b27e27f..cee9379d44e0 100644 --- a/arch/ia64/sn/pci/tioce_provider.c +++ b/arch/ia64/sn/pci/tioce_provider.c | |||
@@ -1034,6 +1034,7 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont | |||
1034 | tioce_common->ce_pcibus.bs_persist_segment, | 1034 | tioce_common->ce_pcibus.bs_persist_segment, |
1035 | tioce_common->ce_pcibus.bs_persist_busnum); | 1035 | tioce_common->ce_pcibus.bs_persist_busnum); |
1036 | 1036 | ||
1037 | sn_set_err_irq_affinity(SGI_PCIASIC_ERROR); | ||
1037 | return tioce_common; | 1038 | return tioce_common; |
1038 | } | 1039 | } |
1039 | 1040 | ||