From: Daniel Gomez <da.gomez@samsung.com>
Date: Tue, 30 May 2023 15:42:53 +0000 (+0000)
Subject: nvme: Increase block size variable size to 32-bit
X-Git-Tag: v6.6.7~2487^2~33^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdbfcd5f6caa46e1ddbfd60cbf694d192b37805a;p=platform%2Fkernel%2Flinux-starfive.git

nvme: Increase block size variable size to 32-bit

Increase block size variable size to 32-bit unsigned to be able to
support block devices larger than 32k (starting from 64 KiB).

Physical and logical block size already support unsigned 32-bit.

Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
---

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 3263af1..64c484c 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1835,7 +1835,7 @@ static void nvme_update_disk_info(struct gendisk *disk,
 		struct nvme_ns *ns, struct nvme_id_ns *id)
 {
 	sector_t capacity = nvme_lba_to_sect(ns, le64_to_cpu(id->nsze));
-	unsigned short bs = 1 << ns->lba_shift;
+	u32 bs = 1U << ns->lba_shift;
 	u32 atomic_bs, phys_bs, io_opt = 0;
 
 	/*