From patchwork Fri Jun 16 10:03:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 9791021 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0644E60325 for ; Fri, 16 Jun 2017 10:03:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFBA528618 for ; Fri, 16 Jun 2017 10:03:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4AFF2861E; Fri, 16 Jun 2017 10:03:28 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 9B0D928618 for ; Fri, 16 Jun 2017 10:03:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753458AbdFPKD0 (ORCPT ); Fri, 16 Jun 2017 06:03:26 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:46116 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753243AbdFPKDX (ORCPT ); Fri, 16 Jun 2017 06:03:23 -0400 Received: from penelope.horms.nl (unknown [217.111.208.18]) by kirsty.vergenet.net (Postfix) with ESMTPA id D87D025B7AB; Fri, 16 Jun 2017 20:03:20 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1497607401; bh=C79EoDW1Hd6W3+XMPWQ3PsnnM/oLkrkHuW57g9pxrbM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Z/E0G9BSLmJSISazL8oYD45qG1MPhrsDw5QOGFgyU9gwFxEaSIps7BOP/f37sTe5c R7G/IKnw15pqugOc18M8PZpZJWTMoDnaYnGDWlU3fl9e660Uy4phGyAmNLmQUS/nRN RSJ6DyTFzXFSaO36iXb7AgnFpBES9TBddDMoyXoc= Received: by penelope.horms.nl (Postfix, from userid 7100) id 4E8CAE230B6; Fri, 16 Jun 2017 12:03:15 +0200 (CEST) Date: Fri, 16 Jun 2017 12:03:15 +0200 From: Simon Horman To: Geert Uytterhoeven Cc: Wolfram Sang , Ulf Hansson , Magnus Damm , Linux MMC List , Linux-Renesas Subject: Re: [PATCH/RFC 2/5] mmc: tmio: add complete to DMA ops Message-ID: <20170616100314.GD6032@verge.net.au> References: <1496927368-18897-1-git-send-email-horms+renesas@verge.net.au> <1496927368-18897-4-git-send-email-horms+renesas@verge.net.au> <20170616060602.GA16534@verge.net.au> <20170616070432.GC16534@verge.net.au> <20170616071354.GE16534@verge.net.au> <20170616073330.GG22158@verge.net.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170616073330.GG22158@verge.net.au> Organisation: Horms Solutions BV User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Fri, Jun 16, 2017 at 09:33:31AM +0200, Simon Horman wrote: > On Fri, Jun 16, 2017 at 09:23:15AM +0200, Geert Uytterhoeven wrote: > > Hi Simon, > > > > On Fri, Jun 16, 2017 at 9:13 AM, Simon Horman wrote: > > > Sorry for letting this bug creep in to renesas-drivers. > > > Do you want a patch against your tree? I will plan to post v2 of > > > this patchset soon in any case. > > > > You can post such a patch to please users of renesas-drivers, but I won't > > apply it now. I assume the issue will be fixed when next renesas-drivers > > release is created ;-) > > That is my assumption too :) Revised patches posted as "[PATCH mmc/next v2 0/4] mmc: renesas_sdhi: add support for R-Car Gen3 SDHI DMAC" Pushed to topic/sdhi-gen3-dma-2017-v2 in my renesas tree. Do you need a fresh pull request? > I'll see about providing a fix patch too. Fix is: From: Simon Horman Subject: [PATCH] mmc: renesas-sdhi: implement complete to DMA op Implement complete DMA op to resolve regression introduced by the introduction of that DMA op. This resolves a panic when initialising SDHI on non Gen3 platforms which use DMA with SDHI. This is planned to be squashed into "mmc: tmio, renesas-sdhi: add complete to DMA ops" for submission to upstream. Fixes: f6bcd9f5e392 ("mmc: tmio: add complete to DMA ops") Signed-off-by: Simon Horman --- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c index 90f8d11c4868..2897ee0b444a 100644 --- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c @@ -106,6 +106,11 @@ static void renesas_sdhi_sys_dmac_abort_dma(struct tmio_mmc_host *host) renesas_sdhi_sys_dmac_enable_dma(host, true); } +static void renesas_sdhi_sys_dmac_complete_dma(struct tmio_mmc_host *host) +{ + complete(&host->dma_dataend); +} + static void renesas_sdhi_sys_dmac_dma_callback(void *arg) { struct tmio_mmc_host *host = arg; @@ -427,6 +432,7 @@ static const struct tmio_mmc_dma_ops renesas_sdhi_sys_dmac_dma_ops = { .request = renesas_sdhi_sys_dmac_request_dma, .release = renesas_sdhi_sys_dmac_release_dma, .abort = renesas_sdhi_sys_dmac_abort_dma, + .complete = renesas_sdhi_sys_dmac_complete_dma, }; static int renesas_sdhi_sys_dmac_probe(struct platform_device *pdev)