From: Marc Zyngier <maz@kernel.org> To: kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Cc: Eric Auger <eric.auger@redhat.com>, James Morse <james.morse@arm.com>, Julien Thierry <julien.thierry.kdev@gmail.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, Thomas Gleixner <tglx@linutronix.de>, Jason Cooper <jason@lakedaemon.net>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Andrew Murray <Andrew.Murray@arm.com>, Zenghui Yu <yuzenghui@huawei.com>, Jayachandran C <jnair@marvell.com>, Robert Richter <rrichter@marvell.com> Subject: [PATCH v2 03/36] irqchip/gic-v3-its: Allow LPI invalidation via the DirectLPI interface Date: Sun, 27 Oct 2019 14:42:01 +0000 [thread overview] Message-ID: <20191027144234.8395-4-maz@kernel.org> (raw) In-Reply-To: <20191027144234.8395-1-maz@kernel.org> We currently don't make much use of the DirectLPI feature, and it would be beneficial to do this more, if only because it becomes a mandatory feature for GICv4.1. Signed-off-by: Marc Zyngier <maz@kernel.org> --- drivers/irqchip/irq-gic-v3-its.c | 40 +++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 58cb233cf138..3e33cdc08200 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -175,6 +175,12 @@ static DEFINE_IDA(its_vpeid_ida); #define gic_data_rdist_rd_base() (gic_data_rdist()->rd_base) #define gic_data_rdist_vlpi_base() (gic_data_rdist_rd_base() + SZ_128K) +static inline u32 its_get_event_id(struct irq_data *d) +{ + struct its_device *its_dev = irq_data_get_irq_chip_data(d); + return d->hwirq - its_dev->event_map.lpi_base; +} + static struct its_collection *dev_event_to_col(struct its_device *its_dev, u32 event) { @@ -183,6 +189,13 @@ static struct its_collection *dev_event_to_col(struct its_device *its_dev, return its->collections + its_dev->event_map.col_map[event]; } +static struct its_collection *irq_to_col(struct irq_data *d) +{ + struct its_device *its_dev = irq_data_get_irq_chip_data(d); + + return dev_event_to_col(its_dev, its_get_event_id(d)); +} + static struct its_collection *valid_col(struct its_collection *col) { if (WARN_ON_ONCE(col->target_address & GENMASK_ULL(15, 0))) @@ -1031,12 +1044,6 @@ static void its_send_vinvall(struct its_node *its, struct its_vpe *vpe) * irqchip functions - assumes MSI, mostly. */ -static inline u32 its_get_event_id(struct irq_data *d) -{ - struct its_device *its_dev = irq_data_get_irq_chip_data(d); - return d->hwirq - its_dev->event_map.lpi_base; -} - static void lpi_write_config(struct irq_data *d, u8 clr, u8 set) { irq_hw_number_t hwirq; @@ -1081,12 +1088,28 @@ static void wait_for_syncr(void __iomem *rdbase) cpu_relax(); } +static void direct_lpi_inv(struct irq_data *d) +{ + struct its_collection *col; + void __iomem *rdbase; + + /* Target the redistributor this LPI is currently routed to */ + col = irq_to_col(d); + rdbase = per_cpu_ptr(gic_rdists->rdist, col->col_id)->rd_base; + gic_write_lpir(d->hwirq, rdbase + GICR_INVLPIR); + + wait_for_syncr(rdbase); +} + static void lpi_update_config(struct irq_data *d, u8 clr, u8 set) { struct its_device *its_dev = irq_data_get_irq_chip_data(d); lpi_write_config(d, clr, set); - its_send_inv(its_dev, its_get_event_id(d)); + if (gic_rdists->has_direct_lpi && !irqd_is_forwarded_to_vcpu(d)) + direct_lpi_inv(d); + else + its_send_inv(its_dev, its_get_event_id(d)); } static void its_vlpi_set_doorbell(struct irq_data *d, bool enable) @@ -2917,8 +2940,9 @@ static void its_vpe_send_inv(struct irq_data *d) if (gic_rdists->has_direct_lpi) { void __iomem *rdbase; + /* Target the redistributor this VPE is currently known on */ rdbase = per_cpu_ptr(gic_rdists->rdist, vpe->col_idx)->rd_base; - gic_write_lpir(vpe->vpe_db_lpi, rdbase + GICR_INVLPIR); + gic_write_lpir(d->parent_data->hwirq, rdbase + GICR_INVLPIR); wait_for_syncr(rdbase); } else { its_vpe_send_cmd(vpe, its_send_inv); -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org> To: kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Jason Cooper <jason@lakedaemon.net>, Robert Richter <rrichter@marvell.com>, Jayachandran C <jnair@marvell.com>, Thomas Gleixner <tglx@linutronix.de> Subject: [PATCH v2 03/36] irqchip/gic-v3-its: Allow LPI invalidation via the DirectLPI interface Date: Sun, 27 Oct 2019 14:42:01 +0000 [thread overview] Message-ID: <20191027144234.8395-4-maz@kernel.org> (raw) In-Reply-To: <20191027144234.8395-1-maz@kernel.org> We currently don't make much use of the DirectLPI feature, and it would be beneficial to do this more, if only because it becomes a mandatory feature for GICv4.1. Signed-off-by: Marc Zyngier <maz@kernel.org> --- drivers/irqchip/irq-gic-v3-its.c | 40 +++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 58cb233cf138..3e33cdc08200 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -175,6 +175,12 @@ static DEFINE_IDA(its_vpeid_ida); #define gic_data_rdist_rd_base() (gic_data_rdist()->rd_base) #define gic_data_rdist_vlpi_base() (gic_data_rdist_rd_base() + SZ_128K) +static inline u32 its_get_event_id(struct irq_data *d) +{ + struct its_device *its_dev = irq_data_get_irq_chip_data(d); + return d->hwirq - its_dev->event_map.lpi_base; +} + static struct its_collection *dev_event_to_col(struct its_device *its_dev, u32 event) { @@ -183,6 +189,13 @@ static struct its_collection *dev_event_to_col(struct its_device *its_dev, return its->collections + its_dev->event_map.col_map[event]; } +static struct its_collection *irq_to_col(struct irq_data *d) +{ + struct its_device *its_dev = irq_data_get_irq_chip_data(d); + + return dev_event_to_col(its_dev, its_get_event_id(d)); +} + static struct its_collection *valid_col(struct its_collection *col) { if (WARN_ON_ONCE(col->target_address & GENMASK_ULL(15, 0))) @@ -1031,12 +1044,6 @@ static void its_send_vinvall(struct its_node *its, struct its_vpe *vpe) * irqchip functions - assumes MSI, mostly. */ -static inline u32 its_get_event_id(struct irq_data *d) -{ - struct its_device *its_dev = irq_data_get_irq_chip_data(d); - return d->hwirq - its_dev->event_map.lpi_base; -} - static void lpi_write_config(struct irq_data *d, u8 clr, u8 set) { irq_hw_number_t hwirq; @@ -1081,12 +1088,28 @@ static void wait_for_syncr(void __iomem *rdbase) cpu_relax(); } +static void direct_lpi_inv(struct irq_data *d) +{ + struct its_collection *col; + void __iomem *rdbase; + + /* Target the redistributor this LPI is currently routed to */ + col = irq_to_col(d); + rdbase = per_cpu_ptr(gic_rdists->rdist, col->col_id)->rd_base; + gic_write_lpir(d->hwirq, rdbase + GICR_INVLPIR); + + wait_for_syncr(rdbase); +} + static void lpi_update_config(struct irq_data *d, u8 clr, u8 set) { struct its_device *its_dev = irq_data_get_irq_chip_data(d); lpi_write_config(d, clr, set); - its_send_inv(its_dev, its_get_event_id(d)); + if (gic_rdists->has_direct_lpi && !irqd_is_forwarded_to_vcpu(d)) + direct_lpi_inv(d); + else + its_send_inv(its_dev, its_get_event_id(d)); } static void its_vlpi_set_doorbell(struct irq_data *d, bool enable) @@ -2917,8 +2940,9 @@ static void its_vpe_send_inv(struct irq_data *d) if (gic_rdists->has_direct_lpi) { void __iomem *rdbase; + /* Target the redistributor this VPE is currently known on */ rdbase = per_cpu_ptr(gic_rdists->rdist, vpe->col_idx)->rd_base; - gic_write_lpir(vpe->vpe_db_lpi, rdbase + GICR_INVLPIR); + gic_write_lpir(d->parent_data->hwirq, rdbase + GICR_INVLPIR); wait_for_syncr(rdbase); } else { its_vpe_send_cmd(vpe, its_send_inv); -- 2.20.1 _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2019-10-27 14:43 UTC|newest] Thread overview: 151+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-27 14:41 [PATCH v2 00/36] irqchip/gic-v4: GICv4.1 architecture support Marc Zyngier 2019-10-27 14:41 ` Marc Zyngier 2019-10-27 14:41 ` [PATCH v2 01/36] KVM: arm64: vgic-v4: Move the GICv4 residency flow to be driven by vcpu_load/put Marc Zyngier 2019-10-27 14:41 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 02/36] irqchip/gic-v3-its: Factor out wait_for_syncr primitive Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-28 9:20 ` Zenghui Yu 2019-10-28 9:20 ` Zenghui Yu 2019-11-20 13:21 ` [tip: irq/core] " tip-bot2 for Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier [this message] 2019-10-27 14:42 ` [PATCH v2 03/36] irqchip/gic-v3-its: Allow LPI invalidation via the DirectLPI interface Marc Zyngier 2019-10-31 8:49 ` Zenghui Yu 2019-10-31 8:49 ` Zenghui Yu 2019-11-01 13:26 ` Marc Zyngier 2019-11-01 13:26 ` Marc Zyngier 2019-11-05 10:30 ` Zenghui Yu 2019-11-05 10:30 ` Zenghui Yu 2019-11-05 12:12 ` Marc Zyngier 2019-11-05 12:12 ` Marc Zyngier 2019-11-20 13:21 ` [tip: irq/core] " tip-bot2 for Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 04/36] irqchip/gic-v3-its: Make is_v4 use a TYPER copy Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-28 9:34 ` Zenghui Yu 2019-10-28 9:34 ` Zenghui Yu 2019-10-28 10:52 ` Marc Zyngier 2019-10-28 10:52 ` Marc Zyngier 2019-11-20 13:21 ` [tip: irq/core] " tip-bot2 for Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 05/36] irqchip/gic-v3-its: Kill its->ite_size and use TYPER copy instead Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-28 9:40 ` Zenghui Yu 2019-10-28 9:40 ` Zenghui Yu 2019-11-20 13:21 ` [tip: irq/core] " tip-bot2 for Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 06/36] irqchip/gic-v3-its: Kill its->device_ids " Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-31 6:33 ` Zenghui Yu 2019-10-31 6:33 ` Zenghui Yu 2019-10-31 8:30 ` Marc Zyngier 2019-10-31 8:30 ` Marc Zyngier 2019-10-31 9:08 ` Zenghui Yu 2019-10-31 9:08 ` Zenghui Yu 2019-11-20 13:21 ` [tip: irq/core] " tip-bot2 for Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 07/36] irqchip/gic-v3-its: Add get_vlpi_map() helper Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-31 3:54 ` Zenghui Yu 2019-10-31 3:54 ` Zenghui Yu 2019-11-20 13:21 ` [tip: irq/core] irqchip/gic-v3-its: Add its_vlpi_map helpers tip-bot2 for Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 08/36] irqchip/gic-v3: Detect GICv4.1 supporting RVPEID Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-31 11:34 ` Zenghui Yu 2019-10-31 11:34 ` Zenghui Yu 2019-10-27 14:42 ` [PATCH v2 09/36] irqchip/gic-v3: Add GICv4.1 VPEID size discovery Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-31 12:02 ` Zenghui Yu 2019-10-31 12:02 ` Zenghui Yu 2019-11-01 15:13 ` Marc Zyngier 2019-11-01 15:13 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 10/36] irqchip/gic-v3: Workaround Cavium TX1 erratum when reading GICD_TYPER2 Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2020-03-15 9:55 ` [tip: irq/urgent] irqchip/gic-v3: Workaround Cavium erratum 38539 " tip-bot2 for Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 11/36] irqchip/gic-v4.1: VPE table (aka GICR_VPROPBASER) allocation Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-12-24 7:10 ` Zenghui Yu 2019-12-24 7:10 ` Zenghui Yu 2019-12-24 9:19 ` Marc Zyngier 2019-12-24 9:19 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 12/36] irqchip/gic-v4.1: Implement the v4.1 flavour of VMAPP Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-11-01 10:58 ` Zenghui Yu 2019-11-01 10:58 ` Zenghui Yu 2019-11-13 8:02 ` Zenghui Yu 2019-11-13 8:02 ` Zenghui Yu 2019-11-13 9:47 ` Marc Zyngier 2019-11-13 9:47 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 13/36] irqchip/gic-v4.1: Don't use the VPE proxy if RVPEID is set Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-11-01 11:05 ` Zenghui Yu 2019-11-01 11:05 ` Zenghui Yu 2019-12-18 14:39 ` Marc Zyngier 2019-12-18 14:39 ` Marc Zyngier 2019-12-19 3:05 ` Zenghui Yu 2019-12-19 3:05 ` Zenghui Yu 2019-10-27 14:42 ` [PATCH v2 14/36] irqchip/gic-v4.1: Implement the v4.1 flavour of VMOVP Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-11-01 11:10 ` Zenghui Yu 2019-11-01 11:10 ` Zenghui Yu 2019-10-27 14:42 ` [PATCH v2 15/36] irqchip/gic-v4.1: Plumb skeletal VPE irqchip Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-11-01 11:13 ` Zenghui Yu 2019-11-01 11:13 ` Zenghui Yu 2019-10-27 14:42 ` [PATCH v2 16/36] irqchip/gic-v4.1: Add mask/unmask doorbell callbacks Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-11-01 11:23 ` Zenghui Yu 2019-11-01 11:23 ` Zenghui Yu 2019-12-18 15:06 ` Marc Zyngier 2019-12-18 15:06 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 17/36] irqchip/gic-v4.1: Add VPE residency callback Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-11-01 11:34 ` Zenghui Yu 2019-11-01 11:34 ` Zenghui Yu 2019-10-27 14:42 ` [PATCH v2 18/36] irqchip/gic-v4.1: Add VPE eviction callback Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-11-01 11:39 ` Zenghui Yu 2019-11-01 11:39 ` Zenghui Yu 2019-10-27 14:42 ` [PATCH v2 19/36] irqchip/gic-v4.1: Add VPE INVALL callback Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-11-01 11:51 ` Zenghui Yu 2019-11-01 11:51 ` Zenghui Yu 2019-12-18 14:18 ` Marc Zyngier 2019-12-18 14:18 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 20/36] irqchip/gic-v4.1: Suppress per-VLPI doorbell Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-11-01 12:17 ` Zenghui Yu 2019-11-01 12:17 ` Zenghui Yu 2019-10-27 14:42 ` [PATCH v2 21/36] irqchip/gic-v4.1: Allow direct invalidation of VLPIs Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-11-01 12:30 ` Zenghui Yu 2019-11-01 12:30 ` Zenghui Yu 2019-10-27 14:42 ` [PATCH v2 22/36] irqchip/gic-v4.1: Advertise support v4.1 to KVM Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-11-01 12:55 ` Zenghui Yu 2019-11-01 12:55 ` Zenghui Yu 2019-12-18 14:48 ` Marc Zyngier 2019-12-18 14:48 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 23/36] irqchip/gic-v4.1: Map the ITS SGIR register page Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 24/36] irqchip/gic-v4.1: Plumb skeletal VSGI irqchip Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 25/36] irqchip/gic-v4.1: Add initial SGI configuration Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 26/36] irqchip/gic-v4.1: Plumb mask/unmask SGI callbacks Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 27/36] irqchip/gic-v4.1: Plumb get/set_irqchip_state " Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 28/36] irqchip/gic-v4.1: Plumb set_vcpu_affinity " Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 29/36] irqchip/gic-v4.1: Move doorbell management to the GICv4 abstraction layer Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 30/36] irqchip/gic-v4.1: Add VSGI allocation/teardown Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 31/36] irqchip/gic-v4.1: Add VSGI property setup Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 32/36] irqchip/gic-v4.1: Eagerly vmap vPEs Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 33/36] KVM: arm64: GICv4.1: Let doorbells be auto-enabled Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 34/36] KVM: arm64: GICv4.1: Add direct injection capability to SGI registers Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 35/36] KVM: arm64: GICv4.1: Configure SGIs as HW interrupts Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier 2019-10-27 14:42 ` [PATCH v2 36/36] KVM: arm64: GICv4.1: Expose HW-based SGIs in debugfs Marc Zyngier 2019-10-27 14:42 ` Marc Zyngier
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=20191027144234.8395-4-maz@kernel.org \ --to=maz@kernel.org \ --cc=Andrew.Murray@arm.com \ --cc=eric.auger@redhat.com \ --cc=james.morse@arm.com \ --cc=jason@lakedaemon.net \ --cc=jnair@marvell.com \ --cc=julien.thierry.kdev@gmail.com \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-kernel@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=rrichter@marvell.com \ --cc=suzuki.poulose@arm.com \ --cc=tglx@linutronix.de \ --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: linkBe 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.