From patchwork Thu Jan 28 12:21:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin X-Patchwork-Id: 372860 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82FF0C433DB for ; Thu, 28 Jan 2021 12:23:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 345EE64DCC for ; Thu, 28 Jan 2021 12:23:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231680AbhA1MWk (ORCPT ); Thu, 28 Jan 2021 07:22:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231588AbhA1MWW (ORCPT ); Thu, 28 Jan 2021 07:22:22 -0500 Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [IPv6:2a02:6b8:0:801:2::102]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57BFCC061574; Thu, 28 Jan 2021 04:21:40 -0800 (PST) Received: from sas2-b72cee5f614a.qloud-c.yandex.net (sas2-b72cee5f614a.qloud-c.yandex.net [IPv6:2a02:6b8:c08:6c80:0:640:b72c:ee5f]) by forward102j.mail.yandex.net (Yandex) with ESMTP id B4B30F212F4; Thu, 28 Jan 2021 15:21:36 +0300 (MSK) Received: from sas1-27140bb19246.qloud-c.yandex.net (sas1-27140bb19246.qloud-c.yandex.net [2a02:6b8:c08:1803:0:640:2714:bb1]) by sas2-b72cee5f614a.qloud-c.yandex.net (mxback/Yandex) with ESMTP id qvcgAJgqcY-LaHiuJla; Thu, 28 Jan 2021 15:21:36 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maquefel.me; s=mail; t=1611836496; bh=hIu/Pi1a2rxhSeJ9mcdKquJRCpaeUeChEOMSBEzmYZc=; h=In-Reply-To:References:Date:Subject:To:From:Message-Id:Cc; b=pZ6knQj5vvpWeN8ELP78WQ/RFmEkPuz3UPFtzG226GgahkXQZrXvgaRlZQKuBOtpQ ACBe8yANLFcBpx8EqEGIvrwexyIzcb7SqFE/t8sZaxN2OOmN1zzCGFb2cioKwbphVP VaLQ0es2pCGtJLJPmC4emVXXbD71kdq22fHipo4c= Authentication-Results: sas2-b72cee5f614a.qloud-c.yandex.net; dkim=pass header.i=@maquefel.me Received: by sas1-27140bb19246.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id dVFT85naok-LZn8doPV; Thu, 28 Jan 2021 15:21:36 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Nikita Shubin Cc: Andy Shevchenko , Nikita Shubin , Linus Walleij , Bartosz Golaszewski , Alexander Sverdlin , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/7] gpio: gpio-ep93xx: fix BUG_ON port F usage Date: Thu, 28 Jan 2021 15:21:17 +0300 Message-Id: <20210128122123.25341-2-nikita.shubin@maquefel.me> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128122123.25341-1-nikita.shubin@maquefel.me> References: <20210128122123.25341-1-nikita.shubin@maquefel.me> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The port F is index 2 not 5. ------------[ cut here ]------------ kernel BUG at drivers/gpio/gpio-ep93xx.c:64! Internal error: Oops - BUG: 0 [#1] ARM Modules linked in: CPU: 0 PID: 403 Comm: gpio-event-mon Not tainted 5.9.10-00011-ge93e9618628b-dirty #19 Hardware name: Technologic Systems TS-72xx SBC PC is at ep93xx_gpio_update_int_params+0x1c/0x80 LR is at ep93xx_gpio_update_int_params+0x14/0x80 pc : [] lr : [] psr: 20000093 sp : c158de00 ip : 00000000 fp : 00000001 r10: c44154d4 r9 : 00000000 r8 : c4415020 r7 : c04ef884 r6 : c051c842 r5 : c4415020 r4 : 00000005 r3 : 00000000 r2 : 00000000 r1 : c04eb768 r0 : 00000008 Flags: nzCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment none Control: 0000717f Table: 01684000 DAC: 00000051 Process gpio-event-mon (pid: 403, stack limit = 0x(ptrval)) Stack: (0xc158de00 to 0xc158e000) de00: 00000005 00000002 c051c842 c0238dc0 c0238c98 c0238c98 c04ef874 00000000 de20: 00000003 c04fcfcc 60000013 c04ef910 c04ef8d4 c00456f0 c04ef874 c15f1e00 de40: 00000000 00000000 00000001 c0045d40 c15f1e00 c4400160 c0044ca8 c04ef8a8 de60: 60000013 00000000 c15f1e00 c04ef874 c04ef884 00000001 c0235d70 c158b800 de80: be825f0f c0045ec8 00000003 c158b800 c440aa00 be825bc8 00000003 00000001 dea0: 00000000 c0236f00 c44ed3a0 c158b800 c45c2015 00000000 00000001 00000003 dec0: 6f697067 6576652d 6d2d746e 00006e6f 00000000 00000000 00000000 00000000 dee0: be825df4 c00abb0c c440c500 c00aabd4 c440c500 c528b840 c45c2010 c04e1228 df00: 00000ff0 c4478d28 c030b404 be825bc8 c1550e20 00000003 c1550e20 c00c3388 df20: c4478d28 c00c3d48 be825f0f c00abd00 c45c2000 c45c2000 c1550e20 c00bfea8 df40: 00000003 c00b0714 00000000 c4450000 00000004 00000100 00000001 c04e1228 df60: c158dfb0 ffffff9c 000231f8 00000003 00000142 c00b085c 00000000 c04e1228 df80: 00000000 be825f0f 00000003 00000003 00000036 c00083c4 c158c000 00000000 dfa0: be825f0f c00081e0 be825f0f 00000003 00000003 c030b404 be825bc8 00000000 dfc0: be825f0f 00000003 00000003 00000036 00000001 00000000 00022070 be825f0f dfe0: b6f2e4e0 be825bac 00010acc b6f2e4ec 60000010 00000003 00000000 00000000 [] (ep93xx_gpio_update_int_params) from [] (ep93xx_gpio_irq_type+0x128/0x1c0) [] (ep93xx_gpio_irq_type) from [] (__irq_set_trigger+0x6c/0x128) [] (__irq_set_trigger) from [] (__setup_irq+0x594/0x678) [] (__setup_irq) from [] (request_threaded_irq+0xa4/0x128) [] (request_threaded_irq) from [] (gpio_ioctl+0x300/0x4d8) [] (gpio_ioctl) from [] (vfs_ioctl+0x24/0x3c) [] (vfs_ioctl) from [] (sys_ioctl+0xbc/0x768) [] (sys_ioctl) from [] (ret_fast_syscall+0x0/0x50) Exception stack(0xc158dfa8 to 0xc158dff0) dfa0: be825f0f 00000003 00000003 c030b404 be825bc8 00000000 dfc0: be825f0f 00000003 00000003 00000036 00000001 00000000 00022070 be825f0f dfe0: b6f2e4e0 be825bac 00010acc b6f2e4ec Code: e59f0060 ebfff3e1 e3540002 9a000000 (e7f001f2) ---[ end trace 3f6544e133e9f5ae ]--- Fixes: fd935fc421e74 ("gpio: ep93xx: Do not pingpong irq numbers") Signed-off-by: Nikita Shubin --- v2->v3: Reworded commit message. --- drivers/gpio/gpio-ep93xx.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c index 226da8df6f10..0d5a9a90cf48 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c @@ -39,6 +39,12 @@ struct ep93xx_gpio { struct gpio_chip gc[8]; }; +/* + * F Port index in GPIOCHIP'S array is 5 + * but we use index 2 for stored values and offsets + */ +#define EP93XX_GPIO_F_PORT_INDEX 5 + /************************************************************************* * Interrupt handling for EP93xx on-chip GPIOs *************************************************************************/ @@ -85,6 +91,9 @@ static int ep93xx_gpio_port(struct gpio_chip *gc) return 0; } + if (port == EP93XX_GPIO_F_PORT_INDEX) + port = 2; + return port; } From patchwork Thu Jan 28 12:21:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin X-Patchwork-Id: 372859 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7A32C43381 for ; Thu, 28 Jan 2021 12:23:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B1DF064DE0 for ; Thu, 28 Jan 2021 12:23:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231694AbhA1MWq (ORCPT ); Thu, 28 Jan 2021 07:22:46 -0500 Received: from forward100p.mail.yandex.net ([77.88.28.100]:38372 "EHLO forward100p.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231590AbhA1MWY (ORCPT ); Thu, 28 Jan 2021 07:22:24 -0500 Received: from sas2-3d0e723302f6.qloud-c.yandex.net (sas2-3d0e723302f6.qloud-c.yandex.net [IPv6:2a02:6b8:c08:6c80:0:640:3d0e:7233]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 2FFCA5981269; Thu, 28 Jan 2021 15:21:40 +0300 (MSK) Received: from sas1-27140bb19246.qloud-c.yandex.net (sas1-27140bb19246.qloud-c.yandex.net [2a02:6b8:c08:1803:0:640:2714:bb1]) by sas2-3d0e723302f6.qloud-c.yandex.net (mxback/Yandex) with ESMTP id SzMlFKvUZz-LeHmRjsC; Thu, 28 Jan 2021 15:21:40 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maquefel.me; s=mail; t=1611836500; bh=C5a9SAwNEUbR0EuvrWoukVA4pIVxaiS8G+ziQFPV0KI=; h=In-Reply-To:References:Date:Subject:To:From:Message-Id:Cc; b=itNi+t5nvny7pHGe6/qW2iTQ8KWsNovm2Xvj6ZoiyL0DI6UkhBhpNy9SEauETszZX z1f1nIxpnbcpdfubWT7apxteCdIVjmM8O5qxbNyYgy/Qe0mp4mlTHLl+I6YNfj1L8x fHQL1zlZL5lnJQtqUuU/gqsYScw5Lor5I+S2grx8= Authentication-Results: sas2-3d0e723302f6.qloud-c.yandex.net; dkim=pass header.i=@maquefel.me Received: by sas1-27140bb19246.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id dVFT85naok-Ldn81BQu; Thu, 28 Jan 2021 15:21:39 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Nikita Shubin Cc: Andy Shevchenko , Nikita Shubin , Linus Walleij , Bartosz Golaszewski , Alexander Sverdlin , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/7] gpio: ep93xx: drop to_irq binding Date: Thu, 28 Jan 2021 15:21:20 +0300 Message-Id: <20210128122123.25341-5-nikita.shubin@maquefel.me> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128122123.25341-1-nikita.shubin@maquefel.me> References: <20210128122123.25341-1-nikita.shubin@maquefel.me> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org As ->to_irq is redefined in gpiochip_add_irqchip, having it defined in driver is useless, so let's drop it. Signed-off-by: Nikita Shubin --- drivers/gpio/gpio-ep93xx.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c index dc88115e34da..ee1cb3b894db 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c @@ -337,11 +337,6 @@ static int ep93xx_gpio_set_config(struct gpio_chip *gc, unsigned offset, return 0; } -static int ep93xx_gpio_f_to_irq(struct gpio_chip *gc, unsigned offset) -{ - return EP93XX_GPIO_F_IRQ_BASE + offset; -} - static void ep93xx_init_irq_chips(struct ep93xx_gpio *epg) { int i; @@ -429,7 +424,6 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, } girq->default_type = IRQ_TYPE_NONE; girq->handler = handle_level_irq; - gc->to_irq = ep93xx_gpio_f_to_irq; girq->first = EP93XX_GPIO_F_IRQ_BASE; } From patchwork Thu Jan 28 12:21:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin X-Patchwork-Id: 372857 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C639C433DB for ; Thu, 28 Jan 2021 12:24:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 081B264DCC for ; Thu, 28 Jan 2021 12:24:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231782AbhA1MYI (ORCPT ); Thu, 28 Jan 2021 07:24:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231496AbhA1MWv (ORCPT ); Thu, 28 Jan 2021 07:22:51 -0500 Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:109]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97AD2C061788; Thu, 28 Jan 2021 04:21:44 -0800 (PST) Received: from sas1-121c281eae19.qloud-c.yandex.net (sas1-121c281eae19.qloud-c.yandex.net [IPv6:2a02:6b8:c08:cf03:0:640:121c:281e]) by forward106p.mail.yandex.net (Yandex) with ESMTP id D7DB91C81DB1; Thu, 28 Jan 2021 15:21:42 +0300 (MSK) Received: from sas1-27140bb19246.qloud-c.yandex.net (sas1-27140bb19246.qloud-c.yandex.net [2a02:6b8:c08:1803:0:640:2714:bb1]) by sas1-121c281eae19.qloud-c.yandex.net (mxback/Yandex) with ESMTP id QDw1zldknv-LgICE5iY; Thu, 28 Jan 2021 15:21:42 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maquefel.me; s=mail; t=1611836502; bh=TxePM7yigEWZGALCm3l//RosNPu0MYRdbDRTJyb50So=; h=In-Reply-To:References:Date:Subject:To:From:Message-Id:Cc; b=AGkP3Lv6J+8Sh2s9RHlv3t3oiL7QDQkThKt+VtwXQGobRSfG/YNhmlqe1tF9kH5F5 XWSfwX/hpNpXZVZ6RWdys2P7VOFwOAm3IMFkjzjEcHXHIDWJB3VQexKS+oASxx0PL3 03O2MjrruruIAEHthauQ0LcRh+wJPYVzc+KG50Dg= Authentication-Results: sas1-121c281eae19.qloud-c.yandex.net; dkim=pass header.i=@maquefel.me Received: by sas1-27140bb19246.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id dVFT85naok-Lgn84O12; Thu, 28 Jan 2021 15:21:42 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Nikita Shubin Cc: Andy Shevchenko , Nikita Shubin , Linus Walleij , Bartosz Golaszewski , Alexander Sverdlin , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 7/7] gpiod: ep93xx: refactor base IRQ number Date: Thu, 28 Jan 2021 15:21:23 +0300 Message-Id: <20210128122123.25341-8-nikita.shubin@maquefel.me> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128122123.25341-1-nikita.shubin@maquefel.me> References: <20210128122123.25341-1-nikita.shubin@maquefel.me> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org - use predefined constants instead of plain numbers - use provided bank IRQ number instead of defined constant for port F Signed-off-by: Nikita Shubin --- drivers/gpio/gpio-ep93xx.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c index df55aa13bd9a..b1501607e8ed 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c @@ -28,6 +28,8 @@ /* Maximum value for irq capable line identifiers */ #define EP93XX_GPIO_LINE_MAX_IRQ 23 +#define EP93XX_GPIO_A_IRQ_BASE 64 +#define EP93XX_GPIO_B_IRQ_BASE 72 /* * Static mapping of GPIO bank F IRQS: * F0..F7 (16..24) to irq 80..87. @@ -311,14 +313,14 @@ struct ep93xx_gpio_bank { static struct ep93xx_gpio_bank ep93xx_gpio_banks[] = { /* Bank A has 8 IRQs */ - EP93XX_GPIO_BANK("A", 0x00, 0x10, 0, true, false, 64), + EP93XX_GPIO_BANK("A", 0x00, 0x10, 0, true, false, EP93XX_GPIO_A_IRQ_BASE), /* Bank B has 8 IRQs */ - EP93XX_GPIO_BANK("B", 0x04, 0x14, 8, true, false, 72), + EP93XX_GPIO_BANK("B", 0x04, 0x14, 8, true, false, EP93XX_GPIO_B_IRQ_BASE), EP93XX_GPIO_BANK("C", 0x08, 0x18, 40, false, false, 0), EP93XX_GPIO_BANK("D", 0x0c, 0x1c, 24, false, false, 0), EP93XX_GPIO_BANK("E", 0x20, 0x24, 32, false, false, 0), /* Bank F has 8 IRQs */ - EP93XX_GPIO_BANK("F", 0x30, 0x34, 16, false, true, 0), + EP93XX_GPIO_BANK("F", 0x30, 0x34, 16, false, true, EP93XX_GPIO_F_IRQ_BASE), EP93XX_GPIO_BANK("G", 0x38, 0x3c, 48, false, false, 0), EP93XX_GPIO_BANK("H", 0x40, 0x44, 56, false, false, 0), }; @@ -414,7 +416,7 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, /* Pick resources 1..8 for these IRQs */ for (i = 0; i < girq->num_parents; i++) { girq->parents[i] = platform_get_irq(pdev, i + 1); - gpio_irq = EP93XX_GPIO_F_IRQ_BASE + i; + gpio_irq = bank->irq_base + i; irq_set_chip_data(gpio_irq, &epg->gc[5]); irq_set_chip_and_handler(gpio_irq, &ep93xx_gpio_irq_chip, @@ -423,7 +425,7 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, } girq->default_type = IRQ_TYPE_NONE; girq->handler = handle_level_irq; - girq->first = EP93XX_GPIO_F_IRQ_BASE; + girq->first = bank->irq_base; } return devm_gpiochip_add_data(dev, gc, epg);