Patchwork [v2] ahci: properly reset PxCMD on HBA reset

login
register
mail settings
Submitter Jason Baron
Date Sept. 4, 2012, 8:08 p.m.
Message ID <201209042008.q84K88cJ015036@int-mx11.intmail.prod.int.phx2.redhat.com>
Download mbox | patch
Permalink /patch/181668/
State New
Headers show

Comments

Jason Baron - Sept. 4, 2012, 8:08 p.m.
While testing q35, I found that windows 7 (specifically, windows 7 ultimate
with sp1 x64), wouldn't install because it can't find the cdrom or disk drive.
The failure message is: 'A required cd/dvd device driver is missing. If you
have a driver floppy disk, CD, DVD, or USB flash drive, please insert it now.'
This can also be reproduced on piix by adding an ahci controller, and
observing that windows 7 does not see any devices behind it.

The problem is that when windows issues a HBA reset, qemu does not reset the
individual ports' PxCMD register. Windows 7 then reads back the PxCMD register
and presumably assumes that the ahci controller has already been initialized.
Windows then never sets up the PxIE register to enable interrupts, and thus it
never gets irqs back when it sends ata device inquiry commands.

This change brings qemu into ahci 1.3 specification compliance.

Section 10.4.3 HBA Reset:

"
When GHC.HR is set to '1', GHC.AE, GHC.IE, the IS register, and all port
register fields (except PxFB/PxFBU/PxCLB/PxCLBU) that are not HwInit in the
HBA's register memory space are reset.
"

I've also re-tested Fedora 16 and 17 to verify that they continue to work with
this change.

Signed-off-by: Jason Baron <jbaron@redhat.com>
---

changes in v2:
    -continue to set PORT_CMD_SPIN_UP, PORT_CMD_POWER_ON on reset (Kevin Wolf)
    -drop cmd init in ahci_init() (Alexander Graf)

 hw/ide/ahci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Alexander Graf - Sept. 5, 2012, 3:28 a.m.
On 04.09.2012, at 16:08, Jason Baron wrote:

> While testing q35, I found that windows 7 (specifically, windows 7 ultimate
> with sp1 x64), wouldn't install because it can't find the cdrom or disk drive.
> The failure message is: 'A required cd/dvd device driver is missing. If you
> have a driver floppy disk, CD, DVD, or USB flash drive, please insert it now.'
> This can also be reproduced on piix by adding an ahci controller, and
> observing that windows 7 does not see any devices behind it.
> 
> The problem is that when windows issues a HBA reset, qemu does not reset the
> individual ports' PxCMD register. Windows 7 then reads back the PxCMD register
> and presumably assumes that the ahci controller has already been initialized.
> Windows then never sets up the PxIE register to enable interrupts, and thus it
> never gets irqs back when it sends ata device inquiry commands.
> 
> This change brings qemu into ahci 1.3 specification compliance.
> 
> Section 10.4.3 HBA Reset:
> 
> "
> When GHC.HR is set to '1', GHC.AE, GHC.IE, the IS register, and all port
> register fields (except PxFB/PxFBU/PxCLB/PxCLBU) that are not HwInit in the
> HBA's register memory space are reset.
> "
> 
> I've also re-tested Fedora 16 and 17 to verify that they continue to work with
> this change.
> 
> Signed-off-by: Jason Baron <jbaron@redhat.com>

Awesome, a lot cleaner now :).

Acked-by: Alexander Graf <agraf@suse.de>
Kevin Wolf - Sept. 7, 2012, 12:42 p.m.
Am 05.09.2012 05:28, schrieb Alexander Graf:
> 
> On 04.09.2012, at 16:08, Jason Baron wrote:
> 
>> While testing q35, I found that windows 7 (specifically, windows 7 ultimate
>> with sp1 x64), wouldn't install because it can't find the cdrom or disk drive.
>> The failure message is: 'A required cd/dvd device driver is missing. If you
>> have a driver floppy disk, CD, DVD, or USB flash drive, please insert it now.'
>> This can also be reproduced on piix by adding an ahci controller, and
>> observing that windows 7 does not see any devices behind it.
>>
>> The problem is that when windows issues a HBA reset, qemu does not reset the
>> individual ports' PxCMD register. Windows 7 then reads back the PxCMD register
>> and presumably assumes that the ahci controller has already been initialized.
>> Windows then never sets up the PxIE register to enable interrupts, and thus it
>> never gets irqs back when it sends ata device inquiry commands.
>>
>> This change brings qemu into ahci 1.3 specification compliance.
>>
>> Section 10.4.3 HBA Reset:
>>
>> "
>> When GHC.HR is set to '1', GHC.AE, GHC.IE, the IS register, and all port
>> register fields (except PxFB/PxFBU/PxCLB/PxCLBU) that are not HwInit in the
>> HBA's register memory space are reset.
>> "
>>
>> I've also re-tested Fedora 16 and 17 to verify that they continue to work with
>> this change.
>>
>> Signed-off-by: Jason Baron <jbaron@redhat.com>
> 
> Awesome, a lot cleaner now :).
> 
> Acked-by: Alexander Graf <agraf@suse.de>

Thanks, applied to block-next.

Kevin

Patch

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 3d41771..97a0fa9 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1175,7 +1175,6 @@  void ahci_init(AHCIState *s, DeviceState *qdev, DMAContext *dma, int ports)
         ad->port_no = i;
         ad->port.dma = &ad->dma;
         ad->port.dma->ops = &ahci_dma_ops;
-        ad->port_regs.cmd = PORT_CMD_SPIN_UP | PORT_CMD_POWER_ON;
     }
 }
 
@@ -1199,6 +1198,7 @@  void ahci_reset(AHCIState *s)
         pr->irq_stat = 0;
         pr->irq_mask = 0;
         pr->scr_ctl = 0;
+        pr->cmd = PORT_CMD_SPIN_UP | PORT_CMD_POWER_ON;
         ahci_reset_port(s, i);
     }
 }