]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/blobdiff - drivers/lightnvm/core.c
Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...
[mirror_ubuntu-artful-kernel.git] / drivers / lightnvm / core.c
index 02240a0b39c9d96e203b04a8e0cee96f31bed4d5..5262ba66a7a74c94d91d2c5815eb5bf19f2c62a2 100644 (file)
 
 static LIST_HEAD(nvm_tgt_types);
 static DECLARE_RWSEM(nvm_tgtt_lock);
-static LIST_HEAD(nvm_mgrs);
 static LIST_HEAD(nvm_devices);
 static DECLARE_RWSEM(nvm_lock);
 
+/* Map between virtual and physical channel and lun */
+struct nvm_ch_map {
+       int ch_off;
+       int nr_luns;
+       int *lun_offs;
+};
+
+struct nvm_dev_map {
+       struct nvm_ch_map *chnls;
+       int nr_chnls;
+};
+
+struct nvm_area {
+       struct list_head list;
+       sector_t begin;
+       sector_t end;   /* end is excluded */
+};
+
+static struct nvm_target *nvm_find_target(struct nvm_dev *dev, const char *name)
+{
+       struct nvm_target *tgt;
+
+       list_for_each_entry(tgt, &dev->targets, list)
+               if (!strcmp(name, tgt->disk->disk_name))
+                       return tgt;
+
+       return NULL;
+}
+
+static int nvm_reserve_luns(struct nvm_dev *dev, int lun_begin, int lun_end)
+{
+       int i;
+
+       for (i = lun_begin; i <= lun_end; i++) {
+               if (test_and_set_bit(i, dev->lun_map)) {
+                       pr_err("nvm: lun %d already allocated\n", i);
+                       goto err;
+               }
+       }
+
+       return 0;
+err:
+       while (--i > lun_begin)
+               clear_bit(i, dev->lun_map);
+
+       return -EBUSY;
+}
+
+static void nvm_release_luns_err(struct nvm_dev *dev, int lun_begin,
+                                int lun_end)
+{
+       int i;
+
+       for (i = lun_begin; i <= lun_end; i++)
+               WARN_ON(!test_and_clear_bit(i, dev->lun_map));
+}
+
+static void nvm_remove_tgt_dev(struct nvm_tgt_dev *tgt_dev)
+{
+       struct nvm_dev *dev = tgt_dev->parent;
+       struct nvm_dev_map *dev_map = tgt_dev->map;
+       int i, j;
+
+       for (i = 0; i < dev_map->nr_chnls; i++) {
+               struct nvm_ch_map *ch_map = &dev_map->chnls[i];
+               int *lun_offs = ch_map->lun_offs;
+               int ch = i + ch_map->ch_off;
+
+               for (j = 0; j < ch_map->nr_luns; j++) {
+                       int lun = j + lun_offs[j];
+                       int lunid = (ch * dev->geo.luns_per_chnl) + lun;
+
+                       WARN_ON(!test_and_clear_bit(lunid, dev->lun_map));
+               }
+
+               kfree(ch_map->lun_offs);
+       }
+
+       kfree(dev_map->chnls);
+       kfree(dev_map);
+
+       kfree(tgt_dev->luns);
+       kfree(tgt_dev);
+}
+
+static struct nvm_tgt_dev *nvm_create_tgt_dev(struct nvm_dev *dev,
+                                             int lun_begin, int lun_end)
+{
+       struct nvm_tgt_dev *tgt_dev = NULL;
+       struct nvm_dev_map *dev_rmap = dev->rmap;
+       struct nvm_dev_map *dev_map;
+       struct ppa_addr *luns;
+       int nr_luns = lun_end - lun_begin + 1;
+       int luns_left = nr_luns;
+       int nr_chnls = nr_luns / dev->geo.luns_per_chnl;
+       int nr_chnls_mod = nr_luns % dev->geo.luns_per_chnl;
+       int bch = lun_begin / dev->geo.luns_per_chnl;
+       int blun = lun_begin % dev->geo.luns_per_chnl;
+       int lunid = 0;
+       int lun_balanced = 1;
+       int prev_nr_luns;
+       int i, j;
+
+       nr_chnls = nr_luns / dev->geo.luns_per_chnl;
+       nr_chnls = (nr_chnls_mod == 0) ? nr_chnls : nr_chnls + 1;
+
+       dev_map = kmalloc(sizeof(struct nvm_dev_map), GFP_KERNEL);
+       if (!dev_map)
+               goto err_dev;
+
+       dev_map->chnls = kcalloc(nr_chnls, sizeof(struct nvm_ch_map),
+                                                               GFP_KERNEL);
+       if (!dev_map->chnls)
+               goto err_chnls;
+
+       luns = kcalloc(nr_luns, sizeof(struct ppa_addr), GFP_KERNEL);
+       if (!luns)
+               goto err_luns;
+
+       prev_nr_luns = (luns_left > dev->geo.luns_per_chnl) ?
+                                       dev->geo.luns_per_chnl : luns_left;
+       for (i = 0; i < nr_chnls; i++) {
+               struct nvm_ch_map *ch_rmap = &dev_rmap->chnls[i + bch];
+               int *lun_roffs = ch_rmap->lun_offs;
+               struct nvm_ch_map *ch_map = &dev_map->chnls[i];
+               int *lun_offs;
+               int luns_in_chnl = (luns_left > dev->geo.luns_per_chnl) ?
+                                       dev->geo.luns_per_chnl : luns_left;
+
+               if (lun_balanced && prev_nr_luns != luns_in_chnl)
+                       lun_balanced = 0;
+
+               ch_map->ch_off = ch_rmap->ch_off = bch;
+               ch_map->nr_luns = luns_in_chnl;
+
+               lun_offs = kcalloc(luns_in_chnl, sizeof(int), GFP_KERNEL);
+               if (!lun_offs)
+                       goto err_ch;
+
+               for (j = 0; j < luns_in_chnl; j++) {
+                       luns[lunid].ppa = 0;
+                       luns[lunid].g.ch = i;
+                       luns[lunid++].g.lun = j;
+
+                       lun_offs[j] = blun;
+                       lun_roffs[j + blun] = blun;
+               }
+
+               ch_map->lun_offs = lun_offs;
+
+               /* when starting a new channel, lun offset is reset */
+               blun = 0;
+               luns_left -= luns_in_chnl;
+       }
+
+       dev_map->nr_chnls = nr_chnls;
+
+       tgt_dev = kmalloc(sizeof(struct nvm_tgt_dev), GFP_KERNEL);
+       if (!tgt_dev)
+               goto err_ch;
+
+       memcpy(&tgt_dev->geo, &dev->geo, sizeof(struct nvm_geo));
+       /* Target device only owns a portion of the physical device */
+       tgt_dev->geo.nr_chnls = nr_chnls;
+       tgt_dev->geo.nr_luns = nr_luns;
+       tgt_dev->geo.luns_per_chnl = (lun_balanced) ? prev_nr_luns : -1;
+       tgt_dev->total_secs = nr_luns * tgt_dev->geo.sec_per_lun;
+       tgt_dev->q = dev->q;
+       tgt_dev->map = dev_map;
+       tgt_dev->luns = luns;
+       memcpy(&tgt_dev->identity, &dev->identity, sizeof(struct nvm_id));
+
+       tgt_dev->parent = dev;
+
+       return tgt_dev;
+err_ch:
+       while (--i > 0)
+               kfree(dev_map->chnls[i].lun_offs);
+       kfree(luns);
+err_luns:
+       kfree(dev_map->chnls);
+err_chnls:
+       kfree(dev_map);
+err_dev:
+       return tgt_dev;
+}
+
+static const struct block_device_operations nvm_fops = {
+       .owner          = THIS_MODULE,
+};
+
+static int nvm_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create)
+{
+       struct nvm_ioctl_create_simple *s = &create->conf.s;
+       struct request_queue *tqueue;
+       struct gendisk *tdisk;
+       struct nvm_tgt_type *tt;
+       struct nvm_target *t;
+       struct nvm_tgt_dev *tgt_dev;
+       void *targetdata;
+
+       tt = nvm_find_target_type(create->tgttype, 1);
+       if (!tt) {
+               pr_err("nvm: target type %s not found\n", create->tgttype);
+               return -EINVAL;
+       }
+
+       mutex_lock(&dev->mlock);
+       t = nvm_find_target(dev, create->tgtname);
+       if (t) {
+               pr_err("nvm: target name already exists.\n");
+               mutex_unlock(&dev->mlock);
+               return -EINVAL;
+       }
+       mutex_unlock(&dev->mlock);
+
+       if (nvm_reserve_luns(dev, s->lun_begin, s->lun_end))
+               return -ENOMEM;
+
+       t = kmalloc(sizeof(struct nvm_target), GFP_KERNEL);
+       if (!t)
+               goto err_reserve;
+
+       tgt_dev = nvm_create_tgt_dev(dev, s->lun_begin, s->lun_end);
+       if (!tgt_dev) {
+               pr_err("nvm: could not create target device\n");
+               goto err_t;
+       }
+
+       tqueue = blk_alloc_queue_node(GFP_KERNEL, dev->q->node);
+       if (!tqueue)
+               goto err_dev;
+       blk_queue_make_request(tqueue, tt->make_rq);
+
+       tdisk = alloc_disk(0);
+       if (!tdisk)
+               goto err_queue;
+
+       sprintf(tdisk->disk_name, "%s", create->tgtname);
+       tdisk->flags = GENHD_FL_EXT_DEVT;
+       tdisk->major = 0;
+       tdisk->first_minor = 0;
+       tdisk->fops = &nvm_fops;
+       tdisk->queue = tqueue;
+
+       targetdata = tt->init(tgt_dev, tdisk);
+       if (IS_ERR(targetdata))
+               goto err_init;
+
+       tdisk->private_data = targetdata;
+       tqueue->queuedata = targetdata;
+
+       blk_queue_max_hw_sectors(tqueue, 8 * dev->ops->max_phys_sect);
+
+       set_capacity(tdisk, tt->capacity(targetdata));
+       add_disk(tdisk);
+
+       if (tt->sysfs_init && tt->sysfs_init(tdisk))
+               goto err_sysfs;
+
+       t->type = tt;
+       t->disk = tdisk;
+       t->dev = tgt_dev;
+
+       mutex_lock(&dev->mlock);
+       list_add_tail(&t->list, &dev->targets);
+       mutex_unlock(&dev->mlock);
+
+       return 0;
+err_sysfs:
+       if (tt->exit)
+               tt->exit(targetdata);
+err_init:
+       put_disk(tdisk);
+err_queue:
+       blk_cleanup_queue(tqueue);
+err_dev:
+       nvm_remove_tgt_dev(tgt_dev);
+err_t:
+       kfree(t);
+err_reserve:
+       nvm_release_luns_err(dev, s->lun_begin, s->lun_end);
+       return -ENOMEM;
+}
+
+static void __nvm_remove_target(struct nvm_target *t)
+{
+       struct nvm_tgt_type *tt = t->type;
+       struct gendisk *tdisk = t->disk;
+       struct request_queue *q = tdisk->queue;
+
+       del_gendisk(tdisk);
+       blk_cleanup_queue(q);
+
+       if (tt->sysfs_exit)
+               tt->sysfs_exit(tdisk);
+
+       if (tt->exit)
+               tt->exit(tdisk->private_data);
+
+       nvm_remove_tgt_dev(t->dev);
+       put_disk(tdisk);
+
+       list_del(&t->list);
+       kfree(t);
+}
+
+/**
+ * nvm_remove_tgt - Removes a target from the media manager
+ * @dev:       device
+ * @remove:    ioctl structure with target name to remove.
+ *
+ * Returns:
+ * 0: on success
+ * 1: on not found
+ * <0: on error
+ */
+static int nvm_remove_tgt(struct nvm_dev *dev, struct nvm_ioctl_remove *remove)
+{
+       struct nvm_target *t;
+
+       mutex_lock(&dev->mlock);
+       t = nvm_find_target(dev, remove->tgtname);
+       if (!t) {
+               mutex_unlock(&dev->mlock);
+               return 1;
+       }
+       __nvm_remove_target(t);
+       mutex_unlock(&dev->mlock);
+
+       return 0;
+}
+
+static int nvm_register_map(struct nvm_dev *dev)
+{
+       struct nvm_dev_map *rmap;
+       int i, j;
+
+       rmap = kmalloc(sizeof(struct nvm_dev_map), GFP_KERNEL);
+       if (!rmap)
+               goto err_rmap;
+
+       rmap->chnls = kcalloc(dev->geo.nr_chnls, sizeof(struct nvm_ch_map),
+                                                               GFP_KERNEL);
+       if (!rmap->chnls)
+               goto err_chnls;
+
+       for (i = 0; i < dev->geo.nr_chnls; i++) {
+               struct nvm_ch_map *ch_rmap;
+               int *lun_roffs;
+               int luns_in_chnl = dev->geo.luns_per_chnl;
+
+               ch_rmap = &rmap->chnls[i];
+
+               ch_rmap->ch_off = -1;
+               ch_rmap->nr_luns = luns_in_chnl;
+
+               lun_roffs = kcalloc(luns_in_chnl, sizeof(int), GFP_KERNEL);
+               if (!lun_roffs)
+                       goto err_ch;
+
+               for (j = 0; j < luns_in_chnl; j++)
+                       lun_roffs[j] = -1;
+
+               ch_rmap->lun_offs = lun_roffs;
+       }
+
+       dev->rmap = rmap;
+
+       return 0;
+err_ch:
+       while (--i >= 0)
+               kfree(rmap->chnls[i].lun_offs);
+err_chnls:
+       kfree(rmap);
+err_rmap:
+       return -ENOMEM;
+}
+
+static void nvm_map_to_dev(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *p)
+{
+       struct nvm_dev_map *dev_map = tgt_dev->map;
+       struct nvm_ch_map *ch_map = &dev_map->chnls[p->g.ch];
+       int lun_off = ch_map->lun_offs[p->g.lun];
+
+       p->g.ch += ch_map->ch_off;
+       p->g.lun += lun_off;
+}
+
+static void nvm_map_to_tgt(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *p)
+{
+       struct nvm_dev *dev = tgt_dev->parent;
+       struct nvm_dev_map *dev_rmap = dev->rmap;
+       struct nvm_ch_map *ch_rmap = &dev_rmap->chnls[p->g.ch];
+       int lun_roff = ch_rmap->lun_offs[p->g.lun];
+
+       p->g.ch -= ch_rmap->ch_off;
+       p->g.lun -= lun_roff;
+}
+
+static void nvm_ppa_tgt_to_dev(struct nvm_tgt_dev *tgt_dev,
+                               struct ppa_addr *ppa_list, int nr_ppas)
+{
+       int i;
+
+       for (i = 0; i < nr_ppas; i++) {
+               nvm_map_to_dev(tgt_dev, &ppa_list[i]);
+               ppa_list[i] = generic_to_dev_addr(tgt_dev, ppa_list[i]);
+       }
+}
+
+static void nvm_ppa_dev_to_tgt(struct nvm_tgt_dev *tgt_dev,
+                               struct ppa_addr *ppa_list, int nr_ppas)
+{
+       int i;
+
+       for (i = 0; i < nr_ppas; i++) {
+               ppa_list[i] = dev_to_generic_addr(tgt_dev, ppa_list[i]);
+               nvm_map_to_tgt(tgt_dev, &ppa_list[i]);
+       }
+}
+
+static void nvm_rq_tgt_to_dev(struct nvm_tgt_dev *tgt_dev, struct nvm_rq *rqd)
+{
+       if (rqd->nr_ppas == 1) {
+               nvm_ppa_tgt_to_dev(tgt_dev, &rqd->ppa_addr, 1);
+               return;
+       }
+
+       nvm_ppa_tgt_to_dev(tgt_dev, rqd->ppa_list, rqd->nr_ppas);
+}
+
+static void nvm_rq_dev_to_tgt(struct nvm_tgt_dev *tgt_dev, struct nvm_rq *rqd)
+{
+       if (rqd->nr_ppas == 1) {
+               nvm_ppa_dev_to_tgt(tgt_dev, &rqd->ppa_addr, 1);
+               return;
+       }
+
+       nvm_ppa_dev_to_tgt(tgt_dev, rqd->ppa_list, rqd->nr_ppas);
+}
+
+void nvm_part_to_tgt(struct nvm_dev *dev, sector_t *entries,
+                    int len)
+{
+       struct nvm_geo *geo = &dev->geo;
+       struct nvm_dev_map *dev_rmap = dev->rmap;
+       u64 i;
+
+       for (i = 0; i < len; i++) {
+               struct nvm_ch_map *ch_rmap;
+               int *lun_roffs;
+               struct ppa_addr gaddr;
+               u64 pba = le64_to_cpu(entries[i]);
+               int off;
+               u64 diff;
+
+               if (!pba)
+                       continue;
+
+               gaddr = linear_to_generic_addr(geo, pba);
+               ch_rmap = &dev_rmap->chnls[gaddr.g.ch];
+               lun_roffs = ch_rmap->lun_offs;
+
+               off = gaddr.g.ch * geo->luns_per_chnl + gaddr.g.lun;
+
+               diff = ((ch_rmap->ch_off * geo->luns_per_chnl) +
+                               (lun_roffs[gaddr.g.lun])) * geo->sec_per_lun;
+
+               entries[i] -= cpu_to_le64(diff);
+       }
+}
+EXPORT_SYMBOL(nvm_part_to_tgt);
+
 struct nvm_tgt_type *nvm_find_target_type(const char *name, int lock)
 {
        struct nvm_tgt_type *tmp, *tt = NULL;
@@ -92,78 +565,6 @@ void nvm_dev_dma_free(struct nvm_dev *dev, void *addr, dma_addr_t dma_handler)
 }
 EXPORT_SYMBOL(nvm_dev_dma_free);
 
