From patchwork Fri Dec 4 09:55:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 11951319 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=-18.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 2AF97C433FE for ; Fri, 4 Dec 2020 09:57:07 +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 AA4F422795 for ; Fri, 4 Dec 2020 09:57:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA4F422795 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kemnade.info 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:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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=t6mugHo+0uoO6y5iocqZ6ztitDtBUoFA+y9UfG9o+7M=; b=aOUPh2wqlGGRfPpCMylas24uND Bux1meJdHflOL0ZNo6PgYaGAmvrTIeEvhfSpYZjTQ+FpR6dCpRQUIZIy1kIX0UOF9wt0m0oHrAIJK VZhQJ+VzTOmHS0rQNRjRpWkEoKRhc7REYDe2/eMUoJ5HT8sYI2LbDojZ+bktMpgXWqpesip7lsvVt x6pqBO4PF4LhOemc+krjAIhxhTSDVSDGrU3St6BS7aeFsZyqbDzN47Hz24lDhdTpDRHFmip/0McMn vmclQ2vanEx0/Bucoa/DVFELHtkmqmDwzOse7Lr4BbXztGQArud52Js5p7b9c3vjgPj+Oy9kt2Sc1 r6xEYl7A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kl7ok-00046N-Gf; Fri, 04 Dec 2020 09:55:58 +0000 Received: from mail.andi.de1.cc ([2a01:238:4321:8900:456f:ecd6:43e:202c]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kl7oh-00043y-Jh for linux-arm-kernel@lists.infradead.org; Fri, 04 Dec 2020 09:55:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kemnade.info; s=20180802; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=fJpuyRzV4I2KZjwbntRMc/ZkowAxvkPltOWKais1/1Q=; b=fTd7Mu/kSBVGaD6w9u7Fvsqo+V M9Shk40I2efVqorSiw7l9oejHdQ7LtDJU8eh0zD5jNQupNJR7NNTvvPbfOtoNT/k28ckOelN6sbnI NrIJLF5VCCpUf7xppKp0SbRRl19Cl9lPSLQLKWsn4lTa4WbLNncwA3LLiY43zGfUkL7M=; Received: from p200300ccff0a0b001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:cc:ff0a:b00:1a3d:a2ff:febf:d33a] helo=aktux) by mail.andi.de1.cc with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1kl7oZ-0003Z5-M9; Fri, 04 Dec 2020 10:55:47 +0100 Received: from andi by aktux with local (Exim 4.92) (envelope-from ) id 1kl7oZ-0008GH-Dj; Fri, 04 Dec 2020 10:55:47 +0100 From: Andreas Kemnade To: tony@atomide.com, ulf.hansson@linaro.org, wsa+renesas@sang-engineering.com, dianders@chromium.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, letux-kernel@openphoenux.org Subject: [PATCH] ARM: OMAP2+: omap_device: fix idling of devices during probe Date: Fri, 4 Dec 2020 10:55:39 +0100 Message-Id: <20201204095539.31705-1-andreas@kemnade.info> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201204_045555_875124_79D3ECF5 X-CRM114-Status: GOOD ( 15.83 ) 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: Andreas Kemnade Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On the GTA04A5 od->_driver_status was not set to BUS_NOTIFY_BIND_DRIVER during probe of the second mmc used for wifi. Therefore omap_device_late_idle idled the device during probing causing oopses when accessing the registers. It was not set because od->_state was set to OMAP_DEVICE_STATE_IDLE in the notifier callback. Therefore set od->_driver_status also in that case. This came apparent after commit 21b2cec61c04 ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.4") causing this oops: [ 3.179534] omap_hsmmc 480b4000.mmc: omap_device_late_idle: enabled but no driver. Idling [ 3.265594] 8<--- cut here --- [ 3.268707] Unhandled fault: external abort on non-linefetch (0x1028) at 0xfa0b402c [ 3.276397] pgd = (ptrval) [ 3.279144] [fa0b402c] *pgd=48011452(bad) [ 3.283203] Internal error: : 1028 [#1] SMP ARM [ 3.287750] Modules linked in: [ 3.290832] CPU: 0 PID: 7 Comm: kworker/u2:0 Not tainted 5.10.0-rc6 #3 [ 3.297393] Hardware name: Generic OMAP36xx (Flattened Device Tree) [ 3.303710] Workqueue: events_unbound async_run_entry_fn [ 3.309082] PC is at omap_hsmmc_set_bus_width+0x8/0x78 [ 3.314239] LR is at omap_hsmmc_set_ios+0x11c/0x258 [ 3.319152] pc : [] lr : [] psr: 20000013 [ 3.325469] sp : c10f9e00 ip : c175c800 fp : 00000066 [ 3.330718] r10: c175cb80 r9 : fa0b4000 r8 : 00000000 [ 3.335968] r7 : c123e010 r6 : c175ca58 r5 : c175cb80 r4 : c175c800 [ 3.342529] r3 : 00000001 r2 : 58ad940c r1 : fa0b4000 r0 : c175cb80 [ 3.349090] Flags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none [ 3.356262] Control: 10c5387d Table: 80004019 DAC: 00000051 [ 3.362030] Process kworker/u2:0 (pid: 7, stack limit = 0x(ptrval)) [ 3.368347] Stack: (0xc10f9e00 to 0xc10fa000) [ 3.372741] 9e00: c175c800 00000007 c123e000 c123e010 00000000 c077b2b0 c175c800 00000000 [ 3.380950] 9e20: c123e000 c077c14c c175c800 c077d284 c175c800 c175c800 c123e000 c0799190 [ 3.389190] 9e40: 00000000 c1755040 c175cb80 00000000 c123fd68 58ad940c 00000001 c123e010 [ 3.397430] 9e60: 00000000 c0edaec8 00000000 00000000 c0edaec8 00000006 ffffe000 c0666728 [ 3.405639] 9e80: c123e010 c0f38c28 c0f38c30 00000000 00000000 c066457c c123e010 c0edaec8 [ 3.413879] 9ea0: c06649bc c0e051c8 00000000 00000000 c0efa4a0 c06648b8 00000000 c10f9ef4 [ 3.422119] 9ec0: c06649bc c066298c 00000000 c1039e6c c1653738 58ad940c c123e010 c123e010 [ 3.430328] 9ee0: c0e051c8 c123e054 c100f000 c0663e60 c0e03d00 c123e010 00010101 58ad940c [ 3.438568] 9f00: c12642d0 c0f02018 c12642c0 c015da48 c12642d0 c10bbf00 c1009400 c100f000 [ 3.446807] 9f20: 00000000 c0153b74 c10bc800 c1009400 00000088 c10bbf00 c10bbf14 c1009400 [ 3.455017] 9f40: 00000088 c1009418 c0e03d00 c1009400 ffffe000 c0153eec ffffe000 00000000 [ 3.463256] 9f60: c10bbf00 00000000 c10b1ac0 c10b1c40 c10f8000 c0153ec0 c10bbf00 c10ebe94 [ 3.471466] 9f80: c10b1ae4 c015a9ac 00000001 c10b1c40 c015a87c 00000000 00000000 00000000 [ 3.479705] 9fa0: 00000000 00000000 00000000 c0100168 00000000 00000000 00000000 00000000 [ 3.487945] 9fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 3.496154] 9fe0: 00000000 00000000 00000000 00000000 00000013 00000000 00000000 00000000 [ 3.504394] [] (omap_hsmmc_set_bus_width) from [] (omap_hsmmc_set_ios+0x11c/0x258) [ 3.513763] [] (omap_hsmmc_set_ios) from [] (mmc_power_up.part.8+0x3c/0xd0) [ 3.522521] [] (mmc_power_up.part.8) from [] (mmc_start_host+0x88/0x9c) [ 3.530944] [] (mmc_start_host) from [] (mmc_add_host+0x58/0x84) [ 3.538726] [] (mmc_add_host) from [] (omap_hsmmc_probe+0x5fc/0x8c0) [ 3.546874] [] (omap_hsmmc_probe) from [] (platform_drv_probe+0x48/0x98) [ 3.555358] [] (platform_drv_probe) from [] (really_probe+0x1dc/0x3b4) [ 3.563690] [] (really_probe) from [] (driver_probe_device+0x58/0xb4) [ 3.571929] [] (driver_probe_device) from [] (bus_for_each_drv+0x7c/0xc4) [ 3.580505] [] (bus_for_each_drv) from [] (__device_attach_async_helper+0xa4/0xd8) [ 3.589874] [] (__device_attach_async_helper) from [] (async_run_entry_fn+0x3c/0x1) [ 3.599487] [] (async_run_entry_fn) from [] (process_one_work+0x228/0x574) [ 3.608154] [] (process_one_work) from [] (worker_thread+0x2c/0x5d0) [ 3.616302] [] (worker_thread) from [] (kthread+0x130/0x144) [ 3.623748] [] (kthread) from [] (ret_from_fork+0x14/0x2c) Fixes: 21b2cec61c04 ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.4") Signed-off-by: Andreas Kemnade Acked-by: Ulf Hansson Tested-by: Adam Ford #logicpd-torpedo-37xx-devkit --- arch/arm/mach-omap2/omap_device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c index fc7bb2ca1672..13adf88d472b 100644 --- a/arch/arm/mach-omap2/omap_device.c +++ b/arch/arm/mach-omap2/omap_device.c @@ -230,10 +230,12 @@ static int _omap_device_notifier_call(struct notifier_block *nb, break; case BUS_NOTIFY_BIND_DRIVER: od = to_omap_device(pdev); - if (od && (od->_state == OMAP_DEVICE_STATE_ENABLED) && - pm_runtime_status_suspended(dev)) { + if (od) { od->_driver_status = BUS_NOTIFY_BIND_DRIVER; - pm_runtime_set_active(dev); + if ((od->_state == OMAP_DEVICE_STATE_ENABLED) && + pm_runtime_status_suspended(dev)) { + pm_runtime_set_active(dev); + } } break; case BUS_NOTIFY_ADD_DEVICE: