motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/riscv/riscv-iommu: add riscv-iommu-hpm file

Browse source 
The HPM (Hardware Performance Monitor) support consists of almost 7
hundred lines that would be put on top of the base riscv-iommu
emulation.

To avoid clogging riscv-iommu.c, add a separated riscv-iommu-hpm file
that will contain HPM specific code.

We'll start by adding riscv_iommu_hpmcycle_read(), a helper that will be
called during the riscv_iommu_mmio_read() callback.

This change will have no effect on the existing emulation since we're
not declaring HPM feature support.

Signed-off-by: Tomasz Jeznach <tjeznach@rivosinc.com>
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20250224190826.1858473-4-dbarboza@ventanamicro.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Tomasz Jeznach 2025-02-24 16:08:18 -03:00 • committed by Alistair Francis
parent 045b19afc9
commit 4faea7e084
5 changed files with 110 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
hw/riscv/riscv-iommu.c
View file

@ -29,6 +29,7 @@
#include "cpu_bits.h"
#include "riscv-iommu.h"
#include "riscv-iommu-bits.h"
#include "riscv-iommu-hpm.h"
#include "trace.h"
#define LIMIT_CACHE_CTX (1U << 7)
@ -2153,7 +2154,28 @@ static MemTxResult riscv_iommu_mmio_read(void *opaque, hwaddr addr,
return MEMTX_ACCESS_ERROR;
}
ptr = &s->regs_rw[addr];
/* Compute cycle register value. */
if ((addr & ~7) == RISCV_IOMMU_REG_IOHPMCYCLES) {
val = riscv_iommu_hpmcycle_read(s);
ptr = (uint8_t *)&val + (addr & 7);
} else if ((addr & ~3) == RISCV_IOMMU_REG_IOCOUNTOVF) {
/*
* Software can read RISCV_IOMMU_REG_IOCOUNTOVF before timer
* callback completes. In which case CY_OF bit in
* RISCV_IOMMU_IOHPMCYCLES_OVF would be 0. Here we take the
* CY_OF bit state from RISCV_IOMMU_REG_IOHPMCYCLES register as
* it's not dependent over the timer callback and is computed
* from cycle overflow.
*/
val = ldq_le_p(&s->regs_rw[addr]);
val |= (riscv_iommu_hpmcycle_read(s) & RISCV_IOMMU_IOHPMCYCLES_OVF)
? RISCV_IOMMU_IOCOUNTOVF_CY
: 0;
ptr = (uint8_t *)&val + (addr & 3);
} else {
ptr = &s->regs_rw[addr];
}
val = ldn_le_p(ptr, size);
*data = val;