From patchwork Mon May 5 14:18:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: R Sricharan X-Patchwork-Id: 4115321 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 277819F271 for ; Mon, 5 May 2014 14:20:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5B2DB20398 for ; Mon, 5 May 2014 14:20:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D73E2022A for ; Mon, 5 May 2014 14:20:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932810AbaEEOUf (ORCPT ); Mon, 5 May 2014 10:20:35 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:43389 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932538AbaEEOUb (ORCPT ); Mon, 5 May 2014 10:20:31 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s45EKBA2023135; Mon, 5 May 2014 09:20:11 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s45EKBHb021843; Mon, 5 May 2014 09:20:11 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Mon, 5 May 2014 09:20:11 -0500 Received: from uda0393807.india.ti.com. (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s45EJxgW023302; Mon, 5 May 2014 09:20:09 -0500 From: Sricharan R To: , CC: , , , Subject: [PATCH 4/5] irqchip: crossbar: Initialise the crossbar with a safe value Date: Mon, 5 May 2014 19:48:46 +0530 Message-ID: <1399299527-10955-5-git-send-email-r.sricharan@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1399299527-10955-1-git-send-email-r.sricharan@ti.com> References: <1399299527-10955-1-git-send-email-r.sricharan@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Nishanth Menon Since crossbar is s/w configurable, the initial settings of the crossbar cannot be assumed to be sane. This implies that: a) On initialization all un-reserved crossbars must be initialized to a known 'safe' value. b) When unmapping the interrupt, the safe value must be written to ensure that the crossbar mapping matches with interrupt controller usage. So provide a safe value in the compatible data to map if '0' is not safe for the platform and use it during init and unmap Signed-off-by: Nishanth Menon Signed-off-by: Sricharan R --- drivers/irqchip/irq-crossbar.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c index 847f6e3..287d3ce 100644 --- a/drivers/irqchip/irq-crossbar.c +++ b/drivers/irqchip/irq-crossbar.c @@ -44,6 +44,7 @@ struct crossbar_device { struct crossbar_data { const uint *irqs_unused; const uint size; + const uint safe_map; }; static struct crossbar_device *cb; @@ -134,7 +135,7 @@ const struct irq_domain_ops routable_irq_domain_ops = { static int __init crossbar_of_init(struct device_node *node, const struct crossbar_data *data) { - int i, size, max, reserved = 0, entry; + int i, size, max, reserved = 0, entry, safe_map; const __be32 *irqsr; const int *irqsk = NULL; @@ -212,6 +213,7 @@ static int __init crossbar_of_init(struct device_node *node, if (data) { irqsk = data->irqs_unused; size = data->size; + safe_map = data->safe_map; for (i = 0; i < size; i++) { entry = irqsk[i]; @@ -222,6 +224,14 @@ static int __init crossbar_of_init(struct device_node *node, } cb->irq_map[entry] = IRQ_SKIP; } + + for (i = 0; i < max; i++) { + if (cb->irq_map[i] == IRQ_RESERVED || + cb->irq_map[i] == IRQ_SKIP) + continue; + + cb->write(i, safe_map); + } } register_routable_domain_ops(&routable_irq_domain_ops); @@ -241,7 +251,7 @@ err1: /* irq number 10 cannot be used because of hw bug */ int dra_irqs_unused[] = { 10 }; struct crossbar_data cb_dra_data = { dra_irqs_unused, - ARRAY_SIZE(dra_irqs_unused) }; + ARRAY_SIZE(dra_irqs_unused), 0 }; static const struct of_device_id crossbar_match[] __initconst = { { .compatible = "ti,irq-crossbar", .data = &cb_dra_data },