minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 12:13:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fs/fat: align disk buffers on cache line to enable DMA and cache

Browse Source 
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Eric Nelson 2012-04-11 04:08:53 +00:00 committed by Anatolij Gustschin
parent dec049d924
commit 9a800ac718
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/fat/fat.c
View File

@ -31,6 +31,8 @@
#include <fat.h> #include <fat.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <part.h> #include <part.h>
#include <malloc.h>
#include <linux/compiler.h>
/* /*
* Convert a string to lowercase. * Convert a string to lowercase.
@ -62,7 +64,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) 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 */ /* First close any currently found FAT filesystem */
cur_dev = NULL; cur_dev = NULL;
@ -293,7 +295,7 @@ get_cluster (fsdata *mydata, __u32 clustnum, __u8 *buffer,
return -1; return -1;
} }
if (size % mydata->sect_size) { if (size % mydata->sect_size) {
__u8 tmpbuf[mydata->sect_size]; ALLOC_CACHE_ALIGN_BUFFER(__u8, tmpbuf, mydata->sect_size);
idx = size / mydata->sect_size; idx = size / mydata->sect_size;
ret = disk_read(startsect + idx, 1, tmpbuf); ret = disk_read(startsect + idx, 1, tmpbuf);
@ -428,8 +430,8 @@ static int slot2str (dir_slot *slotptr, char *l_name, int *idx)
* into 'retdent' * into 'retdent'
* Return 0 on success, -1 otherwise. * Return 0 on success, -1 otherwise.
*/ */
__attribute__ ((__aligned__ (__alignof__ (dir_entry)))) __u8 get_vfatname_block[MAX_CLUSTSIZE]
__u8 get_vfatname_block[MAX_CLUSTSIZE]; __aligned(ARCH_DMA_MINALIGN);
static int static int
get_vfatname (fsdata *mydata, int curclust, __u8 *cluster, get_vfatname (fsdata *mydata, int curclust, __u8 *cluster,
@ -533,8 +535,8 @@ static __u8 mkcksum (const char *str)
* Get the directory entry associated with 'filename' from the directory * Get the directory entry associated with 'filename' from the directory
* starting at 'startsect' * starting at 'startsect'
*/ */
__attribute__ ((__aligned__ (__alignof__ (dir_entry)))) __u8 get_dentfromdir_block[MAX_CLUSTSIZE]
__u8 get_dentfromdir_block[MAX_CLUSTSIZE]; __aligned(ARCH_DMA_MINALIGN);
static dir_entry *get_dentfromdir (fsdata *mydata, int startsect, static dir_entry *get_dentfromdir (fsdata *mydata, int startsect,
char *filename, dir_entry *retdent, char *filename, dir_entry *retdent,
@ -709,7 +711,7 @@ read_bootsectandvi (boot_sector *bs, volume_info *volinfo, int *fatsize)
return -1; return -1;
} }
block = malloc(cur_dev->blksz); block = memalign(ARCH_DMA_MINALIGN, cur_dev->blksz);
if (block == NULL) { if (block == NULL) {
debug("Error: allocating block\n"); debug("Error: allocating block\n");
return -1; return -1;
@ -765,8 +767,8 @@ exit:
return ret; return ret;
} }
__attribute__ ((__aligned__ (__alignof__ (dir_entry)))) __u8 do_fat_read_block[MAX_CLUSTSIZE]
__u8 do_fat_read_block[MAX_CLUSTSIZE]; __aligned(ARCH_DMA_MINALIGN);
long long
do_fat_read (const char *filename, void *buffer, unsigned long maxsize, do_fat_read (const char *filename, void *buffer, unsigned long maxsize,
@ -828,7 +830,7 @@ do_fat_read (const char *filename, void *buffer, unsigned long maxsize,
} }
mydata->fatbufnum = -1; mydata->fatbufnum = -1;
mydata->fatbuf = malloc(FATBUFSIZE); mydata->fatbuf = memalign(ARCH_DMA_MINALIGN, FATBUFSIZE);
if (mydata->fatbuf == NULL) { if (mydata->fatbuf == NULL) {
debug("Error: allocating memory\n"); debug("Error: allocating memory\n");
return -1; return -1;