Skip to contentSkip to conversation

nvme: fix NSSRS offset in CAP register

PATCH In review Klaus Jensen 3 participants 4 messages Oct 23, 2019 – Oct 29, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvme: fix NSSRS offset in CAP register

Fix the offset of the NSSRS field the CAP register.

---
 include/block/nvme.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/block/nvme.h +1 -1
index 3ec8efcc435e..fa15b51c33bb 100644
@@ -23,7 +23,7 @@ enum NvmeCapShift {
     CAP_AMS_SHIFT      = 17,
     CAP_TO_SHIFT       = 24,
     CAP_DSTRD_SHIFT    = 32,
-    CAP_NSSRS_SHIFT    = 33,
+    CAP_NSSRS_SHIFT    = 36,
     CAP_CSS_SHIFT      = 37,
     CAP_MPSMIN_SHIFT   = 48,
     CAP_MPSMAX_SHIFT   = 52,
Signature · 1 line
2.23.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 1 line · Klaus Jensen

Fix the offset of the NSSRS field the CAP register.

From NVME 1.4, section 3 ("Controller Registers"), subsection 3.1.1 ("Offset 0h: CAP – Controller Capabilities") CAP_NSSRS_SHIFT is bit 36, not 33.

Quoted 13 lines
---
 include/block/nvme.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/block/nvme.h +0 -0
index 3ec8efcc435e..fa15b51c33bb 100644

include/block/nvme.h enum NvmeCapShift { · line 29

Quoted 8 lines
include/block/nvme.h +1 -1
@@ -23,7 +23,7 @@ enum NvmeCapShift {
     CAP_AMS_SHIFT      = 17,
     CAP_TO_SHIFT       = 24,
     CAP_DSTRD_SHIFT    = 32,
-    CAP_NSSRS_SHIFT    = 33,
+    CAP_NSSRS_SHIFT    = 36,
     CAP_CSS_SHIFT      = 37,
     CAP_MPSMIN_SHIFT   = 48,
     CAP_MPSMAX_SHIFT   = 52,

I like updating commit messages with spec references; if it can be updated that would be nice.

Regardless:

#2 lore raw
Quoted 34 lines · John Snow
Quoted 1 line · Klaus Jensen

Fix the offset of the NSSRS field the CAP register.

From NVME 1.4, section 3 ("Controller Registers"), subsection 3.1.1 ("Offset 0h: CAP – Controller Capabilities") CAP_NSSRS_SHIFT is bit 36, not 33.

Quoted 13 lines
---
 include/block/nvme.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/block/nvme.h +0 -0
index 3ec8efcc435e..fa15b51c33bb 100644

include/block/nvme.h enum NvmeCapShift { · line 29

Quoted 8 lines
include/block/nvme.h +1 -1
@@ -23,7 +23,7 @@ enum NvmeCapShift {
     CAP_AMS_SHIFT      = 17,
     CAP_TO_SHIFT       = 24,
     CAP_DSTRD_SHIFT    = 32,
-    CAP_NSSRS_SHIFT    = 33,
+    CAP_NSSRS_SHIFT    = 36,
     CAP_CSS_SHIFT      = 37,
     CAP_MPSMIN_SHIFT   = 48,
     CAP_MPSMAX_SHIFT   = 52,

I like updating commit messages with spec references; if it can be updated that would be nice.

Quoted 4 lines

Regardless:

Sounds good. Can the committer squash that in?

Cheers,
Klaus