Re: [PATCH] hw/ide/ahci: map cmd_fis as DMA_DIRECTION_TO_DEVICE

[Kevin Wolf]

Am 19.01.2021 um 17:40 hat Alexander Bulekov geschrieben:
> 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 

Thanks, applied to the block branch.

Kevin

[PATCH] hw/ide/ahci: map cmd_fis as DMA_DIRECTION_TO_DEVICE

[Alexander Bulekov]

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 
---
 hw/ide/ahci.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 4b675b9cfd..6432d44ad8 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -699,7 +699,7 @@ static void ahci_reset_port(AHCIState *s, int port)
 }
 
 /* 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;
 GString *s = g_string_new("FIS:");
@@ -1099,11 +1099,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)
 {
 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;
 NCQTransferState *ncq_tfs = &ad->ncq_tfs[tag];
 size_t size;
@@ -1183,7 +1183,7 @@ static AHCICmdHdr *get_cmd_header(AHCIState *s, uint8_t 
port, uint8_t slot)
 }
 
 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];
 AHCICmdHdr *cmd = get_cmd_header(s, port, slot);
@@ -1299,7 +1299,7 @@ static int handle_cmd(AHCIState *s, int port, uint8_t 
slot)
 tbl_addr = le64_to_cpu(cmd->tbl_addr);
 cmd_len = 0x80;
 cmd_fis = dma_memory_map(s->as, tbl_addr, &cmd_len,
- DMA_DIRECTION_FROM_DEVICE);
+ DMA_DIRECTION_TO_DEVICE);
 if (!cmd_fis) {
 trace_handle_cmd_badfis(s, port);
 return -1;
@@ -1324,7 +1324,7 @@ static int handle_cmd(AHCIState *s, int port, uint8_t 
slot)
 }
 
 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);
 
 if (s->dev[port].port.ifs[0].status & (BUSY_STAT|DRQ_STAT)) {
-- 
2.28.0