ide: Test cases and a corner case fix
cover ide: Test cases and a corner case fix
Kevin Wolf (5):
ide: Reset BMIDEA bit when the bus master is stopped libqos/pci: Enable bus mastering
qtest: Add IDE test case
qtest/ide-test: Add simple DMA read/write test case qtest/ide-test: Test short and long PRDTs
hw/ide/pci.c | 1 + tests/Makefile | 2 + tests/ide-test.c | 440 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/libqos/pci.c | 2 +- 4 files changed, 444 insertions(+), 1 deletion(-) create mode 100644 tests/ide-test.c
Signature · 1 line
1.8.1.4
PATCH 1/5 ide: Reset BMIDEA bit when the bus master is stopped
The device is supposed to reset the Bus Master IDE Active bit in the status register when 0 is written to the Start/Stop Bus Master bit in the command register.
In the common cases this happens automatically because bdrv_drain_all() flushes the requests, but with a large PRDT it could remain set.
--- hw/ide/pci.c | 1 + 1 file changed, 1 insertion(+)
hw/ide/pci.c +1 -0
@@ -312,6 +312,7 @@ void bmdma_cmd_writeb(BMDMAState *bm, uint32_t val)bdrv_drain_all ();assert (bm->bus->dma->aiocb ==NULL ); } + bm->status &= ~BM_STATUS_DMAING ; }else { bm->cur_addr = bm->addr;if (!(bm->status &BM_STATUS_DMAING )) {
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH 1/5] ide: Reset BMIDEA bit when the bus master is stopped
Quoted 11 lines · Kevin Wolf
The device is supposed to reset the Bus Master IDE Active bit in the status register when 0 is written to the Start/Stop Bus Master bit in the command register.
In the common cases this happens automatically because
bdrv_drain_all()flushes the requests, but with a large PRDT it could remain set.Signed-off-by Kevin Wolf <[email protected]>--- hw/ide/pci.c | 1 + 1 file changed, 1 insertion(+)
PATCH 2/5 libqos/pci: Enable bus mastering
In reply to Kevin Wolf--- tests/libqos/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/libqos/pci.c +1 -1
@@ -71,7 +71,7 @@ void qpci_device_enable(QPCIDevice *dev)/* FIXME -- does this need to be a bus callout? */ cmd =qpci_config_readw (dev,PCI_COMMAND ); - cmd |=PCI_COMMAND_IO |PCI_COMMAND_MEMORY ; + cmd |=PCI_COMMAND_IO |PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER ;qpci_config_writew (dev,PCI_COMMAND , cmd); }
Signature · 1 line
1.8.1.4
PATCH 3/5 qtest: Add IDE test case
In reply to Kevin WolfThis adds a simple IDE test case and starts by verifying that IDENTIFY can be successfully used and return the correct serial number, version and the WCE flag is set for cache=writeback.
--- tests/Makefile | 2 + tests/ide-test.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+) create mode 100644 tests/ide-test.c
tests/Makefile +2 -0
@@ -51,6 +51,7 @@ check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh # really in libqtest, not in the testcases themselves. check-qtest-i386-y = tests/fdc-test$(EXESUF) gcov-files-i386-y = hw/fdc.c +check-qtest-i386-y += tests/ide-test$(EXESUF) check-qtest-i386-y += tests/hd-geo-test$(EXESUF) gcov-files-i386-y += hw/hd-geometry.c check-qtest-i386-y += tests/rtc-test$(EXESUF)
@@ -127,6 +128,7 @@ libqos-omap-obj-y = $(libqos-obj-y) tests/libqos/i2c-omap.o tests/rtc-test$(EXESUF): tests/rtc-test.o tests/m48t59-test$(EXESUF): tests/m48t59-test.o tests/fdc-test$(EXESUF): tests/fdc-test.o +tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y) tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y) tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
tests/ide-test.c new file +165 -0
165 lines not on this page · raw message
Signature · 1 line
1.8.1.4
PATCH 4/5 qtest/ide-test: Add simple DMA read/write test case
In reply to Kevin WolfThis tests that single sectors can be successfully written and correctly read back.
--- tests/ide-test.c | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 221 insertions(+)
tests/ide-test.c +221 -0
@@ -29,8 +29,12 @@#include <glib.h> #include "libqtest.h" +#include "libqos/pci-pc.h" +#include "libqos/malloc-pc.h" #include "qemu-common.h" +#include "hw/pci/pci_ids.h" +#include "hw/pci/pci_regs.h" #define TEST_IMAGE_SIZE 64 * 1024 * 1024
@@ -60,12 +64,42 @@ enum { };enum { +LBA =0x40 , +}; + +enum { + bmreg_cmd =0x0 , + bmreg_status =0x2 , + bmreg_prdt =0x4 , +}; + +enum { +CMD_READ_DMA =0xc8 , +CMD_WRITE_DMA =0xca ,CMD_IDENTIFY =0xec , }; +enum { +BM_CMD_START =0x1 , +BM_CMD_WRITE =0x8 ,/* write = from device to memory */ +}; + +enum { +BM_STS_ACTIVE =0x1 , +BM_STS_ERROR =0x2 , +BM_STS_INTR =0x4 , +}; + +enum { +PRDT_EOT =0x80000000 , +}; +#define assert_bit_set (data, mask) g_assert_cmphex((data) & (mask), ==, (mask))#define assert_bit_clear (data, mask) g_assert_cmphex((data) & (mask), ==, 0) +static QPCIBus *pcibus =NULL ; +static QGuestAllocator *guest_malloc; +static char tmp_path[] ="/tmp/qtest.XXXXXX" ;static void ide_test_start (const char *cmdline_fmt, ...)
@@ -79,6 +113,7 @@ static void ide_test_start(const char *cmdline_fmt, ...)qtest_start (cmdline);qtest_irq_intercept_in (global_qtest,"ioapic" ); + guest_malloc =pc_alloc_init (); }static void ide_test_quit (void )
@@ -86,6 +121,188 @@ static void ide_test_quit(void)qtest_quit (global_qtest); } +static QPCIDevice *get_pci_device (uint16_t *bmdma_base) +{ +QPCIDevice *dev; +uint16_t vendor_id, device_id; + +if (!pcibus) { + pcibus =qpci_init_pc (); + } + +/* Find PCI device and verify it's the right one */ + dev =qpci_device_find (pcibus,QPCI_DEVFN (IDE_PCI_DEV ,IDE_PCI_FUNC )); +g_assert (dev !=NULL ); + + vendor_id =qpci_config_readw (dev,PCI_VENDOR_ID ); + device_id =qpci_config_readw (dev,PCI_DEVICE_ID ); +g_assert (vendor_id ==PCI_VENDOR_ID_INTEL ); +g_assert (device_id ==PCI_DEVICE_ID_INTEL_82371SB_1 ); + +/* Map bmdma BAR */ + *bmdma_base = (uint16_t )(uintptr_t )qpci_iomap (dev,4 ); + +qpci_device_enable (dev); + +return dev; +} + +static void free_pci_device (QPCIDevice *dev) +{ +/* libqos doesn't have a function for this, so free it manually */ +g_free (dev); +} + +typedef struct PrdtEntry { +uint32_t addr; +uint32_t size; +} QEMU_PACKED PrdtEntry; + +#define assert_bit_set (data, mask) g_assert_cmphex((data) & (mask), ==, (mask)) +#define assert_bit_clear (data, mask) g_assert_cmphex((data) & (mask), ==, 0) + +static int send_dma_request (int cmd,uint64_t sector,int nb_sectors, +PrdtEntry *prdt,int prdt_entries) +{ +QPCIDevice *dev; +uint16_t bmdma_base; +uintptr_t guest_prdt; +size_t len; +bool from_dev; +uint8_t status; + + dev =get_pci_device (&bmdma_base); + +switch (cmd) { +case CMD_READ_DMA : + from_dev = true; +break ; +case CMD_WRITE_DMA : + from_dev = false; +break ; +default : +g_assert_not_reached (); + } + +/* Select device 0 */ +outb (IDE_BASE + reg_device,0 |LBA ); + +/* Stop any running transfer, clear any pending interrupt */ +outb (bmdma_base + bmreg_cmd,0 ); +outb (bmdma_base + bmreg_status,BM_STS_INTR ); + +/* Setup PRDT */ + len =sizeof (*prdt) * prdt_entries; + guest_prdt =guest_alloc (guest_malloc, len); +memwrite (guest_prdt, prdt, len); +outl (bmdma_base + bmreg_prdt, guest_prdt); + +/* ATA DMA command */ +outb (IDE_BASE + reg_nsectors, nb_sectors); + +outb (IDE_BASE + reg_lba_low, sector &0xff ); +outb (IDE_BASE + reg_lba_middle, (sector >>8 ) &0xff ); +outb (IDE_BASE + reg_lba_high, (sector >>16 ) &0xff ); + +outb (IDE_BASE + reg_command, cmd); + +/* Start DMA transfer */ +outb (bmdma_base + bmreg_cmd,BM_CMD_START | (from_dev ?BM_CMD_WRITE :0 )); + +/* Wait for the DMA transfer to complete */ +do { + status =inb (bmdma_base + bmreg_status); + }while ((status & (BM_STS_ACTIVE |BM_STS_INTR )) ==BM_STS_ACTIVE ); + + g_assert_cmpint(get_irq(IDE_PRIMARY_IRQ), ==, !!(status & BM_STS_INTR)); + +/* Check IDE status code */ +assert_bit_set (inb (IDE_BASE + reg_status),DRDY ); +assert_bit_clear (inb (IDE_BASE + reg_status),BSY |DRQ ); + +/* Reading the status register clears the IRQ */ +g_assert (!get_irq (IDE_PRIMARY_IRQ )); + +/* Stop DMA transfer if still active */ +if (status &BM_STS_ACTIVE ) { +outb (bmdma_base + bmreg_cmd,0 ); + } + +free_pci_device (dev); + +return status; +} + +static void test_bmdma_simple_rw (void ) +{ +uint8_t status; +uint8_t *buf; +uint8_t *cmpbuf; +size_t len =512 ; +uintptr_t guest_buf =guest_alloc (guest_malloc, len); + +PrdtEntry prdt[] = { + { .addr = guest_buf, .size = len |PRDT_EOT }, + }; + + buf =g_malloc (len); + cmpbuf =g_malloc (len); + +/* Write 0x55 pattern to sector 0 */ +memset (buf,0x55 , len); +memwrite (guest_buf, buf, len); + + status =send_dma_request (CMD_WRITE_DMA ,0 ,1 , prdt,ARRAY_SIZE (prdt)); + g_assert_cmphex(status, ==, BM_STS_INTR); +assert_bit_clear (inb (IDE_BASE + reg_status),DF |ERR ); + +/* Write 0xaa pattern to sector 1 */ +memset (buf,0xaa , len); +memwrite (guest_buf, buf, len); + + status =send_dma_request (CMD_WRITE_DMA ,1 ,1 , prdt,ARRAY_SIZE (prdt)); + g_assert_cmphex(status, ==, BM_STS_INTR); +assert_bit_clear (inb (IDE_BASE + reg_status),DF |ERR ); + +/* Read and verify 0x55 pattern in sector 0 */ +memset (cmpbuf,0x55 , len); + + status =send_dma_request (CMD_READ_DMA ,0 ,1 , prdt,ARRAY_SIZE (prdt)); + g_assert_cmphex(status, ==, BM_STS_INTR); +assert_bit_clear (inb (IDE_BASE + reg_status),DF |ERR ); + +memread (guest_buf, buf, len); +g_assert (memcmp (buf, cmpbuf, len) ==0 ); + +/* Read and verify 0xaa pattern in sector 1 */ +memset (cmpbuf,0xaa , len); + + status =send_dma_request (CMD_READ_DMA ,1 ,1 , prdt,ARRAY_SIZE (prdt)); + g_assert_cmphex(status, ==, BM_STS_INTR); +assert_bit_clear (inb (IDE_BASE + reg_status),DF |ERR ); + +memread (guest_buf, buf, len); +g_assert (memcmp (buf, cmpbuf, len) ==0 ); + + +g_free (buf); +g_free (cmpbuf); +} + +static void test_bmdma_setup (void ) +{ +ide_test_start ( +"-vnc none " +"-drive file=%s,if=ide,serial=%s,cache=writeback " +"-global ide-hd.ver=%s" , + tmp_path,"testdisk" ,"version" ); +} + +static void test_bmdma_teardown (void ) +{ +ide_test_quit (); +} +static void test_identify (void ) {uint8_t data;
@@ -156,6 +373,10 @@ int main(int argc, char **argv)qtest_add_func ("/ide/identify" , test_identify); +qtest_add_func ("/ide/bmdma/setup" , test_bmdma_setup); +qtest_add_func ("/ide/bmdma/simple_rw" , test_bmdma_simple_rw); +qtest_add_func ("/ide/bmdma/teardown" , test_bmdma_teardown); + ret =g_test_run ();/* Cleanup */
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH 4/5] qtest/ide-test: Add simple DMA read/write test case
Il 08/05/2013 11:43, Kevin Wolf ha scritto:
Quoted 144 lines
This tests that single sectors can be successfully written and correctly read back.
Signed-off-by Kevin Wolf <[email protected]>--- tests/ide-test.c | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 221 insertions(+)tests/ide-test.c +99
-0@@ -29,8 +29,12 @@#include <glib.h> #include "libqtest.h" +#include "libqos/pci-pc.h" +#include "libqos/malloc-pc.h" #include "qemu-common.h" +#include "hw/pci/pci_ids.h" +#include "hw/pci/pci_regs.h" #define TEST_IMAGE_SIZE 64 * 1024 * 1024@@ -60,12 +64,42 @@ enum { };enum { +LBA =0x40 , +}; + +enum { + bmreg_cmd =0x0 , + bmreg_status =0x2 , + bmreg_prdt =0x4 , +}; + +enum { +CMD_READ_DMA =0xc8 , +CMD_WRITE_DMA =0xca ,CMD_IDENTIFY =0xec , }; +enum { +BM_CMD_START =0x1 , +BM_CMD_WRITE =0x8 ,/* write = from device to memory */ +}; + +enum { +BM_STS_ACTIVE =0x1 , +BM_STS_ERROR =0x2 , +BM_STS_INTR =0x4 , +}; + +enum { +PRDT_EOT =0x80000000 , +}; +#define assert_bit_set (data, mask) g_assert_cmphex((data) & (mask), ==, (mask))#define assert_bit_clear (data, mask) g_assert_cmphex((data) & (mask), ==, 0) +static QPCIBus *pcibus =NULL ; +static QGuestAllocator *guest_malloc; +static char tmp_path[] ="/tmp/qtest.XXXXXX" ;static void ide_test_start (const char *cmdline_fmt, ...)@@ -79,6 +113,7 @@ static void ide_test_start(const char *cmdline_fmt, ...)qtest_start (cmdline);qtest_irq_intercept_in (global_qtest,"ioapic" ); + guest_malloc =pc_alloc_init (); }static void ide_test_quit (void )@@ -86,6 +121,188 @@ static void ide_test_quit(void)qtest_quit (global_qtest); } +static QPCIDevice *get_pci_device (uint16_t *bmdma_base) +{ +QPCIDevice *dev; +uint16_t vendor_id, device_id; + +if (!pcibus) { + pcibus =qpci_init_pc (); + } + +/* Find PCI device and verify it's the right one */ + dev =qpci_device_find (pcibus,QPCI_DEVFN (IDE_PCI_DEV ,IDE_PCI_FUNC )); +g_assert (dev !=NULL ); + + vendor_id =qpci_config_readw (dev,PCI_VENDOR_ID ); + device_id =qpci_config_readw (dev,PCI_DEVICE_ID ); +g_assert (vendor_id ==PCI_VENDOR_ID_INTEL ); +g_assert (device_id ==PCI_DEVICE_ID_INTEL_82371SB_1 ); + +/* Map bmdma BAR */ + *bmdma_base = (uint16_t )(uintptr_t )qpci_iomap (dev,4 ); + +qpci_device_enable (dev); + +return dev; +} + +static void free_pci_device (QPCIDevice *dev) +{ +/* libqos doesn't have a function for this, so free it manually */ +g_free (dev); +} + +typedef struct PrdtEntry { +uint32_t addr; +uint32_t size; +} QEMU_PACKED PrdtEntry; + +#define assert_bit_set (data, mask) g_assert_cmphex((data) & (mask), ==, (mask)) +#define assert_bit_clear (data, mask) g_assert_cmphex((data) & (mask), ==, 0) + +static int send_dma_request (int cmd,uint64_t sector,int nb_sectors, +PrdtEntry *prdt,int prdt_entries) +{ +QPCIDevice *dev; +uint16_t bmdma_base; +uintptr_t guest_prdt; +size_t len; +bool from_dev; +uint8_t status; + + dev =get_pci_device (&bmdma_base); + +switch (cmd) { +case CMD_READ_DMA : + from_dev = true; +break ; +case CMD_WRITE_DMA : + from_dev = false; +break ; +default : +g_assert_not_reached (); + } + +/* Select device 0 */
tests/ide-test.c static void ide_test_quit(void) · line 197
Quoted 10 lines
tests/ide-test.c +10
-0+outb (IDE_BASE + reg_device,0 |LBA ); + +/* Stop any running transfer, clear any pending interrupt */ +outb (bmdma_base + bmreg_cmd,0 ); +outb (bmdma_base + bmreg_status,BM_STS_INTR ); + +/* Setup PRDT */ + len =sizeof (*prdt) * prdt_entries; + guest_prdt =guest_alloc (guest_malloc, len); +memwrite (guest_prdt, prdt, len);
What endianness?
Paolo
Quoted 1 line
tests/ide-test.c +1
-0+outl (bmdma_base + bmreg_prdt, guest_prdt);
PATCH 5/5 qtest/ide-test: Test short and long PRDTs
In reply to Kevin WolfThis tests the behaviour of the DMA engine when the given PRDT contains physical region descriptors for either more or less bytes than the IDE request is for.
--- tests/ide-test.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+)
tests/ide-test.c +54 -0
@@ -77,6 +77,8 @@ enum {CMD_READ_DMA =0xc8 ,CMD_WRITE_DMA =0xca ,CMD_IDENTIFY =0xec , + + CMDF_ABORT = 0x100, }; enum {
@@ -170,9 +172,13 @@ static int send_dma_request(int cmd, uint64_t sector, int nb_sectors,size_t len;bool from_dev;uint8_t status; +int flags; dev =get_pci_device (&bmdma_base); + flags = cmd & ~0xff ; + cmd &=0xff ; +switch (cmd) {case CMD_READ_DMA : from_dev = true;
@@ -209,6 +215,10 @@ static int send_dma_request(int cmd, uint64_t sector, int nb_sectors,/* Start DMA transfer */ outb (bmdma_base + bmreg_cmd,BM_CMD_START | (from_dev ?BM_CMD_WRITE :0 )); +if (flags &CMDF_ABORT ) { +outb (bmdma_base + bmreg_cmd,0 ); + } +/* Wait for the DMA transfer to complete */ do { status = inb(bmdma_base + bmreg_status);
@@ -289,6 +299,48 @@ static void test_bmdma_simple_rw(void)g_free (cmpbuf); } +static void test_bmdma_short_prdt (void ) +{ +uint8_t status; + +PrdtEntry prdt[] = { + { .addr =0 , .size =0x10 |PRDT_EOT }, + }; + +/* Normal request */ + status =send_dma_request (CMD_READ_DMA ,0 ,1 , + prdt,ARRAY_SIZE (prdt)); + g_assert_cmphex(status, ==, 0); +assert_bit_clear (inb (IDE_BASE + reg_status),DF |ERR ); + +/* Abort the request before it completes */ + status =send_dma_request (CMD_READ_DMA |CMDF_ABORT ,0 ,1 , + prdt,ARRAY_SIZE (prdt)); + g_assert_cmphex(status, ==, 0); +assert_bit_clear (inb (IDE_BASE + reg_status),DF |ERR ); +} + +static void test_bmdma_long_prdt (void ) +{ +uint8_t status; + +PrdtEntry prdt[] = { + { .addr =0 , .size =0x1000 |PRDT_EOT }, + }; + +/* Normal request */ + status =send_dma_request (CMD_READ_DMA ,0 ,1 , + prdt,ARRAY_SIZE (prdt)); + g_assert_cmphex(status, ==, BM_STS_ACTIVE | BM_STS_INTR); +assert_bit_clear (inb (IDE_BASE + reg_status),DF |ERR ); + +/* Abort the request before it completes */ + status =send_dma_request (CMD_READ_DMA |CMDF_ABORT ,0 ,1 , + prdt,ARRAY_SIZE (prdt)); + g_assert_cmphex(status, ==, BM_STS_INTR); +assert_bit_clear (inb (IDE_BASE + reg_status),DF |ERR ); +} +static void test_bmdma_setup (void ) { ide_test_start(
@@ -375,6 +427,8 @@ int main(int argc, char **argv)qtest_add_func ("/ide/bmdma/setup" , test_bmdma_setup);qtest_add_func ("/ide/bmdma/simple_rw" , test_bmdma_simple_rw); +qtest_add_func ("/ide/bmdma/short_prdt" , test_bmdma_short_prdt); +qtest_add_func ("/ide/bmdma/long_prdt" , test_bmdma_long_prdt);qtest_add_func ("/ide/bmdma/teardown" , test_bmdma_teardown); ret =g_test_run ();
Signature · 1 line
1.8.1.4