s390-ccw: refactor IPL structs
ECKD DASDs have different IPL structures for CDL and LDL formats. The current Ipl1 and Ipl2 structs follow the CDL format, so we prepend "EckdCdl" to them. Boot info for LDL has been moved to a new struct: EckdLdlIpl1. Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com> Acked-by: Janosch Frank <frankja@linux.vnet.ibm.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
80beedcc38
commit
ac4c5958b1
|
@ -221,7 +221,7 @@ static void run_eckd_boot_script(block_number_t bmt_block_nr)
|
||||||
static void ipl_eckd_cdl(void)
|
static void ipl_eckd_cdl(void)
|
||||||
{
|
{
|
||||||
XEckdMbr *mbr;
|
XEckdMbr *mbr;
|
||||||
Ipl2 *ipl2 = (void *)sec;
|
EckdCdlIpl2 *ipl2 = (void *)sec;
|
||||||
IplVolumeLabel *vlbl = (void *)sec;
|
IplVolumeLabel *vlbl = (void *)sec;
|
||||||
block_number_t bmt_block_nr;
|
block_number_t bmt_block_nr;
|
||||||
|
|
||||||
|
@ -231,7 +231,7 @@ static void ipl_eckd_cdl(void)
|
||||||
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
|
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
|
||||||
read_block(1, ipl2, "Cannot read IPL2 record at block 1");
|
read_block(1, ipl2, "Cannot read IPL2 record at block 1");
|
||||||
|
|
||||||
mbr = &ipl2->u.x.mbr;
|
mbr = &ipl2->mbr;
|
||||||
IPL_assert(magic_match(mbr, ZIPL_MAGIC), "No zIPL section in IPL2 record.");
|
IPL_assert(magic_match(mbr, ZIPL_MAGIC), "No zIPL section in IPL2 record.");
|
||||||
IPL_assert(block_size_ok(mbr->blockptr.xeckd.bptr.size),
|
IPL_assert(block_size_ok(mbr->blockptr.xeckd.bptr.size),
|
||||||
"Bad block size in zIPL section of IPL2 record.");
|
"Bad block size in zIPL section of IPL2 record.");
|
||||||
|
@ -281,7 +281,7 @@ static void print_eckd_ldl_msg(ECKD_IPL_mode_t mode)
|
||||||
static void ipl_eckd_ldl(ECKD_IPL_mode_t mode)
|
static void ipl_eckd_ldl(ECKD_IPL_mode_t mode)
|
||||||
{
|
{
|
||||||
block_number_t bmt_block_nr;
|
block_number_t bmt_block_nr;
|
||||||
BootInfo *bip = (void *)(sec + 0x70); /* BootInfo is MBR for LDL */
|
EckdLdlIpl1 *ipl1 = (void *)sec;
|
||||||
|
|
||||||
if (mode != ECKD_LDL_UNLABELED) {
|
if (mode != ECKD_LDL_UNLABELED) {
|
||||||
print_eckd_ldl_msg(mode);
|
print_eckd_ldl_msg(mode);
|
||||||
|
@ -292,15 +292,15 @@ static void ipl_eckd_ldl(ECKD_IPL_mode_t mode)
|
||||||
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
|
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
|
||||||
read_block(0, sec, "Cannot read block 0 to grab boot info.");
|
read_block(0, sec, "Cannot read block 0 to grab boot info.");
|
||||||
if (mode == ECKD_LDL_UNLABELED) {
|
if (mode == ECKD_LDL_UNLABELED) {
|
||||||
if (!magic_match(bip->magic, ZIPL_MAGIC)) {
|
if (!magic_match(ipl1->bip.magic, ZIPL_MAGIC)) {
|
||||||
return; /* not applicable layout */
|
return; /* not applicable layout */
|
||||||
}
|
}
|
||||||
sclp_print("unlabeled LDL.\n");
|
sclp_print("unlabeled LDL.\n");
|
||||||
}
|
}
|
||||||
verify_boot_info(bip);
|
verify_boot_info(&ipl1->bip);
|
||||||
|
|
||||||
/* save pointer to Boot Map Table */
|
/* save pointer to Boot Map Table */
|
||||||
bmt_block_nr = eckd_block_num(&bip->bp.ipl.bm_ptr.eckd.bptr.chs);
|
bmt_block_nr = eckd_block_num(&ipl1->bip.bp.ipl.bm_ptr.eckd.bptr.chs);
|
||||||
|
|
||||||
run_eckd_boot_script(bmt_block_nr);
|
run_eckd_boot_script(bmt_block_nr);
|
||||||
/* no return */
|
/* no return */
|
||||||
|
|
|
@ -239,22 +239,27 @@ typedef struct BootInfo { /* @ 0x70, record #0 */
|
||||||
} bp;
|
} bp;
|
||||||
} __attribute__ ((packed)) BootInfo; /* see also XEckdMbr */
|
} __attribute__ ((packed)) BootInfo; /* see also XEckdMbr */
|
||||||
|
|
||||||
typedef struct Ipl1 {
|
/*
|
||||||
unsigned char key[4]; /* == "IPL1" */
|
* Structs for IPL
|
||||||
unsigned char data[24];
|
*/
|
||||||
} __attribute__((packed)) Ipl1;
|
#define STAGE2_BLK_CNT_MAX 24 /* Stage 1b can load up to 24 blocks */
|
||||||
|
|
||||||
typedef struct Ipl2 {
|
typedef struct EckdCdlIpl1 {
|
||||||
unsigned char key[4]; /* == "IPL2" */
|
uint8_t key[4]; /* == "IPL1" */
|
||||||
union {
|
uint8_t data[24];
|
||||||
unsigned char data[144];
|
} __attribute__((packed)) EckdCdlIpl1;
|
||||||
struct {
|
|
||||||
unsigned char reserved1[92-4];
|
typedef struct EckdCdlIpl2 {
|
||||||
|
uint8_t key[4]; /* == "IPL2" */
|
||||||
|
uint8_t reserved0[88];
|
||||||
XEckdMbr mbr;
|
XEckdMbr mbr;
|
||||||
unsigned char reserved2[144-(92-4)-sizeof(XEckdMbr)];
|
uint8_t reserved[24];
|
||||||
} x;
|
} __attribute__((packed)) EckdCdlIpl2;
|
||||||
} u;
|
|
||||||
} __attribute__((packed)) Ipl2;
|
typedef struct EckdLdlIpl1 {
|
||||||
|
uint8_t reserved[112];
|
||||||
|
BootInfo bip; /* BootInfo is MBR for LDL */
|
||||||
|
} __attribute__((packed)) EckdLdlIpl1;
|
||||||
|
|
||||||
typedef struct IplVolumeLabel {
|
typedef struct IplVolumeLabel {
|
||||||
unsigned char key[4]; /* == "VOL1" */
|
unsigned char key[4]; /* == "VOL1" */
|
||||||
|
|
Loading…
Reference in New Issue