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=-0.6 required=3.0 tests=DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by aws-us-west-2-korg-lkml-1.web.codeaurora.org (Postfix) with ESMTP id BD48DC433EF for ; Thu, 14 Jun 2018 08:34:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5E6A8208D8 for ; Thu, 14 Jun 2018 08:34:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=linaro.org header.i=@linaro.org header.b="g3QnyIHl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E6A8208D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754732AbeFNIed (ORCPT ); Thu, 14 Jun 2018 04:34:33 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:44773 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752899AbeFNIe3 (ORCPT ); Thu, 14 Jun 2018 04:34:29 -0400 Received: by mail-pf0-f193.google.com with SMTP id h12-v6so2861949pfk.11 for ; Thu, 14 Jun 2018 01:34:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=77FDvp83IyNmigGpLse/BKkkFCnJvYZ6NLQPGf7npA0=; b=g3QnyIHl89JTbuxi2LYQjsFkr1Y+tcq5IBULqubZGjBr6sIrvP0T1aBuxicxXNKRdj By8FIdLN6Gn89bE0HiLplDAacJqMFMwPxqtE1eh6Y5RVfaZur/q3KiCNdI7XohO0HIiB wjjjfOBRMpKFAA/4GC1X/NjEV/JaFNJNITaHM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=77FDvp83IyNmigGpLse/BKkkFCnJvYZ6NLQPGf7npA0=; b=tnSQ9rPzgf3gBnN7ONzk4jJTVySxqe7PyFp071HBQ1+8WIJOX3MNiq57y4fjlOLEN5 pNEBz0pbH70fI99IcU0n28NL7qq77h9fn5hzHUZRMX9GJvXUIgthZUG9CDFrLfToW1qX 647wcMpvzNXLcd7aELuu40owFGez+lBoTiFGTMKKIKaV5oMMkGJoxYvL/Gyz7ny/2K6j if2MJh2G5jtXVQt7V76XnF9z8dF67g7N65tX2rO0+S9BSG5tRaPeJ/PZ1pv62pUUkWCs NHsSbu7iGOu3GrXcf4eVSMiRE46pL0/Xz1yBIhKHGqAi1bRCDUst790LnG+2CMcN5Kty NO2Q== X-Gm-Message-State: APt69E1z+0A2Sgi80hhjcKquov+txYuVtFNlbJx7z0TL3ioOlOAtBpex zYJIkUCGuwLxFJPDOo+7ONu6ug== X-Google-Smtp-Source: ADUXVKJyg5uIO8hdnhs8M0NBcsdAVQwlp+C7SPdzSv2WGfy2wKRWiZyn5zsvfKGEMAlxVv/rIar7GQ== X-Received: by 2002:a65:602c:: with SMTP id p12-v6mr1453466pgu.209.1528965268464; Thu, 14 Jun 2018 01:34:28 -0700 (PDT) Received: from localhost ([106.201.124.1]) by smtp.gmail.com with ESMTPSA id v6-v6sm6682386pfm.120.2018.06.14.01.34.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Jun 2018 01:34:27 -0700 (PDT) Date: Thu, 14 Jun 2018 14:04:25 +0530 From: Vinod Koul To: Kuninori Morimoto Cc: Geert Uytterhoeven , Dan Williams , Magnus Damm , Linux-Renesas , Linux Kernel Mailing List , Laurent Pinchart , Kieran Bingham , Geert Uytterhoeven , dmaengine@vger.kernel.org, "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" Subject: Re: [PATCH v2] dmaengine: rcar-dmac: don't use DMAC error interrupt Message-ID: <20180614083425.GA25852@vkoul-mobl> References: <8736xrkrci.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8736xrkrci.wl%kuninori.morimoto.gx@renesas.com> User-Agent: Mutt/1.9.2 (2017-12-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 13-06-18, 08:49, Kuninori Morimoto wrote: > > From: Kuninori Morimoto > > Current rcar-dmac is using DMAC error interrupt which will handle all > channel's error. But in this design, error handling itself will be > issue if user want to use virtualization, multi OS, etc. > This patch removes current DMAC error interrupt handling, and handle it > on each channel interrupt handler. So what happens when you are not in virtualization, multi OS..? Who handles this interrupt? > > Signed-off-by: Magnus Damm > [Kuninori: updated patch to adjust DMACHCR/DMAOR] > Signed-off-by: Kuninori Morimoto > Tested-by: Nguyen Viet Dung > --- > v1 -> v2 > > - add [Kuninori: xxx] line on git log > - don't remove DT property > - tidyup rcar_dmac_isr_channel() > > .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + > drivers/dma/sh/rcar-dmac.c | 72 +++++++--------------- > 2 files changed, 23 insertions(+), 50 deletions(-) > > diff --git a/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt b/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt > index b1ba6395..b8e1c13 100644 > --- a/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt > +++ b/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt > @@ -38,6 +38,7 @@ Required Properties: > - interrupt-names: one entry for the error interrupt, named "error", plus one > entry per channel, named "ch%u", where %u is the channel number ranging from > zero to the number of channels minus one. > + # "error" interrupt will be ignored, so far > > - clock-names: "fck" for the functional clock > - clocks: a list of phandle + clock-specifier pairs, one for each entry > diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c > index 2a2ccd9..279c930 100644 > --- a/drivers/dma/sh/rcar-dmac.c > +++ b/drivers/dma/sh/rcar-dmac.c > @@ -431,7 +431,8 @@ static void rcar_dmac_chan_start_xfer(struct rcar_dmac_chan *chan) > chcr |= RCAR_DMACHCR_DPM_DISABLED | RCAR_DMACHCR_IE; > } > > - rcar_dmac_chan_write(chan, RCAR_DMACHCR, chcr | RCAR_DMACHCR_DE); > + rcar_dmac_chan_write(chan, RCAR_DMACHCR, > + chcr | RCAR_DMACHCR_DE | RCAR_DMACHCR_CAIE); > } > > static int rcar_dmac_init(struct rcar_dmac *dmac) > @@ -783,7 +784,8 @@ static void rcar_dmac_chan_halt(struct rcar_dmac_chan *chan) > u32 chcr = rcar_dmac_chan_read(chan, RCAR_DMACHCR); > > chcr &= ~(RCAR_DMACHCR_DSE | RCAR_DMACHCR_DSIE | RCAR_DMACHCR_IE | > - RCAR_DMACHCR_TE | RCAR_DMACHCR_DE); > + RCAR_DMACHCR_TE | RCAR_DMACHCR_DE | > + RCAR_DMACHCR_CAE | RCAR_DMACHCR_CAIE); > rcar_dmac_chan_write(chan, RCAR_DMACHCR, chcr); > rcar_dmac_chcr_de_barrier(chan); > } > @@ -812,12 +814,7 @@ static void rcar_dmac_chan_reinit(struct rcar_dmac_chan *chan) > } > } > > -static void rcar_dmac_stop(struct rcar_dmac *dmac) > -{ > - rcar_dmac_write(dmac, RCAR_DMAOR, 0); > -} > - > -static void rcar_dmac_abort(struct rcar_dmac *dmac) > +static void rcar_dmac_stop_all_chan(struct rcar_dmac *dmac) > { > unsigned int i; > > @@ -829,11 +826,10 @@ static void rcar_dmac_abort(struct rcar_dmac *dmac) > spin_lock(&chan->lock); > rcar_dmac_chan_halt(chan); > spin_unlock(&chan->lock); > - > - rcar_dmac_chan_reinit(chan); > } > } > > + > /* ----------------------------------------------------------------------------- > * Descriptors preparation > */ > @@ -1522,11 +1518,18 @@ static irqreturn_t rcar_dmac_isr_channel(int irq, void *dev) > u32 mask = RCAR_DMACHCR_DSE | RCAR_DMACHCR_TE; > struct rcar_dmac_chan *chan = dev; > irqreturn_t ret = IRQ_NONE; > + bool reinit = false; > u32 chcr; > > spin_lock(&chan->lock); > > chcr = rcar_dmac_chan_read(chan, RCAR_DMACHCR); > + if (chcr & RCAR_DMACHCR_CAE) { > + rcar_dmac_chan_halt(chan); > + reinit = true; > + goto spin_lock_end; > + } > + > if (chcr & RCAR_DMACHCR_TE) > mask |= RCAR_DMACHCR_DE; > rcar_dmac_chan_write(chan, RCAR_DMACHCR, chcr & ~mask); > @@ -1539,8 +1542,16 @@ static irqreturn_t rcar_dmac_isr_channel(int irq, void *dev) > if (chcr & RCAR_DMACHCR_TE) > ret |= rcar_dmac_isr_transfer_end(chan); > > +spin_lock_end: > spin_unlock(&chan->lock); > > + if (reinit) { > + dev_err(chan->chan.device->dev, "Channel Address Error\n"); > + > + rcar_dmac_chan_reinit(chan); > + ret = IRQ_HANDLED; > + } > + > return ret; > } > > @@ -1597,24 +1608,6 @@ static irqreturn_t rcar_dmac_isr_channel_thread(int irq, void *dev) > return IRQ_HANDLED; > } > > -static irqreturn_t rcar_dmac_isr_error(int irq, void *data) > -{ > - struct rcar_dmac *dmac = data; > - > - if (!(rcar_dmac_read(dmac, RCAR_DMAOR) & RCAR_DMAOR_AE)) > - return IRQ_NONE; > - > - /* > - * An unrecoverable error occurred on an unknown channel. Halt the DMAC, > - * abort transfers on all channels, and reinitialize the DMAC. > - */ > - rcar_dmac_stop(dmac); > - rcar_dmac_abort(dmac); > - rcar_dmac_init(dmac); > - > - return IRQ_HANDLED; > -} > - > /* ----------------------------------------------------------------------------- > * OF xlate and channel filter > */ > @@ -1784,8 +1777,6 @@ static int rcar_dmac_probe(struct platform_device *pdev) > struct rcar_dmac *dmac; > struct resource *mem; > unsigned int i; > - char *irqname; > - int irq; > int ret; > > dmac = devm_kzalloc(&pdev->dev, sizeof(*dmac), GFP_KERNEL); > @@ -1824,17 +1815,6 @@ static int rcar_dmac_probe(struct platform_device *pdev) > if (IS_ERR(dmac->iomem)) > return PTR_ERR(dmac->iomem); > > - irq = platform_get_irq_byname(pdev, "error"); > - if (irq < 0) { > - dev_err(&pdev->dev, "no error IRQ specified\n"); > - return -ENODEV; > - } > - > - irqname = devm_kasprintf(dmac->dev, GFP_KERNEL, "%s:error", > - dev_name(dmac->dev)); > - if (!irqname) > - return -ENOMEM; > - > /* Enable runtime PM and initialize the device. */ > pm_runtime_enable(&pdev->dev); > ret = pm_runtime_get_sync(&pdev->dev); > @@ -1885,14 +1865,6 @@ static int rcar_dmac_probe(struct platform_device *pdev) > goto error; > } > > - ret = devm_request_irq(&pdev->dev, irq, rcar_dmac_isr_error, 0, > - irqname, dmac); > - if (ret) { > - dev_err(&pdev->dev, "failed to request IRQ %u (%d)\n", > - irq, ret); > - return ret; > - } > - > /* Register the DMAC as a DMA provider for DT. */ > ret = of_dma_controller_register(pdev->dev.of_node, rcar_dmac_of_xlate, > NULL); > @@ -1932,7 +1904,7 @@ static void rcar_dmac_shutdown(struct platform_device *pdev) > { > struct rcar_dmac *dmac = platform_get_drvdata(pdev); > > - rcar_dmac_stop(dmac); > + rcar_dmac_stop_all_chan(dmac); > } > > static const struct of_device_id rcar_dmac_of_ids[] = { > -- > 1.9.1 -- ~Vinod