From patchwork Mon Dec 6 13:12:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kepplinger X-Patchwork-Id: 79166 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1muDoV-0090Ug-HC; Mon, 06 Dec 2021 13:13:51 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244143AbhLFNRR (ORCPT + 1 other); Mon, 6 Dec 2021 08:17:17 -0500 Received: from comms.puri.sm ([159.203.221.185]:48098 "EHLO comms.puri.sm" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244073AbhLFNRR (ORCPT ); Mon, 6 Dec 2021 08:17:17 -0500 Received: from localhost (localhost [127.0.0.1]) by comms.puri.sm (Postfix) with ESMTP id 97658DF539; Mon, 6 Dec 2021 05:13:18 -0800 (PST) Received: from comms.puri.sm ([127.0.0.1]) by localhost (comms.puri.sm [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QP9B0PAlJ5sC; Mon, 6 Dec 2021 05:13:18 -0800 (PST) From: Martin Kepplinger To: slongerbeam@gmail.com, p.zabel@pengutronix.de, mchehab@kernel.org, laurent.pinchart@ideasonboard.com Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Martin Kepplinger Subject: [PATCH v1 1/2] media: imx: imx8mq-mipi-csi2: fix system resume issue Date: Mon, 6 Dec 2021 14:12:41 +0100 Message-Id: <20211206131242.2697464-2-martin.kepplinger@puri.sm> In-Reply-To: <20211206131242.2697464-1-martin.kepplinger@puri.sm> References: <20211206131242.2697464-1-martin.kepplinger@puri.sm> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.4 (--) X-LSpam-Report: No, score=-2.4 required=5.0 tests=BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no during system resume, interconnect bandwidth would be requested even though the device is runtime suspended. This leaves the system in an unbalanced state. Fix that by checking the state before. Signed-off-by: Martin Kepplinger --- drivers/staging/media/imx/imx8mq-mipi-csi2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/staging/media/imx/imx8mq-mipi-csi2.c b/drivers/staging/media/imx/imx8mq-mipi-csi2.c index 7adbdd14daa9..31a1e43733a0 100644 --- a/drivers/staging/media/imx/imx8mq-mipi-csi2.c +++ b/drivers/staging/media/imx/imx8mq-mipi-csi2.c @@ -714,6 +714,9 @@ static int imx8mq_mipi_csi_pm_suspend(struct device *dev, bool runtime) mutex_unlock(&state->lock); + if (!runtime && pm_runtime_suspended(state->dev)) + return 0; + ret = icc_set_bw(state->icc_path, 0, 0); if (ret) dev_err(dev, "icc_set_bw failed with %d\n", ret); @@ -727,6 +730,9 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev, bool runtime) struct csi_state *state = mipi_sd_to_csi2_state(sd); int ret = 0; + if (!runtime && pm_runtime_suspended(state->dev)) + return 0; + ret = icc_set_bw(state->icc_path, 0, state->icc_path_bw); if (ret) { dev_err(dev, "icc_set_bw failed with %d\n", ret); From patchwork Mon Dec 6 13:12:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kepplinger X-Patchwork-Id: 79167 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1muDoX-0090Ug-Sv; Mon, 06 Dec 2021 13:13:54 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244147AbhLFNRU (ORCPT + 1 other); Mon, 6 Dec 2021 08:17:20 -0500 Received: from comms.puri.sm ([159.203.221.185]:48106 "EHLO comms.puri.sm" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244140AbhLFNRU (ORCPT ); Mon, 6 Dec 2021 08:17:20 -0500 Received: from localhost (localhost [127.0.0.1]) by comms.puri.sm (Postfix) with ESMTP id 9982FDFF4B; Mon, 6 Dec 2021 05:13:21 -0800 (PST) Received: from comms.puri.sm ([127.0.0.1]) by localhost (comms.puri.sm [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3Y2dsPfrnCov; Mon, 6 Dec 2021 05:13:21 -0800 (PST) From: Martin Kepplinger To: slongerbeam@gmail.com, p.zabel@pengutronix.de, mchehab@kernel.org, laurent.pinchart@ideasonboard.com Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Martin Kepplinger Subject: [PATCH v1 2/2] media: imx: imx8mq-mipi-csi2: remove wrong irq config write operation Date: Mon, 6 Dec 2021 14:12:42 +0100 Message-Id: <20211206131242.2697464-3-martin.kepplinger@puri.sm> In-Reply-To: <20211206131242.2697464-1-martin.kepplinger@puri.sm> References: <20211206131242.2697464-1-martin.kepplinger@puri.sm> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.4 (--) X-LSpam-Report: No, score=-2.4 required=5.0 tests=BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no The place where this register writel() that masks one interrupt is placed does not guarantee that the device is powered so that's not allowed. Moreover imx8mq_mipi_csi_start_stream() masks the interrupt anyway so the write is not even needed. Remove it as this is a mistake that slipped in with the driver. Fixes: f33fd8d77dd0 ("media: imx: add a driver for i.MX8MQ mipi csi rx phy and controller") Signed-off-by: Martin Kepplinger --- drivers/staging/media/imx/imx8mq-mipi-csi2.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/media/imx/imx8mq-mipi-csi2.c b/drivers/staging/media/imx/imx8mq-mipi-csi2.c index 31a1e43733a0..776a00eed550 100644 --- a/drivers/staging/media/imx/imx8mq-mipi-csi2.c +++ b/drivers/staging/media/imx/imx8mq-mipi-csi2.c @@ -398,9 +398,6 @@ static int imx8mq_mipi_csi_s_stream(struct v4l2_subdev *sd, int enable) struct csi_state *state = mipi_sd_to_csi2_state(sd); int ret = 0; - imx8mq_mipi_csi_write(state, CSI2RX_IRQ_MASK, - CSI2RX_IRQ_MASK_ULPS_STATUS_CHANGE); - if (enable) { ret = pm_runtime_resume_and_get(state->dev); if (ret < 0)