From 97b77de2d951b4946fb3219a99c98f2dd4c0120f Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 16 Apr 2024 16:36:47 -0600 Subject: [PATCH] nvme: Eliminate intel_log_temp_stats_swapbytes We can't post a AER for this page, so there's no need to be able to swap it to host byte order. It's not one of the standard defined pages that can post via AER, and the vendor's public docs for this temperature page don't suggest it's possible to get over or under event changes. Since nvmecontrol no longer needsd the swap routine, remove it since it's now unused. Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44659 --- sys/dev/nvme/nvme.h | 17 ----------------- sys/dev/nvme/nvme_ctrlr.c | 4 ---- 2 files changed, 21 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 706b77507b6..409d1f006ca 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -2241,23 +2241,6 @@ void nvme_sanitize_status_page_swapbytes( #endif } -static inline -void intel_log_temp_stats_swapbytes(struct intel_log_temp_stats *s __unused) -{ -#if _BYTE_ORDER != _LITTLE_ENDIAN - - s->current = le64toh(s->current); - s->overtemp_flag_last = le64toh(s->overtemp_flag_last); - s->overtemp_flag_life = le64toh(s->overtemp_flag_life); - s->max_temp = le64toh(s->max_temp); - s->min_temp = le64toh(s->min_temp); - /* omit _rsvd[] */ - s->max_oper_temp = le64toh(s->max_oper_temp); - s->min_oper_temp = le64toh(s->min_oper_temp); - s->est_offset = le64toh(s->est_offset); -#endif -} - static inline void nvme_resv_status_swapbytes(struct nvme_resv_status *s __unused, size_t size __unused) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index e41f3263534..b7b03082c54 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -718,10 +718,6 @@ nvme_ctrlr_async_event_log_page_cb(void *arg, const struct nvme_completion *cpl) nvme_sanitize_status_page_swapbytes( (struct nvme_sanitize_status_page *)aer->log_page_buffer); break; - case INTEL_LOG_TEMP_STATS: - intel_log_temp_stats_swapbytes( - (struct intel_log_temp_stats *)aer->log_page_buffer); - break; default: break; }