Merge tag 'pci-v4.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[karo-tx-linux.git] / drivers / lightnvm / rrpc.c

diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
index 75ed12ae0f471289b0eede389d6a0419c139cc6e..9fb7de395915ca8e3893f16273a5e6c20d4a763d 100644 (file)
--- a/drivers/lightnvm/rrpc.c
+++ b/drivers/lightnvm/rrpc.c
@@ -735,7 +735,7 @@ static void __rrpc_mark_bad_block(struct rrpc *rrpc, struct ppa_addr ppa)
        rblk = &rlun->blocks[ppa.g.blk];
        rblk->state = NVM_BLK_ST_BAD;
 
-       nvm_set_bb_tbl(dev->parent, &ppa, 1, NVM_BLK_T_GRWN_BAD);
+       nvm_set_tgt_bb_tbl(dev, &ppa, 1, NVM_BLK_T_GRWN_BAD);
 }
 
 static void rrpc_mark_bad_block(struct rrpc *rrpc, struct nvm_rq *rqd)
@@ -983,8 +983,8 @@ static int rrpc_submit_io(struct rrpc *rrpc, struct bio *bio,
                if (!(flags & NVM_IOTYPE_GC)) {
                        rrpc_unlock_rq(rrpc, rqd);
                        if (rqd->nr_ppas > 1)
-                               nvm_dev_dma_free(dev->parent,
-                                       rqd->ppa_list, rqd->dma_ppa_list);
+                               nvm_dev_dma_free(dev->parent, rqd->ppa_list,
+                                                       rqd->dma_ppa_list);
                }
                return NVM_IO_ERR;
        }
@@ -1116,7 +1116,7 @@ static int rrpc_l2p_update(u64 slba, u32 nlb, __le64 *entries, void *private)
 
                div_u64_rem(pba, rrpc->nr_sects, &mod);
 
-               gaddr = rrpc_recov_addr(dev->parent, pba);
+               gaddr = rrpc_recov_addr(dev, pba);
                rlun = rrpc_ppa_to_lun(rrpc, gaddr);
                if (!rlun) {
                        pr_err("rrpc: l2p corruption on lba %llu\n",
@@ -1166,12 +1166,9 @@ static int rrpc_map_init(struct rrpc *rrpc)
                r->addr = ADDR_EMPTY;
        }
 
-       if (!dev->ops->get_l2p_tbl)
-               return 0;
-
        /* Bring up the mapping table from device */
-       ret = dev->ops->get_l2p_tbl(dev->parent, rrpc->soffset, rrpc->nr_sects,
-                                       rrpc_l2p_update, rrpc);
+       ret = nvm_get_l2p_tbl(dev, rrpc->soffset, rrpc->nr_sects,
+                                                       rrpc_l2p_update, rrpc);
        if (ret) {
                pr_err("nvm: rrpc: could not read L2P table.\n");
                return -EINVAL;
@@ -1258,6 +1255,9 @@ static int rrpc_bb_discovery(struct nvm_tgt_dev *dev, struct rrpc_lun *rlun)
        int i;
        int ret;
 
+       if (!dev->parent->ops->get_bb_tbl)
+               return 0;
+
        nr_blks = geo->blks_per_lun * geo->plane_mode;
        blks = kmalloc(nr_blks, GFP_KERNEL);
        if (!blks)
@@ -1267,7 +1267,7 @@ static int rrpc_bb_discovery(struct nvm_tgt_dev *dev, struct rrpc_lun *rlun)
        ppa.g.ch = rlun->bppa.g.ch;
        ppa.g.lun = rlun->bppa.g.lun;
 
-       ret = nvm_get_bb_tbl(dev->parent, ppa, blks);
+       ret = nvm_get_tgt_bb_tbl(dev, ppa, blks);
        if (ret) {
                pr_err("rrpc: could not get BB table\n");
                goto out;
@@ -1277,7 +1277,6 @@ static int rrpc_bb_discovery(struct nvm_tgt_dev *dev, struct rrpc_lun *rlun)
        if (nr_blks < 0)
                return nr_blks;
 
-       rlun->nr_free_blocks = geo->blks_per_lun;
        for (i = 0; i < nr_blks; i++) {
                if (blks[i] == NVM_BLK_T_FREE)
                        continue;
@@ -1348,17 +1347,19 @@ static int rrpc_luns_init(struct rrpc *rrpc, struct ppa_addr *luns)
                        list_add_tail(&rblk->list, &rlun->free_list);
                }
 
-               if (rrpc_bb_discovery(dev, rlun))
-                       goto err;
-
+               rlun->rrpc = rrpc;
+               rlun->nr_free_blocks = geo->blks_per_lun;
                rlun->reserved_blocks = 2; /* for GC only */
 
-               rlun->rrpc = rrpc;
                INIT_LIST_HEAD(&rlun->prio_list);
                INIT_LIST_HEAD(&rlun->wblk_list);
 
                INIT_WORK(&rlun->ws_gc, rrpc_lun_gc);
                spin_lock_init(&rlun->lock);
+
+               if (rrpc_bb_discovery(dev, rlun))
+                       goto err;
+
        }
 
        return 0;
@@ -1370,13 +1371,12 @@ err:
 static int rrpc_area_init(struct rrpc *rrpc, sector_t *begin)
 {
        struct nvm_tgt_dev *dev = rrpc->dev;
-       struct nvmm_type *mt = dev->mt;
        sector_t size = rrpc->nr_sects * dev->geo.sec_size;
        int ret;
 
        size >>= 9;
 
-       ret = mt->get_area(dev->parent, begin, size);
+       ret = nvm_get_area(dev, begin, size);
        if (!ret)
                *begin >>= (ilog2(dev->geo.sec_size) - 9);
 
@@ -1386,10 +1386,9 @@ static int rrpc_area_init(struct rrpc *rrpc, sector_t *begin)
 static void rrpc_area_free(struct rrpc *rrpc)
 {
        struct nvm_tgt_dev *dev = rrpc->dev;
-       struct nvmm_type *mt = dev->mt;
        sector_t begin = rrpc->soffset << (ilog2(dev->geo.sec_size) - 9);
 
-       mt->put_area(dev->parent, begin);
+       nvm_put_area(dev, begin);
 }
 
 static void rrpc_free(struct rrpc *rrpc)