-static struct nvmm_type *nvm_find_mgr_type(const char *name)
-{
-       struct nvmm_type *mt;
-
-       list_for_each_entry(mt, &nvm_mgrs, list)
-               if (!strcmp(name, mt->name))
-                       return mt;
-
-       return NULL;
-}
-
-static struct nvmm_type *nvm_init_mgr(struct nvm_dev *dev)
-{
-       struct nvmm_type *mt;
-       int ret;
-
-       lockdep_assert_held(&nvm_lock);
-
-       list_for_each_entry(mt, &nvm_mgrs, list) {
-               if (strncmp(dev->sb.mmtype, mt->name, NVM_MMTYPE_LEN))
-                       continue;
-
-               ret = mt->register_mgr(dev);
-               if (ret < 0) {
-                       pr_err("nvm: media mgr failed to init (%d) on dev %s\n",
-                                                               ret, dev->name);
-                       return NULL; /* initialization failed */
-               } else if (ret > 0)
-                       return mt;
-       }
-
-       return NULL;
-}
-
-int nvm_register_mgr(struct nvmm_type *mt)
-{
-       struct nvm_dev *dev;
-       int ret = 0;
-
-       down_write(&nvm_lock);
-       if (nvm_find_mgr_type(mt->name)) {
-               ret = -EEXIST;
-               goto finish;
-       } else {
-               list_add(&mt->list, &nvm_mgrs);
-       }
-
-       /* try to register media mgr if any device have none configured */
-       list_for_each_entry(dev, &nvm_devices, devices) {
-               if (dev->mt)
-                       continue;
-
-               dev->mt = nvm_init_mgr(dev);
-       }
-finish:
-       up_write(&nvm_lock);
-
-       return ret;
-}
-EXPORT_SYMBOL(nvm_register_mgr);
-
-void nvm_unregister_mgr(struct nvmm_type *mt)
-{
-       if (!mt)
-               return;
-
-       down_write(&nvm_lock);
-       list_del(&mt->list);
-       up_write(&nvm_lock);
-}
-EXPORT_SYMBOL(nvm_unregister_mgr);
-
 static struct nvm_dev *nvm_find_nvm_dev(const char *name)
 {
        struct nvm_dev *dev;
@@ -175,53 +576,6 @@ static struct nvm_dev *nvm_find_nvm_dev(const char *name)
        return NULL;
 }
 
