Commit 3fb94892 authored Dec 21, 2022 by Christoph Hellwig Committed by zhaoxiaoqiang11 Aug 14, 2023

nvme: fix the NVME_CMD_EFFECTS_CSE_MASK definition

stable inclusion
from stable-v5.10.163
commit 4b3282a9779c079c4fa5a911ccae4cf7c30a580f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7PJ9N

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4b3282a9779c079c4fa5a911ccae4cf7c30a580f



----------------------------------------------------

[ Upstream commit 685e6311 ]

3 << 16 does not generate the correct mask for bits 16, 17 and 18.
Use the GENMASK macro to generate the correct mask instead.

Fixes: 84fef62d ("nvme: check admin passthru command effects")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Kanchan Joshi <joshi.k@samsung.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: zhaoxiaoqiang11 <zhaoxiaoqiang11@jd.com>

parent a9649a07

include/linux/nvme.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@
		#ifndef _LINUX_NVME_H
		#define _LINUX_NVME_H

		#include <linux/bits.h>
		#include <linux/types.h>
		#include <linux/uuid.h>

		@@ -528,7 +529,7 @@ enum {
		NVME_CMD_EFFECTS_NCC = 1 << 2,
		NVME_CMD_EFFECTS_NIC = 1 << 3,
		NVME_CMD_EFFECTS_CCC = 1 << 4,
		NVME_CMD_EFFECTS_CSE_MASK = 3 << 16,
		NVME_CMD_EFFECTS_CSE_MASK = GENMASK(18, 16),
		NVME_CMD_EFFECTS_UUID_SEL = 1 << 19,
		};