From: Tokunori Ikegami Date: Fri, 3 Jan 2025 13:14:10 +0000 (+0900) Subject: ocp-print: use int48_to_long() to print 48 bits values X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2be043664ceb80670f85ffc11276f0ba9a4d3e94;p=users%2Fsagi%2Fnvme-cli.git ocp-print: use int48_to_long() to print 48 bits values This is to reduce unnecessary mask with 0x0000FFFFFFFFFFFF. Signed-off-by: Tokunori Ikegami --- diff --git a/plugins/ocp/ocp-print-json.c b/plugins/ocp/ocp-print-json.c index 83594d3d..316f152e 100644 --- a/plugins/ocp/ocp-print-json.c +++ b/plugins/ocp/ocp-print-json.c @@ -162,11 +162,11 @@ static void json_smart_extended_log_v1(void *data) (uint64_t)le64_to_cpu(*(uint64_t *)&log_data[SCAO_PMUR])); json_object_add_value_object(root, "Physical media units read", pmur); json_object_add_value_uint64(root, "Bad user nand blocks - Raw", - (uint64_t)le64_to_cpu(*(uint64_t *)&log_data[SCAO_BUNBR] & 0x0000FFFFFFFFFFFF)); + int48_to_long(&log_data[SCAO_BUNBR])); json_object_add_value_uint(root, "Bad user nand blocks - Normalized", (uint16_t)le16_to_cpu(*(uint16_t *)&log_data[SCAO_BUNBN])); json_object_add_value_uint64(root, "Bad system nand blocks - Raw", - (uint64_t)le64_to_cpu(*(uint64_t *)&log_data[SCAO_BSNBR] & 0x0000FFFFFFFFFFFF)); + int48_to_long(&log_data[SCAO_BSNBR])); json_object_add_value_uint(root, "Bad system nand blocks - Normalized", (uint16_t)le16_to_cpu(*(uint16_t *)&log_data[SCAO_BSNBN])); json_object_add_value_uint64(root, "XOR recovery count", diff --git a/plugins/ocp/ocp-print-stdout.c b/plugins/ocp/ocp-print-stdout.c index 3ddf2293..7f767bbf 100644 --- a/plugins/ocp/ocp-print-stdout.c +++ b/plugins/ocp/ocp-print-stdout.c @@ -111,11 +111,11 @@ static void stdout_smart_extended_log(void *data, unsigned int version) (uint64_t)le64_to_cpu(*(uint64_t *)&log_data[SCAO_PMUR + 8]), (uint64_t)le64_to_cpu(*(uint64_t *)&log_data[SCAO_PMUR])); printf(" Bad user nand blocks - Raw %"PRIu64"\n", - (uint64_t)le64_to_cpu(*(uint64_t *)&log_data[SCAO_BUNBR] & 0x0000FFFFFFFFFFFF)); + int48_to_long(&log_data[SCAO_BUNBR])); printf(" Bad user nand blocks - Normalized %d\n", (uint16_t)le16_to_cpu(*(uint16_t *)&log_data[SCAO_BUNBN])); printf(" Bad system nand blocks - Raw %"PRIu64"\n", - (uint64_t)le64_to_cpu(*(uint64_t *)&log_data[SCAO_BSNBR] & 0x0000FFFFFFFFFFFF)); + int48_to_long(&log_data[SCAO_BSNBR])); printf(" Bad system nand blocks - Normalized %d\n", (uint16_t)le16_to_cpu(*(uint16_t *)&log_data[SCAO_BSNBN])); printf(" XOR recovery count %"PRIu64"\n",