diff --git a/plugins/sandisk/sandisk-nvme.h b/plugins/sandisk/sandisk-nvme.h index af22ff1366..9a9633aa44 100644 --- a/plugins/sandisk/sandisk-nvme.h +++ b/plugins/sandisk/sandisk-nvme.h @@ -5,7 +5,7 @@ #if !defined(SANDISK_NVME) || defined(CMD_HEADER_MULTI_READ) #define SANDISK_NVME -#define SANDISK_PLUGIN_VERSION "3.0.0" +#define SANDISK_PLUGIN_VERSION "3.0.1" #include "cmd.h" PLUGIN(NAME("sndk", "Sandisk vendor specific extensions", SANDISK_PLUGIN_VERSION), diff --git a/plugins/sandisk/sandisk-utils.c b/plugins/sandisk/sandisk-utils.c index 113c97f9b5..2e96877649 100644 --- a/plugins/sandisk/sandisk-utils.c +++ b/plugins/sandisk/sandisk-utils.c @@ -158,16 +158,14 @@ __u64 sndk_get_drive_capabilities(nvme_root_t r, struct nvme_dev *dev) case SNDK_NVME_WDC_VID: switch (read_device_id) { case SNDK_NVME_SNTMP_DEV_ID: + case SNDK_NVME_SNTMP_DEV_ID_1: 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_FW_ACTIVATE_HISTORY_C2 | SNDK_DRIVE_CAP_VU_FID_CLEAR_PCIE | - SNDK_DRIVE_CAP_VU_FID_CLEAR_FW_ACT_HISTORY | - SNDK_DRIVE_CAP_INFO | SNDK_DRIVE_CAP_CLOUD_SSD_VERSION | SNDK_DRIVE_CAP_LOG_PAGE_DIR | SNDK_DRIVE_CAP_DRIVE_STATUS | diff --git a/plugins/sandisk/sandisk-utils.h b/plugins/sandisk/sandisk-utils.h index 2f55815220..da89a4f8b2 100644 --- a/plugins/sandisk/sandisk-utils.h +++ b/plugins/sandisk/sandisk-utils.h @@ -44,6 +44,7 @@ #define SNDK_NVME_SN861_DEV_ID_1 0x2751 #define SNDK_NVME_SN861_DEV_ID_2 0x2752 #define SNDK_NVME_SNTMP_DEV_ID 0x2761 +#define SNDK_NVME_SNTMP_DEV_ID_1 0x2763 #define SNDK_NVME_SN520_DEV_ID 0x5003 #define SNDK_NVME_SN520_DEV_ID_1 0x5004 diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c index e6e036171d..0738c8589d 100644 --- a/plugins/wdc/wdc-nvme.c +++ b/plugins/wdc/wdc-nvme.c @@ -90,6 +90,7 @@ #define WDC_NVME_SN861_DEV_ID_1 0x2751 #define WDC_NVME_SN861_DEV_ID_2 0x2752 #define WDC_NVME_SNTMP_DEV_ID 0x2761 +#define WDC_NVME_SNTMP_DEV_ID_1 0x2763 /* This id's are no longer supported, delete ?? */ #define WDC_NVME_SN550_DEV_ID 0x2708 @@ -1917,14 +1918,13 @@ static __u64 wdc_get_drive_capabilities(nvme_root_t r, struct nvme_dev *dev) break; case WDC_NVME_SNTMP_DEV_ID: + case WDC_NVME_SNTMP_DEV_ID_1: capabilities |= (WDC_DRIVE_CAP_C0_LOG_PAGE | WDC_DRIVE_CAP_C3_LOG_PAGE | WDC_DRIVE_CAP_OCP_C4_LOG_PAGE | WDC_DRIVE_CAP_OCP_C5_LOG_PAGE | WDC_DRIVE_CAP_DUI | - WDC_DRIVE_CAP_FW_ACTIVATE_HISTORY_C2 | WDC_DRIVE_CAP_VU_FID_CLEAR_PCIE | - WDC_DRIVE_CAP_VU_FID_CLEAR_FW_ACT_HISTORY | WDC_DRIVE_CAP_CLEAR_ASSERT | WDC_DRIVE_CAP_CLOUD_SSD_VERSION | WDC_DRIVE_CAP_LOG_PAGE_DIR | @@ -7265,6 +7265,7 @@ static int wdc_get_c0_log_page(nvme_root_t r, struct nvme_dev *dev, char *format case WDC_NVME_SN655_DEV_ID: case WDC_NVME_SN655_DEV_ID_1: case WDC_NVME_SNTMP_DEV_ID: + case WDC_NVME_SNTMP_DEV_ID_1: if (uuid_index == 0) { ret = nvme_get_print_ocp_cloud_smart_log(dev, uuid_index, @@ -11823,7 +11824,6 @@ static int wdc_vs_drive_info(int argc, char **argv, case WDC_NVME_SN550_DEV_ID: case WDC_NVME_ZN350_DEV_ID: case WDC_NVME_ZN350_DEV_ID_1: - case WDC_NVME_SNTMP_DEV_ID: ret = wdc_do_drive_info(dev, &result); if (!ret) {