Skip to content

Commit

Permalink
[IA64] hpsim, fix SAL handling in fw-emu
Browse files Browse the repository at this point in the history
The switch-cases of SAL_FREQ_BASE generate non-relocatable code. The
same as for the ifs one level upper. This causes oopses early in boot
because the kernel jumps to the hell instead of the offset in sal
callback.

So use ifs here for SAL_FREQ_BASE decision too.

Isn't there any compiler directive or settings to solve that cleanly?

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
Jiri Slaby authored and Tony Luck committed Feb 24, 2012
1 parent 48e30fa commit 82af3a4
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions arch/ia64/hp/sim/boot/fw-emu.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,28 +160,19 @@ sal_emulator (long index, unsigned long in1, unsigned long in2,
*/
status = 0;
if (index == SAL_FREQ_BASE) {
switch (in1) {
case SAL_FREQ_BASE_PLATFORM:
if (in1 == SAL_FREQ_BASE_PLATFORM)
r9 = 200000000;
break;

case SAL_FREQ_BASE_INTERVAL_TIMER:
else if (in1 == SAL_FREQ_BASE_INTERVAL_TIMER) {
/*
* Is this supposed to be the cr.itc frequency
* or something platform specific? The SAL
* doc ain't exactly clear on this...
*/
r9 = 700000000;
break;

case SAL_FREQ_BASE_REALTIME_CLOCK:
} else if (in1 == SAL_FREQ_BASE_REALTIME_CLOCK)
r9 = 1;
break;

default:
else
status = -1;
break;
}
} else if (index == SAL_SET_VECTORS) {
;
} else if (index == SAL_GET_STATE_INFO) {
Expand Down

0 comments on commit 82af3a4

Please sign in to comment.