diff options
author | Jack Steiner <steiner@sgi.com> | 2005-08-11 13:26:00 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-08-17 18:30:14 -0400 |
commit | 2fdbb590e4f9b346e5d06cf7f85dcb7a9f2e0a48 (patch) | |
tree | f02bdaba4ccf801ad31c4981a97098f376fec0f2 /arch/ia64/sn | |
parent | 0aa2c72e59cf1d09a0b321e4e6292af78a51b8b3 (diff) |
[IA64-SGI] - New SN hardware support - boot_init_shub2
Update the addresses of the pio_write_status_addr so that
they are correct for newer processors. Shub2 did not number
the threads in the order that I had expected.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn')
-rw-r--r-- | arch/ia64/sn/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index 7c7fe441d62..ed77715393e 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c | |||
@@ -532,8 +532,8 @@ void __init sn_cpu_init(void) | |||
532 | */ | 532 | */ |
533 | { | 533 | { |
534 | u64 pio1[] = {SH1_PIO_WRITE_STATUS_0, 0, SH1_PIO_WRITE_STATUS_1, 0}; | 534 | u64 pio1[] = {SH1_PIO_WRITE_STATUS_0, 0, SH1_PIO_WRITE_STATUS_1, 0}; |
535 | u64 pio2[] = {SH2_PIO_WRITE_STATUS_0, SH2_PIO_WRITE_STATUS_1, | 535 | u64 pio2[] = {SH2_PIO_WRITE_STATUS_0, SH2_PIO_WRITE_STATUS_2, |
536 | SH2_PIO_WRITE_STATUS_2, SH2_PIO_WRITE_STATUS_3}; | 536 | SH2_PIO_WRITE_STATUS_1, SH2_PIO_WRITE_STATUS_3}; |
537 | u64 *pio; | 537 | u64 *pio; |
538 | pio = is_shub1() ? pio1 : pio2; | 538 | pio = is_shub1() ? pio1 : pio2; |
539 | pda->pio_write_status_addr = (volatile unsigned long *) LOCAL_MMR_ADDR(pio[slice]); | 539 | pda->pio_write_status_addr = (volatile unsigned long *) LOCAL_MMR_ADDR(pio[slice]); |