motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 18:44:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ahci: modify ahci_port_write to use register numbers

Browse source 
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180531222835.16558-7-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
John Snow 2018-06-08 13:17:37 -04:00
parent 59281eee97
commit f647f4587e
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
hw/ide/ahci.c
View file

@ -282,30 +282,32 @@ static int ahci_cond_start_engines(AHCIDevice *ad)
static void ahci_port_write(AHCIState *s, int port, int offset, uint32_t val) static void ahci_port_write(AHCIState *s, int port, int offset, uint32_t val)
{ {
AHCIPortRegs *pr = &s->dev[port].port_regs; AHCIPortRegs *pr = &s->dev[port].port_regs;
enum AHCIPortReg regnum = offset / sizeof(uint32_t);
assert(regnum < (AHCI_PORT_ADDR_OFFSET_LEN / sizeof(uint32_t)));
trace_ahci_port_write(s, port, offset, val); trace_ahci_port_write(s, port, offset, val);
switch (offset) { switch (regnum) {
case PORT_LST_ADDR: case AHCI_PORT_REG_LST_ADDR:
pr->lst_addr = val; pr->lst_addr = val;
break; break;
case PORT_LST_ADDR_HI: case AHCI_PORT_REG_LST_ADDR_HI:
pr->lst_addr_hi = val; pr->lst_addr_hi = val;
break; break;
case PORT_FIS_ADDR: case AHCI_PORT_REG_FIS_ADDR:
pr->fis_addr = val; pr->fis_addr = val;
break; break;
case PORT_FIS_ADDR_HI: case AHCI_PORT_REG_FIS_ADDR_HI:
pr->fis_addr_hi = val; pr->fis_addr_hi = val;
break; break;
case PORT_IRQ_STAT: case AHCI_PORT_REG_IRQ_STAT:
pr->irq_stat &= ~val; pr->irq_stat &= ~val;
ahci_check_irq(s); ahci_check_irq(s);
break; break;
case PORT_IRQ_MASK: case AHCI_PORT_REG_IRQ_MASK:
pr->irq_mask = val & 0xfdc000ff; pr->irq_mask = val & 0xfdc000ff;
ahci_check_irq(s); ahci_check_irq(s);
break; break;
case PORT_CMD: case AHCI_PORT_REG_CMD:
/* Block any Read-only fields from being set; /* Block any Read-only fields from being set;
* including LIST_ON and FIS_ON. * including LIST_ON and FIS_ON.
* The spec requires to set ICC bits to zero after the ICC change * The spec requires to set ICC bits to zero after the ICC change
@ -329,26 +331,26 @@ static void ahci_port_write(AHCIState *s, int port, int offset, uint32_t val)
check_cmd(s, port); check_cmd(s, port);
break; break;
case PORT_TFDATA: case AHCI_PORT_REG_TFDATA:
case PORT_SIG: case AHCI_PORT_REG_SIG:
case PORT_SCR_STAT: case AHCI_PORT_REG_SCR_STAT:
/* Read Only */ /* Read Only */
break; break;
case PORT_SCR_CTL: case AHCI_PORT_REG_SCR_CTL:
if (((pr->scr_ctl & AHCI_SCR_SCTL_DET) == 1) && if (((pr->scr_ctl & AHCI_SCR_SCTL_DET) == 1) &&
((val & AHCI_SCR_SCTL_DET) == 0)) { ((val & AHCI_SCR_SCTL_DET) == 0)) {
ahci_reset_port(s, port); ahci_reset_port(s, port);
} }
pr->scr_ctl = val; pr->scr_ctl = val;
break; break;
case PORT_SCR_ERR: case AHCI_PORT_REG_SCR_ERR:
pr->scr_err &= ~val; pr->scr_err &= ~val;
break; break;
case PORT_SCR_ACT: case AHCI_PORT_REG_SCR_ACT:
/* RW1 */ /* RW1 */
pr->scr_act |= val; pr->scr_act |= val;
break; break;
case PORT_CMD_ISSUE: case AHCI_PORT_REG_CMD_ISSUE:
pr->cmd_issue |= val; pr->cmd_issue |= val;
check_cmd(s, port); check_cmd(s, port);
break; break;