redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

nvme/lightnvm: Log using the ctrl named device

Browse source 
Align with the rest of the nvme subsystem.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Sagi Grimberg 2016-05-06 20:03:14 +02:00 committed by Jens Axboe
parent 75b8564932
commit b86d8d363e
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/nvme/host/lightnvm.c
View file

@ -367,8 +367,8 @@ static int nvme_nvm_get_l2p_tbl(struct nvm_dev *nvmdev, u64 slba, u32 nlb,
ret = nvme_submit_sync_cmd(ns->ctrl->admin_q, ret = nvme_submit_sync_cmd(ns->ctrl->admin_q,
(struct nvme_command *)&c, entries, len); (struct nvme_command *)&c, entries, len);
if (ret) { if (ret) {
dev_err(ns->ctrl->dev, "L2P table transfer failed (%d)\n", dev_err(ns->ctrl->device,
ret); "L2P table transfer failed (%d)\n", ret);
ret = -EIO; ret = -EIO;
goto out; goto out;
} }
@ -410,27 +410,28 @@ static int nvme_nvm_get_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr ppa,
ret = nvme_submit_sync_cmd(ctrl->admin_q, (struct nvme_command *)&c, ret = nvme_submit_sync_cmd(ctrl->admin_q, (struct nvme_command *)&c,
bb_tbl, tblsz); bb_tbl, tblsz);
if (ret) { if (ret) {
dev_err(ctrl->dev, "get bad block table failed (%d)\n", ret); dev_err(ctrl->device, "get bad block table failed (%d)\n", ret);
ret = -EIO; ret = -EIO;
goto out; goto out;
} }
if (bb_tbl->tblid[0] != 'B' || bb_tbl->tblid[1] != 'B' || if (bb_tbl->tblid[0] != 'B' || bb_tbl->tblid[1] != 'B' ||
bb_tbl->tblid[2] != 'L' || bb_tbl->tblid[3] != 'T') { bb_tbl->tblid[2] != 'L' || bb_tbl->tblid[3] != 'T') {
dev_err(ctrl->dev, "bbt format mismatch\n"); dev_err(ctrl->device, "bbt format mismatch\n");
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
if (le16_to_cpu(bb_tbl->verid) != 1) { if (le16_to_cpu(bb_tbl->verid) != 1) {
ret = -EINVAL; ret = -EINVAL;
dev_err(ctrl->dev, "bbt version not supported\n"); dev_err(ctrl->device, "bbt version not supported\n");
goto out; goto out;
} }
if (le32_to_cpu(bb_tbl->tblks) != nr_blks) { if (le32_to_cpu(bb_tbl->tblks) != nr_blks) {
ret = -EINVAL; ret = -EINVAL;
dev_err(ctrl->dev, "bbt unsuspected blocks returned (%u!=%u)", dev_err(ctrl->device,
"bbt unsuspected blocks returned (%u!=%u)",
le32_to_cpu(bb_tbl->tblks), nr_blks); le32_to_cpu(bb_tbl->tblks), nr_blks);
goto out; goto out;
} }
@ -457,7 +458,8 @@ static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr *ppas,
ret = nvme_submit_sync_cmd(ns->ctrl->admin_q, (struct nvme_command *)&c, ret = nvme_submit_sync_cmd(ns->ctrl->admin_q, (struct nvme_command *)&c,
NULL, 0); NULL, 0);
if (ret) if (ret)
dev_err(ns->ctrl->dev, "set bad block table failed (%d)\n", ret); dev_err(ns->ctrl->device, "set bad block table failed (%d)\n",
ret);
return ret; return ret;
} }