vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

sparc64: Close cdboot ihandle

Browse source 
The ihandle is left open with a cd-core image.  This will cause a delay
booting grub from a virtual cdrom in a LDOM.  It will also cause problems
as Linux boots, since it expects the ihandle to be closed during init.

Orabug: 25911275

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Eric Snowberg 2017-05-11 18:42:23 -07:00 committed by Vincent Batts
parent 6ff34a6a81
commit 53d00ac6ef
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
grub-core/boot/sparc64/ieee1275/boot.S
View file

@ -69,6 +69,10 @@ prom_seek_name: .asciz "seek"
prom_read_name: .asciz "read" prom_read_name: .asciz "read"
prom_exit_name: .asciz "exit" prom_exit_name: .asciz "exit"
grub_name: .asciz "GRUB " grub_name: .asciz "GRUB "
#ifdef CDBOOT
prom_close_name: .asciz "close"
#endif
#define GRUB_NAME_LEN 5 #define GRUB_NAME_LEN 5
.align 4 .align 4
@ -213,6 +217,12 @@ bootpath_known:
call prom_call_3_1_o1 call prom_call_3_1_o1
#ifdef CDBOOT #ifdef CDBOOT
LDUW_ABS(kernel_size, 0x00, %o3) LDUW_ABS(kernel_size, 0x00, %o3)
GET_ABS(prom_close_name, %o0)
mov 1, %g1
mov 0, %o5
call prom_call
mov BOOTDEV_REG, %o1
#else #else
mov 512, %o3 mov 512, %o3
#endif #endif