From: Andrew Jones <drjones@redhat.com>
To: Eric Auger <eric.auger@redhat.com>
Cc: eric.auger.pro@gmail.com, maz@kernel.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
qemu-devel@nongnu.org, qemu-arm@nongnu.org,
peter.maydell@linaro.org, andre.przywara@arm.com,
thuth@redhat.com, yuzenghui@huawei.com, alexandru.elisei@arm.com
Subject: Re: [kvm-unit-tests PATCH v3 08/14] arm/arm64: ITS: its_enable_defaults
Date: Fri, 7 Feb 2020 13:41:08 +0100 [thread overview]
Message-ID: <20200207124108.wtgghuwoka42oj4i@kamzik.brq.redhat.com> (raw)
In-Reply-To: <20200128103459.19413-9-eric.auger@redhat.com>
On Tue, Jan 28, 2020 at 11:34:53AM +0100, Eric Auger wrote:
> its_enable_defaults() is the top init function that allocates the
> command queue and all the requested tables (device, collection,
> lpi config and pending tables), enable LPIs at distributor level
> and ITS level.
>
> gicv3_enable_defaults must be called before.
>
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
>
> ---
>
> 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-its.h | 8 ++++
> lib/arm/gic-v3-its.c | 89 ++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 97 insertions(+)
>
> diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h
> index 815c515..fe73c04 100644
> --- a/lib/arm/asm/gic-v3-its.h
> +++ b/lib/arm/asm/gic-v3-its.h
> @@ -36,6 +36,8 @@ 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;
> @@ -88,10 +90,16 @@ extern struct its_data its_data;
> #define GITS_BASER_TYPE_DEVICE 1
> #define GITS_BASER_TYPE_COLLECTION 4
>
> +
> +struct its_cmd_block {
> + u64 raw_cmd[4];
> +};
> +
> extern void its_parse_typer(void);
> extern void its_init(void);
> extern int its_parse_baser(int i, struct its_baser *baser);
> extern struct its_baser *its_lookup_baser(int type);
> +extern void its_enable_defaults(void);
>
> #else /* __arm__ */
>
> diff --git a/lib/arm/gic-v3-its.c b/lib/arm/gic-v3-its.c
> index 2c0ce13..d1e7e52 100644
> --- a/lib/arm/gic-v3-its.c
> +++ b/lib/arm/gic-v3-its.c
> @@ -86,3 +86,92 @@ void its_init(void)
> its_parse_baser(i, &its_data.baser[i]);
> }
>
> +static void its_setup_baser(int i, struct its_baser *baser)
> +{
> + unsigned long n = (baser->nr_pages * baser->psz) >> PAGE_SHIFT;
> + unsigned long order = is_power_of_2(n) ? fls(n) : fls(n) + 1;
> + u64 val;
> +
> + baser->table_addr = (u64)virt_to_phys(alloc_pages(order));
> +
> + val = ((u64)baser->table_addr |
> + ((u64)baser->type << GITS_BASER_TYPE_SHIFT) |
> + ((u64)(baser->esz - 1) << GITS_BASER_ENTRY_SIZE_SHIFT) |
> + ((baser->nr_pages - 1) << GITS_BASER_PAGES_SHIFT) |
> + (u64)baser->indirect << 62 |
> + (u64)baser->valid << 63);
<< GITS_BASER_INDIRECT
<< GITS_BASER_VALID
> +
> + switch (baser->psz) {
> + case SZ_4K:
> + val |= GITS_BASER_PAGE_SIZE_4K;
> + break;
> + case SZ_16K:
> + val |= GITS_BASER_PAGE_SIZE_16K;
> + break;
> + case SZ_64K:
> + val |= GITS_BASER_PAGE_SIZE_64K;
> + break;
> + }
> +
> + writeq(val, gicv3_its_base() + GITS_BASER + i * 8);
> +}
> +
> +/**
> + * init_cmd_queue: Allocate the command queue and initialize
> + * CBASER, CREADR, CWRITER
> + */
> +static void its_cmd_queue_init(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);
> +}
> +
> +void its_enable_defaults(void)
> +{
> + unsigned int i;
> +
> + its_parse_typer();
> +
> + /* Allocate BASER tables (device and collection tables) */
> + for (i = 0; i < GITS_BASER_NR_REGS; i++) {
> + struct its_baser *baser = &its_data.baser[i];
> + int ret;
> +
> + ret = its_parse_baser(i, baser);
> + if (ret)
> + continue;
Didn't we already parse typer and baser at its_init time? How/why would
its_parse_baser fail? Should we assert when it does?
> +
> + switch (baser->type) {
> + case GITS_BASER_TYPE_DEVICE:
> + baser->valid = true;
> + its_setup_baser(i, baser);
> + break;
> + case GITS_BASER_TYPE_COLLECTION:
> + baser->valid = true;
> + its_setup_baser(i, baser);
> + break;
> + default:
> + break;
assert() ?
> + }
> + }
> +
> + /* Allocate LPI config and pending tables */
> + gicv3_lpi_alloc_tables();
> +
> + its_cmd_queue_init();
> +
> + for (i = 0; i < nr_cpus; i++)
> + gicv3_lpi_rdist_ctrl(i, true);
> +
> + writel(GITS_CTLR_ENABLE, its_data.base + GITS_CTLR);
> +}
> --
> 2.20.1
>
>
It's looking like we don't have a clean separation between its_init and
its_enable_defaults. I'd expect its_init to do all the allocating of
memory and its_enable_defaults to do all the write's to the device.
We should only do its_init once and its_enable should be something
we can do again (after a disable, on reset, etc.). Is that not possible
with the ITS device?
Thanks,
drew
next prev parent reply other threads:[~2020-02-07 12:41 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-28 10:34 [kvm-unit-tests PATCH v3 00/14] arm/arm64: Add ITS tests Eric Auger
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 01/14] libcflat: Add other size defines Eric Auger
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 02/14] arm: gic: Provide per-IRQ helper functions Eric Auger
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 03/14] arm/arm64: gic: Introduce setup_irq() helper Eric Auger
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 04/14] arm/arm64: gicv3: Add some re-distributor defines Eric Auger
2020-02-06 14:35 ` Zenghui Yu
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 05/14] arm/arm64: ITS: Introspection tests Eric Auger
2020-02-06 15:12 ` Zenghui Yu
2020-02-07 10:19 ` Andrew Jones
2020-03-04 14:20 ` Auger Eric
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 06/14] arm/arm64: gicv3: Set the LPI config and pending tables Eric Auger
2020-02-07 2:12 ` Zenghui Yu
2020-03-05 19:40 ` Auger Eric
2020-02-07 12:11 ` Andrew Jones
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 07/14] arm/arm64: gicv3: Enable/Disable LPIs at re-distributor level Eric Auger
2020-02-07 12:14 ` Andrew Jones
2020-02-07 12:19 ` Andrew Jones
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 08/14] arm/arm64: ITS: its_enable_defaults Eric Auger
2020-02-07 3:20 ` Zenghui Yu
2020-03-04 14:26 ` Auger Eric
2020-03-05 6:30 ` Zenghui Yu
2020-02-07 12:41 ` Andrew Jones [this message]
2020-03-05 17:59 ` Auger Eric
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 09/14] arm/arm64: ITS: Device and collection Initialization Eric Auger
2020-02-07 5:41 ` Zenghui Yu
2020-03-05 19:42 ` Auger Eric
2020-02-07 12:51 ` Andrew Jones
2020-03-06 8:47 ` Auger Eric
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 10/14] arm/arm64: ITS: commands Eric Auger
2020-02-07 13:37 ` Andrew Jones
2020-03-06 9:13 ` Auger Eric
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 11/14] arm/arm64: ITS: INT functional tests Eric Auger
2020-02-07 13:15 ` Andrew Jones
2020-03-06 12:55 ` Auger Eric
2020-03-06 13:29 ` Andrew Jones
2020-03-06 13:40 ` Auger Eric
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 12/14] arm/run: Allow Migration tests Eric Auger
2020-01-29 8:07 ` Thomas Huth
2020-01-29 9:29 ` Auger Eric
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 13/14] arm/arm64: ITS: migration tests Eric Auger
2020-02-07 13:49 ` Andrew Jones
2020-03-06 13:06 ` Auger Eric
2020-01-28 10:34 ` [kvm-unit-tests PATCH v3 14/14] arm/arm64: ITS: pending table migration test Eric Auger
2020-02-07 14:06 ` Andrew Jones
2020-03-06 13:21 ` Auger Eric
2020-03-06 13:36 ` Andrew Jones
2020-03-06 13:41 ` Auger Eric
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200207124108.wtgghuwoka42oj4i@kamzik.brq.redhat.com \
--to=drjones@redhat.com \
--cc=alexandru.elisei@arm.com \
--cc=andre.przywara@arm.com \
--cc=eric.auger.pro@gmail.com \
--cc=eric.auger@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=maz@kernel.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).