All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andre Przywara <andre.przywara@arm.com>
To: Will Deacon <will.deacon@arm.com>, Marc Zyngier <marc.zyngier@arm.com>
Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [kvmtool PATCH v10 13/15] arm: setup SPI IRQ routing tables
Date: Tue, 25 Apr 2017 15:39:30 +0100	[thread overview]
Message-ID: <20170425143932.17235-14-andre.przywara@arm.com> (raw)
In-Reply-To: <20170425143932.17235-1-andre.przywara@arm.com>

Since we soon start using GSI routing on ARM platforms too, we have
to setup the initial SPI routing table. Before the first call to
KVM_SET_GSI_ROUTING, the kernel holds this table internally, but this
is overwritten with the ioctl, so we have to explicitly set it up
here.
The routing is actually not used for IRQs triggered by KVM_IRQ_LINE,
but it needs to be here anyway. We use a simple 1:1 mapping.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
 arm/gic.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/arm/gic.c b/arm/gic.c
index 651ede7..d9c3175 100644
--- a/arm/gic.c
+++ b/arm/gic.c
@@ -10,6 +10,8 @@
 #include <linux/kvm.h>
 #include <linux/sizes.h>
 
+#define IRQCHIP_GIC 0
+
 static int gic_fd = -1;
 static u64 gic_redists_base;
 static u64 gic_redists_size;
@@ -32,6 +34,34 @@ int irqchip_parser(const struct option *opt, const char *arg, int unset)
 	return 0;
 }
 
