Virtualization/openbios
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/openbios.git synced 2024-02-13 08:34:06 +08:00
Code Issues Projects Releases Wiki Activity

From Paul Brook <paul@codesourcery.com>

Browse Source 
The current esp code will perform partial reads on devices with sector sizes 
> 512. The attached patch makes it read the whole sector from the device, and
uses the additional if multiple blocks are requested.

I'm not sure if the old behavior is technically wrong, but it confused me when
debugging the qemu device emulation :-)

Paul



git-svn-id: svn://coreboot.org/openbios/openbios-devel@87 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Stefan Reinauer
2006-10-10 17:43:11 +00:00
parent d98f56098d
commit 9be00e6061
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/esp.c
View File

@@ -149,13 +149,12 @@ do_command(esp_private_t *esp, sd_private_t *sd, int cmdlen, int replylen)
return 0; // OK return 0; // OK
} }
// offset is multiple of 512, len in bytes // offset is in sectors
static int static int
ob_sd_read_sectors(esp_private_t *esp, sd_private_t *sd, int offset, void *dest, ob_sd_read_sector(esp_private_t *esp, sd_private_t *sd, int offset)
short len, short sect_offset)
{ {
DPRINTF("ob_sd_read_sectors id %d %lx sector=%d len=%d soff %d\n", DPRINTF("ob_sd_read_sector id %d %lx sector=%d\n",
sd->id, (unsigned long)dest, offset, len, sect_offset); sd->id, (unsigned long)dest, offset);
// Setup command = Read(10) // Setup command = Read(10)
memset(esp->buffer, 0, 10); memset(esp->buffer, 0, 10);
@@ -167,14 +166,12 @@ ob_sd_read_sectors(esp_private_t *esp, sd_private_t *sd, int offset, void *dest,
esp->buffer[5] = (offset >> 8) & 0xff; esp->buffer[5] = (offset >> 8) & 0xff;
esp->buffer[6] = offset & 0xff; esp->buffer[6] = offset & 0xff;
esp->buffer[8] = (len >> 8) & 0xff; esp->buffer[8] = 0;
esp->buffer[9] = len & 0xff; esp->buffer[9] = 1;
if (do_command(esp, sd, 10, len * 512 + sect_offset)) if (do_command(esp, sd, 10, sd->bs))
return 0; return 0;
memcpy(dest, esp->buffer + sect_offset, len * 512);
return 0; return 0;
} }
@@ -249,13 +246,17 @@ ob_sd_read_blocks(sd_private_t **sd)
sect_offset = blk / spb; sect_offset = blk / spb;
pos = (blk - sect_offset * spb) * 512; pos = (blk - sect_offset * spb) * 512;
if (ob_sd_read_sectors(global_esp, *sd, sect_offset, dest, 1, pos)) { if (ob_sd_read_sector(global_esp, *sd, sect_offset)) {
DPRINTF("ob_sd_read_blocks: error\n"); DPRINTF("ob_sd_read_blocks: error\n");
RET(0); RET(0);
} }
dest += 512; while (n && pos < spb * 512) {
n--; memcpy(dest, global_esp->buffer + pos, 512);
blk++; pos += 512;
dest += 512;
n--;
blk++;
}
} }
PUSH(cnt); PUSH(cnt);
} }