vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apb: fix IOMMU register sizes 

According to the referenced documentation, the IOMMU has 3 64-bit registers
consisting of a control register, base register and flush register.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
master
Mark Cave-Ayland 2014-05-28 08:28:21 +01:00
parent ea9a6606b1
commit fd7fbc8ff7
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/pci-host/apb.c
View File

@ -71,7 +71,7 @@ do { printf("APB: " fmt , ## __VA_ARGS__); } while (0)
#define NO_IRQ_REQUEST (MAX_IVEC + 1) #define NO_IRQ_REQUEST (MAX_IVEC + 1)
typedef struct IOMMUState { typedef struct IOMMUState {
uint32_t regs[4]; uint32_t regs[6];
} IOMMUState; } IOMMUState;
#define TYPE_APB "pbm" #define TYPE_APB "pbm"
@ -157,11 +157,9 @@ static void apb_config_writel (void *opaque, hwaddr addr,
case 0x30 ... 0x4f: /* DMA error registers */ case 0x30 ... 0x4f: /* DMA error registers */
/* XXX: not implemented yet */ /* XXX: not implemented yet */
break; break;
case 0x200 ... 0x20b: /* IOMMU */ case 0x200 ... 0x217: /* IOMMU */
is->regs[(addr & 0xf) >> 2] = val; is->regs[(addr & 0xf) >> 2] = val;
break; break;
case 0x20c ... 0x3ff: /* IOMMU flush */
break;
case 0xc00 ... 0xc3f: /* PCI interrupt control */ case 0xc00 ... 0xc3f: /* PCI interrupt control */
if (addr & 4) { if (addr & 4) {
unsigned int ino = (addr & 0x3f) >> 3; unsigned int ino = (addr & 0x3f) >> 3;
@ -241,12 +239,9 @@ static uint64_t apb_config_readl (void *opaque,
val = 0; val = 0;
/* XXX: not implemented yet */ /* XXX: not implemented yet */
break; break;
case 0x200 ... 0x20b: /* IOMMU */ case 0x200 ... 0x217: /* IOMMU */
val = is->regs[(addr & 0xf) >> 2]; val = is->regs[(addr & 0xf) >> 2];
break; break;
case 0x20c ... 0x3ff: /* IOMMU flush */
val = 0;
break;
case 0xc00 ... 0xc3f: /* PCI interrupt control */ case 0xc00 ... 0xc3f: /* PCI interrupt control */
if (addr & 4) { if (addr & 4) {
val = s->pci_irq_map[(addr & 0x3f) >> 3]; val = s->pci_irq_map[(addr & 0x3f) >> 3];