david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ahci: remove cmd_fis argument from write_fis_d2h

Browse Source 
It's no longer used. We used to generate a D2H FIS based
upon the command FIS that prompted the update, but in reality,
the D2H FIS is generated purely from register state.

cmd_fis is vestigial, so get rid of it.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1441140641-17631-4-git-send-email-jsnow@redhat.com
This commit is contained in:
John Snow 2015-09-01 16:50:40 -04:00
parent 33a983cb28
commit 28ee82557c
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/ide/ahci.c
View File

@ -46,7 +46,7 @@ do { \
static void check_cmd(AHCIState *s, int port); static void check_cmd(AHCIState *s, int port);
static int handle_cmd(AHCIState *s, int port, uint8_t slot); static int handle_cmd(AHCIState *s, int port, uint8_t slot);
static void ahci_reset_port(AHCIState *s, int port); static void ahci_reset_port(AHCIState *s, int port);
static void ahci_write_fis_d2h(AHCIDevice *ad, uint8_t *cmd_fis); static void ahci_write_fis_d2h(AHCIDevice *ad);
static void ahci_init_d2h(AHCIDevice *ad); static void ahci_init_d2h(AHCIDevice *ad);
static int ahci_dma_prepare_buf(IDEDMA *dma, int32_t limit); static int ahci_dma_prepare_buf(IDEDMA *dma, int32_t limit);
static bool ahci_map_clb_address(AHCIDevice *ad); static bool ahci_map_clb_address(AHCIDevice *ad);
@ -538,12 +538,9 @@ static void ahci_check_cmd_bh(void *opaque)
static void ahci_init_d2h(AHCIDevice *ad) static void ahci_init_d2h(AHCIDevice *ad)
{ {
uint8_t init_fis[20];
IDEState *ide_state = &ad->port.ifs[0]; IDEState *ide_state = &ad->port.ifs[0];
AHCIPortRegs *pr = &ad->port_regs; AHCIPortRegs *pr = &ad->port_regs;
memset(init_fis, 0, sizeof(init_fis));
/* We're emulating receiving the first Reg H2D Fis from the device; /* We're emulating receiving the first Reg H2D Fis from the device;
* Update the SIG register, but otherwise proceed as normal. */ * Update the SIG register, but otherwise proceed as normal. */
pr->sig = (ide_state->hcyl << 24) | pr->sig = (ide_state->hcyl << 24) |
@ -551,7 +548,7 @@ static void ahci_init_d2h(AHCIDevice *ad)
(ide_state->sector << 8) | (ide_state->sector << 8) |
(ide_state->nsector & 0xFF); (ide_state->nsector & 0xFF);
ahci_write_fis_d2h(ad, init_fis); ahci_write_fis_d2h(ad);
} }
static void ahci_set_signature(AHCIDevice *ad, uint32_t sig) static void ahci_set_signature(AHCIDevice *ad, uint32_t sig)
@ -753,7 +750,7 @@ static void ahci_write_fis_pio(AHCIDevice *ad, uint16_t len)
ahci_trigger_irq(ad->hba, ad, PORT_IRQ_PIOS_FIS); ahci_trigger_irq(ad->hba, ad, PORT_IRQ_PIOS_FIS);
} }
static void ahci_write_fis_d2h(AHCIDevice *ad, uint8_t *cmd_fis) static void ahci_write_fis_d2h(AHCIDevice *ad)
{ {
AHCIPortRegs *pr = &ad->port_regs; AHCIPortRegs *pr = &ad->port_regs;
uint8_t *d2h_fis; uint8_t *d2h_fis;
@ -1401,7 +1398,7 @@ static void ahci_cmd_done(IDEDMA *dma)
DPRINTF(ad->port_no, "cmd done\n"); DPRINTF(ad->port_no, "cmd done\n");
/* update d2h status */ /* update d2h status */
ahci_write_fis_d2h(ad, NULL); ahci_write_fis_d2h(ad);
if (!ad->check_bh) { if (!ad->check_bh) {
/* maybe we still have something to process, check later */ /* maybe we still have something to process, check later */