[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/23] ide: Convert DMA read/write commands to ide_c
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 08/23] ide: Convert DMA read/write commands to ide_cmd_table handler |
Date: |
Mon, 24 Jun 2013 11:10:20 +0200 |
From: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/ide/core.c | 69 ++++++++++++++++++++++++++++++++---------------------------
1 file changed, 38 insertions(+), 31 deletions(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 86af4b0..2c8a0ff 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -1152,6 +1152,38 @@ static bool cmd_write_pio(IDEState *s, uint8_t cmd)
return false;
}
+static bool cmd_read_dma(IDEState *s, uint8_t cmd)
+{
+ bool lba48 = (cmd == WIN_READDMA_EXT);
+
+ if (!s->bs) {
+ ide_abort_command(s);
+ return true;
+ }
+
+ ide_cmd_lba48_transform(s, lba48);
+ ide_sector_start_dma(s, IDE_DMA_READ);
+
+ return false;
+}
+
+static bool cmd_write_dma(IDEState *s, uint8_t cmd)
+{
+ bool lba48 = (cmd == WIN_WRITEDMA_EXT);
+
+ if (!s->bs) {
+ ide_abort_command(s);
+ return true;
+ }
+
+ ide_cmd_lba48_transform(s, lba48);
+ ide_sector_start_dma(s, IDE_DMA_WRITE);
+
+ s->media_changed = 1;
+
+ return false;
+}
+
#define HD_OK (1u << IDE_HD)
#define CD_OK (1u << IDE_CD)
#define CFA_OK (1u << IDE_CFATA)
@@ -1175,13 +1207,13 @@ static const struct {
[WIN_READ] = { cmd_read_pio, ALL_OK },
[WIN_READ_ONCE] = { cmd_read_pio, ALL_OK },
[WIN_READ_EXT] = { cmd_read_pio, HD_CFA_OK },
- [WIN_READDMA_EXT] = { NULL, HD_CFA_OK },
+ [WIN_READDMA_EXT] = { cmd_read_dma, HD_CFA_OK },
[WIN_READ_NATIVE_MAX_EXT] = { NULL, HD_CFA_OK },
[WIN_MULTREAD_EXT] = { cmd_read_multiple, HD_CFA_OK },
[WIN_WRITE] = { cmd_write_pio, HD_CFA_OK },
[WIN_WRITE_ONCE] = { cmd_write_pio, HD_CFA_OK },
[WIN_WRITE_EXT] = { cmd_write_pio, HD_CFA_OK },
- [WIN_WRITEDMA_EXT] = { NULL, HD_CFA_OK },
+ [WIN_WRITEDMA_EXT] = { cmd_write_dma, HD_CFA_OK },
[CFA_WRITE_SECT_WO_ERASE] = { cmd_write_pio, CFA_OK },
[WIN_MULTWRITE_EXT] = { cmd_write_multiple, HD_CFA_OK },
[WIN_WRITE_VERIFY] = { cmd_write_pio, HD_CFA_OK },
@@ -1206,10 +1238,10 @@ static const struct {
[WIN_MULTREAD] = { cmd_read_multiple, HD_CFA_OK },
[WIN_MULTWRITE] = { cmd_write_multiple, HD_CFA_OK },
[WIN_SETMULT] = { cmd_set_multiple_mode, HD_CFA_OK |
SET_DSC },
- [WIN_READDMA] = { NULL, HD_CFA_OK },
- [WIN_READDMA_ONCE] = { NULL, HD_CFA_OK },
- [WIN_WRITEDMA] = { NULL, HD_CFA_OK },
- [WIN_WRITEDMA_ONCE] = { NULL, HD_CFA_OK },
+ [WIN_READDMA] = { cmd_read_dma, HD_CFA_OK },
+ [WIN_READDMA_ONCE] = { cmd_read_dma, HD_CFA_OK },
+ [WIN_WRITEDMA] = { cmd_write_dma, HD_CFA_OK },
+ [WIN_WRITEDMA_ONCE] = { cmd_write_dma, HD_CFA_OK },
[CFA_WRITE_MULTI_WO_ERASE] = { cmd_write_multiple, CFA_OK },
[WIN_STANDBYNOW1] = { cmd_nop, ALL_OK },
[WIN_IDLEIMMEDIATE] = { cmd_nop, ALL_OK },
@@ -1277,31 +1309,6 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val)
}
switch(val) {
- case WIN_READDMA_EXT:
- lba48 = 1;
- /* fall through */
- case WIN_READDMA:
- case WIN_READDMA_ONCE:
- if (!s->bs) {
- goto abort_cmd;
- }
- ide_cmd_lba48_transform(s, lba48);
- ide_sector_start_dma(s, IDE_DMA_READ);
- break;
-
- case WIN_WRITEDMA_EXT:
- lba48 = 1;
- /* fall through */
- case WIN_WRITEDMA:
- case WIN_WRITEDMA_ONCE:
- if (!s->bs) {
- goto abort_cmd;
- }
- ide_cmd_lba48_transform(s, lba48);
- ide_sector_start_dma(s, IDE_DMA_WRITE);
- s->media_changed = 1;
- break;
-
case WIN_READ_NATIVE_MAX_EXT:
lba48 = 1;
/* fall through */
--
1.8.1.4
- [Qemu-devel] [PULL 00/23] Block patches, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 02/23] ide: Convert WIN_DSM to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 01/23] ide: Add handler to ide_cmd_table, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 03/23] ide: Convert WIN_IDENTIFY to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 04/23] ide: Convert cmd_nop commands to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 05/23] ide: Convert verify commands to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 06/23] ide: Convert read/write multiple commands to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 09/23] ide: Convert READ NATIVE MAX ADDRESS to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 10/23] ide: Convert CHECK POWER MDOE to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 08/23] ide: Convert DMA read/write commands to ide_cmd_table handler,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 07/23] ide: Convert PIO read/write commands to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 11/23] ide: Convert SET FEATURES to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 12/23] ide: Convert FLUSH CACHE to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 13/23] ide: Convert SEEK to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 14/23] ide: Convert ATAPI commands to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 15/23] ide: Convert CF-ATA commands to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 16/23] ide: Convert SMART commands to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 17/23] ide: Clean up ide_exec_cmd(), Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 18/23] Revert "block: Disable driver-specific options for 1.5", Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 19/23] qcow2: Add refcount update reason to all callers, Stefan Hajnoczi, 2013/06/24