From patchwork Thu Jun 8 19:39:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 773461 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wkG3L5Fvlz9s76 for ; Fri, 9 Jun 2017 05:39:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KmZNi9lc"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751697AbdFHTj6 (ORCPT ); Thu, 8 Jun 2017 15:39:58 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:33938 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751672AbdFHTj4 (ORCPT ); Thu, 8 Jun 2017 15:39:56 -0400 Received: by mail-wr0-f194.google.com with SMTP id u101so4682286wrc.1; Thu, 08 Jun 2017 12:39:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=lv7dFEEthnPS3qca2dPIkX3ThWbezC1MtEvRcOHGpkI=; b=KmZNi9lcgwpbD04K4A2EkJSaS7NJ9ZmhtMRLPZI8ORPXSAvjielOmrgevLmWyf64O5 +x2xMaiP5Rgx4C8pWzrzcpPOK/2hzRdbrc2Oj1MkjW7sxJgLiO9aBlYOId+6dFP9fZxe dJ3Dtlj2lnCpirt0lwxslEtoU4Vh2hxci56VwYj4tO4LGS5Ryq8ifUt/CJOa2RW2n0/j +DFlDp0hQ2IPB0l+KNRu27i+NKH9wl5bZKiDecOq/c8OefaGnhUi/MQ1an6RiwH9EsfF gJ+ZqhVCa2H8c1A/MB5+oIjQgX8E7bFEWEUQT8GM2vvI6HP01/yc/S25AlTGUGe19LCH g/+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=lv7dFEEthnPS3qca2dPIkX3ThWbezC1MtEvRcOHGpkI=; b=BgTz9T6X838R6BtIB+/KguxCZOfdwdCm2V3xlvT3UMHytYtnEh74bWydKel+YZOFoc 3Mwhk2EuyKK36vLnh6FcMOFvs7t/QkEsRZQZAD11qELoNFmJ6gcFtPStLoyUYbSCJmJ7 Qg76+Uqey+rviYAlAK0bcpkgL8tAbXbgUxUanUzzy45w3VdQFfjOQbp1MQUQfTCfnG8R C7Rolj3tHVZYOOdN/HixsP8fP0jx89ia+50u36J/nFUT01RRSQUu9k/gzhQUktaosnnr HSnIowtYtN+II966AYTdqD/qUcDZKWBq9A4cb7g7eAxjDJzsrO54a+SrpOo4DCGsC6Ln PYXA== X-Gm-Message-State: AODbwcBR0Uv2yeaNynQmuTR5QTRJKVQiK8mN79CRcCK4ffV+TxGs8bEb OHMzrP03Q13bHA== X-Received: by 10.223.169.138 with SMTP id b10mr20402315wrd.29.1496950794672; Thu, 08 Jun 2017 12:39:54 -0700 (PDT) Received: from ?IPv6:2003:c6:ebdd:1100:565:334a:6f73:1edb? (p200300C6EBDD11000565334A6F731EDB.dip0.t-ipconnect.de. [2003:c6:ebdd:1100:565:334a:6f73:1edb]) by smtp.googlemail.com with ESMTPSA id z12sm6229349wrb.41.2017.06.08.12.39.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jun 2017 12:39:54 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v6 6/9] pinctrl: meson: add support for GPIO interrupts To: Jerome Brunet , Mark Rutland , Marc Zyngier , Linus Walleij , Kevin Hilman , Thomas Gleixner , Rob Herring , Neil Armstrong Cc: devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-gpio@vger.kernel.org, "thierry.reding@gmail.com" , Thierry Reding References: <04378047-4194-bb0f-3da3-e1d62345a86b@gmail.com> Message-ID: Date: Thu, 8 Jun 2017 21:39:14 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <04378047-4194-bb0f-3da3-e1d62345a86b@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Add support for GPIO interrupts and make use of the just introduced irqchip driver handling the GPIO interrupt-controller. Signed-off-by: Heiner Kallweit --- v5: - changed Kconfig entry based on Neil's suggestion - extended comments - fixed indentation v6: - no changes --- drivers/pinctrl/Kconfig | 1 + drivers/pinctrl/meson/pinctrl-meson.c | 170 +++++++++++++++++++++++++++++++++- 2 files changed, 170 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 7ae04a97..86834dea 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -166,6 +166,7 @@ config PINCTRL_MESON select PINCONF select GENERIC_PINCONF select GPIOLIB + select GPIOLIB_IRQCHIP select OF_GPIO select REGMAP_MMIO diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index 66ed70c1..7bacd4e3 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -62,6 +62,8 @@ #include "../pinctrl-utils.h" #include "pinctrl-meson.h" +static struct irq_domain *meson_pinctrl_irq_domain; + /** * meson_get_bank() - find the bank containing a given pin * @@ -497,6 +499,154 @@ static int meson_gpio_get(struct gpio_chip *chip, unsigned gpio) return !!(val & BIT(bit)); } +static struct meson_pinctrl *meson_gpio_data_to_pc(struct irq_data *data) +{ + struct gpio_chip *chip = irq_data_get_irq_chip_data(data); + + return gpiochip_get_data(chip); +} + +static int meson_gpio_bank_hwirq(struct meson_bank *bank, unsigned int offset) +{ + int hwirq; + + if (bank->irq_first < 0) + /* this bank cannot generate irqs */ + return 0; + + hwirq = offset - bank->first + bank->irq_first; + + if (hwirq > bank->irq_last) + /* this pin cannot generate irqs */ + return 0; + + return hwirq; +} + +static int meson_gpio_to_hwirq(struct irq_data *data) +{ + struct meson_pinctrl *pc = meson_gpio_data_to_pc(data); + unsigned int offset = data->hwirq; + struct meson_bank *bank; + int hwirq, ret; + + offset += pc->data->pin_base; + + ret = meson_get_bank(pc, offset, &bank); + if (ret) + return ret; + + hwirq = meson_gpio_bank_hwirq(bank, offset); + if (!hwirq) + dev_dbg(pc->dev, "no interrupt for pin %u\n", offset); + + return hwirq; +} + +static void meson_gpio_irq_handler(struct irq_desc *desc) +{ + struct irq_chip *chip = irq_desc_get_chip(desc); + struct irq_data *gpio_irq_data = irq_desc_get_handler_data(desc); + + chained_irq_enter(chip, desc); + + if (gpio_irq_data) + generic_handle_irq(gpio_irq_data->irq); + + chained_irq_exit(chip, desc); +} + +static void meson_gpio_irq_unmask(struct irq_data *data) {} +static void meson_gpio_irq_mask(struct irq_data *data) {} + +static void meson_gpio_irq_shutdown(struct irq_data *data) +{ + int hwirq = meson_gpio_to_hwirq(data); + int irq; + + if (hwirq <= 0) + return; + + /* + * In case of IRQ_TYPE_EDGE_BOTH we need two parent interrupts, + * one for each edge. That's due to HW constraints. + * We use format 2 * GPIO_HWIRQ +(0|1) for the hwirq, so we can + * have one GPIO_HWIRQ twice and derive the GPIO_HWIRQ from hwirq + * by shifting hwirq one bit to the right. + */ + irq = irq_find_mapping(meson_pinctrl_irq_domain, hwirq * 2); + if (irq) { + irq_set_chained_handler_and_data(irq, handle_bad_irq, NULL); + irq_domain_free_irqs(irq, 1); + } + + irq = irq_find_mapping(meson_pinctrl_irq_domain, hwirq * 2 + 1); + if (irq) { + irq_set_chained_handler_and_data(irq, handle_bad_irq, NULL); + irq_domain_free_irqs(irq, 1); + } +} + +static int meson_gpio_irq_set_type(struct irq_data *data, unsigned int type) +{ + int hwirq = meson_gpio_to_hwirq(data); + struct irq_fwspec fwspec; + int irq, irq2, num_slots; + + if (irqd_is_activated(data)) + return -EBUSY; + + if (hwirq < 0) + return hwirq; + + if (!hwirq) + return -ENXIO; + + fwspec.fwnode = meson_pinctrl_irq_domain->fwnode; + fwspec.param_count = 2; + + /* + * The chip can create an interrupt for either rising or falling edge + * only. Therefore use two interrupts in case of IRQ_TYPE_EDGE_BOTH, + * first for falling edge and second one for rising edge. + */ + num_slots = (type == IRQ_TYPE_EDGE_BOTH) ? 2 : 1; + + /* see comment in meson_gpio_irq_shutdown why we shift one bit here */ + fwspec.param[0] = hwirq << 1; + if (num_slots == 1) + fwspec.param[1] = type; + else + fwspec.param[1] = IRQ_TYPE_EDGE_FALLING; + + irq = irq_create_fwspec_mapping(&fwspec); + if (!irq) + return -EINVAL; + + irq_set_chained_handler_and_data(irq, meson_gpio_irq_handler, data); + + if (num_slots > 1) { + fwspec.param[0]++; + fwspec.param[1] = IRQ_TYPE_EDGE_RISING; + irq2 = irq_create_fwspec_mapping(&fwspec); + if (!irq2) { + irq_domain_free_irqs(irq, 1); + return -EINVAL; + } + irq_set_chained_handler_and_data(irq2, meson_gpio_irq_handler, data); + } + + return 0; +} + +static struct irq_chip meson_gpio_irq_chip = { + .name = "GPIO", + .irq_set_type = meson_gpio_irq_set_type, + .irq_mask = meson_gpio_irq_mask, + .irq_unmask = meson_gpio_irq_unmask, + .irq_shutdown = meson_gpio_irq_shutdown, +}; + static const struct of_device_id meson_pinctrl_dt_match[] = { { .compatible = "amlogic,meson8-cbus-pinctrl", @@ -558,7 +708,8 @@ static int meson_gpiolib_register(struct meson_pinctrl *pc) return ret; } - return 0; + return gpiochip_irqchip_add(&pc->chip, &meson_gpio_irq_chip, 0, + handle_simple_irq, IRQ_TYPE_NONE); } static struct regmap_config meson_regmap_config = { @@ -637,6 +788,23 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc, return PTR_ERR(pc->reg_gpio); } + if (!meson_pinctrl_irq_domain) { + np = of_find_compatible_node(NULL, NULL, "amlogic,meson-gpio-intc"); + if (!np) { + dev_err(pc->dev, "interrupt controller DT node not found\n"); + return -EINVAL; + } + + meson_pinctrl_irq_domain = irq_find_host(np); + if (!meson_pinctrl_irq_domain) { + dev_err(pc->dev, "interrupt controller not found\n"); + of_node_put(np); + return -EINVAL; + } + + of_node_put(np); + } + return 0; }