From: Damien Le Moal <damien.lemoal@wdc.com>

Date: Mon, 21 Oct 2019 12:40:04 +0900

Subject: [PATCH] nvme: Introduce nvme_lba_to_sect()

Git-commit: e08f2ae850929d40e66268ee47e443e7ea56eeb7

Patch-mainline: v5.5-rc1

References: bsc#1169045

Introduce the new helper function nvme_lba_to_sect() to convert a device

logical block number to a 512B sector number. Use this new helper in

obvious places, cleaning up the code.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>

Reviewed-by: Christoph Hellwig <hch@lst.de>

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>

Signed-off-by: Keith Busch <kbusch@kernel.org>

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Acked-by: Hannes Reinecke <hare@suse.com>

---

 drivers/nvme/host/core.c | 14 +++++++-------

 drivers/nvme/host/nvme.h |  8 ++++++++

 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c

index 64815fa1a254..b4214e54f2d2 100644

--- a/drivers/nvme/host/core.c

+++ b/drivers/nvme/host/core.c

@@ -1611,7 +1611,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));

 }

@@ -1648,8 +1648,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))

@@ -1665,11 +1664,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,

@@ -1712,7 +1712,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;

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h

index 37eb94fb797d..2637d9dd278f 100644

--- a/drivers/nvme/host/nvme.h

+++ b/drivers/nvme/host/nvme.h

@@ -426,6 +426,14 @@ static inline u64 nvme_sect_to_lba(struct nvme_ns *ns, sector_t sector)

 	return sector >> (ns->lba_shift - SECTOR_SHIFT);

 }

+/*

+ * Convert a device logical block number to a 512B sector number.

+ */

+static inline sector_t nvme_lba_to_sect(struct nvme_ns *ns, u64 lba)

+{

+	return lba << (ns->lba_shift - SECTOR_SHIFT);

+}

+

 static inline void nvme_end_request(struct request *req, __le16 status,

 		union nvme_result result)

 {

-- 

2.16.4