| Message ID | 1415383518-29327-3-git-send-email-tixy@linaro.org |
|---|---|
| State | Accepted |
| Commit | c27f95568d1ed2573fc9c8848d741da63ca9a34e |
| Headers | show
Return-Path: <patchwork-forward+bncBD42NLN4UAJRBDMV6SRAKGQEKQF6GRQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7BA8B218C0 for <linaro@patches.linaro.org>; Fri, 7 Nov 2014 18:08:14 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id x13sf2191543wgg.9 for <linaro@patches.linaro.org>; Fri, 07 Nov 2014 10:08:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=Bs2o8Q7reDrMB5bFgzg5iIZbHkrAK3kJHTzuzvHpx0w=; b=KoUCv7NGMJlgaFkRsfXhmaASNMWWK7WmLGswCpv3QVwpNSxb9dIjU/UBBPgsae0PyI aKT8CJJzoCBEoome1+1cFUWHVwguboU8/9Rdk/SCbQY/VzNQ3g5gRq4niWJ2KGpz+dIB wIi2Sh7zR2cvOU5rQh2eaTK3/h7YTn/0spnkoXPyBVb6wFgpmJtH8WjmG4ObjmiXP0XX dOnFD6EdoOKbXfMXKaJxU8KPMJ2qJwk6I1uUleNJjFlmrm/EfQvuUDs+C/A7uWYfgVQz ArSsAkpeeo4BC/Hvj6gDHzWFHS5OJw00V1Z1ttBxUyDVI4BaGGVxYvzwEd313RSElCzo XV3A== X-Gm-Message-State: ALoCoQl9ElfP6zkM6YMm7d8wS3sxfaHL/3sGq8t6IqV0gRt+G27Ve4hXb5XS4EZIfnb8ytrUtNvv X-Received: by 10.152.26.72 with SMTP id j8mr2234600lag.3.1415383693466; Fri, 07 Nov 2014 10:08:13 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.205 with SMTP id ba13ls247624lab.33.gmail; Fri, 07 Nov 2014 10:08:13 -0800 (PST) X-Received: by 10.112.125.33 with SMTP id mn1mr3576108lbb.99.1415383693118; Fri, 07 Nov 2014 10:08:13 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id u16si16012181laz.45.2014.11.07.10.08.13 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Nov 2014 10:08:13 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id q1so4918309lam.10 for <patchwork-forward@linaro.org>; Fri, 07 Nov 2014 10:08:13 -0800 (PST) X-Received: by 10.112.189.10 with SMTP id ge10mr12550943lbc.23.1415383692982; Fri, 07 Nov 2014 10:08:12 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp245725lbc; Fri, 7 Nov 2014 10:08:12 -0800 (PST) X-Received: by 10.66.129.142 with SMTP id nw14mr13815144pab.119.1415383691311; Fri, 07 Nov 2014 10:08:11 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id dr2si9808473pbc.2.2014.11.07.10.08.10 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Nov 2014 10:08:11 -0800 (PST) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xmnvv-0004XQ-2A; Fri, 07 Nov 2014 18:06:51 +0000 Received: from smarthost01a.mail.zen.net.uk ([212.23.1.1]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xmnvg-0004SJ-MY for linux-arm-kernel@lists.infradead.org; Fri, 07 Nov 2014 18:06:37 +0000 Received: from [82.69.122.217] (helo=plug1) by smarthost01a.mail.zen.net.uk with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from <tixy@yxit.co.uk>) id 1XmnvC-0000ZT-Me; Fri, 07 Nov 2014 18:06:06 +0000 Received: from linaro1 ([192.168.2.110] helo=linaro1.home) by plug1 with esmtp (Exim 4.80) (envelope-from <tixy@home>) id 1Xmnv9-0002Di-6p; Fri, 07 Nov 2014 18:06:03 +0000 Received: from tixy by linaro1.home with local (Exim 4.84) (envelope-from <tixy@home>) id 1Xmnv9-0007e0-4V; Fri, 07 Nov 2014 18:06:03 +0000 From: Jon Medhurst <tixy@linaro.org> To: Vinod Koul <vinod.koul@intel.com>, Dan Williams <dan.j.williams@intel.com>, dmaengine@vger.kernel.org Subject: [PATCH 2/2] dma: pl330: Limit MFIFO usage for memcpy to avoid exhausting entries Date: Fri, 7 Nov 2014 18:05:18 +0000 Message-Id: <1415383518-29327-3-git-send-email-tixy@linaro.org> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1415383518-29327-1-git-send-email-tixy@linaro.org> References: <1415383518-29327-1-git-send-email-tixy@linaro.org> X-Originating-smarthost01a-IP: [82.69.122.217] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141107_100636_897646_DBCDC196 X-CRM114-Status: UNSURE ( 8.52 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [212.23.1.1 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [212.23.1.1 listed in wl.mailspike.net] 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> MIME-Version: 1.0 Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: tixy@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit |
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 8f869ec..849439a 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2336,7 +2336,7 @@ static inline int get_burst_len(struct dma_pl330_desc *desc, size_t len) int burst_len; burst_len = pl330->pcfg.data_bus_width / 8; - burst_len *= pl330->pcfg.data_buf_dep; + burst_len *= pl330->pcfg.data_buf_dep / pl330->pcfg.num_chan; burst_len >>= desc->rqcfg.brst_size; /* src/dst_burst_len can't be more than 16 */
The MFIFO is shared by all channels so restrict each memcpy to it's fair share. This is being over cautious, but without a global view of DMA channel usage on a system it's not possible to come up with a more optimum safe limit. Signed-off-by: Jon Medhurst <tixy@linaro.org> --- drivers/dma/pl330.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)