Skip to content

Commit 0edc23e

Browse files
author
Marc Zyngier
committed
irqchip/gic-v3: Add VLPI/DirectLPI discovery
Add helper functions that probe for VLPI and DirectLPI properties. Reviewed-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
1 parent 0d94ded commit 0edc23e

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

drivers/irqchip/irq-gic-v3.c

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2013, 2014 ARM Limited, All Rights Reserved.
2+
* Copyright (C) 2013-2017 ARM Limited, All Rights Reserved.
33
* Author: Marc Zyngier <marc.zyngier@arm.com>
44
*
55
* This program is free software; you can redistribute it and/or modify
@@ -504,6 +504,24 @@ static int gic_populate_rdist(void)
504504
return -ENODEV;
505505
}
506506

507+
static int __gic_update_vlpi_properties(struct redist_region *region,
508+
void __iomem *ptr)
509+
{
510+
u64 typer = gic_read_typer(ptr + GICR_TYPER);
511+
gic_data.rdists.has_vlpis &= !!(typer & GICR_TYPER_VLPIS);
512+
gic_data.rdists.has_direct_lpi &= !!(typer & GICR_TYPER_DirectLPIS);
513+
514+
return 1;
515+
}
516+
517+
static void gic_update_vlpi_properties(void)
518+
{
519+
gic_iterate_rdists(__gic_update_vlpi_properties);
520+
pr_info("%sVLPI support, %sdirect LPI support\n",
521+
!gic_data.rdists.has_vlpis ? "no " : "",
522+
!gic_data.rdists.has_direct_lpi ? "no " : "");
523+
}
524+
507525
static void gic_cpu_sys_reg_init(void)
508526
{
509527
/*
@@ -968,6 +986,8 @@ static int __init gic_init_bases(void __iomem *dist_base,
968986
gic_data.domain = irq_domain_create_tree(handle, &gic_irq_domain_ops,
969987
&gic_data);
970988
gic_data.rdists.rdist = alloc_percpu(typeof(*gic_data.rdists.rdist));
989+
gic_data.rdists.has_vlpis = true;
990+
gic_data.rdists.has_direct_lpi = true;
971991

972992
if (WARN_ON(!gic_data.domain) || WARN_ON(!gic_data.rdists.rdist)) {
973993
err = -ENOMEM;
@@ -976,6 +996,8 @@ static int __init gic_init_bases(void __iomem *dist_base,
976996

977997
set_handle_irq(gic_handle_irq);
978998

999+
gic_update_vlpi_properties();
1000+
9791001
if (IS_ENABLED(CONFIG_ARM_GIC_V3_ITS) && gic_dist_supports_lpis())
9801002
its_init(handle, &gic_data.rdists, gic_data.domain);
9811003

include/linux/irqchip/arm-gic-v3.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204

205205
#define GICR_TYPER_PLPIS (1U << 0)
206206
#define GICR_TYPER_VLPIS (1U << 1)
207+
#define GICR_TYPER_DirectLPIS (1U << 3)
207208
#define GICR_TYPER_LAST (1U << 4)
208209

209210
#define GIC_V3_REDIST_SIZE 0x20000
@@ -487,6 +488,8 @@ struct rdists {
487488
struct page *prop_page;
488489
int id_bits;
489490
u64 flags;
491+
bool has_vlpis;
492+
bool has_direct_lpi;
490493
};
491494

492495
struct irq_domain;

0 commit comments

Comments
 (0)