From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753732AbdARKzm (ORCPT ); Wed, 18 Jan 2017 05:55:42 -0500 Received: from terminus.zytor.com ([198.137.202.10]:42372 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752620AbdARKzi (ORCPT ); Wed, 18 Jan 2017 05:55:38 -0500 Date: Wed, 18 Jan 2017 02:55:18 -0800 From: tip-bot for Ruslan Ruslichenko Message-ID: Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, rruslich@cisco.com, hpa@zytor.com, tglx@linutronix.de Reply-To: hpa@zytor.com, tglx@linutronix.de, rruslich@cisco.com, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <1484662432-13580-1-git-send-email-rruslich@cisco.com> References: <1484662432-13580-1-git-send-email-rruslich@cisco.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/ioapic: Restore IO-APIC irq_chip retrigger callback Git-Commit-ID: a9b4f08770b415f30f2fb0f8329a370c8f554aa3 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a9b4f08770b415f30f2fb0f8329a370c8f554aa3 Gitweb: http://git.kernel.org/tip/a9b4f08770b415f30f2fb0f8329a370c8f554aa3 Author: Ruslan Ruslichenko AuthorDate: Tue, 17 Jan 2017 16:13:52 +0200 Committer: Thomas Gleixner 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 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 --- 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, };