From patchwork Wed Nov 27 20:11:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 3249771 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1BFD49F474 for ; Wed, 27 Nov 2013 20:13:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A8AA9205F0 for ; Wed, 27 Nov 2013 20:13:07 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 54774205F4 for ; Wed, 27 Nov 2013 20:13:05 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VllTn-0000fK-Ea; Wed, 27 Nov 2013 20:12:59 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VllTk-0000eF-V1; Wed, 27 Nov 2013 20:12:56 +0000 Received: from devils.ext.ti.com ([198.47.26.153]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VllTh-0000du-ME for linux-arm-kernel@lists.infradead.org; Wed, 27 Nov 2013 20:12:54 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id rARKCJGG009899; Wed, 27 Nov 2013 14:12:19 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id rARKCJdt018910; Wed, 27 Nov 2013 14:12:19 -0600 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Wed, 27 Nov 2013 14:12:19 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id rARKCHGJ026321; Wed, 27 Nov 2013 14:12:18 -0600 Date: Wed, 27 Nov 2013 14:11:49 -0600 From: Felipe Balbi To: Aaro Koskinen Subject: Re: [PATCH 00/13] mfd: menelaus: a few cleanups Message-ID: <20131127201149.GB20734@saruman.home> References: <1385579217-20127-1-git-send-email-balbi@ti.com> <20131127200247.GH24645@blackmetal.musicnaut.iki.fi> MIME-Version: 1.0 In-Reply-To: <20131127200247.GH24645@blackmetal.musicnaut.iki.fi> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131127_151253_855952_E9BC4E59 X-CRM114-Status: GOOD ( 23.82 ) X-Spam-Score: -6.9 (------) Cc: sameo@linux.intel.com, Tony Lindgren , Linux Kernel Mailing List , Felipe Balbi , Linux OMAP Mailing List , lee.jones@linaro.org, Linux ARM Kernel Mailing List X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: balbi@ti.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi, On Wed, Nov 27, 2013 at 10:02:47PM +0200, Aaro Koskinen wrote: > On Wed, Nov 27, 2013 at 01:06:44PM -0600, Felipe Balbi wrote: > > few cleanups on the old menelaus driver. I don't have > > HW to test these patches, maybe Aaro can help here ? > > Hmm, I got: > > [ 1.330000] Unable to handle kernel NULL pointer dereference at virtual address 00000000 > [ 1.340000] pgd = c0004000 > [ 1.340000] [00000000] *pgd=00000000 > [ 1.350000] Internal error: Oops: 17 [#1] ARM > [ 1.350000] CPU: 0 PID: 1 Comm: swapper Not tainted 3.13.0-rc1-n8x0_tiny-los.git-729021f-00018-g74a0f39 #2 > [ 1.350000] task: c782c000 ti: c782e000 task.ti: c782e000 > [ 1.350000] PC is at mutex_lock+0x0/0x20 > [ 1.350000] LR is at __irq_get_desc_lock+0x6c/0x88 > [ 1.350000] pc : [] lr : [] psr: a0000013 > [ 1.350000] sp : c782fe10 ip : fffffffa fp : 00000000 > [ 1.350000] r10: c01e0268 r9 : 00000000 r8 : c7903e20 > [ 1.350000] r7 : 00000001 r6 : c782fe2c r5 : 00000000 r4 : c7147080 > [ 1.350000] r3 : c013eab0 r2 : 00000000 r1 : 000000f2 r0 : 00000000 > [ 1.350000] Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel > [ 1.350000] Control: 00c5387d Table: 8704c000 DAC: 00000017 > [ 1.350000] Process swapper (pid: 1, stack limit = 0xc782e1b8) > [ 1.350000] Stack: (0xc782fe10 to 0xc7830000) > [ 1.350000] fe00: 00000000 000000f2 c0053034 00000000 > [ 1.350000] fe20: 00000000 c0053518 c016b798 00000000 000000f2 c711ea10 00000102 c7903e00 > [ 1.350000] fe20: 00000000 c0053518 c016b798 00000000 000000f2 c711ea10 00000102 c7903e00 > [ 1.350000] fe40: c7903e20 c013ec80 c016b798 c711ea10 c7903e20 c013ebc4 c7903e00 00000000 > [ 1.350000] fe60: c046ae74 00000000 00000015 c0140ab8 c7903e20 c0498b10 c0498b18 c0131194 > [ 1.350000] fe80: c7903e20 c046ae74 c7903e54 00000000 c01da8fc c0131338 00000000 c046ae74 > [ 1.350000] fea0: c01312ac c012fa00 c784e64c c78e7f90 c046ae74 c70b6420 c046b1e0 c01301a8 > [ 1.350000] fec0: c01b1130 c00ce2fc c046ae74 c046ae74 c01dce14 c01e24d0 c01c6484 c01316cc > [ 1.350000] fee0: c046b1e0 c046ae50 c01dce14 c0141bc8 c782e000 00000006 c01dce14 c01c6ad0 > [ 1.350000] ff00: c04907e4 c784d3c0 c016b7a8 0000006f 00000000 00000000 00000000 c00c488c > [ 1.350000] ff20: c05998c0 c0170258 00000015 c003ff84 c0466030 00000000 c01b1204 c01b4358 > [ 1.350000] ff40: 00000006 00000006 00000000 00000006 00000006 c01dce14 c01e24d0 c01c6484 > [ 1.350000] ff60: c01dce20 c046c460 00000015 c01c6c70 00000006 00000006 c01c6484 ffffffff > [ 1.350000] ff80: ffffffff ffffffff 00000000 c01634e0 00000000 00000000 00000000 00000000 > [ 1.350000] ffa0: 00000000 c01634e8 00000000 c000e0f8 00000000 00000000 00000000 00000000 > [ 1.350000] ffc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 > [ 1.350000] ffe0: 00000000 00000000 00000000 00000000 00000013 00000000 ffffffff ffffffff > [ 1.350000] [] (mutex_lock+0x0/0x20) from [] (__irq_get_desc_lock+0x6c/0x88) > [ 1.350000] [] (__irq_get_desc_lock+0x6c/0x88) from [] (__irq_set_handler+0x24/0x128) > [ 1.350000] [] (__irq_set_handler+0x24/0x128) from [] (menelaus_probe+0xbc/0x280) > [ 1.350000] [] (menelaus_probe+0xbc/0x280) from [] (i2c_device_probe+0x98/0xc0) > [ 1.350000] [] (i2c_device_probe+0x98/0xc0) from [] (driver_probe_device+0x110/0x228) > [ 1.350000] [] (driver_probe_device+0x110/0x228) from [] (__driver_attach+0x8c/0x90) > [ 1.350000] [] (__driver_attach+0x8c/0x90) from [] (bus_for_each_dev+0x54/0x88) > [ 1.350000] [] (bus_for_each_dev+0x54/0x88) from [] (bus_add_driver+0xd4/0x1c8) > [ 1.350000] [] (bus_add_driver+0xd4/0x1c8) from [] (driver_register+0x78/0xf4) > [ 1.350000] [] (driver_register+0x78/0xf4) from [] (i2c_register_driver+0x2c/0xb8) > [ 1.350000] [] (i2c_register_driver+0x2c/0xb8) from [] (do_one_initcall+0x94/0x150) > [ 1.350000] [] (do_one_initcall+0x94/0x150) from [] (kernel_init_freeable+0xe4/0x1b0) > [ 1.350000] [] (kernel_init_freeable+0xe4/0x1b0) from [] (kernel_init+0x8/0x110) > [ 1.350000] [] (kernel_init+0x8/0x110) from [] (ret_from_fork+0x14/0x3c) > [ 1.350000] Code: 03a03000 05843000 e28dd010 e8bd81f0 (e1902f9f) > [ 1.360000] ---[ end trace 75cc9e337407e765 ]--- > [ 1.360000] Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b hmm, irq_set_chip_and_handler() will call back into the irq_chip we just registered, so my ->irq_bus_lock needs to have everything setup (chip_data my mutex), this should solve it: let me know when you can, and I'll meld these hunks to proper patch. diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 376f01d..c9bd2fb 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -1232,6 +1232,7 @@ static int menelaus_probe(struct i2c_client *client, the_menelaus = m; m->client = client; + mutex_init(&m->lock); irq_base = irq_alloc_descs(-1, 0, MENELAUS_NR_IRQS, 0); if (irq_base < 0) { @@ -1245,10 +1246,10 @@ static int menelaus_probe(struct i2c_client *client, m->irq_base = irq_base; for (i = irq_base; i < irq_base + MENELAUS_NR_IRQS; i++) { + irq_set_chip_data(i, m); irq_set_chip_and_handler(i, &menelaus_irq_chip, handle_simple_irq); irq_set_nested_thread(i, 1); - irq_set_chip_data(i, m); set_irq_flags(i, IRQF_VALID); } @@ -1280,8 +1281,6 @@ static int menelaus_probe(struct i2c_client *client, } } - mutex_init(&m->lock); - pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f); val = menelaus_read_reg(m, MENELAUS_VCORE_CTRL1);