Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion plugins/sandisk/sandisk-nvme.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#if !defined(SANDISK_NVME) || defined(CMD_HEADER_MULTI_READ)
#define SANDISK_NVME

#define SANDISK_PLUGIN_VERSION "3.0.6"
#define SANDISK_PLUGIN_VERSION "3.0.7"
#include "cmd.h"

PLUGIN(NAME("sndk", "Sandisk vendor specific extensions", SANDISK_PLUGIN_VERSION),
Expand Down
24 changes: 24 additions & 0 deletions plugins/sandisk/sandisk-utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,24 @@ __u64 sndk_get_drive_capabilities(nvme_root_t r, struct nvme_dev *dev)
SNDK_DRIVE_CAP_SET_LATENCY_MONITOR);
break;

case SNDK_NVME_SNESSD1_DEV_ID_E1L:
case SNDK_NVME_SNESSD1_DEV_ID_E2:
case SNDK_NVME_SNESSD1_DEV_ID_E3S:
case SNDK_NVME_SNESSD1_DEV_ID_E3L:
case SNDK_NVME_SNESSD1_DEV_ID_U2:
capabilities |= (SNDK_DRIVE_CAP_C0_LOG_PAGE |
SNDK_DRIVE_CAP_C3_LOG_PAGE |
SNDK_DRIVE_CAP_CA_LOG_PAGE |
SNDK_DRIVE_CAP_OCP_C4_LOG_PAGE |
SNDK_DRIVE_CAP_OCP_C5_LOG_PAGE |
SNDK_DRIVE_CAP_UDUI |
SNDK_DRIVE_CAP_VU_FID_CLEAR_PCIE |
SNDK_DRIVE_CAP_CLOUD_SSD_VERSION |
SNDK_DRIVE_CAP_LOG_PAGE_DIR |
SNDK_DRIVE_CAP_DRIVE_STATUS |
SNDK_DRIVE_CAP_SET_LATENCY_MONITOR);
break;

case SNDK_NVME_SN861_DEV_ID_E1S:
capabilities |= (SNDK_DRIVE_CAP_C0_LOG_PAGE |
SNDK_DRIVE_CAP_C3_LOG_PAGE |
Expand Down Expand Up @@ -619,6 +637,12 @@ __u64 sndk_get_drive_capabilities(nvme_root_t r, struct nvme_dev *dev)
capabilities = SNDK_DRIVE_CAP_UDUI;
break;

case SNDK_NVME_SNCSSD1_DEV_ID_M2_2230:
case SNDK_NVME_SNCSSD1_DEV_ID_M2_2242:
case SNDK_NVME_SNCSSD1_DEV_ID_M2_2280:
capabilities = SNDK_DRIVE_CAP_UDUI;
break;

default:
capabilities = 0;
}
Expand Down
13 changes: 12 additions & 1 deletion plugins/sandisk/sandisk-utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@
#define SNDK_NVME_SNTMP_DEV_ID 0x2761
#define SNDK_NVME_SNTMP_DEV_ID_1 0x2763

#define SNDK_NVME_SNESSD1_DEV_ID_E1L 0x2765
#define SNDK_NVME_SNESSD1_DEV_ID_E2 0x2766
#define SNDK_NVME_SNESSD1_DEV_ID_E3S 0x2767
#define SNDK_NVME_SNESSD1_DEV_ID_E3L 0x2768
#define SNDK_NVME_SNESSD1_DEV_ID_U2 0x2769

#define SNDK_NVME_SN520_DEV_ID 0x5003
#define SNDK_NVME_SN520_DEV_ID_1 0x5004
#define SNDK_NVME_SN520_DEV_ID_2 0x5005
Expand Down Expand Up @@ -75,6 +81,10 @@
#define SNDK_NVME_SN7150_DEV_ID_4 0x503e
#define SNDK_NVME_SN7150_DEV_ID_5 0x503f

#define SNDK_NVME_SNCSSD1_DEV_ID_M2_2230 0x5081
#define SNDK_NVME_SNCSSD1_DEV_ID_M2_2242 0x5082
#define SNDK_NVME_SNCSSD1_DEV_ID_M2_2280 0x5083

#define SNDK_NVME_SN7100_DEV_ID_1 0x5043
#define SNDK_NVME_SN7100_DEV_ID_2 0x5044
#define SNDK_NVME_SN7100_DEV_ID_3 0x5045
Expand Down Expand Up @@ -108,7 +118,7 @@
#define SNDK_DRIVE_CAP_CLEAR_PCIE 0x0000000000000080
#define SNDK_DRIVE_CAP_RESIZE 0x0000000000000100
#define SNDK_DRIVE_CAP_NAND_STATS 0x0000000000000200
#define SNDK_DRIVE_CAP_RESIZE_SN861 0x0000000000000400
#define SNDK_DRIVE_CAP_RESERVED2 0x0000000000000400
#define SNDK_DRIVE_CAP_RESERVED3 0x0000000000000800
#define SNDK_DRIVE_CAP_RESERVED4 0x0000000000001000
#define SNDK_DRIVE_CAP_FW_ACTIVATE_HISTORY 0x0000000000002000
Expand Down Expand Up @@ -141,6 +151,7 @@
#define SNDK_DRIVE_CAP_DEVICE_WAF 0x0000010000000000
#define SNDK_DRIVE_CAP_SET_LATENCY_MONITOR 0x0000020000000000
#define SNDK_DRIVE_CAP_UDUI 0x0000040000000000
#define SNDK_DRIVE_CAP_RESIZE_SN861 0x0000080000000000

/* Any new capability flags should be added to the WDC plugin */

Expand Down