OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/ide/ahci: map cmd_fis as DMA_DIRECTION_TO_DEVICE

Browse Source 
cmd_fis is mapped as DMA_DIRECTION_FROM_DEVICE, however, it is read
from, and not written to anywhere. Fix the DMA_DIRECTION and mark
cmd_fis as read-only in the code.

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20210119164051.89268-1-alxndr@bu.edu>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Alexander Bulekov 2021-01-19 11:40:51 -05:00 committed by Kevin Wolf
parent 076d467aac
commit 26941eb4ca
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/ide/ahci.c
View File

@ -700,7 +700,7 @@ static void ahci_reset_port(AHCIState *s, int port)
} }
/* Buffer pretty output based on a raw FIS structure. */ /* Buffer pretty output based on a raw FIS structure. */
static char *ahci_pretty_buffer_fis(uint8_t *fis, int cmd_len) static char *ahci_pretty_buffer_fis(const uint8_t *fis, int cmd_len)
{ {
int i; int i;
GString *s = g_string_new("FIS:"); GString *s = g_string_new("FIS:");
@ -1100,11 +1100,11 @@ static void execute_ncq_command(NCQTransferState *ncq_tfs)
} }
static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, static void process_ncq_command(AHCIState *s, int port, const uint8_t *cmd_fis,
uint8_t slot) uint8_t slot)
{ {
AHCIDevice *ad = &s->dev[port]; AHCIDevice *ad = &s->dev[port];
NCQFrame *ncq_fis = (NCQFrame*)cmd_fis; const NCQFrame *ncq_fis = (NCQFrame *)cmd_fis;
uint8_t tag = ncq_fis->tag >> 3; uint8_t tag = ncq_fis->tag >> 3;
NCQTransferState *ncq_tfs = &ad->ncq_tfs[tag]; NCQTransferState *ncq_tfs = &ad->ncq_tfs[tag];
size_t size; size_t size;
@ -1185,7 +1185,7 @@ static AHCICmdHdr *get_cmd_header(AHCIState *s, uint8_t port, uint8_t slot)
} }
static void handle_reg_h2d_fis(AHCIState *s, int port, static void handle_reg_h2d_fis(AHCIState *s, int port,
uint8_t slot, uint8_t *cmd_fis) uint8_t slot, const uint8_t *cmd_fis)
{ {
IDEState *ide_state = &s->dev[port].port.ifs[0]; IDEState *ide_state = &s->dev[port].port.ifs[0];
AHCICmdHdr *cmd = get_cmd_header(s, port, slot); AHCICmdHdr *cmd = get_cmd_header(s, port, slot);
@ -1301,7 +1301,7 @@ static int handle_cmd(AHCIState *s, int port, uint8_t slot)
tbl_addr = le64_to_cpu(cmd->tbl_addr); tbl_addr = le64_to_cpu(cmd->tbl_addr);
cmd_len = 0x80; cmd_len = 0x80;
cmd_fis = dma_memory_map(s->as, tbl_addr, &cmd_len, cmd_fis = dma_memory_map(s->as, tbl_addr, &cmd_len,
DMA_DIRECTION_FROM_DEVICE); DMA_DIRECTION_TO_DEVICE);
if (!cmd_fis) { if (!cmd_fis) {
trace_handle_cmd_badfis(s, port); trace_handle_cmd_badfis(s, port);
return -1; return -1;
@ -1326,7 +1326,7 @@ static int handle_cmd(AHCIState *s, int port, uint8_t slot)
} }
out: out:
dma_memory_unmap(s->as, cmd_fis, cmd_len, DMA_DIRECTION_FROM_DEVICE, dma_memory_unmap(s->as, cmd_fis, cmd_len, DMA_DIRECTION_TO_DEVICE,
cmd_len); cmd_len);
if (s->dev[port].port.ifs[0].status & (BUSY_STAT|DRQ_STAT)) { if (s->dev[port].port.ifs[0].status & (BUSY_STAT|DRQ_STAT)) {