sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAMA5 ADC+TC: Several updates/fixes from ongoing debug

Browse Source
This commit is contained in:
Gregory Nutt 2013-10-25 08:46:57 -06:00
parent 15c2d87fb9
commit dad8aa9781
5 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/src/sama5/Kconfig
View File

@ -2257,6 +2257,14 @@ config SAMA5_TC1_TIOB5
endif # SAMA5_TC1 endif # SAMA5_TC1
config SAMA5_TC_REGDEBUG
bool "TC Register level debug"
depends on DEBUG
default n
---help---
Output detailed register-level Timer/Counter device debug information.
Very invasive! Requires also DEBUG.
endmenu # Timer/counter Configuration endmenu # Timer/counter Configuration
endif # SAMA5_TC0 || SAMA5_TC1 endif # SAMA5_TC0 || SAMA5_TC1

4
arch/arm/src/sama5/chip/sam_adc.h
View File

@ -203,7 +203,7 @@
/* Channel Sequence Register 1 */ /* Channel Sequence Register 1 */
#define ADC_SEQR1_USCH_SHIFT(n) (((n)-1) << 4) /* n=1..8 */ #define ADC_SEQR1_USCH_SHIFT(n) (((n)-1) << 2) /* n=1..8 */
#define ADC_SEQR1_USCH_MASK(n) (15 << ADC_SEQR1_USCH_SHIFT(n)) #define ADC_SEQR1_USCH_MASK(n) (15 << ADC_SEQR1_USCH_SHIFT(n))
# define ADC_SEQR1_USCH(n,v) ((uint32_t)(v) << ADC_SEQR1_USCH_SHIFT(n)) # define ADC_SEQR1_USCH(n,v) ((uint32_t)(v) << ADC_SEQR1_USCH_SHIFT(n))
#define ADC_SEQR1_USCH1_SHIFT (0) /* Bits 0-3: User sequence number 1 */ #define ADC_SEQR1_USCH1_SHIFT (0) /* Bits 0-3: User sequence number 1 */
@ -233,7 +233,7 @@
/* Channel Sequence Register 2 */ /* Channel Sequence Register 2 */
#define ADC_SEQR2_USCH_SHIFT(n) (((n)-9) << 4) /* n=9..11 */ #define ADC_SEQR2_USCH_SHIFT(n) (((n)-9) << 2) /* n=9..11 */
#define ADC_SEQR2_USCH_MASK(n) (15 << ADC_SEQR2_USCH_SHIFT(n)) #define ADC_SEQR2_USCH_MASK(n) (15 << ADC_SEQR2_USCH_SHIFT(n))
# define ADC_SEQR2_USCH(n,v) ((uint32_t)(v) << ADC_SEQR2_USCH_SHIFT(n)) # define ADC_SEQR2_USCH(n,v) ((uint32_t)(v) << ADC_SEQR2_USCH_SHIFT(n))
#define ADC_SEQR2_USCH9_SHIFT (0) /* Bits 0-3: User sequence number 9 */ #define ADC_SEQR2_USCH9_SHIFT (0) /* Bits 0-3: User sequence number 9 */

16
arch/arm/src/sama5/sam_adc.c
View File

