Commit f348daf3 authored by Peter Lieven's avatar Peter Lieven Committed by Peter Maydell
Browse files

tests: fix cdrom_pio_impl in ide-test 



The check for the cleared BSY flag has to be performed
before each data transfer and not just before the
first one.

Commit 5f81724d revealed this glitch as the BSY flag
was not set in ATAPI PIO transfers before.

While at it fix the descriptions and add a comment before
the nested for loop that transfers the data.

Signed-off-by: default avatarPeter Lieven <pl@kamp.de>
Message-id: 1448029742-19771-1-git-send-email-pl@kamp.de
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 28c3e6ee

tests/ide-test.c

+8 −8
Original line number Diff line number Diff line
@@ -699,24 +699,19 @@ static void cdrom_pio_impl(int nblocks) 
    outb(IDE_BASE + reg_lba_middle, BYTE_COUNT_LIMIT & 0xFF);

    outb(IDE_BASE + reg_lba_high, (BYTE_COUNT_LIMIT >> 8 & 0xFF));

    outb(IDE_BASE + reg_command, CMD_PACKET);

    /* HPD0: Check_Status_A State */

    /* HP0: Check_Status_A State */

    nsleep(400);

    data = ide_wait_clear(BSY);

    /* HPD1: Send_Packet State */

    /* HP1: Send_Packet State */

    assert_bit_set(data, DRQ | DRDY);

    assert_bit_clear(data, ERR | DF | BSY);



    /* SCSI CDB (READ10) -- read n*2048 bytes from block 0 */

    send_scsi_cdb_read10(0, nblocks);



    /* HPD3: INTRQ_Wait */

    /* HP3: INTRQ_Wait */

    ide_wait_intr(IDE_PRIMARY_IRQ);



    /* HPD2: Check_Status_B */

    data = ide_wait_clear(BSY);

    assert_bit_set(data, DRQ | DRDY);

    assert_bit_clear(data, ERR | DF | BSY);



    /* Read data back: occurs in bursts of 'BYTE_COUNT_LIMIT' bytes.

     * If BYTE_COUNT_LIMIT is odd, we transfer BYTE_COUNT_LIMIT - 1 bytes.

     * We allow an odd limit only when the remaining transfer size is
@@ -728,6 +723,11 @@ static void cdrom_pio_impl(int nblocks) 
    for (i = 0; i < DIV_ROUND_UP(rxsize, limit); i++) {

        size_t offset = i * (limit / 2);

        size_t rem = (rxsize / 2) - offset;

        /* HP2: Check_Status_B */

        data = ide_wait_clear(BSY);

        assert_bit_set(data, DRQ | DRDY);

        assert_bit_clear(data, ERR | DF | BSY);

        /* HP4: Transfer_Data */

        for (j = 0; j < MIN((limit / 2), rem); j++) {

            rx[offset + j] = le16_to_cpu(inw(IDE_BASE + reg_data));

        }