From patchwork Wed Jun 15 12:08:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 1922 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7F15023DE6 for ; Wed, 15 Jun 2011 12:03:18 +0000 (UTC) Received: from mail-vw0-f52.google.com (mail-vw0-f52.google.com [209.85.212.52]) by fiordland.canonical.com (Postfix) with ESMTP id 2EC2EA184A9 for ; Wed, 15 Jun 2011 12:03:18 +0000 (UTC) Received: by vws16 with SMTP id 16so292312vws.11 for ; Wed, 15 Jun 2011 05:03:17 -0700 (PDT) Received: by 10.52.75.4 with SMTP id y4mr620897vdv.167.1308139397498; Wed, 15 Jun 2011 05:03:17 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.52.183.130 with SMTP id em2cs120848vdc; Wed, 15 Jun 2011 05:03:17 -0700 (PDT) Received: by 10.52.98.97 with SMTP id eh1mr664195vdb.7.1308139395078; Wed, 15 Jun 2011 05:03:15 -0700 (PDT) Received: from CH1EHSOBE017.bigfish.com (ch1ehsobe002.messaging.microsoft.com [216.32.181.182]) by mx.google.com with ESMTPS id n18si311705vcz.68.2011.06.15.05.03.13 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Jun 2011 05:03:14 -0700 (PDT) Received-SPF: neutral (google.com: 216.32.181.182 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=216.32.181.182; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.181.182 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: from mail206-ch1-R.bigfish.com (216.32.181.174) by CH1EHSOBE017.bigfish.com (10.43.70.67) with Microsoft SMTP Server id 14.1.225.22; Wed, 15 Jun 2011 12:03:13 +0000 Received: from mail206-ch1 (localhost.localdomain [127.0.0.1]) by mail206-ch1-R.bigfish.com (Postfix) with ESMTP id 0C4A68D80F2; Wed, 15 Jun 2011 12:03:13 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail206-ch1 (localhost.localdomain [127.0.0.1]) by mail206-ch1 (MessageSwitch) id 1308139392417551_20329; Wed, 15 Jun 2011 12:03:12 +0000 (UTC) Received: from CH1EHSMHS033.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.247]) by mail206-ch1.bigfish.com (Postfix) with ESMTP id 5F3A9818058; Wed, 15 Jun 2011 12:03:12 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS033.bigfish.com (10.43.70.33) with Microsoft SMTP Server (TLS) id 14.1.225.22; Wed, 15 Jun 2011 12:03:12 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.289.8; Wed, 15 Jun 2011 07:03:11 -0500 Received: from S2100-06.ap.freescale.net (S2100-06.ap.freescale.net [10.192.242.125]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p5FC36sk010606; Wed, 15 Jun 2011 07:03:07 -0500 (CDT) From: Shawn Guo To: CC: Dan Williams , , Russell King - ARM Linux , FUJITA Tomonori , , , , , , Shawn Guo Subject: [PATCH v3] dmaengine: add new dma API for max_segment_number Date: Wed, 15 Jun 2011 20:08:41 +0800 Message-ID: <1308139721-4008-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: References: MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com Like dma_set(get)_max_seg_size for max_segment_size, the patch adds max_segment_number into device_dma_parameters and creates the corresponding dmaengine API dma_set(get)_max_seg_number for it. Here is the user story that tells the need of the new api. The mxs-mmc is the mmc host controller for Freescale MXS architecture. There are a pair of mmc host specific parameters max_seg_size and max_segs that mxs-mmc host driver needs to tell mmc core, so that mmc core can know how big each data segment could be and how many segments could be handled one time in a scatter list by host driver. The mxs-mmc driver is one user of dmaengine mxs-dma, and it will call mxs-dma to transfer data in scatter list. That is to say mxs-mmc has no idea of what max_seg_size and max_segs should be, because they are all mxs-dma capability parameters, and mxs-mmc needs to query them from mxs-dma. Right now, there is well defined dma api (dma_get_max_seg_size) for mmc to query max_seg_size from dma driver, but the one for max_segs is missing. That's why mxs-mmc driver has to hard-code it. The mxs-mmc is just one example to demonstrate the need of the new api, and there are other mmc host drivers (mxcmmc on imx-dma is another example) and possibly even other dmaengine users need this new api to know the maximum segments that dma driver can handle per dma call. Signed-off-by: Shawn Guo --- include/linux/device.h | 16 ++++++++++++---- include/linux/dma-mapping.h | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/include/linux/device.h b/include/linux/device.h index c66111a..f1152c5 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -481,12 +481,20 @@ extern int devres_release_group(struct device *dev, void *id); extern void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp); extern void devm_kfree(struct device *dev, void *p); +/* + * device_dma_parameters is a property of DMA provider, and it belongs to the + * 'struct device' that actually provides DMA service, typically the drivers + * under drivers/dma, although in some cases the DMA provider and block device + * uses DMA service happen to be the same 'struct device'. + * + * It's not necessary for every single DMA providers to have this structure, + * because some DMA providers simply do not have these parameters/limitations. + * For those do have, the DMA providers should be responsible for setting the + * parameters up. + */ struct device_dma_parameters { - /* - * a low level driver may set these to teach IOMMU code about - * sg limitations. - */ unsigned int max_segment_size; + unsigned int max_segment_number; unsigned long segment_boundary_mask; }; diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index ba8319a..fd314f4 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -131,6 +131,21 @@ static inline unsigned int dma_set_max_seg_size(struct device *dev, return -EIO; } +static inline unsigned int dma_get_max_seg_number(struct device *dev) +{ + return dev->dma_parms ? dev->dma_parms->max_segment_number : 1; +} + +static inline unsigned int dma_set_max_seg_number(struct device *dev, + unsigned int number) +{ + if (dev->dma_parms) { + dev->dma_parms->max_segment_number = number; + return 0; + } else + return -EIO; +} + static inline unsigned long dma_get_seg_boundary(struct device *dev) { return dev->dma_parms ?