From 929be521d4dd8a0ed3b3a42cd22e1659407ce83a Mon Sep 17 00:00:00 2001 From: Cástor Muñoz Date: Fri, 12 Feb 2016 01:06:31 +0100 Subject: iPod Classic: fix buffer alignment on HDD driver Read/write buffers who are aligned to 16 were not re-aligned to 32 as it should be. Althrough USB storage and buffering are always passing buffers aligned to 32, a few unaligned buffers are being received from other tasks, so this patch could solve some rare random issues. Also fixes DMA configuration for HDDs that support any MDMA mode but only UDMA0 (probably will never happen). Change-Id: I00219ae434205681c69293fc563e0526224c9adf --- firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'firmware') diff --git a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c index 7f5a19b9d0..a924b82959 100644 --- a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c +++ b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c @@ -74,7 +74,7 @@ static int ata_reset(void); static void ata_power_down(void); #ifdef ATA_HAVE_BBT -char ata_bbt_buf[ATA_BBT_PAGES * 64]; +char ata_bbt_buf[ATA_BBT_PAGES * 64] STORAGE_ALIGN_ATTR; uint16_t (*ata_bbt)[0x20]; uint64_t ata_virtual_sectors; uint32_t ata_last_offset; @@ -679,10 +679,13 @@ static int ata_power_up(void) udmatime = 0x3050a52; param = 0x41; } + else if (ata_identify_data[88] & BIT(0)) + { + param = 0x40; + } if (ata_identify_data[88] & BITRANGE(0, 4)) { ata_dma_flags = BIT(2) | BIT(3) | BIT(9) | BIT(10); - param |= 0x40; } } ata_dma = param ? true : false; @@ -907,7 +910,7 @@ int ata_bbt_translate(uint64_t sector, uint32_t count, uint64_t* phys, uint32_t* static int ata_rw_sectors(uint64_t sector, uint32_t count, void* buffer, bool write) { - if (((uint32_t)buffer) & 0xf) + if (STORAGE_OVERLAP((uint32_t)buffer)) { while (count) { -- cgit v1.2.3