From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 696C8C433DF for ; Wed, 1 Jul 2020 03:28:24 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 35D37206EB for ; Wed, 1 Jul 2020 03:28:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="P295Qyd1"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SPTSDknI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 35D37206EB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=a7y28L6+Q36L9NzFkOL4qLOxe7LpWvfCTUO4sEqXBhk=; b=P295Qyd1TeD0rEWAF6eA8aF7j/ Elz210rbeNRAObr8TuvmWH8pwOxo+Ku7lvY50T/6iGYQga0pGml5PhIi7ryL7x0wHgZ2oyWrD66Hs /BGnLlI/O3MByl/oQiD73cMwSHGbyIk8aU06sf7LSk9wURHOfSwA27930Xcoe6zgTzz4kpIec1doL xrfCHHCynBAQmn2KPtI/pwU7PeQMTf90WrEbUiPKly+aW3m3+uCHW3+EMfMW50HW5s65ZRWTG3GoJ 4+tJ6AOQXhcDWNPgUa9DzUdg03MjiyrHRUSjMS1u54nr+93VsPcq/ezRTDmvl30tuHoV/iMgg2JnR uNCX1JBA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqTOn-00061t-IK; Wed, 01 Jul 2020 03:27:01 +0000 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqTOk-000618-F8 for linux-arm-kernel@lists.infradead.org; Wed, 01 Jul 2020 03:26:59 +0000 Received: by mail-pg1-x543.google.com with SMTP id m22so612875pgv.9 for ; Tue, 30 Jun 2020 20:26:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=haItCdpVH6dP/fd+5hLpgld/wltsvifALp6/dCIKiUI=; b=SPTSDknIZgZlYH4/MMUk8/DWmB5sQwqLFNIvY0YQOzB+1NDSz9ue0XTtY3zJPJyGPh FqYx+8nz67YMzigCBFOubptd5wD+AGrzkNOC9mswhVQVpRpy1G4xqLOEj37d5fyVqEc7 cd4OaUQh7JHIrwrFMQSkq6zd2XvhWmkPmzej1vmhBbPokqpEPg1JNPk92NYgev7Az2KE BWIqv/oL6SGFETlqDugkXCh9yW0FcNtICllVvQpdfuD4JdcqnxQOiDMQAAJQCYsKUQZ/ dqD6xZf1AJ3zbmmQlfkMI7yEtZ3I6ZCag2iVjXKjIZigm8isfBJdDuvBvLcdx+dD8Iw+ 7mZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=haItCdpVH6dP/fd+5hLpgld/wltsvifALp6/dCIKiUI=; b=nvxwqnRB4Vc2vuAAZafhsfmlivtC+WwLXRnygbee6ih2jVij0lqll4VLe3WtePQpCT zENzbxKFCy+I9ypE8AORJ6AifZ5RErsw9y0Uf6gGTYzM2SzlMrkl0iq5ZKmCgM8rzTnk dwgzWHpNLn4tvJGhPS9+zDZWcbFFS3IvGEOAsdnrRkbnYiwgWksEyk+0JUm0VzbcI9OB 79crDFxkSyXuyIZJZh9omNOZIcMCH+28LU5NO7nveCMLL0+TAT3zu0STMBbi/QZGsqVy r3W41gGHXaU+B3bUCBkwi20vXmBlpyL9N7cURCIulwwm4/o1ajUOUxLMiPJ5Q1UdFhKL EM0A== X-Gm-Message-State: AOAM533fDS+INcg57oWNUJGshJg12ybuU911csRe5ZRctnX4uy8q/rFE eOkaJmQJc7dyHeI2LS6vuGk= X-Google-Smtp-Source: ABdhPJxhMdBD2bTgiyIx0gqt4AIvw35kkmSWBBquJORLP6hBn08oAcBgjQkCQhESure4jATbG6y9Zw== X-Received: by 2002:aa7:8b4b:: with SMTP id i11mr22292919pfd.123.1593574015112; Tue, 30 Jun 2020 20:26:55 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id s36sm3942110pgl.35.2020.06.30.20.26.54 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Jun 2020 20:26:54 -0700 (PDT) From: Guenter Roeck To: Shawn Guo Subject: [PATCH] imx: Provide correct number of resources when registering gpio devices Date: Tue, 30 Jun 2020 20:26:51 -0700 Message-Id: <20200701032651.12420-1-linux@roeck-us.net> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200630_232658_536200_66D66C67 X-CRM114-Status: GOOD ( 14.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sascha Hauer , Guenter Roeck , Russell King , linux-kernel@vger.kernel.org, NXP Linux Team , Pengutronix Kernel Team , Bjorn Helgaas , Fabio Estevam , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since commit a85a6c86c25be ("driver core: platform: Clarify that IRQ 0 is invalid"), the kernel is a bit touchy when it encounters interrupt 0. As a result, there are lots of warnings such as the following when booting systems such as 'kzm'. WARNING: CPU: 0 PID: 1 at drivers/base/platform.c:224 platform_get_irq_optional+0x118/0x128 0 is an invalid IRQ number Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.8.0-rc3 #1 Hardware name: Kyoto Microcomputer Co., Ltd. KZM-ARM11-01 [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [] (show_stack) from [] (dump_stack+0xe8/0x120) [] (dump_stack) from [] (__warn+0xe4/0x108) [] (__warn) from [] (warn_slowpath_fmt+0x74/0xbc) [] (warn_slowpath_fmt) from [] (platform_get_irq_optional+0x118/0x128) [] (platform_get_irq_optional) from [] (platform_irq_count+0x20/0x3c) [] (platform_irq_count) from [] (mxc_gpio_probe+0x8c/0x494) [] (mxc_gpio_probe) from [] (platform_drv_probe+0x48/0x98) [] (platform_drv_probe) from [] (really_probe+0x214/0x344) [] (really_probe) from [] (driver_probe_device+0x58/0xb4) [] (driver_probe_device) from [] (device_driver_attach+0x58/0x60) [] (device_driver_attach) from [] (__driver_attach+0x84/0xc0) [] (__driver_attach) from [] (bus_for_each_dev+0x78/0xb8) [] (bus_for_each_dev) from [] (bus_add_driver+0x154/0x1e0) [] (bus_add_driver) from [] (driver_register+0x74/0x108) [] (driver_register) from [] (do_one_initcall+0x80/0x3b4) [] (do_one_initcall) from [] (kernel_init_freeable+0x170/0x208) [] (kernel_init_freeable) from [] (kernel_init+0x8/0x11c) [] (kernel_init) from [] (ret_from_fork+0x14/0x20) As it turns out, mxc_register_gpio() is a bit lax when setting the number of resources: it registers a resource with interrupt 0 when in reality there is no such interrupt. Fix the problem by not declaring the second interrupt resource if there is no second interrupt. Fixes: a85a6c86c25be ("driver core: platform: Clarify that IRQ 0 is invalid") Cc: Bjorn Helgaas Signed-off-by: Guenter Roeck --- arch/arm/mach-imx/devices/platform-gpio-mxc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/devices/platform-gpio-mxc.c b/arch/arm/mach-imx/devices/platform-gpio-mxc.c index 78628ef12672..355de845224c 100644 --- a/arch/arm/mach-imx/devices/platform-gpio-mxc.c +++ b/arch/arm/mach-imx/devices/platform-gpio-mxc.c @@ -24,7 +24,8 @@ struct platform_device *__init mxc_register_gpio(char *name, int id, .flags = IORESOURCE_IRQ, }, }; + unsigned int nres; - return platform_device_register_resndata(&mxc_aips_bus, - name, id, res, ARRAY_SIZE(res), NULL, 0); + nres = irq_high ? ARRAY_SIZE(res) : ARRAY_SIZE(res) - 1; + return platform_device_register_resndata(&mxc_aips_bus, name, id, res, nres, NULL, 0); } -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel