From patchwork Tue Oct 3 22:38:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 821052 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mhUqhwtX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y6DTt2Plnz9t2Z for ; Wed, 4 Oct 2017 09:38:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751199AbdJCWi5 (ORCPT ); Tue, 3 Oct 2017 18:38:57 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:37288 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750865AbdJCWi4 (ORCPT ); Tue, 3 Oct 2017 18:38:56 -0400 Received: by mail-wr0-f193.google.com with SMTP id v38so3875296wrc.4; Tue, 03 Oct 2017 15:38:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=dpczuOKsMOctL7VWLKtA3abT/z11URWHZFOst6eNQ6A=; b=mhUqhwtXK0YrEiFoGMyUz9rzcHxPPGO7S2fb9PJJxqQef7HWpnbBTeg1KlvyAMKxj5 AZtxd0WuJW98K0zRUnFXiVs6NTqL2Eu359zXbmUXi90o3gUe7NLTYZdSBd+Oez9owajJ YhZpbUoPQMbSQKHaUk5buy1SyknXTB5yu+RF6QnCOKvN5J+KIt++heecAT43BLvoKwDn DRh17DTpzy03ZwGXExmBKcXgzspkDwPZ7jwto76V6YAhg4G7mDmVjHJud9VwWe8fDnlW p2YQZdq3ROuimpyLy7nHAhvsUwlaS2oFAh9cqccsbTG/0jqAyXTo1RRYwHnV7Rd3Qz6B MuRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=dpczuOKsMOctL7VWLKtA3abT/z11URWHZFOst6eNQ6A=; b=nyYdSYQNzJYi2qbfa0vC79vzJeTfYoJEfJ8RF7E6UGJNTutlgXDFDP81Ur/K0tYF7o lfGiLCIYH4egDEKZ9lC1auH6AkwaNiibvRVFeeq5xVRq5RU+/GlbfztNdtceYm+MMKVY HoBAvsEkaKdGkLo0dHQorF3V57UjNhN5NwTi+HycW6uKm4OnjHuPrDniTFW1cLt5VOKG +umb4K/BmFqM3mx+34MQPYkMktpW4R1XJpFheLYJQn9Rwm5gf/ZAVhfEcPOWCDI3nCVE thpvmNGB/AItQEvRwdSgUN9N4cHp6wYgnYI3SbrlY6Kl4YsYSeg1r8s4Sw3AprKc2iHq 1mwQ== X-Gm-Message-State: AMCzsaWQ6//b50Sf1xnrn21LPjmqDaPpWEXFS/QqyUO4qW9fBlhOXymN HOIp9bFPt97Z3a1aIa0kQ1c= X-Google-Smtp-Source: AOwi7QDnSzeoOXOQG9rn8W2BySA4g4bScwCUw4tQQLlAJJcerTK6AqWNS6+PYOhWtshyvQNn9KW4wg== X-Received: by 10.223.169.239 with SMTP id b102mr2563911wrd.171.1507070335224; Tue, 03 Oct 2017 15:38:55 -0700 (PDT) Received: from localhost.localdomain (ppp109-252-55-163.pppoe.spdop.ru. [109.252.55.163]) by smtp.gmail.com with ESMTPSA id f11sm11666021wra.79.2017.10.03.15.38.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Oct 2017 15:38:54 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Vinod Koul , Laxman Dewangan Cc: dmaengine@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH] dmaengine: tegra-apb: Support non-flow controlled slave configuration Date: Wed, 4 Oct 2017 01:38:38 +0300 Message-Id: <20171003223838.31834-1-digetx@gmail.com> X-Mailer: git-send-email 2.14.1 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org This allows DMA client to issue a non-flow controlled TX. In particular it is needed for the fuse driver that reads fuse registers using APBDMA to workaround a HW bug that results in hang when CPU and DMA perform simultaneous access to fuse peripheral. Signed-off-by: Dmitry Osipenko Reviewed-by: Jon Hunter --- drivers/dma/tegra20-apb-dma.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c index b9d75a54c896..a177039713a7 100644 --- a/drivers/dma/tegra20-apb-dma.c +++ b/drivers/dma/tegra20-apb-dma.c @@ -353,7 +353,8 @@ static int tegra_dma_slave_config(struct dma_chan *dc, } memcpy(&tdc->dma_sconfig, sconfig, sizeof(*sconfig)); - if (tdc->slave_id == TEGRA_APBDMA_SLAVE_ID_INVALID) { + if (tdc->slave_id == TEGRA_APBDMA_SLAVE_ID_INVALID && + sconfig->device_fc) { if (sconfig->slave_id > TEGRA_APBDMA_CSR_REQ_SEL_MASK) return -EINVAL; tdc->slave_id = sconfig->slave_id; @@ -970,8 +971,13 @@ static struct dma_async_tx_descriptor *tegra_dma_prep_slave_sg( TEGRA_APBDMA_AHBSEQ_WRAP_SHIFT; ahb_seq |= TEGRA_APBDMA_AHBSEQ_BUS_WIDTH_32; - csr |= TEGRA_APBDMA_CSR_ONCE | TEGRA_APBDMA_CSR_FLOW; - csr |= tdc->slave_id << TEGRA_APBDMA_CSR_REQ_SEL_SHIFT; + csr |= TEGRA_APBDMA_CSR_ONCE ; + + if (tdc->slave_id != TEGRA_APBDMA_SLAVE_ID_INVALID) { + csr |= TEGRA_APBDMA_CSR_FLOW; + csr |= tdc->slave_id << TEGRA_APBDMA_CSR_REQ_SEL_SHIFT; + } + if (flags & DMA_PREP_INTERRUPT) csr |= TEGRA_APBDMA_CSR_IE_EOC; @@ -1110,10 +1116,13 @@ static struct dma_async_tx_descriptor *tegra_dma_prep_dma_cyclic( TEGRA_APBDMA_AHBSEQ_WRAP_SHIFT; ahb_seq |= TEGRA_APBDMA_AHBSEQ_BUS_WIDTH_32; - csr |= TEGRA_APBDMA_CSR_FLOW; + if (tdc->slave_id != TEGRA_APBDMA_SLAVE_ID_INVALID) { + csr |= TEGRA_APBDMA_CSR_FLOW; + csr |= tdc->slave_id << TEGRA_APBDMA_CSR_REQ_SEL_SHIFT; + } + if (flags & DMA_PREP_INTERRUPT) csr |= TEGRA_APBDMA_CSR_IE_EOC; - csr |= tdc->slave_id << TEGRA_APBDMA_CSR_REQ_SEL_SHIFT; apb_seq |= TEGRA_APBDMA_APBSEQ_WRAP_WORD_1;