diff options
-rw-r--r-- | nuttx/ChangeLog | 4 | ||||
-rw-r--r-- | nuttx/Kconfig | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/common/up_initialize.c | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/lpc17xx/Kconfig | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/lpc17xx/lpc17_gpdma.c | 336 | ||||
-rw-r--r-- | nuttx/arch/arm/src/lpc17xx/lpc17_gpdma.h | 14 | ||||
-rw-r--r-- | nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c | 21 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sam3u/Kconfig | 1 |
8 files changed, 332 insertions, 55 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 23ca473c8..58d078a4e 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -4470,4 +4470,6 @@ Open1788 LCD and SDRAM which is used as a framebuffer (2013-3-27). * arch/arm/src/lpc17xx/lpc17_gdma.c and lpc17_sdcard.c: Began implementation of the LPC17 DMA and integration into the SDCARD - driver (2013-3029). + driver (2013-3-29). + * arch/arm/src/lpc17xx/lpc17_gdma.c: LPC17 DMA is code complete and + under test. Does not yet work (2013-3-30).
\ No newline at end of file diff --git a/nuttx/Kconfig b/nuttx/Kconfig index e92d1c018..904cb511a 100644 --- a/nuttx/Kconfig +++ b/nuttx/Kconfig @@ -443,9 +443,17 @@ config DEBUG_CAN ---help--- Enable CAN driver debug SYSLOG output (disabled by default) +config DEBUG_SDIO + bool "Enable SDIO Debug Output" + default n + depends on MMCSD_SDIO + ---help--- + Enable SDIO driver debug SYSLOG output (disabled by default) + config DEBUG_DMA bool "Enable DMA Debug Output" default n + depends on ARCH_DMA ---help--- Enable DMA-releated debug SYSLOG output (disabled by default) diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c index 0ea3fcd35..f4f37c8e3 100644 --- a/nuttx/arch/arm/src/common/up_initialize.c +++ b/nuttx/arch/arm/src/common/up_initialize.c @@ -136,7 +136,7 @@ void up_initialize(void) up_pminitialize(); #endif - /* Initialize the DMA subsystem if the weak function stm32_dmainitialize has been + /* Initialize the DMA subsystem if the weak function up_dmainitialize has been * brought into the build */ diff --git a/nuttx/arch/arm/src/lpc17xx/Kconfig b/nuttx/arch/arm/src/lpc17xx/Kconfig index cad80ac7e..e4a3913b1 100644 --- a/nuttx/arch/arm/src/lpc17xx/Kconfig +++ b/nuttx/arch/arm/src/lpc17xx/Kconfig @@ -305,6 +305,7 @@ config LPC17_DAC config LPC17_GPDMA bool "GPDMA" default n + select ARCH_DMA config LPC17_CRC bool "CRC engine" diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_gpdma.c b/nuttx/arch/arm/src/lpc17xx/lpc17_gpdma.c index 696309b5f..4edc87dbf 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_gpdma.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_gpdma.c @@ -63,24 +63,6 @@ * Definitions ****************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG too) */ - -#undef DMA_DEBUG /* Define to enable debug */ -#undef DMA_VERBOSE /* Define to enable verbose debug */ - -#ifdef DMA_DEBUG -# define dmadbg lldbg -# ifdef DMA_VERBOSE -# define spivdbg lldbg -# else -# define spivdbg(x...) -# endif -#else -# undef DMA_VERBOSE -# define dmadbg(x...) -# define spivdbg(x...) -#endif - /**************************************************************************** * Private Types ****************************************************************************/ @@ -89,6 +71,7 @@ struct lpc17_dmach_s { bool inuse; /* True: The channel is in use */ + uint8_t chn; /* Channel number */ dma_callback_t callback; /* DMA completion callback function */ void *arg; /* Argument to pass to the callback function */ }; @@ -124,23 +107,109 @@ static struct lpc17_gpdma_s g_gpdma; ****************************************************************************/ /**************************************************************************** + * Name: gpdma_interrupt + * + * Description: + * The common GPDMA interrupt handler. + * + * Returned Value: + * None + * + ****************************************************************************/ + +static int gpdma_interrupt(int irq, FAR void *context) +{ + struct lpc17_dmach_s *dmach; + uint32_t regval; + uint32_t chbit; + int result; + int i; + + /* Check each DMA channel */ + + for (i = 0; i < LPC17_NDMACH; i++) + { + chbit = DMACH((uint32_t)i); + + /* Is there an interrupt pending for this channel? If the bit for + * this channel is set, that indicates that a specific DMA channel + * interrupt request is active. The request can be generated from + * either the error or terminal count interrupt requests. + */ + + regval = getreg32(LPC17_DMA_INTST); + if ((regval & chbit) != 0) + { + /* Yes.. Is this channel assigned? Is there a callback function? */ + + dmach = &g_gpdma.dmach[i]; + if (dmach->inuse && dmach->callback) + { + /* Yes.. did an error occur? */ + + regval = getreg32(LPC17_DMA_INTERRST); + if ((regval & chbit) != 0) + { + /* Yes.. report error status */ + + result = -EIO; + } + + /* Then this must be a terminal transfer event */ + + else + { + /* Let's make sure it is the terminal transfer event. */ + + regval = getreg32(LPC17_DMA_INTTCST); + if ((regval & chbit) != 0) + { + result = OK; + } + + /* This should not happen */ + + else + { + result = -EINVAL; + } + } + + /* Perform the callback */ + + dmach->callback((DMA_HANDLE)dmach, dmach->arg, result); + } + + /* Disable this channel, mask any further interrupts for + * this channel, and clear any pending interrupts. + */ + + lpc17_dmastop((DMA_HANDLE)dmach); + } + } + + return OK; +} + +/**************************************************************************** * Public Functions ****************************************************************************/ /**************************************************************************** - * Name: lpc17_dmainitialize + * Name: up_dmainitialize * * Description: * Initialize the GPDMA subsystem. * * Returned Value: - * None + * Zero on success; A negated errno value on failure. * ****************************************************************************/ -void lpc17_dmainitilaize(void) +void weak_function up_dmainitialize(void) { uint32_t regval; + int ret; int i; /* Enable clocking to the GPDMA block */ @@ -164,6 +233,20 @@ void lpc17_dmainitilaize(void) /* Initialize the DMA state structure */ sem_init(&g_gpdma.exclsem, 0, 1); + + for (i = 0; i < LPC17_NDMACH; i++) + { + g_gpdma.dmach[i].chn = i; /* Channel number */ + g_gpdma.dmach[i].inuse = false; /* Channel is not in-use */ + } + + /* Attach and enable the common interrupt handler */ + + ret = irq_attach(LPC17_IRQ_GPDMA, gpdma_interrupt); + if (ret == OK) + { + up_enable_irq(LPC17_IRQ_GPDMA); + } } /**************************************************************************** @@ -279,6 +362,10 @@ void lpc17_dmafree(DMA_HANDLE handle) DEBUGASSERT(dmach && dmach->inuse); + /* Make sure that the DMA channel was properly stopped */ + + lpc17_dmastop(handle); + /* Mark the channel available. This is an atomic operation and needs no * special protection. */ @@ -298,11 +385,81 @@ int lpc17_dmasetup(DMA_HANDLE handle, uint32_t control, uint32_t config, uint32_t srcaddr, uint32_t destaddr, size_t nxfrs) { struct lpc17_dmach_s *dmach = (DMA_HANDLE)handle; + uint32_t chbit; + uint32_t regval; + uint32_t base; DEBUGASSERT(dmach && dmach->inuse); -#warning "Missing logic" - return -ENOSYS; + chbit = DMACH((uint32_t)dmach->chn); + base = LPC17_DMACH_BASE((uint32_t)dmach->chn); + + /* Put the channel in a known state. Zero disables everything */ + + putreg32(0, base + LPC17_DMACH_CONTROL_OFFSET); + putreg32(0, base + LPC17_DMACH_CONFIG_OFFSET); + + /* "Programming a DMA channel + * + * 1. "Choose a free DMA channel with the priority needed. DMA channel 0 + * has the highest priority and DMA channel 7 the lowest priority. + */ + + regval = getreg32(LPC17_DMA_ENBLDCHNS); + if ((regval & chbit) != 0) + { + /* There is an active DMA on this channel! */ + + return -EBUSY; + } + + /* 2. "Clear any pending interrupts on the channel to be used by writing + * to the DMACIntTCClear and DMACIntErrClear register. The previous + * channel operation might have left interrupt active. + */ + + putreg32(chbit, LPC17_DMA_INTTCCLR); + putreg32(chbit, LPC17_DMA_INTERRCLR); + + /* 3. "Write the source address into the DMACCxSrcAddr register. */ + + putreg32(srcaddr, base + LPC17_DMACH_SRCADDR_OFFSET); + + /* 4. "Write the destination address into the DMACCxDestAddr register. */ + + putreg32(destaddr, base + LPC17_DMACH_DESTADDR_OFFSET); + + /* 5. "Write the address of the next LLI into the DMACCxLLI register. If + * the transfer comprises of a single packet of data then 0 must be + * written into this register. + */ + + putreg32(0, base + LPC17_DMACH_LLI_OFFSET); + + /* 6. "Write the control information into the DMACCxControl register." + * + * The caller provides all CONTROL register fields except for the transfer + * size which is passed as a separate parameter and for the terminal count + * interrupt enable bit which is controlled by the driver. + */ + + regval = control & ~(DMACH_CONTROL_XFRSIZE_MASK|DMACH_CONTROL_I); + regval |= ((uint32_t)nxfrs << DMACH_CONTROL_XFRSIZE_SHIFT); + putreg32(regval, base + LPC17_DMACH_CONTROL_OFFSET); + + /* 7. "Write the channel configuration information into the DMACCxConfig + * register. If the enable bit is set then the DMA channel is + * automatically enabled." + * + * Only the SRCPER, DSTPER, and XFRTTYPE fields of the CONFIG register + * are provided by the caller. Little endian is assumed. + */ + + regval = config & (DMACH_CONFIG_SRCPER_MASK|DMACH_CONFIG_DSTPER_MASK| + DMACH_CONFIG_XFRTYPE_MASK); + putreg32(regval, base + LPC17_DMACH_CONFIG_OFFSET); + + return OK; } /**************************************************************************** @@ -316,6 +473,9 @@ int lpc17_dmasetup(DMA_HANDLE handle, uint32_t control, uint32_t config, int lpc17_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg) { struct lpc17_dmach_s *dmach = (DMA_HANDLE)handle; + uint32_t regval; + uint32_t chbit; + uint32_t base; DEBUGASSERT(dmach && dmach->inuse && callback); @@ -324,9 +484,29 @@ int lpc17_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg) dmach->callback = callback; dmach->arg = arg; - /* Start the DMA */ -#warning "Missing logic" - return -ENOSYS; + /* Clear any pending DMA interrupts */ + + chbit = DMACH((uint32_t)dmach->chn); + putreg32(chbit, LPC17_DMA_INTTCCLR); + putreg32(chbit, LPC17_DMA_INTERRCLR); + + /* Enable terminal count interrupt */ + + base = LPC17_DMACH_BASE((uint32_t)dmach->chn); + regval = getreg32(base + LPC17_DMACH_CONTROL_OFFSET); + regval |= DMACH_CONTROL_I; + putreg32(regval, base + LPC17_DMACH_CONTROL_OFFSET); + + /* Enable the channel and unmask terminal count and error interrupts. + * According to the user manual, zero masks and one unmasks (hence, + * these are really enables). + */ + + regval = getreg32(base + LPC17_DMACH_CONFIG_OFFSET); + regval |= (DMACH_CONFIG_E | DMACH_CONFIG_IE | DMACH_CONFIG_ITC); + putreg32(regval, base + LPC17_DMACH_CONFIG_OFFSET); + + return OK; } /**************************************************************************** @@ -342,9 +522,27 @@ int lpc17_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg) void lpc17_dmastop(DMA_HANDLE handle) { struct lpc17_dmach_s *dmach = (DMA_HANDLE)handle; + uint32_t regaddr; + uint32_t regval; + uint32_t chbit; DEBUGASSERT(dmach && dmach->inuse); -#warning "Missing logic" + + /* Disable this channel and mask any further interrupts from the channel. + * this channel. The channel is disabled by clearning the channel + * enable bit. Any outstanding data in the FIFO’s is lost. + */ + + regaddr = LPC17_DMACH_CONFIG((uint32_t)dmach->chn); + regval = getreg32(regaddr); + regval &= ~(DMACH_CONFIG_E | DMACH_CONFIG_IE | DMACH_CONFIG_ITC); + putreg32(regval, regaddr); + + /* Clear any pending interrupts for this channel */ + + chbit = DMACH((uint32_t)dmach->chn); + putreg32(chbit, LPC17_DMA_INTTCCLR); + putreg32(chbit, LPC17_DMA_INTERRCLR); } /**************************************************************************** @@ -359,9 +557,33 @@ void lpc17_dmastop(DMA_HANDLE handle) void lpc17_dmasample(DMA_HANDLE handle, struct lpc17_dmaregs_s *regs) { struct lpc17_dmach_s *dmach = (DMA_HANDLE)handle; - - DEBUGASSERT(dmach && dmach->inuse); -#warning "Missing logic" + uint32_t base; + + DEBUGASSERT(dmach); + + /* Sample the global DMA registers */ + + regs->gbl.intst = getreg32(LPC17_DMA_INTST); + regs->gbl.inttcst = getreg32(LPC17_DMA_INTTCST); + regs->gbl.interrst = getreg32(LPC17_DMA_INTERRST); + regs->gbl.rawinttcst = getreg32(LPC17_DMA_RAWINTTCST); + regs->gbl.rawinterrst = getreg32(LPC17_DMA_RAWINTERRST); + regs->gbl.enbldchns = getreg32(LPC17_DMA_ENBLDCHNS); + regs->gbl.softbreq = getreg32(LPC17_DMA_SOFTBREQ); + regs->gbl.softsreq = getreg32(LPC17_DMA_SOFTSREQ); + regs->gbl.softlbreq = getreg32(LPC17_DMA_SOFTLBREQ); + regs->gbl.softlsreq = getreg32(LPC17_DMA_SOFTLSREQ); + regs->gbl.config = getreg32(LPC17_DMA_CONFIG); + regs->gbl.sync = getreg32(LPC17_DMA_SYNC); + + /* Sample the DMA channel registers */ + + base = LPC17_DMACH_BASE((uint32_t)dmach->chn); + regs->ch.srcaddr = getreg32(base + LPC17_DMACH_SRCADDR_OFFSET); + regs->ch.destaddr = getreg32(base + LPC17_DMACH_DESTADDR_OFFSET); + regs->ch.lli = getreg32(base + LPC17_DMACH_LLI_OFFSET); + regs->ch.control = getreg32(base + LPC17_DMACH_CONTROL_OFFSET); + regs->ch.config = getreg32(base + LPC17_DMACH_CONFIG_OFFSET); } #endif /* CONFIG_DEBUG_DMA */ @@ -374,12 +596,58 @@ void lpc17_dmasample(DMA_HANDLE handle, struct lpc17_dmaregs_s *regs) ****************************************************************************/ #ifdef CONFIG_DEBUG_DMA -void lpc17_dmadump(DMA_HANDLE handle, const struct lpc17_dmaregs_s *regs, const char *msg) +void lpc17_dmadump(DMA_HANDLE handle, const struct lpc17_dmaregs_s *regs, + const char *msg) { struct lpc17_dmach_s *dmach = (DMA_HANDLE)handle; - - DEBUGASSERT(dmach && dmach->inuse); -#warning "Missing logic" + uint32_t base; + + DEBUGASSERT(dmach); + + /* Dump the sampled global DMA registers */ + + dmadbg("Global GPDMA Registers: %s\n", msg); + dmadbg(" INTST[%08x]: %08x\n", + LPC17_DMA_INTST, regs->gbl.intst); + dmadbg(" INTTCST[%08x]: %08x\n", + LPC17_DMA_INTTCST, regs->gbl.inttcst); + dmadbg(" INTERRST[%08x]: %08x\n", + LPC17_DMA_INTERRST, regs->gbl.interrst); + dmadbg(" RAWINTTCST[%08x]: %08x\n", + LPC17_DMA_RAWINTTCST, regs->gbl.rawinttcst); + dmadbg(" RAWINTERRST[%08x]: %08x\n", + LPC17_DMA_RAWINTERRST, regs->gbl.rawinterrst); + dmadbg(" ENBLDCHNS[%08x]: %08x\n", + LPC17_DMA_ENBLDCHNS, regs->gbl.enbldchns); + dmadbg(" SOFTBREQ[%08x]: %08x\n", + LPC17_DMA_SOFTBREQ, regs->gbl.softbreq); + dmadbg(" SOFTSREQ[%08x]: %08x\n", + LPC17_DMA_SOFTSREQ, regs->gbl.softsreq); + dmadbg(" SOFTLBREQ[%08x]: %08x\n", + LPC17_DMA_SOFTLBREQ, regs->gbl.softlbreq); + dmadbg(" SOFTLSREQ[%08x]: %08x\n", + LPC17_DMA_SOFTLSREQ, regs->gbl.softlsreq); + dmadbg(" CONFIG[%08x]: %08x\n", + LPC17_DMA_CONFIG, regs->gbl.config); + dmadbg(" SYNC[%08x]: %08x\n", + LPC17_DMA_SYNC, regs->gbl.sync); + + /* Dump the DMA channel registers */ + + base = LPC17_DMACH_BASE((uint32_t)dmach->chn); + + dmadbg("Channel GPDMA Registers: %d\n", dmach->chn); + + dmadbg(" SRCADDR[%08x]: %08x\n", + base + LPC17_DMACH_SRCADDR_OFFSET, regs->ch.srcaddr); + dmadbg(" DESTADDR[%08x]: %08x\n", + base + LPC17_DMACH_DESTADDR_OFFSET, regs->ch.destaddr); + dmadbg(" LLI[%08x]: %08x\n", + base + LPC17_DMACH_LLI_OFFSET, regs->ch.lli); + dmadbg(" CONTROL[%08x]: %08x\n", + base + LPC17_DMACH_CONTROL_OFFSET, regs->ch.control); + dmadbg(" CONFIG[%08x]: %08x\n", + base + LPC17_DMACH_CONFIG_OFFSET, regs->ch.config); } #endif /* CONFIG_DEBUG_DMA */ diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_gpdma.h b/nuttx/arch/arm/src/lpc17xx/lpc17_gpdma.h index 77ac811ab..cd2d10dd2 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_gpdma.h +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_gpdma.h @@ -125,17 +125,17 @@ extern "C" ************************************************************************************/ /**************************************************************************** - * Name: lpc17_dmainitialize + * Name: up_dmainitialize * * Description: - * Initialize the GPDMA subsystem. + * Initialize the GPDMA subsystem (also prototyped in up_internal.h). * * Returned Value: - * None + * Zero on success; A negated errno value on failure. * ****************************************************************************/ -void lpc17_dmainitilaize(void); +void weak_function up_dmainitialize(void); /**************************************************************************** * Name: lpc17_dmaconfigure @@ -224,7 +224,7 @@ void lpc17_dmastop(DMA_HANDLE handle); ****************************************************************************/ #ifdef CONFIG_DEBUG_DMA -EXTERN void lpc17_dmasample(DMA_HANDLE handle, struct lpc17_dmaregs_s *regs); +void lpc17_dmasample(DMA_HANDLE handle, struct lpc17_dmaregs_s *regs); #else # define lpc17_dmasample(handle,regs) #endif @@ -238,8 +238,8 @@ EXTERN void lpc17_dmasample(DMA_HANDLE handle, struct lpc17_dmaregs_s *regs); ****************************************************************************/ #ifdef CONFIG_DEBUG_DMA -EXTERN void lpc17_dmadump(DMA_HANDLE handle, const struct lpc17_dmaregs_s *regs, - const char *msg); +void lpc17_dmadump(DMA_HANDLE handle, const struct lpc17_dmaregs_s *regs, + const char *msg); #else # define lpc17_dmadump(handle,regs,msg) #endif diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c index f449685de..c776395a7 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c @@ -152,7 +152,11 @@ * - Memory burst size (F4 only) */ -/* DMA control register settings */ +/* DMA control register settings. All CONTROL register fields need to be + * specified except for the transfer size which is passed as a separate + * parameter and for the terminal count interrupt enable bit which is + * controlled by the driver. + */ #define SDCARD_RXDMA32_CONTROL (DMACH_CONTROL_SBSIZE_4|DMACH_CONTROL_DBSIZE_4|\ DMACH_CONTROL_SWIDTH_32BIT|DMACH_CONTROL_DWIDTH_32BIT|\ @@ -161,19 +165,12 @@ DMACH_CONTROL_SWIDTH_32BIT|DMACH_CONTROL_DWIDTH_32BIT|\ DMACH_CONTROL_SI) -/* DMA configuration register settings */ - -#define SDCARD_RXDMA32_CONFIG (DMACH_CONFIG_E|DMACH_CONFIG_SRCPER_SDCARD|\ - DMACH_CONFIG_XFRTYPE_P2M) -#define SDCARD_TXDMA32_CONFIG (DMACH_CONFIG_E|DMACH_CONFIG_DSTPER_SDCARD|\ - DMACH_CONFIG_XFRTYPE_M2P) - -/* SD card DMA Channel/Stream selection. For the the case of the LPC17XX F4, there - * are multiple DMA stream options that must be dis-ambiguated in the board.h - * file. +/* DMA configuration register settings. Only the SRCPER, DSTPER, and + * XFRTTYPE fields of the CONFIG register need be specified. */ -#define SDCARD_DMACHAN DMAMAP_SDCARD +#define SDCARD_RXDMA32_CONFIG (DMACH_CONFIG_SRCPER_SDCARD|DMACH_CONFIG_XFRTYPE_P2M) +#define SDCARD_TXDMA32_CONFIG (DMACH_CONFIG_DSTPER_SDCARD|DMACH_CONFIG_XFRTYPE_M2P) /* FIFO sizes */ diff --git a/nuttx/arch/arm/src/sam3u/Kconfig b/nuttx/arch/arm/src/sam3u/Kconfig index 473e1d9a4..7170fdac3 100644 --- a/nuttx/arch/arm/src/sam3u/Kconfig +++ b/nuttx/arch/arm/src/sam3u/Kconfig @@ -20,6 +20,7 @@ menu "AT91SAM3 Peripheral Support" config SAM3U_DMA bool "DMA" default n + select ARCH_DMA config SAM3U_NAND bool "NAND support" |