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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 F032DC2D0DB for ; Wed, 22 Jan 2020 11:08:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB1442467A for ; Wed, 22 Jan 2020 11:08:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="JYbQkjC2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729047AbgAVLIr (ORCPT ); Wed, 22 Jan 2020 06:08:47 -0500 Received: from mx0a-001ae601.pphosted.com ([67.231.149.25]:61634 "EHLO mx0b-001ae601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725911AbgAVLIr (ORCPT ); Wed, 22 Jan 2020 06:08:47 -0500 Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 00MB3ZfA027915; Wed, 22 Jan 2020 05:08:44 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=PODMain02222019; bh=Wfwz0JBha5yb+vEJD1AnM22AO8M2TkTcB/GNhCOoR1M=; b=JYbQkjC2m1RA/XQFYNd89kiqKjg7hmxFwFMCUKV7PVz6xutq1HgmNzExKNZh6/ToaxHi eFDY//alxYLV/TVe4YerQn9a7vUqMvjiOGIPu1+teDFC/NhHOvXYxVpvXQBVDEQlIlBG QFXuDwaKo19KG5flpzOGuN69jCrXD8qCF3FFuhBwOqGpEkaJTtHdlR8ICAOP8k8CpZso 0X4srNgsga45C2gnKx3666XCfrebE6Im/rdl44JDF4ZTdd7GAsnTX/MzPpNRSYxOGt1f 2Nw1liVO90nv94ypi0cZwIw5r66EmVeLvdP8S08kCJo2gAcixDokM5LF7EWZI6kWXPwc SQ== Authentication-Results: ppops.net; spf=fail smtp.mailfrom=ckeepax@opensource.cirrus.com Received: from ediex01.ad.cirrus.com ([5.172.152.52]) by mx0a-001ae601.pphosted.com with ESMTP id 2xm0a8wd1p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Wed, 22 Jan 2020 05:08:44 -0600 Received: from EDIEX01.ad.cirrus.com (198.61.84.80) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1591.10; Wed, 22 Jan 2020 11:08:42 +0000 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.1.1591.10 via Frontend Transport; Wed, 22 Jan 2020 11:08:42 +0000 Received: from algalon.ad.cirrus.com (algalon.ad.cirrus.com [198.90.251.122]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 2538F2AB; Wed, 22 Jan 2020 11:08:42 +0000 (UTC) From: Charles Keepax To: , CC: , , Subject: [PATCH RESEND 2/2] mfd: madera: Improve handling of regulator unbinding Date: Wed, 22 Jan 2020 11:08:42 +0000 Message-ID: <20200122110842.10702-2-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200122110842.10702-1-ckeepax@opensource.cirrus.com> References: <20200122110842.10702-1-ckeepax@opensource.cirrus.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-SPF-Result: fail X-Proofpoint-SPF-Record: v=spf1 include:spf-001ae601.pphosted.com include:spf.protection.outlook.com -all X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 mlxlogscore=680 phishscore=0 malwarescore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-2001220101 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current unbinding process for Madera has some issues. The trouble is runtime PM is disabled as the first step of the process, but some of the drivers release IRQs causing regmap IRQ to issue a runtime get which fails. To allow runtime PM to remain enabled during mfd_remove_devices, the DCVDD regulator must remain available. In the case of external DCVDD's this is simple, the regulator can simply be disabled/put after the call to mfd_remove_devices. However, in the case of an internally supplied DCVDD the regulator needs to be released after all the MFD children, except for the regulator child itself, have been removed. This is achieved by having the regulator driver itself do the disable/put, as it is the last driver removed from the MFD. Signed-off-by: Charles Keepax --- drivers/mfd/madera-core.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c index a8cfadc1fc01e..5170b55836fc1 100644 --- a/drivers/mfd/madera-core.c +++ b/drivers/mfd/madera-core.c @@ -730,18 +730,22 @@ int madera_dev_exit(struct madera *madera) /* Prevent any IRQs being serviced while we clean up */ disable_irq(madera->irq); - /* - * DCVDD could be supplied by a child node, we must disable it before - * removing the children, and prevent PM runtime from turning it back on - */ + pm_runtime_get_sync(madera->dev); + + mfd_remove_devices(madera->dev); + pm_runtime_disable(madera->dev); - clk_disable_unprepare(madera->mclk[MADERA_MCLK2].clk); + if (!madera->internal_dcvdd) { + regulator_disable(madera->dcvdd); + regulator_put(madera->dcvdd); + } - regulator_disable(madera->dcvdd); - regulator_put(madera->dcvdd); + pm_runtime_set_suspended(madera->dev); + pm_runtime_put_noidle(madera->dev); + + clk_disable_unprepare(madera->mclk[MADERA_MCLK2].clk); - mfd_remove_devices(madera->dev); madera_enable_hard_reset(madera); regulator_bulk_disable(madera->num_core_supplies, -- 2.11.0