Patchwork [U-Boot] fs/fat: align disk buffers on cache line to enable DMA and cache

login
register
mail settings
Submitter Eric Nelson
Date March 3, 2012, 10:05 p.m.
Message ID <1330812338-25820-2-git-send-email-eric.nelson@boundarydevices.com>
Download mbox | patch
Permalink /patch/144463/
State Accepted
Headers show

Comments

Eric Nelson - March 3, 2012, 10:05 p.m.
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
 fs/fat/fat.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
Mike Frysinger - March 3, 2012, 11:14 p.m.
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike

Patch

diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index 1f95eb4..c924ec0 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -31,6 +31,7 @@ 
 #include <fat.h>
 #include <asm/byteorder.h>
 #include <part.h>
+#include <malloc.h>
 
 /*
  * Convert a string to lowercase.
@@ -62,7 +63,7 @@  static int disk_read(__u32 block, __u32 nr_blocks, void *buf)
 
 int fat_register_device (block_dev_desc_t * dev_desc, int part_no)
 {
-	unsigned char buffer[dev_desc->blksz];
+	ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
 
 	/* First close any currently found FAT filesystem */
 	cur_dev = NULL;
@@ -293,7 +294,7 @@  get_cluster (fsdata *mydata, __u32 clustnum, __u8 *buffer,
 		return -1;
 	}
 	if (size % mydata->sect_size) {
-		__u8 tmpbuf[mydata->sect_size];
+		ALLOC_CACHE_ALIGN_BUFFER(__u8, tmpbuf, mydata->sect_size);
 
 		idx = size / mydata->sect_size;
 		ret = disk_read(startsect + idx, 1, tmpbuf);
@@ -428,7 +429,7 @@  static int slot2str (dir_slot *slotptr, char *l_name, int *idx)
  * into 'retdent'
  * Return 0 on success, -1 otherwise.
  */
-__attribute__ ((__aligned__ (__alignof__ (dir_entry))))
+__attribute__ ((__aligned__ (ARCH_DMA_MINALIGN)))
 __u8 get_vfatname_block[MAX_CLUSTSIZE];
 
 static int
@@ -709,7 +710,7 @@  read_bootsectandvi (boot_sector *bs, volume_info *volinfo, int *fatsize)
 		return -1;
 	}
 
-	block = malloc(cur_dev->blksz);
+	block = memalign(ARCH_DMA_MINALIGN, cur_dev->blksz);
 	if (block == NULL) {
 		debug("Error: allocating block\n");
 		return -1;
@@ -828,7 +829,7 @@  do_fat_read (const char *filename, void *buffer, unsigned long maxsize,
 	}
 
 	mydata->fatbufnum = -1;
-	mydata->fatbuf = malloc(FATBUFSIZE);
+	mydata->fatbuf = memalign(ARCH_DMA_MINALIGN, FATBUFSIZE);
 	if (mydata->fatbuf == NULL) {
 		debug("Error: allocating memory\n");
 		return -1;