scsi: mpt3sas: Don't print sense pool info twice
Subsystems (2)
PATCH 1/1 scsi: mpt3sas: Don't print sense pool info twice
_base_allocate_sense_dma_pool() already prints out the sense pool information, so don't print it a second time after calling it in _base_allocate_memory_pools(). In addition the version in _base_allocate_memory_pools() was using the wrong size value, sz, which was last assigned when doing some nvme calculations instead of sense_sz to determine the pool size in kilobytes.
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +0 -5
@@ -6616,11 +6616,6 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)else if (rc == -EAGAIN ) goto try_32bit_dma; total_sz += sense_sz; -ioc_info (ioc, -"sense pool(0x%p)- dma(0x%llx): depth(%d)," -"element_size(%d), pool_size(%d kB)\n" , - ioc->sense, (unsigned long long )ioc->sense_dma, ioc->scsiio_depth, -SCSI_SENSE_BUFFERSIZE , sz /1024 );/* reply pool, 4 byte align */ sz = ioc->reply_free_queue_depth * ioc->reply_sz; rc =_base_allocate_reply_pool (ioc, sz);
Signature · 1 line
2.38.1
PATCH v2 1/1 scsi: mpt3sas: Don't print sense pool info twice
_base_allocate_sense_dma_pool() already prints out the sense pool information, so don't print it a second time after calling it in _base_allocate_memory_pools(). In addition the version in _base_allocate_memory_pools() was using the wrong size value, sz, which was last assigned when doing some nvme calculations instead of sense_sz to determine the pool size in kilobytes.
---
changes from v1: Add missing Fixes tag, and missed Cc to James
drivers/scsi/mpt3sas/mpt3sas_base.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +0 -5
@@ -6616,11 +6616,6 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)else if (rc == -EAGAIN ) goto try_32bit_dma; total_sz += sense_sz; -ioc_info (ioc, -"sense pool(0x%p)- dma(0x%llx): depth(%d)," -"element_size(%d), pool_size(%d kB)\n" , - ioc->sense, (unsigned long long )ioc->sense_dma, ioc->scsiio_depth, -SCSI_SENSE_BUFFERSIZE , sz /1024 );/* reply pool, 4 byte align */ sz = ioc->reply_free_queue_depth * ioc->reply_sz; rc =_base_allocate_reply_pool (ioc, sz);
Signature · 1 line
2.38.1
Martin K. Petersen
AppliedQuoted 8 lines · Jerry Snitselaar
_base_allocate_sense_dma_pool()already prints out the sense pool information, so don't print it a second time after calling it in_base_allocate_memory_pools(). In addition the version in_base_allocate_memory_pools()was using the wrong size value, sz, which was last assigned when doing some nvme calculations instead ofsense_szto determine the pool size in kilobytes.[...]
Applied to 6.3/scsi-fixes, thanks!
[1/1] scsi: mpt3sas: Don't print sense pool info twice
https://git.kernel.org/mkp/scsi/c/d684a7a26f7d
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering