Commit 34900429 authored Mar 10, 2010 by FUJITA Tomonori Committed by Linus Torvalds Mar 12, 2010

dma-mapping: sparc: unify 32bit and 64bit dma_set_mask



This patchset transforms the PCI DMA API into the generic device model.
It's one of the reasons why we introduced the generic DMA API long ago;
driver writers are always able to use the generic DMA API with any bus
instead of using bus specific DMA APIs such as pci_map_single,
sbus_map_single, etc (only two bus specific APIs exist now; pci and ssb).

Some of the PCI DMA API are already implented on the top of the generic
DMA API (include/asm-generic/pci-dma-compat.h).  But there are some
exceptions.  This patchset finishes the transformation.

This patch:

sparc has two dma_set_mask implementations for 32bit and 64bit.  They are
same except for the error returned value.  We can safely unify them since
the error returned value doesn't matter as long as it is negative (as
DMA-API.txt describes).

This patch also changes dma_set_mask not to call
pci_set_dma_mask. Instead, dma_set_mask does the same thing that
pci_set_dma_mask does. This change enables ut to change
pci_set_dma_mask to call dma_set_mask; we can implement
pci_set_dma_mask as pci-dma-compat.h does.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: David Miller <davem@davemloft.net>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: James Bottomley <James.Bottomley@suse.de>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Greg KH <greg@kroah.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 06db881b

arch/sparc/include/asm/dma-mapping.h

+13 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@
		#define DMA_ERROR_CODE (~(dma_addr_t)0x0)

		extern int dma_supported(struct device *dev, u64 mask);
		extern int dma_set_mask(struct device *dev, u64 dma_mask);

		#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
		#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
		@@ -62,4 +61,17 @@ static inline int dma_get_cache_alignment(void)
		return (1 << INTERNODE_CACHE_SHIFT);
		}

		static inline int dma_set_mask(struct device *dev, u64 mask)
		{
		#ifdef CONFIG_PCI
		if (dev->bus == &pci_bus_type) {
		if (!dev->dma_mask \|\| !dma_supported(dev, mask))
		return -EINVAL;
		*dev->dma_mask = mask;
		return 0;
		}
		#endif
		return -EINVAL;
		}

		#endif

arch/sparc/kernel/iommu.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -862,13 +862,3 @@ int dma_supported(struct device *dev, u64 device_mask)
		return 0;
		}
		EXPORT_SYMBOL(dma_supported);

		int dma_set_mask(struct device *dev, u64 dma_mask)
		{
		#ifdef CONFIG_PCI
		if (dev->bus == &pci_bus_type)
		return pci_set_dma_mask(to_pci_dev(dev), dma_mask);
		#endif
		return -EINVAL;
		}
		EXPORT_SYMBOL(dma_set_mask);

arch/sparc/kernel/ioport.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -676,17 +676,6 @@ int dma_supported(struct device *dev, u64 mask)
		}
		EXPORT_SYMBOL(dma_supported);

		int dma_set_mask(struct device *dev, u64 dma_mask)
		{
		#ifdef CONFIG_PCI
		if (dev->bus == &pci_bus_type)
		return pci_set_dma_mask(to_pci_dev(dev), dma_mask);
		#endif
		return -EOPNOTSUPP;
		}
		EXPORT_SYMBOL(dma_set_mask);


		#ifdef CONFIG_PROC_FS

		static int sparc_io_proc_show(struct seq_file m, void v)

Admin message