Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1561472

[tip:x86/apic] x86/ioapic: Restore IO-APIC irq_chip retrigger callback

Show all headers | View raw

Commit-ID:  a9b4f08770b415f30f2fb0f8329a370c8f554aa3
Gitweb:     http://git.kernel.org/tip/a9b4f08770b415f30f2fb0f8329a370c8f554aa3
Author:     Ruslan Ruslichenko <rruslich@cisco.com>
AuthorDate: Tue, 17 Jan 2017 16:13:52 +0200
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 18 Jan 2017 11:51:02 +0100

x86/ioapic: Restore IO-APIC irq_chip retrigger callback

commit d32932d02e18 removed the irq_retrigger callback from the IO-APIC
chip and did not add it to the new IO-APIC-IR irq chip.

There is no harm because the interrupts are resent in software when the
retrigger callback is NULL, but it's less efficient. So restore them.

[ tglx: Massaged changelog ]

Fixes: d32932d02e18  ("x86/irq: Convert IOAPIC to use hierarchical irqdomain interfaces")
Signed-off-by: Ruslan Ruslichenko <rruslich@cisco.com>
Cc: xe-linux-external@cisco.com
Link: http://lkml.kernel.org/r/1484662432-13580-1-git-send-email-rruslich@cisco.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
 arch/x86/kernel/apic/io_apic.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 945e512..1e35dd0 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1875,6 +1875,7 @@ static struct irq_chip ioapic_chip __read_mostly = {
 	.irq_ack		= irq_chip_ack_parent,
 	.irq_eoi		= ioapic_ack_level,
 	.irq_set_affinity	= ioapic_set_affinity,
+	.irq_retrigger		= irq_chip_retrigger_hierarchy,
 	.flags			= IRQCHIP_SKIP_SET_WAKE,
 };
 
@@ -1886,6 +1887,7 @@ static struct irq_chip ioapic_ir_chip __read_mostly = {
 	.irq_ack		= irq_chip_ack_parent,
 	.irq_eoi		= ioapic_ir_ack_level,
 	.irq_set_affinity	= ioapic_set_affinity,
+	.irq_retrigger		= irq_chip_retrigger_hierarchy,
 	.flags			= IRQCHIP_SKIP_SET_WAKE,
 };
 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] x86/ioapic: add IO-APIC irq_chip retrigger hook Ruslan Ruslichenko <rruslich@cisco.com> - 2017-01-17 15:30 +0100
  Re: [PATCH] x86/ioapic: add IO-APIC irq_chip retrigger hook Thomas Gleixner <tglx@linutronix.de> - 2017-01-18 11:50 +0100
    Re: [PATCH] x86/ioapic: add IO-APIC irq_chip retrigger hook "Ruslan Ruslichenko -X (rruslich - GLOBALLOGIC INC at Cisco)"          <rruslich@cisco.com> - 2017-01-18 15:30 +0100
      Re: [PATCH] x86/ioapic: add IO-APIC irq_chip retrigger hook Thomas Gleixner <tglx@linutronix.de> - 2017-01-18 16:20 +0100
  [tip:x86/apic] x86/ioapic: Restore IO-APIC irq_chip retrigger  callback tip-bot for Ruslan Ruslichenko <tipbot@zytor.com> - 2017-01-18 12:00 +0100
  [tip:x86/urgent] x86/ioapic: Restore IO-APIC irq_chip retrigger  callback tip-bot for Ruslan Ruslichenko <tipbot@zytor.com> - 2017-01-18 15:50 +0100

csiph-web