From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com, maz@kernel.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
qemu-devel@nongnu.org, qemu-arm@nongnu.org
Cc: drjones@redhat.com, andre.przywara@arm.com,
peter.maydell@linaro.org, yuzenghui@huawei.com,
alexandru.elisei@arm.com, thuth@redhat.com
Subject: [kvm-unit-tests PATCH v3 09/14] arm/arm64: ITS: Device and collection Initialization
Date: Tue, 28 Jan 2020 11:34:54 +0100 [thread overview]
Message-ID: <20200128103459.19413-10-eric.auger@redhat.com> (raw)
In-Reply-To: <20200128103459.19413-1-eric.auger@redhat.com>
Introduce an helper functions to register
- a new device, characterized by its device id and the
max number of event IDs that dimension its ITT (Interrupt
Translation Table). The function allocates the ITT.
- a new collection, characterized by its ID and the
target processing engine (PE).
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
v2 -> v3:
- s/report_abort/assert
v1 -> v2:
- s/nb_/nr_
---
lib/arm/asm/gic-v3-its.h | 20 +++++++++++++++++-
lib/arm/gic-v3-its.c | 44 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 1 deletion(-)
diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h
index fe73c04..acd97a9 100644
--- a/lib/arm/asm/gic-v3-its.h
+++ b/lib/arm/asm/gic-v3-its.h
@@ -31,6 +31,19 @@ struct its_baser {
};
#define GITS_BASER_NR_REGS 8
+#define GITS_MAX_DEVICES 8
+#define GITS_MAX_COLLECTIONS 8
+
+struct its_device {
+ u32 device_id; /* device ID */
+ u32 nr_ites; /* Max Interrupt Translation Entries */
+ void *itt; /* Interrupt Translation Table GPA */
+};
+
+struct its_collection {
+ u64 target_address;
+ u16 col_id;
+};
struct its_data {
void *base;
@@ -38,6 +51,10 @@ struct its_data {
struct its_baser baser[GITS_BASER_NR_REGS];
struct its_cmd_block *cmd_base;
struct its_cmd_block *cmd_write;
+ struct its_device devices[GITS_MAX_DEVICES];
+ u32 nr_devices; /* Allocated Devices */
+ struct its_collection collections[GITS_MAX_COLLECTIONS];
+ u32 nr_collections; /* Allocated Collections */
};
extern struct its_data its_data;
@@ -90,7 +107,6 @@ 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];
};
@@ -100,6 +116,8 @@ 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);
+extern struct its_device *its_create_device(u32 dev_id, int nr_ites);
+extern struct its_collection *its_create_collection(u32 col_id, u32 target_pe);
#else /* __arm__ */
diff --git a/lib/arm/gic-v3-its.c b/lib/arm/gic-v3-its.c
index d1e7e52..c2dcd01 100644
--- a/lib/arm/gic-v3-its.c
+++ b/lib/arm/gic-v3-its.c
@@ -175,3 +175,47 @@ void its_enable_defaults(void)
writel(GITS_CTLR_ENABLE, its_data.base + GITS_CTLR);
}
+
+struct its_device *its_create_device(u32 device_id, int nr_ites)
+{
+ struct its_baser *baser;
+ struct its_device *new;
+ unsigned long n, order;
+
+ assert(its_data.nr_devices < GITS_MAX_DEVICES);
+
+ baser = its_lookup_baser(GITS_BASER_TYPE_DEVICE);
+ if (!baser)
+ return NULL;
+
+ new = &its_data.devices[its_data.nr_devices];
+
+ new->device_id = device_id;
+ new->nr_ites = nr_ites;
+
+ n = (its_data.typer.ite_size * nr_ites) >> PAGE_SHIFT;
+ order = is_power_of_2(n) ? fls(n) : fls(n) + 1;
+ new->itt = (void *)virt_to_phys(alloc_pages(order));
+
+ its_data.nr_devices++;
+ return new;
+}
+
+struct its_collection *its_create_collection(u32 col_id, u32 pe)
+{
+ struct its_collection *new;
+
+ assert(its_data.nr_collections < GITS_MAX_COLLECTIONS);
+
+ new = &its_data.collections[its_data.nr_collections];
+
+ new->col_id = col_id;
+
+ if (its_data.typer.pta)
+ new->target_address = (u64)gicv3_data.redist_base[pe];
+ else
+ new->target_address = pe << 16;
+
+ its_data.nr_collections++;
+ return new;
+}
--
2.20.1
next prev parent reply other threads:[~2020-01-28 10:36 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
2020-03-05 17:59 ` Auger Eric
2020-01-28 10:34 ` Eric Auger [this message]
2020-02-07 5:41 ` [kvm-unit-tests PATCH v3 09/14] arm/arm64: ITS: Device and collection Initialization 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=20200128103459.19413-10-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=alexandru.elisei@arm.com \
--cc=andre.przywara@arm.com \
--cc=drjones@redhat.com \
--cc=eric.auger.pro@gmail.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).