Merge branch 'master' into add-da4-support

Author: dwsuse

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 |

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

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 |
@@ -7269,6 +7269,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,
@@ -11827,7 +11828,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) {