On 29 June 2018 at 14:29, Luc Michel <luc.michel@greensocs.com> wrote:
> Implement virtualization extensions in the gic_cpu_read() and
> gic_cpu_write() functions. Those are the last bits missing to fully
> support virtualization extensions in the CPU interface path.
>
> Signed-off-by: Luc Michel <luc.michel@greensocs.com>
> ---
> hw/intc/arm_gic.c | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
> index 434dc9c7b2..2b1fa280eb 100644
> --- a/hw/intc/arm_gic.c
> +++ b/hw/intc/arm_gic.c
> @@ -1336,9 +1336,12 @@ static MemTxResult gic_cpu_read(GICState *s, int cpu, int offset,
> case 0xd0: case 0xd4: case 0xd8: case 0xdc:
> {
> int regno = (offset - 0xd0) / 4;
> + int nr_aprs = gic_is_vcpu(cpu) ? GIC_VIRT_NR_APRS : GIC_NR_APRS;
>
> - if (regno >= GIC_NR_APRS || s->revision != 2) {
> + if (regno >= nr_aprs || s->revision != 2) {
> *data = 0;
> + } else if (gic_is_vcpu(cpu)) {
> + *data = s->h_apr[gic_get_vcpu_real_id(cpu)];
> } else if (gic_cpu_ns_access(s, cpu, attrs)) {
> /* NS view of GICC_APR<n> is the top half of GIC_NSAPR<n> */
> *data = gic_apr_ns_view(s, regno, cpu);
> @@ -1352,7 +1355,7 @@ static MemTxResult gic_cpu_read(GICState *s, int cpu, int offset,
> int regno = (offset - 0xe0) / 4;
>
> if (regno >= GIC_NR_APRS || s->revision != 2 || !gic_has_groups(s) ||
> - gic_cpu_ns_access(s, cpu, attrs)) {
> + gic_cpu_ns_access(s, cpu, attrs) || gic_is_vcpu(cpu)) {
> *data = 0;
> } else {
> *data = s->nsapr[regno][cpu];
> @@ -1387,7 +1390,8 @@ static MemTxResult gic_cpu_write(GICState *s, int cpu, int offset,
> s->abpr[cpu] = MAX(value & 0x7, GIC_MIN_ABPR);
> }
> } else {
> - s->bpr[cpu] = MAX(value & 0x7, GIC_MIN_BPR);
> + int min_bpr = gic_is_vcpu(cpu) ? GIC_VIRT_MIN_BPR : GIC_MIN_BPR;
> + s->bpr[cpu] = MAX(value & 0x7, min_bpr);
> }
> break;
> case 0x10: /* End Of Interrupt */
> @@ -1404,11 +1408,14 @@ static MemTxResult gic_cpu_write(GICState *s, int cpu, int offset,
> case 0xd0: case 0xd4: case 0xd8: case 0xdc:
> {
> int regno = (offset - 0xd0) / 4;
> + int nr_aprs = gic_is_vcpu(cpu) ? GIC_VIRT_NR_APRS : GIC_NR_APRS;
>
> - if (regno >= GIC_NR_APRS || s->revision != 2) {
> + if (regno >= nr_aprs || s->revision != 2) {
> return MEMTX_OK;
> }
> - if (gic_cpu_ns_access(s, cpu, attrs)) {
> + if (gic_is_vcpu(cpu)) {
> + s->h_apr[gic_get_vcpu_real_id(cpu)] = value;
> + } else if (gic_cpu_ns_access(s, cpu, attrs)) {
> /* NS view of GICC_APR<n> is the top half of GIC_NSAPR<n> */
> gic_apr_write_ns_view(s, regno, cpu, value);
> } else {
> @@ -1423,6 +1430,9 @@ static MemTxResult gic_cpu_write(GICState *s, int cpu, int offset,
> if (regno >= GIC_NR_APRS || s->revision != 2) {
> return MEMTX_OK;
> }
> + if (gic_is_vcpu(cpu)) {
> + return MEMTX_OK;
> + }
> if (!gic_has_groups(s) || (gic_cpu_ns_access(s, cpu, attrs))) {
> return MEMTX_OK;
> }
> --
> 2.17.1
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
thanks
-- PMM