diff mbox series

[kvm-unit-tests,v4,07/13] arm/arm64: ITS: its_enable_defaults

Message ID 20200309102420.24498-8-eric.auger@redhat.com
State New
Headers show
Series arm/arm64: Add ITS tests | expand

Commit Message

Eric Auger March 9, 2020, 10:24 a.m. UTC 
its_enable_defaults() enable LPIs at distributor level
and ITS level.

gicv3_enable_defaults must be called before.

Signed-off-by: Eric Auger <eric.auger@redhat.com>

---
v3 -> v4:
- use GITS_BASER_INDIRECT & GITS_BASER_VALID in its_setup_baser()
- don't parse BASERs again in its_enable_defaults
- rename its_setup_baser into its_baser_alloc_table
- All allocations moved to the init function
- squashed "arm/arm64: gicv3: Enable/Disable LPIs at re-distributor level"
  into this patch
- introduce gicv3_lpi_rdist_enable and gicv3_lpi_rdist_disable
- pend and prop table bases stored as virt addresses
- move some init functions from enable() to its_init
- removed GICR_PROPBASER_IDBITS_MASK
- introduced LPI_OFFSET
- lpi_prop becomes u8 *
- gicv3_lpi_set_config/get_config became macro
- renamed gicv3_lpi_set_pending_table_bit into gicv3_lpi_set_clr_pending

v2 -> v3:
- introduce its_setup_baser in this patch
- squash "arm/arm64: ITS: Init the command queue" in this patch.
---
 lib/arm/asm/gic-v3.h       | 28 +++++++++++------
 lib/arm/gic-v3.c           | 64 ++++++++++++++++++++++----------------
 lib/arm64/asm/gic-v3-its.h |  1 +
 lib/arm64/gic-v3-its.c     | 16 ++++++++--
 4 files changed, 71 insertions(+), 38 deletions(-)

Comments

Andrew Jones March 9, 2020, 11:27 a.m. UTC | #1 
On Mon, Mar 09, 2020 at 11:24:14AM +0100, Eric Auger wrote:
> its_enable_defaults() enable LPIs at distributor level
> and ITS level.
> 
> gicv3_enable_defaults must be called before.
> 
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
> 
> ---
> v3 -> v4:
> - use GITS_BASER_INDIRECT & GITS_BASER_VALID in its_setup_baser()
> - don't parse BASERs again in its_enable_defaults
> - rename its_setup_baser into its_baser_alloc_table
> - All allocations moved to the init function
> - squashed "arm/arm64: gicv3: Enable/Disable LPIs at re-distributor level"
>   into this patch
> - introduce gicv3_lpi_rdist_enable and gicv3_lpi_rdist_disable
> - pend and prop table bases stored as virt addresses
> - move some init functions from enable() to its_init
> - removed GICR_PROPBASER_IDBITS_MASK
> - introduced LPI_OFFSET
> - lpi_prop becomes u8 *
> - gicv3_lpi_set_config/get_config became macro
> - renamed gicv3_lpi_set_pending_table_bit into gicv3_lpi_set_clr_pending
> 
> v2 -> v3:
> - introduce its_setup_baser in this patch
> - squash "arm/arm64: ITS: Init the command queue" in this patch.
> ---
>  lib/arm/asm/gic-v3.h       | 28 +++++++++++------
>  lib/arm/gic-v3.c           | 64 ++++++++++++++++++++++----------------
>  lib/arm64/asm/gic-v3-its.h |  1 +
>  lib/arm64/gic-v3-its.c     | 16 ++++++++--
>  4 files changed, 71 insertions(+), 38 deletions(-)
> 
> diff --git a/lib/arm/asm/gic-v3.h b/lib/arm/asm/gic-v3.h
> index 12134ef..ea9ae8e 100644
> --- a/lib/arm/asm/gic-v3.h
> +++ b/lib/arm/asm/gic-v3.h
> @@ -50,15 +50,16 @@
>  #define MPIDR_TO_SGI_AFFINITY(cluster_id, level) \
>  	(MPIDR_AFFINITY_LEVEL(cluster_id, level) << ICC_SGI1R_AFFINITY_## level ## _SHIFT)
>  
> -#define GICR_PROPBASER_IDBITS_MASK                      (0x1f)
> +#define GICR_PENDBASER_PTZ		BIT_ULL(62)
>  
> -#define GICR_PENDBASER_PTZ                              BIT_ULL(62)
> +#define LPI_PROP_GROUP1			(1 << 1)
> +#define LPI_PROP_ENABLED		(1 << 0)
> +#define LPI_PROP_DEFAULT_PRIO		0xa0
> +#define LPI_PROP_DEFAULT		(LPI_PROP_DEFAULT_PRIO | LPI_PROP_GROUP1 | LPI_PROP_ENABLED)
>  
> -#define LPI_PROP_GROUP1		(1 << 1)
> -#define LPI_PROP_ENABLED	(1 << 0)
> -#define LPI_PROP_DEFAULT_PRIO   0xa0
> -#define LPI_PROP_DEFAULT	(LPI_PROP_DEFAULT_PRIO | LPI_PROP_GROUP1 | \
> -				 LPI_PROP_ENABLED)

