From patchwork Thu Jan 10 06:01:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 10755217 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2734E13B5 for ; Thu, 10 Jan 2019 06:02:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1823C29104 for ; Thu, 10 Jan 2019 06:02:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BFE52915C; Thu, 10 Jan 2019 06:02:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1E6429104 for ; Thu, 10 Jan 2019 06:02:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726369AbfAJGCl (ORCPT ); Thu, 10 Jan 2019 01:02:41 -0500 Received: from mail.andi.de1.cc ([85.214.239.24]:36634 "EHLO h2641619.stratoserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725536AbfAJGCk (ORCPT ); Thu, 10 Jan 2019 01:02:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kemnade.info; s=20180802; h=Message-Id:Date:Subject:Cc:To:From:Sender: Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: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=ELnuXEy+ZyRvfofCf0p0AbrqJf7RUAii+SnFu9UC6bs=; b=B98ApLHWImDhvZ6TSyjudCZmXj PcyMMCq8csk6e2+CRvRz4NjqJ/buIeI9O7q7pxV5qvBt+O4QPeZ6PZAR53bHEOBmdE0bJD+F4exWr sgm9E1v/Wzf/AybQr178vXxpEcIxK6Om+ZDQ5pRNgjNE+vOBPLksQ6YLhr8uRH5OecdE=; Received: from hsvpn29.hotsplots.net ([185.46.137.7] helo=localhost) by h2641619.stratoserver.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1ghTQH-0002Hv-Ew; Thu, 10 Jan 2019 07:02:33 +0100 Received: from andi by localhost with local (Exim 4.89) (envelope-from ) id 1ghTQE-0004PQ-PL; Thu, 10 Jan 2019 07:02:31 +0100 From: Andreas Kemnade To: laurent.pinchart@ideasonboard.com, mchehab@kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap , Discussions about the Letux Kernel Cc: Andreas Kemnade Subject: [PATCH RFC] media: omap3isp: Fix high idle current Date: Thu, 10 Jan 2019 07:01:36 +0100 Message-Id: <20190110060136.16896-1-andreas@kemnade.info> X-Mailer: git-send-email 2.11.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On the GTA04, current consumption rose by about 30mA when the omap3_isp module was loaded and the v4l device was not accessed and even no camera attached. Module removal fixed it again. Slowing down the removal process reveals that calling isp_detach_iommu() is required to have low current. So isp_attach/detach_iommu() to moved to the get()/put() functions. This all has strange side effects. The hwmod seems to be accessible using /dev/mem if the iommu calls in their original place. With the modified placement it is not. In a very old setup with a 3.7 kernel which has the iommu calls at the same place as our current kernel, the memory is not accessible. Note: isp_get()/put() calls seem to be balanced. But at the current wonky gta04 setup (with a not upstreamed image sensor driver)which also has other problems, CAM reports address holes. So I have no clear idea whether this patch is right or not. Signed-off-by: Andreas Kemnade --- drivers/media/platform/omap3isp/isp.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index 13f2828d880d..b837ca5604ad 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -88,6 +88,10 @@ static void isp_save_ctx(struct isp_device *isp); static void isp_restore_ctx(struct isp_device *isp); +static int isp_attach_iommu(struct isp_device *isp); + +static void isp_detach_iommu(struct isp_device *isp); + static const struct isp_res_mapping isp_res_maps[] = { { .isp_rev = ISP_REVISION_2_0, @@ -1407,6 +1411,14 @@ static struct isp_device *__omap3isp_get(struct isp_device *isp, bool irq) __isp = NULL; goto out; } + /* IOMMU */ + if (isp_attach_iommu(isp) < 0) { + dev_err(isp->dev, "unable to attach to IOMMU\n"); + isp_disable_clocks(isp); + __isp = NULL; + goto out; + } + /* We don't want to restore context before saving it! */ if (isp->has_context) @@ -1453,6 +1465,7 @@ static void __omap3isp_put(struct isp_device *isp, bool save_ctx) if (!media_entity_enum_empty(&isp->crashed) || isp->stop_failure) isp_reset(isp); + isp_detach_iommu(isp); isp_disable_clocks(isp); } mutex_unlock(&isp->isp_mutex); @@ -1999,10 +2012,6 @@ static int isp_remove(struct platform_device *pdev) isp_cleanup_modules(isp); isp_xclk_cleanup(isp); - __omap3isp_get(isp, false); - isp_detach_iommu(isp); - __omap3isp_put(isp, false); - media_entity_enum_cleanup(&isp->crashed); v4l2_async_notifier_cleanup(&isp->notifier); @@ -2313,19 +2322,12 @@ static int isp_probe(struct platform_device *pdev) isp->mmio_hist_base_phys = mem->start + isp_res_maps[m].offset[OMAP3_ISP_IOMEM_HIST]; - /* IOMMU */ - ret = isp_attach_iommu(isp); - if (ret < 0) { - dev_err(&pdev->dev, "unable to attach to IOMMU\n"); - goto error_isp; - } - /* Interrupt */ ret = platform_get_irq(pdev, 0); if (ret <= 0) { dev_err(isp->dev, "No IRQ resource\n"); ret = -ENODEV; - goto error_iommu; + goto error_isp; } isp->irq_num = ret; @@ -2339,7 +2341,7 @@ static int isp_probe(struct platform_device *pdev) /* Entities */ ret = isp_initialize_modules(isp); if (ret < 0) - goto error_iommu; + goto error_isp; ret = isp_register_entities(isp); if (ret < 0)