-static void nvm_tgt_generic_to_addr_mode(struct nvm_tgt_dev *tgt_dev,
-                                        struct nvm_rq *rqd)
-{
-       struct nvm_dev *dev = tgt_dev->parent;
-       int i;
-
-       if (rqd->nr_ppas > 1) {
-               for (i = 0; i < rqd->nr_ppas; i++) {
-                       rqd->ppa_list[i] = dev->mt->trans_ppa(tgt_dev,
-                                       rqd->ppa_list[i], TRANS_TGT_TO_DEV);
-                       rqd->ppa_list[i] = generic_to_dev_addr(dev,
-                                                       rqd->ppa_list[i]);
-               }
-       } else {
-               rqd->ppa_addr = dev->mt->trans_ppa(tgt_dev, rqd->ppa_addr,
-                                               TRANS_TGT_TO_DEV);
-               rqd->ppa_addr = generic_to_dev_addr(dev, rqd->ppa_addr);
-       }
-}
-
-int nvm_set_bb_tbl(struct nvm_dev *dev, struct ppa_addr *ppas, int nr_ppas,
-                                                               int type)
-{
-       struct nvm_rq rqd;
-       int ret;
-
-       if (nr_ppas > dev->ops->max_phys_sect) {
-               pr_err("nvm: unable to update all sysblocks atomically\n");
-               return -EINVAL;
-       }
-
-       memset(&rqd, 0, sizeof(struct nvm_rq));
-
-       nvm_set_rqd_ppalist(dev, &rqd, ppas, nr_ppas, 1);
-       nvm_generic_to_addr_mode(dev, &rqd);
-
-       ret = dev->ops->set_bb_tbl(dev, &rqd.ppa_addr, rqd.nr_ppas, type);
-       nvm_free_rqd_ppalist(dev, &rqd);
-       if (ret) {
-               pr_err("nvm: sysblk failed bb mark\n");
-               return -EINVAL;
-       }
-
-       return 0;
-}
-EXPORT_SYMBOL(nvm_set_bb_tbl);
-
 int nvm_set_tgt_bb_tbl(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *ppas,
                       int nr_ppas, int type)
 {
@@ -237,12 +591,12 @@ int nvm_set_tgt_bb_tbl(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *ppas,
        memset(&rqd, 0, sizeof(struct nvm_rq));
 
        nvm_set_rqd_ppalist(dev, &rqd, ppas, nr_ppas, 1);
-       nvm_tgt_generic_to_addr_mode(tgt_dev, &rqd);
+       nvm_rq_tgt_to_dev(tgt_dev, &rqd);
 
        ret = dev->ops->set_bb_tbl(dev, &rqd.ppa_addr, rqd.nr_ppas, type);
        nvm_free_rqd_ppalist(dev, &rqd);
        if (ret) {
-               pr_err("nvm: sysblk failed bb mark\n");
+               pr_err("nvm: failed bb mark\n");
                return -EINVAL;
        }
 
@@ -262,15 +616,42 @@ int nvm_submit_io(struct nvm_tgt_dev *tgt_dev, struct nvm_rq *rqd)
 {
        struct nvm_dev *dev = tgt_dev->parent;
 
-       return dev->mt->submit_io(tgt_dev, rqd);
+       if (!dev->ops->submit_io)
+               return -ENODEV;
+
+       nvm_rq_tgt_to_dev(tgt_dev, rqd);
+
+       rqd->dev = tgt_dev;
+       return dev->ops->submit_io(dev, rqd);
 }
 EXPORT_SYMBOL(nvm_submit_io);
 
-int nvm_erase_blk(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *p, int flags)
+int nvm_erase_blk(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *ppas, int flags)
 {
        struct nvm_dev *dev = tgt_dev->parent;
+       struct nvm_rq rqd;
+       int ret;
+
+       if (!dev->ops->erase_block)
+               return 0;
+
+       nvm_map_to_dev(tgt_dev, ppas);
+
+       memset(&rqd, 0, sizeof(struct nvm_rq));
+
+       ret = nvm_set_rqd_ppalist(dev, &rqd, ppas, 1, 1);
+       if (ret)
+               return ret;
+
+       nvm_rq_tgt_to_dev(tgt_dev, &rqd);
+
+       rqd.flags = flags;
+
+       ret = dev->ops->erase_block(dev, &rqd);
 
-       return dev->mt->erase_blk(tgt_dev, p, flags);
+       nvm_free_rqd_ppalist(dev, &rqd);
+
+       return ret;
 }
 EXPORT_SYMBOL(nvm_erase_blk);
 
@@ -289,46 +670,67 @@ EXPORT_SYMBOL(nvm_get_l2p_tbl);
 int nvm_get_area(struct nvm_tgt_dev *tgt_dev, sector_t *lba, sector_t len)
 {
        struct nvm_dev *dev = tgt_dev->parent;
+       struct nvm_geo *geo = &dev->geo;
+       struct nvm_area *area, *prev, *next;
+       sector_t begin = 0;
+       sector_t max_sectors = (geo->sec_size * dev->total_secs) >> 9;
 
-       return dev->mt->get_area(dev, lba, len);
-}
-EXPORT_SYMBOL(nvm_get_area);
+       if (len > max_sectors)
+               return -EINVAL;
 
-void nvm_put_area(struct nvm_tgt_dev *tgt_dev, sector_t lba)
-{
-       struct nvm_dev *dev = tgt_dev->parent;
+       area = kmalloc(sizeof(struct nvm_area), GFP_KERNEL);
+       if (!area)
+               return -ENOMEM;
 
-       dev->mt->put_area(dev, lba);
-}
-EXPORT_SYMBOL(nvm_put_area);
+       prev = NULL;
 
-void nvm_addr_to_generic_mode(struct nvm_dev *dev, struct nvm_rq *rqd)
-{
-       int i;
+       spin_lock(&dev->lock);
+       list_for_each_entry(next, &dev->area_list, list) {
+               if (begin + len > next->begin) {
+                       begin = next->end;
+                       prev = next;
+                       continue;
+               }
+               break;
+       }
 
-       if (rqd->nr_ppas > 1) {
-               for (i = 0; i < rqd->nr_ppas; i++)
-                       rqd->ppa_list[i] = dev_to_generic_addr(dev,
-                                                       rqd->ppa_list[i]);
-       } else {
-               rqd->ppa_addr = dev_to_generic_addr(dev, rqd->ppa_addr);
+       if ((begin + len) > max_sectors) {
+               spin_unlock(&dev->lock);
+               kfree(area);
+               return -EINVAL;
        }
+
+       area->begin = *lba = begin;
+       area->end = begin + len;
+
+       if (prev) /* insert into sorted order */
+               list_add(&area->list, &prev->list);
+       else
+               list_add(&area->list, &dev->area_list);
+       spin_unlock(&dev->lock);
+
+       return 0;
 }
-EXPORT_SYMBOL(nvm_addr_to_generic_mode);
+EXPORT_SYMBOL(nvm_get_area);
 
-void nvm_generic_to_addr_mode(struct nvm_dev *dev, struct nvm_rq *rqd)
+void nvm_put_area(struct nvm_tgt_dev *tgt_dev, sector_t begin)
 {
-       int i;
+       struct nvm_dev *dev = tgt_dev->parent;
+       struct nvm_area *area;
 
-       if (rqd->nr_ppas > 1) {
-               for (i = 0; i < rqd->nr_ppas; i++)
-                       rqd->ppa_list[i] = generic_to_dev_addr(dev,
-                                                       rqd->ppa_list[i]);
-       } else {
-               rqd->ppa_addr = generic_to_dev_addr(dev, rqd->ppa_addr);
+       spin_lock(&dev->lock);
+       list_for_each_entry(area, &dev->area_list, list) {
+               if (area->begin != begin)
+                       continue;
+
+               list_del(&area->list);
+               spin_unlock(&dev->lock);
+               kfree(area);
+               return;
        }
+       spin_unlock(&dev->lock);
 }
-EXPORT_SYMBOL(nvm_generic_to_addr_mode);
+EXPORT_SYMBOL(nvm_put_area);
 
 int nvm_set_rqd_ppalist(struct nvm_dev *dev, struct nvm_rq *rqd,
                        const struct ppa_addr *ppas, int nr_ppas, int vblk)
@@ -380,149 +782,19 @@ void nvm_free_rqd_ppalist(struct nvm_dev *dev, struct nvm_rq *rqd)
 }
 EXPORT_SYMBOL(nvm_free_rqd_ppalist);
 
-int nvm_erase_ppa(struct nvm_dev *dev, struct ppa_addr *ppas, int nr_ppas,
-                                                               int flags)
+void nvm_end_io(struct nvm_rq *rqd)
 {
-       struct nvm_rq rqd;
-       int ret;
+       struct nvm_tgt_dev *tgt_dev = rqd->dev;
 
-       if (!dev->ops->erase_block)
-               return 0;
+       /* Convert address space */
+       if (tgt_dev)
+               nvm_rq_dev_to_tgt(tgt_dev, rqd);
 
-       memset(&rqd, 0, sizeof(struct nvm_rq));
-
-       ret = nvm_set_rqd_ppalist(dev, &rqd, ppas, nr_ppas, 1);
-       if (ret)
-               return ret;
-
-       nvm_generic_to_addr_mode(dev, &rqd);
-
-       rqd.flags = flags;
-
-       ret = dev->ops->erase_block(dev, &rqd);
-
-       nvm_free_rqd_ppalist(dev, &rqd);
-
-       return ret;
-}
-EXPORT_SYMBOL(nvm_erase_ppa);
-
-void nvm_end_io(struct nvm_rq *rqd, int error)
-{
-       rqd->error = error;
-       rqd->end_io(rqd);
+       if (rqd->end_io)
+               rqd->end_io(rqd);
 }
 EXPORT_SYMBOL(nvm_end_io);
 
-static void nvm_end_io_sync(struct nvm_rq *rqd)
-{
-       struct completion *waiting = rqd->wait;
-
-       rqd->wait = NULL;
-
-       complete(waiting);
-}
-
-static int __nvm_submit_ppa(struct nvm_dev *dev, struct nvm_rq *rqd, int opcode,
-                                               int flags, void *buf, int len)
-{
-       DECLARE_COMPLETION_ONSTACK(wait);
-       struct bio *bio;
-       int ret;
-       unsigned long hang_check;
-
-       bio = bio_map_kern(dev->q, buf, len, GFP_KERNEL);
-       if (IS_ERR_OR_NULL(bio))
-               return -ENOMEM;
-
-       nvm_generic_to_addr_mode(dev, rqd);
-
-       rqd->dev = NULL;
-       rqd->opcode = opcode;
-       rqd->flags = flags;
-       rqd->bio = bio;
-       rqd->wait = &wait;
-       rqd->end_io = nvm_end_io_sync;
-
-       ret = dev->ops->submit_io(dev, rqd);
-       if (ret) {
-               bio_put(bio);
-               return ret;
-       }
-
-       /* Prevent hang_check timer from firing at us during very long I/O */
-       hang_check = sysctl_hung_task_timeout_secs;
-       if (hang_check)
-               while (!wait_for_completion_io_timeout(&wait,
-                                                       hang_check * (HZ/2)))
-                       ;
-       else
-               wait_for_completion_io(&wait);
-
-       return rqd->error;
-}
-
-/**
- * nvm_submit_ppa_list - submit user-defined ppa list to device. The user must
- *                      take to free ppa list if necessary.
- * @dev:       device
- * @ppa_list:  user created ppa_list
- * @nr_ppas:   length of ppa_list
- * @opcode:    device opcode
- * @flags:     device flags
- * @buf:       data buffer
- * @len:       data buffer length
- */
-int nvm_submit_ppa_list(struct nvm_dev *dev, struct ppa_addr *ppa_list,
-                       int nr_ppas, int opcode, int flags, void *buf, int len)
-{
-       struct nvm_rq rqd;
-
-       if (dev->ops->max_phys_sect < nr_ppas)
-               return -EINVAL;
-
-       memset(&rqd, 0, sizeof(struct nvm_rq));
-
-       rqd.nr_ppas = nr_ppas;
-       if (nr_ppas > 1)
-               rqd.ppa_list = ppa_list;
-       else
-               rqd.ppa_addr = ppa_list[0];
-
-       return __nvm_submit_ppa(dev, &rqd, opcode, flags, buf, len);
-}
-EXPORT_SYMBOL(nvm_submit_ppa_list);
-
-/**
- * nvm_submit_ppa - submit PPAs to device. PPAs will automatically be unfolded
- *                 as single, dual, quad plane PPAs depending on device type.
- * @dev:       device
- * @ppa:       user created ppa_list
- * @nr_ppas:   length of ppa_list
- * @opcode:    device opcode
- * @flags:     device flags
- * @buf:       data buffer
- * @len:       data buffer length
- */
-int nvm_submit_ppa(struct nvm_dev *dev, struct ppa_addr *ppa, int nr_ppas,
-                               int opcode, int flags, void *buf, int len)
-{
-       struct nvm_rq rqd;
-       int ret;
-
-       memset(&rqd, 0, sizeof(struct nvm_rq));
-       ret = nvm_set_rqd_ppalist(dev, &rqd, ppa, nr_ppas, 1);
-       if (ret)
-               return ret;
-
-       ret = __nvm_submit_ppa(dev, &rqd, opcode, flags, buf, len);
-
-       nvm_free_rqd_ppalist(dev, &rqd);
-
-       return ret;
-}
-EXPORT_SYMBOL(nvm_submit_ppa);
-
 /*
  * folds a bad block list from its plane representation to its virtual
  * block representation. The fold is done in place and reduced size is
@@ -559,21 +831,14 @@ int nvm_bb_tbl_fold(struct nvm_dev *dev, u8 *blks, int nr_blks)
 }
 EXPORT_SYMBOL(nvm_bb_tbl_fold);
 
-int nvm_get_bb_tbl(struct nvm_dev *dev, struct ppa_addr ppa, u8 *blks)
-{
-       ppa = generic_to_dev_addr(dev, ppa);
-
-       return dev->ops->get_bb_tbl(dev, ppa, blks);
-}
-EXPORT_SYMBOL(nvm_get_bb_tbl);
-
 int nvm_get_tgt_bb_tbl(struct nvm_tgt_dev *tgt_dev, struct ppa_addr ppa,
                       u8 *blks)
 {
        struct nvm_dev *dev = tgt_dev->parent;
 
-       ppa = dev->mt->trans_ppa(tgt_dev, ppa, TRANS_TGT_TO_DEV);
-       return nvm_get_bb_tbl(dev, ppa, blks);
+       nvm_ppa_tgt_to_dev(tgt_dev, &ppa, 1);
+
+       return dev->ops->get_bb_tbl(dev, ppa, blks);
 }
 EXPORT_SYMBOL(nvm_get_tgt_bb_tbl);
 
@@ -627,7 +892,7 @@ static int nvm_init_mlc_tbl(struct nvm_dev *dev, struct nvm_id_group *grp)
 static int nvm_core_init(struct nvm_dev *dev)
 {
        struct nvm_id *id = &dev->identity;
-       struct nvm_id_group *grp = &id->groups[0];
+       struct nvm_id_group *grp = &id->grp;
        struct nvm_geo *geo = &dev->geo;
        int ret;
 
@@ -691,36 +956,31 @@ static int nvm_core_init(struct nvm_dev *dev)
                goto err_fmtype;
        }
 
+       INIT_LIST_HEAD(&dev->area_list);
+       INIT_LIST_HEAD(&dev->targets);
        mutex_init(&dev->mlock);
        spin_lock_init(&dev->lock);
 
-       blk_queue_logical_block_size(dev->q, geo->sec_size);
+       ret = nvm_register_map(dev);
+       if (ret)
+               goto err_fmtype;
 
+       blk_queue_logical_block_size(dev->q, geo->sec_size);
        return 0;
 err_fmtype:
        kfree(dev->lun_map);
        return ret;
 }
 
-static void nvm_free_mgr(struct nvm_dev *dev)
-{
-       if (!dev->mt)
-               return;
-
-       dev->mt->unregister_mgr(dev);
-       dev->mt = NULL;
-}
-
 void nvm_free(struct nvm_dev *dev)
 {
        if (!dev)
                return;
 
-       nvm_free_mgr(dev);
-
        if (dev->dma_pool)
                dev->ops->destroy_dma_pool(dev->dma_pool);
 
+       kfree(dev->rmap);
        kfree(dev->lptbl);
        kfree(dev->lun_map);
        kfree(dev);
@@ -731,28 +991,19 @@ static int nvm_init(struct nvm_dev *dev)
        struct nvm_geo *geo = &dev->geo;
        int ret = -EINVAL;
 
-       if (!dev->q || !dev->ops)
-               return ret;
-
        if (dev->ops->identity(dev, &dev->identity)) {
                pr_err("nvm: device could not be identified\n");
                goto err;
        }
 
-       pr_debug("nvm: ver:%x nvm_vendor:%x groups:%u\n",
-                       dev->identity.ver_id, dev->identity.vmnt,
-                                                       dev->identity.cgrps);
+       pr_debug("nvm: ver:%x nvm_vendor:%x\n",
+                       dev->identity.ver_id, dev->identity.vmnt);
 
        if (dev->identity.ver_id != 1) {
                pr_err("nvm: device not supported by kernel.");
                goto err;
        }
 
-       if (dev->identity.cgrps != 1) {
-               pr_err("nvm: only one group configuration supported.");
-               goto err;
-       }
-
        ret = nvm_core_init(dev);
        if (ret) {
                pr_err("nvm: could not initialize core structures.\n");
@@ -779,49 +1030,50 @@ int nvm_register(struct nvm_dev *dev)
 {
        int ret;
 
-       ret = nvm_init(dev);
-       if (ret)
-               goto err_init;
+       if (!dev->q || !dev->ops)
+               return -EINVAL;
 
        if (dev->ops->max_phys_sect > 256) {
                pr_info("nvm: max sectors supported is 256.\n");
-               ret = -EINVAL;
-               goto err_init;
+               return -EINVAL;
        }
 
        if (dev->ops->max_phys_sect > 1) {
                dev->dma_pool = dev->ops->create_dma_pool(dev, "ppalist");
                if (!dev->dma_pool) {
                        pr_err("nvm: could not create dma pool\n");
-                       ret = -ENOMEM;
-                       goto err_init;
+                       return -ENOMEM;
                }
        }
 
-       if (dev->identity.cap & NVM_ID_DCAP_BBLKMGMT) {
-               ret = nvm_get_sysblock(dev, &dev->sb);
-               if (!ret)
-                       pr_err("nvm: device not initialized.\n");
-               else if (ret < 0)
-                       pr_err("nvm: err (%d) on device initialization\n", ret);
-       }
+       ret = nvm_init(dev);
+       if (ret)
+               goto err_init;
 
        /* register device with a supported media manager */
        down_write(&nvm_lock);
-       if (ret > 0)
-               dev->mt = nvm_init_mgr(dev);
        list_add(&dev->devices, &nvm_devices);
        up_write(&nvm_lock);
 
        return 0;
 err_init:
-       kfree(dev->lun_map);
+       dev->ops->destroy_dma_pool(dev->dma_pool);
        return ret;
 }
 EXPORT_SYMBOL(nvm_register);
 
 void nvm_unregister(struct nvm_dev *dev)
 {
+       struct nvm_target *t, *tmp;
+
+       mutex_lock(&dev->mlock);
+       list_for_each_entry_safe(t, tmp, &dev->targets, list) {
+               if (t->dev->parent != dev)
+                       continue;
+               __nvm_remove_target(t);
+       }
+       mutex_unlock(&dev->mlock);
+
        down_write(&nvm_lock);
        list_del(&dev->devices);
        up_write(&nvm_lock);
@@ -844,24 +1096,24 @@ static int __nvm_configure_create(struct nvm_ioctl_create *create)
                return -EINVAL;
        }
 
-       if (!dev->mt) {
-               pr_info("nvm: device has no media manager registered.\n");
-               return -ENODEV;
-       }
-
        if (create->conf.type != NVM_CONFIG_TYPE_SIMPLE) {
                pr_err("nvm: config type not valid\n");
                return -EINVAL;
        }
        s = &create->conf.s;
 
-       if (s->lun_begin > s->lun_end || s->lun_end > dev->geo.nr_luns) {
+       if (s->lun_begin == -1 && s->lun_end == -1) {
+               s->lun_begin = 0;
+               s->lun_end = dev->geo.nr_luns - 1;
+       }
+
+       if (s->lun_begin > s->lun_end || s->lun_end >= dev->geo.nr_luns) {
                pr_err("nvm: lun out of bound (%u:%u > %u)\n",
-                       s->lun_begin, s->lun_end, dev->geo.nr_luns);
+                       s->lun_begin, s->lun_end, dev->geo.nr_luns - 1);
                return -EINVAL;
        }
 
-       return dev->mt->create_tgt(dev, create);
+       return nvm_create_tgt(dev, create);
 }
 
 static long nvm_ioctl_info(struct file *file, void __user *arg)
@@ -923,16 +1175,14 @@ static long nvm_ioctl_get_devices(struct file *file, void __user *arg)
                struct nvm_ioctl_device_info *info = &devices->info[i];
 
                sprintf(info->devname, "%s", dev->name);
-               if (dev->mt) {
-                       info->bmversion[0] = dev->mt->version[0];
-                       info->bmversion[1] = dev->mt->version[1];
-                       info->bmversion[2] = dev->mt->version[2];
-                       sprintf(info->bmname, "%s", dev->mt->name);
-               } else {
-                       sprintf(info->bmname, "none");
-               }
 
+               /* kept for compatibility */
+               info->bmversion[0] = 1;
+               info->bmversion[1] = 0;
+               info->bmversion[2] = 0;
+               sprintf(info->bmname, "%s", "gennvm");
                i++;
+
                if (i > 31) {
                        pr_err("nvm: max 31 devices can be reported.\n");
                        break;
@@ -994,7 +1244,7 @@ static long nvm_ioctl_dev_remove(struct file *file, void __user *arg)
        }
 
        list_for_each_entry(dev, &nvm_devices, devices) {
-               ret = dev->mt->remove_tgt(dev, &remove);
+               ret = nvm_remove_tgt(dev, &remove);
                if (!ret)
                        break;
        }
@@ -1002,47 +1252,7 @@ static long nvm_ioctl_dev_remove(struct file *file, void __user *arg)
        return ret;
 }
 
