Skip to content

Commit bb4e636

Browse files
[NVMe-CLI] Add support for SN730 to WDC plugin commmands
1 parent 89e06bc commit bb4e636

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

plugins/wdc/wdc-nvme.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@
7171
#define WDC_NVME_SN520_DEV_ID_1 0x5004
7272
#define WDC_NVME_SN520_DEV_ID_2 0x5005
7373
#define WDC_NVME_SN720_DEV_ID 0x5002
74-
#define WDC_NVME_SN730_DEV_ID 0x3714
75-
#define WDC_NVME_SN730_DEV_ID_1 0x3734
74+
#define WDC_NVME_SN730A_DEV_ID 0x5006
75+
#define WDC_NVME_SN730B_DEV_ID 0x3714
76+
#define WDC_NVME_SN730B_DEV_ID_1 0x3734
7677
#define WDC_NVME_SN340_DEV_ID 0x500d
7778

7879
#define WDC_DRIVE_CAP_CAP_DIAG 0x0000000000000001
@@ -91,7 +92,7 @@
9192

9293
#define WDC_DRIVE_CAP_DRIVE_ESSENTIALS 0x0000000100000000
9394
#define WDC_DRIVE_CAP_DUI_DATA 0x0000000200000000
94-
#define WDC_SN730_CAP_VUC_LOG 0x0000000400000000
95+
#define WDC_SN730B_CAP_VUC_LOG 0x0000000400000000
9596
#define WDC_DRIVE_CAP_SN340_DUI 0x0000000800000000
9697
#define WDC_DRIVE_CAP_SMART_LOG_MASK (WDC_DRIVE_CAP_C1_LOG_PAGE | WDC_DRIVE_CAP_CA_LOG_PAGE | \
9798
WDC_DRIVE_CAP_D0_LOG_PAGE)
@@ -785,10 +786,10 @@ static __u64 wdc_get_drive_capabilities(int fd) {
785786
if (wdc_nvme_check_supported_log_page(fd, WDC_NVME_GET_VU_SMART_LOG_OPCODE) == true)
786787
capabilities |= WDC_DRIVE_CAP_D0_LOG_PAGE;
787788
break;
788-
case WDC_NVME_SN730_DEV_ID:
789+
case WDC_NVME_SN730B_DEV_ID:
789790
/* FALLTHRU */
790-
case WDC_NVME_SN730_DEV_ID_1:
791-
capabilities = WDC_SN730_CAP_VUC_LOG;
791+
case WDC_NVME_SN730B_DEV_ID_1:
792+
capabilities = WDC_SN730B_CAP_VUC_LOG;
792793
break;
793794
default:
794795
capabilities = 0;
@@ -806,6 +807,8 @@ static __u64 wdc_get_drive_capabilities(int fd) {
806807
case WDC_NVME_SN520_DEV_ID_2:
807808
capabilities = WDC_DRIVE_CAP_DUI_DATA;
808809
case WDC_NVME_SN720_DEV_ID:
810+
/* FALLTHRU */
811+
case WDC_NVME_SN730A_DEV_ID:
809812
capabilities = WDC_DRIVE_CAP_DUI_DATA | WDC_DRIVE_CAP_NAND_STATS;
810813
break;
811814
case WDC_NVME_SN340_DEV_ID:
@@ -1861,7 +1864,7 @@ static int wdc_vs_internal_fw_log(int argc, char **argv, struct command *command
18611864
return wdc_do_cap_dui(fd, f, xfer_size, cfg.data_area, cfg.verbose);
18621865
} else if ((capabilities & WDC_DRIVE_CAP_DUI_DATA) == WDC_DRIVE_CAP_DUI_DATA) {
18631866
return wdc_do_cap_dui(fd, f, xfer_size, cfg.data_area, cfg.verbose);
1864-
} else if ((capabilities & WDC_SN730_CAP_VUC_LOG) == WDC_SN730_CAP_VUC_LOG) {
1867+
} else if ((capabilities & WDC_SN730B_CAP_VUC_LOG) == WDC_SN730B_CAP_VUC_LOG) {
18651868
return wdc_do_sn730_get_and_tar(fd, f);
18661869
} else {
18671870
fprintf(stderr, "ERROR : WDC: unsupported device for this command\n");

0 commit comments

Comments
 (0)