Skip to content

Commit 17c6b0b

Browse files
committed
scsi: smartpqi: Enhance WWID logging logic
JIRA: https://issues.redhat.com/browse/RHEL-96279 commit 001164f Author: Venkatesh Emparala <Venkatesh.Emparala@microchip.com> Date: Wed Apr 23 13:32:27 2025 -0500 scsi: smartpqi: Enhance WWID logging logic Log the extended WWID for NVMe devices and for devices that have the firmware feature bit "PQI_FIRMWARE_FEATURE_RPL_EXTENDED_FORMAT_4_5" enabled. Log 8-bytes otherwise. Reviewed-by: Scott Teel <scott.teel@microchip.com> Reviewed-by: Scott Benesh <scott.benesh@microchip.com> Reviewed-by: Mike McGowen <mike.mcgowen@microchip.com> Signed-off-by: Venkatesh Emparala <Venkatesh.Emparala@microchip.com> Signed-off-by: Don Brace <don.brace@microchip.com> Link: https://lore.kernel.org/r/20250423183229.538572-4-don.brace@microchip.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Don Brace <dbrace@redhat.com>
1 parent 53f75d3 commit 17c6b0b

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

drivers/scsi/smartpqi/smartpqi_init.c

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2012,18 +2012,31 @@ static void pqi_dev_info(struct pqi_ctrl_info *ctrl_info,
20122012
PQI_DEV_INFO_BUFFER_LENGTH - count,
20132013
"-:-");
20142014

2015-
if (pqi_is_logical_device(device))
2015+
if (pqi_is_logical_device(device)) {
20162016
count += scnprintf(buffer + count,
20172017
PQI_DEV_INFO_BUFFER_LENGTH - count,
20182018
" %08x%08x",
20192019
*((u32 *)&device->scsi3addr),
20202020
*((u32 *)&device->scsi3addr[4]));
2021-
else
2021+
} else if (ctrl_info->rpl_extended_format_4_5_supported) {
2022+
if (device->device_type == SA_DEVICE_TYPE_NVME)
2023+
count += scnprintf(buffer + count,
2024+
PQI_DEV_INFO_BUFFER_LENGTH - count,
2025+
" %016llx%016llx",
2026+
get_unaligned_be64(&device->wwid[0]),
2027+
get_unaligned_be64(&device->wwid[8]));
2028+
else
2029+
count += scnprintf(buffer + count,
2030+
PQI_DEV_INFO_BUFFER_LENGTH - count,
2031+
" %016llx",
2032+
get_unaligned_be64(&device->wwid[0]));
2033+
} else {
20222034
count += scnprintf(buffer + count,
20232035
PQI_DEV_INFO_BUFFER_LENGTH - count,
2024-
" %016llx%016llx",
2025-
get_unaligned_be64(&device->wwid[0]),
2026-
get_unaligned_be64(&device->wwid[8]));
2036+
" %016llx",
2037+
get_unaligned_be64(&device->wwid[0]));
2038+
}
2039+
20272040

20282041
count += scnprintf(buffer + count, PQI_DEV_INFO_BUFFER_LENGTH - count,
20292042
" %s %.8s %.16s ",

0 commit comments

Comments
 (0)