January 2024 - SeaBIOS - mail.coreboot.org

[RFC v3 0/1] Add LBA 64bit support.
by Max Tottenham Jan. 26, 2024

Jan. 26, 2024

Changes since V2: * Print READ CAPACITY(16) debug call at higher log level * Cleanup return statement for CMD_WRITE in src/hw/blockcmd.c:scsi_fill_cmd() * Change format specifier for printing drive->sectors to %llx * Minor commit log spelling/punctuation fixes Changes since V1: * De-duplicate blksize check and capacity logging * Fix off by 1 error for returned sector count (LBA addresses start from 0). Max Tottenham (1): Add LBA 64bit support for reads beyond 2TB. src/hw/blockcmd.c | 58 +++++++++++++++++++++++++++++++++++------------ src/hw/blockcmd.h | 27 ++++++++++++++++++++++ 2 files changed, 71 insertions(+), 14 deletions(-) -- 2.34.1

2 2

[RFC v2 0/1] Add LBA 64bit support.
by Max Tottenham Jan. 25, 2024

Jan. 25, 2024

Changes since V1: * De-duplicate blksize check and capacity logging * Fix off by 1 error for returned sector count (LBA addresses start from 0). Max Tottenham (1): Add LBA 64bit support for reads beyond 2TB. src/hw/blockcmd.c | 61 +++++++++++++++++++++++++++++++++++------------ src/hw/blockcmd.h | 27 +++++++++++++++++++++ 2 files changed, 73 insertions(+), 15 deletions(-) -- 2.34.1

3 9

[RFC] Add LBA 64bit support for reads beyond 2TB.
by Max Tottenham Jan. 25, 2024

Jan. 25, 2024

