From patchwork Fri Oct 12 14:57:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 148785 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp834537lji; Fri, 12 Oct 2018 07:58:51 -0700 (PDT) X-Google-Smtp-Source: ACcGV60P2+KSNEO5/8dA3T1MfTicY7D5zL4ari3b2a2xbthEAAT+ZkhtdfHFdfO02GcE1E0CSHaM X-Received: by 2002:a65:4385:: with SMTP id m5-v6mr5528299pgp.219.1539356331101; Fri, 12 Oct 2018 07:58:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539356331; cv=none; d=google.com; s=arc-20160816; b=T5GhKq5kWZEIqxGNX9ncNUwuS66oDdBESZ9FDsrN4HjYVvzIZoCvKt7WpguGGDWhMH nkoV4Jm1npYwMcMUZML/agVk2BXMD7jmr3Dily8ITpLX2s5ELDtGfRoYOgbqD93biYvA Ux1hqJhZZvlWp3Lh+AuO8EcLREi8T7YJ5Z6CA0a/6TIAxImolod6+ZrBarRYbGmlhRAe a1sDL5tcQ+dk0Q9F6Nb4R9nPsW69DBYdvPHObgmFFiSLRLHDU9fed+OtQRP29EsOjb70 HbfzPeREHDTfEM3m4DXri+2i/+Xp86tlkPuWTSEmnVlK1t76lTtxLKWtwb1Mw1c5zKM5 pK6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=mddxV7i40K2p+WcuchNOgFO0VNs4dZslkYzPME553/g=; b=gJfatDIHWxXxsqgq0J4oubAeLjQo2ZAwSnRHx607n3i+7CDEchVEFTWaxZMWMhIllI XQoSujmXVr3skpLOiBlNLDFrtgUZtCs8N+44ZnKJGvTHJ9dbXI5A2NFIaDDZAKR0khEF 2vvxu5cDHjkLnOOPV9MSmZXnua7ULypEvJM6FqxypCz8cjaTXzHC2JbghXpwu4+hlCF5 rxymUFyrDWmRsvzwPAmEwWQNnzfKreOJGYYFo2kE4Abp5NTqkIgdopmieX+CHElXHMYe +HdhEdqT+BI54XFla/K7EhGrPx+wSbwKdOmht0F8btlWtlx2bqTkHa1h0OP0yAHZXRzB KL6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=0AOSn2Mz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o5-v6si1469963pgm.222.2018.10.12.07.58.50; Fri, 12 Oct 2018 07:58:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=0AOSn2Mz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729062AbeJLWbj (ORCPT + 32 others); Fri, 12 Oct 2018 18:31:39 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:52724 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728720AbeJLWbi (ORCPT ); Fri, 12 Oct 2018 18:31:38 -0400 Received: from grover.tkatk1.zaq.ne.jp (zaqdadce369.zaq.ne.jp [218.220.227.105]) (authenticated) by conuserg-07.nifty.com with ESMTP id w9CEvjPB016823; Fri, 12 Oct 2018 23:57:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com w9CEvjPB016823 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1539356268; bh=mddxV7i40K2p+WcuchNOgFO0VNs4dZslkYzPME553/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0AOSn2MzD4asqNCffRzt1nQ899BrgC9wWwChcteE0U+W/5nFlHMWzT/0c9RZRfqrt 5Bzb6NAN0Lz4p+bmtZPISZ+DXKzaY/go8UGbbpB3AfJOotJnjyQW1GtorumArDUDO7 lbX108BqsS/3tEYHAC9ZLdmd+uU144QthekduJbbIHy1Ho1p4TFDuiAvy4PLBbjmMg 5DVMf8oUepMaLwxwr9im0syvMFTRuoCSABzDZlfzC8YW0q16Uxg2DXwWrMTqy2KEm+ pwfZ77SLvCiLVyoVv/oz+PIN0TbNvH6gBCucygV5vlXyuTWAEteEaRXBjku+/RQQMh 2jL8FABwfSqXA== X-Nifty-SrcIP: [218.220.227.105] From: Masahiro Yamada To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Wolfram Sang , Masahiro Yamada , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] mmc: uniphier-sd: avoid using broken DMA RX channel Date: Fri, 12 Oct 2018 23:57:38 +0900 Message-Id: <1539356258-12374-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539356258-12374-1-git-send-email-yamada.masahiro@socionext.com> References: <1539356258-12374-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org host->chan_rx is NULL when UNIPHIER_SD_CAP_BROKEN_DMA_RX quirk flag is set. In this case, it should not set up DMA. Signed-off-by: Masahiro Yamada --- drivers/mmc/host/uniphier-sd.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4 diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c index 10d49aa..1ee9fd0 100644 --- a/drivers/mmc/host/uniphier-sd.c +++ b/drivers/mmc/host/uniphier-sd.c @@ -251,6 +251,9 @@ static void uniphier_sd_internal_dma_start(struct tmio_mmc_host *host, u32 dma_mode; int sg_len; + if ((data->flags & MMC_DATA_READ) && !host->chan_rx) + goto force_pio; + if (WARN_ON(host->sg_len != 1)) goto force_pio;