mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-05 09:49:58 -04:00
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>
This commit is contained in:
committed by
Martin K. Petersen
parent
01b8bdddcf
commit
001164fc30
@@ -2011,18 +2011,31 @@ static void pqi_dev_info(struct pqi_ctrl_info *ctrl_info,
|
||||
PQI_DEV_INFO_BUFFER_LENGTH - count,
|
||||
"-:-");
|
||||
|
||||
if (pqi_is_logical_device(device))
|
||||
if (pqi_is_logical_device(device)) {
|
||||
count += scnprintf(buffer + count,
|
||||
PQI_DEV_INFO_BUFFER_LENGTH - count,
|
||||
" %08x%08x",
|
||||
*((u32 *)&device->scsi3addr),
|
||||
*((u32 *)&device->scsi3addr[4]));
|
||||
else
|
||||
} else if (ctrl_info->rpl_extended_format_4_5_supported) {
|
||||
if (device->device_type == SA_DEVICE_TYPE_NVME)
|
||||
count += scnprintf(buffer + count,
|
||||
PQI_DEV_INFO_BUFFER_LENGTH - count,
|
||||
" %016llx%016llx",
|
||||
get_unaligned_be64(&device->wwid[0]),
|
||||
get_unaligned_be64(&device->wwid[8]));
|
||||
else
|
||||
count += scnprintf(buffer + count,
|
||||
PQI_DEV_INFO_BUFFER_LENGTH - count,
|
||||
" %016llx",
|
||||
get_unaligned_be64(&device->wwid[0]));
|
||||
} else {
|
||||
count += scnprintf(buffer + count,
|
||||
PQI_DEV_INFO_BUFFER_LENGTH - count,
|
||||
" %016llx%016llx",
|
||||
get_unaligned_be64(&device->wwid[0]),
|
||||
get_unaligned_be64(&device->wwid[8]));
|
||||
" %016llx",
|
||||
get_unaligned_be64(&device->wwid[0]));
|
||||
}
|
||||
|
||||
|
||||
count += scnprintf(buffer + count, PQI_DEV_INFO_BUFFER_LENGTH - count,
|
||||
" %s %.8s %.16s ",
|
||||
|
||||
Reference in New Issue
Block a user