Skip to content

AHCI emulation support v7

Alexander Graf qemu-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest10 patches 7 repliesIn review

v1 -> v2 from the cover letter

- rename IDEExtender to IDEBusOps and make a pointer (kraxel)
- make dma hooks explicit by putting them into ops struct (stefanha)
- use qdev buses (kraxel)
- minor cleanups
- dprintf overhaul
- add reset function

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/10ide: split ide command interpretation offhw/ide/core.c hw/ide/internal.h+16 -61 reply
2/10ide: fix whitespace gap in ide_exec_cmdhw/ide/core.c+367 -3671 reply
3/10ide: add support for ide bus opshw/ide/core.c hw/ide/internal.h+54 -80 replies
4/10ide: add DMA hooks to bus opshw/ide/core.c hw/ide/internal.h+10 -31 reply
5/10ide: add ncq identify data for ahci sata driveshw/ide/core.c hw/ide/internal.h+9 -01 reply
6/10pci: add storage class for satahw/pci_ids.h+1 -01 reply
7/10pci: add ich7 pci idhw/pci.h+1 -01 reply
8/10ahci: add ahci emulationMakefile.objs hw/ide/ahci.c+1376 -00 replies
9/10ide: move pata specific parts to pata.cMakefile.objs hw/ide/core.c hw/ide/internal.h +1 more+184 -1431 reply
10/10config: add ahci for pci capable machinesdefault-configs/pci.mak+1 -00 replies

Reviews trailers per patch

7 of 10 patches have a Reviewed-by or Acked-by.

PatchStefan Hajnoczi
1/10R-b
2/10R-b
3/10
4/10R-b
5/10R-b
6/10R-b
7/10R-b
8/10
9/10R-b
10/10

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [Qemu-devel] [PATCH 00/10] AHCI emulation support v7

This patch adds support for AHCI emulation. I have tested and verified it works in Linux, OpenBSD, Windows Vista and Windows 7. This AHCI emulation supports NCQ, so multiple read or write requests can be outstanding at the same time.

The code is however not fully optimized yet. I'm fairly sure that there are low hanging performance fruits to be found still :). In my simple benchmarks I achieved about 2/3rd of virtio performance.

Also, this AHCI emulation layer does not support legacy mode. So if you're using a disk with this emulation, you do not get it exposed using the legacy IDE interfaces.

Another nitpick is CD-ROM support in Windows. Somehow it doesn't detect a CD-ROM drive attached to AHCI. At least it doesn't list it.

To attach an AHCI disk to your VM, please use

  -drive id=disk,file=...,if=none -device ahci,id=ahci \
  -device ide-drive,drive=disk,bus=ahci.0

Big endian hosts are still broken due to qemu shortcomings in mmio handing. With the mmio endianness patch set, ahci works there too.

This patch set is based on work done during the Google Summer of Code. I was mentoring a student, Roland Elek, who wrote most of the AHCI emulation code based on a patch from Chong Qiao. A bunch of other people were also involved, so everybody who I didn't mention - thanks a lot!

git://repo.or.cz/qemu/ahci.git ahci

v1 -> v2:

- rename IDEExtender to IDEBusOps and make a pointer (kraxel)
- make dma hooks explicit by putting them into ops struct (stefanha)
- use qdev buses (kraxel)
- minor cleanups
- dprintf overhaul
- add reset function

v2 -> v3:

- add msi support (kraxel)
- use MIN macro (kraxel)
- add msi support (kraxel)
- fix ncq with multiple ports
- zap qdev properties (kraxel)
- redesign legacy IF_SATA hooks (kraxel)
- don't build ahci as part of target
- move to ide/ (kwolf)

v3 -> v4:

- prepare for endianness safety
- add lspci dump (herbszt)
- use ich7 instead of ich7m (herbszt)
- fix lst+fis mapping (kraxel)
- coding style (blue swirl)
- explicit mmio setters/getters (blue swirl)
- split pata code out to pata.c (kwolf)
- only include config-devices.h in machine description (blue swirl)

v4 -> v5:

- s/H2dNcqFis/NCQFrame/g (blue swirl)
- redo -drive magic (blue swirl)
- bump BAR to 4k
- rename ICH7_AHCI to ICH7_AHCI_RAID (herbszt)
- drop device config header (blue swirl)

v5 -> v6:
- PCI config space fixes (isaku)
- remove CONFIG_AHCI from x86 default configs (paul brook)
- use snprintf (blue swirl)
- add generic PCI config file (paul brook)
- build ahci on all PCI platforms (paul brook)

v6 -> v7:

- use bus instead of opaque (stefanha)
- change naming in IDEBusOps (stefanha, kwolf)
- rename IDEBusOps (stefanha)
- improve interrupt injection
- combine tfdata code paths
- update tfdata more often
- reset port registers on port reset
- improve debug output
- add "feature" variable from fis for some extended commands
- always set feature to DMA for atapi
- osx 10.5.0 works as of this version
- use non-raid ich7 ahci (herbszt)
- reflect normal ich7 in pci dump
- stick to new IDEBusOps (stefanha, kwolf)
- stefan's ahci comments

Alexander Graf (8):
ide: split ide command interpretation off
ide: fix whitespace gap in ide_exec_cmd
ide: add DMA hooks to bus ops
pci: add storage class for sata
pci: add ich7 pci id
ahci: add ahci emulation
ide: move pata specific parts to pata.c
config: add ahci for pci capable machines

Roland Elek (2):
ide: add support for ide bus ops
ide: add ncq identify data for ahci sata drives

 Makefile.objs           |    3 +-
 default-configs/pci.mak |    1 +
 hw/ide/ahci.c           | 1375 +++++++++++++++++++++++++++++++++++++++++++++++
 hw/ide/core.c           |  874 ++++++++++++++-----------------
 hw/ide/internal.h       |   37 +-
 hw/ide/pata.c           |  178 ++++++
 hw/pci.h                |    1 +
 hw/pci_ids.h            |    1 +
 8 files changed, 1981 insertions(+), 489 deletions(-)
 create mode 100644 hw/ide/ahci.c
 create mode 100644 hw/ide/pata.c