From patchwork Tue Sep 15 11:00:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grzegorz Jaszczyk X-Patchwork-Id: 312032 Delivered-To: patch@linaro.org Received: by 2002:a92:5ad1:0:0:0:0:0 with SMTP id b78csp30156ilg; Tue, 15 Sep 2020 17:57:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynzC4wPxfNI8iDczLWHNRSx0z5I45R5NlRHmCgJoPD6pZLVWx7bibrtKJRwDSQpwCSI0jK X-Received: by 2002:a17:906:e50:: with SMTP id q16mr23772463eji.544.1600217840147; Tue, 15 Sep 2020 17:57:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600217840; cv=none; d=google.com; s=arc-20160816; b=DqxzUJiBoj1TOmpRQDZboBEUJ5keOyXoeDhGjKkCu11lgFCC4wkbsNb24U/PL686rn VlYomfQjW49Tdywys6bvnCUYreoHy1t4kwmtYpmOPQJy1/8X/sJyDtB/4OPtlhLs1Om8 LKBZFIxn3D+OFh7+QQYnxVSK5K5YQHMZ3cq79taFuggfD5ScKMTtjX5y0a9R8w0wb7sb 2tw2Tkdhg/HWso24EtuZy7hB21UNTmRRABlGD1qGuaTzFaiypOIDGcIYVAdBYznWusSI 4bQNaZeUUsK6OcNBbPlum6JFkvN/strIHXAuNq6aoIiHf0rDUuBOgn1IPa560ZorX/Yq /Gvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=xSpHbTMRF5l19WgNcjU80aU88bYV7d4gSwfI8EzLalw=; b=SgLwj3CXSshnSU6Y9H0EUjlyKDV4fD7qF0PSp3w4DsvPy1Dbryz/U5OPxS2sWjIXwx W9+0iUevJgMT3DaACVcSQX5amHwcRy11ZTqyfnqFN3BjKxdVpsSngQiu2H/Aac6yIscT OdpycHg2wBJHBsa/pJbUBtPDuhFv9eSkMhEOeisl8cW17H5dAqexFWJtD9B/pNY6KM0u XzvNkV5SkDQaPNwVpHXmWqZPGKSZHwi8ArfPL9hW+Ft4M5aB/5GiSZ8yPICY4C21e29J xPF8gP0laxg9oIx0I+RhNKUVRljm+aKVmdehrMcNKv6lCRtxXi6s/Izq9CvVROLZtSt6 AyIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yyMFQuI1; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v21si11381063ejg.582.2020.09.15.17.57.19; Tue, 15 Sep 2020 17:57:20 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yyMFQuI1; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726152AbgIOLOw (ORCPT + 6 others); Tue, 15 Sep 2020 07:14:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726193AbgIOLMz (ORCPT ); Tue, 15 Sep 2020 07:12:55 -0400 Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5B7FC061356 for ; Tue, 15 Sep 2020 04:01:23 -0700 (PDT) Received: by mail-lj1-x244.google.com with SMTP id a22so2368876ljp.13 for ; Tue, 15 Sep 2020 04:01:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xSpHbTMRF5l19WgNcjU80aU88bYV7d4gSwfI8EzLalw=; b=yyMFQuI1h5MjsRDh0RoPYqvdO2aC3fzk9cDPN3EHzGepEPWwIEyol3ueu7Hy7yX885 /vMQOv/HuZEiJlLgzQDEkAQ/OhDV11uwUhB20gy9kW619W25vBSOAy78Ed6JLB5zT6H+ bCsMheI3kKxWDFjKGRg9W2oSRzE8u2OMnUjXlQUpXNo7d0n6aTrPAA/3atamjonMaStz 8+1EvJKaQZGQhi4wziZqDEV9/5qri1Z2ouN1LZbQIQh2QhPApL8E8MUaVeB3HRV9/H8x Gw5udUfFW/LpvPSpTuQRhk6wAKk4k1GVGWNDNYU5Iwv2d52NUyAJqlTZMEIjhYcQcS4W TVhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xSpHbTMRF5l19WgNcjU80aU88bYV7d4gSwfI8EzLalw=; b=cAAHzaxKtVKSTUI/1bB4e2N1ReF5dzId5v9WauEVqXh+FK0MkMQLZSYv/8033XsEVJ bq81zJywX+F9MwAayjnbVkCNR53lerJbwiA0FTHaYNSQxS6GboywC1Xkd7nOhnvnCdOC yZOTtVk/W4sI77+wN64EWgnBo4C47g0B7J0j7waKKqGM3v9ibwoi+aljtj7xEjaid/9g LOxqmrZnJruetaRD4loGMZdLULv7uXz9gMY79hHGmQKuZgGMYtWpks8k2qaGzpvhPie3 X3F74Cxsqx1Xb3endZLeI9YEsvOF0N2yeosrQTPKJYsT8YZaIuU+IK79rE4cjJ/UHGgr F55A== X-Gm-Message-State: AOAM530Q9NdQyVFOHgPTIjraZxI1GG7W0oDULtxa0QV3KFC4pZU43FFn zxuaK5tUer2f1uEZSZk9/2nPmg== X-Received: by 2002:a2e:a543:: with SMTP id e3mr6304643ljn.33.1600167682043; Tue, 15 Sep 2020 04:01:22 -0700 (PDT) Received: from gilgamesh.semihalf.com (193-106-246-138.noc.fibertech.net.pl. [193.106.246.138]) by smtp.gmail.com with ESMTPSA id n3sm4588916ljj.59.2020.09.15.04.01.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Sep 2020 04:01:21 -0700 (PDT) From: Grzegorz Jaszczyk To: tglx@linutronix.de, jason@lakedaemon.net, maz@kernel.org, s-anna@ti.com Cc: grzegorz.jaszczyk@linaro.org, robh+dt@kernel.org, lee.jones@linaro.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, david@lechnology.com, praneeth@ti.com Subject: [PATCH v6 3/5] irqchip/irq-pruss-intc: Add logic for handling reserved interrupts Date: Tue, 15 Sep 2020 13:00:49 +0200 Message-Id: <1600167651-20851-4-git-send-email-grzegorz.jaszczyk@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1600167651-20851-1-git-send-email-grzegorz.jaszczyk@linaro.org> References: <1600167651-20851-1-git-send-email-grzegorz.jaszczyk@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Suman Anna The PRUSS INTC has a fixed number of output interrupt lines that are connected to a number of processors or other PRUSS instances or other devices (like DMA) on the SoC. The output interrupt lines 2 through 9 are usually connected to the main Arm host processor and are referred to as host interrupts 0 through 7 from ARM/MPU perspective. All of these 8 host interrupts are not always exclusively connected to the Arm interrupt controller. Some SoCs have some interrupt lines not connected to the Arm interrupt controller at all, while a few others have the interrupt lines connected to multiple processors in which they need to be partitioned as per SoC integration needs. For example, AM437x and 66AK2G SoCs have 2 PRUSS instances each and have the host interrupt 5 connected to the other PRUSS, while AM335x has host interrupt 0 shared between MPU and TSC_ADC and host interrupts 6 & 7 shared between MPU and a DMA controller. Add logic to the PRUSS INTC driver to ignore both these shared and invalid interrupts. Signed-off-by: Suman Anna Signed-off-by: Grzegorz Jaszczyk --- v5->v6: - No change. v4->v5: - Rename: s/invalid_intr/irqs_reserved/ v3->v4: - Due to changes in DT bindings which converts irqs-reserved property from uint8-array to bitmask requested by Rob introduce relevant changes in the driver. - Merge the irqs-reserved and irqs-shared to one property since they can be handled by one logic (relevant change was introduced to DT binding). - Update commit message. v2->v3: - Extra checks for (intc->irqs[i]) in error/remove path was moved from "irqchip/irq-pruss-intc: Add a PRUSS irqchip driver for PRUSS interrupts" to this patch v1->v2: - https://patchwork.kernel.org/patch/11069757/ --- drivers/irqchip/irq-pruss-intc.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/irqchip/irq-pruss-intc.c b/drivers/irqchip/irq-pruss-intc.c index 319e431..396dc55 100644 --- a/drivers/irqchip/irq-pruss-intc.c +++ b/drivers/irqchip/irq-pruss-intc.c @@ -484,7 +484,7 @@ static int pruss_intc_probe(struct platform_device *pdev) struct pruss_intc *intc; struct pruss_host_irq_data *host_data; int i, irq, ret; - u8 max_system_events; + u8 max_system_events, irqs_reserved = 0; data = of_device_get_match_data(dev); if (!data) @@ -504,6 +504,16 @@ static int pruss_intc_probe(struct platform_device *pdev) if (IS_ERR(intc->base)) return PTR_ERR(intc->base); + ret = of_property_read_u8(dev->of_node, "ti,irqs-reserved", + &irqs_reserved); + + /* + * The irqs-reserved is used only for some SoC's therefore not having + * this property is still valid + */ + if (ret < 0 && ret != -EINVAL) + return ret; + pruss_intc_init(intc); mutex_init(&intc->lock); @@ -514,6 +524,9 @@ static int pruss_intc_probe(struct platform_device *pdev) return -ENOMEM; for (i = 0; i < MAX_NUM_HOST_IRQS; i++) { + if (irqs_reserved & BIT(i)) + continue; + irq = platform_get_irq_byname(pdev, irq_names[i]); if (irq <= 0) { ret = (irq == 0) ? -EINVAL : irq; @@ -538,8 +551,11 @@ static int pruss_intc_probe(struct platform_device *pdev) return 0; fail_irq: - while (--i >= 0) - irq_set_chained_handler_and_data(intc->irqs[i], NULL, NULL); + while (--i >= 0) { + if (intc->irqs[i]) + irq_set_chained_handler_and_data(intc->irqs[i], NULL, + NULL); + } irq_domain_remove(intc->domain); @@ -553,8 +569,11 @@ static int pruss_intc_remove(struct platform_device *pdev) unsigned int hwirq; int i; - for (i = 0; i < MAX_NUM_HOST_IRQS; i++) - irq_set_chained_handler_and_data(intc->irqs[i], NULL, NULL); + for (i = 0; i < MAX_NUM_HOST_IRQS; i++) { + if (intc->irqs[i]) + irq_set_chained_handler_and_data(intc->irqs[i], NULL, + NULL); + } for (hwirq = 0; hwirq < max_system_events; hwirq++) irq_dispose_mapping(irq_find_mapping(intc->domain, hwirq));