From 978559a55c88467d2a5c483eb162fc6a0076b5c5 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 12 Sep 2010 14:35:25 +0000 Subject: [PATCH] Early AT45DB debug fixes git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2943 42af7a65-404d-4744-a932-0658087f49c3 --- arch/arm/src/arm/up_dataabort.c | 4 ++ arch/arm/src/arm/up_prefetchabort.c | 4 ++ configs/ea3131/src/up_fillpage.c | 73 +++++++++-------------------- drivers/mtd/at45db.c | 6 +-- 4 files changed, 33 insertions(+), 54 deletions(-) diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c index 49eb5b6a69..05886e3849 100644 --- a/arch/arm/src/arm/up_dataabort.c +++ b/arch/arm/src/arm/up_dataabort.c @@ -161,6 +161,10 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr) */ pg_miss(); + + /* Indicate that we are no longer in an interrupt handler */ + + current_regs = NULL; return; segfault: diff --git a/arch/arm/src/arm/up_prefetchabort.c b/arch/arm/src/arm/up_prefetchabort.c index ea70a2ff57..2d184bad66 100644 --- a/arch/arm/src/arm/up_prefetchabort.c +++ b/arch/arm/src/arm/up_prefetchabort.c @@ -132,6 +132,10 @@ void up_prefetchabort(uint32_t *regs) */ pg_miss(); + + /* Indicate that we are no longer in an interrupt handler */ + + current_regs = NULL; } else #endif diff --git a/configs/ea3131/src/up_fillpage.c b/configs/ea3131/src/up_fillpage.c index 156f89ab81..2d3412bef6 100755 --- a/configs/ea3131/src/up_fillpage.c +++ b/configs/ea3131/src/up_fillpage.c @@ -192,9 +192,7 @@ struct pg_source_s { /* If interrupts or DMA are used, then we will have to defer initialization */ -#if defined(CONFIG_LPC313x_SPI_INTERRUPTS) || defined(CONFIG_LPC313x_SPI_DMA) bool initialized; /* TRUE: we are initialized */ -#endif /* This is the M25P* device state structure */ @@ -247,7 +245,7 @@ static inline void lpc313x_initsrc(void) char devname[16]; #endif - pgvdbg("Initializing %s\n", CONFIG_PAGING_BINPATH); + pgllvdbg("Initializing %s\n", CONFIG_PAGING_BINPATH); /* No, do we need to mount an SD device? */ @@ -281,6 +279,9 @@ static inline void lpc313x_initsrc(void) g_pgsrc.fd = open(CONFIG_PAGING_BINPATH, O_RDONLY); DEBUGASSERT(g_pgsrc.fd >= 0); + + /* Then we are initialized */ + g_pgsrc.initialized = true; } } @@ -288,6 +289,7 @@ static inline void lpc313x_initsrc(void) #elif defined(CONFIG_PAGING_M25PX) || defined(CONFIG_PAGING_AT45DB) static inline void lpc313x_initsrc(void) { + FAR struct spi_dev_s *spi; #ifdef CONFIG_DEBUG uint32_t capacity; int ret; @@ -295,15 +297,15 @@ static inline void lpc313x_initsrc(void) /* Are we already initialized? */ -#if defined(CONFIG_LPC313x_SPI_INTERRUPTS) || defined(CONFIG_LPC313x_SPI_DMA) - if (!g_pgsrc.initialized) -#endif - { - pgvdbg("Initializing\n"); + if (!g_pgsrc.initialized) + { + /* No... the initialize now */ + + pgllvdbg("Initializing\n"); /* First get an instance of the SPI device interface */ - FAR struct spi_dev_s *spi = up_spiinitialize(CONFIG_PAGING_SPIPORT); + spi = up_spiinitialize(CONFIG_PAGING_SPIPORT); DEBUGASSERT(spi != NULL); /* Then bind the SPI interface to the MTD driver */ @@ -330,9 +332,9 @@ static inline void lpc313x_initsrc(void) DEBUGASSERT(capacity >= (CONFIG_PAGING_BINOFFSET + PG_TEXT_VSIZE)); #endif -#if defined(CONFIG_LPC313x_SPI_INTERRUPTS) || defined(CONFIG_LPC313x_SPI_DMA) + /* We are now initialized */ + g_pgsrc.initialized = true; -#endif } } @@ -411,7 +413,7 @@ int up_fillpage(FAR _TCB *tcb, FAR void *vpage) off_t offset; #endif - pgdbg("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far); + pglldbg("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far); DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND); /* If BINPATH is defined, then it is the full path to a file on a mounted file @@ -421,9 +423,7 @@ int up_fillpage(FAR _TCB *tcb, FAR void *vpage) #if defined(CONFIG_PAGING_BINPATH) - /* Perform initialization of the paging source device (if necessary and - * appropriate) - */ + /* Perform initialization of the paging source device (if necessary) */ lpc313x_initsrc(); @@ -446,17 +446,9 @@ int up_fillpage(FAR _TCB *tcb, FAR void *vpage) #elif defined(CONFIG_PAGING_M25PX) || defined(CONFIG_PAGING_AT45DB) /* !CONFIG_PAGING_BINPATH */ - /* If CONFIG_PAGING_M25PX or CONFIG_PAGING_AT45DB is defined, use the - * SPI corresponding FLASH driver. If either are selected, then the - * MTD interface to the device will be used to support paging. - * - * If the driver is configured to use interrupts or DMA, then it must be - * initialized in this context. - */ + /* Perform initialization of the paging source device (if necessary) */ -#if defined(CONFIG_LPC313x_SPI_INTERRUPTS) || defined(CONFIG_LPC313x_SPI_DMA) lpc313x_initsrc(); -#endif /* Create an offset into the binary image that corresponds to the * virtual address. File offset 0 corresponds to PG_LOCKED_VBASE. @@ -484,7 +476,7 @@ int up_fillpage(FAR _TCB *tcb, FAR void *vpage) int up_fillpage(FAR _TCB *tcb, FAR void *vpage, up_pgcallback_t pg_callback) { - pgdbg("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far); + pglldbg("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far); DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND); #if defined(CONFIG_PAGING_BINPATH) @@ -521,34 +513,13 @@ void weak_function lpc313x_pginitialize(void) * text addresses might map to offsets into that file. * - Do whatever else is necessary to make up_fillpage() ready for the first time * that it is called. - */ - -#if defined(CONFIG_PAGING_BINPATH) - - /* If BINPATH is defined, then it is the full path to a file on a mounted file - * system. However, in this case, initialization will involve some higher level - * file system operations. Since this function is called from a low level (before - * os_start() is even called), it may not be possible to perform file system - * operations yet. Therefore, initialization will be deferred until the first + * + * In reality, however, this function is not very useful: This function is called + * from a low level (before os_start() is even called), it may not be possible to + * perform file system operations or even to get debug output yet. Therefore, + * to keep life simple, initialization will be deferred in all cases until the first * time that up_fillpage() is called. */ - -#elif defined(CONFIG_PAGING_M25PX) || defined(CONFIG_PAGING_AT45DB) - - /* If CONFIG_PAGING_M25PX or CONFIG_PAGING_AT45DB is defined, use the corresponding - * FLASH driver. If either is selected, then the MTD interface to the device - * will be used to support paging. - * - * If the driver is not configured to use interrupts or DMA, then it is - * probably safe to initialize it in this context. - */ - -#if !defined(CONFIG_LPC313x_SPI_INTERRUPTS) && !defined(CONFIG_LPC313x_SPI_DMA) - - lpc313x_initsrc(); - -#endif -#endif } #endif /* CONFIG_PAGING */ diff --git a/drivers/mtd/at45db.c b/drivers/mtd/at45db.c index 314978e324..d090a1b853 100644 --- a/drivers/mtd/at45db.c +++ b/drivers/mtd/at45db.c @@ -312,9 +312,10 @@ static inline int at45db_rdid(struct at45db_dev_s *priv) fvdbg("priv: %p\n", priv); - /* Lock the SPI bus, configure the bus, and select this FLASH part. */ + /* Configure the bus, and select this FLASH part. (The caller should alread have + * loced the bus for exclusive access) + */ - at45db_lock(priv); SPI_SELECT(priv->spi, SPIDEV_FLASH, true); /* Send the " Manufacturer and Device ID Read" command and read the first three @@ -329,7 +330,6 @@ static inline int at45db_rdid(struct at45db_dev_s *priv) /* Deselect the FLASH and unlock the bus */ SPI_SELECT(priv->spi, SPIDEV_FLASH, false); - at45db_unlock(priv); fvdbg("manufacturer: %02x devid1: %02x devid2: %02x\n", manufacturer, devid1, devid2);