提交 ce9143c4 编写于 作者: S Sumit Garg 提交者: Zheng Zengkai

irqchip/gic-v3: Enable support for SGIs to act as NMIs

maillist inclusion
category: feature
bugzilla: 49593
CVE: NA
Reference: https://www.spinics.net/lists/arm-kernel/msg851005.html

-------------------------------------------------

Add support to handle SGIs as pseudo NMIs. As SGIs or IPIs default to a
special flow handler: handle_percpu_devid_fasteoi_ipi(), so skip NMI
handler update in case of SGIs.

Also, enable NMI support prior to gic_smp_init() as allocation of SGIs
as IRQs/NMIs happen as part of this routine.
Signed-off-by: NSumit Garg <sumit.garg@linaro.org>
Signed-off-by: NWei Li <liwei391@huawei.com>
Reviewed-by: NXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 e4332fc0
...@@ -455,6 +455,7 @@ static u32 gic_get_ppi_index(struct irq_data *d) ...@@ -455,6 +455,7 @@ static u32 gic_get_ppi_index(struct irq_data *d)
static int gic_irq_nmi_setup(struct irq_data *d) static int gic_irq_nmi_setup(struct irq_data *d)
{ {
struct irq_desc *desc = irq_to_desc(d->irq); struct irq_desc *desc = irq_to_desc(d->irq);
u32 idx;
if (!gic_supports_nmi()) if (!gic_supports_nmi())
return -EINVAL; return -EINVAL;
...@@ -472,16 +473,22 @@ static int gic_irq_nmi_setup(struct irq_data *d) ...@@ -472,16 +473,22 @@ static int gic_irq_nmi_setup(struct irq_data *d)
return -EINVAL; return -EINVAL;
/* desc lock should already be held */ /* desc lock should already be held */
if (gic_irq_in_rdist(d)) { switch (get_intid_range(d)) {
u32 idx = gic_get_ppi_index(d); case SGI_RANGE:
break;
case PPI_RANGE:
case EPPI_RANGE:
idx = gic_get_ppi_index(d);
/* Setting up PPI as NMI, only switch handler for first NMI */ /* Setting up PPI as NMI, only switch handler for first NMI */
if (!refcount_inc_not_zero(&ppi_nmi_refs[idx])) { if (!refcount_inc_not_zero(&ppi_nmi_refs[idx])) {
refcount_set(&ppi_nmi_refs[idx], 1); refcount_set(&ppi_nmi_refs[idx], 1);
desc->handle_irq = handle_percpu_devid_fasteoi_nmi; desc->handle_irq = handle_percpu_devid_fasteoi_nmi;
} }
} else { break;
default:
desc->handle_irq = handle_fasteoi_nmi; desc->handle_irq = handle_fasteoi_nmi;
break;
} }
gic_irq_set_prio(d, GICD_INT_NMI_PRI); gic_irq_set_prio(d, GICD_INT_NMI_PRI);
...@@ -492,6 +499,7 @@ static int gic_irq_nmi_setup(struct irq_data *d) ...@@ -492,6 +499,7 @@ static int gic_irq_nmi_setup(struct irq_data *d)
static void gic_irq_nmi_teardown(struct irq_data *d) static void gic_irq_nmi_teardown(struct irq_data *d)
{ {
struct irq_desc *desc = irq_to_desc(d->irq); struct irq_desc *desc = irq_to_desc(d->irq);
u32 idx;
if (WARN_ON(!gic_supports_nmi())) if (WARN_ON(!gic_supports_nmi()))
return; return;
...@@ -509,14 +517,20 @@ static void gic_irq_nmi_teardown(struct irq_data *d) ...@@ -509,14 +517,20 @@ static void gic_irq_nmi_teardown(struct irq_data *d)
return; return;
/* desc lock should already be held */ /* desc lock should already be held */
if (gic_irq_in_rdist(d)) { switch (get_intid_range(d)) {
u32 idx = gic_get_ppi_index(d); case SGI_RANGE:
break;
case PPI_RANGE:
case EPPI_RANGE:
idx = gic_get_ppi_index(d);
/* Tearing down NMI, only switch handler for last NMI */ /* Tearing down NMI, only switch handler for last NMI */
if (refcount_dec_and_test(&ppi_nmi_refs[idx])) if (refcount_dec_and_test(&ppi_nmi_refs[idx]))
desc->handle_irq = handle_percpu_devid_irq; desc->handle_irq = handle_percpu_devid_irq;
} else { break;
default:
desc->handle_irq = handle_fasteoi_irq; desc->handle_irq = handle_fasteoi_irq;
break;
} }
gic_irq_set_prio(d, GICD_INT_DEF_PRI); gic_irq_set_prio(d, GICD_INT_DEF_PRI);
...@@ -1702,6 +1716,7 @@ static int __init gic_init_bases(void __iomem *dist_base, ...@@ -1702,6 +1716,7 @@ static int __init gic_init_bases(void __iomem *dist_base,
gic_dist_init(); gic_dist_init();
gic_cpu_init(); gic_cpu_init();
gic_enable_nmi_support();
gic_smp_init(); gic_smp_init();
gic_cpu_pm_init(); gic_cpu_pm_init();
...@@ -1713,8 +1728,6 @@ static int __init gic_init_bases(void __iomem *dist_base, ...@@ -1713,8 +1728,6 @@ static int __init gic_init_bases(void __iomem *dist_base,
gicv2m_init(handle, gic_data.domain); gicv2m_init(handle, gic_data.domain);
} }
gic_enable_nmi_support();
return 0; return 0;
out_free: out_free:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册