Received: by 2002:ac0:b08d:0:0:0:0:0 with SMTP id l13csp1944247imc; Fri, 22 Feb 2019 14:21:57 -0800 (PST) X-Google-Smtp-Source: AHgI3IbBQjb6Gky8qS5UTvLPAwMLfAh2+6YM9L2u+YEWpb8wo9LUehAsYkN9K8bWzS1iieue8pH+ X-Received: by 2002:a17:902:129:: with SMTP id 38mr6462392plb.140.1550874117613; Fri, 22 Feb 2019 14:21:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550874117; cv=none; d=google.com; s=arc-20160816; b=pgxolE3uZ67ebWC6lpYp+y7Wsq8wk+KDM4Tipl4OG3PDrQAGaA+P4xf5sl9RLrJ87z tJImdDPGVr68Zth2tT7e6YF/MYewTSPqY4SpFHjlUNuV0I2P3eJJpZTV3PhqKiV29eAk 3bxP46pModMDlAOk1K26Y3w2iN/7Xhr4WZQGkaUGvg/qrok0BMyjsi5Al88ODZGIo/+o RRiKFq0wwm08OWJOFDvhzSUWIBvHOz3310ObFeCaFzTyfXJAfhbS4ILlnWq/xqKiD4S5 eVQ4TdT6+8bnHER493ELYARa6VAeNI9u3yHNyZKIskL2oqWQo5FE53UqI6bC7oyzxhKg mUhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dmarc-filter:dkim-signature:dkim-signature; bh=i85qysxqaEtY08m32zTIS1tpSeaRoeAv7IZqSZV8l8U=; b=zOzBz3su5V+bPs4e1cB2PidOc6Cr1vdZkIXzBmzQ8fyAVfWQ4QRyuJ6E6u1jSyLBbc o23aDvnWz0JnStLukPqTqrFp9HQ1/YdUt1qUrycd6BPG4ebqD8gCRF/kR3wSTlNLjmeU 3TP/k2eEQ+QV9gNQC7xfYpqWlDjxpZA/QvBa/dCB/fDfq4YehjKJsim1b/aGM+k9id+E dxDBjWH5cfd7c0py5oRzI6YNkD7VAEeZnt+yC6RZsnRMG4dYZv3DoPseMvZNCCDhQyvk nvwc3J8UdtODalz50t9g0nMf5GuQAd/1UCZaC0ltrP/S+w5mwEM19tCTFxOtMlQVziMQ Pa2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=HYcYaCMK; dkim=pass header.i=@codeaurora.org header.s=default header.b=chqjFOPu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 67si2364260pgc.312.2019.02.22.14.21.42; Fri, 22 Feb 2019 14:21:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=HYcYaCMK; dkim=pass header.i=@codeaurora.org header.s=default header.b=chqjFOPu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727287AbfBVWTl (ORCPT + 99 others); Fri, 22 Feb 2019 17:19:41 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:44534 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726736AbfBVWTK (ORCPT ); Fri, 22 Feb 2019 17:19:10 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 37414609C1; Fri, 22 Feb 2019 22:19:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1550873949; bh=6X40OFzrDRghYYHQ6tTUUMvjuGDQtJZi3ZoE6byY/qI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HYcYaCMKT1F0kaFf6X4gVuSKphJC0foTHsaHggsN1FHleDzv56Xy3EA9pfLmsCa8c W1aQUrYCtvHl6S3JP7rT1AS6iPGDOGsJV4JIgpeaqKHCcYDgahjokwpaFG8XNkKJGa phBg+m6uSZb9oyjs8leeqzSX2CWmKAfWGlcdFse8= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED autolearn=no autolearn_force=no version=3.4.0 Received: from codeaurora.org (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: ilina@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id D9A4160918; Fri, 22 Feb 2019 22:19:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1550873947; bh=6X40OFzrDRghYYHQ6tTUUMvjuGDQtJZi3ZoE6byY/qI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=chqjFOPus2QkkydSBydi2h0kI1+4GmvNkHz+lAg2FkYTC5GaIL4QNaKMwjay7KaDq +fVhHNY8Z4ZeOj5M2n9+wyfRwuKO5UP1Ak6E/V/XqFnDP9hXhsMH12uyxh24qgbe5Q j83MS3tuebnOj0rx5LRQ3yxrI57iEMHs39nGZJGs= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D9A4160918 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=ilina@codeaurora.org From: Lina Iyer To: swboyd@chromium.org, evgreen@chromium.org, marc.zyngier@arm.com Cc: linux-kernel@vger.kernel.org, rplsssn@codeaurora.org, linux-arm-msm@vger.kernel.org, thierry.reding@gmail.com, bjorn.andersson@linaro.org, dianders@chromium.org, linus.walleij@linaro.org, Lina Iyer Subject: [PATCH v3 4/9] drivers: irqchip: add PDC irqdomain for wakeup capable GPIOs Date: Fri, 22 Feb 2019 15:18:45 -0700 Message-Id: <20190222221850.26939-5-ilina@codeaurora.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190222221850.26939-1-ilina@codeaurora.org> References: <20190222221850.26939-1-ilina@codeaurora.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce a new domain for wakeup capable GPIOs. The domain can be requested using the bus token DOMAIN_BUS_WAKEUP. In the following patches, we will specify PDC as the wakeup-parent for the TLMM GPIO irqchip. Requesting a wakeup GPIO will setup the GPIO and the corresponding PDC interrupt as its parent. Co-developed-by: Stephen Boyd Signed-off-by: Lina Iyer --- Changes in v3: - Remove PDC GPIO map data (moved to DT) - hwirq passed in .alloc() is a PDC pin now Changes in v2: - Remove separate file for PDC GPIO map data - Error checks and return - Whitespace fixes --- drivers/irqchip/qcom-pdc.c | 106 ++++++++++++++++++++++++++++++++--- include/linux/soc/qcom/irq.h | 23 ++++++++ 2 files changed, 120 insertions(+), 9 deletions(-) create mode 100644 include/linux/soc/qcom/irq.h diff --git a/drivers/irqchip/qcom-pdc.c b/drivers/irqchip/qcom-pdc.c index faa7d61b9d6c..5a64cbeec410 100644 --- a/drivers/irqchip/qcom-pdc.c +++ b/drivers/irqchip/qcom-pdc.c @@ -13,12 +13,13 @@ #include #include #include +#include #include -#include #include #include #define PDC_MAX_IRQS 126 +#define PDC_MAX_GPIO_IRQS 256 #define CLEAR_INTR(reg, intr) (reg & ~(1 << intr)) #define ENABLE_INTR(reg, intr) (reg | (1 << intr)) @@ -32,6 +33,16 @@ struct pdc_pin_region { u32 cnt; }; +struct pdc_gpio_pin_map { + unsigned int gpio; + u32 pdc_pin; +}; + +struct pdc_gpio_pin_data { + size_t size; + const struct pdc_gpio_pin_map *map; +}; + static DEFINE_RAW_SPINLOCK(pdc_lock); static void __iomem *pdc_base; static struct pdc_pin_region *pdc_region; @@ -47,9 +58,8 @@ static u32 pdc_reg_read(int reg, u32 i) return readl_relaxed(pdc_base + reg + i * sizeof(u32)); } -static void pdc_enable_intr(struct irq_data *d, bool on) +static void pdc_enable_intr(irq_hw_number_t pin_out, bool on) { - int pin_out = d->hwirq; u32 index, mask; u32 enable; @@ -65,13 +75,23 @@ static void pdc_enable_intr(struct irq_data *d, bool on) static void qcom_pdc_gic_mask(struct irq_data *d) { - pdc_enable_intr(d, false); + irq_hw_number_t hwirq = d->hwirq; + + if (hwirq == ULONG_MAX) + return; + + pdc_enable_intr(hwirq, false); irq_chip_mask_parent(d); } static void qcom_pdc_gic_unmask(struct irq_data *d) { - pdc_enable_intr(d, true); + irq_hw_number_t hwirq = d->hwirq; + + if (hwirq == ULONG_MAX) + return; + + pdc_enable_intr(hwirq, true); irq_chip_unmask_parent(d); } @@ -111,9 +131,12 @@ enum pdc_irq_config_bits { */ static int qcom_pdc_gic_set_type(struct irq_data *d, unsigned int type) { - int pin_out = d->hwirq; + irq_hw_number_t pin_out = d->hwirq; enum pdc_irq_config_bits pdc_type; + if (pin_out == ULONG_MAX) + return 0; + switch (type) { case IRQ_TYPE_EDGE_RISING: pdc_type = PDC_EDGE_RISING; @@ -157,7 +180,7 @@ static struct irq_chip qcom_pdc_gic_chip = { .irq_set_affinity = irq_chip_set_affinity_parent, }; -static irq_hw_number_t get_parent_hwirq(int pin) +static irq_hw_number_t get_parent_hwirq(irq_hw_number_t pin) { int i; struct pdc_pin_region *region; @@ -169,7 +192,6 @@ static irq_hw_number_t get_parent_hwirq(int pin) return (region->parent_base + pin - region->pin_base); } - WARN_ON(1); return ~0UL; } @@ -232,6 +254,60 @@ static const struct irq_domain_ops qcom_pdc_ops = { .free = irq_domain_free_irqs_common, }; +static int qcom_pdc_gpio_alloc(struct irq_domain *domain, unsigned int virq, + unsigned int nr_irqs, void *data) +{ + struct qcom_irq_fwspec *qcom_fwspec = data; + struct irq_fwspec *fwspec = &qcom_fwspec->fwspec; + struct irq_fwspec parent_fwspec; + irq_hw_number_t hwirq, parent_hwirq; + unsigned int type; + int ret; + + ret = qcom_pdc_translate(domain, fwspec, &hwirq, &type); + if (ret) + return -EINVAL; + + parent_hwirq = get_parent_hwirq(hwirq); + if (parent_hwirq == ~0UL) + return -EINVAL; + + ret = irq_domain_set_hwirq_and_chip(domain, virq, hwirq, + &qcom_pdc_gic_chip, NULL); + if (ret) + return ret; + + qcom_fwspec->mask = true; + + if (type & IRQ_TYPE_EDGE_BOTH) + type = IRQ_TYPE_EDGE_RISING; + + if (type & IRQ_TYPE_LEVEL_MASK) + type = IRQ_TYPE_LEVEL_HIGH; + + parent_fwspec.fwnode = domain->parent->fwnode; + parent_fwspec.param_count = 3; + parent_fwspec.param[0] = 0; + parent_fwspec.param[1] = parent_hwirq; + parent_fwspec.param[2] = type; + + return irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, + &parent_fwspec); +} + +static int qcom_pdc_gpio_domain_select(struct irq_domain *d, + struct irq_fwspec *fwspec, + enum irq_domain_bus_token bus_token) +{ + return (bus_token == DOMAIN_BUS_WAKEUP); +} + +static const struct irq_domain_ops qcom_pdc_gpio_ops = { + .select = qcom_pdc_gpio_domain_select, + .alloc = qcom_pdc_gpio_alloc, + .free = irq_domain_free_irqs_common, +}; + static int pdc_setup_pin_mapping(struct device_node *np) { int ret, n; @@ -270,7 +346,7 @@ static int pdc_setup_pin_mapping(struct device_node *np) static int qcom_pdc_init(struct device_node *node, struct device_node *parent) { - struct irq_domain *parent_domain, *pdc_domain; + struct irq_domain *parent_domain, *pdc_domain, *pdc_gpio_domain; int ret; pdc_base = of_iomap(node, 0); @@ -301,6 +377,18 @@ static int qcom_pdc_init(struct device_node *node, struct device_node *parent) goto fail; } + pdc_gpio_domain = irq_domain_create_hierarchy(parent_domain, 0, + PDC_MAX_GPIO_IRQS, + of_fwnode_handle(node), + &qcom_pdc_gpio_ops, NULL); + if (!pdc_gpio_domain) { + pr_err("%pOF: GIC domain add failed for GPIO domain\n", node); + ret = -ENOMEM; + goto fail; + } + + irq_domain_update_bus_token(pdc_gpio_domain, DOMAIN_BUS_WAKEUP); + return 0; fail: diff --git a/include/linux/soc/qcom/irq.h b/include/linux/soc/qcom/irq.h new file mode 100644 index 000000000000..bacc9edbce0d --- /dev/null +++ b/include/linux/soc/qcom/irq.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __QCOM_IRQ_H +#define __QCOM_IRQ_H + +#include + +/** + * struct qcom_irq_fwspec - qcom specific irq fwspec wrapper + * @fwspec: irq fwspec + * @mask: if true, keep the irq masked in the gpio controller + * + * Use this structure to communicate between the parent irq chip, MPM or PDC, + * to the gpio chip, TLMM, about the gpio being allocated in the parent + * and if the gpio chip should keep the line masked because the parent irq + * chip is handling everything about the irq line. + */ +struct qcom_irq_fwspec { + struct irq_fwspec fwspec; + bool mask; +}; + +#endif -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project