When booting from a >2TB drive/filesystem, it's possible what the kernel/bootloader may be updated and written out at an LBA address beyond what is normally accessible by the READ(10) SCSI commands. If this happens to the kernel grub will fail to boot the kernel as it will call into the BIOS with an LBA address >2TB, and the BIOS will return an error. Per the SCSI spec, >2TB drives should return 0XFFFFFFFF, and a READ CAPACITY(16) command should be issues to determine the full size of the drive, READ(16) commands can then be used in order to read data at LBA addresses beyond 2TB (64 bit LBA addresses). --- src/hw/blockcmd.c | 75 +++++++++++++++++++++++++++++++++++------------ src/hw/blockcmd.h | 27 +++++++++++++++++ 2 files changed, 84 insertions(+), 18 deletions(-) diff --git a/src/hw/blockcmd.c b/src/hw/blockcmd.c index 6b6fea97..4f5dc2d7 100644 --- a/src/hw/blockcmd.c +++ b/src/hw/blockcmd.c @@ -66,6 +66,23 @@ cdb_test_unit_ready(struct disk_op_s *op) return process_op(op); } +static int +cdb_read_capacity16(struct disk_op_s *op, struct cdbres_read_capacity_16 *data) +{ + struct cdb_sai_read_capacity_16 cmd; + memset(&cmd, 0, sizeof(cmd)); + cmd.command = CDB_CMD_SERVICE_ACTION_IN; + cmd.flags = CDB_CMD_SAI_READ_CAPACITY_16; + cmd.len = cpu_to_be32(sizeof(struct cdbres_read_capacity_16)); + op->command = CMD_SCSI; + op->count = 1; + op->buf_fl = data; + op->cdbcmd = &cmd; + op->blocksize = sizeof(*data); + return process_op(op); +} + + // Request capacity static int cdb_read_capacity(struct disk_op_s *op, struct cdbres_read_capacity *data) @@ -111,13 +128,23 @@ scsi_fill_cmd(struct disk_op_s *op, void *cdbcmd, int maxcdb) switch (op->command) { case CMD_READ: case CMD_WRITE: ; - struct cdb_rwdata_10 *cmd = cdbcmd; - memset(cmd, 0, maxcdb); - cmd->command = (op->command == CMD_READ ? CDB_CMD_READ_10 - : CDB_CMD_WRITE_10); - cmd->lba = cpu_to_be32(op->lba); - cmd->count = cpu_to_be16(op->count); - return GET_FLATPTR(op->drive_fl->blksize); + if (op->lba < 0xFFFFFFFFULL) { + struct cdb_rwdata_10 *cmd = cdbcmd; + memset(cmd, 0, maxcdb); + cmd->command = (op->command == CMD_READ ? CDB_CMD_READ_10 + : CDB_CMD_WRITE_10); + cmd->lba = cpu_to_be32(op->lba); + cmd->count = cpu_to_be16(op->count); + return GET_FLATPTR(op->drive_fl->blksize); + } else { + struct cdb_rwdata_16 *cmd = cdbcmd; + memset(cmd, 0, maxcdb); + cmd->command = (op->command == CMD_READ ? CDB_CMD_READ_16 + : CDB_CMD_WRITE_16); + cmd->lba = cpu_to_be64(op->lba); + cmd->count = cpu_to_be32(op->count); + return GET_FLATPTR(op->drive_fl->blksize); + } case CMD_SCSI: if (MODESEGMENT) return -1; @@ -331,18 +358,30 @@ scsi_drive_setup(struct drive_s *drive, const char *s, int prio) if (ret) return ret; - // READ CAPACITY returns the address of the last block. - // We do not bother with READ CAPACITY(16) because BIOS does not support - // 64-bit LBA anyway. - drive->blksize = be32_to_cpu(capdata.blksize); - if (drive->blksize != DISK_SECTOR_SIZE) { - dprintf(1, "%s: unsupported block size %d\n", s, drive->blksize); - return -1; - } - drive->sectors = (u64)be32_to_cpu(capdata.sectors) + 1; - dprintf(1, "%s blksize=%d sectors=%u\n" - , s, drive->blksize, (unsigned)drive->sectors); + if (be32_to_cpu(capdata.sectors) == 0xFFFFFFFFUL) { + dprintf(1, "%s: >2TB Detected trying READCAP(16)\n", s); + struct cdbres_read_capacity_16 capdata16; + ret = cdb_read_capacity16(&dop, &capdata16); + + drive->blksize = be32_to_cpu(capdata16.blksize); + if (drive->blksize != DISK_SECTOR_SIZE) { + dprintf(1, "%s: unsupported block size %d\n", s, drive->blksize); + return -1; + } + drive->sectors = be64_to_cpu(capdata16.sectors); + dprintf(1, "READCAP(16) %s blksize=%d sectors=%llX\n" + , s, drive->blksize, drive->sectors); + } else { + drive->blksize = be32_to_cpu(capdata.blksize); + if (drive->blksize != DISK_SECTOR_SIZE) { + dprintf(1, "%s: unsupported block size %d\n", s, drive->blksize); + return -1; + } + drive->sectors = (u64)be32_to_cpu(capdata.sectors) + 1; + dprintf(1, "%s blksize=%d sectors=%u\n" + , s, drive->blksize, (unsigned)drive->sectors); + } // We do not recover from USB stalls, so try to be safe and avoid // sending the command if the (obsolete, but still provided by QEMU) // fixed disk geometry page may not be supported. diff --git a/src/hw/blockcmd.h b/src/hw/blockcmd.h index f18543ed..2683186c 100644 --- a/src/hw/blockcmd.h +++ b/src/hw/blockcmd.h @@ -18,6 +18,16 @@ struct cdb_rwdata_10 { u8 pad[6]; } PACKED; +#define CDB_CMD_READ_16 0x88 +#define CDB_CMD_WRITE_16 0x8A +struct cdb_rwdata_16 { + u8 command; + u8 flags; + u64 lba; + u32 count; + u16 reserved_14; +} PACKED; + #define CDB_CMD_READ_CAPACITY 0x25 struct cdb_read_capacity { @@ -32,6 +42,23 @@ struct cdbres_read_capacity { u32 blksize; } PACKED; + +#define CDB_CMD_SERVICE_ACTION_IN 0x9E +#define CDB_CMD_SAI_READ_CAPACITY_16 0x10 +struct cdb_sai_read_capacity_16 { + u8 command; + u8 flags; + u64 lba; //marked as obsolete? + u32 len; + u16 reserved_14; +} PACKED; + +struct cdbres_read_capacity_16 { + u64 sectors; + u32 blksize; + u8 reserved_12[20]; +} PACKED; + #define CDB_CMD_TEST_UNIT_READY 0x00 #define CDB_CMD_INQUIRY 0x12 #define CDB_CMD_REQUEST_SENSE 0x03 -- 2.34.1

2 1

[PATCH] Add AHCI Power ON + ICC_ACTIVE into port setup code
by Andrej Kruták Jan. 25, 2024

