From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jerry-ch Chen Subject: Re: [RFC PATCH V2 4/4] platform: mtk-isp: Add Mediatek FD driver Date: Wed, 4 Sep 2019 14:09:49 +0800 Message-ID: <1567577389.18318.100.camel@mtksdccf07> References: <1562661672-22439-1-git-send-email-Jerry-Ch.chen@mediatek.com> <1562661672-22439-5-git-send-email-Jerry-Ch.chen@mediatek.com> <20190802082815.GA203993@chromium.org> <1566724680.20680.8.camel@mtksdccf07> <1566957625.20680.33.camel@mtksdccf07> <1567424859.18318.32.camel@mtksdccf07> <1567493081.18318.49.camel@mtksdccf07> <1567511169.18318.65.camel@mtksdccf07> <1567568281.18318.80.camel@mtksdccf07> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+glpam-linux-mediatek=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: Tomasz Figa Cc: "devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Sean Cheng =?UTF-8?Q?=28=E9=84=AD=E6=98=87=E5=BC=98=29?= , "laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org" , Rynn Wu =?UTF-8?Q?=28=E5=90=B3=E8=82=B2=E6=81=A9=29?= , srv_heupstream , Po-Yang Huang =?UTF-8?Q?=28=E9=BB=83=E6=9F=8F=E9=99=BD=29?= , "mchehab-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" , "suleiman-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org" , "shik-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org" , Jungo Lin =?UTF-8?Q?=28=E6=9E=97=E6=98=8E=E4=BF=8A=29?= , Sj Huang =?UTF-8?Q?=28=E9=BB=83=E4=BF=A1=E7=92=8B=29?= , "yuzhao-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org" , "linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" , zwisler-F7+t8E8rja8pug/h7KTFAQ@public.gmane.org List-Id: devicetree@vger.kernel.org Hi Tomasz, On Wed, 2019-09-04 at 12:15 +0800, Tomasz Figa wrote: > On Wed, Sep 4, 2019 at 12:38 PM Jerry-ch Chen > wrote: > > > > Hi Tomasz, > > > > On Tue, 2019-09-03 at 20:05 +0800, Tomasz Figa wrote: > > > On Tue, Sep 3, 2019 at 8:46 PM Jerry-ch Chen wrote: > > > > > > > > Hi Tomasz, > > > > > > > > On Tue, 2019-09-03 at 15:04 +0800, Tomasz Figa wrote: > > > > > On Tue, Sep 3, 2019 at 3:44 PM Jerry-ch Chen wrote: > > > > > > > > > > > > On Tue, 2019-09-03 at 13:19 +0800, Tomasz Figa wrote: > > > > > > > On Mon, Sep 2, 2019 at 8:47 PM Jerry-ch Chen wrote: > > > > > > > > > > > > > > > > Hi Tomasz, > > > > > > > > > > > > > > > > On Fri, 2019-08-30 at 16:33 +0800, Tomasz Figa wrote: > > > > > > > > > On Wed, Aug 28, 2019 at 11:00 AM Jerry-ch Chen > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > Hi Tomasz, > > > > > > > > > > > > > > > > > > > > On Mon, 2019-08-26 at 14:36 +0800, Tomasz Figa wrote: > > > > > > > > > > > Hi Jerry, > > > > > > > > > > > > > > > > > > > > > > On Sun, Aug 25, 2019 at 6:18 PM Jerry-ch Chen > > > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > Hi Tomasz, > > > > > > > > > > > > > > > > > > > > > > > > On Fri, 2019-08-02 at 16:28 +0800, Tomasz Figa wrote: > > > > > > > > > > > > > Hi Jerry, > > > > > > > > > > > > > > > > > > > > > > > > > > On Tue, Jul 09, 2019 at 04:41:12PM +0800, Jerry-ch Chen wrote: > > [snip] > > > > > > > > > > > [snip] > > > > > > > > > > > > > > > > > > > > > > > > > +static void mtk_fd_vb2_stop_streaming(struct vb2_queue *vq) > > > > > > > > > > > > > > +{ > > > > > > > > > > > > > > + struct mtk_fd_ctx *ctx = vb2_get_drv_priv(vq); > > > > > > > > > > > > > > + struct vb2_buffer *vb; > > > > > > > > > > > > > > > > > > > > > > > > > > How do we guarantee here that the hardware isn't still accessing the buffers > > > > > > > > > > > > > removed below? > > > > > > > > > > > > > > > > > > > > > > > > > Maybe we can check the driver state flag and aborting the unfinished > > > > > > > > > > > > jobs? > > > > > > > > > > > > (fd_hw->state == FD_ENQ) > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Yes, we need to either cancel or wait for the currently processing > > > > > > > > > > > job. It depends on hardware capabilities, but cancelling is generally > > > > > > > > > > > preferred for the lower latency. > > > > > > > > > > > > > > > > > > > > > Ok, it the state is ENQ, then we can disable the FD hw by controlling > > > > > > > > > > the registers. > > > > > > > > > > > > > > > > > > > > for example: > > > > > > > > > > writel(0x0, fd->fd_base + FD_HW_ENABLE); > > > > > > > > > > writel(0x0, fd->fd_base + FD_INT_EN); > > > > > > > > > > > > > > > > > > > > > > > > > > > > What's exactly the effect of writing 0 to FD_HW_ENABLE? > > > > > > > > > > > > > > > > > Sorry, my last reply didn't solve the question, > > > > > > > > we should implement a mtk_fd_job_abort() for v4l2_m2m_ops(). > > > > > > > > > > > > > > > > which is able to readl_poll_timeout_atomic() > > > > > > > > and check the HW busy bits in the register FD_INT_EN; > > > > > > > > > > > > > > > > if they are not cleared until timeout, we could handle the last > > > > > > > > processing job. > > > > > > > > Otherwise, the FD irq handler should have handled the last processing > > > > > > > > job and we could continue the stop_streaming(). > > > > > > > > > > > > > > > > For job_abort(): > > > > > > > > static void mtk_fd_job_abort(void *priv) > > > > > > > > { > > > > > > > > struct mtk_fd_ctx *ctx = priv; > > > > > > > > struct mtk_fd_dev *fd = ctx->fd_dev; > > > > > > > > u32 val; > > > > > > > > u32 ret; > > > > > > > > > > > > > > > > ret = readl_poll_timeout_atomic(fd->fd_base + MTK_FD_REG_OFFSET_INT_EN, > > > > > > > > val, > > > > > > > > (val & MTK_FD_HW_BUSY_MASK) == > > > > > > > > MTK_FD_HW_STATE_IS_BUSY, > > > > > > > > USEC_PER_MSEC, MTK_FD_STOP_HW_TIMEOUT); > > > > > > > > > > > > > > Hmm, would it be possible to avoid the busy wait by having a > > > > > > > completion that could be signalled from the interrupt handler? > > > > > > > > > > > > > > Best regards, > > > > > > > Tomasz > > > > > > > > > > > > I suppose that would be wakeup a wait queue in the interrupt handler, > > > > > > the the wait_event_interrupt_timeout() will be used in here and system > > > > > > suspend e.g. mtk_fd_suspend(). > > > > > > > > > > Yes, that should work. > > > > > > > > > > > Or do you suggest to wait_event_interrupt_timeout() every frame in the > > > > > > mtk_fd_ipi_handler()? > > > > > > > > > > Nope, we shouldn't need that. > > > > > > > > > > > I think maybe the readl_poll_timeout_atomic would be good enough. > > > > > > > > > > > > > > > > Not really. Busy waiting should be avoided as much as possible. What's > > > > > the point of entering suspend if you end up burning the power by > > > > > spinning the CPU for some milliseconds? > > > > > > > > > Ok, I see, busy waiting is not a good idea, I will use the wait queue > > > > instead. the job abort will refine as following: > > > > > > > > static void mtk_fd_job_abort(void *priv) > > > > { > > > > struct mtk_fd_ctx *ctx = priv; > > > > struct mtk_fd_dev *fd = ctx->fd_dev; > > > > u32 ret; > > > > > > > > ret = wait_event_interruptible_timeout > > > > (fd->wq, (fd->fd_irq_result & MTK_FD_HW_IRQ_MASK), > > > > usecs_to_jiffies(50000)); > > > > if (ret) > > > > mtk_fd_hw_job_finish(fd, VB2_BUF_STATE_ERROR); > > > > dev_dbg(fd->dev, "%s, ret:%d\n", __func__, ret); > > > > > > > > fd->fd_irq_result = 0; > > > > } > > > > > > > > static struct v4l2_m2m_ops fd_m2m_ops = { > > > > .device_run = mtk_fd_device_run, > > > > .job_abort = mtk_fd_job_abort, > > > > > > I'm not sure we should be using the functon above as the .job_abort > > > callback. It's expected to abort the job, but we're just waiting for > > > it to finish. I think we should just call mtk_fd_job_abort() manually > > > from .stop_streaming. > > > > > > > Ok, I will fix it. > > > > > > }; > > > > > > > > and we could use it in suspend. > > > > static int mtk_fd_suspend(struct device *dev) > > > > { > > > > struct mtk_fd_dev *fd = dev_get_drvdata(dev); > > > > > > > > if (pm_runtime_suspended(dev)) > > > > return 0; > > > > > > > > if (fd->fd_stream_count) > > > > mtk_fd_job_abort(fd->ctx); > > > > > > > > /* suspend FD HW */ > > > > writel(0x0, fd->fd_base + MTK_FD_REG_OFFSET_INT_EN); > > > > writel(0x0, fd->fd_base + MTK_FD_REG_OFFSET_HW_ENABLE); > > > > clk_disable_unprepare(fd->fd_clk); > > > > dev_dbg(dev, "%s:disable clock\n", __func__); > > > > > > > > return 0; > > > > } > > > > > > > > static irqreturn_t mtk_fd_irq(int irq, void *data) > > > > { > > > > struct mtk_fd_dev *fd = (struct mtk_fd_dev *)data; > > > > > > > > fd->fd_irq_result = readl(fd->fd_base + MTK_FD_REG_OFFSET_INT_VAL); > > > > wake_up_interruptible(&fd->wq); > > > > > > The wake up should be done at the very end of this function. Otherwise > > > we end up with m2m framework racing with the mtk_fd_hw_job_finish() > > > below. > > > > > > Also, I'd use a completion here rather than an open coded wait and > > > wake-up. The driver could reinit_completion() before queuing a job to > > > the hardware and the IRQ handler would complete(). There would be no > > > need to store the IRQ flags in driver data anymore. > > Ok, It will be refined as following: > > > > suspend and stop streaming will call mtk_fd_job_abort() > > > > static void mtk_fd_job_abort(struct mtk_fd_dev *fd) > > { > > u32 ret; > > > > ret = wait_for_completion_timeout(&fd->fd_irq_done, > > msecs_to_jiffies(MTK_FD_HW_TIMEOUT)); > > if (ret) > > For the _timeout variants, !ret means the timeout and ret > 0 means > that the wait ended successfully before. > Thanks, fixed. > Also please make sure that the timeout is big enough not to happen > normally on a heavily loaded system. Something like 1 second should be > good. > Ok, I will make it 1 second #define MTK_FD_HW_TIMEOUT 1000 Also, I will add a condition in mtk_fd_vb2_stop_streaming(), since it would be called twice, now it works fine whether I reuse the condition with mtk_fd_hw_disconnect or not, however, I think do it before buffer remove looks more reasonable. static void mtk_fd_vb2_stop_streaming(struct vb2_queue *vq) { struct mtk_fd_ctx *ctx = vb2_get_drv_priv(vq); struct mtk_fd_dev *fd = ctx->fd_dev; struct vb2_v4l2_buffer *vb; struct v4l2_m2m_ctx *m2m_ctx = ctx->fh.m2m_ctx; struct v4l2_m2m_queue_ctx *queue_ctx; if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) mtk_fd_job_abort(fd); queue_ctx = V4L2_TYPE_IS_OUTPUT(vq->type) ? &m2m_ctx->out_q_ctx : &m2m_ctx->cap_q_ctx; while ((vb = v4l2_m2m_buf_remove(queue_ctx))) v4l2_m2m_buf_done(vb, VB2_BUF_STATE_ERROR); if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) mtk_fd_hw_disconnect(fd); } > > mtk_fd_hw_job_finish(fd, VB2_BUF_STATE_ERROR); > > } > > > > complete at irq handler > > > > static irqreturn_t mtk_fd_irq(int irq, void *data) > > { > > struct mtk_fd_dev *fd = (struct mtk_fd_dev *)data; > > > > /* must read this register otherwise HW will keep sending irq */ > > readl(fd->fd_base + MTK_FD_REG_OFFSET_INT_VAL); > > fd->output->number = readl(fd->fd_base + MTK_FD_REG_OFFSET_RESULT); > > dev_dbg(fd->dev, "mtk_fd_face_num:%d\n", fd->output->number); > > > > pm_runtime_put((fd->dev)); > > mtk_fd_hw_job_finish(fd, VB2_BUF_STATE_DONE); > > complete(&fd->fd_irq_done); > > return IRQ_HANDLED; > > } > > > > and reinit_completion before time before sending a job to HW > > > > static int mtk_fd_hw_job_exec(struct mtk_fd_dev *fd, > > struct fd_enq_param *fd_param) > > { > > struct ipi_message fd_ipi_msg; > > int ret; > > > > pm_runtime_get_sync((fd->dev)); > > > > reinit_completion(&fd->fd_irq_done); > > fd_ipi_msg.cmd_id = MTK_FD_IPI_CMD_ENQUEUE; > > memcpy(&fd_ipi_msg.fd_enq_param, fd_param, sizeof(struct > > fd_enq_param)); > > ret = scp_ipi_send(fd->scp_pdev, SCP_IPI_FD_CMD, &fd_ipi_msg, > > sizeof(fd_ipi_msg), MTK_FD_IPI_SEND_TIMEOUT); > > if (ret) { > > pm_runtime_put((fd->dev)); > > mtk_fd_hw_job_finish(fd, VB2_BUF_STATE_ERROR); > > return ret; > > } > > return 0; > > } > > Looks good, thanks. Please also don't forget about init_completion() > in driver probe. > Yes, thanks for remind. Best regards, Jerry > Best regards, > Tomasz 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=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 autolearn=no 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 E03FCC3A59E for ; Wed, 4 Sep 2019 06:10:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A786223402 for ; Wed, 4 Sep 2019 06:10:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727083AbfIDGKA (ORCPT ); Wed, 4 Sep 2019 02:10:00 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:40551 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725840AbfIDGKA (ORCPT ); Wed, 4 Sep 2019 02:10:00 -0400 X-UUID: 74b5ced7c1f64b89aeee44ffcd0f3e0f-20190904 X-UUID: 74b5ced7c1f64b89aeee44ffcd0f3e0f-20190904 Received: from mtkcas09.mediatek.inc [(172.21.101.178)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 966876367; Wed, 04 Sep 2019 14:09:49 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 4 Sep 2019 14:09:48 +0800 Received: from [172.21.84.99] (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 4 Sep 2019 14:09:48 +0800 Message-ID: <1567577389.18318.100.camel@mtksdccf07> Subject: Re: [RFC PATCH V2 4/4] platform: mtk-isp: Add Mediatek FD driver From: Jerry-ch Chen To: Tomasz Figa CC: "yuzhao@chromium.org" , "zwisler@chromium.org" , "linux-mediatek@lists.infradead.org" , "linux-arm-kernel@lists.infradead.org" , Sean Cheng =?UTF-8?Q?=28=E9=84=AD=E6=98=87=E5=BC=98=29?= , "Sj Huang =?UTF-8?Q?=28=E9=BB=83=E4=BF=A1=E7=92=8B=29?=" , Christie Yu =?UTF-8?Q?=28=E6=B8=B8=E9=9B=85=E6=83=A0=29?= , Frederic Chen =?UTF-8?Q?=28=E9=99=B3=E4=BF=8A=E5=85=83=29?= , Jungo Lin =?UTF-8?Q?=28=E6=9E=97=E6=98=8E=E4=BF=8A=29?= , Rynn Wu =?UTF-8?Q?=28=E5=90=B3=E8=82=B2=E6=81=A9=29?= , Po-Yang Huang =?UTF-8?Q?=28=E9=BB=83=E6=9F=8F=E9=99=BD=29?= , "shik@chromium.org" , "suleiman@chromium.org" , "linux-media@vger.kernel.org" , srv_heupstream , "devicetree@vger.kernel.org" , "laurent.pinchart+renesas@ideasonboard.com" , "hans.verkuil@cisco.com" , "mchehab@kernel.org" , "matthias.bgg@gmail.com" Date: Wed, 4 Sep 2019 14:09:49 +0800 In-Reply-To: References: <1562661672-22439-1-git-send-email-Jerry-Ch.chen@mediatek.com> <1562661672-22439-5-git-send-email-Jerry-Ch.chen@mediatek.com> <20190802082815.GA203993@chromium.org> <1566724680.20680.8.camel@mtksdccf07> <1566957625.20680.33.camel@mtksdccf07> <1567424859.18318.32.camel@mtksdccf07> <1567493081.18318.49.camel@mtksdccf07> <1567511169.18318.65.camel@mtksdccf07> <1567568281.18318.80.camel@mtksdccf07> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-MTK: N Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Tomasz, On Wed, 2019-09-04 at 12:15 +0800, Tomasz Figa wrote: > On Wed, Sep 4, 2019 at 12:38 PM Jerry-ch Chen > wrote: > > > > Hi Tomasz, > > > > On Tue, 2019-09-03 at 20:05 +0800, Tomasz Figa wrote: > > > On Tue, Sep 3, 2019 at 8:46 PM Jerry-ch Chen wrote: > > > > > > > > Hi Tomasz, > > > > > > > > On Tue, 2019-09-03 at 15:04 +0800, Tomasz Figa wrote: > > > > > On Tue, Sep 3, 2019 at 3:44 PM Jerry-ch Chen wrote: > > > > > > > > > > > > On Tue, 2019-09-03 at 13:19 +0800, Tomasz Figa wrote: > > > > > > > On Mon, Sep 2, 2019 at 8:47 PM Jerry-ch Chen wrote: > > > > > > > > > > > > > > > > Hi Tomasz, > > > > > > > > > > > > > > > > On Fri, 2019-08-30 at 16:33 +0800, Tomasz Figa wrote: > > > > > > > > > On Wed, Aug 28, 2019 at 11:00 AM Jerry-ch Chen > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > Hi Tomasz, > > > > > > > > > > > > > > > > > > > > On Mon, 2019-08-26 at 14:36 +0800, Tomasz Figa wrote: > > > > > > > > > > > Hi Jerry, > > > > > > > > > > > > > > > > > > > > > > On Sun, Aug 25, 2019 at 6:18 PM Jerry-ch Chen > > > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > Hi Tomasz, > > > > > > > > > > > > > > > > > > > > > > > > On Fri, 2019-08-02 at 16:28 +0800, Tomasz Figa wrote: > > > > > > > > > > > > > Hi Jerry, > > > > > > > > > > > > > > > > > > > > > > > > > > On Tue, Jul 09, 2019 at 04:41:12PM +0800, Jerry-ch Chen wrote: > > [snip] > > > > > > > > > > > [snip] > > > > > > > > > > > > > > > > > > > > > > > > > +static void mtk_fd_vb2_stop_streaming(struct vb2_queue *vq) > > > > > > > > > > > > > > +{ > > > > > > > > > > > > > > + struct mtk_fd_ctx *ctx = vb2_get_drv_priv(vq); > > > > > > > > > > > > > > + struct vb2_buffer *vb; > > > > > > > > > > > > > > > > > > > > > > > > > > How do we guarantee here that the hardware isn't still accessing the buffers > > > > > > > > > > > > > removed below? > > > > > > > > > > > > > > > > > > > > > > > > > Maybe we can check the driver state flag and aborting the unfinished > > > > > > > > > > > > jobs? > > > > > > > > > > > > (fd_hw->state == FD_ENQ) > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Yes, we need to either cancel or wait for the currently processing > > > > > > > > > > > job. It depends on hardware capabilities, but cancelling is generally > > > > > > > > > > > preferred for the lower latency. > > > > > > > > > > > > > > > > > > > > > Ok, it the state is ENQ, then we can disable the FD hw by controlling > > > > > > > > > > the registers. > > > > > > > > > > > > > > > > > > > > for example: > > > > > > > > > > writel(0x0, fd->fd_base + FD_HW_ENABLE); > > > > > > > > > > writel(0x0, fd->fd_base + FD_INT_EN); > > > > > > > > > > > > > > > > > > > > > > > > > > > > What's exactly the effect of writing 0 to FD_HW_ENABLE? > > > > > > > > > > > > > > > > > Sorry, my last reply didn't solve the question, > > > > > > > > we should implement a mtk_fd_job_abort() for v4l2_m2m_ops(). > > > > > > > > > > > > > > > > which is able to readl_poll_timeout_atomic() > > > > > > > > and check the HW busy bits in the register FD_INT_EN; > > > > > > > > > > > > > > > > if they are not cleared until timeout, we could handle the last > > > > > > > > processing job. > > > > > > > > Otherwise, the FD irq handler should have handled the last processing > > > > > > > > job and we could continue the stop_streaming(). > > > > > > > > > > > > > > > > For job_abort(): > > > > > > > > static void mtk_fd_job_abort(void *priv) > > > > > > > > { > > > > > > > > struct mtk_fd_ctx *ctx = priv; > > > > > > > > struct mtk_fd_dev *fd = ctx->fd_dev; > > > > > > > > u32 val; > > > > > > > > u32 ret; > > > > > > > > > > > > > > > > ret = readl_poll_timeout_atomic(fd->fd_base + MTK_FD_REG_OFFSET_INT_EN, > > > > > > > > val, > > > > > > > > (val & MTK_FD_HW_BUSY_MASK) == > > > > > > > > MTK_FD_HW_STATE_IS_BUSY, > > > > > > > > USEC_PER_MSEC, MTK_FD_STOP_HW_TIMEOUT); > > > > > > > > > > > > > > Hmm, would it be possible to avoid the busy wait by having a > > > > > > > completion that could be signalled from the interrupt handler? > > > > > > > > > > > > > > Best regards, > > > > > > > Tomasz > > > > > > > > > > > > I suppose that would be wakeup a wait queue in the interrupt handler, > > > > > > the the wait_event_interrupt_timeout() will be used in here and system > > > > > > suspend e.g. mtk_fd_suspend(). > > > > > > > > > > Yes, that should work. > > > > > > > > > > > Or do you suggest to wait_event_interrupt_timeout() every frame in the > > > > > > mtk_fd_ipi_handler()? > > > > > > > > > > Nope, we shouldn't need that. > > > > > > > > > > > I think maybe the readl_poll_timeout_atomic would be good enough. > > > > > > > > > > > > > > > > Not really. Busy waiting should be avoided as much as possible. What's > > > > > the point of entering suspend if you end up burning the power by > > > > > spinning the CPU for some milliseconds? > > > > > > > > > Ok, I see, busy waiting is not a good idea, I will use the wait queue > > > > instead. the job abort will refine as following: > > > > > > > > static void mtk_fd_job_abort(void *priv) > > > > { > > > > struct mtk_fd_ctx *ctx = priv; > > > > struct mtk_fd_dev *fd = ctx->fd_dev; > > > > u32 ret; > > > > > > > > ret = wait_event_interruptible_timeout > > > > (fd->wq, (fd->fd_irq_result & MTK_FD_HW_IRQ_MASK), > > > > usecs_to_jiffies(50000)); > > > > if (ret) > > > > mtk_fd_hw_job_finish(fd, VB2_BUF_STATE_ERROR); > > > > dev_dbg(fd->dev, "%s, ret:%d\n", __func__, ret); > > > > > > > > fd->fd_irq_result = 0; > > > > } > > > > > > > > static struct v4l2_m2m_ops fd_m2m_ops = { > > > > .device_run = mtk_fd_device_run, > > > > .job_abort = mtk_fd_job_abort, > > > > > > I'm not sure we should be using the functon above as the .job_abort > > > callback. It's expected to abort the job, but we're just waiting for > > > it to finish. I think we should just call mtk_fd_job_abort() manually > > > from .stop_streaming. > > > > > > > Ok, I will fix it. > > > > > > }; > > > > > > > > and we could use it in suspend. > > > > static int mtk_fd_suspend(struct device *dev) > > > > { > > > > struct mtk_fd_dev *fd = dev_get_drvdata(dev); > > > > > > > > if (pm_runtime_suspended(dev)) > > > > return 0; > > > > > > > > if (fd->fd_stream_count) > > > > mtk_fd_job_abort(fd->ctx); > > > > > > > > /* suspend FD HW */ > > > > writel(0x0, fd->fd_base + MTK_FD_REG_OFFSET_INT_EN); > > > > writel(0x0, fd->fd_base + MTK_FD_REG_OFFSET_HW_ENABLE); > > > > clk_disable_unprepare(fd->fd_clk); > > > > dev_dbg(dev, "%s:disable clock\n", __func__); > > > > > > > > return 0; > > > > } > > > > > > > > static irqreturn_t mtk_fd_irq(int irq, void *data) > > > > { > > > > struct mtk_fd_dev *fd = (struct mtk_fd_dev *)data; > > > > > > > > fd->fd_irq_result = readl(fd->fd_base + MTK_FD_REG_OFFSET_INT_VAL); > > > > wake_up_interruptible(&fd->wq); > > > > > > The wake up should be done at the very end of this function. Otherwise > > > we end up with m2m framework racing with the mtk_fd_hw_job_finish() > > > below. > > > > > > Also, I'd use a completion here rather than an open coded wait and > > > wake-up. The driver could reinit_completion() before queuing a job to > > > the hardware and the IRQ handler would complete(). There would be no > > > need to store the IRQ flags in driver data anymore. > > Ok, It will be refined as following: > > > > suspend and stop streaming will call mtk_fd_job_abort() > > > > static void mtk_fd_job_abort(struct mtk_fd_dev *fd) > > { > > u32 ret; > > > > ret = wait_for_completion_timeout(&fd->fd_irq_done, > > msecs_to_jiffies(MTK_FD_HW_TIMEOUT)); > > if (ret) > > For the _timeout variants, !ret means the timeout and ret > 0 means > that the wait ended successfully before. > Thanks, fixed. > Also please make sure that the timeout is big enough not to happen > normally on a heavily loaded system. Something like 1 second should be > good. > Ok, I will make it 1 second #define MTK_FD_HW_TIMEOUT 1000 Also, I will add a condition in mtk_fd_vb2_stop_streaming(), since it would be called twice, now it works fine whether I reuse the condition with mtk_fd_hw_disconnect or not, however, I think do it before buffer remove looks more reasonable. static void mtk_fd_vb2_stop_streaming(struct vb2_queue *vq) { struct mtk_fd_ctx *ctx = vb2_get_drv_priv(vq); struct mtk_fd_dev *fd = ctx->fd_dev; struct vb2_v4l2_buffer *vb; struct v4l2_m2m_ctx *m2m_ctx = ctx->fh.m2m_ctx; struct v4l2_m2m_queue_ctx *queue_ctx; if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) mtk_fd_job_abort(fd); queue_ctx = V4L2_TYPE_IS_OUTPUT(vq->type) ? &m2m_ctx->out_q_ctx : &m2m_ctx->cap_q_ctx; while ((vb = v4l2_m2m_buf_remove(queue_ctx))) v4l2_m2m_buf_done(vb, VB2_BUF_STATE_ERROR); if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) mtk_fd_hw_disconnect(fd); } > > mtk_fd_hw_job_finish(fd, VB2_BUF_STATE_ERROR); > > } > > > > complete at irq handler > > > > static irqreturn_t mtk_fd_irq(int irq, void *data) > > { > > struct mtk_fd_dev *fd = (struct mtk_fd_dev *)data; > > > > /* must read this register otherwise HW will keep sending irq */ > > readl(fd->fd_base + MTK_FD_REG_OFFSET_INT_VAL); > > fd->output->number = readl(fd->fd_base + MTK_FD_REG_OFFSET_RESULT); > > dev_dbg(fd->dev, "mtk_fd_face_num:%d\n", fd->output->number); > > > > pm_runtime_put((fd->dev)); > > mtk_fd_hw_job_finish(fd, VB2_BUF_STATE_DONE); > > complete(&fd->fd_irq_done); > > return IRQ_HANDLED; > > } > > > > and reinit_completion before time before sending a job to HW > > > > static int mtk_fd_hw_job_exec(struct mtk_fd_dev *fd, > > struct fd_enq_param *fd_param) > > { > > struct ipi_message fd_ipi_msg; > > int ret; > > > > pm_runtime_get_sync((fd->dev)); > > > > reinit_completion(&fd->fd_irq_done); > > fd_ipi_msg.cmd_id = MTK_FD_IPI_CMD_ENQUEUE; > > memcpy(&fd_ipi_msg.fd_enq_param, fd_param, sizeof(struct > > fd_enq_param)); > > ret = scp_ipi_send(fd->scp_pdev, SCP_IPI_FD_CMD, &fd_ipi_msg, > > sizeof(fd_ipi_msg), MTK_FD_IPI_SEND_TIMEOUT); > > if (ret) { > > pm_runtime_put((fd->dev)); > > mtk_fd_hw_job_finish(fd, VB2_BUF_STATE_ERROR); > > return ret; > > } > > return 0; > > } > > Looks good, thanks. Please also don't forget about init_completion() > in driver probe. > Yes, thanks for remind. Best regards, Jerry > Best regards, > Tomasz 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=-2.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=no 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 64DCBC3A59E for ; Wed, 4 Sep 2019 06:10:06 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 363022339D for ; Wed, 4 Sep 2019 06:10:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="WE1b9AsQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 363022339D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=W3xatL9KP0yHR/q/8v03r79TATzsRGdqUX/xg+bYwhg=; b=WE1b9AsQYE9dny DqRE0UQcdxZ8tQA+vnU+IK6XPiqtirnzt/JLzrf6dSX33emhKbPg3t5+5rjTZt6qdsbaIeD/AxUGO +ocWfyXL+ESqd3x6XYAv4LtRs08VTZC+zkM3vPhSyBFhJCuIculoEBcwQBhM3T9nOCHHWvtusBjs9 1U62sIK5MkVvaf/Nx6ltc5WFPyUQFrDfUkgII9b0CBxlv2jRx4lkm7poOwa561Z51pTcWdDTUA7ZZ 5P+eEhtOrWEdwf4PuTy31FBFV7F4cVM18W3eb9bKY9/ahU0oc5Ty4rNN5D4OrUQIJMI66BXzJKBMb wVFjb6eLR4iAWH27bPvA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i5OUT-00058T-En; Wed, 04 Sep 2019 06:10:01 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i5OUO-000578-B6; Wed, 04 Sep 2019 06:09:58 +0000 X-UUID: 8e7c611639644a889c7c2b0a491cc1d3-20190903 X-UUID: 8e7c611639644a889c7c2b0a491cc1d3-20190903 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1650731883; Tue, 03 Sep 2019 22:09:51 -0800 Received: from MTKMBS07N2.mediatek.inc (172.21.101.141) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 3 Sep 2019 23:09:50 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 4 Sep 2019 14:09:48 +0800 Received: from [172.21.84.99] (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 4 Sep 2019 14:09:48 +0800 Message-ID: <1567577389.18318.100.camel@mtksdccf07> Subject: Re: [RFC PATCH V2 4/4] platform: mtk-isp: Add Mediatek FD driver From: Jerry-ch Chen To: Tomasz Figa Date: Wed, 4 Sep 2019 14:09:49 +0800 In-Reply-To: References: <1562661672-22439-1-git-send-email-Jerry-Ch.chen@mediatek.com> <1562661672-22439-5-git-send-email-Jerry-Ch.chen@mediatek.com> <20190802082815.GA203993@chromium.org> <1566724680.20680.8.camel@mtksdccf07> <1566957625.20680.33.camel@mtksdccf07> <1567424859.18318.32.camel@mtksdccf07> <1567493081.18318.49.camel@mtksdccf07> <1567511169.18318.65.camel@mtksdccf07> <1567568281.18318.80.camel@mtksdccf07> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190903_230956_391479_367F0B6D X-CRM114-Status: GOOD ( 38.45 ) 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: "devicetree@vger.kernel.org" , Sean Cheng =?UTF-8?Q?=28=E9=84=AD=E6=98=87=E5=BC=98=29?= , "laurent.pinchart+renesas@ideasonboard.com" , Rynn Wu =?UTF-8?Q?=28=E5=90=B3=E8=82=B2=E6=81=A9=29?= , srv_heupstream , Po-Yang Huang =?UTF-8?Q?=28=E9=BB=83=E6=9F=8F=E9=99=BD=29?= , "mchehab@kernel.org" , "suleiman@chromium.org" , "shik@chromium.org" , Jungo Lin =?UTF-8?Q?=28=E6=9E=97=E6=98=8E=E4=BF=8A=29?= , Sj Huang =?UTF-8?Q?=28=E9=BB=83=E4=BF=A1=E7=92=8B=29?= , "yuzhao@chromium.org" , "linux-mediatek@lists.infradead.org" , "zwisler@chromium.org" , "matthias.bgg@gmail.com" , Christie Yu =?UTF-8?Q?=28=E6=B8=B8=E9=9B=85=E6=83=A0=29?= , Frederic Chen =?UTF-8?Q?=28=E9=99=B3=E4=BF=8A=E5=85=83=29?= , "hans.verkuil@cisco.com" , "linux-arm-kernel@lists.infradead.org" , "linux-media@vger.kernel.org" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Tomasz, On Wed, 2019-09-04 at 12:15 +0800, Tomasz Figa wrote: > On Wed, Sep 4, 2019 at 12:38 PM Jerry-ch Chen > wrote: > > > > Hi Tomasz, > > > > On Tue, 2019-09-03 at 20:05 +0800, Tomasz Figa wrote: > > > On Tue, Sep 3, 2019 at 8:46 PM Jerry-ch Chen wrote: > > > > > > > > Hi Tomasz, > > > > > > > > On Tue, 2019-09-03 at 15:04 +0800, Tomasz Figa wrote: > > > > > On Tue, Sep 3, 2019 at 3:44 PM Jerry-ch Chen wrote: > > > > > > > > > > > > On Tue, 2019-09-03 at 13:19 +0800, Tomasz Figa wrote: > > > > > > > On Mon, Sep 2, 2019 at 8:47 PM Jerry-ch Chen wrote: > > > > > > > > > > > > > > > > Hi Tomasz, > > > > > > > > > > > > > > > > On Fri, 2019-08-30 at 16:33 +0800, Tomasz Figa wrote: > > > > > > > > > On Wed, Aug 28, 2019 at 11:00 AM Jerry-ch Chen > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > Hi Tomasz, > > > > > > > > > > > > > > > > > > > > On Mon, 2019-08-26 at 14:36 +0800, Tomasz Figa wrote: > > > > > > > > > > > Hi Jerry, > > > > > > > > > > > > > > > > > > > > > > On Sun, Aug 25, 2019 at 6:18 PM Jerry-ch Chen > > > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > Hi Tomasz, > > > > > > > > > > > > > > > > > > > > > > > > On Fri, 2019-08-02 at 16:28 +0800, Tomasz Figa wrote: > > > > > > > > > > > > > Hi Jerry, > > > > > > > > > > > > > > > > > > > > > > > > > > On Tue, Jul 09, 2019 at 04:41:12PM +0800, Jerry-ch Chen wrote: > > [snip] > > > > > > > > > > > [snip] > > > > > > > > > > > > > > > > > > > > > > > > > +static void mtk_fd_vb2_stop_streaming(struct vb2_queue *vq) > > > > > > > > > > > > > > +{ > > > > > > > > > > > > > > + struct mtk_fd_ctx *ctx = vb2_get_drv_priv(vq); > > > > > > > > > > > > > > + struct vb2_buffer *vb; > > > > > > > > > > > > > > > > > > > > > > > > > > How do we guarantee here that the hardware isn't still accessing the buffers > > > > > > > > > > > > > removed below? > > > > > > > > > > > > > > > > > > > > > > > > > Maybe we can check the driver state flag and aborting the unfinished > > > > > > > > > > > > jobs? > > > > > > > > > > > > (fd_hw->state == FD_ENQ) > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Yes, we need to either cancel or wait for the currently processing > > > > > > > > > > > job. It depends on hardware capabilities, but cancelling is generally > > > > > > > > > > > preferred for the lower latency. > > > > > > > > > > > > > > > > > > > > > Ok, it the state is ENQ, then we can disable the FD hw by controlling > > > > > > > > > > the registers. > > > > > > > > > > > > > > > > > > > > for example: > > > > > > > > > > writel(0x0, fd->fd_base + FD_HW_ENABLE); > > > > > > > > > > writel(0x0, fd->fd_base + FD_INT_EN); > > > > > > > > > > > > > > > > > > > > > > > > > > > > What's exactly the effect of writing 0 to FD_HW_ENABLE? > > > > > > > > > > > > > > > > > Sorry, my last reply didn't solve the question, > > > > > > > > we should implement a mtk_fd_job_abort() for v4l2_m2m_ops(). > > > > > > > > > > > > > > > > which is able to readl_poll_timeout_atomic() > > > > > > > > and check the HW busy bits in the register FD_INT_EN; > > > > > > > > > > > > > > > > if they are not cleared until timeout, we could handle the last > > > > > > > > processing job. > > > > > > > > Otherwise, the FD irq handler should have handled the last processing > > > > > > > > job and we could continue the stop_streaming(). > > > > > > > > > > > > > > > > For job_abort(): > > > > > > > > static void mtk_fd_job_abort(void *priv) > > > > > > > > { > > > > > > > > struct mtk_fd_ctx *ctx = priv; > > > > > > > > struct mtk_fd_dev *fd = ctx->fd_dev; > > > > > > > > u32 val; > > > > > > > > u32 ret; > > > > > > > > > > > > > > > > ret = readl_poll_timeout_atomic(fd->fd_base + MTK_FD_REG_OFFSET_INT_EN, > > > > > > > > val, > > > > > > > > (val & MTK_FD_HW_BUSY_MASK) == > > > > > > > > MTK_FD_HW_STATE_IS_BUSY, > > > > > > > > USEC_PER_MSEC, MTK_FD_STOP_HW_TIMEOUT); > > > > > > > > > > > > > > Hmm, would it be possible to avoid the busy wait by having a > > > > > > > completion that could be signalled from the interrupt handler? > > > > > > > > > > > > > > Best regards, > > > > > > > Tomasz > > > > > > > > > > > > I suppose that would be wakeup a wait queue in the interrupt handler, > > > > > > the the wait_event_interrupt_timeout() will be used in here and system > > > > > > suspend e.g. mtk_fd_suspend(). > > > > > > > > > > Yes, that should work. > > > > > > > > > > > Or do you suggest to wait_event_interrupt_timeout() every frame in the > > > > > > mtk_fd_ipi_handler()? > > > > > > > > > > Nope, we shouldn't need that. > > > > > > > > > > > I think maybe the readl_poll_timeout_atomic would be good enough. > > > > > > > > > > > > > > > > Not really. Busy waiting should be avoided as much as possible. What's > > > > > the point of entering suspend if you end up burning the power by > > > > > spinning the CPU for some milliseconds? > > > > > > > > > Ok, I see, busy waiting is not a good idea, I will use the wait queue > > > > instead. the job abort will refine as following: > > > > > > > > static void mtk_fd_job_abort(void *priv) > > > > { > > > > struct mtk_fd_ctx *ctx = priv; > > > > struct mtk_fd_dev *fd = ctx->fd_dev; > > > > u32 ret; > > > > > > > > ret = wait_event_interruptible_timeout > > > > (fd->wq, (fd->fd_irq_result & MTK_FD_HW_IRQ_MASK), > > > > usecs_to_jiffies(50000)); > > > > if (ret) > > > > mtk_fd_hw_job_finish(fd, VB2_BUF_STATE_ERROR); > > > > dev_dbg(fd->dev, "%s, ret:%d\n", __func__, ret); > > > > > > > > fd->fd_irq_result = 0; > > > > } > > > > > > > > static struct v4l2_m2m_ops fd_m2m_ops = { > > > > .device_run = mtk_fd_device_run, > > > > .job_abort = mtk_fd_job_abort, > > > > > > I'm not sure we should be using the functon above as the .job_abort > > > callback. It's expected to abort the job, but we're just waiting for > > > it to finish. I think we should just call mtk_fd_job_abort() manually > > > from .stop_streaming. > > > > > > > Ok, I will fix it. > > > > > > }; > > > > > > > > and we could use it in suspend. > > > > static int mtk_fd_suspend(struct device *dev) > > > > { > > > > struct mtk_fd_dev *fd = dev_get_drvdata(dev); > > > > > > > > if (pm_runtime_suspended(dev)) > > > > return 0; > > > > > > > > if (fd->fd_stream_count) > > > > mtk_fd_job_abort(fd->ctx); > > > > > > > > /* suspend FD HW */ > > > > writel(0x0, fd->fd_base + MTK_FD_REG_OFFSET_INT_EN); > > > > writel(0x0, fd->fd_base + MTK_FD_REG_OFFSET_HW_ENABLE); > > > > clk_disable_unprepare(fd->fd_clk); > > > > dev_dbg(dev, "%s:disable clock\n", __func__); > > > > > > > > return 0; > > > > } > > > > > > > > static irqreturn_t mtk_fd_irq(int irq, void *data) > > > > { > > > > struct mtk_fd_dev *fd = (struct mtk_fd_dev *)data; > > > > > > > > fd->fd_irq_result = readl(fd->fd_base + MTK_FD_REG_OFFSET_INT_VAL); > > > > wake_up_interruptible(&fd->wq); > > > > > > The wake up should be done at the very end of this function. Otherwise > > > we end up with m2m framework racing with the mtk_fd_hw_job_finish() > > > below. > > > > > > Also, I'd use a completion here rather than an open coded wait and > > > wake-up. The driver could reinit_completion() before queuing a job to > > > the hardware and the IRQ handler would complete(). There would be no > > > need to store the IRQ flags in driver data anymore. > > Ok, It will be refined as following: > > > > suspend and stop streaming will call mtk_fd_job_abort() > > > > static void mtk_fd_job_abort(struct mtk_fd_dev *fd) > > { > > u32 ret; > > > > ret = wait_for_completion_timeout(&fd->fd_irq_done, > > msecs_to_jiffies(MTK_FD_HW_TIMEOUT)); > > if (ret) > > For the _timeout variants, !ret means the timeout and ret > 0 means > that the wait ended successfully before. > Thanks, fixed. > Also please make sure that the timeout is big enough not to happen > normally on a heavily loaded system. Something like 1 second should be > good. > Ok, I will make it 1 second #define MTK_FD_HW_TIMEOUT 1000 Also, I will add a condition in mtk_fd_vb2_stop_streaming(), since it would be called twice, now it works fine whether I reuse the condition with mtk_fd_hw_disconnect or not, however, I think do it before buffer remove looks more reasonable. static void mtk_fd_vb2_stop_streaming(struct vb2_queue *vq) { struct mtk_fd_ctx *ctx = vb2_get_drv_priv(vq); struct mtk_fd_dev *fd = ctx->fd_dev; struct vb2_v4l2_buffer *vb; struct v4l2_m2m_ctx *m2m_ctx = ctx->fh.m2m_ctx; struct v4l2_m2m_queue_ctx *queue_ctx; if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) mtk_fd_job_abort(fd); queue_ctx = V4L2_TYPE_IS_OUTPUT(vq->type) ? &m2m_ctx->out_q_ctx : &m2m_ctx->cap_q_ctx; while ((vb = v4l2_m2m_buf_remove(queue_ctx))) v4l2_m2m_buf_done(vb, VB2_BUF_STATE_ERROR); if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) mtk_fd_hw_disconnect(fd); } > > mtk_fd_hw_job_finish(fd, VB2_BUF_STATE_ERROR); > > } > > > > complete at irq handler > > > > static irqreturn_t mtk_fd_irq(int irq, void *data) > > { > > struct mtk_fd_dev *fd = (struct mtk_fd_dev *)data; > > > > /* must read this register otherwise HW will keep sending irq */ > > readl(fd->fd_base + MTK_FD_REG_OFFSET_INT_VAL); > > fd->output->number = readl(fd->fd_base + MTK_FD_REG_OFFSET_RESULT); > > dev_dbg(fd->dev, "mtk_fd_face_num:%d\n", fd->output->number); > > > > pm_runtime_put((fd->dev)); > > mtk_fd_hw_job_finish(fd, VB2_BUF_STATE_DONE); > > complete(&fd->fd_irq_done); > > return IRQ_HANDLED; > > } > > > > and reinit_completion before time before sending a job to HW > > > > static int mtk_fd_hw_job_exec(struct mtk_fd_dev *fd, > > struct fd_enq_param *fd_param) > > { > > struct ipi_message fd_ipi_msg; > > int ret; > > > > pm_runtime_get_sync((fd->dev)); > > > > reinit_completion(&fd->fd_irq_done); > > fd_ipi_msg.cmd_id = MTK_FD_IPI_CMD_ENQUEUE; > > memcpy(&fd_ipi_msg.fd_enq_param, fd_param, sizeof(struct > > fd_enq_param)); > > ret = scp_ipi_send(fd->scp_pdev, SCP_IPI_FD_CMD, &fd_ipi_msg, > > sizeof(fd_ipi_msg), MTK_FD_IPI_SEND_TIMEOUT); > > if (ret) { > > pm_runtime_put((fd->dev)); > > mtk_fd_hw_job_finish(fd, VB2_BUF_STATE_ERROR); > > return ret; > > } > > return 0; > > } > > Looks good, thanks. Please also don't forget about init_completion() > in driver probe. > Yes, thanks for remind. Best regards, Jerry > Best regards, > Tomasz _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel