Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762392AbYFZNZn (ORCPT ); Thu, 26 Jun 2008 09:25:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755837AbYFZNYC (ORCPT ); Thu, 26 Jun 2008 09:24:02 -0400 Received: from smtpeu1.atmel.com ([195.65.72.27]:59179 "EHLO bagnes.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760342AbYFZNXz (ORCPT ); Thu, 26 Jun 2008 09:23:55 -0400 From: Haavard Skinnemoen To: Dan Williams , Pierre Ossman Cc: linux-kernel@vger.kernel.org, linux-embedded@vger.kernel.org, kernel@avr32linux.org, shannon.nelson@intel.com, David Brownell , Haavard Skinnemoen Subject: [PATCH v4 2/6] dmaengine: Add dma_chan_is_in_use() function Date: Thu, 26 Jun 2008 15:23:19 +0200 Message-Id: <1214486603-23655-3-git-send-email-haavard.skinnemoen@atmel.com> X-Mailer: git-send-email 1.5.5.4 In-Reply-To: <1214486603-23655-2-git-send-email-haavard.skinnemoen@atmel.com> References: <1214486603-23655-1-git-send-email-haavard.skinnemoen@atmel.com> <1214486603-23655-2-git-send-email-haavard.skinnemoen@atmel.com> X-OriginalArrivalTime: 26 Jun 2008 13:23:06.0681 (UTC) FILETIME=[C5148290:01C8D78F] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2409 Lines: 75 This moves the code checking if a DMA channel is in use from show_in_use() into an inline helper function, dma_is_in_use(). DMA controllers can use this in order to give clients exclusive access to channels (usually necessary when setting up slave DMA.) I have to admit that I don't really understand the channel refcounting logic at all... dma_chan_get() simply increments a per-cpu value. How can we be sure that whatever CPU calls dma_chan_is_in_use() sees the same value? Signed-off-by: Haavard Skinnemoen --- drivers/dma/dmaengine.c | 12 +----------- include/linux/dmaengine.h | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index a57c337..ad8d811 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -105,17 +105,7 @@ static ssize_t show_bytes_transferred(struct device *dev, struct device_attribut static ssize_t show_in_use(struct device *dev, struct device_attribute *attr, char *buf) { struct dma_chan *chan = to_dma_chan(dev); - int in_use = 0; - - if (unlikely(chan->slow_ref) && - atomic_read(&chan->refcount.refcount) > 1) - in_use = 1; - else { - if (local_read(&(per_cpu_ptr(chan->local, - get_cpu())->refcount)) > 0) - in_use = 1; - put_cpu(); - } + int in_use = dma_chan_is_in_use(chan); return sprintf(buf, "%d\n", in_use); } diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index cffb95f..4b602d3 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -180,6 +180,23 @@ static inline void dma_chan_put(struct dma_chan *chan) } } +static inline bool dma_chan_is_in_use(struct dma_chan *chan) +{ + bool in_use = false; + + if (unlikely(chan->slow_ref) && + atomic_read(&chan->refcount.refcount) > 1) + in_use = true; + else { + if (local_read(&(per_cpu_ptr(chan->local, + get_cpu())->refcount)) > 0) + in_use = true; + put_cpu(); + } + + return in_use; +} + /* * typedef dma_event_callback - function pointer to a DMA event callback * For each channel added to the system this routine is called for each client. -- 1.5.5.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/