From patchwork Thu Jun 16 12:30:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 887192 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5GCMfBW010447 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 16 Jun 2011 12:23:02 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QXBag-0004B3-Gf; Thu, 16 Jun 2011 12:22:30 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QXBag-00079q-3q; Thu, 16 Jun 2011 12:22:30 +0000 Received: from mail-pw0-f49.google.com ([209.85.160.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QXBab-00079V-Mm for linux-arm-kernel@lists.infradead.org; Thu, 16 Jun 2011 12:22:27 +0000 Received: by pwi8 with SMTP id 8so672207pwi.36 for ; Thu, 16 Jun 2011 05:22:21 -0700 (PDT) Received: by 10.68.40.9 with SMTP id t9mr359663pbk.387.1308226941212; Thu, 16 Jun 2011 05:22:21 -0700 (PDT) Received: from localhost.localdomain ([117.83.51.212]) by mx.google.com with ESMTPS id y2sm880856pbi.67.2011.06.16.05.21.59 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 16 Jun 2011 05:22:20 -0700 (PDT) From: Shawn Guo To: linux-kernel@vger.kernel.org Subject: [PATCH v3 RESEND] dma-mapping: add new API for max_segment_number Date: Thu, 16 Jun 2011 20:30:53 +0800 Message-Id: <1308227453-2034-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: References: X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110616_082226_227732_60095E5D X-CRM114-Status: GOOD ( 18.91 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.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 [209.85.160.49 listed in list.dnswl.org] Cc: Shawn Guo , Russell King - ARM Linux , linux-scsi@vger.kernel.org, vinod.koul@intel.com, gregkh@suse.de, linux-mmc@vger.kernel.org, FUJITA Tomonori , Per Forlin , Dan Williams , cjb@laptop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 16 Jun 2011 12:23:02 +0000 (UTC) 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 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 --- Reasons for resend: * Cc linux-scsi for comment, per request from FUJITA Tomonori * Take suggestion from Per Forlin to change patch subject to dma-mapping 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 ?