diff options
author | Eric Auger <eric.auger@redhat.com> | 2020-04-02 16:52:21 +0200 |
---|---|---|
committer | Andrew Jones <drjones@redhat.com> | 2020-04-03 10:03:45 +0200 |
commit | 80374e12c3efa647e186efc4f5573669951c4f11 (patch) | |
tree | b7656c26ee5c6906f356d6d262e08d7346c3c401 | |
parent | ba74b1063d21003ff7de7a84af121af2d3663c1f (diff) | |
download | kvm-unit-tests-80374e12c3efa647e186efc4f5573669951c4f11.tar.gz |
arm/arm64: ITS: its_enable_defaults
its_enable_defaults() enable LPIs at redistributor level
and ITS level.
gicv3_enable_defaults must be called before.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Zenghui Yu <yuzenghui@huawei.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
-rw-r--r-- | lib/arm/asm/gic-v3.h | 6 | ||||
-rw-r--r-- | lib/arm/gic-v3.c | 25 | ||||
-rw-r--r-- | lib/arm64/asm/gic-v3-its.h | 1 | ||||
-rw-r--r-- | lib/arm64/gic-v3-its.c | 13 |
4 files changed, 45 insertions, 0 deletions
diff --git a/lib/arm/asm/gic-v3.h b/lib/arm/asm/gic-v3.h index fedffa8..cb72922 100644 --- a/lib/arm/asm/gic-v3.h +++ b/lib/arm/asm/gic-v3.h @@ -57,6 +57,10 @@ #define LPI_PROP_DEFAULT_PRIO 0xa0 #define LPI_PROP_DEFAULT (LPI_PROP_DEFAULT_PRIO | LPI_PROP_GROUP1 | LPI_PROP_ENABLED) +#define LPI_ID_BASE 8192 +#define LPI(lpi) ((lpi) + LPI_ID_BASE) +#define LPI_OFFSET(intid) ((intid) - LPI_ID_BASE) + #include <asm/arch_gicv3.h> #ifndef __ASSEMBLY__ @@ -93,6 +97,8 @@ extern void gicv3_ipi_send_mask(int irq, const cpumask_t *dest); extern void gicv3_set_redist_base(size_t stride); extern void gicv3_lpi_set_clr_pending(int rdist, int n, bool set); extern void gicv3_lpi_alloc_tables(void); +extern void gicv3_lpi_rdist_enable(int redist); +extern void gicv3_lpi_rdist_disable(int redist); static inline void gicv3_do_wait_for_rwp(void *base) { diff --git a/lib/arm/gic-v3.c b/lib/arm/gic-v3.c index 6cf1d1d..a7e2cb8 100644 --- a/lib/arm/gic-v3.c +++ b/lib/arm/gic-v3.c @@ -199,4 +199,29 @@ void gicv3_lpi_set_clr_pending(int rdist, int n, bool set) byte &= ~mask; *ptr = byte; } + +static void gicv3_lpi_rdist_ctrl(u32 redist, bool set) +{ + void *ptr; + u64 val; + + assert(redist < nr_cpus); + + ptr = gicv3_data.redist_base[redist]; + val = readl(ptr + GICR_CTLR); + if (set) + val |= GICR_CTLR_ENABLE_LPIS; + else + val &= ~GICR_CTLR_ENABLE_LPIS; + writel(val, ptr + GICR_CTLR); +} + +void gicv3_lpi_rdist_enable(int redist) +{ + gicv3_lpi_rdist_ctrl(redist, true); +} +void gicv3_lpi_rdist_disable(int redist) +{ + gicv3_lpi_rdist_ctrl(redist, false); +} #endif /* __aarch64__ */ diff --git a/lib/arm64/asm/gic-v3-its.h b/lib/arm64/asm/gic-v3-its.h index c0bd58c..7e03e4c 100644 --- a/lib/arm64/asm/gic-v3-its.h +++ b/lib/arm64/asm/gic-v3-its.h @@ -92,5 +92,6 @@ extern struct its_data its_data; extern void its_parse_typer(void); extern void its_init(void); extern int its_baser_lookup(int i, struct its_baser *baser); +extern void its_enable_defaults(void); #endif /* _ASMARM64_GIC_V3_ITS_H_ */ diff --git a/lib/arm64/gic-v3-its.c b/lib/arm64/gic-v3-its.c index 04dde97..cf176b7 100644 --- a/lib/arm64/gic-v3-its.c +++ b/lib/arm64/gic-v3-its.c @@ -96,3 +96,16 @@ void its_init(void) its_cmd_queue_init(); } +/* must be called after gicv3_enable_defaults */ +void its_enable_defaults(void) +{ + int cpu; + + /* Allocate LPI config and pending tables */ + gicv3_lpi_alloc_tables(); + + for_each_present_cpu(cpu) + gicv3_lpi_rdist_enable(cpu); + + writel(GITS_CTLR_ENABLE, its_data.base + GITS_CTLR); +} |