Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp2266247ybc; Wed, 20 Nov 2019 11:22:35 -0800 (PST) X-Google-Smtp-Source: APXvYqxOc0ujcNlBTr302a61wtIOt2M2iKnRVkUyVnZkw35f7ezjqE9vhFeGzM3JNtLexHoYLpws X-Received: by 2002:a17:906:3e90:: with SMTP id a16mr7317085ejj.265.1574277755509; Wed, 20 Nov 2019 11:22:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574277755; cv=none; d=google.com; s=arc-20160816; b=daSGNfgPPtABQpIAzpU8q2Dlo82gwVfuJphARmrX/SGDKzND/1l0W9XlnhrkmcHOCm T2mFSsqDuejbVIzX420iYGoJJBM2cLidWr0h/RT8kJcw5bApq6FnbpeNqm8XVArMZCxz x8pPh/mci+OksSIljKOg+y506j6G42JL3xzurrnagKUqq0Q6nwmEr4ZzAnFVvBqNLk05 0+jBFsRq5eHAliW8yiKXk0G5sOOYj3SLOIpqBoJwhpHsE+Hv/OjxnFdqoixKFfzJsngm 2Zy6J7Rj9wxZfB75iwLDrAmtQcxzqjZbuid+e4wSuY8UqQcDi2CuS3jSzisVFKIetRRZ 6Erg== 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:references :in-reply-to:message-id:date:subject:cc:to:from; bh=N+wDbzRcLwcajyOMgHObFBXDA3qMWnNcb3CN/P2OyVY=; b=zWn5n+GuNaMUzAJXPRf7784uUqpiy42D09P6Xa8ZSuVOXcNtD2qj4A81jno2yqpl// yfAoEmozpf/crIZV8JV+rWwSEhGeqrkzGQofWWh67NIBbIb8YqMfaPeTfe1dJMso8X2O WiKwmKoXB9KebeZJjadym0WLTaeS+L3e5s/IS1adV1FLIzSPqJB+7JpYnEDPj4hzkvhH 7paE4C1WCCElToLXSPCZNLBszd4vpUX1eS0v0AYEZEDcuCMUTOCTHGsS85IQl7UCuoqe m61MBjLrSHdfMxtl/hz6RJfYfYW4k+xzVdubi3XnmRq6/F6JRg200p7Meqqie/zNWD0H qwZQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o25si51999ejc.52.2019.11.20.11.22.10; Wed, 20 Nov 2019 11:22:35 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727673AbfKTTUb (ORCPT + 99 others); Wed, 20 Nov 2019 14:20:31 -0500 Received: from thoth.sbs.de ([192.35.17.2]:52705 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727270AbfKTTUa (ORCPT ); Wed, 20 Nov 2019 14:20:30 -0500 Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id xAKJKFIU022295 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Nov 2019 20:20:15 +0100 Received: from md1f2u6c.ad001.siemens.net ([139.25.68.37]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xAKJKFQe024611; Wed, 20 Nov 2019 20:20:15 +0100 From: Jan Kiszka To: Andy Shevchenko , Linus Walleij , Bartosz Golaszewski Cc: Linux Kernel Mailing List , linux-gpio@vger.kernel.org, Mika Westerberg , ACPI Devel Maling List , "Rafael J . Wysocki" Subject: [PATCH v3 1/2] gpio: sch: Add edge event support Date: Wed, 20 Nov 2019 20:20:13 +0100 Message-Id: <42ae6149a14f81fd86c5acb5bd33e987123b6bed.1574277614.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jan Kiszka Add the required infrastructure consisting of an irq_chip_generic with its irq_chip_type callbacks to enable and report edge events of the pins to the gpio core. The actual hook-up of the event interrupt will happen separately. Signed-off-by: Jan Kiszka --- drivers/gpio/gpio-sch.c | 114 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 107 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpio-sch.c b/drivers/gpio/gpio-sch.c index fb143f28c386..6a9c5500800c 100644 --- a/drivers/gpio/gpio-sch.c +++ b/drivers/gpio/gpio-sch.c @@ -18,12 +18,17 @@ #define GEN 0x00 #define GIO 0x04 #define GLV 0x08 +#define GTPE 0x0c +#define GTNE 0x10 +#define GGPE 0x14 +#define GTS 0x1c struct sch_gpio { struct gpio_chip chip; spinlock_t lock; unsigned short iobase; unsigned short resume_base; + int irq_base; }; static unsigned sch_gpio_offset(struct sch_gpio *sch, unsigned gpio, @@ -79,10 +84,11 @@ static void sch_gpio_reg_set(struct sch_gpio *sch, unsigned gpio, unsigned reg, static int sch_gpio_direction_in(struct gpio_chip *gc, unsigned gpio_num) { struct sch_gpio *sch = gpiochip_get_data(gc); + unsigned long flags; - spin_lock(&sch->lock); + spin_lock_irqsave(&sch->lock, flags); sch_gpio_reg_set(sch, gpio_num, GIO, 1); - spin_unlock(&sch->lock); + spin_unlock_irqrestore(&sch->lock, flags); return 0; } @@ -95,20 +101,22 @@ static int sch_gpio_get(struct gpio_chip *gc, unsigned gpio_num) static void sch_gpio_set(struct gpio_chip *gc, unsigned gpio_num, int val) { struct sch_gpio *sch = gpiochip_get_data(gc); + unsigned long flags; - spin_lock(&sch->lock); + spin_lock_irqsave(&sch->lock, flags); sch_gpio_reg_set(sch, gpio_num, GLV, val); - spin_unlock(&sch->lock); + spin_unlock_irqrestore(&sch->lock, flags); } static int sch_gpio_direction_out(struct gpio_chip *gc, unsigned gpio_num, int val) { struct sch_gpio *sch = gpiochip_get_data(gc); + unsigned long flags; - spin_lock(&sch->lock); + spin_lock_irqsave(&sch->lock, flags); sch_gpio_reg_set(sch, gpio_num, GIO, 0); - spin_unlock(&sch->lock); + spin_unlock_irqrestore(&sch->lock, flags); /* * according to the datasheet, writing to the level register has no @@ -130,6 +138,12 @@ static int sch_gpio_get_direction(struct gpio_chip *gc, unsigned gpio_num) return sch_gpio_reg_get(sch, gpio_num, GIO); } +static int sch_gpio_to_irq(struct gpio_chip *gpio, unsigned int offset) +{ + struct sch_gpio *sch = gpiochip_get_data(gpio); + return sch->irq_base + offset; +} + static const struct gpio_chip sch_gpio_chip = { .label = "sch_gpio", .owner = THIS_MODULE, @@ -138,12 +152,70 @@ static const struct gpio_chip sch_gpio_chip = { .direction_output = sch_gpio_direction_out, .set = sch_gpio_set, .get_direction = sch_gpio_get_direction, + .to_irq = sch_gpio_to_irq, }; +static int sch_irq_type(struct irq_data *d, unsigned int type) +{ + struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); + struct sch_gpio *sch = gc->private; + unsigned int gpio_num = d->irq - sch->irq_base; + unsigned long flags; + int rising = 0; + int falling = 0; + + switch (type & IRQ_TYPE_SENSE_MASK) { + case IRQ_TYPE_EDGE_RISING: + rising = 1; + break; + case IRQ_TYPE_EDGE_FALLING: + falling = 1; + break; + case IRQ_TYPE_EDGE_BOTH: + rising = 1; + falling = 1; + break; + default: + return -EINVAL; + } + + spin_lock_irqsave(&sch->lock, flags); + sch_gpio_reg_set(sch, gpio_num, GTPE, rising); + sch_gpio_reg_set(sch, gpio_num, GTNE, falling); + spin_unlock_irqrestore(&sch->lock, flags); + + return 0; +} + +static void sch_irq_set_enable(struct irq_data *d, int val) +{ + struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); + struct sch_gpio *sch = gc->private; + unsigned int gpio_num = d->irq - sch->irq_base; + unsigned long flags; + + spin_lock_irqsave(&sch->lock, flags); + sch_gpio_reg_set(sch, gpio_num, GGPE, val); + spin_unlock_irqrestore(&sch->lock, flags); +} + +static void sch_irq_mask(struct irq_data *d) +{ + sch_irq_set_enable(d, 0); +} + +static void sch_irq_unmask(struct irq_data *d) +{ + sch_irq_set_enable(d, 1); +} + static int sch_gpio_probe(struct platform_device *pdev) { + struct irq_chip_generic *gc; + struct irq_chip_type *ct; struct sch_gpio *sch; struct resource *res; + int irq_base, ret; sch = devm_kzalloc(&pdev->dev, sizeof(*sch), GFP_KERNEL); if (!sch) @@ -203,7 +275,35 @@ static int sch_gpio_probe(struct platform_device *pdev) platform_set_drvdata(pdev, sch); - return devm_gpiochip_add_data(&pdev->dev, &sch->chip, sch); + ret = devm_gpiochip_add_data(&pdev->dev, &sch->chip, sch); + if (ret) + return ret; + + irq_base = devm_irq_alloc_descs(&pdev->dev, -1, 0, sch->chip.ngpio, + NUMA_NO_NODE); + if (irq_base < 0) + return irq_base; + sch->irq_base = irq_base; + + gc = devm_irq_alloc_generic_chip(&pdev->dev, "sch_gpio", 1, irq_base, + NULL, handle_simple_irq); + if (!gc) + return -ENOMEM; + + gc->private = sch; + ct = gc->chip_types; + + ct->chip.irq_mask = sch_irq_mask; + ct->chip.irq_unmask = sch_irq_unmask; + ct->chip.irq_set_type = sch_irq_type; + + ret = devm_irq_setup_generic_chip(&pdev->dev, gc, + IRQ_MSK(sch->chip.ngpio), + 0, IRQ_NOREQUEST | IRQ_NOPROBE, 0); + if (ret) + return ret; + + return 0; } static struct platform_driver sch_gpio_driver = { -- 2.16.4