Jan. 25, 2024

Windows appears to put the AHCI port into 'Partial power management state' during reboot, the command puts it back into 'active state'. AHCI/1: link down 0x00000231 (SCR STAT register) -> AHCI/1: link up 0x00000133 Signed-off-by: Andrej Krutak andrej.krutak(a)sysgo.com --- src/hw/ahci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hw/ahci.c b/src/hw/ahci.c index 3fa845aa..4f0f640a 100644 --- a/src/hw/ahci.c +++ b/src/hw/ahci.c @@ -444,7 +444,8 @@ static int ahci_port_setup(struct ahci_port_s *port) ahci_port_writel(ctrl, pnr, PORT_CMD, cmd); /* spin up */ - cmd |= PORT_CMD_SPIN_UP; + cmd &= ~PORT_CMD_ICC_MASK; + cmd |= PORT_CMD_SPIN_UP | PORT_CMD_POWER_ON | PORT_CMD_ICC_ACTIVE; ahci_port_writel(ctrl, pnr, PORT_CMD, cmd); u32 end = timer_calc(AHCI_LINK_TIMEOUT); for (;;) { -- 2.34.1

2 1

[PATCH] esp-scsi: terminate DMA transfer when ESP data transfer completes
by Mark Cave-Ayland Jan. 25, 2024

Jan. 25, 2024

When the ESP data transfer completes indicated by the STAT_TC flag being set, terminate the DMA transfer by issuing a DMA IDLE command. Otherwise in the case where the guest sends a reset followed by an ESP command, the DMA signal remains enabled and so the next SeaBIOS DMA transfer begins immediately when the next ESP command is received rather than waiting until the data is ready and the DMA command is issued. With this fix it is possible to boot a Windows XP ISO to the installer and complete a full installation within QEMU directly using SeaBIOS. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- src/hw/esp-scsi.c | 2 ++ 1 file changed, 2 insertions(+) [This fixes the Windows XP setup issue reported by Paolo when DC390 support was first added to QEMU (see https://lore.kernel.org/all/501A94D0.3080502@redhat.com/ for the original thread) way back in 2012.] diff --git a/src/hw/esp-scsi.c b/src/hw/esp-scsi.c index f19804f..8612069 100644 --- a/src/hw/esp-scsi.c +++ b/src/hw/esp-scsi.c @@ -147,6 +147,8 @@ esp_scsi_process_op(struct disk_op_s *op) /* At end of DMA TC is set again -> complete command. */ if (state == 1 && (stat & ESP_STAT_TC)) { state++; + /* Terminate esp_scsi_dma() command */ + outb(0, iobase + ESP_DMA_CMD); continue; } -- 2.39.2

2 1

Re: [PATCH 0/8] SeaVGABios/cbvga: Assume VGA compatible GPU in, text-mode
by segfault_bilibili Jan. 20, 2024

Jan. 20, 2024

Hi Patrick, First, apologies for my bad English grammar and email composing skills. I tried your patch [7/8] to fix bugcheck 50 bsod on my Dell Latitude E6430 which is running Libreboot. In short, your patch initially did not fix the bsod, but after an one-line change of code it successfully fixed bsod, although I still don't know the full situation. According to my observation, _rom_header_size must be set to some value greater than 0x40, like 0x41. Under vendor BIOS, igdkmd64 is observed to have a "reattempt memmap" logic only if _rom_header_size > 0x40. After this reattempt of memmap completed, the driver was loaded correctly and it won't bsod. Otherwise, if _rom_header_size <= 0x40, such logic was seemed to be skipped, and then at certain breakpoint I observed that nothing but "??" representing unreadable bytes filled up windbg's memory peek window, because the vmaddr which was supposed to point to VBT actually pointed to invalid address. `!vtop` command confirmed this as well. In vgasrc/cbvga.c, related lines: > /* Increment rom header size */ > size +=3D (GET_FARVAR(0, vbt->hdr_vbt_size) + 512 - 1) >> 9; > SET_VGA(_rom_header_size, size); I set `size` to at least 0x41, like: size +=3D (GET_FARVAR(0, vbt->hdr_vbt_size) + 512 - 1) >> 9; if (size <= 0x40) size = 0x40 + 1; // newly added line SET_VGA(_rom_header_size, size); and then the bsod is gone. Cheers, segfault

1 0