Index: uspace/lib/block/libblock.c =================================================================== --- uspace/lib/block/libblock.c (revision c4aa9cfd8e9381a2d886ffc77e6f62a5aa3e4357) +++ uspace/lib/block/libblock.c (revision 79ae36ddc409577eb0da3750b3a7280e034566a2) @@ -62,13 +62,13 @@ static LIST_INITIALIZE(dcl_head); -#define CACHE_BUCKETS_LOG2 10 -#define CACHE_BUCKETS (1 << CACHE_BUCKETS_LOG2) +#define CACHE_BUCKETS_LOG2 10 +#define CACHE_BUCKETS (1 << CACHE_BUCKETS_LOG2) typedef struct { fibril_mutex_t lock; - size_t lblock_size; /**< Logical block size. */ - unsigned blocks_cluster; /**< Physical blocks per block_t */ - unsigned block_count; /**< Total number of blocks. */ - unsigned blocks_cached; /**< Number of cached blocks. */ + size_t lblock_size; /**< Logical block size. */ + unsigned blocks_cluster; /**< Physical blocks per block_t */ + unsigned block_count; /**< Total number of blocks. */ + unsigned blocks_cached; /**< Number of cached blocks. */ hash_table_t block_hash; link_t free_head; @@ -79,5 +79,5 @@ link_t link; devmap_handle_t devmap_handle; - int dev_phone; + async_sess_t *sess; fibril_mutex_t comm_area_lock; void *comm_area; @@ -85,19 +85,20 @@ void *bb_buf; aoff64_t bb_addr; - size_t pblock_size; /**< Physical block size. */ + size_t pblock_size; /**< Physical block size. */ cache_t *cache; } devcon_t; -static int read_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt); -static int write_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt); -static int get_block_size(int dev_phone, size_t *bsize); -static int get_num_blocks(int dev_phone, aoff64_t *nblocks); -static aoff64_t ba_ltop(devcon_t *devcon, aoff64_t lba); +static int read_blocks(devcon_t *, aoff64_t, size_t); +static int write_blocks(devcon_t *, aoff64_t, size_t); +static int get_block_size(async_sess_t *, size_t *); +static int get_num_blocks(async_sess_t *, aoff64_t *); +static aoff64_t ba_ltop(devcon_t *, aoff64_t); static devcon_t *devcon_search(devmap_handle_t devmap_handle) { link_t *cur; - + fibril_mutex_lock(&dcl_lock); + for (cur = dcl_head.next; cur != &dcl_head; cur = cur->next) { devcon_t *devcon = list_get_instance(cur, devcon_t, link); @@ -107,17 +108,18 @@ } } + fibril_mutex_unlock(&dcl_lock); return NULL; } -static int devcon_add(devmap_handle_t devmap_handle, int dev_phone, size_t bsize, - void *comm_area, size_t comm_size) +static int devcon_add(devmap_handle_t devmap_handle, async_sess_t *sess, + size_t bsize, void *comm_area, size_t comm_size) { link_t *cur; devcon_t *devcon; - + if (comm_size < bsize) return EINVAL; - + devcon = malloc(sizeof(devcon_t)); if (!devcon) @@ -126,5 +128,5 @@ link_initialize(&devcon->link); devcon->devmap_handle = devmap_handle; - devcon->dev_phone = dev_phone; + devcon->sess = sess; fibril_mutex_initialize(&devcon->comm_area_lock); devcon->comm_area = comm_area; @@ -134,5 +136,5 @@ devcon->pblock_size = bsize; devcon->cache = NULL; - + fibril_mutex_lock(&dcl_lock); for (cur = dcl_head.next; cur != &dcl_head; cur = cur->next) { @@ -156,44 +158,46 @@ } -int block_init(devmap_handle_t devmap_handle, size_t comm_size) -{ - int rc; - int dev_phone; - void *comm_area; - size_t bsize; - - comm_area = mmap(NULL, comm_size, PROTO_READ | PROTO_WRITE, +int block_init(exch_mgmt_t mgmt, devmap_handle_t devmap_handle, + size_t comm_size) +{ + void *comm_area = mmap(NULL, comm_size, PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); - if (!comm_area) { + if (!comm_area) return ENOMEM; - } - - dev_phone = devmap_device_connect(devmap_handle, IPC_FLAG_BLOCKING); - if (dev_phone < 0) { + + async_sess_t *sess = devmap_device_connect(mgmt, devmap_handle, + IPC_FLAG_BLOCKING); + if (!sess) { munmap(comm_area, comm_size); - return dev_phone; - } - - rc = async_share_out_start(dev_phone, comm_area, + return ENOENT; + } + + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_share_out_start(exch, comm_area, AS_AREA_READ | AS_AREA_WRITE); - if (rc != EOK) { - munmap(comm_area, comm_size); - async_hangup(dev_phone); - return rc; - } - - if (get_block_size(dev_phone, &bsize) != EOK) { - munmap(comm_area, comm_size); - async_hangup(dev_phone); - return rc; - } - - rc = devcon_add(devmap_handle, dev_phone, bsize, comm_area, comm_size); + async_exchange_end(exch); + if (rc != EOK) { munmap(comm_area, comm_size); - async_hangup(dev_phone); + async_hangup(sess); return rc; } - + + size_t bsize; + rc = get_block_size(sess, &bsize); + + if (rc != EOK) { + munmap(comm_area, comm_size); + async_hangup(sess); + return rc; + } + + rc = devcon_add(devmap_handle, sess, bsize, comm_area, comm_size); + if (rc != EOK) { + munmap(comm_area, comm_size); + async_hangup(sess); + return rc; + } + return EOK; } @@ -206,14 +210,14 @@ if (devcon->cache) (void) block_cache_fini(devmap_handle); - + devcon_remove(devcon); - + if (devcon->bb_buf) free(devcon->bb_buf); - + munmap(devcon->comm_area, devcon->comm_size); - async_hangup(devcon->dev_phone); - - free(devcon); + async_hangup(devcon->sess); + + free(devcon); } @@ -808,5 +812,5 @@ assert(devcon); - return get_block_size(devcon->dev_phone, bsize); + return get_block_size(devcon->sess, bsize); } @@ -820,10 +824,8 @@ int block_get_nblocks(devmap_handle_t devmap_handle, aoff64_t *nblocks) { - devcon_t *devcon; - - devcon = devcon_search(devmap_handle); - assert(devcon); - - return get_num_blocks(devcon->dev_phone, nblocks); + devcon_t *devcon = devcon_search(devmap_handle); + assert(devcon); + + return get_num_blocks(devcon->sess, nblocks); } @@ -891,9 +893,11 @@ static int read_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt) { - int rc; - - assert(devcon); - rc = async_req_3_0(devcon->dev_phone, BD_READ_BLOCKS, LOWER32(ba), + assert(devcon); + + async_exch_t *exch = async_exchange_begin(devcon->sess); + int rc = async_req_3_0(exch, BD_READ_BLOCKS, LOWER32(ba), UPPER32(ba), cnt); + async_exchange_end(exch); + if (rc != EOK) { printf("Error %d reading %zu blocks starting at block %" PRIuOFF64 @@ -904,4 +908,5 @@ #endif } + return rc; } @@ -918,9 +923,11 @@ static int write_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt) { - int rc; - - assert(devcon); - rc = async_req_3_0(devcon->dev_phone, BD_WRITE_BLOCKS, LOWER32(ba), + assert(devcon); + + async_exch_t *exch = async_exchange_begin(devcon->sess); + int rc = async_req_3_0(exch, BD_WRITE_BLOCKS, LOWER32(ba), UPPER32(ba), cnt); + async_exchange_end(exch); + if (rc != EOK) { printf("Error %d writing %zu blocks starting at block %" PRIuOFF64 @@ -930,31 +937,36 @@ #endif } + return rc; } /** Get block size used by the device. */ -static int get_block_size(int dev_phone, size_t *bsize) +static int get_block_size(async_sess_t *sess, size_t *bsize) { sysarg_t bs; - int rc; - - rc = async_req_0_1(dev_phone, BD_GET_BLOCK_SIZE, &bs); + + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_0_1(exch, BD_GET_BLOCK_SIZE, &bs); + async_exchange_end(exch); + if (rc == EOK) *bsize = (size_t) bs; - + return rc; } /** Get total number of blocks on block device. */ -static int get_num_blocks(int dev_phone, aoff64_t *nblocks) -{ - sysarg_t nb_l, nb_h; - int rc; - - rc = async_req_0_2(dev_phone, BD_GET_NUM_BLOCKS, &nb_l, &nb_h); - if (rc == EOK) { +static int get_num_blocks(async_sess_t *sess, aoff64_t *nblocks) +{ + sysarg_t nb_l; + sysarg_t nb_h; + + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_0_2(exch, BD_GET_NUM_BLOCKS, &nb_l, &nb_h); + async_exchange_end(exch); + + if (rc == EOK) *nblocks = (aoff64_t) MERGE_LOUP32(nb_l, nb_h); - } - + return rc; } Index: uspace/lib/block/libblock.h =================================================================== --- uspace/lib/block/libblock.h (revision c4aa9cfd8e9381a2d886ffc77e6f62a5aa3e4357) +++ uspace/lib/block/libblock.h (revision 79ae36ddc409577eb0da3750b3a7280e034566a2) @@ -40,4 +40,5 @@ #include +#include #include "../../srv/vfs/vfs.h" #include @@ -96,5 +97,5 @@ }; -extern int block_init(devmap_handle_t, size_t); +extern int block_init(exch_mgmt_t, devmap_handle_t, size_t); extern void block_fini(devmap_handle_t);