Merge branch 'for-4.6/drivers' of git://git.kernel.dk/linux-block

[thirdparty/linux.git] / drivers / nvme / host / lightnvm.c

diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index 6bb15e4926dc86ed8b30e5cc2c504dc29090d545..42a01a93198944717f2f0266aaee7570d0c52467 100644 (file)
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -379,8 +379,31 @@ out:
        return ret;
 }
 
+static void nvme_nvm_bb_tbl_fold(struct nvm_dev *nvmdev,
+                                               int nr_dst_blks, u8 *dst_blks,
+                                               int nr_src_blks, u8 *src_blks)
+{
+       int blk, offset, pl, blktype;
+
+       for (blk = 0; blk < nr_dst_blks; blk++) {
+               offset = blk * nvmdev->plane_mode;
+               blktype = src_blks[offset];
+
+               /* Bad blocks on any planes take precedence over other types */
+               for (pl = 0; pl < nvmdev->plane_mode; pl++) {
+                       if (src_blks[offset + pl] &
+                                       (NVM_BLK_T_BAD|NVM_BLK_T_GRWN_BAD)) {
+                               blktype = src_blks[offset + pl];
+                               break;
+                       }
+               }
+
+               dst_blks[blk] = blktype;
+       }
+}
+
 static int nvme_nvm_get_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr ppa,
-                               int nr_blocks, nvm_bb_update_fn *update_bbtbl,
+                               int nr_dst_blks, nvm_bb_update_fn *update_bbtbl,
                                void *priv)
 {
        struct request_queue *q = nvmdev->q;
@@ -388,7 +411,9 @@ static int nvme_nvm_get_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr ppa,
        struct nvme_ctrl *ctrl = ns->ctrl;
        struct nvme_nvm_command c = {};
        struct nvme_nvm_bb_tbl *bb_tbl;
-       int tblsz = sizeof(struct nvme_nvm_bb_tbl) + nr_blocks;
+       u8 *dst_blks = NULL;
+       int nr_src_blks = nr_dst_blks * nvmdev->plane_mode;
+       int tblsz = sizeof(struct nvme_nvm_bb_tbl) + nr_src_blks;
        int ret = 0;
 
        c.get_bb.opcode = nvme_nvm_admin_get_bb_tbl;
@@ -399,6 +424,12 @@ static int nvme_nvm_get_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr ppa,
        if (!bb_tbl)
                return -ENOMEM;
 
+       dst_blks = kzalloc(nr_dst_blks, GFP_KERNEL);
+       if (!dst_blks) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
        ret = nvme_submit_sync_cmd(ctrl->admin_q, (struct nvme_command *)&c,
                                                                bb_tbl, tblsz);
        if (ret) {
@@ -420,16 +451,21 @@ static int nvme_nvm_get_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr ppa,
                goto out;
        }
 
-       if (le32_to_cpu(bb_tbl->tblks) != nr_blocks) {
+       if (le32_to_cpu(bb_tbl->tblks) != nr_src_blks) {
                ret = -EINVAL;
                dev_err(ctrl->dev, "bbt unsuspected blocks returned (%u!=%u)",
-                                       le32_to_cpu(bb_tbl->tblks), nr_blocks);
+                               le32_to_cpu(bb_tbl->tblks), nr_src_blks);
                goto out;
        }
 
+       nvme_nvm_bb_tbl_fold(nvmdev, nr_dst_blks, dst_blks,
+                                               nr_src_blks, bb_tbl->blk);
+
        ppa = dev_to_generic_addr(nvmdev, ppa);
-       ret = update_bbtbl(ppa, nr_blocks, bb_tbl->blk, priv);
+       ret = update_bbtbl(ppa, nr_dst_blks, dst_blks, priv);
+
 out:
+       kfree(dst_blks);
        kfree(bb_tbl);
        return ret;
 }