From patchwork Thu Apr 29 17:35:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkatraman S X-Patchwork-Id: 95956 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3UIFCY2024833 for ; Fri, 30 Apr 2010 18:15:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933452Ab0D3SMm (ORCPT ); Fri, 30 Apr 2010 14:12:42 -0400 Received: from mail-iw0-f182.google.com ([209.85.223.182]:55735 "EHLO mail-iw0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933876Ab0D3SMj (ORCPT ); Fri, 30 Apr 2010 14:12:39 -0400 Received: by mail-iw0-f182.google.com with SMTP id 12so556036iwn.15 for ; Fri, 30 Apr 2010 11:12:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=9cXZx4qT5VFzCTvN6t3ockEEFQVtdRAkYv1YihBS7UA=; b=a3SC0HaVEVJE1qaTYU5h6DDh+1LHgYYtx7ayRyXgmQKooRIfuuJChJZTSJAnmSj8iX JD0n5Zsaocd731J47kgnVNJJDAs3WEzi4XrzMlAzKDcIz6TgdGQkphXI/q758g/emBNL 4tothHX05pEcrsOLs5fyLIxeftJUlPtaOUDb8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type; b=Gk0rCl51bGcTqN2gsy6inHg1LWXtXdBumUH3uNfnAoWwGo+TidWHjUnzciW7kbCfN2 OKNj0+A5N5vnmU9ZYmBD7PjV/eRZhmMijJHOGzpJlP8nCpjLM/vppOCW5IuF0ylMdOr0 /Xk1P3CmJFExm/NDtmBvdBOXeKT3Zgov5YOFA= MIME-Version: 1.0 Received: by 10.231.168.207 with SMTP id v15mr2058708iby.34.1272562526322; Thu, 29 Apr 2010 10:35:26 -0700 (PDT) Received: by 10.231.148.201 with HTTP; Thu, 29 Apr 2010 10:35:26 -0700 (PDT) Date: Thu, 29 Apr 2010 23:05:26 +0530 X-Google-Sender-Auth: fb5aa7091d75634d Message-ID: Subject: [PATCH v8 2/2] omap hsmmc: adaptation of sdma descriptor autoloading feature From: Venkatraman S To: linux-omap@vger.kernel.org, linux-mmc@vger.kernel.org, linux-arm-kernel@lists.arm.linux.org.uk Cc: Madhusudhan Chikkature , Adrian Hunter , "Kadiyala, Kishore" , Santosh Shilimkar , Tony Lindgren Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 30 Apr 2010 18:15:20 +0000 (UTC) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 65093d4..095fd94 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -102,6 +102,8 @@ #define SRD (1 << 26) #define SOFTRESET (1 << 1) #define RESETDONE (1 << 0) +/* End of superblock indicator for sglist transfers */ +#define DMA_ICR_SGLIST_END 0x4D00 /* * FIXME: Most likely all the data using these _DEVID defines should come @@ -118,6 +120,12 @@ #define OMAP_MMC_MASTER_CLOCK 96000000 #define DRIVER_NAME "mmci-omap-hs" +#define DMA_TYPE_NODMA 0 +#define DMA_TYPE_SDMA 1 +#define DMA_TYPE_SDMA_DLOAD 2 + +#define DMA_CTRL_BUF_SIZE (PAGE_SIZE * 3) + /* Timeouts for entering power saving states on inactivity, msec */ #define OMAP_MMC_DISABLED_TIMEOUT 100 #define OMAP_MMC_SLEEP_TIMEOUT 1000 @@ -170,7 +178,11 @@ struct omap_hsmmc_host { u32 bytesleft; int suspended; int irq; - int use_dma, dma_ch; + int dma_caps; + int dma_in_use; + int dma_ch; + void *dma_ctrl_buf; + dma_addr_t dma_ctrl_buf_phy; int dma_line_tx, dma_line_rx; int slot_id; int got_dbclk; @@ -527,7 +539,7 @@ static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host) { unsigned int irq_mask; - if (host->use_dma) + if (host->dma_in_use) irq_mask = INT_EN_MASK & ~(BRR_ENABLE | BWR_ENABLE); else