aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-2.6.39/0010-MIPS-Lantiq-Add-DMA-support.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2011-11-03 15:15:52 +0000
committerJohn Crispin <john@openwrt.org>2011-11-03 15:15:52 +0000
commitea36ad76bcf0043d137da37ea1aee7bded76f5a2 (patch)
treef75ee0417c813ac599e78048c15bdd5f4ffacb82 /target/linux/lantiq/patches-2.6.39/0010-MIPS-Lantiq-Add-DMA-support.patch
parentd8722fac7046020715c41106df28371f3f521132 (diff)
downloadupstream-ea36ad76bcf0043d137da37ea1aee7bded76f5a2.tar.gz
upstream-ea36ad76bcf0043d137da37ea1aee7bded76f5a2.tar.bz2
upstream-ea36ad76bcf0043d137da37ea1aee7bded76f5a2.zip
lantiq: bump to 3.1
SVN-Revision: 28721
Diffstat (limited to 'target/linux/lantiq/patches-2.6.39/0010-MIPS-Lantiq-Add-DMA-support.patch')
-rw-r--r--target/linux/lantiq/patches-2.6.39/0010-MIPS-Lantiq-Add-DMA-support.patch372
1 files changed, 0 insertions, 372 deletions
diff --git a/target/linux/lantiq/patches-2.6.39/0010-MIPS-Lantiq-Add-DMA-support.patch b/target/linux/lantiq/patches-2.6.39/0010-MIPS-Lantiq-Add-DMA-support.patch
deleted file mode 100644
index 7e23053861..0000000000
--- a/target/linux/lantiq/patches-2.6.39/0010-MIPS-Lantiq-Add-DMA-support.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-From bd620ec1ca053bab8ce2562968700e6f80e4ff83 Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Fri, 6 May 2011 00:10:00 +0200
-Subject: [PATCH 10/13] MIPS: Lantiq: Add DMA support
-
-This patch adds support for the DMA engine found inside the XWAY family of
-SoCs. The engine has 5 ports and 20 channels.
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Ralph Hempel <ralph.hempel@lantiq.com>
-Cc: linux-mips@linux-mips.org
-Patchwork: https://patchwork.linux-mips.org/patch/2355/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 3 +-
- arch/mips/include/asm/mach-lantiq/xway/xway_dma.h | 60 +++++
- arch/mips/lantiq/xway/Makefile | 2 +-
- arch/mips/lantiq/xway/devices.h | 1 +
- arch/mips/lantiq/xway/dma.c | 253 ++++++++++++++++++++
- 5 files changed, 317 insertions(+), 2 deletions(-)
- create mode 100644 arch/mips/include/asm/mach-lantiq/xway/xway_dma.h
- create mode 100644 arch/mips/lantiq/xway/dma.c
-
---- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
-+++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
-@@ -86,7 +86,8 @@
- #define LTQ_PPE32_SIZE 0x40000
-
- /* DMA */
--#define LTQ_DMA_BASE_ADDR 0xBE104100
-+#define LTQ_DMA_BASE_ADDR 0x1E104100
-+#define LTQ_DMA_SIZE 0x800
-
- /* PCI */
- #define PCI_CR_BASE_ADDR 0x1E105400
---- /dev/null
-+++ b/arch/mips/include/asm/mach-lantiq/xway/xway_dma.h
-@@ -0,0 +1,60 @@
-+/*
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * Copyright (C) 2011 John Crispin <blogic@openwrt.org>
-+ */
-+
-+#ifndef LTQ_DMA_H__
-+#define LTQ_DMA_H__
-+
-+#define LTQ_DESC_SIZE 0x08 /* each descriptor is 64bit */
-+#define LTQ_DESC_NUM 0x40 /* 64 descriptors / channel */
-+
-+#define LTQ_DMA_OWN BIT(31) /* owner bit */
-+#define LTQ_DMA_C BIT(30) /* complete bit */
-+#define LTQ_DMA_SOP BIT(29) /* start of packet */
-+#define LTQ_DMA_EOP BIT(28) /* end of packet */
-+#define LTQ_DMA_TX_OFFSET(x) ((x & 0x1f) << 23) /* data bytes offset */
-+#define LTQ_DMA_RX_OFFSET(x) ((x & 0x7) << 23) /* data bytes offset */
-+#define LTQ_DMA_SIZE_MASK (0xffff) /* the size field is 16 bit */
-+
-+struct ltq_dma_desc {
-+ u32 ctl;
-+ u32 addr;
-+};
-+
-+struct ltq_dma_channel {
-+ int nr; /* the channel number */
-+ int irq; /* the mapped irq */
-+ int desc; /* the current descriptor */
-+ struct ltq_dma_desc *desc_base; /* the descriptor base */
-+ int phys; /* physical addr */
-+};
-+
-+enum {
-+ DMA_PORT_ETOP = 0,
-+ DMA_PORT_DEU,
-+};
-+
-+extern void ltq_dma_enable_irq(struct ltq_dma_channel *ch);
-+extern void ltq_dma_disable_irq(struct ltq_dma_channel *ch);
-+extern void ltq_dma_ack_irq(struct ltq_dma_channel *ch);
-+extern void ltq_dma_open(struct ltq_dma_channel *ch);
-+extern void ltq_dma_close(struct ltq_dma_channel *ch);
-+extern void ltq_dma_alloc_tx(struct ltq_dma_channel *ch);
-+extern void ltq_dma_alloc_rx(struct ltq_dma_channel *ch);
-+extern void ltq_dma_free(struct ltq_dma_channel *ch);
-+extern void ltq_dma_init_port(int p);
-+
-+#endif
---- a/arch/mips/lantiq/xway/Makefile
-+++ b/arch/mips/lantiq/xway/Makefile
-@@ -1,4 +1,4 @@
--obj-y := pmu.o ebu.o reset.o gpio.o gpio_stp.o gpio_ebu.o devices.o
-+obj-y := pmu.o ebu.o reset.o gpio.o gpio_stp.o gpio_ebu.o devices.o dma.o
-
- obj-$(CONFIG_SOC_XWAY) += clk-xway.o prom-xway.o setup-xway.o
- obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o prom-ase.o setup-ase.o
---- a/arch/mips/lantiq/xway/devices.h
-+++ b/arch/mips/lantiq/xway/devices.h
-@@ -10,6 +10,7 @@
- #define _LTQ_DEVICES_XWAY_H__
-
- #include "../devices.h"
-+#include <linux/phy.h>
-
- extern void ltq_register_gpio(void);
- extern void ltq_register_gpio_stp(void);
---- /dev/null
-+++ b/arch/mips/lantiq/xway/dma.c
-@@ -0,0 +1,253 @@
-+/*
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * Copyright (C) 2011 John Crispin <blogic@openwrt.org>
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <linux/dma-mapping.h>
-+
-+#include <lantiq_soc.h>
-+#include <xway_dma.h>
-+
-+#define LTQ_DMA_CTRL 0x10
-+#define LTQ_DMA_CPOLL 0x14
-+#define LTQ_DMA_CS 0x18
-+#define LTQ_DMA_CCTRL 0x1C
-+#define LTQ_DMA_CDBA 0x20
-+#define LTQ_DMA_CDLEN 0x24
-+#define LTQ_DMA_CIS 0x28
-+#define LTQ_DMA_CIE 0x2C
-+#define LTQ_DMA_PS 0x40
-+#define LTQ_DMA_PCTRL 0x44
-+#define LTQ_DMA_IRNEN 0xf4
-+
-+#define DMA_DESCPT BIT(3) /* descriptor complete irq */
-+#define DMA_TX BIT(8) /* TX channel direction */
-+#define DMA_CHAN_ON BIT(0) /* channel on / off bit */
-+#define DMA_PDEN BIT(6) /* enable packet drop */
-+#define DMA_CHAN_RST BIT(1) /* channel on / off bit */
-+#define DMA_RESET BIT(0) /* channel on / off bit */
-+#define DMA_IRQ_ACK 0x7e /* IRQ status register */
-+#define DMA_POLL BIT(31) /* turn on channel polling */
-+#define DMA_CLK_DIV4 BIT(6) /* polling clock divider */
-+#define DMA_2W_BURST BIT(1) /* 2 word burst length */
-+#define DMA_MAX_CHANNEL 20 /* the soc has 20 channels */
-+#define DMA_ETOP_ENDIANESS (0xf << 8) /* endianess swap etop channels */
-+#define DMA_WEIGHT (BIT(17) | BIT(16)) /* default channel wheight */
-+
-+#define ltq_dma_r32(x) ltq_r32(ltq_dma_membase + (x))
-+#define ltq_dma_w32(x, y) ltq_w32(x, ltq_dma_membase + (y))
-+#define ltq_dma_w32_mask(x, y, z) ltq_w32_mask(x, y, \
-+ ltq_dma_membase + (z))
-+
-+static struct resource ltq_dma_resource = {
-+ .name = "dma",
-+ .start = LTQ_DMA_BASE_ADDR,
-+ .end = LTQ_DMA_BASE_ADDR + LTQ_DMA_SIZE - 1,
-+ .flags = IORESOURCE_MEM,
-+};
-+
-+static void __iomem *ltq_dma_membase;
-+
-+void
-+ltq_dma_enable_irq(struct ltq_dma_channel *ch)
-+{
-+ unsigned long flags;
-+
-+ local_irq_save(flags);
-+ ltq_dma_w32(ch->nr, LTQ_DMA_CS);
-+ ltq_dma_w32_mask(0, 1 << ch->nr, LTQ_DMA_IRNEN);
-+ local_irq_restore(flags);
-+}
-+EXPORT_SYMBOL_GPL(ltq_dma_enable_irq);
-+
-+void
-+ltq_dma_disable_irq(struct ltq_dma_channel *ch)
-+{
-+ unsigned long flags;
-+
-+ local_irq_save(flags);
-+ ltq_dma_w32(ch->nr, LTQ_DMA_CS);
-+ ltq_dma_w32_mask(1 << ch->nr, 0, LTQ_DMA_IRNEN);
-+ local_irq_restore(flags);
-+}
-+EXPORT_SYMBOL_GPL(ltq_dma_disable_irq);
-+
-+void
-+ltq_dma_ack_irq(struct ltq_dma_channel *ch)
-+{
-+ unsigned long flags;
-+
-+ local_irq_save(flags);
-+ ltq_dma_w32(ch->nr, LTQ_DMA_CS);
-+ ltq_dma_w32(DMA_IRQ_ACK, LTQ_DMA_CIS);
-+ local_irq_restore(flags);
-+}
-+EXPORT_SYMBOL_GPL(ltq_dma_ack_irq);
-+
-+void
-+ltq_dma_open(struct ltq_dma_channel *ch)
-+{
-+ unsigned long flag;
-+
-+ local_irq_save(flag);
-+ ltq_dma_w32(ch->nr, LTQ_DMA_CS);
-+ ltq_dma_w32_mask(0, DMA_CHAN_ON, LTQ_DMA_CCTRL);
-+ ltq_dma_enable_irq(ch);
-+ local_irq_restore(flag);
-+}
-+EXPORT_SYMBOL_GPL(ltq_dma_open);
-+
-+void
-+ltq_dma_close(struct ltq_dma_channel *ch)
-+{
-+ unsigned long flag;
-+
-+ local_irq_save(flag);
-+ ltq_dma_w32(ch->nr, LTQ_DMA_CS);
-+ ltq_dma_w32_mask(DMA_CHAN_ON, 0, LTQ_DMA_CCTRL);
-+ ltq_dma_disable_irq(ch);
-+ local_irq_restore(flag);
-+}
-+EXPORT_SYMBOL_GPL(ltq_dma_close);
-+
-+static void
-+ltq_dma_alloc(struct ltq_dma_channel *ch)
-+{
-+ unsigned long flags;
-+
-+ ch->desc = 0;
-+ ch->desc_base = dma_alloc_coherent(NULL,
-+ LTQ_DESC_NUM * LTQ_DESC_SIZE,
-+ &ch->phys, GFP_ATOMIC);
-+ memset(ch->desc_base, 0, LTQ_DESC_NUM * LTQ_DESC_SIZE);
-+
-+ local_irq_save(flags);
-+ ltq_dma_w32(ch->nr, LTQ_DMA_CS);
-+ ltq_dma_w32(ch->phys, LTQ_DMA_CDBA);
-+ ltq_dma_w32(LTQ_DESC_NUM, LTQ_DMA_CDLEN);
-+ ltq_dma_w32_mask(DMA_CHAN_ON, 0, LTQ_DMA_CCTRL);
-+ wmb();
-+ ltq_dma_w32_mask(0, DMA_CHAN_RST, LTQ_DMA_CCTRL);
-+ while (ltq_dma_r32(LTQ_DMA_CCTRL) & DMA_CHAN_RST)
-+ ;
-+ local_irq_restore(flags);
-+}
-+
-+void
-+ltq_dma_alloc_tx(struct ltq_dma_channel *ch)
-+{
-+ unsigned long flags;
-+
-+ ltq_dma_alloc(ch);
-+
-+ local_irq_save(flags);
-+ ltq_dma_w32(DMA_DESCPT, LTQ_DMA_CIE);
-+ ltq_dma_w32_mask(0, 1 << ch->nr, LTQ_DMA_IRNEN);
-+ ltq_dma_w32(DMA_WEIGHT | DMA_TX, LTQ_DMA_CCTRL);
-+ local_irq_restore(flags);
-+}
-+EXPORT_SYMBOL_GPL(ltq_dma_alloc_tx);
-+
-+void
-+ltq_dma_alloc_rx(struct ltq_dma_channel *ch)
-+{
-+ unsigned long flags;
-+
-+ ltq_dma_alloc(ch);
-+
-+ local_irq_save(flags);
-+ ltq_dma_w32(DMA_DESCPT, LTQ_DMA_CIE);
-+ ltq_dma_w32_mask(0, 1 << ch->nr, LTQ_DMA_IRNEN);
-+ ltq_dma_w32(DMA_WEIGHT, LTQ_DMA_CCTRL);
-+ local_irq_restore(flags);
-+}
-+EXPORT_SYMBOL_GPL(ltq_dma_alloc_rx);
-+
-+void
-+ltq_dma_free(struct ltq_dma_channel *ch)
-+{
-+ if (!ch->desc_base)
-+ return;
-+ ltq_dma_close(ch);
-+ dma_free_coherent(NULL, LTQ_DESC_NUM * LTQ_DESC_SIZE,
-+ ch->desc_base, ch->phys);
-+}
-+EXPORT_SYMBOL_GPL(ltq_dma_free);
-+
-+void
-+ltq_dma_init_port(int p)
-+{
-+ ltq_dma_w32(p, LTQ_DMA_PS);
-+ switch (p) {
-+ case DMA_PORT_ETOP:
-+ /*
-+ * Tell the DMA engine to swap the endianess of data frames and
-+ * drop packets if the channel arbitration fails.
-+ */
-+ ltq_dma_w32_mask(0, DMA_ETOP_ENDIANESS | DMA_PDEN,
-+ LTQ_DMA_PCTRL);
-+ break;
-+
-+ case DMA_PORT_DEU:
-+ ltq_dma_w32((DMA_2W_BURST << 4) | (DMA_2W_BURST << 2),
-+ LTQ_DMA_PCTRL);
-+ break;
-+
-+ default:
-+ break;
-+ }
-+}
-+EXPORT_SYMBOL_GPL(ltq_dma_init_port);
-+
-+int __init
-+ltq_dma_init(void)
-+{
-+ int i;
-+
-+ /* insert and request the memory region */
-+ if (insert_resource(&iomem_resource, &ltq_dma_resource) < 0)
-+ panic("Failed to insert dma memory\n");
-+
-+ if (request_mem_region(ltq_dma_resource.start,
-+ resource_size(&ltq_dma_resource), "dma") < 0)
-+ panic("Failed to request dma memory\n");
-+
-+ /* remap dma register range */
-+ ltq_dma_membase = ioremap_nocache(ltq_dma_resource.start,
-+ resource_size(&ltq_dma_resource));
-+ if (!ltq_dma_membase)
-+ panic("Failed to remap dma memory\n");
-+
-+ /* power up and reset the dma engine */
-+ ltq_pmu_enable(PMU_DMA);
-+ ltq_dma_w32_mask(0, DMA_RESET, LTQ_DMA_CTRL);
-+
-+ /* disable all interrupts */
-+ ltq_dma_w32(0, LTQ_DMA_IRNEN);
-+
-+ /* reset/configure each channel */
-+ for (i = 0; i < DMA_MAX_CHANNEL; i++) {
-+ ltq_dma_w32(i, LTQ_DMA_CS);
-+ ltq_dma_w32(DMA_CHAN_RST, LTQ_DMA_CCTRL);
-+ ltq_dma_w32(DMA_POLL | DMA_CLK_DIV4, LTQ_DMA_CPOLL);
-+ ltq_dma_w32_mask(DMA_CHAN_ON, 0, LTQ_DMA_CCTRL);
-+ }
-+ return 0;
-+}
-+
-+postcore_initcall(ltq_dma_init);