SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/loongarch/virt: Use MemTxAttrs interface for misc ops

Browse Source 
Use MemTxAttrs interface read_with_attrs/write_with_attrs
for virt_iocsr_misc_ops.

Signed-off-by: Song Gao <gaosong@loongson.cn>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
Message-Id: <20240528083855.1912757-3-gaosong@loongson.cn>
This commit is contained in:
Song Gao 2024-05-28 16:38:54 +08:00
parent dc6f37eb95
commit f2e61edb29
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hw/loongarch/virt.c
View File

@ -900,37 +900,49 @@ static void virt_firmware_init(LoongArchVirtMachineState *lvms)
} }
static void virt_iocsr_misc_write(void *opaque, hwaddr addr, static MemTxResult virt_iocsr_misc_write(void *opaque, hwaddr addr,
uint64_t val, unsigned size) uint64_t val, unsigned size,
MemTxAttrs attrs)
{ {
return MEMTX_OK;
} }
static uint64_t virt_iocsr_misc_read(void *opaque, hwaddr addr, unsigned size) static MemTxResult virt_iocsr_misc_read(void *opaque, hwaddr addr,
uint64_t *data,
unsigned size, MemTxAttrs attrs)
{ {
uint64_t ret; uint64_t ret = 0;
switch (addr) { switch (addr) {
case VERSION_REG: case VERSION_REG:
return 0x11ULL; ret = 0x11ULL;
break;
case FEATURE_REG: case FEATURE_REG:
ret = BIT(IOCSRF_MSI) | BIT(IOCSRF_EXTIOI) | BIT(IOCSRF_CSRIPI); ret = BIT(IOCSRF_MSI) | BIT(IOCSRF_EXTIOI) | BIT(IOCSRF_CSRIPI);
if (kvm_enabled()) { if (kvm_enabled()) {
ret |= BIT(IOCSRF_VM); ret |= BIT(IOCSRF_VM);
} }
return ret; break;
case VENDOR_REG: case VENDOR_REG:
return 0x6e6f73676e6f6f4cULL; /* "Loongson" */ ret = 0x6e6f73676e6f6f4cULL; /* "Loongson" */
break;
case CPUNAME_REG: case CPUNAME_REG:
return 0x303030354133ULL; /* "3A5000" */ ret = 0x303030354133ULL; /* "3A5000" */
break;
case MISC_FUNC_REG: case MISC_FUNC_REG:
return BIT_ULL(IOCSRM_EXTIOI_EN); ret = BIT_ULL(IOCSRM_EXTIOI_EN);
break;
default:
g_assert_not_reached();
} }
return 0ULL;
*data = ret;
return MEMTX_OK;
} }
static const MemoryRegionOps virt_iocsr_misc_ops = { static const MemoryRegionOps virt_iocsr_misc_ops = {
.read = virt_iocsr_misc_read, .read_with_attrs = virt_iocsr_misc_read,
.write = virt_iocsr_misc_write, .write_with_attrs = virt_iocsr_misc_write,
.endianness = DEVICE_LITTLE_ENDIAN, .endianness = DEVICE_LITTLE_ENDIAN,
.valid = { .valid = {
.min_access_size = 4, .min_access_size = 4,