From: arnd@arndb•de
To: Paul Mackerras <paulus@samba•org>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>
Cc: Mark Nelson <markn@au1•ibm.com>,
linuxppc-dev@ozlabs•org, cbe-oss-dev@ozlabs•org
Subject: [patch 10/11] powerpc: move device_to_mask() to dma-mapping.h
Date: Fri, 04 Jul 2008 21:05:45 +0200 [thread overview]
Message-ID: <20080704190806.831029912@arndb.de> (raw)
In-Reply-To: 20080704190535.316377278@arndb.de
Move device_to_mask() to dma-mapping.h because we need to use it from
outside dma_64.c in a later patch.
Signed-off-by: Mark Nelson <markn@au1•ibm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb•de>
---
arch/powerpc/kernel/dma_64.c | 9 ---------
include/asm-powerpc/dma-mapping.h | 9 +++++++++
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/kernel/dma_64.c b/arch/powerpc/kernel/dma_64.c
index 3ae0c35..ae5708e 100644
--- a/arch/powerpc/kernel/dma_64.c
+++ b/arch/powerpc/kernel/dma_64.c
@@ -15,15 +15,6 @@
* Generic iommu implementation
*/
-static inline unsigned long device_to_mask(struct device *dev)
-{
- if (dev->dma_mask && *dev->dma_mask)
- return *dev->dma_mask;
- /* Assume devices without mask can take 32 bit addresses */
- return 0xfffffffful;
-}
-
-
/* Allocates a contiguous real buffer and creates mappings over it.
* Returns the virtual address of the buffer and sets dma_handle
* to the dma address (mapping) of the first page.
diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h
index de13950..74c5497 100644
--- a/include/asm-powerpc/dma-mapping.h
+++ b/include/asm-powerpc/dma-mapping.h
@@ -45,6 +45,15 @@ extern void __dma_sync_page(struct page *page, unsigned long offset,
#endif /* ! CONFIG_NOT_COHERENT_CACHE */
#ifdef CONFIG_PPC64
+
+static inline unsigned long device_to_mask(struct device *dev)
+{
+ if (dev->dma_mask && *dev->dma_mask)
+ return *dev->dma_mask;
+ /* Assume devices without mask can take 32 bit addresses */
+ return 0xfffffffful;
+}
+
/*
* DMA operations are abstracted for G5 vs. i/pSeries, PCI vs. VIO
*/
--
1.5.4.3
--
next prev parent reply other threads:[~2008-07-04 19:05 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-04 19:05 [patch 00/11] Cell patches for 2.6.27 arnd
2008-07-04 19:05 ` [patch 01/11] powerpc/cell: add support for power button of future IBM cell blades arnd
2008-07-07 5:12 ` Benjamin Herrenschmidt
2008-07-07 9:23 ` Christian Krafft
[not found] ` <20080707184756.16e52677@linux.ibm.com>
2008-07-07 16:54 ` [Cbe-oss-dev] [patch 01/02] powerpc/cell: cleanup sysreset_hack for " Christian Krafft
2008-07-07 16:56 ` [Cbe-oss-dev] [patch 02/02] powerpc/cell: add support for power button of future " Christian Krafft
2008-07-09 3:35 ` Benjamin Herrenschmidt
2008-07-09 13:15 ` Arnd Bergmann
2008-07-09 20:45 ` Benjamin Herrenschmidt
2008-07-10 14:34 ` Arnd Bergmann
2008-07-07 5:24 ` [patch 01/11] " Stephen Rothwell
2008-07-07 8:40 ` [Cbe-oss-dev] " Arnd Bergmann
2008-07-04 19:05 ` [patch 02/11] powerpc/axonram: use only one block device major number arnd
2008-07-04 19:05 ` [patch 03/11] powerpc/axonram: enable partitioning of the Axons DDR2 DIMMs arnd
2008-07-04 19:05 ` [patch 04/11] powerpc/spufs: add atomic busy_spus counter to struct cbe_spu_info arnd
2008-07-07 5:19 ` Benjamin Herrenschmidt
2008-07-07 5:30 ` Stephen Rothwell
2008-07-07 8:50 ` [Cbe-oss-dev] " Arnd Bergmann
2008-07-04 19:05 ` [patch 05/11] powerpc/cell: add spu aware cpufreq governor arnd
2008-07-07 5:21 ` Benjamin Herrenschmidt
2008-07-07 5:32 ` Stephen Rothwell
2008-07-07 9:01 ` [Cbe-oss-dev] " Arnd Bergmann
2008-07-07 6:24 ` Stephen Rothwell
2008-07-07 8:58 ` [Cbe-oss-dev] " Arnd Bergmann
2008-07-07 14:59 ` Arnd Bergmann
2008-07-07 15:35 ` Josh Boyer
2008-07-07 21:15 ` Arnd Bergmann
2008-07-07 21:17 ` Josh Boyer
2008-07-08 2:40 ` Stephen Rothwell
2008-07-07 19:56 ` Geoff Levand
2008-07-04 19:05 ` [patch 06/11] powerpc: Add struct iommu_table argument to iommu_map_sg() arnd
2008-07-04 19:05 ` [patch 07/11] powerpc/dma: implement new dma_*map*_attrs() interfaces arnd
2008-07-07 5:27 ` Benjamin Herrenschmidt
2008-07-07 19:15 ` Geoff Levand
2008-07-04 19:05 ` [patch 08/11] powerpc/dma: use the struct dma_attrs in iommu code arnd
2008-07-04 19:05 ` [patch 09/11] powerpc/cell: cell_dma_dev_setup_iommu() return the iommu table arnd
2008-07-04 19:05 ` arnd [this message]
2008-07-04 19:05 ` [patch 11/11] powerpc/cell: Add DMA_ATTR_STRONG_ORDERING dma attribute and use in IOMMU code arnd
2008-07-05 5:43 ` [Cbe-oss-dev] " Michael Ellerman
2008-07-05 6:28 ` Benjamin Herrenschmidt
2008-07-05 21:51 ` Arnd Bergmann
2008-07-05 22:20 ` Benjamin Herrenschmidt
2008-07-06 15:15 ` Arnd Bergmann
2008-07-07 0:00 ` Michael Ellerman
2008-07-07 9:01 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080704190806.831029912@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=benh@kernel$(echo .)crashing.org \
--cc=cbe-oss-dev@ozlabs$(echo .)org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=markn@au1$(echo .)ibm.com \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox