ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PCI IDE: Use PCI DMA stub functions 

This updates the PCI IDE device emulation to use the explicit PCI DMA
wrapper to initialize its scatter/gathjer structure.  This means this
driver should not need further changes when the sglist interface is
extended to support IOMMUs.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
David Gibson 2011-10-31 17:06:56 +11:00 committed by Anthony Liguori
parent fa0ce55c71
commit 552908fef5
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/ide/pci.c
View File

@ -62,7 +62,8 @@ static int bmdma_prepare_buf(IDEDMA *dma, int is_write)
} prd; } prd;
int l, len; int l, len;
qemu_sglist_init(&s->sg, s->nsector / (BMDMA_PAGE_SIZE / 512) + 1); pci_dma_sglist_init(&s->sg, &bm->pci_dev->dev,
s->nsector / (BMDMA_PAGE_SIZE / 512) + 1);
s->io_buffer_size = 0; s->io_buffer_size = 0;
for(;;) { for(;;) {
if (bm->cur_prd_len == 0) { if (bm->cur_prd_len == 0) {
@ -70,7 +71,7 @@ static int bmdma_prepare_buf(IDEDMA *dma, int is_write)
if (bm->cur_prd_last || if (bm->cur_prd_last ||
(bm->cur_addr - bm->addr) >= BMDMA_PAGE_SIZE) (bm->cur_addr - bm->addr) >= BMDMA_PAGE_SIZE)
return s->io_buffer_size != 0; return s->io_buffer_size != 0;
cpu_physical_memory_read(bm->cur_addr, (uint8_t *)&prd, 8); pci_dma_read(&bm->pci_dev->dev, bm->cur_addr, (uint8_t *)&prd, 8);
bm->cur_addr += 8; bm->cur_addr += 8;
prd.addr = le32_to_cpu(prd.addr); prd.addr = le32_to_cpu(prd.addr);
prd.size = le32_to_cpu(prd.size); prd.size = le32_to_cpu(prd.size);
@ -112,7 +113,7 @@ static int bmdma_rw_buf(IDEDMA *dma, int is_write)
if (bm->cur_prd_last || if (bm->cur_prd_last ||
(bm->cur_addr - bm->addr) >= BMDMA_PAGE_SIZE) (bm->cur_addr - bm->addr) >= BMDMA_PAGE_SIZE)
return 0; return 0;
cpu_physical_memory_read(bm->cur_addr, (uint8_t *)&prd, 8); pci_dma_read(&bm->pci_dev->dev, bm->cur_addr, (uint8_t *)&prd, 8);
bm->cur_addr += 8; bm->cur_addr += 8;
prd.addr = le32_to_cpu(prd.addr); prd.addr = le32_to_cpu(prd.addr);
prd.size = le32_to_cpu(prd.size); prd.size = le32_to_cpu(prd.size);
@ -127,11 +128,11 @@ static int bmdma_rw_buf(IDEDMA *dma, int is_write)
l = bm->cur_prd_len; l = bm->cur_prd_len;
if (l > 0) { if (l > 0) {
if (is_write) { if (is_write) {
cpu_physical_memory_write(bm->cur_prd_addr, pci_dma_write(&bm->pci_dev->dev, bm->cur_prd_addr,
s->io_buffer + s->io_buffer_index, l); s->io_buffer + s->io_buffer_index, l);
} else { } else {
cpu_physical_memory_read(bm->cur_prd_addr, pci_dma_read(&bm->pci_dev->dev, bm->cur_prd_addr,
s->io_buffer + s->io_buffer_index, l); s->io_buffer + s->io_buffer_index, l);
} }
bm->cur_prd_addr += l; bm->cur_prd_addr += l;
bm->cur_prd_len -= l; bm->cur_prd_len -= l;
@ -326,7 +327,7 @@ void bmdma_cmd_writeb(BMDMAState *bm, uint32_t val)
bm->cmd = val & 0x09; bm->cmd = val & 0x09;
} }
static uint64_t bmdma_addr_read(void *opaque, target_phys_addr_t addr, static uint64_t bmdma_addr_read(void *opaque, dma_addr_t addr,
unsigned width) unsigned width)
{ {
BMDMAState *bm = opaque; BMDMAState *bm = opaque;
@ -340,7 +341,7 @@ static uint64_t bmdma_addr_read(void *opaque, target_phys_addr_t addr,
return data; return data;
} }
static void bmdma_addr_write(void *opaque, target_phys_addr_t addr, static void bmdma_addr_write(void *opaque, dma_addr_t addr,
uint64_t data, unsigned width) uint64_t data, unsigned width)
{ {
BMDMAState *bm = opaque; BMDMAState *bm = opaque;