-static void nvm_setup_nvm_sb_info(struct nvm_sb_info *info)
-{
-       info->seqnr = 1;
-       info->erase_cnt = 0;
-       info->version = 1;
-}
-
-static long __nvm_ioctl_dev_init(struct nvm_ioctl_dev_init *init)
-{
-       struct nvm_dev *dev;
-       struct nvm_sb_info info;
-       int ret;
-
-       down_write(&nvm_lock);
-       dev = nvm_find_nvm_dev(init->dev);
-       up_write(&nvm_lock);
-       if (!dev) {
-               pr_err("nvm: device not found\n");
-               return -EINVAL;
-       }
-
-       nvm_setup_nvm_sb_info(&info);
-
-       strncpy(info.mmtype, init->mmtype, NVM_MMTYPE_LEN);
-       info.fs_ppa.ppa = -1;
-
-       if (dev->identity.cap & NVM_ID_DCAP_BBLKMGMT) {
-               ret = nvm_init_sysblock(dev, &info);
-               if (ret)
-                       return ret;
-       }
-
-       memcpy(&dev->sb, &info, sizeof(struct nvm_sb_info));
-
-       down_write(&nvm_lock);
-       dev->mt = nvm_init_mgr(dev);
-       up_write(&nvm_lock);
-
-       return 0;
-}
-
+/* kept for compatibility reasons */
 static long nvm_ioctl_dev_init(struct file *file, void __user *arg)
 {
        struct nvm_ioctl_dev_init init;
@@ -1058,15 +1268,13 @@ static long nvm_ioctl_dev_init(struct file *file, void __user *arg)
                return -EINVAL;
        }
 
-       init.dev[DISK_NAME_LEN - 1] = '\0';
-
-       return __nvm_ioctl_dev_init(&init);
+       return 0;
 }
 
+/* Kept for compatibility reasons */
 static long nvm_ioctl_dev_factory(struct file *file, void __user *arg)
 {
        struct nvm_ioctl_dev_factory fact;
-       struct nvm_dev *dev;
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
@@ -1079,19 +1287,6 @@ static long nvm_ioctl_dev_factory(struct file *file, void __user *arg)
        if (fact.flags & ~(NVM_FACTORY_NR_BITS - 1))
                return -EINVAL;
 
-       down_write(&nvm_lock);
-       dev = nvm_find_nvm_dev(fact.dev);
-       up_write(&nvm_lock);
-       if (!dev) {
-               pr_err("nvm: device not found\n");
-               return -EINVAL;
-       }
-
-       nvm_free_mgr(dev);
-
-       if (dev->identity.cap & NVM_ID_DCAP_BBLKMGMT)
-               return nvm_dev_factory(dev, fact.flags);
-
        return 0;
 }