Skip to content

nvme-print-stdout: add nvm-id-ctrl command VER and LBAMQF fields #2584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igaw merged 2 commits into from
Dec 2, 2024
Merged

nvme-print-stdout: add nvm-id-ctrl command VER and LBAMQF fields #2584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d65d1a6
build: bump libnvme wrap
igaw Dec 2, 2024
2bb39ed
nvme-print-stdout: add nvm-id-ctrl command VER and LBAMQF fields
ikegami-t Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions nvme-print-stdout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3105,6 +3105,29 @@ static void stdout_id_ctrl_nvm_aocs(__u16 aocs)
printf("\n");
}

static void stdout_id_ctrl_nvm_ver(__u32 ver)
{
printf(" NVM command set specification: %d.%d.%d\n\n", NVME_MAJOR(ver), NVME_MINOR(ver),
NVME_TERTIARY(ver));
}

static void stdout_id_ctrl_nvm_lbamqf(__u8 lbamqf)
{
printf(" 0x%x: ", lbamqf);

switch (lbamqf) {
case NVME_ID_CTRL_NVM_LBAMQF_TYPE_0:
printf("LBA Migration Queue Entry Type 0\n\n");
break;
case NVME_ID_CTRL_NVM_LBAMQF_VENDOR_MIN ... NVME_ID_CTRL_NVM_LBAMQF_VENDOR_MAX:
printf("Vendor Specific\n\n");
break;
default:
printf("Reserved\n\n");
break;
}
}

static void stdout_id_ctrl_nvm(struct nvme_id_ctrl_nvm *ctrl_nvm)
{
int verbose = stdout_print_ops.flags & VERBOSE;
Expand All @@ -3119,6 +3142,12 @@ static void stdout_id_ctrl_nvm(struct nvme_id_ctrl_nvm *ctrl_nvm)
printf("aocs : %u\n", le16_to_cpu(ctrl_nvm->aocs));
if (verbose)
stdout_id_ctrl_nvm_aocs(le16_to_cpu(ctrl_nvm->aocs));
printf("ver : 0x%x\n", le32_to_cpu(ctrl_nvm->ver));
if (verbose)
stdout_id_ctrl_nvm_ver(le32_to_cpu(ctrl_nvm->ver));
printf("lbamqf : %u\n", ctrl_nvm->lbamqf);
if (verbose)
stdout_id_ctrl_nvm_lbamqf(ctrl_nvm->lbamqf);
}

static void stdout_nvm_id_ns_pic(__u8 pic)
Expand Down
2 changes: 1 addition & 1 deletion subprojects/libnvme.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[wrap-git]
url = https://github.com/linux-nvme/libnvme.git
revision = f1ddb968ce03a67a96e3f9069e9b758532cf67b9
revision = 5f89dfd392ea87ce69cf27b19b0a4a73a4b4d31b

[provide]
libnvme = libnvme_dep
Expand Down