diff options
| author | weety <[email protected]> | 2013-04-02 20:24:51 +0800 |
|---|---|---|
| committer | weety <[email protected]> | 2013-04-02 20:24:51 +0800 |
| commit | fb9ea5eada7fb3d1fbc9bce6d8b5be486130c87e (patch) | |
| tree | d6343582c18ea138063b484b1a7e147fa7c428fd /bsp | |
| parent | 92d4c1939b6e68975698f751e617f6c46c7bb95e (diff) | |
enable at91sam9260 mmu, update SDIO and EMAC drivers
Diffstat (limited to 'bsp')
| -rwxr-xr-x[-rw-r--r--] | bsp/at91sam9260/at91_mci.c | 11 | ||||
| -rwxr-xr-x | bsp/at91sam9260/board.c | 2 | ||||
| -rwxr-xr-x | bsp/at91sam9260/macb.c | 99 | ||||
| -rwxr-xr-x | bsp/at91sam9260/rtconfig.h | 2 |
4 files changed, 52 insertions, 62 deletions
diff --git a/bsp/at91sam9260/at91_mci.c b/bsp/at91sam9260/at91_mci.c index 90d002d2bc..b9c2611f36 100644..100755 --- a/bsp/at91sam9260/at91_mci.c +++ b/bsp/at91sam9260/at91_mci.c @@ -27,6 +27,12 @@ #define mci_dbg(fmt, ...) #endif +#define MMU_NOCACHE_ADDR(a) ((rt_uint32_t)a | (1UL<<31)) + +extern void mmu_clean_dcache(rt_uint32_t buffer, rt_uint32_t size); +extern void mmu_invalidate_dcache(rt_uint32_t buffer, rt_uint32_t size); + + #define AT91_MCI_ERRORS (AT91_MCI_RINDE | AT91_MCI_RDIRE | AT91_MCI_RCRCE \ | AT91_MCI_RENDE | AT91_MCI_RTOE | AT91_MCI_DCRCE \ | AT91_MCI_DTOE | AT91_MCI_OVRE | AT91_MCI_UNRE) @@ -334,6 +340,7 @@ static void at91_mci_send_command(struct at91_mci *mci, struct rt_mmcsd_cmd *cmd * Handle a read */ + mmu_invalidate_dcache(data->buf, data->blksize*data->blks); at91_mci_init_dma_read(mci); ier = AT91_MCI_ENDRX /* | AT91_MCI_RXBUFF */; } @@ -359,13 +366,15 @@ static void at91_mci_send_command(struct at91_mci *mci, struct rt_mmcsd_cmd *cmd return; } rt_memset(mci->buf, 0, 12); - rt_memcpy(mci->buf, data->buf, block_length * blocks); + rt_memcpy(mci->buf, data->buf, length); + mmu_clean_dcache(mci->buf, length); at91_mci_write(AT91_PDC_TPR, (rt_uint32_t)(mci->buf)); at91_mci_write(AT91_PDC_TCR, (data->blksize & 0x3) ? length : length / 4); } else { + mmu_clean_dcache(data->buf, data->blksize*data->blks); at91_mci_write(AT91_PDC_TPR, (rt_uint32_t)(data->buf)); at91_mci_write(AT91_PDC_TCR, (data->blksize & 0x3) ? length : length / 4); diff --git a/bsp/at91sam9260/board.c b/bsp/at91sam9260/board.c index 8b098a7f0e..1ea8bfa5c6 100755 --- a/bsp/at91sam9260/board.c +++ b/bsp/at91sam9260/board.c @@ -341,7 +341,7 @@ void rt_hw_board_init() rt_hw_uart_init(); /* initialize mmu */ - //rt_hw_mmu_init(); + rt_hw_mmu_init(); /* initialize timer0 */ rt_hw_timer_init(); diff --git a/bsp/at91sam9260/macb.c b/bsp/at91sam9260/macb.c index e4371ec55d..7c77d6137f 100755 --- a/bsp/at91sam9260/macb.c +++ b/bsp/at91sam9260/macb.c @@ -18,6 +18,26 @@ #include <at91sam926x.h> #include "macb.h" +#define MMU_NOCACHE_ADDR(a) ((rt_uint32_t)a | (1UL<<31)) + +extern void mmu_clean_dcache(rt_uint32_t buffer, rt_uint32_t size); +extern void mmu_invalidate_dcache(rt_uint32_t buffer, rt_uint32_t size); + +/* Cache macros - Packet buffers would be from pbuf pool which is cached */ +#define EMAC_VIRT_NOCACHE(addr) (addr) +#define EMAC_CACHE_INVALIDATE(addr, size) \ + mmu_invalidate_dcache((rt_uint32_t)addr, size) +#define EMAC_CACHE_WRITEBACK(addr, size) \ + mmu_clean_dcache((rt_uint32_t)addr, size) +#define EMAC_CACHE_WRITEBACK_INVALIDATE(addr, size) \ + mmu_clean_invalidated_dcache((rt_uint32_t)addr, size) + +/* EMAC has BD's in cached memory - so need cache functions */ +#define BD_CACHE_INVALIDATE(addr, size) +#define BD_CACHE_WRITEBACK(addr, size) +#define BD_CACHE_WRITEBACK_INVALIDATE(addr, size) + + #define CONFIG_RMII #define MACB_RX_BUFFER_SIZE 4096*4 @@ -378,6 +398,8 @@ static rt_err_t rt_macb_init(rt_device_t dev) } macb->rx_tail = macb->tx_head = macb->tx_tail = 0; + BD_CACHE_WRITEBACK_INVALIDATE(macb->rx_ring, MACB_RX_RING_SIZE * sizeof(struct macb_dma_desc)); + BD_CACHE_WRITEBACK_INVALIDATE(macb->tx_ring, MACB_TX_RING_SIZE * sizeof(struct macb_dma_desc)); macb_writel(macb, RBQP, macb->rx_ring_dma); macb_writel(macb, TBQP, macb->tx_ring_dma); @@ -470,28 +492,12 @@ static rt_err_t rt_macb_control(rt_device_t dev, rt_uint8_t cmd, void *args) /* transmit packet. */ rt_err_t rt_macb_tx( rt_device_t dev, struct pbuf* p) { - struct pbuf* q; - rt_uint8_t* bufptr, *buf = RT_NULL; unsigned long ctrl; struct rt_macb_eth *macb = dev->user_data; unsigned int tx_head = macb->tx_head; - - /* lock macb device */ - rt_sem_take(&sem_lock, RT_WAITING_FOREVER); - buf = rt_malloc(p->tot_len); - if (!buf) { - rt_kprintf("%s:alloc buf failed\n", __func__); - return -RT_ENOMEM; - } - bufptr = buf; - - - for (q = p; q != NULL; q = q->next) - { - memcpy(bufptr, q->payload, q->len); - bufptr += q->len; - } + rt_sem_take(&sem_lock, RT_WAITING_FOREVER); + EMAC_CACHE_WRITEBACK(p->payload, p->tot_len); ctrl = p->tot_len & TXBUF_FRMLEN_MASK; ctrl |= TXBUF_FRAME_END; if (tx_head == (MACB_TX_RING_SIZE - 1)) { @@ -499,17 +505,14 @@ rt_err_t rt_macb_tx( rt_device_t dev, struct pbuf* p) macb->tx_head = 0; } else macb->tx_head++; - macb->tx_ring[tx_head].ctrl = ctrl; - macb->tx_ring[tx_head].addr = (rt_uint32_t)buf; + macb->tx_ring[tx_head].addr = (rt_uint32_t)p->payload; + BD_CACHE_WRITEBACK_INVALIDATE(macb->tx_ring[tx_head], sizeof(struct macb_dma_desc)); macb_writel(macb, NCR, MACB_BIT(TE) | MACB_BIT(RE) | MACB_BIT(TSTART)); - - /* unlock macb device */ - rt_sem_release(&sem_lock); + rt_sem_release(&sem_lock); /* wait ack */ rt_sem_take(&sem_ack, RT_WAITING_FOREVER); - rt_free(buf); return RT_EOK; } @@ -546,12 +549,7 @@ struct pbuf *rt_macb_rx(rt_device_t dev) int wrapped = 0; rt_uint32_t status; - struct pbuf* q; - rt_uint8_t *buf = RT_NULL; - - /* lock macb device */ rt_sem_take(&sem_lock, RT_WAITING_FOREVER); - for (;;) { if (!(macb->rx_ring[rx_tail].addr & RXADDR_USED)) break; @@ -574,39 +572,18 @@ struct pbuf *rt_macb_rx(rt_device_t dev) } if (wrapped) { unsigned int headlen, taillen; - buf = rt_malloc(len); - if (!buf) - { - rt_kprintf("%s:alloc memory failed\n", __func__); - pbuf_free(p); - p = RT_NULL; - break; - } headlen = 128 * (MACB_RX_RING_SIZE - macb->rx_tail); taillen = len - headlen; - memcpy((void *)buf, - buffer, headlen); - memcpy((void *)((unsigned int)buf + headlen), + EMAC_CACHE_INVALIDATE(buffer, headlen); + EMAC_CACHE_INVALIDATE(macb->rx_buffer, taillen); + memcpy((void *)p->payload, buffer, headlen); + memcpy((void *)((unsigned int)p->payload + headlen), macb->rx_buffer, taillen); - buffer = (void *)buf; - for (q = p; q != RT_NULL; q= q->next) - { - /* read data from device */ - memcpy((void *)q->payload, buffer, q->len); - buffer = (void *)((unsigned int)buffer + q->len); - } - rt_free(buf); - buf = RT_NULL; } else { - for (q = p; q != RT_NULL; q= q->next) - { - /* read data from device */ - memcpy((void *)q->payload, buffer, q->len); - buffer = (void *)((unsigned int)buffer + q->len); - } - + EMAC_CACHE_INVALIDATE(buffer, len); + memcpy((void *)p->payload, buffer, p->len); } if (++rx_tail >= MACB_RX_RING_SIZE) @@ -620,7 +597,7 @@ struct pbuf *rt_macb_rx(rt_device_t dev) } } } - /* unlock macb device */ + rt_sem_release(&sem_lock); return p; @@ -647,11 +624,17 @@ void macb_initialize() macb->rx_buffer = rt_malloc(MACB_RX_BUFFER_SIZE); macb->rx_ring = rt_malloc(MACB_RX_RING_SIZE * sizeof(struct macb_dma_desc)); macb->tx_ring = rt_malloc(MACB_TX_RING_SIZE * sizeof(struct macb_dma_desc)); - + + EMAC_CACHE_INVALIDATE(macb->rx_ring, MACB_RX_RING_SIZE * sizeof(struct macb_dma_desc)); + EMAC_CACHE_INVALIDATE(macb->tx_ring, MACB_TX_RING_SIZE * sizeof(struct macb_dma_desc)); + macb->rx_buffer_dma = (unsigned long)macb->rx_buffer; macb->rx_ring_dma = (unsigned long)macb->rx_ring; macb->tx_ring_dma = (unsigned long)macb->tx_ring; + macb->rx_ring = MMU_NOCACHE_ADDR(macb->rx_ring); + macb->tx_ring = MMU_NOCACHE_ADDR(macb->tx_ring); + macb->regs = AT91SAM9260_BASE_EMAC; macb->phy_addr = 0x00; diff --git a/bsp/at91sam9260/rtconfig.h b/bsp/at91sam9260/rtconfig.h index 1080c98173..ab5f3e5c51 100755 --- a/bsp/at91sam9260/rtconfig.h +++ b/bsp/at91sam9260/rtconfig.h @@ -141,8 +141,6 @@ #define RT_USING_LWIP #define RT_LWIP_DNS -#define LWIP_NETIF_LINK_CALLBACK 1 - /* Trace LwIP protocol */ // #define RT_LWIP_DEBUG |
