From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYi0A-000066-Lr for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:47:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYi07-0000VQ-Hg for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:47:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYi07-0000VG-9w for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:47:51 -0500 From: Kevin Wolf Date: Wed, 14 Nov 2012 19:47:14 +0100 Message-Id: <1352918847-3696-14-git-send-email-kwolf@redhat.com> In-Reply-To: <1352918847-3696-1-git-send-email-kwolf@redhat.com> References: <1352918847-3696-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 13/26] fdc-test: add tests for non-DMA READ command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Herv=C3=A9 Poussineau Signed-off-by: Herv=C3=A9 Poussineau Signed-off-by: Kevin Wolf --- tests/fdc-test.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++= ++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/tests/fdc-test.c b/tests/fdc-test.c index 67bfb22..4649e3f 100644 --- a/tests/fdc-test.c +++ b/tests/fdc-test.c @@ -55,6 +55,8 @@ enum { }; =20 enum { + BUSY =3D 0x10, + NONDMA =3D 0x20, RQM =3D 0x80, DIO =3D 0x40, =20 @@ -166,6 +168,69 @@ static uint8_t send_read_command(void) return ret; } =20 +static uint8_t send_read_no_dma_command(int nb_sect, uint8_t expected_st= 0) +{ + uint8_t drive =3D 0; + uint8_t head =3D 0; + uint8_t cyl =3D 0; + uint8_t sect_addr =3D 1; + uint8_t sect_size =3D 2; + uint8_t eot =3D nb_sect; + uint8_t gap =3D 0x1b; + uint8_t gpl =3D 0xff; + + uint8_t msr =3D 0; + uint8_t st0; + + uint8_t ret =3D 0; + + floppy_send(CMD_READ); + floppy_send(head << 2 | drive); + g_assert(!get_irq(FLOPPY_IRQ)); + floppy_send(cyl); + floppy_send(head); + floppy_send(sect_addr); + floppy_send(sect_size); + floppy_send(eot); + floppy_send(gap); + floppy_send(gpl); + + uint16_t i =3D 0; + uint8_t n =3D 2; + for (; i < n; i++) { + msr =3D inb(FLOPPY_BASE + reg_msr); + if (msr =3D=3D (BUSY | NONDMA | DIO | RQM)) { + break; + } + sleep(1); + } + + if (i >=3D n) { + return 1; + } + + /* Non-DMA mode */ + for (i =3D 0; i < 512 * 2 * nb_sect; i++) { + msr =3D inb(FLOPPY_BASE + reg_msr); + assert_bit_set(msr, BUSY | RQM | DIO); + inb(FLOPPY_BASE + reg_fifo); + } + + st0 =3D floppy_recv(); + if (st0 !=3D expected_st0) { + ret =3D 1; + } + + floppy_recv(); + floppy_recv(); + floppy_recv(); + floppy_recv(); + floppy_recv(); + floppy_recv(); + + return ret; +} + static void send_seek(int cyl) { int drive =3D 0; @@ -327,6 +392,36 @@ static void test_relative_seek(void) g_assert(pcn =3D=3D 0); } =20 +static void test_read_no_dma_1(void) +{ + uint8_t ret; + + outb(FLOPPY_BASE + reg_dor, inb(FLOPPY_BASE + reg_dor) & ~0x08); + send_seek(0); + ret =3D send_read_no_dma_command(1, 0x24); /* FIXME: should be 0x04 = */ + g_assert(ret =3D=3D 0); +} + +static void test_read_no_dma_18(void) +{ + uint8_t ret; + + outb(FLOPPY_BASE + reg_dor, inb(FLOPPY_BASE + reg_dor) & ~0x08); + send_seek(0); + ret =3D send_read_no_dma_command(18, 0x24); /* FIXME: should be 0x04= */ + g_assert(ret =3D=3D 0); +} + +static void test_read_no_dma_19(void) +{ + uint8_t ret; + + outb(FLOPPY_BASE + reg_dor, inb(FLOPPY_BASE + reg_dor) & ~0x08); + send_seek(0); + ret =3D send_read_no_dma_command(19, 0x20); + g_assert(ret =3D=3D 0); +} + /* success if no crash or abort */ static void fuzz_registers(void) { @@ -377,6 +472,9 @@ int main(int argc, char **argv) qtest_add_func("/fdc/sense_interrupt", test_sense_interrupt); qtest_add_func("/fdc/relative_seek", test_relative_seek); qtest_add_func("/fdc/media_insert", test_media_insert); + qtest_add_func("/fdc/read_no_dma_1", test_read_no_dma_1); + qtest_add_func("/fdc/read_no_dma_18", test_read_no_dma_18); + qtest_add_func("/fdc/read_no_dma_19", test_read_no_dma_19); qtest_add_func("/fdc/fuzz-registers", fuzz_registers); =20 ret =3D g_test_run(); --=20 1.7.6.5