From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from imap0.codethink.co.uk ([185.43.218.159]:38770 "EHLO imap0.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932341AbdEKRFV (ORCPT ); Thu, 11 May 2017 13:05:21 -0400 Message-ID: <1494522304.3965.65.camel@codethink.co.uk> Subject: Re: [PATCH 4.4 16/60] x86/ioapic: Restore IO-APIC irq_chip retrigger callback From: Ben Hutchings To: Greg Kroah-Hartman , Ruslan Ruslichenko , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, xe-linux-external@cisco.com Date: Thu, 11 May 2017 18:05:04 +0100 In-Reply-To: <20170511141237.776596381@linuxfoundation.org> References: <20170511141237.094835992@linuxfoundation.org> <20170511141237.776596381@linuxfoundation.org> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: On Thu, 2017-05-11 at 16:12 +0200, Greg Kroah-Hartman wrote: > 4.4-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Ruslan Ruslichenko > > commit a9b4f08770b415f30f2fb0f8329a370c8f554aa3 upstream. > > 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. Sounds like it's not important enough for stable, then? Ben. > [ 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 > Signed-off-by: Greg Kroah-Hartman > > --- > arch/x86/kernel/apic/io_apic.c | 2 ++ > 1 file changed, 2 insertions(+) > > --- 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 __rea > .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 __ > .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, > }; > > > > -- Ben Hutchings Software Developer, Codethink Ltd.