Merge tag 'for-5.5/drivers-20191121' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / nvme / host / core.c

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index fa7ba09..c5e434c 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -283,6 +283,8 @@ void nvme_complete_rq(struct request *req)
 
        trace_nvme_complete_rq(req);
 
+       nvme_cleanup_cmd(req);
+
        if (nvme_req(req)->ctrl->kas)
                nvme_req(req)->ctrl->comp_seen = true;
 
@@ -313,7 +315,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved)
        if (blk_mq_request_completed(req))
                return true;
 
-       nvme_req(req)->status = NVME_SC_HOST_PATH_ERROR;
+       nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD;
        blk_mq_complete_request(req);
        return true;
 }
@@ -626,7 +628,7 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *ns, struct request *req,
        }
 
        __rq_for_each_bio(bio, req) {
-               u64 slba = nvme_block_nr(ns, bio->bi_iter.bi_sector);
+               u64 slba = nvme_sect_to_lba(ns, bio->bi_iter.bi_sector);
                u32 nlb = bio->bi_iter.bi_size >> ns->lba_shift;
 
                if (n < segments) {
@@ -667,7 +669,7 @@ static inline blk_status_t nvme_setup_write_zeroes(struct nvme_ns *ns,
        cmnd->write_zeroes.opcode = nvme_cmd_write_zeroes;
        cmnd->write_zeroes.nsid = cpu_to_le32(ns->head->ns_id);
        cmnd->write_zeroes.slba =
-               cpu_to_le64(nvme_block_nr(ns, blk_rq_pos(req)));
+               cpu_to_le64(nvme_sect_to_lba(ns, blk_rq_pos(req)));
        cmnd->write_zeroes.length =
                cpu_to_le16((blk_rq_bytes(req) >> ns->lba_shift) - 1);
        cmnd->write_zeroes.control = 0;
@@ -691,7 +693,7 @@ static inline blk_status_t nvme_setup_rw(struct nvme_ns *ns,
 
        cmnd->rw.opcode = (rq_data_dir(req) ? nvme_cmd_write : nvme_cmd_read);
        cmnd->rw.nsid = cpu_to_le32(ns->head->ns_id);
-       cmnd->rw.slba = cpu_to_le64(nvme_block_nr(ns, blk_rq_pos(req)));
+       cmnd->rw.slba = cpu_to_le64(nvme_sect_to_lba(ns, blk_rq_pos(req)));
        cmnd->rw.length = cpu_to_le16((blk_rq_bytes(req) >> ns->lba_shift) - 1);
 
        if (req_op(req) == REQ_OP_WRITE && ctrl->nr_streams)
@@ -1647,7 +1649,7 @@ static void nvme_init_integrity(struct gendisk *disk, u16 ms, u8 pi_type)
 
 static void nvme_set_chunk_size(struct nvme_ns *ns)
 {
-       u32 chunk_size = (((u32)ns->noiob) << (ns->lba_shift - 9));
+       u32 chunk_size = nvme_lba_to_sect(ns, ns->noiob);
        blk_queue_chunk_sectors(ns->queue, rounddown_pow_of_two(chunk_size));
 }
 
@@ -1684,8 +1686,7 @@ static void nvme_config_discard(struct gendisk *disk, struct nvme_ns *ns)
 
 static void nvme_config_write_zeroes(struct gendisk *disk, struct nvme_ns *ns)
 {
-       u32 max_sectors;
-       unsigned short bs = 1 << ns->lba_shift;
+       u64 max_blocks;
 
        if (!(ns->ctrl->oncs & NVME_CTRL_ONCS_WRITE_ZEROES) ||
            (ns->ctrl->quirks & NVME_QUIRK_DISABLE_WRITE_ZEROES))
@@ -1701,11 +1702,12 @@ static void nvme_config_write_zeroes(struct gendisk *disk, struct nvme_ns *ns)
         * nvme_init_identify() if available.
         */
        if (ns->ctrl->max_hw_sectors == UINT_MAX)
-               max_sectors = ((u32)(USHRT_MAX + 1) * bs) >> 9;
+               max_blocks = (u64)USHRT_MAX + 1;
        else
-               max_sectors = ((u32)(ns->ctrl->max_hw_sectors + 1) * bs) >> 9;
+               max_blocks = ns->ctrl->max_hw_sectors + 1;
 
-       blk_queue_max_write_zeroes_sectors(disk->queue, max_sectors);
+       blk_queue_max_write_zeroes_sectors(disk->queue,
+                                          nvme_lba_to_sect(ns, max_blocks));
 }
 
 static int nvme_report_ns_ids(struct nvme_ctrl *ctrl, unsigned int nsid,
@@ -1748,7 +1750,7 @@ static bool nvme_ns_ids_equal(struct nvme_ns_ids *a, struct nvme_ns_ids *b)
 static void nvme_update_disk_info(struct gendisk *disk,
                struct nvme_ns *ns, struct nvme_id_ns *id)
 {
-       sector_t capacity = le64_to_cpu(id->nsze) << (ns->lba_shift - 9);
+       sector_t capacity = nvme_lba_to_sect(ns, le64_to_cpu(id->nsze));
        unsigned short bs = 1 << ns->lba_shift;
        u32 atomic_bs, phys_bs, io_opt;