devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

iPod Classic: fix s5l8702 cache line length.

Browse source 
Use 32 bytes for cache line length (arm926ej-s), this prevents
misalignments of ATA storage buffer which in some builds could
cause weird faults.

Change-Id: I88dc595d251315620ec49b0251ddc039ff47181e
Reviewed-on: http://gerrit.rockbox.org/1031
Reviewed-by: Marcin Bukat <marcin.bukat@gmail.com>
This commit is contained in:
Cástor Muñoz 2014-11-10 01:50:19 +01:00 • committed by Marcin Bukat
parent bcca111438
commit edb0c6c92f
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/export/s5l8702.h
View file

@ -30,7 +30,7 @@
#define TIMER_FREQ 54000000 #define TIMER_FREQ 54000000
#define CACHEALIGN_BITS (4) /* 2^4 = 16 bytes */ #define CACHEALIGN_BITS (5) /* 2^5 = 32 bytes */
#define DRAM_ORIG 0x08000000 #define DRAM_ORIG 0x08000000
#define IRAM_ORIG 0 #define IRAM_ORIG 0

5
firmware/target/arm/s5l8702/debug-s5l8702.c
View file

@ -61,6 +61,11 @@ bool dbg_hw_info(void)
_DEBUG_PRINTF("speed: %d MHz", ((CLKCON0 & 1) ? _DEBUG_PRINTF("speed: %d MHz", ((CLKCON0 & 1) ?
CPUFREQ_NORMAL : CPUFREQ_MAX) / 1000000); CPUFREQ_NORMAL : CPUFREQ_MAX) / 1000000);
_DEBUG_PRINTF("current_tick: %d", (unsigned int)current_tick); _DEBUG_PRINTF("current_tick: %d", (unsigned int)current_tick);
uint32_t __res;
asm volatile ("mrc p15, 0, %0, c0, c0, 0" : "=r"(__res));
_DEBUG_PRINTF("ID code: %08x", __res);
asm volatile ("mrc p15, 0, %0, c0, c0, 1" : "=r"(__res));
_DEBUG_PRINTF("cache type: %08x", __res);
line++; line++;
_DEBUG_PRINTF("LCD type: %d", lcd_type); _DEBUG_PRINTF("LCD type: %d", lcd_type);

6
firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c Executable file → Normal file
View file

@ -48,8 +48,8 @@
/** static, private data **/ /** static, private data **/
static uint8_t ceata_taskfile[16] __attribute__((aligned(16))); static uint8_t ceata_taskfile[16] STORAGE_ALIGN_ATTR;
static uint16_t ata_identify_data[0x100] __attribute__((aligned(16))); static uint16_t ata_identify_data[0x100] STORAGE_ALIGN_ATTR;
static bool ceata; static bool ceata;
static bool ata_swap; static bool ata_swap;
static bool ata_lba48; static bool ata_lba48;
@ -68,7 +68,7 @@ static struct semaphore mmc_wakeup;
static struct semaphore mmc_comp_wakeup; static struct semaphore mmc_comp_wakeup;
static int spinup_time = 0; static int spinup_time = 0;
static int dma_mode = 0; static int dma_mode = 0;
static char aligned_buffer[SECTOR_SIZE] __attribute__((aligned(0x10))); static char aligned_buffer[SECTOR_SIZE] STORAGE_ALIGN_ATTR;
#ifdef ATA_HAVE_BBT #ifdef ATA_HAVE_BBT