[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 09/19] qtest/ahci: Demagic ahci tests.
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v3 09/19] qtest/ahci: Demagic ahci tests. |
Date: |
Thu, 5 Feb 2015 12:41:20 -0500 |
Add human-readable command names and other miscellaneous #defines
to help make the code more readable.
Some of these definitions are not yet used in this current series,
but for convenience and sanity they have been lumped together here,
as it's more trouble than it is worth in a test suite to hand-pick,
one-by-one, which preprocessor definitions are useful per-each test.
These definitions include:
ATA Command Mnemonics
Current expected AHCI sector size
FIS magic bytes
REG_H2D_FIS flags
Command Header flags
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
tests/ahci-test.c | 12 ++++++------
tests/libqos/ahci.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index b67d935..211274e 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -705,9 +705,9 @@ static void ahci_test_identify(AHCIQState *ahci)
/* Construct our Command Header (set_command_header handles endianness.) */
memset(&cmd, 0x00, sizeof(cmd));
- cmd.flags = 5; /* reg_h2d_fis is 5 double-words long */
- cmd.flags |= 0x400; /* clear PxTFD.STS.BSY when done */
- cmd.prdtl = 1; /* One PRD table entry. */
+ cmd.flags = 5; /* reg_h2d_fis is 5 double-words long */
+ cmd.flags |= CMDH_CLR_BSY; /* clear PxTFD.STS.BSY when done */
+ cmd.prdtl = 1; /* One PRD table entry. */
cmd.prdbc = 0;
cmd.ctba = table;
@@ -719,10 +719,10 @@ static void ahci_test_identify(AHCIQState *ahci)
/* Construct our Command FIS, Based on http://wiki.osdev.org/AHCI */
memset(&fis, 0x00, sizeof(fis));
- fis.fis_type = 0x27; /* Register Host-to-Device FIS */
- fis.command = 0xEC; /* IDENTIFY */
+ fis.fis_type = REG_H2D_FIS; /* Register Host-to-Device FIS */
+ fis.command = CMD_IDENTIFY;
fis.device = 0;
- fis.flags = 0x80; /* Indicate this is a command FIS */
+ fis.flags = REG_H2D_FIS_CMD; /* Indicate this is a command FIS */
/* We've committed nothing yet, no interrupts should be posted yet. */
g_assert_cmphex(ahci_px_rreg(ahci, i, AHCI_PX_IS), ==, 0);
diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h
index f17aa23..0837bf5 100644
--- a/tests/libqos/ahci.h
+++ b/tests/libqos/ahci.h
@@ -243,6 +243,59 @@
#define AHCI_VERSION_1_2 (0x00010200)
#define AHCI_VERSION_1_3 (0x00010300)
+#define AHCI_SECTOR_SIZE (512)
+
+/* FIS types */
+enum {
+ REG_H2D_FIS = 0x27,
+ REG_D2H_FIS = 0x34,
+ DMA_ACTIVATE_FIS = 0x39,
+ DMA_SETUP_FIS = 0x41,
+ DATA_FIS = 0x46,
+ BIST_ACTIVATE_FIS = 0x58,
+ PIO_SETUP_FIS = 0x5F,
+ SDB_FIS = 0xA1
+};
+
+/* FIS flags */
+#define REG_H2D_FIS_CMD 0x80
+
+/* ATA Commands */
+enum {
+ /* DMA */
+ CMD_READ_DMA = 0xC8,
+ CMD_READ_DMA_EXT = 0x25,
+ CMD_WRITE_DMA = 0xCA,
+ CMD_WRITE_DMA_EXT = 0x35,
+ /* PIO */
+ CMD_READ_PIO = 0x20,
+ CMD_READ_PIO_EXT = 0x24,
+ CMD_WRITE_PIO = 0x30,
+ CMD_WRITE_PIO_EXT = 0x34,
+ /* Misc */
+ CMD_READ_MAX = 0xF8,
+ CMD_READ_MAX_EXT = 0x27,
+ CMD_FLUSH_CACHE = 0xE7,
+ CMD_IDENTIFY = 0xEC
+};
+
+/* AHCI Command Header Flags & Masks*/
+#define CMDH_CFL (0x1F)
+#define CMDH_ATAPI (0x20)
+#define CMDH_WRITE (0x40)
+#define CMDH_PREFETCH (0x80)
+#define CMDH_RESET (0x100)
+#define CMDH_BIST (0x200)
+#define CMDH_CLR_BSY (0x400)
+#define CMDH_RES (0x800)
+#define CMDH_PMP (0xF000)
+
+/* ATA device register masks */
+#define ATA_DEVICE_MAGIC 0xA0
+#define ATA_DEVICE_LBA 0x40
+#define ATA_DEVICE_DRIVE 0x10
+#define ATA_DEVICE_HEAD 0x0F
+
/*** Structures ***/
typedef struct AHCIPortQState {
--
1.9.3
- Re: [Qemu-devel] [PATCH v3 04/19] libqos/ahci: Add command header helpers, (continued)
- [Qemu-devel] [PATCH v3 02/19] libqos/ahci: Add ahci_port_clear helper, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 06/19] libqos/ahci: Add ahci_port_check_interrupts helper, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 05/19] libqos/ahci: Add ahci_port_check_error helper, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 07/19] libqos/ahci: Add port_check_nonbusy helper, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 14/19] libqos/ahci: add ahci command size setters, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 13/19] libqos/ahci: add ahci command verify, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 08/19] libqos/ahci: Add cmd response sanity check helpers, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 17/19] libqos/ahci: Add ahci_clean_mem, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 16/19] libqos/ahci: add ahci_io, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 09/19] qtest/ahci: Demagic ahci tests.,
John Snow <=
- [Qemu-devel] [PATCH v3 11/19] libqos/ahci: Add ide cmd properties, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 18/19] qtest/ahci: Assert sector size in identify test, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 12/19] libqos/ahci: add ahci command functions, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 10/19] qtest/ahci: add ahci_write_fis, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 15/19] libqos/ahci: Add ahci_guest_io, John Snow, 2015/02/05
- [Qemu-devel] [PATCH v3 19/19] qtest/ahci: Adding simple dma read-write test, John Snow, 2015/02/05
- Re: [Qemu-devel] [PATCH v3 00/19] qtest/ahci: add dma test, Stefan Hajnoczi, 2015/02/12