This reformatting should be squashed into 5/13.

> +#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>
>  
> @@ -76,7 +77,7 @@ struct gicv3_data {
>  	void *dist_base;
>  	void *redist_bases[GICV3_NR_REDISTS];
>  	void *redist_base[NR_CPUS];
> -	void *lpi_prop;
> +	u8 *lpi_prop;
>  	void *lpi_pend[NR_CPUS];
>  	unsigned int irq_nr;
>  };
> @@ -96,8 +97,10 @@ 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_config(int n, u8 val);
>  extern u8 gicv3_lpi_get_config(int n);
> -extern void gicv3_lpi_set_pending_table_bit(int rdist, int n, bool set);
> +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)
>  {
> @@ -143,5 +146,12 @@ static inline u64 mpidr_uncompress(u32 compressed)
>  	return mpidr;
>  }
>  
> +#define gicv3_lpi_set_config(intid, value) ({		\
> +	gicv3_data.lpi_prop[LPI_OFFSET(intid)] = value; \
> +})
> +
> +#define gicv3_lpi_get_config(intid) (gicv3_data.lpi_prop[LPI_OFFSET(intid)])
> +
> +
>  #endif /* !__ASSEMBLY__ */
>  #endif /* _ASMARM_GIC_V3_H_ */
> diff --git a/lib/arm/gic-v3.c b/lib/arm/gic-v3.c
> index 949a986..a3b55b2 100644
> --- a/lib/arm/gic-v3.c
> +++ b/lib/arm/gic-v3.c
> @@ -150,7 +150,14 @@ void gicv3_ipi_send_single(int irq, int cpu)
>  }
>  
>  #if defined(__aarch64__)
> -/* alloc_lpi_tables: Allocate LPI config and pending tables */
> +
> +/**

*

> + * alloc_lpi_tables - Allocate LPI config and pending tables
> + * and set PROPBASER (shared by all rdistributors) and per
> + * redistributor PENDBASER.
> + *
> + * gicv3_set_redist_base() must be called before

How about asserting gicv3_redist_base() isn't NULL?

> + */
>  void gicv3_lpi_alloc_tables(void)
>  {
>  	unsigned long n = SZ_64K >> PAGE_SHIFT;
> @@ -161,13 +168,9 @@ void gicv3_lpi_alloc_tables(void)
>  	gicv3_data.lpi_prop = alloc_pages(order);
>  
>  	/* ID bits = 13, ie. up to 14b LPI INTID */
> -	prop_val = (u64)virt_to_phys(gicv3_data.lpi_prop) | 13;
> +	prop_val = (u64)(virt_to_phys(gicv3_data.lpi_prop)) | 13;
>  
> -	/*
> -	 * Allocate pending tables for each redistributor
> -	 * and set PROPBASER and PENDBASER
> -	 */
> -	for_each_present_cpu(cpu) {
> +	for (cpu = 0; cpu < nr_cpus; cpu++) {
>  		u64 pend_val;
>  		void *ptr;
>  
> @@ -176,30 +179,14 @@ void gicv3_lpi_alloc_tables(void)
>  		writeq(prop_val, ptr + GICR_PROPBASER);
>  
>  		gicv3_data.lpi_pend[cpu] = alloc_pages(order);
> -
> -		pend_val = (u64)virt_to_phys(gicv3_data.lpi_pend[cpu]);
> -
> +		pend_val = (u64)(virt_to_phys(gicv3_data.lpi_pend[cpu]));
>  		writeq(pend_val, ptr + GICR_PENDBASER);
>  	}
>  }
>  
> -void gicv3_lpi_set_config(int n, u8 value)
> +void gicv3_lpi_set_clr_pending(int rdist, int n, bool set)
>  {
> -	u8 *entry = (u8 *)(gicv3_data.lpi_prop + (n - 8192));
> -
> -	*entry = value;
> -}
> -
> -u8 gicv3_lpi_get_config(int n)
> -{
> -	u8 *entry = (u8 *)(gicv3_data.lpi_prop + (n - 8192));
> -
> -	return *entry;
> -}
> -
> -void gicv3_lpi_set_pending_table_bit(int rdist, int n, bool set)
> -{
> -	u8 *ptr = phys_to_virt((phys_addr_t)gicv3_data.lpi_pend[rdist]);
> +	u8 *ptr = gicv3_data.lpi_pend[rdist];
>  	u8 mask = 1 << (n % 8), byte;
>  
>  	ptr += (n / 8);
> @@ -210,4 +197,29 @@ void gicv3_lpi_set_pending_table_bit(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 331ba0e..1e95977 100644
> --- a/lib/arm64/asm/gic-v3-its.h
> +++ b/lib/arm64/asm/gic-v3-its.h
> @@ -88,5 +88,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 23b0d06..2f480ae 100644
> --- a/lib/arm64/gic-v3-its.c
> +++ b/lib/arm64/gic-v3-its.c
> @@ -94,9 +94,19 @@ void its_init(void)
>  	its_baser_alloc_table(&its_data.device_baser, SZ_64K);
>  	its_baser_alloc_table(&its_data.coll_baser, SZ_64K);
>  
> -	/* Allocate LPI config and pending tables */
> -	gicv3_lpi_alloc_tables();
> -
>  	its_cmd_queue_init();
>  }
>  
> +/* must be called after gicv3_enable_defaults */
> +void its_enable_defaults(void)
> +{
> +	int i;
> +
> +	/* Allocate LPI config and pending tables */
> +	gicv3_lpi_alloc_tables();
> +
> +	for (i = 0; i < nr_cpus; i++)
> +		gicv3_lpi_rdist_enable(i);
> +
> +	writel(GITS_CTLR_ENABLE, its_data.base + GITS_CTLR);
> +}
> -- 
> 2.20.1
>
Andrew Jones March 9, 2020, 11:39 a.m. UTC | #2 
On Mon, Mar 09, 2020 at 11:24:14AM +0100, Eric Auger wrote:
> its_enable_defaults() enable LPIs at distributor level
> and ITS level.
> 
> gicv3_enable_defaults must be called before.
> 
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
> 
> ---
> v3 -> v4:
> - use GITS_BASER_INDIRECT & GITS_BASER_VALID in its_setup_baser()
> - don't parse BASERs again in its_enable_defaults
> - rename its_setup_baser into its_baser_alloc_table
> - All allocations moved to the init function
> - squashed "arm/arm64: gicv3: Enable/Disable LPIs at re-distributor level"
>   into this patch
> - introduce gicv3_lpi_rdist_enable and gicv3_lpi_rdist_disable
> - pend and prop table bases stored as virt addresses
> - move some init functions from enable() to its_init
> - removed GICR_PROPBASER_IDBITS_MASK
> - introduced LPI_OFFSET
> - lpi_prop becomes u8 *
> - gicv3_lpi_set_config/get_config became macro
> - renamed gicv3_lpi_set_pending_table_bit into gicv3_lpi_set_clr_pending
> 
> v2 -> v3:
> - introduce its_setup_baser in this patch
> - squash "arm/arm64: ITS: Init the command queue" in this patch.
> ---
>  lib/arm/asm/gic-v3.h       | 28 +++++++++++------
>  lib/arm/gic-v3.c           | 64 ++++++++++++++++++++++----------------
>  lib/arm64/asm/gic-v3-its.h |  1 +
>  lib/arm64/gic-v3-its.c     | 16 ++++++++--
>  4 files changed, 71 insertions(+), 38 deletions(-)
> 
> diff --git a/lib/arm/asm/gic-v3.h b/lib/arm/asm/gic-v3.h
> index 12134ef..ea9ae8e 100644
> --- a/lib/arm/asm/gic-v3.h
> +++ b/lib/arm/asm/gic-v3.h
> @@ -50,15 +50,16 @@
>  #define MPIDR_TO_SGI_AFFINITY(cluster_id, level) \
>  	(MPIDR_AFFINITY_LEVEL(cluster_id, level) << ICC_SGI1R_AFFINITY_## level ## _SHIFT)
>  
> -#define GICR_PROPBASER_IDBITS_MASK                      (0x1f)
> +#define GICR_PENDBASER_PTZ		BIT_ULL(62)
>  
> -#define GICR_PENDBASER_PTZ                              BIT_ULL(62)
> +#define LPI_PROP_GROUP1			(1 << 1)
> +#define LPI_PROP_ENABLED		(1 << 0)
> +#define LPI_PROP_DEFAULT_PRIO		0xa0
> +#define LPI_PROP_DEFAULT		(LPI_PROP_DEFAULT_PRIO | LPI_PROP_GROUP1 | LPI_PROP_ENABLED)
>  
> -#define LPI_PROP_GROUP1		(1 << 1)
> -#define LPI_PROP_ENABLED	(1 << 0)
> -#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>
>  
> @@ -76,7 +77,7 @@ struct gicv3_data {
>  	void *dist_base;
>  	void *redist_bases[GICV3_NR_REDISTS];
>  	void *redist_base[NR_CPUS];
> -	void *lpi_prop;
> +	u8 *lpi_prop;
>  	void *lpi_pend[NR_CPUS];
>  	unsigned int irq_nr;
>  };
> @@ -96,8 +97,10 @@ 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_config(int n, u8 val);
>  extern u8 gicv3_lpi_get_config(int n);
> -extern void gicv3_lpi_set_pending_table_bit(int rdist, int n, bool set);
> +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)
>  {
> @@ -143,5 +146,12 @@ static inline u64 mpidr_uncompress(u32 compressed)
>  	return mpidr;
>  }
>  
> +#define gicv3_lpi_set_config(intid, value) ({		\
> +	gicv3_data.lpi_prop[LPI_OFFSET(intid)] = value; \
> +})
> +
> +#define gicv3_lpi_get_config(intid) (gicv3_data.lpi_prop[LPI_OFFSET(intid)])
> +
> +
>  #endif /* !__ASSEMBLY__ */
>  #endif /* _ASMARM_GIC_V3_H_ */
> diff --git a/lib/arm/gic-v3.c b/lib/arm/gic-v3.c
> index 949a986..a3b55b2 100644
> --- a/lib/arm/gic-v3.c
> +++ b/lib/arm/gic-v3.c
> @@ -150,7 +150,14 @@ void gicv3_ipi_send_single(int irq, int cpu)
>  }
>  
>  #if defined(__aarch64__)
> -/* alloc_lpi_tables: Allocate LPI config and pending tables */
> +
> +/**
> + * alloc_lpi_tables - Allocate LPI config and pending tables
> + * and set PROPBASER (shared by all rdistributors) and per
> + * redistributor PENDBASER.
> + *
> + * gicv3_set_redist_base() must be called before
> + */
>  void gicv3_lpi_alloc_tables(void)
>  {
>  	unsigned long n = SZ_64K >> PAGE_SHIFT;
> @@ -161,13 +168,9 @@ void gicv3_lpi_alloc_tables(void)
>  	gicv3_data.lpi_prop = alloc_pages(order);
>  
>  	/* ID bits = 13, ie. up to 14b LPI INTID */
> -	prop_val = (u64)virt_to_phys(gicv3_data.lpi_prop) | 13;
> +	prop_val = (u64)(virt_to_phys(gicv3_data.lpi_prop)) | 13;
>  
> -	/*
> -	 * Allocate pending tables for each redistributor
> -	 * and set PROPBASER and PENDBASER
> -	 */
> -	for_each_present_cpu(cpu) {
> +	for (cpu = 0; cpu < nr_cpus; cpu++) {

You don't mention this change in the changelog. What's wrong with
using for_each_present_cpu() here?

>  		u64 pend_val;
>  		void *ptr;
>  
> @@ -176,30 +179,14 @@ void gicv3_lpi_alloc_tables(void)
>  		writeq(prop_val, ptr + GICR_PROPBASER);
>  
>  		gicv3_data.lpi_pend[cpu] = alloc_pages(order);
> -
> -		pend_val = (u64)virt_to_phys(gicv3_data.lpi_pend[cpu]);
> -
> +		pend_val = (u64)(virt_to_phys(gicv3_data.lpi_pend[cpu]));
>  		writeq(pend_val, ptr + GICR_PENDBASER);
>  	}
>  }
>  
> -void gicv3_lpi_set_config(int n, u8 value)
> +void gicv3_lpi_set_clr_pending(int rdist, int n, bool set)
>  {
> -	u8 *entry = (u8 *)(gicv3_data.lpi_prop + (n - 8192));
> -
> -	*entry = value;
> -}
> -
> -u8 gicv3_lpi_get_config(int n)
> -{
> -	u8 *entry = (u8 *)(gicv3_data.lpi_prop + (n - 8192));
> -
> -	return *entry;
> -}
> -
> -void gicv3_lpi_set_pending_table_bit(int rdist, int n, bool set)
> -{
> -	u8 *ptr = phys_to_virt((phys_addr_t)gicv3_data.lpi_pend[rdist]);
> +	u8 *ptr = gicv3_data.lpi_pend[rdist];

Alot of the changes above and in this patch in general look like cleanups
that should have been squashed into the patches that introduced the lines
in the first place.

>  	u8 mask = 1 << (n % 8), byte;
>  
>  	ptr += (n / 8);
> @@ -210,4 +197,29 @@ void gicv3_lpi_set_pending_table_bit(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 331ba0e..1e95977 100644
> --- a/lib/arm64/asm/gic-v3-its.h
> +++ b/lib/arm64/asm/gic-v3-its.h
> @@ -88,5 +88,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 23b0d06..2f480ae 100644
> --- a/lib/arm64/gic-v3-its.c
> +++ b/lib/arm64/gic-v3-its.c
> @@ -94,9 +94,19 @@ void its_init(void)
>  	its_baser_alloc_table(&its_data.device_baser, SZ_64K);
>  	its_baser_alloc_table(&its_data.coll_baser, SZ_64K);
>  
> -	/* Allocate LPI config and pending tables */
> -	gicv3_lpi_alloc_tables();
> -
>  	its_cmd_queue_init();
>  }
>  
> +/* must be called after gicv3_enable_defaults */
> +void its_enable_defaults(void)
> +{
> +	int i;
> +
> +	/* Allocate LPI config and pending tables */
> +	gicv3_lpi_alloc_tables();
> +
> +	for (i = 0; i < nr_cpus; i++)
> +		gicv3_lpi_rdist_enable(i);
> +
> +	writel(GITS_CTLR_ENABLE, its_data.base + GITS_CTLR);
> +}
> -- 
> 2.20.1
>

Thanks,
drew
Eric Auger March 9, 2020, 11:45 a.m. UTC | #3 
Hi Drew,

On 3/9/20 12:39 PM, Andrew Jones wrote:
> On Mon, Mar 09, 2020 at 11:24:14AM +0100, Eric Auger wrote:
>> its_enable_defaults() enable LPIs at distributor level
>> and ITS level.
>>
>> gicv3_enable_defaults must be called before.
>>
>> Signed-off-by: Eric Auger <eric.auger@redhat.com>
>>
>> ---
>> v3 -> v4:
>> - use GITS_BASER_INDIRECT & GITS_BASER_VALID in its_setup_baser()
>> - don't parse BASERs again in its_enable_defaults
>> - rename its_setup_baser into its_baser_alloc_table
>> - All allocations moved to the init function
>> - squashed "arm/arm64: gicv3: Enable/Disable LPIs at re-distributor level"
>>   into this patch
>> - introduce gicv3_lpi_rdist_enable and gicv3_lpi_rdist_disable
>> - pend and prop table bases stored as virt addresses
>> - move some init functions from enable() to its_init
>> - removed GICR_PROPBASER_IDBITS_MASK
>> - introduced LPI_OFFSET
>> - lpi_prop becomes u8 *
>> - gicv3_lpi_set_config/get_config became macro
>> - renamed gicv3_lpi_set_pending_table_bit into gicv3_lpi_set_clr_pending
>>
>> v2 -> v3:
>> - introduce its_setup_baser in this patch
>> - squash "arm/arm64: ITS: Init the command queue" in this patch.
>> ---
>>  lib/arm/asm/gic-v3.h       | 28 +++++++++++------
>>  lib/arm/gic-v3.c           | 64 ++++++++++++++++++++++----------------
>>  lib/arm64/asm/gic-v3-its.h |  1 +
>>  lib/arm64/gic-v3-its.c     | 16 ++++++++--
>>  4 files changed, 71 insertions(+), 38 deletions(-)
>>
>> diff --git a/lib/arm/asm/gic-v3.h b/lib/arm/asm/gic-v3.h
>> index 12134ef..ea9ae8e 100644
>> --- a/lib/arm/asm/gic-v3.h
>> +++ b/lib/arm/asm/gic-v3.h
>> @@ -50,15 +50,16 @@
>>  #define MPIDR_TO_SGI_AFFINITY(cluster_id, level) \
>>  	(MPIDR_AFFINITY_LEVEL(cluster_id, level) << ICC_SGI1R_AFFINITY_## level ## _SHIFT)
>>  
>> -#define GICR_PROPBASER_IDBITS_MASK                      (0x1f)
>> +#define GICR_PENDBASER_PTZ		BIT_ULL(62)
>>  
>> -#define GICR_PENDBASER_PTZ                              BIT_ULL(62)
>> +#define LPI_PROP_GROUP1			(1 << 1)
>> +#define LPI_PROP_ENABLED		(1 << 0)
>> +#define LPI_PROP_DEFAULT_PRIO		0xa0
>> +#define LPI_PROP_DEFAULT		(LPI_PROP_DEFAULT_PRIO | LPI_PROP_GROUP1 | LPI_PROP_ENABLED)
>>  
>> -#define LPI_PROP_GROUP1		(1 << 1)
>> -#define LPI_PROP_ENABLED	(1 << 0)
>> -#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>
>>  
>> @@ -76,7 +77,7 @@ struct gicv3_data {
>>  	void *dist_base;
>>  	void *redist_bases[GICV3_NR_REDISTS];
>>  	void *redist_base[NR_CPUS];
>> -	void *lpi_prop;
>> +	u8 *lpi_prop;
>>  	void *lpi_pend[NR_CPUS];
>>  	unsigned int irq_nr;
>>  };
>> @@ -96,8 +97,10 @@ 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_config(int n, u8 val);
>>  extern u8 gicv3_lpi_get_config(int n);
>> -extern void gicv3_lpi_set_pending_table_bit(int rdist, int n, bool set);
>> +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)
>>  {
>> @@ -143,5 +146,12 @@ static inline u64 mpidr_uncompress(u32 compressed)
>>  	return mpidr;
>>  }
>>  
>> +#define gicv3_lpi_set_config(intid, value) ({		\
>> +	gicv3_data.lpi_prop[LPI_OFFSET(intid)] = value; \
>> +})
>> +
>> +#define gicv3_lpi_get_config(intid) (gicv3_data.lpi_prop[LPI_OFFSET(intid)])
>> +
>> +
>>  #endif /* !__ASSEMBLY__ */
>>  #endif /* _ASMARM_GIC_V3_H_ */
>> diff --git a/lib/arm/gic-v3.c b/lib/arm/gic-v3.c
>> index 949a986..a3b55b2 100644
>> --- a/lib/arm/gic-v3.c
>> +++ b/lib/arm/gic-v3.c
>> @@ -150,7 +150,14 @@ void gicv3_ipi_send_single(int irq, int cpu)
>>  }
>>  
>>  #if defined(__aarch64__)
>> -/* alloc_lpi_tables: Allocate LPI config and pending tables */
>> +
>> +/**
>> + * alloc_lpi_tables - Allocate LPI config and pending tables
>> + * and set PROPBASER (shared by all rdistributors) and per
>> + * redistributor PENDBASER.
>> + *
>> + * gicv3_set_redist_base() must be called before
>> + */
>>  void gicv3_lpi_alloc_tables(void)
>>  {
>>  	unsigned long n = SZ_64K >> PAGE_SHIFT;
>> @@ -161,13 +168,9 @@ void gicv3_lpi_alloc_tables(void)
>>  	gicv3_data.lpi_prop = alloc_pages(order);
>>  
>>  	/* ID bits = 13, ie. up to 14b LPI INTID */
>> -	prop_val = (u64)virt_to_phys(gicv3_data.lpi_prop) | 13;
>> +	prop_val = (u64)(virt_to_phys(gicv3_data.lpi_prop)) | 13;
>>  
>> -	/*
>> -	 * Allocate pending tables for each redistributor
>> -	 * and set PROPBASER and PENDBASER
>> -	 */
>> -	for_each_present_cpu(cpu) {
>> +	for (cpu = 0; cpu < nr_cpus; cpu++) {
> 
> You don't mention this change in the changelog.
Hey, you can see the changelog is pretty long already & accurate. But
you're right I missed that one and listing those changes too would have
avoided me to put those changes in that patch.

 What's wrong with
> using for_each_present_cpu() here?
As you encouraged me to move the alloc into the it, I tried to do so but
then discovered this was feasible for such kind of issue. At init time,
CPUs have nott booted yet.
> 
>>  		u64 pend_val;
>>  		void *ptr;
>>  
>> @@ -176,30 +179,14 @@ void gicv3_lpi_alloc_tables(void)
>>  		writeq(prop_val, ptr + GICR_PROPBASER);
>>  
>>  		gicv3_data.lpi_pend[cpu] = alloc_pages(order);
>> -
>> -		pend_val = (u64)virt_to_phys(gicv3_data.lpi_pend[cpu]);
>> -
>> +		pend_val = (u64)(virt_to_phys(gicv3_data.lpi_pend[cpu]));
>>  		writeq(pend_val, ptr + GICR_PENDBASER);
>>  	}
>>  }
>>  
>> -void gicv3_lpi_set_config(int n, u8 value)
>> +void gicv3_lpi_set_clr_pending(int rdist, int n, bool set)
>>  {
>> -	u8 *entry = (u8 *)(gicv3_data.lpi_prop + (n - 8192));
>> -
>> -	*entry = value;
>> -}
>> -
>> -u8 gicv3_lpi_get_config(int n)
>> -{
>> -	u8 *entry = (u8 *)(gicv3_data.lpi_prop + (n - 8192));
>> -
>> -	return *entry;
>> -}
>> -
>> -void gicv3_lpi_set_pending_table_bit(int rdist, int n, bool set)
>> -{
>> -	u8 *ptr = phys_to_virt((phys_addr_t)gicv3_data.lpi_pend[rdist]);
>> +	u8 *ptr = gicv3_data.lpi_pend[rdist];
> 
> Alot of the changes above and in this patch in general look like cleanups
> that should have been squashed into the patches that introduced the lines
> in the first place.
Yes you're right. I forgot to move those changes back to previous patch.
I will do

Thanks

Eric
> 
>>  	u8 mask = 1 << (n % 8), byte;
>>  
>>  	ptr += (n / 8);
>> @@ -210,4 +197,29 @@ void gicv3_lpi_set_pending_table_bit(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 331ba0e..1e95977 100644
>> --- a/lib/arm64/asm/gic-v3-its.h
>> +++ b/lib/arm64/asm/gic-v3-its.h
>> @@ -88,5 +88,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 23b0d06..2f480ae 100644
>> --- a/lib/arm64/gic-v3-its.c
>> +++ b/lib/arm64/gic-v3-its.c
>> @@ -94,9 +94,19 @@ void its_init(void)
>>  	its_baser_alloc_table(&its_data.device_baser, SZ_64K);
>>  	its_baser_alloc_table(&its_data.coll_baser, SZ_64K);
>>  
>> -	/* Allocate LPI config and pending tables */
>> -	gicv3_lpi_alloc_tables();
>> -
>>  	its_cmd_queue_init();
>>  }
>>  
>> +/* must be called after gicv3_enable_defaults */
>> +void its_enable_defaults(void)
>> +{
>> +	int i;
>> +
>> +	/* Allocate LPI config and pending tables */
>> +	gicv3_lpi_alloc_tables();
>> +
>> +	for (i = 0; i < nr_cpus; i++)
>> +		gicv3_lpi_rdist_enable(i);
>> +
>> +	writel(GITS_CTLR_ENABLE, its_data.base + GITS_CTLR);
>> +}
>> -- 
>> 2.20.1
>>
> 
> Thanks,
> drew 
> 
>
Andrew Jones March 9, 2020, 11:52 a.m. UTC | #4 
On Mon, Mar 09, 2020 at 12:45:34PM +0100, Auger Eric wrote:
> >> -	for_each_present_cpu(cpu) {
> >> +	for (cpu = 0; cpu < nr_cpus; cpu++) {
> > 
> > You don't mention this change in the changelog.
> Hey, you can see the changelog is pretty long already & accurate. But
> you're right I missed that one and listing those changes too would have
> avoided me to put those changes in that patch.
> 
>  What's wrong with
> > using for_each_present_cpu() here?
> As you encouraged me to move the alloc into the it, I tried to do so but
> then discovered this was feasible for such kind of issue. At init time,
> CPUs have nott booted yet.

They may not have booted, but for_each_present_cpu() should still work
because the present mask is initialized at setup() time before the unit
test even starts.

Thanks,
drew
diff mbox series

Patch

diff --git a/lib/arm/asm/gic-v3.h b/lib/arm/asm/gic-v3.h
index 12134ef..ea9ae8e 100644
--- a/lib/arm/asm/gic-v3.h
+++ b/lib/arm/asm/gic-v3.h
@@ -50,15 +50,16 @@ 
 #define MPIDR_TO_SGI_AFFINITY(cluster_id, level) \
 	(MPIDR_AFFINITY_LEVEL(cluster_id, level) << ICC_SGI1R_AFFINITY_## level ## _SHIFT)
 
-#define GICR_PROPBASER_IDBITS_MASK                      (0x1f)
+#define GICR_PENDBASER_PTZ		BIT_ULL(62)
 
-#define GICR_PENDBASER_PTZ                              BIT_ULL(62)
+#define LPI_PROP_GROUP1			(1 << 1)
+#define LPI_PROP_ENABLED		(1 << 0)
+#define LPI_PROP_DEFAULT_PRIO		0xa0
+#define LPI_PROP_DEFAULT		(LPI_PROP_DEFAULT_PRIO | LPI_PROP_GROUP1 | LPI_PROP_ENABLED)
 
-#define LPI_PROP_GROUP1		(1 << 1)
-#define LPI_PROP_ENABLED	(1 << 0)
-#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>
 
@@ -76,7 +77,7 @@  struct gicv3_data {
 	void *dist_base;
 	void *redist_bases[GICV3_NR_REDISTS];
 	void *redist_base[NR_CPUS];
-	void *lpi_prop;
+	u8 *lpi_prop;
 	void *lpi_pend[NR_CPUS];
 	unsigned int irq_nr;
 };
@@ -96,8 +97,10 @@  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_config(int n, u8 val);
 extern u8 gicv3_lpi_get_config(int n);
-extern void gicv3_lpi_set_pending_table_bit(int rdist, int n, bool set);
+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)
 {
@@ -143,5 +146,12 @@  static inline u64 mpidr_uncompress(u32 compressed)
 	return mpidr;
 }
 
+#define gicv3_lpi_set_config(intid, value) ({		\
+	gicv3_data.lpi_prop[LPI_OFFSET(intid)] = value; \
+})
+
+#define gicv3_lpi_get_config(intid) (gicv3_data.lpi_prop[LPI_OFFSET(intid)])
+
+
 #endif /* !__ASSEMBLY__ */
 #endif /* _ASMARM_GIC_V3_H_ */
diff --git a/lib/arm/gic-v3.c b/lib/arm/gic-v3.c
index 949a986..a3b55b2 100644
--- a/lib/arm/gic-v3.c
+++ b/lib/arm/gic-v3.c
@@ -150,7 +150,14 @@  void gicv3_ipi_send_single(int irq, int cpu)
 }
 
 #if defined(__aarch64__)
-/* alloc_lpi_tables: Allocate LPI config and pending tables */
+
+/**
+ * alloc_lpi_tables - Allocate LPI config and pending tables
+ * and set PROPBASER (shared by all rdistributors) and per
+ * redistributor PENDBASER.
+ *
+ * gicv3_set_redist_base() must be called before
+ */
 void gicv3_lpi_alloc_tables(void)
 {
 	unsigned long n = SZ_64K >> PAGE_SHIFT;
@@ -161,13 +168,9 @@  void gicv3_lpi_alloc_tables(void)
 	gicv3_data.lpi_prop = alloc_pages(order);
 
 	/* ID bits = 13, ie. up to 14b LPI INTID */
-	prop_val = (u64)virt_to_phys(gicv3_data.lpi_prop) | 13;
+	prop_val = (u64)(virt_to_phys(gicv3_data.lpi_prop)) | 13;
 
-	/*
-	 * Allocate pending tables for each redistributor
-	 * and set PROPBASER and PENDBASER
-	 */
-	for_each_present_cpu(cpu) {
+	for (cpu = 0; cpu < nr_cpus; cpu++) {
 		u64 pend_val;
 		void *ptr;
 
@@ -176,30 +179,14 @@  void gicv3_lpi_alloc_tables(void)
 		writeq(prop_val, ptr + GICR_PROPBASER);
 
 		gicv3_data.lpi_pend[cpu] = alloc_pages(order);
-
-		pend_val = (u64)virt_to_phys(gicv3_data.lpi_pend[cpu]);
-
+		pend_val = (u64)(virt_to_phys(gicv3_data.lpi_pend[cpu]));
 		writeq(pend_val, ptr + GICR_PENDBASER);
 	}
 }
 
-void gicv3_lpi_set_config(int n, u8 value)
+void gicv3_lpi_set_clr_pending(int rdist, int n, bool set)
 {
-	u8 *entry = (u8 *)(gicv3_data.lpi_prop + (n - 8192));
-
-	*entry = value;
-}
-
-u8 gicv3_lpi_get_config(int n)
-{
-	u8 *entry = (u8 *)(gicv3_data.lpi_prop + (n - 8192));
-
-	return *entry;
-}
-
-void gicv3_lpi_set_pending_table_bit(int rdist, int n, bool set)
-{
-	u8 *ptr = phys_to_virt((phys_addr_t)gicv3_data.lpi_pend[rdist]);
+	u8 *ptr = gicv3_data.lpi_pend[rdist];
 	u8 mask = 1 << (n % 8), byte;
 
 	ptr += (n / 8);
@@ -210,4 +197,29 @@  void gicv3_lpi_set_pending_table_bit(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 331ba0e..1e95977 100644
--- a/lib/arm64/asm/gic-v3-its.h
+++ b/lib/arm64/asm/gic-v3-its.h
@@ -88,5 +88,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 23b0d06..2f480ae 100644
--- a/lib/arm64/gic-v3-its.c
+++ b/lib/arm64/gic-v3-its.c
@@ -94,9 +94,19 @@  void its_init(void)
 	its_baser_alloc_table(&its_data.device_baser, SZ_64K);
 	its_baser_alloc_table(&its_data.coll_baser, SZ_64K);
 
-	/* Allocate LPI config and pending tables */
-	gicv3_lpi_alloc_tables();
-
 	its_cmd_queue_init();
 }
 
+/* must be called after gicv3_enable_defaults */
+void its_enable_defaults(void)
+{
+	int i;
+
+	/* Allocate LPI config and pending tables */
+	gicv3_lpi_alloc_tables();
+
+	for (i = 0; i < nr_cpus; i++)
+		gicv3_lpi_rdist_enable(i);
+
+	writel(GITS_CTLR_ENABLE, its_data.base + GITS_CTLR);
+}