lightnvm: make nvm_set_rqd_ppalist() aware of vblks

[cascardo/linux.git] / drivers / lightnvm / core.c

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index e6d7a98..de5db7b 100644 (file)
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -251,33 +251,36 @@ void nvm_generic_to_addr_mode(struct nvm_dev *dev, struct nvm_rq *rqd)
 EXPORT_SYMBOL(nvm_generic_to_addr_mode);
 
 int nvm_set_rqd_ppalist(struct nvm_dev *dev, struct nvm_rq *rqd,
-                                       struct ppa_addr *ppas, int nr_ppas)
+                               struct ppa_addr *ppas, int nr_ppas, int vblk)
 {
        int i, plane_cnt, pl_idx;
 
-       if (dev->plane_mode == NVM_PLANE_SINGLE && nr_ppas == 1) {
-               rqd->nr_pages = 1;
+       if ((!vblk || dev->plane_mode == NVM_PLANE_SINGLE) && nr_ppas == 1) {
+               rqd->nr_pages = nr_ppas;
                rqd->ppa_addr = ppas[0];
 
                return 0;
        }
 
-       plane_cnt = dev->plane_mode;
-       rqd->nr_pages = plane_cnt * nr_ppas;
-
-       if (dev->ops->max_phys_sect < rqd->nr_pages)
-               return -EINVAL;
-
+       rqd->nr_pages = nr_ppas;
        rqd->ppa_list = nvm_dev_dma_alloc(dev, GFP_KERNEL, &rqd->dma_ppa_list);
        if (!rqd->ppa_list) {
                pr_err("nvm: failed to allocate dma memory\n");
                return -ENOMEM;
        }
 
-       for (pl_idx = 0; pl_idx < plane_cnt; pl_idx++) {
+       if (!vblk) {
+               for (i = 0; i < nr_ppas; i++)
+                       rqd->ppa_list[i] = ppas[i];
+       } else {
+               plane_cnt = dev->plane_mode;
+               rqd->nr_pages *= plane_cnt;
+
                for (i = 0; i < nr_ppas; i++) {
-                       ppas[i].g.pl = pl_idx;
-                       rqd->ppa_list[(pl_idx * nr_ppas) + i] = ppas[i];
+                       for (pl_idx = 0; pl_idx < plane_cnt; pl_idx++) {
+                               ppas[i].g.pl = pl_idx;
+                               rqd->ppa_list[(pl_idx * nr_ppas) + i] = ppas[i];
+                       }
                }
        }
 
@@ -304,7 +307,7 @@ int nvm_erase_ppa(struct nvm_dev *dev, struct ppa_addr *ppas, int nr_ppas)
 
        memset(&rqd, 0, sizeof(struct nvm_rq));
 
-       ret = nvm_set_rqd_ppalist(dev, &rqd, ppas, nr_ppas);
+       ret = nvm_set_rqd_ppalist(dev, &rqd, ppas, nr_ppas, 1);
        if (ret)
                return ret;
 
@@ -420,7 +423,7 @@ int nvm_submit_ppa(struct nvm_dev *dev, struct ppa_addr *ppa, int nr_ppas,
        int ret;
 
        memset(&rqd, 0, sizeof(struct nvm_rq));
-       ret = nvm_set_rqd_ppalist(dev, &rqd, ppa, nr_ppas);
+       ret = nvm_set_rqd_ppalist(dev, &rqd, ppa, nr_ppas, 1);
        if (ret)
                return ret;