Skip to content

Commit

Permalink
nvme-print: split pmrmsc into pmrmscl and pmrmscu
Browse files Browse the repository at this point in the history 
Split the PMR Memory Space Control register 64 bits into
PMR Memory Space Control Lower and Upper 32 bits each as
per NVM Express Spec. 1.4b changes.

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
  • Loading branch information
@keithbusch
Gollu Appalanaidu authored and keithbusch committed Mar 2, 2021
1 parent 7692988 commit d43d545
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 16 deletions.
3 changes: 2 additions & 1 deletion linux/nvme.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ enum {
NVME_REG_PMRSTS = 0x0e08, /* Persistent Memory Region Status */
NVME_REG_PMREBS = 0x0e0c, /* Persistent Memory Region Elasticity Buffer Size */
NVME_REG_PMRSWTP= 0x0e10, /* Persistent Memory Region Sustained Write Throughput */
NVME_REG_PMRMSC = 0x0e14, /* Persistent Memory Region Controller Memory Space Control */
NVME_REG_PMRMSCL= 0x0e14, /* Persistent Memory Region Controller Memory Space Control Lower */
NVME_REG_PMRMSCU= 0x0e18, /* Persistent Memory Region Controller Memory Space Control Upper*/
NVME_REG_DBS = 0x1000, /* SQ 0 Tail Doorbell */
};

Expand Down
45 changes: 30 additions & 15 deletions nvme-print.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2163,12 +2163,18 @@ static void nvme_show_registers_pmrswtp(__u32 pmrswtp)
nvme_register_pmr_pmrszu_to_string(pmrswtp & 0x0000000f));
}

static void nvme_show_registers_pmrmsc(uint64_t pmrmsc)
static void nvme_show_registers_pmrmscl(uint32_t pmrmscl)
{
printf("\tController Base Address (CBA): %" PRIx64 "\n",
(pmrmsc & 0xfffffffffffff000) >> 12);
printf("\tController Memory Space Enable (CMSE): %" PRIx64 "\n\n",
(pmrmsc & 0x0000000000000002) >> 1);
printf("\tController Base Address (CBA): %#x\n",
(pmrmscl & 0xfffff000) >> 12);
printf("\tController Memory Space Enable (CMSE): %#x\n\n",
(pmrmscl & 0x00000002) >> 1);
}

static void nvme_show_registers_pmrmscu(uint32_t pmrmscu)
{
printf("\tController Base Address (CBA): %#x\n",
pmrmscu);
}

static inline uint32_t mmio_read32(void *addr)
Expand All @@ -2192,9 +2198,10 @@ static inline __u64 mmio_read64(void *addr)

static void json_ctrl_registers(void *bar)
{
uint64_t cap, asq, acq, bpmbl, cmbmsc, pmrmsc;
uint64_t cap, asq, acq, bpmbl, cmbmsc;
uint32_t vs, intms, intmc, cc, csts, nssr, aqa, cmbsz, cmbloc,
bpinfo, bprsel, cmbsts, pmrcap, pmrctl, pmrsts, pmrebs, pmrswtp;
bpinfo, bprsel, cmbsts, pmrcap, pmrctl, pmrsts, pmrebs, pmrswtp,
pmrmscl, pmrmscu;
struct json_object *root;

cap = mmio_read64(bar + NVME_REG_CAP);
Expand All @@ -2219,7 +2226,8 @@ static void json_ctrl_registers(void *bar)
pmrsts = mmio_read32(bar + NVME_REG_PMRSTS);
pmrebs = mmio_read32(bar + NVME_REG_PMREBS);
pmrswtp = mmio_read32(bar + NVME_REG_PMRSWTP);
pmrmsc = mmio_read64(bar + NVME_REG_PMRMSC);
pmrmscl = mmio_read32(bar + NVME_REG_PMRMSCL);
pmrmscu = mmio_read32(bar + NVME_REG_PMRMSCU);

root = json_create_object();
json_object_add_value_uint(root, "cap", cap);
Expand All @@ -2244,7 +2252,8 @@ static void json_ctrl_registers(void *bar)
json_object_add_value_int(root, "pmrsts", pmrsts);
json_object_add_value_int(root, "pmrebs", pmrebs);
json_object_add_value_int(root, "pmrswtp", pmrswtp);
json_object_add_value_uint(root, "pmrmsc", pmrmsc);
json_object_add_value_uint(root, "pmrmscl", pmrmscl);
json_object_add_value_uint(root, "pmrmscu", pmrmscu);
json_print_object(root, NULL);
printf("\n");
json_free_object(root);
Expand All @@ -2253,9 +2262,10 @@ static void json_ctrl_registers(void *bar)
void nvme_show_ctrl_registers(void *bar, bool fabrics, enum nvme_print_flags flags)
{
const unsigned int reg_size = 0x50; /* 00h to 4Fh */
uint64_t cap, asq, acq, bpmbl, cmbmsc, pmrmsc;
uint64_t cap, asq, acq, bpmbl, cmbmsc;
uint32_t vs, intms, intmc, cc, csts, nssr, aqa, cmbsz, cmbloc, bpinfo,
bprsel, cmbsts, pmrcap, pmrctl, pmrsts, pmrebs, pmrswtp;
bprsel, cmbsts, pmrcap, pmrctl, pmrsts, pmrebs, pmrswtp,
pmrmscl, pmrmscu;
int human = flags & VERBOSE;

if (flags & BINARY)
Expand Down Expand Up @@ -2285,7 +2295,8 @@ void nvme_show_ctrl_registers(void *bar, bool fabrics, enum nvme_print_flags fla
pmrsts = mmio_read32(bar + NVME_REG_PMRSTS);
pmrebs = mmio_read32(bar + NVME_REG_PMREBS);
pmrswtp = mmio_read32(bar + NVME_REG_PMRSWTP);
pmrmsc = mmio_read64(bar + NVME_REG_PMRMSC);
pmrmscl = mmio_read32(bar + NVME_REG_PMRMSCL);
pmrmscu = mmio_read32(bar + NVME_REG_PMRMSCU);

if (human) {
if (cap != 0xffffffff) {
Expand Down Expand Up @@ -2364,8 +2375,11 @@ void nvme_show_ctrl_registers(void *bar, bool fabrics, enum nvme_print_flags fla
printf("pmrswtp : %x\n", pmrswtp);
nvme_show_registers_pmrswtp(pmrswtp);

printf("pmrmsc : %"PRIx64"\n", pmrmsc);
nvme_show_registers_pmrmsc(pmrmsc);
printf("pmrmscl : %#x\n", pmrmscl);
nvme_show_registers_pmrmscl(pmrmscl);

printf("pmrmscu : %#x\n", pmrmscu);
nvme_show_registers_pmrmscu(pmrmscu);
}
} else {
if (cap != 0xffffffff)
Expand Down Expand Up @@ -2396,7 +2410,8 @@ void nvme_show_ctrl_registers(void *bar, bool fabrics, enum nvme_print_flags fla
printf("pmrsts : %x\n", pmrsts);
printf("pmrebs : %x\n", pmrebs);
printf("pmrswtp : %x\n", pmrswtp);
printf("pmrmsc : %"PRIx64"\n", pmrmsc);
printf("pmrmscl : %#x\n", pmrmscl);
printf("pmrmscu : %#x\n", pmrmscu);
}
}
}
Expand Down

0 comments on commit d43d545

Please sign in to comment.