From patchwork Wed Dec 18 10:01:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 3369141 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1E08CC0D4A for ; Wed, 18 Dec 2013 10:02:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1227820458 for ; Wed, 18 Dec 2013 10:02:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 727CC20412 for ; Wed, 18 Dec 2013 10:02:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752779Ab3LRKCD (ORCPT ); Wed, 18 Dec 2013 05:02:03 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:41947 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751419Ab3LRKB7 (ORCPT ); Wed, 18 Dec 2013 05:01:59 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id rBIA1vxC017515; Wed, 18 Dec 2013 04:01:57 -0600 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id rBIA1vRh015374; Wed, 18 Dec 2013 04:01:57 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Wed, 18 Dec 2013 04:01:56 -0600 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id rBIA1qua012556; Wed, 18 Dec 2013 04:01:53 -0600 From: Roger Quadros To: , CC: , , , , Roger Quadros , Subject: [PATCH] mfd: omap-usb-tll: Don't hold lock during pm_runtime_get/put_sync() Date: Wed, 18 Dec 2013 15:31:49 +0530 Message-ID: <1387360909-10624-1-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.8.3.2 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 pm_runtime_get/put_sync() can sleep so don't hold spinlock while calling them. This patch prevents a BUG() when CONFIG_DEBUG_ATOMIC_SLEEP is enabled. Bug is present in Kernel versions v3.9 onwards. Reported-by: Tomi Valkeinen Signed-off-by: Roger Quadros Tested-by: Tomi Valkeinen Cc: # 3.9+ --- drivers/mfd/omap-usb-tll.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c index 0d946ae1..248004c 100644 --- a/drivers/mfd/omap-usb-tll.c +++ b/drivers/mfd/omap-usb-tll.c @@ -346,7 +346,9 @@ int omap_tll_init(struct usbhs_omap_platform_data *pdata) for (i = 0; i < tll->nch; i++) needs_tll |= omap_usb_mode_needs_tll(pdata->port_mode[i]); + spin_unlock(&tll_lock); pm_runtime_get_sync(tll_dev); + spin_lock(&tll_lock); if (needs_tll) { void __iomem *base = tll->base; @@ -398,9 +400,8 @@ int omap_tll_init(struct usbhs_omap_platform_data *pdata) } } - pm_runtime_put_sync(tll_dev); - spin_unlock(&tll_lock); + pm_runtime_put_sync(tll_dev); return 0; } @@ -420,7 +421,9 @@ int omap_tll_enable(struct usbhs_omap_platform_data *pdata) tll = dev_get_drvdata(tll_dev); + spin_unlock(&tll_lock); pm_runtime_get_sync(tll_dev); + spin_lock(&tll_lock); for (i = 0; i < tll->nch; i++) { if (omap_usb_mode_needs_tll(pdata->port_mode[i])) { @@ -438,7 +441,6 @@ int omap_tll_enable(struct usbhs_omap_platform_data *pdata) } spin_unlock(&tll_lock); - return 0; } EXPORT_SYMBOL_GPL(omap_tll_enable); @@ -464,9 +466,8 @@ int omap_tll_disable(struct usbhs_omap_platform_data *pdata) } } - pm_runtime_put_sync(tll_dev); - spin_unlock(&tll_lock); + pm_runtime_put_sync(tll_dev); return 0; }