motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-01 06:21:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

s390-ccw: refactor eckd_block_num to use CHS

Browse source 
Add new cylinder/head/sector struct. Use it to calculate
eckd block numbers instead of a BootMapPointer (which used
eckd chs anyway).

Signed-off-by: Collin L. Walling <walling@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:
Collin L. Walling 2018-02-23 10:43:08 -05:00 • committed by Thomas Huth
parent 5340eb072f
commit 80beedcc38
2 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
pc-bios/s390-ccw/bootmap.c
View file

@ -95,32 +95,32 @@ static inline void verify_boot_info(BootInfo *bip)
"Bad block size in zIPL section of the 1st record."); "Bad block size in zIPL section of the 1st record.");
} }
static block_number_t eckd_block_num(BootMapPointer *p) static block_number_t eckd_block_num(EckdCHS *chs)
{ {
const uint64_t sectors = virtio_get_sectors(); const uint64_t sectors = virtio_get_sectors();
const uint64_t heads = virtio_get_heads(); const uint64_t heads = virtio_get_heads();
const uint64_t cylinder = p->eckd.cylinder const uint64_t cylinder = chs->cylinder
+ ((p->eckd.head & 0xfff0) << 12); + ((chs->head & 0xfff0) << 12);
const uint64_t head = p->eckd.head & 0x000f; const uint64_t head = chs->head & 0x000f;
const block_number_t block = sectors * heads * cylinder const block_number_t block = sectors * heads * cylinder
+ sectors * head + sectors * head
+ p->eckd.sector + chs->sector
- 1; /* block nr starts with zero */ - 1; /* block nr starts with zero */
return block; return block;
} }
static bool eckd_valid_address(BootMapPointer *p) static bool eckd_valid_address(BootMapPointer *p)
{ {
const uint64_t head = p->eckd.head & 0x000f; const uint64_t head = p->eckd.chs.head & 0x000f;
if (head >= virtio_get_heads() if (head >= virtio_get_heads()
|| p->eckd.sector > virtio_get_sectors() || p->eckd.chs.sector > virtio_get_sectors()
|| p->eckd.sector <= 0) { || p->eckd.chs.sector <= 0) {
return false; return false;
} }
if (!virtio_guessed_disk_nature() && if (!virtio_guessed_disk_nature() &&
eckd_block_num(p) >= virtio_get_blocks()) { eckd_block_num(&p->eckd.chs) >= virtio_get_blocks()) {
return false; return false;
} }
@ -140,7 +140,7 @@ static block_number_t load_eckd_segments(block_number_t blk, uint64_t *address)
do { do {
more_data = false; more_data = false;
for (j = 0;; j++) { for (j = 0;; j++) {
block_nr = eckd_block_num((void *)&(bprs[j].xeckd)); block_nr = eckd_block_num(&bprs[j].xeckd.bptr.chs);
if (is_null_block_number(block_nr)) { /* end of chunk */ if (is_null_block_number(block_nr)) { /* end of chunk */
break; break;
} }
@ -198,7 +198,7 @@ static void run_eckd_boot_script(block_number_t bmt_block_nr)
memset(sec, FREE_SPACE_FILLER, sizeof(sec)); memset(sec, FREE_SPACE_FILLER, sizeof(sec));
read_block(bmt_block_nr, sec, "Cannot read Boot Map Table"); read_block(bmt_block_nr, sec, "Cannot read Boot Map Table");
block_nr = eckd_block_num(&bmt->entry[loadparm]); block_nr = eckd_block_num(&bmt->entry[loadparm].xeckd.bptr.chs);
IPL_assert(block_nr != -1, "Cannot find Boot Map Table Entry"); IPL_assert(block_nr != -1, "Cannot find Boot Map Table Entry");
memset(sec, FREE_SPACE_FILLER, sizeof(sec)); memset(sec, FREE_SPACE_FILLER, sizeof(sec));
@ -206,7 +206,7 @@ static void run_eckd_boot_script(block_number_t bmt_block_nr)
for (i = 0; bms->entry[i].type == BOOT_SCRIPT_LOAD; i++) { for (i = 0; bms->entry[i].type == BOOT_SCRIPT_LOAD; i++) {
address = bms->entry[i].address.load_address; address = bms->entry[i].address.load_address;
block_nr = eckd_block_num(&(bms->entry[i].blkptr)); block_nr = eckd_block_num(&bms->entry[i].blkptr.xeckd.bptr.chs);
do { do {
block_nr = load_eckd_segments(block_nr, &address); block_nr = load_eckd_segments(block_nr, &address);
@ -239,7 +239,7 @@ static void ipl_eckd_cdl(void)
"Non-ECKD device type in zIPL section of IPL2 record."); "Non-ECKD device type in zIPL section of IPL2 record.");
/* save pointer to Boot Map Table */ /* save pointer to Boot Map Table */
bmt_block_nr = eckd_block_num(&mbr->blockptr); bmt_block_nr = eckd_block_num(&mbr->blockptr.xeckd.bptr.chs);
memset(sec, FREE_SPACE_FILLER, sizeof(sec)); memset(sec, FREE_SPACE_FILLER, sizeof(sec));
read_block(2, vlbl, "Cannot read Volume Label at block 2"); read_block(2, vlbl, "Cannot read Volume Label at block 2");
@ -300,7 +300,7 @@ static void ipl_eckd_ldl(ECKD_IPL_mode_t mode)
verify_boot_info(bip); verify_boot_info(bip);
/* save pointer to Boot Map Table */ /* save pointer to Boot Map Table */
bmt_block_nr = eckd_block_num((void *)&bip->bp.ipl.bm_ptr.eckd.bptr); bmt_block_nr = eckd_block_num(&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 */

8
pc-bios/s390-ccw/bootmap.h
View file

@ -32,10 +32,14 @@ typedef struct FbaBlockPtr {
uint16_t blockct; uint16_t blockct;
} __attribute__ ((packed)) FbaBlockPtr; } __attribute__ ((packed)) FbaBlockPtr;
typedef struct EckdBlockPtr { typedef struct EckdCHS {
uint16_t cylinder; /* cylinder/head/sector is an address of the block */ uint16_t cylinder;
uint16_t head; uint16_t head;
uint8_t sector; uint8_t sector;
} __attribute__ ((packed)) EckdCHS;
typedef struct EckdBlockPtr {
EckdCHS chs; /* cylinder/head/sector is an address of the block */
uint16_t size; uint16_t size;
uint8_t count; /* (size_in_blocks-1); uint8_t count; /* (size_in_blocks-1);
* it's 0 for TablePtr, ScriptPtr, and SectionPtr */ * it's 0 for TablePtr, ScriptPtr, and SectionPtr */