[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [kvm-unit-tests RFC 03/15] arm/arm64: ITS skeleton
From: |
Andrew Jones |
Subject: |
Re: [Qemu-devel] [kvm-unit-tests RFC 03/15] arm/arm64: ITS skeleton |
Date: |
Tue, 6 Dec 2016 10:23:03 +0100 |
User-agent: |
Mutt/1.6.0.1 (2016-04-01) |
On Mon, Dec 05, 2016 at 10:46:34PM +0100, Eric Auger wrote:
> At the moment we just detect the presence of ITS as part of the
> GICv3 init routine and initialize its base address.
>
> Signed-off-by: Eric Auger <address@hidden>
> ---
> arm/Makefile.common | 1 +
> lib/arm/asm/gic-v3-its.h | 22 ++++++++++++++++++++++
> lib/arm/asm/gic.h | 1 +
> lib/arm/gic-v3-its.c | 9 +++++++++
> lib/arm/gic.c | 30 +++++++++++++++++++++++++-----
> lib/arm64/asm/gic-v3-its.h | 1 +
> 6 files changed, 59 insertions(+), 5 deletions(-)
> create mode 100644 lib/arm/asm/gic-v3-its.h
> create mode 100644 lib/arm/gic-v3-its.c
> create mode 100644 lib/arm64/asm/gic-v3-its.h
>
> diff --git a/arm/Makefile.common b/arm/Makefile.common
> index 6c0898f..070f349 100644
> --- a/arm/Makefile.common
> +++ b/arm/Makefile.common
> @@ -47,6 +47,7 @@ cflatobjs += lib/arm/bitops.o
> cflatobjs += lib/arm/psci.o
> cflatobjs += lib/arm/smp.o
> cflatobjs += lib/arm/gic.o lib/arm/gic-v2.o lib/arm/gic-v3.o
> +cflatobjs += lib/arm/gic-v3-its.o
>
> libeabi = lib/arm/libeabi.a
> eabiobjs = lib/arm/eabi_compat.o
> diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h
> new file mode 100644
> index 0000000..2044565
> --- /dev/null
> +++ b/lib/arm/asm/gic-v3-its.h
> @@ -0,0 +1,22 @@
> +/*
> + * All ITS* defines are lifted from include/linux/irqchip/arm-gic-v3.h
> + *
> + * Copyright (C) 2016, Red Hat Inc, Andrew Jones <address@hidden>
s/Andrew/Eric/
> + *
> + * This work is licensed under the terms of the GNU LGPL, version 2.
> + */
> +#ifndef _ASMARM_GIC_V3_ITS_H_
> +#define _ASMARM_GIC_V3_ITS_H_
> +
> +#ifndef __ASSEMBLY__
> +
> +struct its_data {
> + void *base;
> +};
> +
> +extern struct its_data its_data;
> +
> +#define gicv3_its_base() (its_data.base)
Can't we just add the ITS base address to the current gicv3_data struct?
> +
> +#endif /* !__ASSEMBLY__ */
> +#endif /* _ASMARM_GIC_V3_ITS_H_ */
> diff --git a/lib/arm/asm/gic.h b/lib/arm/asm/gic.h
> index ea5fde9..73d4502 100644
> --- a/lib/arm/asm/gic.h
> +++ b/lib/arm/asm/gic.h
> @@ -30,6 +30,7 @@
>
> #include <asm/gic-v2.h>
> #include <asm/gic-v3.h>
> +#include <asm/gic-v3-its.h>
>
> #ifndef __ASSEMBLY__
> #include <asm/cpumask.h>
> diff --git a/lib/arm/gic-v3-its.c b/lib/arm/gic-v3-its.c
> new file mode 100644
> index 0000000..e382b80
> --- /dev/null
> +++ b/lib/arm/gic-v3-its.c
> @@ -0,0 +1,9 @@
> +/*
> + * Copyright (C) 2016, Red Hat Inc, Eric Auger <address@hidden>
> + *
> + * This work is licensed under the terms of the GNU LGPL, version 2.
> + */
> +#include <asm/gic.h>
> +
> +struct its_data its_data;
> +
> diff --git a/lib/arm/gic.c b/lib/arm/gic.c
> index 957a146..e551abd 100644
> --- a/lib/arm/gic.c
> +++ b/lib/arm/gic.c
> @@ -6,6 +6,7 @@
> #include <devicetree.h>
> #include <asm/gic.h>
> #include <asm/io.h>
> +#include <asm/gic-v3-its.h>
>
> struct gic_common_ops *gic_common_ops;
>
> @@ -17,12 +18,14 @@ struct gicv3_data gicv3_data;
> * Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt
> */
> static bool
> -gic_get_dt_bases(const char *compatible, void **base1, void **base2)
> +gic_get_dt_bases(const char *compatible, void **base1, void **base2,
> + void **base3)
> {
> struct dt_pbus_reg reg;
> - struct dt_device gic;
> + struct dt_device gic, its;
> struct dt_bus bus;
> - int node, ret;
> + int node, subnode, ret, len;
> + const void *fdt = dt_fdt();
>
> dt_bus_init_defaults(&bus);
> dt_device_init(&gic, &bus, NULL);
> @@ -43,19 +46,36 @@ gic_get_dt_bases(const char *compatible, void **base1,
> void **base2)
> assert(ret == 0);
> *base2 = ioremap(reg.addr, reg.size);
>
> + if (base3 && !strcmp(compatible, "arm,gic-v3")) {
> + dt_for_each_subnode(node, subnode) {
> + const struct fdt_property *prop;
> +
> + prop = fdt_get_property(fdt, subnode,
> + "compatible", &len);
> + if (!strcmp((char *)prop->data, "arm,gic-v3-its")) {
> + dt_device_bind_node(&its, subnode);
> + ret = dt_pbus_translate(&its, 0, ®);
> + assert(ret == 0);
> + *base3 = ioremap(reg.addr, reg.size);
> + break;
> + }
> + }
> +
> + }
> +
> return true;
> }
>
> int gicv2_init(void)
> {
> return gic_get_dt_bases("arm,cortex-a15-gic",
> - &gicv2_data.dist_base, &gicv2_data.cpu_base);
> + &gicv2_data.dist_base, &gicv2_data.cpu_base, NULL);
> }
>
> int gicv3_init(void)
> {
> return gic_get_dt_bases("arm,gic-v3", &gicv3_data.dist_base,
> - &gicv3_data.redist_base[0]);
> + &gicv3_data.redist_base[0], &its_data.base);
> }
>
> int gic_init(void)
> diff --git a/lib/arm64/asm/gic-v3-its.h b/lib/arm64/asm/gic-v3-its.h
> new file mode 100644
> index 0000000..083cba4
> --- /dev/null
> +++ b/lib/arm64/asm/gic-v3-its.h
> @@ -0,0 +1 @@
> +#include "../../arm/asm/gic-v3-its.h"
> --
> 2.5.5
>
>
Thanks,
drew
- [Qemu-devel] [kvm-unit-tests RFC 00/15] arm/arm64: add ITS framework, Eric Auger, 2016/12/05
- [Qemu-devel] [kvm-unit-tests RFC 01/15] libcflat: Add other size defines, Eric Auger, 2016/12/05
- [Qemu-devel] [kvm-unit-tests RFC 02/15] arm/arm64: gicv3: Add some re-distributor defines, Eric Auger, 2016/12/05
- [Qemu-devel] [kvm-unit-tests RFC 03/15] arm/arm64: ITS skeleton, Eric Auger, 2016/12/05
- Re: [Qemu-devel] [kvm-unit-tests RFC 03/15] arm/arm64: ITS skeleton,
Andrew Jones <=
- [Qemu-devel] [kvm-unit-tests RFC 04/15] arm/arm64: ITS: BASER parsing and setup, Eric Auger, 2016/12/05
- [Qemu-devel] [kvm-unit-tests RFC 05/15] arm/arm64: GICv3: add cpu count, Eric Auger, 2016/12/05
- [Qemu-devel] [kvm-unit-tests RFC 06/15] arm/arm64: ITS: Set the LPI config and pending tables, Eric Auger, 2016/12/05
- [Qemu-devel] [kvm-unit-tests RFC 07/15] arm/arm64: ITS: Init the command queue, Eric Auger, 2016/12/05
- [Qemu-devel] [kvm-unit-tests RFC 10/15] arm/arm64: ITS: its_enable_defaults, Eric Auger, 2016/12/05
- [Qemu-devel] [kvm-unit-tests RFC 09/15] arm/arm64: ITS: Parse the typer register, Eric Auger, 2016/12/05
- [Qemu-devel] [kvm-unit-tests RFC 08/15] arm/arm64: ITS: enable LPIs at re-distributor level, Eric Auger, 2016/12/05