| Message ID | 20200110145412.14937-9-eric.auger@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | arm/arm64: Add ITS tests | expand |
On Fri, Jan 10, 2020 at 03:54:04PM +0100, Eric Auger wrote: > Allocate the command queue and initialize related registers: > CBASER, CREADR, CWRITER. > > The command queue is 64kB. This aims at not bothing with fullness. I think these means that the goal isn't completeness? If so, please write "minimal implementation" or nothing, as all of kvm-unit-tests is a minimal implementation. > > Signed-off-by: Eric Auger <eric.auger@redhat.com> > > --- > > v2 -> v3: > - removed readr > --- > lib/arm/asm/gic-v3-its.h | 6 ++++++ > lib/arm/gic-v3-its.c | 22 ++++++++++++++++++++++ > 2 files changed, 28 insertions(+) > > diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h > index 2f8b8f1..93814f7 100644 > --- a/lib/arm/asm/gic-v3-its.h > +++ b/lib/arm/asm/gic-v3-its.h > @@ -75,10 +75,16 @@ struct its_baser { > int esz; > }; > > +struct its_cmd_block { > + u64 raw_cmd[4]; Do we need these spaces (not even a tab) after the u64? > +}; > + > struct its_data { > void *base; > struct its_typer typer; > struct its_baser baser[GITS_BASER_NR_REGS]; > + struct its_cmd_block *cmd_base; > + struct its_cmd_block *cmd_write; > }; > > extern struct its_data its_data; > diff --git a/lib/arm/gic-v3-its.c b/lib/arm/gic-v3-its.c > index 6c97569..3037c84 100644 > --- a/lib/arm/gic-v3-its.c > +++ b/lib/arm/gic-v3-its.c > @@ -177,3 +177,25 @@ void set_pending_table_bit(int rdist, int n, bool set) > byte &= ~mask; > *ptr = byte; > } > + > +/** > + * init_cmd_queue: Allocate the command queue and initialize > + * CBASER, CREADR, CWRITER > + */ > +void init_cmd_queue(void); > +void init_cmd_queue(void) its_cmd_queue_init > +{ > + unsigned long n = SZ_64K >> PAGE_SHIFT; > + unsigned long order = fls(n); > + u64 cbaser; > + > + its_data.cmd_base = (void *)virt_to_phys(alloc_pages(order)); > + > + cbaser = ((u64)its_data.cmd_base | (SZ_64K / SZ_4K - 1) | > + GITS_CBASER_VALID); 120 chars > + > + writeq(cbaser, its_data.base + GITS_CBASER); > + > + its_data.cmd_write = its_data.cmd_base; > + writeq(0, its_data.base + GITS_CWRITER); > +} > -- > 2.20.1 > Thanks, drew
diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h index 2f8b8f1..93814f7 100644 --- a/lib/arm/asm/gic-v3-its.h +++ b/lib/arm/asm/gic-v3-its.h @@ -75,10 +75,16 @@ struct its_baser { int esz; }; +struct its_cmd_block { + u64 raw_cmd[4]; +}; + struct its_data { void *base; struct its_typer typer; struct its_baser baser[GITS_BASER_NR_REGS]; + struct its_cmd_block *cmd_base; + struct its_cmd_block *cmd_write; }; extern struct its_data its_data; diff --git a/lib/arm/gic-v3-its.c b/lib/arm/gic-v3-its.c index 6c97569..3037c84 100644 --- a/lib/arm/gic-v3-its.c +++ b/lib/arm/gic-v3-its.c @@ -177,3 +177,25 @@ void set_pending_table_bit(int rdist, int n, bool set) byte &= ~mask; *ptr = byte; } + +/** + * init_cmd_queue: Allocate the command queue and initialize + * CBASER, CREADR, CWRITER + */ +void init_cmd_queue(void); +void init_cmd_queue(void) +{ + unsigned long n = SZ_64K >> PAGE_SHIFT; + unsigned long order = fls(n); + u64 cbaser; + + its_data.cmd_base = (void *)virt_to_phys(alloc_pages(order)); + + cbaser = ((u64)its_data.cmd_base | (SZ_64K / SZ_4K - 1) | + GITS_CBASER_VALID); + + writeq(cbaser, its_data.base + GITS_CBASER); + + its_data.cmd_write = its_data.cmd_base; + writeq(0, its_data.base + GITS_CWRITER); +}
Allocate the command queue and initialize related registers: CBASER, CREADR, CWRITER. The command queue is 64kB. This aims at not bothing with fullness. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- v2 -> v3: - removed readr --- lib/arm/asm/gic-v3-its.h | 6 ++++++ lib/arm/gic-v3-its.c | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+)