Re: [Qemu-devel] [PATCH 2/4] 40p and prep: implement PCI bus mastering

2019-04-14 Thread Hervé Poussineau 

Le 12/04/2019 à 23:06, Artyom Tarasenko a écrit :

Signed-off-by: Artyom Tarasenko 
---
  hw/pci-host/prep.c | 16 
  1 file changed, 12 insertions(+), 4 deletions(-)


Reviewed-by: Hervé Poussineau

[Qemu-devel] [PATCH 2/4] 40p and prep: implement PCI bus mastering

2019-04-12 Thread Artyom Tarasenko 
Signed-off-by: Artyom Tarasenko 
---
 hw/pci-host/prep.c | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c
index 8b9e1fd..94b7465 100644
--- a/hw/pci-host/prep.c
+++ b/hw/pci-host/prep.c
@@ -62,6 +62,7 @@ typedef struct PRePPCIState {
 AddressSpace pci_io_as;
 MemoryRegion pci_io;
 MemoryRegion pci_io_non_contiguous;
+MemoryRegion pci_io_system;
 MemoryRegion pci_memory;
 MemoryRegion pci_intack;
 MemoryRegion bm;
@@ -146,7 +147,7 @@ static uint64_t raven_io_read(void *opaque, hwaddr addr,
 uint8_t buf[4];
 
 addr = raven_io_address(s, addr);
-address_space_read(>pci_io_as, addr + 0x8000,
+address_space_read(>pci_io_as, addr,
MEMTXATTRS_UNSPECIFIED, buf, size);
 
 if (size == 1) {
@@ -178,7 +179,7 @@ static void raven_io_write(void *opaque, hwaddr addr,
 g_assert_not_reached();
 }
 
-address_space_write(>pci_io_as, addr + 0x8000,
+address_space_write(>pci_io_as, addr,
 MEMTXATTRS_UNSPECIFIED, buf, size);
 }
 
@@ -276,14 +277,21 @@ static void raven_pcihost_initfn(Object *obj)
 MemoryRegion *address_space_mem = get_system_memory();
 DeviceState *pci_dev;
 
-memory_region_init(>pci_io, obj, "pci-io", 0x3f80);
+memory_region_init(>pci_io, obj, "pci-io", UINT32_MAX);
 memory_region_init_io(>pci_io_non_contiguous, obj, _io_ops, s,
   "pci-io-non-contiguous", 0x0080);
 memory_region_init(>pci_memory, obj, "pci-memory", 0x3f00);
 address_space_init(>pci_io_as, >pci_io, "raven-io");
 
 /* CPU address space */
-memory_region_add_subregion(address_space_mem, 0x8000, >pci_io);
+memory_region_add_subregion_overlap(address_space_mem, 0x0,
+>pci_io, -1);
+
+memory_region_init_alias(>pci_io_system,  obj, "pci-io-system",
+ >pci_io, 0x000, 0x3f80);
+
+memory_region_add_subregion(address_space_mem, 0x8000,
+>pci_io_system);
 memory_region_add_subregion_overlap(address_space_mem, 0x8000,
 >pci_io_non_contiguous, 1);
 memory_region_add_subregion(address_space_mem, 0xc000, >pci_memory);
-- 
2.7.2