Index: uspace/lib/libblock/libblock.c =================================================================== --- uspace/lib/libblock/libblock.c (revision 402a18fea4d8130d968ebe076514596f024af690) +++ uspace/lib/libblock/libblock.c (revision 1ee00b7af6412235d0d33719a2a5c82edac587e8) @@ -50,4 +50,5 @@ #include #include +#include #include @@ -62,5 +63,5 @@ typedef struct { fibril_mutex_t lock; - size_t block_size; /**< Block size. */ + size_t lblock_size; /**< Logical block size. */ unsigned block_count; /**< Total number of blocks. */ unsigned blocks_cached; /**< Number of cached blocks. */ @@ -78,11 +79,12 @@ size_t com_size; void *bb_buf; - off_t bb_off; - size_t bb_size; + bn_t bb_addr; + size_t pblock_size; /**< Physical block size. */ cache_t *cache; } devcon_t; -static int read_block(devcon_t *devcon, bn_t boff, size_t block_size); -static int write_block(devcon_t *devcon, bn_t boff, size_t block_size); +static int read_blocks(devcon_t *devcon, bn_t ba, size_t cnt); +static int write_blocks(devcon_t *devcon, bn_t ba, size_t cnt); +static size_t get_block_size(int dev_phone, size_t *bsize); static devcon_t *devcon_search(dev_handle_t dev_handle) @@ -102,9 +104,12 @@ } -static int devcon_add(dev_handle_t dev_handle, int dev_phone, void *com_area, - size_t com_size) +static int devcon_add(dev_handle_t dev_handle, int dev_phone, size_t bsize, + void *com_area, size_t com_size) { link_t *cur; devcon_t *devcon; + + if (com_size < bsize) + return EINVAL; devcon = malloc(sizeof(devcon_t)); @@ -119,6 +124,6 @@ devcon->com_size = com_size; devcon->bb_buf = NULL; - devcon->bb_off = 0; - devcon->bb_size = 0; + devcon->bb_addr = 0; + devcon->pblock_size = bsize; devcon->cache = NULL; @@ -149,5 +154,6 @@ int dev_phone; void *com_area; - + size_t bsize; + com_area = mmap(NULL, com_size, PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); @@ -169,6 +175,12 @@ return rc; } + + if (get_block_size(dev_phone, &bsize) != EOK) { + munmap(com_area, com_size); + ipc_hangup(dev_phone); + return rc; + } - rc = devcon_add(dev_handle, dev_phone, com_area, com_size); + rc = devcon_add(dev_handle, dev_phone, bsize, com_area, com_size); if (rc != EOK) { munmap(com_area, com_size); @@ -201,5 +213,5 @@ } -int block_bb_read(dev_handle_t dev_handle, off_t off, size_t size) +int block_bb_read(dev_handle_t dev_handle, bn_t ba) { void *bb_buf; @@ -211,10 +223,10 @@ if (devcon->bb_buf) return EEXIST; - bb_buf = malloc(size); + bb_buf = malloc(devcon->pblock_size); if (!bb_buf) return ENOMEM; - + fibril_mutex_lock(&devcon->com_area_lock); - rc = read_block(devcon, 0, size); + rc = read_blocks(devcon, 0, 1); if (rc != EOK) { fibril_mutex_unlock(&devcon->com_area_lock); @@ -222,10 +234,9 @@ return rc; } - memcpy(bb_buf, devcon->com_area, size); + memcpy(bb_buf, devcon->com_area, devcon->pblock_size); fibril_mutex_unlock(&devcon->com_area_lock); devcon->bb_buf = bb_buf; - devcon->bb_off = off; - devcon->bb_size = size; + devcon->bb_addr = ba; return EOK; @@ -275,8 +286,11 @@ fibril_mutex_initialize(&cache->lock); list_initialize(&cache->free_head); - cache->block_size = size; + cache->lblock_size = size; cache->block_count = blocks; cache->blocks_cached = 0; cache->mode = mode; + + /* No block size translation a.t.m. */ + assert(cache->lblock_size == devcon->pblock_size); if (!hash_table_create(&cache->block_hash, CACHE_BUCKETS, 1, @@ -368,5 +382,5 @@ if (!b) goto recycle; - b->data = malloc(cache->block_size); + b->data = malloc(cache->lblock_size); if (!b->data) { free(b); @@ -400,6 +414,5 @@ fibril_mutex_lock(&devcon->com_area_lock); memcpy(devcon->com_area, b->data, b->size); - rc = write_block(devcon, b->boff, - cache->block_size); + rc = write_blocks(devcon, b->boff, 1); fibril_mutex_unlock(&devcon->com_area_lock); if (rc != EOK) { @@ -437,5 +450,5 @@ block_initialize(b); b->dev_handle = dev_handle; - b->size = cache->block_size; + b->size = cache->lblock_size; b->boff = boff; hash_table_insert(&cache->block_hash, &key, &b->hash_link); @@ -455,6 +468,6 @@ */ fibril_mutex_lock(&devcon->com_area_lock); - rc = read_block(devcon, b->boff, cache->block_size); - memcpy(b->data, devcon->com_area, cache->block_size); + rc = read_blocks(devcon, b->boff, 1); + memcpy(b->data, devcon->com_area, cache->lblock_size); fibril_mutex_unlock(&devcon->com_area_lock); if (rc != EOK) @@ -510,5 +523,5 @@ fibril_mutex_lock(&devcon->com_area_lock); memcpy(devcon->com_area, block->data, block->size); - rc = write_block(devcon, block->boff, block->size); + rc = write_blocks(devcon, block->boff, 1); fibril_mutex_unlock(&devcon->com_area_lock); block->dirty = false; @@ -588,10 +601,14 @@ */ int block_seqread(dev_handle_t dev_handle, off_t *bufpos, size_t *buflen, - off_t *pos, void *dst, size_t size, size_t block_size) + off_t *pos, void *dst, size_t size) { off_t offset = 0; size_t left = size; - devcon_t *devcon = devcon_search(dev_handle); + size_t block_size; + devcon_t *devcon; + + devcon = devcon_search(dev_handle); assert(devcon); + block_size = devcon->pblock_size; fibril_mutex_lock(&devcon->com_area_lock); @@ -620,5 +637,5 @@ int rc; - rc = read_block(devcon, *pos / block_size, block_size); + rc = read_blocks(devcon, *pos / block_size, 1); if (rc != EOK) { fibril_mutex_unlock(&devcon->com_area_lock); @@ -635,25 +652,21 @@ } -/** Read block from block device. +/** Read blocks from block device. * * @param devcon Device connection. - * @param boff Block index. - * @param block_size Block size. + * @param ba Address of first block. + * @param cnt Number of blocks. * @param src Buffer for storing the data. * * @return EOK on success or negative error code on failure. */ -static int read_block(devcon_t *devcon, bn_t boff, size_t block_size) -{ - ipcarg_t retval; +static int read_blocks(devcon_t *devcon, bn_t ba, size_t cnt) +{ int rc; assert(devcon); - rc = async_req_2_1(devcon->dev_phone, BD_READ_BLOCK, boff, block_size, - &retval); - if ((rc != EOK) || (retval != EOK)) - return (rc != EOK ? rc : (int) retval); - - return EOK; + rc = async_req_3_0(devcon->dev_phone, BD_READ_BLOCKS, LOWER32(ba), + UPPER32(ba), cnt); + return rc; } @@ -661,22 +674,31 @@ * * @param devcon Device connection. - * @param boff Block index. - * @param block_size Block size. + * @param ba Address of first block. + * @param cnt Number of blocks. * @param src Buffer containing the data to write. * * @return EOK on success or negative error code on failure. */ -static int write_block(devcon_t *devcon, bn_t boff, size_t block_size) -{ - ipcarg_t retval; +static int write_blocks(devcon_t *devcon, bn_t ba, size_t cnt) +{ int rc; assert(devcon); - rc = async_req_2_1(devcon->dev_phone, BD_WRITE_BLOCK, boff, block_size, - &retval); - if ((rc != EOK) || (retval != EOK)) - return (rc != EOK ? rc : (int) retval); - - return EOK; + rc = async_req_3_0(devcon->dev_phone, BD_WRITE_BLOCKS, LOWER32(ba), + UPPER32(ba), cnt); + return rc; +} + +/** Get block size used by the device. */ +static size_t get_block_size(int dev_phone, size_t *bsize) +{ + ipcarg_t bs; + int rc; + + rc = async_req_0_1(dev_phone, BD_GET_BLOCK_SIZE, &bs); + if (rc == EOK) + *bsize = (size_t) bs; + + return rc; } Index: uspace/lib/libblock/libblock.h =================================================================== --- uspace/lib/libblock/libblock.h (revision 402a18fea4d8130d968ebe076514596f024af690) +++ uspace/lib/libblock/libblock.h (revision 1ee00b7af6412235d0d33719a2a5c82edac587e8) @@ -60,5 +60,5 @@ #define BLOCK_FLAGS_NOREAD 1 -typedef unsigned bn_t; /**< Block number type. */ +typedef uint64_t bn_t; /**< Block number type. */ typedef struct block { @@ -98,5 +98,5 @@ extern void block_fini(dev_handle_t); -extern int block_bb_read(dev_handle_t, off_t, size_t); +extern int block_bb_read(dev_handle_t, bn_t); extern void *block_bb_get(dev_handle_t); @@ -107,5 +107,5 @@ extern int block_seqread(dev_handle_t, off_t *, size_t *, off_t *, void *, - size_t, size_t); + size_t); #endif