From: Huacai Chen <chenhuacai@gmail.com>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org, Fuxin Zhang <zhangfx@lemote.com>,
Zhangjin Wu <wuzhangjin@gmail.com>,
Huacai Chen <chenhc@lemote.com>, Hongliang Tao <taohl@lemote.com>,
Hua Yan <yanh@lemote.com>
Subject: [PATCH 08/14] MIPS: Loongson: Add swiotlb to support big memory (>4GB).
Date: Fri, 15 Jun 2012 16:09:55 +0800 [thread overview]
Message-ID: <1339747801-28691-9-git-send-email-chenhc@lemote.com> (raw)
In-Reply-To: <1339747801-28691-1-git-send-email-chenhc@lemote.com>
This is probably a workaround because Loongson doesn't support DMA
address above 4GB. If memory is more than 4GB, CONFIG_SWIOTLB and
ZONE_DMA32 should be selected. In this way, DMA pages are allocated
below 4GB.
However, CONFIG_SWIOTLB+ZONE_DMA32 is not enough, so, in the following
patches, drivers of block device, graphics card, sound card, etc. will
all be set a DMA32 flags explitly.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
.../mips/include/asm/mach-loongson/dma-coherence.h | 25 +++-
arch/mips/loongson/Kconfig | 18 +++
arch/mips/loongson/common/Makefile | 5 +
arch/mips/loongson/common/dma-swiotlb.c | 147 ++++++++++++++++++++
arch/mips/mm/dma-default.c | 13 ++-
5 files changed, 203 insertions(+), 5 deletions(-)
create mode 100644 arch/mips/loongson/common/dma-swiotlb.c
diff --git a/arch/mips/include/asm/mach-loongson/dma-coherence.h b/arch/mips/include/asm/mach-loongson/dma-coherence.h
index e143305..b1dc286 100644
--- a/arch/mips/include/asm/mach-loongson/dma-coherence.h
+++ b/arch/mips/include/asm/mach-loongson/dma-coherence.h
@@ -13,26 +13,43 @@
struct device;
+extern dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);
+extern phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);
static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr,
size_t size)
{
+#ifdef CONFIG_CPU_LOONGSON3
+ return virt_to_phys(addr) < 0x10000000 ?
+ (virt_to_phys(addr) | 0x0000000080000000) : virt_to_phys(addr);
+#else
return virt_to_phys(addr) | 0x80000000;
+#endif
}
static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,
struct page *page)
{
+#ifdef CONFIG_CPU_LOONGSON3
+ return page_to_phys(page) < 0x10000000 ?
+ (page_to_phys(page) | 0x0000000080000000) : page_to_phys(page);
+#else
return page_to_phys(page) | 0x80000000;
+#endif
}
static inline unsigned long plat_dma_addr_to_phys(struct device *dev,
dma_addr_t dma_addr)
{
-#if defined(CONFIG_CPU_LOONGSON2F) && defined(CONFIG_64BIT)
+#if defined(CONFIG_64BIT)
+#if defined(CONFIG_CPU_LOONGSON3)
+ return (dma_addr < 0x90000000 && dma_addr >= 0x80000000) ?
+ (dma_addr & 0x0fffffff) : dma_addr;
+#elif defined(CONFIG_CPU_LOONGSON2F)
return (dma_addr > 0x8fffffff) ? dma_addr : (dma_addr & 0x0fffffff);
+#endif /* CONFIG_CPU_LOONGSON3 */
#else
return dma_addr & 0x7fffffff;
-#endif
+#endif /* CONFIG_64BIT */
}
static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr,
@@ -65,7 +82,11 @@ static inline int plat_dma_mapping_error(struct device *dev,
static inline int plat_device_is_coherent(struct device *dev)
{
+#ifdef CONFIG_DMA_NONCOHERENT
return 0;
+#else
+ return 1;
+#endif /* CONFIG_DMA_NONCOHERENT */
}
#endif /* __ASM_MACH_LOONGSON_DMA_COHERENCE_H */
diff --git a/arch/mips/loongson/Kconfig b/arch/mips/loongson/Kconfig
index 9a31418..9a591ae 100644
--- a/arch/mips/loongson/Kconfig
+++ b/arch/mips/loongson/Kconfig
@@ -112,6 +112,24 @@ config LOONGSON_UART_BASE
default y
depends on EARLY_PRINTK || SERIAL_8250
+config LOONGSON_BIGMEM
+ bool "Soft IOMMU Support for Big Memory (>4GB)"
+ depends on CPU_LOONGSON3
+ select SWIOTLB
+ select ZONE_DMA32
+
+config IOMMU_HELPER
+ bool
+
+config NEED_SG_DMA_LENGTH
+ bool
+
+config SWIOTLB
+ bool
+ select IOMMU_HELPER
+ select NEED_SG_DMA_LENGTH
+ select NEED_DMA_MAP_STATE
+
config LOONGSON_MC146818
bool
default n
diff --git a/arch/mips/loongson/common/Makefile b/arch/mips/loongson/common/Makefile
index e526488..3a26109 100644
--- a/arch/mips/loongson/common/Makefile
+++ b/arch/mips/loongson/common/Makefile
@@ -25,3 +25,8 @@ obj-$(CONFIG_CS5536) += cs5536/
#
obj-$(CONFIG_LOONGSON_SUSPEND) += pm.o
+
+#
+# Big Memory Support
+#
+obj-$(CONFIG_LOONGSON_BIGMEM) += dma-swiotlb.o
diff --git a/arch/mips/loongson/common/dma-swiotlb.c b/arch/mips/loongson/common/dma-swiotlb.c
new file mode 100644
index 0000000..f71490d
--- /dev/null
+++ b/arch/mips/loongson/common/dma-swiotlb.c
@@ -0,0 +1,147 @@
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/dma-mapping.h>
+#include <linux/scatterlist.h>
+#include <linux/swiotlb.h>
+#include <linux/bootmem.h>
+
+#include <asm/bootinfo.h>
+#include <dma-coherence.h>
+
+static void *loongson_dma_alloc_coherent(struct device *dev, size_t size,
+ dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)
+{
+ void *ret;
+
+ if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
+ return ret;
+
+ /* ignore region specifiers */
+ gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
+
+#ifdef CONFIG_ZONE_DMA
+ if (dev == NULL)
+ gfp |= __GFP_DMA;
+ else if (dev->coherent_dma_mask <= DMA_BIT_MASK(24))
+ gfp |= __GFP_DMA;
+ else
+#endif
+#ifdef CONFIG_ZONE_DMA32
+ if (dev->coherent_dma_mask <= DMA_BIT_MASK(32))
+ gfp |= __GFP_DMA32;
+ else
+#endif
+ ;
+ gfp |= __GFP_NORETRY;
+
+ ret = swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
+ mb();
+ return ret;
+}
+
+static void loongson_dma_free_coherent(struct device *dev, size_t size,
+ void *vaddr, dma_addr_t dma_handle, struct dma_attrs *attrs)
+{
+ int order = get_order(size);
+
+ if (dma_release_from_coherent(dev, order, vaddr))
+ return;
+
+ swiotlb_free_coherent(dev, size, vaddr, dma_handle);
+}
+
+static dma_addr_t loongson_dma_map_page(struct device *dev, struct page *page,
+ unsigned long offset, size_t size,
+ enum dma_data_direction dir,
+ struct dma_attrs *attrs)
+{
+ dma_addr_t daddr = swiotlb_map_page(dev, page, offset, size,
+ dir, attrs);
+ mb();
+ return daddr;
+}
+
+static int loongson_dma_map_sg(struct device *dev, struct scatterlist *sg,
+ int nents, enum dma_data_direction dir,
+ struct dma_attrs *attrs)
+{
+ int r = swiotlb_map_sg_attrs(dev, sg, nents, dir, NULL);
+ mb();
+
+ return r;
+}
+
+static void loongson_dma_sync_single_for_device(struct device *dev,
+ dma_addr_t dma_handle, size_t size,
+ enum dma_data_direction dir)
+{
+ swiotlb_sync_single_for_device(dev, dma_handle, size, dir);
+ mb();
+}
+
+static void loongson_dma_sync_sg_for_device(struct device *dev,
+ struct scatterlist *sg, int nents,
+ enum dma_data_direction dir)
+{
+ swiotlb_sync_sg_for_device(dev, sg, nents, dir);
+ mb();
+}
+
+static dma_addr_t loongson_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
+{
+ return (paddr < 0x10000000) ?
+ (paddr | 0x0000000080000000) : paddr;
+}
+
+static phys_addr_t loongson_unity_dma_to_phys(struct device *dev, dma_addr_t daddr)
+{
+ return (daddr < 0x90000000 && daddr >= 0x80000000) ?
+ (daddr & 0x0fffffff) : daddr;
+}
+
+struct loongson_dma_map_ops {
+ struct dma_map_ops dma_map_ops;
+ dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);
+ phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);
+};
+
+dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
+{
+ struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
+ struct loongson_dma_map_ops, dma_map_ops);
+
+ return ops->phys_to_dma(dev, paddr);
+}
+
+phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
+{
+ struct loongson_dma_map_ops *ops = container_of(get_dma_ops(dev),
+ struct loongson_dma_map_ops, dma_map_ops);
+
+ return ops->dma_to_phys(dev, daddr);
+}
+
+static struct loongson_dma_map_ops loongson_linear_dma_map_ops = {
+ .dma_map_ops = {
+ .alloc = loongson_dma_alloc_coherent,
+ .free = loongson_dma_free_coherent,
+ .map_page = loongson_dma_map_page,
+ .unmap_page = swiotlb_unmap_page,
+ .map_sg = loongson_dma_map_sg,
+ .unmap_sg = swiotlb_unmap_sg_attrs,
+ .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
+ .sync_single_for_device = loongson_dma_sync_single_for_device,
+ .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
+ .sync_sg_for_device = loongson_dma_sync_sg_for_device,
+ .mapping_error = swiotlb_dma_mapping_error,
+ .dma_supported = swiotlb_dma_supported
+ },
+ .phys_to_dma = loongson_unity_phys_to_dma,
+ .dma_to_phys = loongson_unity_dma_to_phys
+};
+
+void __init plat_swiotlb_setup(void)
+{
+ swiotlb_init(1);
+ mips_dma_map_ops = &loongson_linear_dma_map_ops.dma_map_ops;
+}
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 3fab204..122f4f8 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -42,6 +42,13 @@ static inline int cpu_is_noncoherent_r10000(struct device *dev)
current_cpu_type() == CPU_R12000);
}
+static inline int cpu_is_noncoherent_loongson(struct device *dev)
+{
+ return !plat_device_is_coherent(dev) &&
+ (current_cpu_type() == CPU_LOONGSON2 ||
+ current_cpu_type() == CPU_LOONGSON3);
+}
+
static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
{
gfp_t dma_flag;
@@ -209,7 +216,7 @@ static inline void __dma_sync(struct page *page,
static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
{
- if (cpu_is_noncoherent_r10000(dev))
+ if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
__dma_sync(dma_addr_to_page(dev, dma_addr),
dma_addr & ~PAGE_MASK, size, direction);
@@ -260,7 +267,7 @@ static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
static void mips_dma_sync_single_for_cpu(struct device *dev,
dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
{
- if (cpu_is_noncoherent_r10000(dev))
+ if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
__dma_sync(dma_addr_to_page(dev, dma_handle),
dma_handle & ~PAGE_MASK, size, direction);
}
@@ -281,7 +288,7 @@ static void mips_dma_sync_sg_for_cpu(struct device *dev,
/* Make sure that gcc doesn't leave the empty loop body. */
for (i = 0; i < nelems; i++, sg++) {
- if (cpu_is_noncoherent_r10000(dev))
+ if (cpu_is_noncoherent_r10000(dev) || cpu_is_noncoherent_loongson(dev))
__dma_sync(sg_page(sg), sg->offset, sg->length,
direction);
}
--
1.7.7.3
next prev parent reply other threads:[~2012-06-15 8:14 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-15 8:09 [PATCH 00/14] MIPS: Add Loongson-3 based machines support Huacai Chen
2012-06-15 8:09 ` [PATCH 01/14] MIPS: Loongson: Add basic Loongson 3 CPU support Huacai Chen
2012-06-15 15:59 ` David Daney
2012-06-15 16:13 ` Ralf Baechle
2012-06-16 12:49 ` huacai chen
2012-06-15 8:09 ` [PATCH 02/14] MIPS: Loongson 3: Add Lemote-3A machtypes definition Huacai Chen
2012-06-15 8:09 ` [PATCH 03/14] MIPS: Loongson: Make Loongson 3 to use BCD format for RTC Huacai Chen
2012-06-15 8:09 ` [PATCH 04/14] MIPS: Loongson: Add UEFI-like firmware interface support Huacai Chen
2012-06-15 8:09 ` [PATCH 05/14] MIPS: Loongson 3: Add HT-linked PCI support Huacai Chen
2012-06-15 14:34 ` LIU Qi
2012-06-15 8:09 ` [PATCH 06/14] MIPS: Loongson 3: Add IRQ init and dispatch support Huacai Chen
2012-06-15 14:32 ` LIU Qi
2012-06-15 8:09 ` [PATCH 07/14] MIPS: Loongson 3: Add serial port support Huacai Chen
2012-06-15 9:50 ` Arnaud Patard
2012-06-15 11:44 ` huacai chen
2012-06-15 8:09 ` Huacai Chen [this message]
2012-06-15 8:09 ` [PATCH 09/14] ata: Use 32bit DMA in AHCI for Loongson 3 Huacai Chen
2012-06-15 10:04 ` Sergei Shtylyov
2012-06-15 12:42 ` huacai chen
2012-06-17 12:05 ` Borislav Petkov
2012-06-18 9:04 ` huacai chen
2012-06-18 10:10 ` Borislav Petkov
2012-06-18 10:41 ` Huacai Chen
2012-06-18 14:52 ` Borislav Petkov
2012-06-15 8:09 ` [PATCH 10/14] drm/radeon: Make radeon card usable for Loongson Huacai Chen
2012-06-15 14:28 ` LIU Qi
2012-06-15 8:09 ` [PATCH 11/14] ALSA: Make hda sound " Huacai Chen
2012-06-15 8:09 ` [PATCH 12/14] MIPS: Loongson 3: Add Loongson-3 SMP support Huacai Chen
2012-06-15 8:10 ` [PATCH 13/14] MIPS: Loongson 3: Add CPU Hotplug support Huacai Chen
2012-06-15 8:10 ` [PATCH 14/14] MIPS: Loongson: Add a Loongson 3 default config file Huacai Chen
2012-06-15 14:37 ` LIU Qi
2012-06-16 12:52 ` huacai chen
2012-06-15 13:10 ` [PATCH 00/14] MIPS: Add Loongson-3 based machines support LIU Qi
2012-06-16 12:46 ` huacai chen
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=1339747801-28691-9-git-send-email-chenhc@lemote.com \
--to=chenhuacai@gmail.com \
--cc=chenhc@lemote.com \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
--cc=taohl@lemote.com \
--cc=wuzhangjin@gmail.com \
--cc=yanh@lemote.com \
--cc=zhangfx@lemote.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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