@ -671,7 +671,7 @@ static void sam_adc_dmacallback(DMA_HANDLE handle, void *arg, int result)
sam_adc_dmasetup(priv->dma, sam_adc_dmasetup(priv->dma,
priv->odd ? (void *)priv->oddbuf : (void *)priv->evenbuf, priv->odd ? (void *)priv->oddbuf : (void *)priv->evenbuf,
SAMA5_NCHANNELS); SAMA5_NCHANNELS * sizeof(uint32_t));
} }
#endif #endif
@ -995,7 +995,7 @@ static int sam_adc_setup(struct adc_dev_s *dev)
priv->ready = true; priv->ready = true;
priv->enabled = false; priv->enabled = false;
sam_adc_dmasetup(priv->dma, (void *)priv->evenbuf, SAMA5_NCHANNELS); sam_adc_dmasetup(priv, (void *)priv->evenbuf, SAMA5_NCHANNELS);
#else #else
/* Enable end-of-conversion interrupts for all enabled channels. */ /* Enable end-of-conversion interrupts for all enabled channels. */
@ -1566,8 +1566,6 @@ static void sam_adc_analogchange(struct sam_adc_s *priv)
#ifdef CONFIG_SAMA5_ADC_SEQUENCER #ifdef CONFIG_SAMA5_ADC_SEQUENCER
static void sam_adc_setseqr(int chan, uint32_t *seqr1, uint32_t *seqr2, int seq) static void sam_adc_setseqr(int chan, uint32_t *seqr1, uint32_t *seqr2, int seq)
{ {
avdbg("seqr1=%p seqr2=%p seg=%d\n");
if (seq > 8) if (seq > 8)
{ {
*seqr2 |= ADC_SEQR2_USCH(seq, chan); *seqr2 |= ADC_SEQR2_USCH(seq, chan);
@ -1576,6 +1574,8 @@ static void sam_adc_setseqr(int chan, uint32_t *seqr1, uint32_t *seqr2, int seq)
{ {
*seqr1 |= ADC_SEQR1_USCH(seq, chan); *seqr1 |= ADC_SEQR1_USCH(seq, chan);
} }
avdbg("chan=%d seqr1=%08x seqr2=%08x seq=%d\n", chan, *seqr1, *seqr2, seq);
} }
#endif #endif
@ -1593,7 +1593,7 @@ static void sam_adc_sequencer(struct sam_adc_s *priv)
seqr1 = 0; seqr1 = 0;
seqr2 = 0; seqr2 = 0;
seq = 0; seq = 1;
#ifdef CONFIG_SAMA5_ADC_CHAN0 #ifdef CONFIG_SAMA5_ADC_CHAN0
sam_adc_setseqr(0, &seqr1, &seqr2, seq++); sam_adc_setseqr(0, &seqr1, &seqr2, seq++);
@ -1701,12 +1701,6 @@ static void sam_adc_channels(struct sam_adc_s *priv)
avdbg("Entry\n"); avdbg("Entry\n");
/* Disable the sequencer */
regval = sam_adc_getreg(priv, SAM_ADC_MR);
regval &= ~ADC_MR_USEQ;
sam_adc_putreg(priv, SAM_ADC_MR, regval);
/* Enable channels. */ /* Enable channels. */
regval = 0; regval = 0;

4
arch/arm/src/sama5/sam_dmac.c
View File

@ -2154,7 +2154,7 @@ int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
remaining -= maxtransfer; remaining -= maxtransfer;
/* Increment the memory & peripheral address (if it is appropriate to /* Increment the memory & peripheral address (if it is appropriate to
* do do). * do so).
*/ */
if ((dmach->flags & DMACH_FLAG_PERIPHINCREMENT) != 0) if ((dmach->flags & DMACH_FLAG_PERIPHINCREMENT) != 0)
@ -2233,7 +2233,7 @@ int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
remaining -= maxtransfer; remaining -= maxtransfer;
/* Increment the memory & peripheral address (if it is appropriate to /* Increment the memory & peripheral address (if it is appropriate to
* do do). * do so).
*/ */
if ((dmach->flags & DMACH_FLAG_PERIPHINCREMENT) != 0) if ((dmach->flags & DMACH_FLAG_PERIPHINCREMENT) != 0)

43
arch/arm/src/sama5/sam_tc.c
View File

@ -93,8 +93,13 @@
/* Timer debug is enabled if any timer client is enabled */ /* Timer debug is enabled if any timer client is enabled */
#ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_ANALOG
# undef CONFIG_SAMA5_TC_REGDEBUG
#endif
#undef DEBUG_TC #undef DEBUG_TC
#if defined(CONFIG_SAMA5_ADC) #if defined(CONFIG_SAMA5_ADC) && defined(CONFIG_DEBUG_ANALOG)
# define DEBUG_TC 1 # define DEBUG_TC 1
#endif #endif
@ -159,7 +164,7 @@ struct sam_tc_s
/* Debug stuff */ /* Debug stuff */
#ifdef CONFIG_SAMA5_HSMCI_REGDEBUG #ifdef CONFIG_SAMA5_TC_REGDEBUG
bool wrlast; /* Last was a write */ bool wrlast; /* Last was a write */
uint32_t addrlast; /* Last address */ uint32_t addrlast; /* Last address */
uint32_t vallast; /* Last value */ uint32_t vallast; /* Last value */
@ -176,22 +181,22 @@ struct sam_tc_s
static void sam_takesem(struct sam_tc_s *tc); static void sam_takesem(struct sam_tc_s *tc);
#define sam_givesem(tc) (sem_post(&tc->exclsem)) #define sam_givesem(tc) (sem_post(&tc->exclsem))
#ifdef CONFIG_SAMA5_HSMCI_REGDEBUG #ifdef CONFIG_SAMA5_TC_REGDEBUG
static bool sam_checkreg(struct sam_tc_s *tc, bool wr, static bool sam_checkreg(struct sam_tc_s *tc, bool wr, uint32_t regaddr,
uint32_t value, uint32_t regaddr, uint32_t regval); uint32_t regval);
#else #else
# define sam_checkreg(tc,wr,value,regaddr) (false) # define sam_checkreg(tc,wr,regaddr,regval) (false)
#endif #endif
static inline uint32_t sam_tc_getreg(struct sam_chan_s *chan, static inline uint32_t sam_tc_getreg(struct sam_chan_s *chan,
unsigned int offset); unsigned int offset);
static inline void sam_tc_putreg(struct sam_chan_s *chan, static inline void sam_tc_putreg(struct sam_chan_s *chan,
unsigned int offset, uint32_t value); unsigned int offset, uint32_t regval);
static inline uint32_t sam_chan_getreg(struct sam_chan_s *chan, static inline uint32_t sam_chan_getreg(struct sam_chan_s *chan,
unsigned int offset); unsigned int offset);
static inline void sam_chan_putreg(struct sam_chan_s *chan, static inline void sam_chan_putreg(struct sam_chan_s *chan,
unsigned int offset, uint32_t value); unsigned int offset, uint32_t regval);
/* Initialization ***********************************************************/ /* Initialization ***********************************************************/
@ -425,8 +430,10 @@ static void sam_takesem(struct sam_tc_s *tc)
* Check if the current register access is a duplicate of the preceding. * Check if the current register access is a duplicate of the preceding.
* *
* Input Parameters: * Input Parameters:
* value - The value to be written * tc - The timer/counter peripheral state
* regaddr - The address of the register to write to * wr - True:write access false:read access
* regval - The regiser value associated with the access
* regaddr - The address of the register being accessed
* *
* Returned Value: * Returned Value:
* true: This is the first register access of this type. * true: This is the first register access of this type.
@ -434,12 +441,12 @@ static void sam_takesem(struct sam_tc_s *tc)
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SAMA5_HSMCI_REGDEBUG #ifdef CONFIG_SAMA5_TC_REGDEBUG
static bool sam_checkreg(struct sam_tc_s *tc, bool wr, uint32_t regaddr, static bool sam_checkreg(struct sam_tc_s *tc, bool wr, uint32_t regaddr,
uint32_t value) uint32_t regval)
{ {
if (wr == tc->wrlast && /* Same kind of access? */ if (wr == tc->wrlast && /* Same kind of access? */
value == tc->vallast && /* Same value? */ regval == tc->vallast && /* Same value? */
regaddr == tc->addrlast) /* Same regaddr? */ regaddr == tc->addrlast) /* Same regaddr? */
{ {
/* Yes, then just keep a count of the number of times we did this. */ /* Yes, then just keep a count of the number of times we did this. */
@ -461,7 +468,7 @@ static bool sam_checkreg(struct sam_tc_s *tc, bool wr, uint32_t regaddr,
/* Save information about the new access */ /* Save information about the new access */
tc->wrlast = wr; tc->wrlast = wr;
tc->vallast = value; tc->vallast = regval;
tc->addrlast = regaddr; tc->addrlast = regaddr;
tc->ntimes = 0; tc->ntimes = 0;
} }
@ -487,7 +494,7 @@ static inline uint32_t sam_tc_getreg(struct sam_chan_s *chan,
uint32_t regaddr = tc->base + offset; uint32_t regaddr = tc->base + offset;
uint32_t regval = getreg32(regaddr); uint32_t regval = getreg32(regaddr);
#ifdef CONFIG_SAMA5_HSMCI_REGDEBUG #ifdef CONFIG_SAMA5_TC_REGDEBUG
if (sam_checkreg(tc, false, regval, regaddr)) if (sam_checkreg(tc, false, regval, regaddr))
{ {
lldbg("%08x->%08x\n", regaddr, regval); lldbg("%08x->%08x\n", regaddr, regval);
@ -511,7 +518,7 @@ static inline void sam_tc_putreg(struct sam_chan_s *chan, uint32_t regval,
struct sam_tc_s *tc = chan->tc; struct sam_tc_s *tc = chan->tc;
uint32_t regaddr = tc->base + offset; uint32_t regaddr = tc->base + offset;
#ifdef CONFIG_SAMA5_HSMCI_REGDEBUG #ifdef CONFIG_SAMA5_TC_REGDEBUG
if (sam_checkreg(tc, true, regval, regaddr)) if (sam_checkreg(tc, true, regval, regaddr))
{ {
lldbg("%08x<-%08x\n", regaddr, regval); lldbg("%08x<-%08x\n", regaddr, regval);
@ -535,7 +542,7 @@ static inline uint32_t sam_chan_getreg(struct sam_chan_s *chan,
uint32_t regaddr = chan->base + offset; uint32_t regaddr = chan->base + offset;
uint32_t regval = getreg32(regaddr); uint32_t regval = getreg32(regaddr);
#ifdef CONFIG_SAMA5_HSMCI_REGDEBUG #ifdef CONFIG_SAMA5_TC_REGDEBUG
if (sam_checkreg(chan->tc, false, regval, regaddr)) if (sam_checkreg(chan->tc, false, regval, regaddr))
{ {
lldbg("%08x->%08x\n", regaddr, regval); lldbg("%08x->%08x\n", regaddr, regval);
@ -558,7 +565,7 @@ static inline void sam_chan_putreg(struct sam_chan_s *chan, unsigned int offset,
{ {
uint32_t regaddr = chan->base + offset; uint32_t regaddr = chan->base + offset;
#ifdef CONFIG_SAMA5_HSMCI_REGDEBUG #ifdef CONFIG_SAMA5_TC_REGDEBUG
if (sam_checkreg(chan->tc, true, regval, regaddr)) if (sam_checkreg(chan->tc, true, regval, regaddr))
{ {
lldbg("%08x<-%08x\n", regaddr, regval); lldbg("%08x<-%08x\n", regaddr, regval);