Fix unassigned memory and I/O access handling
v3 cover Fix unassigned memory and I/O access handling
Repost of what missed the 1.6 release.
Jan Kiszka (2):
memory: Provide separate handling of unassigned io ports accesses Revert "memory: Return -1 again on reads from unsigned regions"
exec.c | 3 ++- include/exec/ioport.h | 4 ++++ ioport.c | 16 ++++++++++++++++ memory.c | 2 +- 4 files changed, 23 insertions(+), 2 deletions(-)
Signature · 1 line
1.8.1.1.298.ge7eed54
PATCH v3 1/2 memory: Provide separate handling of unassigned io ports accesses
Accesses to unassigned io ports shall return -1 on read and be ignored on write. Ensure these properties via dedicated ops, decoupling us from the memory core's handling of unassigned accesses.
--- exec.c | 3 ++- include/exec/ioport.h | 4 ++++ ioport.c | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-)
exec.c +2 -1
@@ -1820,7 +1820,8 @@ static void memory_map_init(void)address_space_init (&address_space_memory, system_memory,"memory" ); system_io =g_malloc (sizeof (*system_io)); -memory_region_init (system_io,NULL ,"io" ,65536 ); +memory_region_init_io (system_io,NULL , &unassigned_io_ops,NULL ,"io" , +65536 );address_space_init (&address_space_io, system_io,"I/O" );memory_listener_register (&core_memory_listener, &address_space_memory);
include/exec/ioport.h +4 -0
@@ -45,6 +45,10 @@ typedef struct MemoryRegionPortio {#define PORTIO_END_OF_LIST () { } +#ifndef CONFIG_USER_ONLY +extern const MemoryRegionOps unassigned_io_ops; +#endif +void cpu_outb (pio_addr_t addr,uint8_t val);void cpu_outw (pio_addr_t addr,uint16_t val);void cpu_outl (pio_addr_t addr,uint32_t val);
ioport.c +16 -0
@@ -44,6 +44,22 @@ typedef struct MemoryRegionPortioList {MemoryRegionPortio ports[]; } MemoryRegionPortioList; +static uint64_t unassigned_io_read (void *opaque,hwaddr addr,unsigned size) +{ +return -1ULL ; +} + +static void unassigned_io_write (void *opaque,hwaddr addr,uint64_t val, +unsigned size) +{ +} + +const MemoryRegionOps unassigned_io_ops = { + .read = unassigned_io_read, + .write = unassigned_io_write, + .endianness =DEVICE_NATIVE_ENDIAN , +}; +void cpu_outb (pio_addr_t addr,uint8_t val) {LOG_IOPORT ("outb: %04" FMT_pioaddr" %02" PRIx8"\n" , addr, val);
Signature · 1 line
1.8.1.1.298.ge7eed54
PATCH v3 2/2 Revert "memory: Return -1 again on reads from unsigned regions"
In reply to Jan KiszkaThis reverts commit 9b8c69243585a32d14b9bb9fcd52c37b0b5a1b71.
The commit was wrong: We only return -1 on invalid accesses, not on valid but unbacked ones. This broke various corner cases.
--- memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
memory.c +1 -1
@@ -872,7 +872,7 @@ static uint64_t unassigned_mem_read(void *opaque, hwaddr addr,if (current_cpu !=NULL ) {cpu_unassigned_access (current_cpu, addr, false, false,0 , size); } -return -1ULL ; +return 0 ; } static void unassigned_mem_write(void *opaque, hwaddr addr,
Signature · 1 line
1.8.1.1.298.ge7eed54
Quoted 5 lines · Jan Kiszka
Repost of what missed the 1.6 release.
Jan Kiszka (2):
memory: Provide separate handling of unassigned io ports accesses Revert "memory: Return -1 again on reads from unsigned regions"
This fixes booting of integratorcp.
thanks
-- PMM
Am 02.09.2013 18:43, schrieb Jan Kiszka:
Quoted 5 lines
Repost of what missed the 1.6 release.
Jan Kiszka (2):
memory: Provide separate handling of unassigned io ports accesses Revert "memory: Return -1 again on reads from unsigned regions"
These were:
and they're also missing
in the commit messages to get them into 1.6.1 now.
Andreas
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg