Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752543AbbHSXWx (ORCPT ); Wed, 19 Aug 2015 19:22:53 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57886 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751364AbbHSXWv (ORCPT ); Wed, 19 Aug 2015 19:22:51 -0400 Date: Wed, 19 Aug 2015 16:21:59 -0700 From: tip-bot for Grygorii Strashko Message-ID: Cc: grygorii.strashko@ti.com, balbi@ti.com, hpa@zytor.com, sudeep.holla@arm.com, linux@arm.linux.org.uk, marc.zyngier@arm.com, tglx@linutronix.de, nsekhar@ti.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, tony@atomide.com, mingo@kernel.org, jason@lakedaemon.net Reply-To: hpa@zytor.com, sudeep.holla@arm.com, grygorii.strashko@ti.com, balbi@ti.com, linux-kernel@vger.kernel.org, nsekhar@ti.com, linux-arm-kernel@lists.infradead.org, marc.zyngier@arm.com, linux@arm.linux.org.uk, tglx@linutronix.de, mingo@kernel.org, jason@lakedaemon.net, tony@atomide.com In-Reply-To: <1439554830-19502-3-git-send-email-grygorii.strashko@ti.com> References: <1439554830-19502-3-git-send-email-grygorii.strashko@ti.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] genirq: Introduce irq_chip_set_type_parent() helper Git-Commit-ID: b7560de198222994374c1340a389f12d5efb244a 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 Content-Length: 2897 Lines: 81 Commit-ID: b7560de198222994374c1340a389f12d5efb244a Gitweb: http://git.kernel.org/tip/b7560de198222994374c1340a389f12d5efb244a Author: Grygorii Strashko AuthorDate: Fri, 14 Aug 2015 15:20:26 +0300 Committer: Thomas Gleixner CommitDate: Thu, 20 Aug 2015 00:25:25 +0200 genirq: Introduce irq_chip_set_type_parent() helper This helper is required for irq chips which do not implement a irq_set_type callback and need to call down the irq domain hierarchy for the actual trigger type change. This helper is required to fix further wreckage caused by the conversion of TI OMAP to hierarchical irq domains and therefor tagged for stable. [ tglx: Massaged changelog ] Signed-off-by: Grygorii Strashko Cc: Sudeep Holla Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: stable@vger.kernel.org # 4.1 Link: http://lkml.kernel.org/r/1439554830-19502-3-git-send-email-grygorii.strashko@ti.com Signed-off-by: Thomas Gleixner --- include/linux/irq.h | 1 + kernel/irq/chip.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/include/linux/irq.h b/include/linux/irq.h index 92188b0..51744bc 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -484,6 +484,7 @@ extern int irq_chip_set_affinity_parent(struct irq_data *data, extern int irq_chip_set_wake_parent(struct irq_data *data, unsigned int on); extern int irq_chip_set_vcpu_affinity_parent(struct irq_data *data, void *vcpu_info); +extern int irq_chip_set_type_parent(struct irq_data *data, unsigned int type); #endif /* Handling of unhandled and spurious interrupts: */ diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 6de638b..ae21682 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -985,6 +985,23 @@ int irq_chip_set_affinity_parent(struct irq_data *data, } /** + * irq_chip_set_type_parent - Set IRQ type on the parent interrupt + * @data: Pointer to interrupt specific data + * @type: IRQ_TYPE_{LEVEL,EDGE}_* value - see include/linux/irq.h + * + * Conditional, as the underlying parent chip might not implement it. + */ +int irq_chip_set_type_parent(struct irq_data *data, unsigned int type) +{ + data = data->parent_data; + + if (data->chip->irq_set_type) + return data->chip->irq_set_type(data, type); + + return -ENOSYS; +} + +/** * irq_chip_retrigger_hierarchy - Retrigger an interrupt in hardware * @data: Pointer to interrupt specific data * -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/