From: Chaitanya Kulkarni Date: Wed, 6 Feb 2019 22:59:56 +0000 (-0800) Subject: nvme-cli: align all the macros X-Git-Tag: v1.8~26 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f716974fbf794a9247519b65d48611e6e41aa6d7;p=users%2Fsagi%2Fnvme-cli.git nvme-cli: align all the macros Due to the addition of a lot of code in the WDC Plugin over a period of time it has non-aligned macro definitions. This is purely cleanup patch which makes all the macros aligned nicely which makes code readable. Signed-off-by: Chaitanya Kulkarni --- diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c index 99ca5bd1..ba4d419d 100644 --- a/plugins/wdc/wdc-nvme.c +++ b/plugins/wdc/wdc-nvme.c @@ -46,7 +46,7 @@ #define WRITE_SIZE (sizeof(__u8) * 4096) -#define WDC_NVME_SUBCMD_SHIFT 8 +#define WDC_NVME_SUBCMD_SHIFT 8 #define WDC_NVME_LOG_SIZE_DATA_LEN 0x08 #define WDC_NVME_LOG_SIZE_HDR_LEN 0x08 @@ -54,7 +54,7 @@ /* Device Config */ #define WDC_NVME_VID 0x1c58 #define WDC_NVME_VID_2 0x1b96 -#define WDC_NVME_SNDK_VID 0x15b7 +#define WDC_NVME_SNDK_VID 0x15b7 #define WDC_NVME_SN100_DEV_ID 0x0003 #define WDC_NVME_SN200_DEV_ID 0x0023 @@ -73,14 +73,14 @@ #define WDC_NVME_SN730_DEV_ID_1 0x3734 #define WDC_DRIVE_CAP_CAP_DIAG 0x0000000000000001 -#define WDC_DRIVE_CAP_INTERNAL_LOG 0x0000000000000002 +#define WDC_DRIVE_CAP_INTERNAL_LOG 0x0000000000000002 #define WDC_DRIVE_CAP_C1_LOG_PAGE 0x0000000000000004 -#define WDC_DRIVE_CAP_CA_LOG_PAGE 0x0000000000000008 -#define WDC_DRIVE_CAP_D0_LOG_PAGE 0x0000000000000010 +#define WDC_DRIVE_CAP_CA_LOG_PAGE 0x0000000000000008 +#define WDC_DRIVE_CAP_D0_LOG_PAGE 0x0000000000000010 #define WDC_DRIVE_CAP_DRIVE_STATUS 0x0000000000000020 #define WDC_DRIVE_CAP_CLEAR_ASSERT 0x0000000000000040 #define WDC_DRIVE_CAP_CLEAR_PCIE 0x0000000000000080 -#define WDC_DRIVE_CAP_RESIZE 0x0000000000000100 +#define WDC_DRIVE_CAP_RESIZE 0x0000000000000100 #define WDC_DRIVE_CAP_DRIVE_ESSENTIALS 0x0000000100000000 #define WDC_DRIVE_CAP_DUI_DATA 0x0000000200000000 @@ -103,50 +103,50 @@ #define SN730_LOG_CHUNK_SIZE 0x1000 /* Drive Resize */ -#define WDC_NVME_DRIVE_RESIZE_OPCODE 0xCC -#define WDC_NVME_DRIVE_RESIZE_CMD 0x03 -#define WDC_NVME_DRIVE_RESIZE_SUBCMD 0x01 +#define WDC_NVME_DRIVE_RESIZE_OPCODE 0xCC +#define WDC_NVME_DRIVE_RESIZE_CMD 0x03 +#define WDC_NVME_DRIVE_RESIZE_SUBCMD 0x01 /* Capture Diagnostics */ -#define WDC_NVME_CAP_DIAG_HEADER_TOC_SIZE WDC_NVME_LOG_SIZE_DATA_LEN +#define WDC_NVME_CAP_DIAG_HEADER_TOC_SIZE WDC_NVME_LOG_SIZE_DATA_LEN #define WDC_NVME_CAP_DIAG_OPCODE 0xE6 -#define WDC_NVME_CAP_DIAG_CMD_OPCODE 0xC6 +#define WDC_NVME_CAP_DIAG_CMD_OPCODE 0xC6 #define WDC_NVME_CAP_DIAG_SUBCMD 0x00 #define WDC_NVME_CAP_DIAG_CMD 0x00 -#define WDC_NVME_CRASH_DUMP_TYPE 1 -#define WDC_NVME_PFAIL_DUMP_TYPE 2 +#define WDC_NVME_CRASH_DUMP_TYPE 1 +#define WDC_NVME_PFAIL_DUMP_TYPE 2 /* Capture Device Unit Info */ -#define WDC_NVME_CAP_DUI_HEADER_SIZE 0x400 -#define WDC_NVME_CAP_DUI_OPCODE 0xFA +#define WDC_NVME_CAP_DUI_HEADER_SIZE 0x400 +#define WDC_NVME_CAP_DUI_OPCODE 0xFA /* Crash dump */ -#define WDC_NVME_CRASH_DUMP_SIZE_DATA_LEN WDC_NVME_LOG_SIZE_DATA_LEN -#define WDC_NVME_CRASH_DUMP_SIZE_NDT 0x02 -#define WDC_NVME_CRASH_DUMP_SIZE_CMD 0x20 -#define WDC_NVME_CRASH_DUMP_SIZE_SUBCMD 0x03 +#define WDC_NVME_CRASH_DUMP_SIZE_DATA_LEN WDC_NVME_LOG_SIZE_DATA_LEN +#define WDC_NVME_CRASH_DUMP_SIZE_NDT 0x02 +#define WDC_NVME_CRASH_DUMP_SIZE_CMD 0x20 +#define WDC_NVME_CRASH_DUMP_SIZE_SUBCMD 0x03 #define WDC_NVME_CRASH_DUMP_OPCODE WDC_NVME_CAP_DIAG_CMD_OPCODE #define WDC_NVME_CRASH_DUMP_CMD 0x20 #define WDC_NVME_CRASH_DUMP_SUBCMD 0x04 /* PFail Crash dump */ -#define WDC_NVME_PF_CRASH_DUMP_SIZE_DATA_LEN WDC_NVME_LOG_SIZE_HDR_LEN -#define WDC_NVME_PF_CRASH_DUMP_SIZE_NDT 0x02 -#define WDC_NVME_PF_CRASH_DUMP_SIZE_CMD 0x20 -#define WDC_NVME_PF_CRASH_DUMP_SIZE_SUBCMD 0x05 +#define WDC_NVME_PF_CRASH_DUMP_SIZE_DATA_LEN WDC_NVME_LOG_SIZE_HDR_LEN +#define WDC_NVME_PF_CRASH_DUMP_SIZE_NDT 0x02 +#define WDC_NVME_PF_CRASH_DUMP_SIZE_CMD 0x20 +#define WDC_NVME_PF_CRASH_DUMP_SIZE_SUBCMD 0x05 -#define WDC_NVME_PF_CRASH_DUMP_OPCODE WDC_NVME_CAP_DIAG_CMD_OPCODE -#define WDC_NVME_PF_CRASH_DUMP_CMD 0x20 -#define WDC_NVME_PF_CRASH_DUMP_SUBCMD 0x06 +#define WDC_NVME_PF_CRASH_DUMP_OPCODE WDC_NVME_CAP_DIAG_CMD_OPCODE +#define WDC_NVME_PF_CRASH_DUMP_CMD 0x20 +#define WDC_NVME_PF_CRASH_DUMP_SUBCMD 0x06 /* Drive Log */ -#define WDC_NVME_DRIVE_LOG_SIZE_OPCODE WDC_NVME_CAP_DIAG_CMD_OPCODE -#define WDC_NVME_DRIVE_LOG_SIZE_DATA_LEN WDC_NVME_LOG_SIZE_DATA_LEN +#define WDC_NVME_DRIVE_LOG_SIZE_OPCODE WDC_NVME_CAP_DIAG_CMD_OPCODE +#define WDC_NVME_DRIVE_LOG_SIZE_DATA_LEN WDC_NVME_LOG_SIZE_DATA_LEN #define WDC_NVME_DRIVE_LOG_SIZE_NDT 0x02 #define WDC_NVME_DRIVE_LOG_SIZE_CMD 0x20 -#define WDC_NVME_DRIVE_LOG_SIZE_SUBCMD 0x01 +#define WDC_NVME_DRIVE_LOG_SIZE_SUBCMD 0x01 #define WDC_NVME_DRIVE_LOG_OPCODE WDC_NVME_CAP_DIAG_CMD_OPCODE #define WDC_NVME_DRIVE_LOG_CMD 0x20 @@ -154,100 +154,100 @@ /* Purge and Purge Monitor */ #define WDC_NVME_PURGE_CMD_OPCODE 0xDD -#define WDC_NVME_PURGE_MONITOR_OPCODE 0xDE -#define WDC_NVME_PURGE_MONITOR_DATA_LEN 0x2F -#define WDC_NVME_PURGE_MONITOR_CMD_CDW10 0x0000000C -#define WDC_NVME_PURGE_MONITOR_TIMEOUT 0x7530 +#define WDC_NVME_PURGE_MONITOR_OPCODE 0xDE +#define WDC_NVME_PURGE_MONITOR_DATA_LEN 0x2F +#define WDC_NVME_PURGE_MONITOR_CMD_CDW10 0x0000000C +#define WDC_NVME_PURGE_MONITOR_TIMEOUT 0x7530 #define WDC_NVME_PURGE_CMD_SEQ_ERR 0x0C #define WDC_NVME_PURGE_INT_DEV_ERR 0x06 #define WDC_NVME_PURGE_STATE_IDLE 0x00 #define WDC_NVME_PURGE_STATE_DONE 0x01 #define WDC_NVME_PURGE_STATE_BUSY 0x02 -#define WDC_NVME_PURGE_STATE_REQ_PWR_CYC 0x03 -#define WDC_NVME_PURGE_STATE_PWR_CYC_PURGE 0x04 +#define WDC_NVME_PURGE_STATE_REQ_PWR_CYC 0x03 +#define WDC_NVME_PURGE_STATE_PWR_CYC_PURGE 0x04 /* Clear dumps */ -#define WDC_NVME_CLEAR_DUMP_OPCODE 0xFF -#define WDC_NVME_CLEAR_CRASH_DUMP_CMD 0x03 -#define WDC_NVME_CLEAR_CRASH_DUMP_SUBCMD 0x05 -#define WDC_NVME_CLEAR_PF_CRASH_DUMP_SUBCMD 0x06 +#define WDC_NVME_CLEAR_DUMP_OPCODE 0xFF +#define WDC_NVME_CLEAR_CRASH_DUMP_CMD 0x03 +#define WDC_NVME_CLEAR_CRASH_DUMP_SUBCMD 0x05 +#define WDC_NVME_CLEAR_PF_CRASH_DUMP_SUBCMD 0x06 /* Additional Smart Log */ -#define WDC_ADD_LOG_BUF_LEN 0x4000 -#define WDC_NVME_ADD_LOG_OPCODE 0xC1 -#define WDC_GET_LOG_PAGE_SSD_PERFORMANCE 0x37 +#define WDC_ADD_LOG_BUF_LEN 0x4000 +#define WDC_NVME_ADD_LOG_OPCODE 0xC1 +#define WDC_GET_LOG_PAGE_SSD_PERFORMANCE 0x37 #define WDC_NVME_GET_STAT_PERF_INTERVAL_LIFETIME 0x0F /* C2 Log Page */ #define WDC_NVME_GET_DEV_MGMNT_LOG_PAGE_OPCODE 0xC2 -#define WDC_C2_LOG_BUF_LEN 0x1000 -#define WDC_C2_LOG_PAGES_SUPPORTED_ID 0x08 -#define WDC_C2_THERMAL_THROTTLE_STATUS_ID 0x18 -#define WDC_C2_ASSERT_DUMP_PRESENT_ID 0x19 -#define WDC_C2_USER_EOL_STATUS_ID 0x1A -#define WDC_C2_USER_EOL_STATE_ID 0x1C -#define WDC_C2_SYSTEM_EOL_STATE_ID 0x1D -#define WDC_C2_FORMAT_CORRUPT_REASON_ID 0x1E -#define WDC_EOL_STATUS_NORMAL 0x00000000 -#define WDC_EOL_STATUS_END_OF_LIFE 0x00000001 -#define WDC_EOL_STATUS_READ_ONLY 0x00000002 -#define WDC_ASSERT_DUMP_NOT_PRESENT 0x00000000 -#define WDC_ASSERT_DUMP_PRESENT 0x00000001 -#define WDC_THERMAL_THROTTLING_OFF 0x00000000 -#define WDC_THERMAL_THROTTLING_ON 0x00000001 -#define WDC_THERMAL_THROTTLING_UNAVAILABLE 0x00000002 -#define WDC_FORMAT_NOT_CORRUPT 0x00000000 -#define WDC_FORMAT_CORRUPT_FW_ASSERT 0x00000001 -#define WDC_FORMAT_CORRUPT_UNKNOWN 0x000000FF +#define WDC_C2_LOG_BUF_LEN 0x1000 +#define WDC_C2_LOG_PAGES_SUPPORTED_ID 0x08 +#define WDC_C2_THERMAL_THROTTLE_STATUS_ID 0x18 +#define WDC_C2_ASSERT_DUMP_PRESENT_ID 0x19 +#define WDC_C2_USER_EOL_STATUS_ID 0x1A +#define WDC_C2_USER_EOL_STATE_ID 0x1C +#define WDC_C2_SYSTEM_EOL_STATE_ID 0x1D +#define WDC_C2_FORMAT_CORRUPT_REASON_ID 0x1E +#define WDC_EOL_STATUS_NORMAL 0x00000000 +#define WDC_EOL_STATUS_END_OF_LIFE 0x00000001 +#define WDC_EOL_STATUS_READ_ONLY 0x00000002 +#define WDC_ASSERT_DUMP_NOT_PRESENT 0x00000000 +#define WDC_ASSERT_DUMP_PRESENT 0x00000001 +#define WDC_THERMAL_THROTTLING_OFF 0x00000000 +#define WDC_THERMAL_THROTTLING_ON 0x00000001 +#define WDC_THERMAL_THROTTLING_UNAVAILABLE 0x00000002 +#define WDC_FORMAT_NOT_CORRUPT 0x00000000 +#define WDC_FORMAT_CORRUPT_FW_ASSERT 0x00000001 +#define WDC_FORMAT_CORRUPT_UNKNOWN 0x000000FF /* CA Log Page */ -#define WDC_NVME_GET_DEVICE_INFO_LOG_OPCODE 0xCA -#define WDC_CA_LOG_BUF_LEN 0x80 +#define WDC_NVME_GET_DEVICE_INFO_LOG_OPCODE 0xCA +#define WDC_CA_LOG_BUF_LEN 0x80 /* C0 EOL Status Log Page */ -#define WDC_NVME_GET_EOL_STATUS_LOG_OPCODE 0xC0 -#define WDC_NVME_EOL_STATUS_LOG_LEN 0x200 +#define WDC_NVME_GET_EOL_STATUS_LOG_OPCODE 0xC0 +#define WDC_NVME_EOL_STATUS_LOG_LEN 0x200 /* D0 Smart Log Page */ -#define WDC_NVME_GET_VU_SMART_LOG_OPCODE 0xD0 -#define WDC_NVME_VU_SMART_LOG_LEN 0x200 +#define WDC_NVME_GET_VU_SMART_LOG_OPCODE 0xD0 +#define WDC_NVME_VU_SMART_LOG_LEN 0x200 /* Clear PCIe Correctable Errors */ -#define WDC_NVME_CLEAR_PCIE_CORR_OPCODE WDC_NVME_CAP_DIAG_CMD_OPCODE -#define WDC_NVME_CLEAR_PCIE_CORR_CMD 0x22 -#define WDC_NVME_CLEAR_PCIE_CORR_SUBCMD 0x04 +#define WDC_NVME_CLEAR_PCIE_CORR_OPCODE WDC_NVME_CAP_DIAG_CMD_OPCODE +#define WDC_NVME_CLEAR_PCIE_CORR_CMD 0x22 +#define WDC_NVME_CLEAR_PCIE_CORR_SUBCMD 0x04 /* Clear Assert Dump Status */ -#define WDC_NVME_CLEAR_ASSERT_DUMP_OPCODE 0xD8 -#define WDC_NVME_CLEAR_ASSERT_DUMP_CMD 0x03 -#define WDC_NVME_CLEAR_ASSERT_DUMP_SUBCMD 0x05 +#define WDC_NVME_CLEAR_ASSERT_DUMP_OPCODE 0xD8 +#define WDC_NVME_CLEAR_ASSERT_DUMP_CMD 0x03 +#define WDC_NVME_CLEAR_ASSERT_DUMP_SUBCMD 0x05 /* Drive Essentials */ #define WDC_DE_DEFAULT_NUMBER_OF_ERROR_ENTRIES 64 -#define WDC_DE_GENERIC_BUFFER_SIZE 80 -#define WDC_DE_GLOBAL_NSID 0xFFFFFFFF -#define WDC_DE_DEFAULT_NAMESPACE_ID 0x01 -#define WDC_DE_PATH_SEPARATOR "/" -#define WDC_DE_TAR_FILES "*.bin" -#define WDC_DE_TAR_FILE_EXTN ".tar.gz" -#define WDC_DE_TAR_CMD "tar -czf" +#define WDC_DE_GENERIC_BUFFER_SIZE 80 +#define WDC_DE_GLOBAL_NSID 0xFFFFFFFF +#define WDC_DE_DEFAULT_NAMESPACE_ID 0x01 +#define WDC_DE_PATH_SEPARATOR "/" +#define WDC_DE_TAR_FILES "*.bin" +#define WDC_DE_TAR_FILE_EXTN ".tar.gz" +#define WDC_DE_TAR_CMD "tar -czf" /* VU Opcodes */ -#define WDC_DE_VU_READ_SIZE_OPCODE 0xC0 -#define WDC_DE_VU_READ_BUFFER_OPCODE 0xC2 +#define WDC_DE_VU_READ_SIZE_OPCODE 0xC0 +#define WDC_DE_VU_READ_BUFFER_OPCODE 0xC2 -#define WDC_DE_FILE_HEADER_SIZE 4 -#define WDC_DE_FILE_OFFSET_SIZE 2 -#define WDC_DE_FILE_NAME_SIZE 32 +#define WDC_DE_FILE_HEADER_SIZE 4 +#define WDC_DE_FILE_OFFSET_SIZE 2 +#define WDC_DE_FILE_NAME_SIZE 32 #define WDC_DE_VU_READ_BUFFER_STANDARD_OFFSET 0x8000 -#define WDC_DE_READ_MAX_TRANSFER_SIZE 0x8000 +#define WDC_DE_READ_MAX_TRANSFER_SIZE 0x8000 #define WDC_DE_MANUFACTURING_INFO_PAGE_FILE_NAME "manufacturing_info" /* Unique log entry page name. */ -#define WDC_DE_CORE_DUMP_FILE_NAME "core_dump" -#define WDC_DE_EVENT_LOG_FILE_NAME "event_log" -#define WDC_DE_DESTN_SPI 1 -#define WDC_DE_DUMPTRACE_DESTINATION 6 +#define WDC_DE_CORE_DUMP_FILE_NAME "core_dump" +#define WDC_DE_EVENT_LOG_FILE_NAME "event_log" +#define WDC_DE_DESTN_SPI 1 +#define WDC_DE_DUMPTRACE_DESTINATION 6 #define min(x, y) ((x) > (y) ? (y) : (x))