+static int irq__routing_init(struct kvm *kvm)
+{
+	int r;
+	int irqlines = ALIGN(irq__get_nr_allocated_lines(), 32);
+
+	/*
+	 * This describes the default routing that the kernel uses without
+	 * any routing explicitly set up via KVM_SET_GSI_ROUTING. So we
+	 * don't need to commit these setting right now. The first actual
+	 * user (MSI routing) will engage these mappings then.
+	 */
+	for (next_gsi = 0; next_gsi < irqlines; next_gsi++) {
+		r = irq__allocate_routing_entry();
+		if (r)
+			return r;
+
+		irq_routing->entries[irq_routing->nr++] =
+			(struct kvm_irq_routing_entry) {
+				.gsi = next_gsi,
+				.type = KVM_IRQ_ROUTING_IRQCHIP,
+				.u.irqchip.irqchip = IRQCHIP_GIC,
+				.u.irqchip.pin = next_gsi,
+		};
+	}
+
+	return 0;
+}
+
 static int gic__create_its_frame(struct kvm *kvm, u64 its_frame_addr)
 {
 	struct kvm_create_device its_device = {
@@ -239,6 +269,8 @@ static int gic__init_gic(struct kvm *kvm)
 			return ret;
 	}
 
+	irq__routing_init(kvm);
+
 	if (!ioctl(gic_fd, KVM_HAS_DEVICE_ATTR, &vgic_init_attr)) {
 		ret = ioctl(gic_fd, KVM_SET_DEVICE_ATTR, &vgic_init_attr);
 		if (ret)
-- 
2.9.0

WARNING: multiple messages have this Message-ID (diff)
From: andre.przywara@arm.com (Andre Przywara)
To: linux-arm-kernel@lists.infradead.org
Subject: [kvmtool PATCH v10 13/15] arm: setup SPI IRQ routing tables
Date: Tue, 25 Apr 2017 15:39:30 +0100	[thread overview]
Message-ID: <20170425143932.17235-14-andre.przywara@arm.com> (raw)
In-Reply-To: <20170425143932.17235-1-andre.przywara@arm.com>

Since we soon start using GSI routing on ARM platforms too, we have
to setup the initial SPI routing table. Before the first call to
KVM_SET_GSI_ROUTING, the kernel holds this table internally, but this
is overwritten with the ioctl, so we have to explicitly set it up
here.
The routing is actually not used for IRQs triggered by KVM_IRQ_LINE,
but it needs to be here anyway. We use a simple 1:1 mapping.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
 arm/gic.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/arm/gic.c b/arm/gic.c
index 651ede7..d9c3175 100644
--- a/arm/gic.c
+++ b/arm/gic.c
@@ -10,6 +10,8 @@
 #include <linux/kvm.h>
 #include <linux/sizes.h>
 
+#define IRQCHIP_GIC 0
+
 static int gic_fd = -1;
 static u64 gic_redists_base;
 static u64 gic_redists_size;
@@ -32,6 +34,34 @@ int irqchip_parser(const struct option *opt, const char *arg, int unset)
 	return 0;
 }
 
+static int irq__routing_init(struct kvm *kvm)
+{
+	int r;
+	int irqlines = ALIGN(irq__get_nr_allocated_lines(), 32);
+
+	/*
+	 * This describes the default routing that the kernel uses without
+	 * any routing explicitly set up via KVM_SET_GSI_ROUTING. So we
+	 * don't need to commit these setting right now. The first actual
+	 * user (MSI routing) will engage these mappings then.
+	 */
+	for (next_gsi = 0; next_gsi < irqlines; next_gsi++) {
+		r = irq__allocate_routing_entry();
+		if (r)
+			return r;
+
+		irq_routing->entries[irq_routing->nr++] =
+			(struct kvm_irq_routing_entry) {
+				.gsi = next_gsi,
+				.type = KVM_IRQ_ROUTING_IRQCHIP,
+				.u.irqchip.irqchip = IRQCHIP_GIC,
+				.u.irqchip.pin = next_gsi,
+		};
+	}
+
+	return 0;
+}
+
 static int gic__create_its_frame(struct kvm *kvm, u64 its_frame_addr)
 {
 	struct kvm_create_device its_device = {
@@ -239,6 +269,8 @@ static int gic__init_gic(struct kvm *kvm)
 			return ret;
 	}
 
+	irq__routing_init(kvm);
+
 	if (!ioctl(gic_fd, KVM_HAS_DEVICE_ATTR, &vgic_init_attr)) {
 		ret = ioctl(gic_fd, KVM_SET_DEVICE_ATTR, &vgic_init_attr);
 		if (ret)
-- 
2.9.0

  parent reply	other threads:[~2017-04-25 14:39 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-25 14:39 [kvmtool PATCH v10 00/15] kvmtool: arm: ITS emulation and GSI routing support Andre Przywara
2017-04-25 14:39 ` Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 01/15] FDT: use static phandles Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 02/15] arm: use static DT phandle for the GIC Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 03/15] irq: move IRQ routing into irq.c Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 04/15] MSI-X: update GSI routing after changed MSI-X configuration Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 05/15] virtio: fix endianness check for vhost support Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 06/15] PCI: Only allocate IRQ routing entry when available Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 07/15] update public Linux headers for GICv3 ITS emulation Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 08/15] arm: allow vGICv3 emulation Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 09/15] arm: allow creation of an MSI register frame region Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 10/15] arm: FDT: create MSI controller DT node Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 11/15] add kvm__supports_vm_extension() Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 12/15] PCI: inject PCI device ID on MSI injection Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-04-25 14:39 ` Andre Przywara [this message]
2017-04-25 14:39   ` [kvmtool PATCH v10 13/15] arm: setup SPI IRQ routing tables Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 14/15] extend GSI IRQ routing to take a device ID Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-04-25 14:39 ` [kvmtool PATCH v10 15/15] arm64: enable GICv3-ITS emulation Andre Przywara
2017-04-25 14:39   ` Andre Przywara
2017-06-08  9:11 ` [kvmtool PATCH v10 00/15] kvmtool: arm: ITS emulation and GSI routing support Marc Zyngier
2017-06-08  9:11   ` Marc Zyngier
2017-06-08  9:36   ` Andre Przywara
2017-06-08  9:36     ` Andre Przywara

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=20170425143932.17235-14-andre.przywara@arm.com \
    --to=andre.przywara@arm.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=marc.zyngier@arm.com \
    --cc=will.deacon@arm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.