Page MenuHomeFreeBSD
Files F116070150

D44121.diff
No OneTemporary
Actions

D44121.diff
View Options

diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c
--- a/sbin/nvmecontrol/logpage.c
+++ b/sbin/nvmecontrol/logpage.c
@@ -229,10 +229,6 @@
nvme_health_information_page_swapbytes(
(struct nvme_health_information_page *)payload);
break;
- case NVME_LOG_FIRMWARE_SLOT:
- nvme_firmware_page_swapbytes(
- (struct nvme_firmware_page *)payload);
- break;
case NVME_LOG_CHANGED_NAMESPACE:
nvme_ns_list_swapbytes((struct nvme_ns_list *)payload);
break;
@@ -425,15 +421,10 @@
else
status = "Inactive";
- if (fw->revision[i] == 0LLU)
+ if (fw->revision[i][0] == '\0')
printf("Empty\n");
else
- if (isprint(*(char *)&fw->revision[i]))
- printf("[%s] %.8s\n", status,
- (char *)&fw->revision[i]);
- else
- printf("[%s] %016jx\n", status,
- fw->revision[i]);
+ printf("[%s] %.8s\n", status, fw->revision[i]);
}
}
diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
--- a/sys/dev/nvme/nvme.h
+++ b/sys/dev/nvme/nvme.h
@@ -1465,7 +1465,8 @@
struct nvme_firmware_page {
uint8_t afi;
uint8_t reserved[7];
- uint64_t revision[7]; /* revisions for 7 slots */
+ /* revisions for 7 slots */
+ uint8_t revision[7][NVME_FIRMWARE_REVISION_LENGTH];
uint8_t reserved2[448];
} __packed __aligned(4);
@@ -2006,17 +2007,6 @@
#endif
}
-static inline
-void nvme_firmware_page_swapbytes(struct nvme_firmware_page *s __unused)
-{
-#if _BYTE_ORDER != _LITTLE_ENDIAN
- int i;
-
- for (i = 0; i < 7; i++)
- s->revision[i] = le64toh(s->revision[i]);
-#endif
-}
-
static inline
void nvme_ns_list_swapbytes(struct nvme_ns_list *s __unused)
{
diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -682,10 +682,6 @@
nvme_health_information_page_swapbytes(
(struct nvme_health_information_page *)aer->log_page_buffer);
break;
- case NVME_LOG_FIRMWARE_SLOT:
- nvme_firmware_page_swapbytes(
- (struct nvme_firmware_page *)aer->log_page_buffer);
- break;
case NVME_LOG_CHANGED_NAMESPACE:
nvme_ns_list_swapbytes(
(struct nvme_ns_list *)aer->log_page_buffer);

File Metadata

Mime Type
text/plain
Expires
Sat, May 3, 6:53 AM (10 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17926798
Default Alt Text
D44121.diff (2 KB)

Event Timeline