summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-02-22 10:02:20 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-02-22 10:02:20 +0000
commit355f38d30a6e652fccaa2ec0584ed7b63b86b07e (patch)
tree847b8facfc3d5ac4ecb1295b287901c1d1416bd6 /firmware
parent0880349fa85c5e3909a9909f9b432c7206b4378c (diff)
downloadrockbox-355f38d30a6e652fccaa2ec0584ed7b63b86b07e.tar.gz
rockbox-355f38d30a6e652fccaa2ec0584ed7b63b86b07e.tar.bz2
rockbox-355f38d30a6e652fccaa2ec0584ed7b63b86b07e.zip
sd-as3525v2: use an uncached buffer, disable write for the moment
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24858 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/target/arm/as3525/sd-as3525v2.c42
1 files changed, 32 insertions, 10 deletions
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index 400e449c58..16449d5249 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -175,6 +175,10 @@
#define MCI_FIFO ((unsigned long *) (SD_BASE+0x100))
+#define UNALIGNED_NUM_SECTORS 10
+static unsigned char aligned_buffer[UNALIGNED_NUM_SECTORS* SD_BLOCK_SIZE] __attribute__((aligned(32))); /* align on cache line size */
+static unsigned char *uncached_buffer = UNCACHED_ADDR(&aligned_buffer[0]);
+
static int sd_init_card(void);
static void init_controller(void);
@@ -404,14 +408,14 @@ static void init_controller(void)
int idx = (MCI_HCON >> 1) & 31;
int idx_bits = (1 << idx) -1;
- MCI_CLKSRC = 0;
- MCI_CLKDIV = 0;
-
MCI_PWREN &= ~idx_bits;
MCI_PWREN = idx_bits;
mci_delay();
+ MCI_CLKSRC = 0;
+ MCI_CLKDIV = 0;
+
MCI_CTRL |= CTRL_RESET;
while(MCI_CTRL & CTRL_RESET)
;
@@ -563,12 +567,20 @@ static int sd_transfer_sectors(unsigned long start, int count, void* buf, bool w
const int cmd = write ? SD_WRITE_MULTIPLE_BLOCK : SD_READ_MULTIPLE_BLOCK;
/* Interrupt handler might set this to true during transfer */
- retry = false;
-
do
{
+ void *dma_buf = aligned_buffer;
+ unsigned int transfer = count;
+ if(transfer > UNALIGNED_NUM_SECTORS)
+ transfer = UNALIGNED_NUM_SECTORS;
+
+ if(write)
+ memcpy(uncached_buffer, buf, transfer * SD_BLOCK_SIZE);
+
+ retry = false;
+
MCI_BLKSIZ = SD_BLOCK_SIZE;
- MCI_BYTCNT = count * SD_BLOCK_SIZE;
+ MCI_BYTCNT = transfer * SD_BLOCK_SIZE;
MCI_CTRL |= (FIFO_RESET|DMA_RESET);
while(MCI_CTRL & (FIFO_RESET|DMA_RESET))
@@ -592,10 +604,10 @@ static int sd_transfer_sectors(unsigned long start, int count, void* buf, bool w
panicf("transfer multiple blocks failed (%d)", ret);
if(write)
- dma_enable_channel(0, buf, MCI_FIFO, DMA_PERI_SD,
+ dma_enable_channel(0, dma_buf, MCI_FIFO, DMA_PERI_SD,
DMAC_FLOWCTRL_PERI_MEM_TO_PERI, true, false, 0, DMA_S8, NULL);
else
- dma_enable_channel(0, MCI_FIFO, buf, DMA_PERI_SD,
+ dma_enable_channel(0, MCI_FIFO, dma_buf, DMA_PERI_SD,
DMAC_FLOWCTRL_PERI_PERI_TO_MEM, false, true, 0, DMA_S8, NULL);
data_transfer = true;
@@ -617,7 +629,16 @@ static int sd_transfer_sectors(unsigned long start, int count, void* buf, bool w
panicf(" wait for state TRAN failed (%d)", ret);
goto sd_transfer_error;
}
- } while(retry);
+
+ if(!retry)
+ {
+ if(!write)
+ memcpy(buf, uncached_buffer, transfer * SD_BLOCK_SIZE);
+ buf += transfer * SD_BLOCK_SIZE;
+ start += transfer;
+ count -= transfer;
+ }
+ } while(retry || count);
dma_release();
@@ -640,7 +661,8 @@ int sd_read_sectors(unsigned long start, int count, void* buf)
int sd_write_sectors(unsigned long start, int count, const void* buf)
{
-#if defined(BOOTLOADER) /* we don't need write support in bootloader */
+#if 1 /* disabled until stable*/ \
+ || defined(BOOTLOADER) /* we don't need write support in bootloader */
(void) start;
(void) count;
(void) buf;