OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pc-bios/s390-ccw: add boot entry selection for ECKD DASD

Browse Source 
1. change a bit definition of ScsiMbr to allow an array of pointers
2. add loadparm fetch to boot script processing
3. apply loadparm index to boot entry selection, if any

Initial patch from Eugene (jno) Dvurechenski.

Signed-off-by: Eugene (jno) Dvurechenski <jno@linux.vnet.ibm.com>
Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
Farhan Ali 2016-04-18 13:45:32 +02:00 committed by Cornelia Huck
parent 9dd7823b70
commit 82ca394194
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pc-bios/s390-ccw/bootmap.c
View File

@ -183,15 +183,21 @@ static block_number_t load_eckd_segments(block_number_t blk, uint64_t *address)
static void run_eckd_boot_script(block_number_t mbr_block_nr) static void run_eckd_boot_script(block_number_t mbr_block_nr)
{ {
int i; int i;
unsigned int loadparm = get_loadparm_index();
block_number_t block_nr; block_number_t block_nr;
uint64_t address; uint64_t address;
ScsiMbr *scsi_mbr = (void *)sec; ScsiMbr *bte = (void *)sec; /* Eckd bootmap table entry */
BootMapScript *bms = (void *)sec; BootMapScript *bms = (void *)sec;
debug_print_int("loadparm", loadparm);
IPL_assert(loadparm < 31, "loadparm value greater than"
" maximum number of boot entries allowed");
memset(sec, FREE_SPACE_FILLER, sizeof(sec)); memset(sec, FREE_SPACE_FILLER, sizeof(sec));
read_block(mbr_block_nr, sec, "Cannot read MBR"); read_block(mbr_block_nr, sec, "Cannot read MBR");
block_nr = eckd_block_num((void *)&(scsi_mbr->blockptr)); block_nr = eckd_block_num((void *)&(bte->blockptr[loadparm]));
IPL_assert(block_nr != -1, "No Boot Map");
memset(sec, FREE_SPACE_FILLER, sizeof(sec)); memset(sec, FREE_SPACE_FILLER, sizeof(sec));
read_block(block_nr, sec, "Cannot read Boot Map Script"); read_block(block_nr, sec, "Cannot read Boot Map Script");
@ -459,11 +465,11 @@ static void ipl_scsi(void)
debug_print_int("MBR Version", mbr->version_id); debug_print_int("MBR Version", mbr->version_id);
IPL_check(mbr->version_id == 1, IPL_check(mbr->version_id == 1,
"Unknown MBR layout version, assuming version 1"); "Unknown MBR layout version, assuming version 1");
debug_print_int("program table", mbr->blockptr.blockno); debug_print_int("program table", mbr->blockptr[0].blockno);
IPL_assert(mbr->blockptr.blockno, "No Program Table"); IPL_assert(mbr->blockptr[0].blockno, "No Program Table");
/* Parse the program table */ /* Parse the program table */
read_block(mbr->blockptr.blockno, sec, read_block(mbr->blockptr[0].blockno, sec,
"Error reading Program Table"); "Error reading Program Table");
IPL_assert(magic_match(sec, ZIPL_MAGIC), "No zIPL magic in PT"); IPL_assert(magic_match(sec, ZIPL_MAGIC), "No zIPL magic in PT");

2
pc-bios/s390-ccw/bootmap.h
View File

@ -70,7 +70,7 @@ typedef struct ScsiMbr {
uint8_t magic[4]; uint8_t magic[4];
uint32_t version_id; uint32_t version_id;
uint8_t reserved[8]; uint8_t reserved[8];
ScsiBlockPtr blockptr; ScsiBlockPtr blockptr[];
} __attribute__ ((packed)) ScsiMbr; } __attribute__ ((packed)) ScsiMbr;
#define ZIPL_MAGIC "zIPL" #define ZIPL_MAGIC "zIPL"