mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/alpha/typhoon: Stop calling cpu_unassigned_access()

Browse Source 
The typhoon MemoryRegionOps callbacks directly call
cpu_unassigned_access(), presumably as the old-fashioned way
to provoke a CPU exception.  This won't work since commit
6ad4d7eed0 when we switched Alpha over to the
transaction_failed hook API, because now cpu_unassigned_access()
is a no-op for Alpha.

Make the MemoryRegionOps callbacks use the read_with_attrs
and write_with_attrs hooks, so they can signal a failure
that should cause a CPU exception by returning MEMTX_ERROR.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20181210173350.13073-1-peter.maydell@linaro.org>
Tested-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Peter Maydell 2018-12-10 17:33:50 +00:00 committed by Richard Henderson
parent c102d9471f
commit b7ed683a8d
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
hw/alpha/typhoon.c
View File

@ -75,7 +75,9 @@ static void cpu_irq_change(AlphaCPU *cpu, uint64_t req)
} }
} }
static uint64_t cchip_read(void *opaque, hwaddr addr, unsigned size) static MemTxResult cchip_read(void *opaque, hwaddr addr,
uint64_t *data, unsigned size,
MemTxAttrs attrs)
{ {
CPUState *cpu = current_cpu; CPUState *cpu = current_cpu;
TyphoonState *s = opaque; TyphoonState *s = opaque;
@ -196,11 +198,11 @@ static uint64_t cchip_read(void *opaque, hwaddr addr, unsigned size)
break; break;
default: default:
cpu_unassigned_access(cpu, addr, false, false, 0, size); return MEMTX_ERROR;
return -1;
} }
return ret; *data = ret;
return MEMTX_OK;
} }
static uint64_t dchip_read(void *opaque, hwaddr addr, unsigned size) static uint64_t dchip_read(void *opaque, hwaddr addr, unsigned size)
@ -209,7 +211,8 @@ static uint64_t dchip_read(void *opaque, hwaddr addr, unsigned size)
return 0; return 0;
} }
static uint64_t pchip_read(void *opaque, hwaddr addr, unsigned size) static MemTxResult pchip_read(void *opaque, hwaddr addr, uint64_t *data,
unsigned size, MemTxAttrs attrs)
{ {
TyphoonState *s = opaque; TyphoonState *s = opaque;
uint64_t ret = 0; uint64_t ret = 0;
@ -294,15 +297,16 @@ static uint64_t pchip_read(void *opaque, hwaddr addr, unsigned size)
break; break;
default: default:
cpu_unassigned_access(current_cpu, addr, false, false, 0, size); return MEMTX_ERROR;
return -1;
} }
return ret; *data = ret;
return MEMTX_OK;
} }
static void cchip_write(void *opaque, hwaddr addr, static MemTxResult cchip_write(void *opaque, hwaddr addr,
uint64_t val, unsigned size) uint64_t val, unsigned size,
MemTxAttrs attrs)
{ {
TyphoonState *s = opaque; TyphoonState *s = opaque;
uint64_t oldval, newval; uint64_t oldval, newval;
@ -446,9 +450,10 @@ static void cchip_write(void *opaque, hwaddr addr,
break; break;
default: default:
cpu_unassigned_access(current_cpu, addr, true, false, 0, size); return MEMTX_ERROR;
return;
} }
return MEMTX_OK;
} }
static void dchip_write(void *opaque, hwaddr addr, static void dchip_write(void *opaque, hwaddr addr,
@ -457,8 +462,9 @@ static void dchip_write(void *opaque, hwaddr addr,
/* Skip this. It's all related to DRAM timing and setup. */ /* Skip this. It's all related to DRAM timing and setup. */
} }
static void pchip_write(void *opaque, hwaddr addr, static MemTxResult pchip_write(void *opaque, hwaddr addr,
uint64_t val, unsigned size) uint64_t val, unsigned size,
MemTxAttrs attrs)
{ {
TyphoonState *s = opaque; TyphoonState *s = opaque;
uint64_t oldval; uint64_t oldval;
@ -553,14 +559,15 @@ static void pchip_write(void *opaque, hwaddr addr,
break; break;
default: default:
cpu_unassigned_access(current_cpu, addr, true, false, 0, size); return MEMTX_ERROR;
return;
} }
return MEMTX_OK;
} }
static const MemoryRegionOps cchip_ops = { static const MemoryRegionOps cchip_ops = {
.read = cchip_read, .read_with_attrs = cchip_read,
.write = cchip_write, .write_with_attrs = cchip_write,
.endianness = DEVICE_LITTLE_ENDIAN, .endianness = DEVICE_LITTLE_ENDIAN,
.valid = { .valid = {
.min_access_size = 8, .min_access_size = 8,
@ -587,8 +594,8 @@ static const MemoryRegionOps dchip_ops = {
}; };
static const MemoryRegionOps pchip_ops = { static const MemoryRegionOps pchip_ops = {
.read = pchip_read, .read_with_attrs = pchip_read,
.write = pchip_write, .write_with_attrs = pchip_write,
.endianness = DEVICE_LITTLE_ENDIAN, .endianness = DEVICE_LITTLE_ENDIAN,
.valid = { .valid = {
.min_access_size = 8, .min_access_size = 8,