Neaten logging uses
Subsystems (2)
cover Neaten logging uses
Several defects exist in the logging uses
o Missing KERN_<LEVEL>
o Unnecessary KERN_<LEVEL> uses with panic
o Mismatched MPT3SAS_FMT and %s: with name and __func__
Correct these defects and perhaps add some clarity to the logging.
Joe Perches (7):
mpt3sas: Add ioc_<level> logging macros
mpt3sas: Convert uses of pr_<level> with MPT3SAS_FMT to ioc_<level>
mpt3sas: Convert mlsleading uses of pr_<level> with MPT3SAS_FMT
mpt3sas: Convert logging uses with MPT3SAS_FMT and reply_q_name to %s:
mpt3sas: Remove KERN_WARNING from panic uses
mpt3sas: Convert logging uses with MPT3SAS_FMT without logging levels
mpt3sas: Remove unused macro MPT3SAS_FMT
drivers/scsi/mpt3sas/mpt3sas_base.c | 1116 +++++++++----------- drivers/scsi/mpt3sas/mpt3sas_base.h | 9 +- drivers/scsi/mpt3sas/mpt3sas_config.c | 89 +- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 493 ++++----- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1487 ++++++++++++--------------- drivers/scsi/mpt3sas/mpt3sas_transport.c | 337 +++--- drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 101 +- drivers/scsi/mpt3sas/mpt3sas_warpdrive.c | 70 +- 8 files changed, 1618 insertions(+), 2084 deletions(-)
Signature · 1 line
2.15.0
PATCH 1/7 mpt3sas: Add ioc_<level> logging macros
These macros can help identify specific logging uses and eventually perhaps reduce object sizes.
Signed-off-by Joe Perches <[email protected]>
--- drivers/scsi/mpt3sas/mpt3sas_base.h | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/scsi/mpt3sas/mpt3sas_base.h +9 -0
@@ -160,6 +160,15 @@ struct mpt3sas_nvme_cmd {*/ #define MPT3SAS_FMT "%s: " +#define ioc_err (ioc, fmt, ...) \ + pr_err("%s: " fmt, (ioc)->name, ##__VA_ARGS__) +#define ioc_notice (ioc, fmt, ...) \ + pr_notice("%s: " fmt, (ioc)->name, ##__VA_ARGS__) +#define ioc_warn (ioc, fmt, ...) \ + pr_warn("%s: " fmt, (ioc)->name, ##__VA_ARGS__) +#define ioc_info (ioc, fmt, ...) \ + pr_info("%s: " fmt, (ioc)->name, ##__VA_ARGS__) +/* * WarpDrive Specific Log codes */
Signature · 1 line
2.15.0
PATCH 2/7 mpt3sas: Convert uses of pr_<level> with MPT3SAS_FMT to ioc_<level>
In reply to Joe PerchesUse a more common logging style.
Done using the perl script below and some typing
$ git grep --name-only -w MPT3SAS_FMT -- "*.c" | \
xargs perl -i -e 'local $/; while (<>) { s/\bpr_(info|err|notice|warn)\s*\(\s*MPT3SAS_FMT\s*("[^"]+"(?:\s*\\?\s*"[^"]+"\s*){0,5}\s*),\s*ioc->name\s*/ioc_\1(ioc, \2/g; print;}'Miscellanea for these conversions:
o Coalesce formats
o Realign arguments
o Remove unnecessary parentheses
o Use casts to u64 instead of unsigned long long where appropriate
o Convert broken pr_info uses to pr_cont
o Fix broken format string concatenation with line continuations and excess whitespace
Signed-off-by Joe Perches <[email protected]>
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 1065 +++++++++----------- drivers/scsi/mpt3sas/mpt3sas_config.c | 48 +- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 493 ++++----- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1425 ++++++++++++--------------- drivers/scsi/mpt3sas/mpt3sas_transport.c | 313 +++--- drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 101 +- drivers/scsi/mpt3sas/mpt3sas_warpdrive.c | 70 +- 7 files changed, 1533 insertions(+), 1982 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +465 -600
@@ -122,8 +122,8 @@ mpt3sas_base_check_cmd_timeout(struct MPT3SAS_ADAPTER *ioc,if (!(status &MPT3_CMD_RESET )) issue_reset =1 ; -pr_err (MPT3SAS_FMT "Command %s\n" , ioc->name, - ((issue_reset ==0 ) ?"terminated due to Host Reset" :"Timeout" )); +ioc_err (ioc,"Command %s\n" , + issue_reset ==0 ?"terminated due to Host Reset" :"Timeout" );_debug_dump_mf (mpi_request, sz);return issue_reset;
@@ -336,9 +336,7 @@ _base_get_chain_buffer_dma_to_chain_buffer(struct MPT3SAS_ADAPTER *ioc,return ct->chain_buffer; } } -pr_info (MPT3SAS_FMT -"Provided chain_buffer_dma address is not in the lookup list\n" , - ioc->name); +ioc_info (ioc,"Provided chain_buffer_dma address is not in the lookup list\n" );return NULL ; }
@@ -394,7 +392,7 @@ static void _clone_sg_entries(struct MPT3SAS_ADAPTER *ioc,/* Get scsi_cmd using smid */ scmd =mpt3sas_scsih_scsi_lookup_get (ioc, smid);if (scmd ==NULL ) { -pr_err (MPT3SAS_FMT "scmd is NULL\n" , ioc->name); +ioc_err (ioc,"scmd is NULL\n" );return ; }
@@ -566,8 +564,7 @@ _base_fault_reset_work(struct work_struct *work) doorbell =mpt3sas_base_get_iocstate (ioc,0 );if ((doorbell &MPI2_IOC_STATE_MASK ) ==MPI2_IOC_STATE_MASK ) { -pr_err (MPT3SAS_FMT "SAS host is non-operational !!!!\n" , - ioc->name); +ioc_err (ioc,"SAS host is non-operational !!!!\n" );/* It may be possible that EEH recovery can resolve some of * pci bus failure issues rather removing the dead ioc function
@@ -600,13 +597,11 @@ _base_fault_reset_work(struct work_struct *work) p =kthread_run (mpt3sas_remove_dead_ioc_func, ioc,"%s_dead_ioc_%d" , ioc->driver_name, ioc->id);if (IS_ERR (p)) -pr_err (MPT3SAS_FMT -"%s: Running mpt3sas_dead_ioc thread failed !!!!\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: Running mpt3sas_dead_ioc thread failed !!!!\n" , + __func__);else -pr_err (MPT3SAS_FMT -"%s: Running mpt3sas_dead_ioc thread success !!!!\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: Running mpt3sas_dead_ioc thread success !!!!\n" , + __func__);return ;/* don't rearm timer */ }
@@ -614,8 +609,8 @@ _base_fault_reset_work(struct work_struct *work)if ((doorbell &MPI2_IOC_STATE_MASK ) !=MPI2_IOC_STATE_OPERATIONAL ) { rc =mpt3sas_base_hard_reset_handler (ioc,FORCE_BIG_HAMMER ); -pr_warn (MPT3SAS_FMT "%s: hard reset: %s\n" , ioc->name, - __func__, (rc ==0 ) ?"success" :"failed" ); +ioc_warn (ioc,"%s: hard reset: %s\n" , + __func__, rc ==0 ?"success" :"failed" ); doorbell =mpt3sas_base_get_iocstate (ioc,0 );if ((doorbell &MPI2_IOC_STATE_MASK ) ==MPI2_IOC_STATE_FAULT ) mpt3sas_base_fault_info(ioc, doorbell &
@@ -657,8 +652,7 @@ mpt3sas_base_start_watchdog(struct MPT3SAS_ADAPTER *ioc) ioc->fault_reset_work_q =create_singlethread_workqueue (ioc->fault_reset_work_q_name);if (!ioc->fault_reset_work_q) { -pr_err (MPT3SAS_FMT "%s: failed (line=%d)\n" , - ioc->name, __func__, __LINE__); +ioc_err (ioc,"%s: failed (line=%d)\n" , __func__, __LINE__);return ; }spin_lock_irqsave (&ioc->ioc_reset_in_progress_lock, flags);
@@ -700,8 +694,7 @@ mpt3sas_base_stop_watchdog(struct MPT3SAS_ADAPTER *ioc)void mpt3sas_base_fault_info (struct MPT3SAS_ADAPTER *ioc ,u16 fault_code) { -pr_err (MPT3SAS_FMT "fault_state(0x%04x)!\n" , - ioc->name, fault_code); +ioc_err (ioc,"fault_state(0x%04x)!\n" , fault_code); }/**
@@ -728,8 +721,7 @@ mpt3sas_halt_firmware(struct MPT3SAS_ADAPTER *ioc)mpt3sas_base_fault_info (ioc , doorbell); else {writel (0xC0FFEE00 , &ioc->chip->Doorbell); -pr_err (MPT3SAS_FMT "Firmware is halted due to command timeout\n" , - ioc->name); +ioc_err (ioc,"Firmware is halted due to command timeout\n" ); }if (ioc->fwfault_debug ==2 )
@@ -956,8 +948,8 @@ _base_sas_ioc_info(struct MPT3SAS_ADAPTER *ioc, MPI2DefaultReply_t *mpi_reply,break ; } -pr_warn (MPT3SAS_FMT "ioc_status: %s(0x%04x), request(0x%p),(%s)\n" , - ioc->name, desc, ioc_status, request_hdr, func_str); +ioc_warn (ioc,"ioc_status: %s(0x%04x), request(0x%p),(%s)\n" , + desc, ioc_status, request_hdr, func_str);_debug_dump_mf (request_hdr, frame_sz/4 ); }
@@ -1003,9 +995,9 @@ _base_display_event_data(struct MPT3SAS_ADAPTER *ioc, {Mpi2EventDataSasDiscovery_t *event_data = (Mpi2EventDataSasDiscovery_t *)mpi_reply->EventData; -pr_info (MPT3SAS_FMT "Discovery: (%s)" , ioc->name, - (event_data->ReasonCode ==MPI2_EVENT_SAS_DISC_RC_STARTED ) ? -"start" :"stop" ); +ioc_info (ioc,"Discovery: (%s)" , + event_data->ReasonCode ==MPI2_EVENT_SAS_DISC_RC_STARTED ? +"start" :"stop" );if (event_data->DiscoveryStatus)pr_cont (" discovery_status(0x%08x)" ,le32_to_cpu (event_data->DiscoveryStatus));
@@ -1059,14 +1051,13 @@ _base_display_event_data(struct MPT3SAS_ADAPTER *ioc, {Mpi26EventDataPCIeEnumeration_t *event_data = (Mpi26EventDataPCIeEnumeration_t *)mpi_reply->EventData; -pr_info (MPT3SAS_FMT "PCIE Enumeration: (%s)" , ioc->name, - (event_data->ReasonCode == -MPI26_EVENT_PCIE_ENUM_RC_STARTED ) ? -"start" :"stop" ); +ioc_info (ioc,"PCIE Enumeration: (%s)" , + event_data->ReasonCode ==MPI26_EVENT_PCIE_ENUM_RC_STARTED ? +"start" :"stop" );if (event_data->EnumerationStatus) -pr_info ("enumeration_status(0x%08x)" , -le32_to_cpu (event_data->EnumerationStatus)); -pr_info ("\n" ); +pr_cont ("enumeration_status(0x%08x)" , +le32_to_cpu (event_data->EnumerationStatus)); +pr_cont ("\n" );return ; }case MPI2_EVENT_PCIE_TOPOLOGY_CHANGE_LIST :
@@ -1077,7 +1068,7 @@ _base_display_event_data(struct MPT3SAS_ADAPTER *ioc,if (!desc)return ; -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, desc); +ioc_info (ioc,"%s\n" , desc); }/**
@@ -1128,11 +1119,9 @@ _base_sas_log_info(struct MPT3SAS_ADAPTER *ioc , u32 log_info)break ; } -pr_warn (MPT3SAS_FMT -"log_info(0x%08x): originator(%s), code(0x%02x), sub_code(0x%04x)\n" , - ioc->name, log_info, - originator_str, sas_loginfo.dw.code, - sas_loginfo.dw.subcode); +ioc_warn (ioc,"log_info(0x%08x): originator(%s), code(0x%02x), sub_code(0x%04x)\n" , + log_info, + originator_str, sas_loginfo.dw.code, sas_loginfo.dw.subcode); }/**
@@ -1152,8 +1141,8 @@ _base_display_reply_info(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, mpi_reply =mpt3sas_base_get_reply_virt_addr (ioc, reply);if (unlikely (!mpi_reply)) { -pr_err (MPT3SAS_FMT "mpi_reply not valid at %s:%d/%s()!\n" , - ioc->name, __FILE__, __LINE__, __func__); +ioc_err (ioc,"mpi_reply not valid at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__);return ; } ioc_status =le16_to_cpu (mpi_reply->IOCStatus);
@@ -1249,9 +1238,9 @@ _base_async_event(struct MPT3SAS_ADAPTER *ioc, u8 msix_index, u32 reply) delayed_event_ack->EventContext = mpi_reply->EventContext;list_add_tail (&delayed_event_ack->list, &ioc->delayed_event_ack_list); -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"DELAYED: EVENT ACK: event (0x%04x)\n" , - ioc->name,le16_to_cpu (mpi_reply->Event))); +dewtprintk (ioc, +ioc_info (ioc,"DELAYED: EVENT ACK: event (0x%04x)\n" , +le16_to_cpu (mpi_reply->Event))); goto out; }
@@ -2598,9 +2587,8 @@ _base_config_dma_addressing(struct MPT3SAS_ADAPTER *ioc, struct pci_dev *pdev) out:si_meminfo (&s); -pr_info (MPT3SAS_FMT -"%d BIT PCI BUS DMA ADDRESSING SUPPORTED, total mem (%ld kB)\n" , - ioc->name, ioc->dma_mask,convert_to_kb (s.totalram)); +ioc_info (ioc,"%d BIT PCI BUS DMA ADDRESSING SUPPORTED, total mem (%ld kB)\n" , + ioc->dma_mask,convert_to_kb (s.totalram));return 0 ; }
@@ -2639,8 +2627,7 @@ _base_check_enable_msix(struct MPT3SAS_ADAPTER *ioc) base =pci_find_capability (ioc->pdev,PCI_CAP_ID_MSIX );if (!base) { -dfailprintk (ioc,pr_info (MPT3SAS_FMT "msix not supported\n" , - ioc->name)); +dfailprintk (ioc,ioc_info (ioc,"msix not supported\n" ));return -EINVAL ; }
@@ -2658,9 +2645,8 @@ _base_check_enable_msix(struct MPT3SAS_ADAPTER *ioc)pci_read_config_word (ioc->pdev, base +2 , &message_control); ioc->msix_vector_count = (message_control &0x3FF ) +1 ; } -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"msix is supported, vector_count(%d)\n" , - ioc->name, ioc->msix_vector_count)); +dinitprintk (ioc,ioc_info (ioc,"msix is supported, vector_count(%d)\n" , + ioc->msix_vector_count));return 0 ; }
@@ -2702,8 +2688,8 @@ _base_request_irq(struct MPT3SAS_ADAPTER *ioc, u8 index) reply_q =kzalloc (sizeof (struct adapter_reply_queue ),GFP_KERNEL );if (!reply_q) { -pr_err (MPT3SAS_FMT "unable to allocate memory %d!\n" , - ioc->name, (int )sizeof (struct adapter_reply_queue )); +ioc_err (ioc,"unable to allocate memory %zu!\n" , +sizeof (struct adapter_reply_queue ));return -ENOMEM ; } reply_q->ioc = ioc;
@@ -2761,8 +2747,8 @@ _base_assign_reply_queues(struct MPT3SAS_ADAPTER *ioc)const cpumask_t *mask =pci_irq_get_affinity (ioc->pdev, reply_q->msix_index);if (!mask) { -pr_warn (MPT3SAS_FMT "no affinity for msi %x\n" , - ioc->name, reply_q->msix_index); +ioc_warn (ioc,"no affinity for msi %x\n" , + reply_q->msix_index);continue ; }
@@ -2857,9 +2843,9 @@ _base_enable_msix(struct MPT3SAS_ADAPTER *ioc) r =pci_alloc_irq_vectors (ioc->pdev,1 , ioc->reply_queue_count, irq_flags);if (r <0 ) { -dfailprintk (ioc,pr_info (MPT3SAS_FMT -"pci_alloc_irq_vectors failed (r=%d) !!!\n" , - ioc->name, r)); +dfailprintk (ioc, +ioc_info (ioc,"pci_alloc_irq_vectors failed (r=%d) !!!\n" , + r)); goto try_ioapic; }
@@ -2882,9 +2868,9 @@ _base_enable_msix(struct MPT3SAS_ADAPTER *ioc) ioc->reply_queue_count =1 ; r =pci_alloc_irq_vectors (ioc->pdev,1 ,1 ,PCI_IRQ_LEGACY );if (r <0 ) { -dfailprintk (ioc,pr_info (MPT3SAS_FMT -"pci_alloc_irq_vector(legacy) failed (r=%d) !!!\n" , - ioc->name, r)); +dfailprintk (ioc, +ioc_info (ioc,"pci_alloc_irq_vector(legacy) failed (r=%d) !!!\n" , + r)); }else r =_base_request_irq (ioc,0 );
@@ -2939,13 +2925,11 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc)phys_addr_t chip_phys =0 ;struct adapter_reply_queue *reply_q; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , - ioc->name, __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__)); ioc->bars =pci_select_bars (pdev,IORESOURCE_MEM );if (pci_enable_device_mem (pdev)) { -pr_warn (MPT3SAS_FMT "pci_enable_device_mem: failed\n" , - ioc->name); +ioc_warn (ioc,"pci_enable_device_mem: failed\n" ); ioc->bars =0 ;return -ENODEV ; }
@@ -2953,8 +2937,7 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc)if (pci_request_selected_regions (pdev, ioc->bars, ioc->driver_name)) { -pr_warn (MPT3SAS_FMT "pci_request_selected_regions: failed\n" , - ioc->name); +ioc_warn (ioc,"pci_request_selected_regions: failed\n" ); ioc->bars =0 ; r = -ENODEV ; goto out_fail;
@@ -2967,8 +2950,7 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc)if (_base_config_dma_addressing (ioc, pdev) !=0 ) { -pr_warn (MPT3SAS_FMT "no suitable DMA mask for %s\n" , - ioc->name,pci_name (pdev)); +ioc_warn (ioc,"no suitable DMA mask for %s\n" ,pci_name (pdev)); r = -ENODEV ; goto out_fail; }
@@ -2991,8 +2973,7 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc) }if (ioc->chip ==NULL ) { -pr_err (MPT3SAS_FMT "unable to map adapter memory! " -" or resource not found\n" , ioc->name); +ioc_err (ioc,"unable to map adapter memory! or resource not found\n" ); r = -EINVAL ; goto out_fail; }
@@ -3058,10 +3039,10 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc) "IO-APIC enabled"), pci_irq_vector(ioc->pdev, reply_q->msix_index)); -pr_info (MPT3SAS_FMT "iomem(%pap), mapped(0x%p), size(%d)\n" , - ioc->name, &chip_phys, ioc->chip, memap_sz); -pr_info (MPT3SAS_FMT "ioport(0x%016llx), size(%d)\n" , - ioc->name, (unsigned long long )pio_chip, pio_sz); +ioc_info (ioc,"iomem(%pap), mapped(0x%p), size(%d)\n" , + &chip_phys, ioc->chip, memap_sz); +ioc_info (ioc,"ioport(0x%016llx), size(%d)\n" , + (unsigned long long )pio_chip, pio_sz);/* Save PCI configuration state for recovery from PCI AER/EEH errors */ pci_save_state (pdev);
@@ -3176,8 +3157,7 @@ mpt3sas_base_get_smid(struct MPT3SAS_ADAPTER *ioc, u8 cb_idx)spin_lock_irqsave (&ioc->scsi_lookup_lock, flags);if (list_empty (&ioc->internal_free_list)) {spin_unlock_irqrestore (&ioc->scsi_lookup_lock, flags); -pr_err (MPT3SAS_FMT "%s: smid not available\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: smid not available\n" , __func__);return 0 ; }
@@ -3545,89 +3525,85 @@ _base_display_OEMs_branding(struct MPT3SAS_ADAPTER *ioc)case MPI2_MFGPAGE_DEVID_SAS2008 :switch (ioc->pdev->subsystem_device) {case MPT2SAS_INTEL_RMS2LL080_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS2LL080_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS2LL080_BRANDING );break ;case MPT2SAS_INTEL_RMS2LL040_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS2LL040_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS2LL040_BRANDING );break ;case MPT2SAS_INTEL_SSD910_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_SSD910_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_SSD910_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Intel(R) Controller: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Intel(R) Controller: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }case MPI2_MFGPAGE_DEVID_SAS2308_2 :switch (ioc->pdev->subsystem_device) {case MPT2SAS_INTEL_RS25GB008_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RS25GB008_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RS25GB008_BRANDING );break ;case MPT2SAS_INTEL_RMS25JB080_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS25JB080_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS25JB080_BRANDING );break ;case MPT2SAS_INTEL_RMS25JB040_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS25JB040_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS25JB040_BRANDING );break ;case MPT2SAS_INTEL_RMS25KB080_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS25KB080_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS25KB080_BRANDING );break ;case MPT2SAS_INTEL_RMS25KB040_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS25KB040_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS25KB040_BRANDING );break ;case MPT2SAS_INTEL_RMS25LB040_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS25LB040_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS25LB040_BRANDING );break ;case MPT2SAS_INTEL_RMS25LB080_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS25LB080_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS25LB080_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Intel(R) Controller: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Intel(R) Controller: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }case MPI25_MFGPAGE_DEVID_SAS3008 :switch (ioc->pdev->subsystem_device) {case MPT3SAS_INTEL_RMS3JC080_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_INTEL_RMS3JC080_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_INTEL_RMS3JC080_BRANDING );break ;case MPT3SAS_INTEL_RS3GC008_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_INTEL_RS3GC008_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_INTEL_RS3GC008_BRANDING );break ;case MPT3SAS_INTEL_RS3FC044_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_INTEL_RS3FC044_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_INTEL_RS3FC044_BRANDING );break ;case MPT3SAS_INTEL_RS3UC080_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_INTEL_RS3UC080_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_INTEL_RS3UC080_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Intel(R) Controller: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Intel(R) Controller: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;default : -pr_info (MPT3SAS_FMT -"Intel(R) Controller: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Intel(R) Controller: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;
@@ -3636,57 +3612,54 @@ _base_display_OEMs_branding(struct MPT3SAS_ADAPTER *ioc)case MPI2_MFGPAGE_DEVID_SAS2008 :switch (ioc->pdev->subsystem_device) {case MPT2SAS_DELL_6GBPS_SAS_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING );break ;case MPT2SAS_DELL_PERC_H200_ADAPTER_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING );break ;case MPT2SAS_DELL_PERC_H200_INTEGRATED_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING );break ;case MPT2SAS_DELL_PERC_H200_MODULAR_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING );break ;case MPT2SAS_DELL_PERC_H200_EMBEDDED_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING );break ;case MPT2SAS_DELL_PERC_H200_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_PERC_H200_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_PERC_H200_BRANDING );break ;case MPT2SAS_DELL_6GBPS_SAS_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_6GBPS_SAS_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_6GBPS_SAS_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Dell 6Gbps HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Dell 6Gbps HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;case MPI25_MFGPAGE_DEVID_SAS3008 :switch (ioc->pdev->subsystem_device) {case MPT3SAS_DELL_12G_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_DELL_12G_HBA_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_DELL_12G_HBA_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Dell 12Gbps HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Dell 12Gbps HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;default : -pr_info (MPT3SAS_FMT -"Dell HBA: Subsystem ID: 0x%X\n" , ioc->name, - ioc->pdev->subsystem_device); +ioc_info (ioc,"Dell HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;
@@ -3695,46 +3668,42 @@ _base_display_OEMs_branding(struct MPT3SAS_ADAPTER *ioc)case MPI25_MFGPAGE_DEVID_SAS3008 :switch (ioc->pdev->subsystem_device) {case MPT3SAS_CISCO_12G_8E_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_CISCO_12G_8E_HBA_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_CISCO_12G_8E_HBA_BRANDING );break ;case MPT3SAS_CISCO_12G_8I_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_CISCO_12G_8I_HBA_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_CISCO_12G_8I_HBA_BRANDING );break ;case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;case MPI25_MFGPAGE_DEVID_SAS3108_1 :switch (ioc->pdev->subsystem_device) {case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING );break ;case MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_BRANDING - ); +ioc_info (ioc,"%s\n" , +MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;default : -pr_info (MPT3SAS_FMT -"Cisco SAS HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Cisco SAS HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;
@@ -3743,43 +3712,40 @@ _base_display_OEMs_branding(struct MPT3SAS_ADAPTER *ioc)case MPI2_MFGPAGE_DEVID_SAS2004 :switch (ioc->pdev->subsystem_device) {case MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }case MPI2_MFGPAGE_DEVID_SAS2308_2 :switch (ioc->pdev->subsystem_device) {case MPT2SAS_HP_2_4_INTERNAL_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_HP_2_4_INTERNAL_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_HP_2_4_INTERNAL_BRANDING );break ;case MPT2SAS_HP_2_4_EXTERNAL_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_HP_2_4_EXTERNAL_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_HP_2_4_EXTERNAL_BRANDING );break ;case MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_BRANDING );break ;case MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }default : -pr_info (MPT3SAS_FMT -"HP SAS HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"HP SAS HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }default :
@@ -3806,12 +3772,10 @@ _base_display_fwpkg_version(struct MPT3SAS_ADAPTER *ioc)u16 smid, ioc_status;size_t data_length; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));if (ioc->base_cmds.status &MPT3_CMD_PENDING ) { -pr_err (MPT3SAS_FMT "%s: internal command already in use\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: internal command already in use\n" , __func__);return -EAGAIN ; }
@@ -3819,15 +3783,14 @@ _base_display_fwpkg_version(struct MPT3SAS_ADAPTER *ioc) fwpkg_data =pci_alloc_consistent (ioc->pdev, data_length, &fwpkg_data_dma);if (!fwpkg_data) { -pr_err (MPT3SAS_FMT "failure at %s:%d/%s()!\n" , - ioc->name, __FILE__, __LINE__, __func__); +ioc_err (ioc,"failure at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__);return -ENOMEM ; } smid =mpt3sas_base_get_smid (ioc, ioc->base_cb_idx);if (!smid) { -pr_err (MPT3SAS_FMT "%s: failed obtaining a smid\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: failed obtaining a smid\n" , __func__); r = -EAGAIN ; goto out; }
@@ -3846,11 +3809,9 @@ _base_display_fwpkg_version(struct MPT3SAS_ADAPTER *ioc)/* Wait for 15 seconds */ wait_for_completion_timeout (&ioc->base_cmds.done,FW_IMG_HDR_READ_TIMEOUT *HZ ); -pr_info (MPT3SAS_FMT "%s: complete\n" , - ioc->name, __func__); +ioc_info (ioc,"%s: complete\n" , __func__);if (!(ioc->base_cmds.status &MPT3_CMD_COMPLETE )) { -pr_err (MPT3SAS_FMT "%s: timeout\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: timeout\n" , __func__);_debug_dump_mf (mpi_request,sizeof (Mpi25FWUploadRequest_t)/4 ); r = -ETIME ;
@@ -3864,13 +3825,11 @@ _base_display_fwpkg_version(struct MPT3SAS_ADAPTER *ioc)if (ioc_status ==MPI2_IOCSTATUS_SUCCESS ) { FWImgHdr = (Mpi2FWImageHeader_t *)fwpkg_data;if (FWImgHdr->PackageVersion.Word) { -pr_info (MPT3SAS_FMT "FW Package Version" -"(%02d.%02d.%02d.%02d)\n" , - ioc->name, - FWImgHdr->PackageVersion.Struct.Major, - FWImgHdr->PackageVersion.Struct.Minor, - FWImgHdr->PackageVersion.Struct.Unit, - FWImgHdr->PackageVersion.Struct.Dev); +ioc_info (ioc,"FW Package Version (%02d.%02d.%02d.%02d)\n" , + FWImgHdr->PackageVersion.Struct.Major, + FWImgHdr->PackageVersion.Struct.Minor, + FWImgHdr->PackageVersion.Struct.Unit, + FWImgHdr->PackageVersion.Struct.Dev); } }else { _debug_dump_mf(&mpi_reply,
@@ -3900,18 +3859,17 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc) bios_version =le32_to_cpu (ioc->bios_pg3.BiosVersion);strncpy (desc, ioc->manu_pg0.ChipName,16 ); -pr_info (MPT3SAS_FMT "%s: FWVersion(%02d.%02d.%02d.%02d), " \ -"ChipRevision(0x%02x), BiosVersion(%02d.%02d.%02d.%02d)\n" , - ioc->name, desc, - (ioc->facts.FWVersion.Word &0xFF000000 ) >>24 , - (ioc->facts.FWVersion.Word &0x00FF0000 ) >>16 , - (ioc->facts.FWVersion.Word &0x0000FF00 ) >>8 , - ioc->facts.FWVersion.Word &0x000000FF , - ioc->pdev->revision, - (bios_version &0xFF000000 ) >>24 , - (bios_version &0x00FF0000 ) >>16 , - (bios_version &0x0000FF00 ) >>8 , - bios_version &0x000000FF ); +ioc_info (ioc,"%s: FWVersion(%02d.%02d.%02d.%02d), ChipRevision(0x%02x), BiosVersion(%02d.%02d.%02d.%02d)\n" , + desc, + (ioc->facts.FWVersion.Word &0xFF000000 ) >>24 , + (ioc->facts.FWVersion.Word &0x00FF0000 ) >>16 , + (ioc->facts.FWVersion.Word &0x0000FF00 ) >>8 , + ioc->facts.FWVersion.Word &0x000000FF , + ioc->pdev->revision, + (bios_version &0xFF000000 ) >>24 , + (bios_version &0x00FF0000 ) >>16 , + (bios_version &0x0000FF00 ) >>8 , + bios_version &0x000000FF );_base_display_OEMs_branding (ioc);
@@ -3920,82 +3878,81 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc) i++; } -pr_info (MPT3SAS_FMT "Protocol=(" , ioc->name); +ioc_info (ioc,"Protocol=(" );if (ioc->facts.ProtocolFlags &MPI2_IOCFACTS_PROTOCOL_SCSI_INITIATOR ) { -pr_info ("Initiator" ); +pr_cont ("Initiator" ); i++; }if (ioc->facts.ProtocolFlags &MPI2_IOCFACTS_PROTOCOL_SCSI_TARGET ) { -pr_info ("%sTarget" , i ?"," :"" ); +pr_cont ("%sTarget" , i ?"," :"" ); i++; } i =0 ; -pr_info ("), " ); -pr_info ("Capabilities=(" ); +pr_cont ("), Capabilities=(" );if (!ioc->hide_ir_msg) {if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_INTEGRATED_RAID ) { -pr_info ("Raid" ); +pr_cont ("Raid" ); i++; } }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_TLR ) { -pr_info ("%sTLR" , i ?"," :"" ); +pr_cont ("%sTLR" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_MULTICAST ) { -pr_info ("%sMulticast" , i ?"," :"" ); +pr_cont ("%sMulticast" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_BIDIRECTIONAL_TARGET ) { -pr_info ("%sBIDI Target" , i ?"," :"" ); +pr_cont ("%sBIDI Target" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_EEDP ) { -pr_info ("%sEEDP" , i ?"," :"" ); +pr_cont ("%sEEDP" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_SNAPSHOT_BUFFER ) { -pr_info ("%sSnapshot Buffer" , i ?"," :"" ); +pr_cont ("%sSnapshot Buffer" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_DIAG_TRACE_BUFFER ) { -pr_info ("%sDiag Trace Buffer" , i ?"," :"" ); +pr_cont ("%sDiag Trace Buffer" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_EXTENDED_BUFFER ) { -pr_info ("%sDiag Extended Buffer" , i ?"," :"" ); +pr_cont ("%sDiag Extended Buffer" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_TASK_SET_FULL_HANDLING ) { -pr_info ("%sTask Set Full" , i ?"," :"" ); +pr_cont ("%sTask Set Full" , i ?"," :"" ); i++; } iounit_pg1_flags =le32_to_cpu (ioc->iounit_pg1.Flags);if (!(iounit_pg1_flags &MPI2_IOUNITPAGE1_NATIVE_COMMAND_Q_DISABLE )) { -pr_info ("%sNCQ" , i ?"," :"" ); +pr_cont ("%sNCQ" , i ?"," :"" ); i++; } -pr_info (")\n" ); +pr_cont (")\n" ); }/**
@@ -4028,21 +3985,21 @@ mpt3sas_base_update_missing_delay(struct MPT3SAS_ADAPTER *ioc, sizeof(Mpi2SasIOUnit1PhyData_t)); sas_iounit_pg1 =kzalloc (sz,GFP_KERNEL );if (!sas_iounit_pg1) { -pr_err (MPT3SAS_FMT "failure at %s:%d/%s()!\n" , - ioc->name, __FILE__, __LINE__, __func__); +ioc_err (ioc,"failure at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__); goto out; }if ((mpt3sas_config_get_sas_iounit_pg1 (ioc, &mpi_reply, sas_iounit_pg1, sz))) { -pr_err (MPT3SAS_FMT "failure at %s:%d/%s()!\n" , - ioc->name, __FILE__, __LINE__, __func__); +ioc_err (ioc,"failure at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__); goto out; } ioc_status =le16_to_cpu (mpi_reply.IOCStatus) &MPI2_IOCSTATUS_MASK ;if (ioc_status !=MPI2_IOCSTATUS_SUCCESS ) { -pr_err (MPT3SAS_FMT "failure at %s:%d/%s()!\n" , - ioc->name, __FILE__, __LINE__, __func__); +ioc_err (ioc,"failure at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__); goto out; }
@@ -4074,11 +4031,11 @@ mpt3sas_base_update_missing_delay(struct MPT3SAS_ADAPTER *ioc,else dmd_new = dmd &MPI2_SASIOUNIT1_REPORT_MISSING_TIMEOUT_MASK ; -pr_info (MPT3SAS_FMT "device_missing_delay: old(%d), new(%d)\n" , - ioc->name, dmd_orignal, dmd_new); -pr_info (MPT3SAS_FMT "ioc_missing_delay: old(%d), new(%d)\n" , - ioc->name, io_missing_delay_original, - io_missing_delay); +ioc_info (ioc,"device_missing_delay: old(%d), new(%d)\n" , + dmd_orignal, dmd_new); +ioc_info (ioc,"ioc_missing_delay: old(%d), new(%d)\n" , + io_missing_delay_original, + io_missing_delay); ioc->device_missing_delay = dmd_new; ioc->io_missing_delay = io_missing_delay; }
@@ -4189,33 +4146,32 @@ _base_release_memory_pools(struct MPT3SAS_ADAPTER *ioc)struct chain_tracker *ct;struct reply_post_struct *rps; -dexitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dexitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));if (ioc->request) {pci_free_consistent (ioc->pdev, ioc->request_dma_sz, ioc->request, ioc->request_dma); -dexitprintk (ioc,pr_info (MPT3SAS_FMT -"request_pool(0x%p): free\n" , - ioc->name, ioc->request)); +dexitprintk (ioc, +ioc_info (ioc,"request_pool(0x%p): free\n" , + ioc->request)); ioc->request =NULL ; }if (ioc->sense) {dma_pool_free (ioc->sense_dma_pool, ioc->sense, ioc->sense_dma);dma_pool_destroy (ioc->sense_dma_pool); -dexitprintk (ioc,pr_info (MPT3SAS_FMT -"sense_pool(0x%p): free\n" , - ioc->name, ioc->sense)); +dexitprintk (ioc, +ioc_info (ioc,"sense_pool(0x%p): free\n" , + ioc->sense)); ioc->sense =NULL ; }if (ioc->reply) {dma_pool_free (ioc->reply_dma_pool, ioc->reply, ioc->reply_dma);dma_pool_destroy (ioc->reply_dma_pool); -dexitprintk (ioc,pr_info (MPT3SAS_FMT -"reply_pool(0x%p): free\n" , - ioc->name, ioc->reply)); +dexitprintk (ioc, +ioc_info (ioc,"reply_pool(0x%p): free\n" , + ioc->reply)); ioc->reply =NULL ; }
@@ -4223,9 +4179,9 @@ _base_release_memory_pools(struct MPT3SAS_ADAPTER *ioc)dma_pool_free (ioc->reply_free_dma_pool, ioc->reply_free, ioc->reply_free_dma);dma_pool_destroy (ioc->reply_free_dma_pool); -dexitprintk (ioc,pr_info (MPT3SAS_FMT -"reply_free_pool(0x%p): free\n" , - ioc->name, ioc->reply_free)); +dexitprintk (ioc, +ioc_info (ioc,"reply_free_pool(0x%p): free\n" , + ioc->reply_free)); ioc->reply_free =NULL ; }
@@ -4237,9 +4193,9 @@ _base_release_memory_pools(struct MPT3SAS_ADAPTER *ioc) ioc->reply_post_free_dma_pool, rps->reply_post_free, rps->reply_post_free_dma); -dexitprintk (ioc,pr_info (MPT3SAS_FMT -"reply_post_free_pool(0x%p): free\n" , - ioc->name, rps->reply_post_free)); +dexitprintk (ioc, +ioc_info (ioc,"reply_post_free_pool(0x%p): free\n" , + rps->reply_post_free)); rps->reply_post_free =NULL ; } } while (ioc->rdpq_array_enable &&
@@ -4267,9 +4223,9 @@ _base_release_memory_pools(struct MPT3SAS_ADAPTER *ioc) }if (ioc->config_page) { -dexitprintk (ioc,pr_info (MPT3SAS_FMT -"config_page(0x%p): free\n" , ioc->name, - ioc->config_page)); +dexitprintk (ioc, +ioc_info (ioc,"config_page(0x%p): free\n" , + ioc->config_page));pci_free_consistent (ioc->pdev, ioc->config_page_sz, ioc->config_page, ioc->config_page_dma); }
@@ -4338,8 +4294,7 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)int i, j;struct chain_tracker *ct; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__)); retry_sz =0 ;
@@ -4368,10 +4323,8 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)else if (sg_tablesize >MPT_MAX_PHYS_SEGMENTS ) { sg_tablesize = min_t(unsigned short, sg_tablesize,SG_MAX_SEGMENTS ); -pr_warn (MPT3SAS_FMT -"sg_tablesize(%u) is bigger than kernel " -"defined SG_CHUNK_SIZE(%u)\n" , ioc->name, - sg_tablesize,MPT_MAX_PHYS_SEGMENTS ); +ioc_warn (ioc,"sg_tablesize(%u) is bigger than kernel defined SG_CHUNK_SIZE(%u)\n" , + sg_tablesize,MPT_MAX_PHYS_SEGMENTS ); } ioc->shost->sg_tablesize = sg_tablesize; }
@@ -4381,9 +4334,8 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)if (ioc->internal_depth <INTERNAL_CMDS_COUNT ) {if (facts->RequestCredit <= (INTERNAL_CMDS_COUNT +INTERNAL_SCSIIO_CMDS_COUNT )) { -pr_err (MPT3SAS_FMT "IOC doesn't have enough Request \ -Credits, it has just %d number of credits\n" , - ioc->name, facts->RequestCredit); +ioc_err (ioc,"IOC doesn't have enough Request Credits, it has just %d number of credits\n" , + facts->RequestCredit);return -ENOMEM ; } ioc->internal_depth =10 ;
@@ -4482,11 +4434,12 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) ioc->reply_free_queue_depth = ioc->hba_queue_depth +64 ; } -dinitprintk (ioc,pr_info (MPT3SAS_FMT "scatter gather: " \ -"sge_in_main_msg(%d), sge_per_chain(%d), sge_per_io(%d), " -"chains_per_io(%d)\n" , ioc->name, ioc->max_sges_in_main_message, - ioc->max_sges_in_chain_message, ioc->shost->sg_tablesize, - ioc->chains_needed_per_io)); +dinitprintk (ioc, +ioc_info (ioc,"scatter gather: sge_in_main_msg(%d), sge_per_chain(%d), sge_per_io(%d), chains_per_io(%d)\n" , + ioc->max_sges_in_main_message, + ioc->max_sges_in_chain_message, + ioc->shost->sg_tablesize, + ioc->chains_needed_per_io));/* reply post queue, 16 byte align */ reply_post_free_sz = ioc->reply_post_queue_depth *
@@ -4501,16 +4454,13 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) sizeof(struct reply_post_struct), GFP_KERNEL);if (!ioc->reply_post) { -pr_err (MPT3SAS_FMT "reply_post_free pool: kcalloc failed\n" , - ioc->name); +ioc_err (ioc,"reply_post_free pool: kcalloc failed\n" ); goto out; } ioc->reply_post_free_dma_pool =dma_pool_create ("reply_post_free pool" , &ioc->pdev->dev, sz,16 ,0 );if (!ioc->reply_post_free_dma_pool) { -pr_err (MPT3SAS_FMT -"reply_post_free pool: dma_pool_create failed\n" , - ioc->name); +ioc_err (ioc,"reply_post_free pool: dma_pool_create failed\n" ); goto out; } i =0 ;
@@ -4520,29 +4470,25 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)GFP_KERNEL , &ioc->reply_post[i].reply_post_free_dma);if (!ioc->reply_post[i].reply_post_free) { -pr_err (MPT3SAS_FMT -"reply_post_free pool: dma_pool_alloc failed\n" , - ioc->name); +ioc_err (ioc,"reply_post_free pool: dma_pool_alloc failed\n" ); goto out; }memset (ioc->reply_post[i].reply_post_free,0 , sz); -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"reply post free pool (0x%p): depth(%d)," -"element_size(%d), pool_size(%d kB)\n" , ioc->name, - ioc->reply_post[i].reply_post_free, - ioc->reply_post_queue_depth,8 , sz/1024 )); -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"reply_post_free_dma = (0x%llx)\n" , ioc->name, - (unsigned long long ) - ioc->reply_post[i].reply_post_free_dma)); +dinitprintk (ioc, +ioc_info (ioc,"reply post free pool (0x%p): depth(%d), element_size(%d), pool_size(%d kB)\n" , + ioc->reply_post[i].reply_post_free, + ioc->reply_post_queue_depth, +8 , sz /1024 )); +dinitprintk (ioc, +ioc_info (ioc,"reply_post_free_dma = (0x%llx)\n" , + (u64 )ioc->reply_post[i].reply_post_free_dma)); total_sz += sz; }while (ioc->rdpq_array_enable && (++i < ioc->reply_queue_count));if (ioc->dma_mask ==64 ) {if (_base_change_consistent_dma_mask (ioc, ioc->pdev) !=0 ) { -pr_warn (MPT3SAS_FMT -"no suitable consistent DMA mask for %s\n" , - ioc->name,pci_name (ioc->pdev)); +ioc_warn (ioc,"no suitable consistent DMA mask for %s\n" , +pci_name (ioc->pdev)); goto out; } }
@@ -4554,9 +4500,9 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)* with some internal commands that could be outstanding */ ioc->shost->can_queue = ioc->scsiio_depth -INTERNAL_SCSIIO_CMDS_COUNT ; -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"scsi host: can_queue depth (%d)\n" , - ioc->name, ioc->shost->can_queue)); +dinitprintk (ioc, +ioc_info (ioc,"scsi host: can_queue depth (%d)\n" , + ioc->shost->can_queue));/* contiguous pool for request and chains, 16 byte align, one extra "
@@ -4574,10 +4520,9 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) ioc->request_dma_sz = sz; ioc->request =pci_alloc_consistent (ioc->pdev, sz, &ioc->request_dma);if (!ioc->request) { -pr_err (MPT3SAS_FMT "request pool: pci_alloc_consistent " \ -"failed: hba_depth(%d), chains_per_io(%d), frame_sz(%d), " -"total(%d kB)\n" , ioc->name, ioc->hba_queue_depth, - ioc->chains_needed_per_io, ioc->request_sz, sz/1024 ); +ioc_err (ioc,"request pool: pci_alloc_consistent failed: hba_depth(%d), chains_per_io(%d), frame_sz(%d), total(%d kB)\n" , + ioc->hba_queue_depth, ioc->chains_needed_per_io, + ioc->request_sz, sz /1024 );if (ioc->scsiio_depth <MPT3SAS_SAS_QUEUE_DEPTH ) goto out; retry_sz =64 ;
@@ -4587,10 +4532,9 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) }if (retry_sz) -pr_err (MPT3SAS_FMT "request pool: pci_alloc_consistent " \ -"succeed: hba_depth(%d), chains_per_io(%d), frame_sz(%d), " -"total(%d kb)\n" , ioc->name, ioc->hba_queue_depth, - ioc->chains_needed_per_io, ioc->request_sz, sz/1024 ); +ioc_err (ioc,"request pool: pci_alloc_consistent succeed: hba_depth(%d), chains_per_io(%d), frame_sz(%d), total(%d kb)\n" , + ioc->hba_queue_depth, ioc->chains_needed_per_io, + ioc->request_sz, sz /1024 );/* hi-priority queue */ ioc->hi_priority = ioc->request + ((ioc->scsiio_depth + 1) *
@@ -4604,24 +4548,26 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) ioc->internal_dma = ioc->hi_priority_dma + (ioc->hi_priority_depth * ioc->request_sz); -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"request pool(0x%p): depth(%d), frame_size(%d), pool_size(%d kB)\n" , - ioc->name, ioc->request, ioc->hba_queue_depth, ioc->request_sz, - (ioc->hba_queue_depth * ioc->request_sz)/1024 )); +dinitprintk (ioc, +ioc_info (ioc,"request pool(0x%p): depth(%d), frame_size(%d), pool_size(%d kB)\n" , + ioc->request, ioc->hba_queue_depth, + ioc->request_sz, + (ioc->hba_queue_depth * ioc->request_sz) /1024 )); -dinitprintk (ioc,pr_info (MPT3SAS_FMT "request pool: dma(0x%llx)\n" , - ioc->name, (unsigned long long ) ioc->request_dma)); +dinitprintk (ioc, +ioc_info (ioc,"request pool: dma(0x%llx)\n" , + (unsigned long long )ioc->request_dma)); total_sz += sz; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "scsiio(0x%p): depth(%d)\n" , - ioc->name, ioc->request, ioc->scsiio_depth)); +dinitprintk (ioc, +ioc_info (ioc,"scsiio(0x%p): depth(%d)\n" , + ioc->request, ioc->scsiio_depth)); ioc->chain_depth =min_t (u32, ioc->chain_depth,MAX_CHAIN_DEPTH ); sz = ioc->scsiio_depth *sizeof (struct chain_lookup ); ioc->chain_lookup =kzalloc (sz,GFP_KERNEL );if (!ioc->chain_lookup) { -pr_err (MPT3SAS_FMT "chain_lookup: __get_free_pages " -"failed\n" , ioc->name); +ioc_err (ioc,"chain_lookup: __get_free_pages failed\n" ); goto out; }
@@ -4629,8 +4575,7 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)for (i =0 ; i < ioc->scsiio_depth; i++) { ioc->chain_lookup[i].chains_per_smid =kzalloc (sz,GFP_KERNEL );if (!ioc->chain_lookup[i].chains_per_smid) { -pr_err (MPT3SAS_FMT "chain_lookup: " -" kzalloc failed\n" , ioc->name); +ioc_err (ioc,"chain_lookup: kzalloc failed\n" ); goto out; } }
@@ -4639,29 +4584,27 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) ioc->hpr_lookup =kcalloc (ioc->hi_priority_depth,sizeof (struct request_tracker ),GFP_KERNEL );if (!ioc->hpr_lookup) { -pr_err (MPT3SAS_FMT "hpr_lookup: kcalloc failed\n" , - ioc->name); +ioc_err (ioc,"hpr_lookup: kcalloc failed\n" ); goto out; } ioc->hi_priority_smid = ioc->scsiio_depth +1 ; -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"hi_priority(0x%p): depth(%d), start smid(%d)\n" , - ioc->name, ioc->hi_priority, - ioc->hi_priority_depth, ioc->hi_priority_smid)); +dinitprintk (ioc, +ioc_info (ioc,"hi_priority(0x%p): depth(%d), start smid(%d)\n" , + ioc->hi_priority, + ioc->hi_priority_depth, ioc->hi_priority_smid));/* initialize internal queue smid's */ ioc->internal_lookup =kcalloc (ioc->internal_depth,sizeof (struct request_tracker ),GFP_KERNEL );if (!ioc->internal_lookup) { -pr_err (MPT3SAS_FMT "internal_lookup: kcalloc failed\n" , - ioc->name); +ioc_err (ioc,"internal_lookup: kcalloc failed\n" ); goto out; } ioc->internal_smid = ioc->hi_priority_smid + ioc->hi_priority_depth; -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"internal(0x%p): depth(%d), start smid(%d)\n" , - ioc->name, ioc->internal, - ioc->internal_depth, ioc->internal_smid)); +dinitprintk (ioc, +ioc_info (ioc,"internal(0x%p): depth(%d), start smid(%d)\n" , + ioc->internal, + ioc->internal_depth, ioc->internal_smid));/* * The number of NVMe page sized blocks needed is: * (((sg_tablesize * 8) - 1) / (page_size - 8)) + 1
@@ -4685,17 +4628,14 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) sz =sizeof (struct pcie_sg_list ) * ioc->scsiio_depth; ioc->pcie_sg_lookup =kzalloc (sz,GFP_KERNEL );if (!ioc->pcie_sg_lookup) { -pr_info (MPT3SAS_FMT -"PCIe SGL lookup: kzalloc failed\n" , ioc->name); +ioc_info (ioc,"PCIe SGL lookup: kzalloc failed\n" ); goto out; } sz = nvme_blocks_needed * ioc->page_size; ioc->pcie_sgl_dma_pool =dma_pool_create ("PCIe SGL pool" , &ioc->pdev->dev, sz,16 ,0 );if (!ioc->pcie_sgl_dma_pool) { -pr_info (MPT3SAS_FMT -"PCIe SGL pool: dma_pool_create failed\n" , - ioc->name); +ioc_info (ioc,"PCIe SGL pool: dma_pool_create failed\n" ); goto out; }
@@ -4708,9 +4648,7 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) ioc->pcie_sgl_dma_pool,GFP_KERNEL , &ioc->pcie_sg_lookup[i].pcie_sgl_dma);if (!ioc->pcie_sg_lookup[i].pcie_sgl) { -pr_info (MPT3SAS_FMT -"PCIe SGL pool: dma_pool_alloc failed\n" , - ioc->name); +ioc_info (ioc,"PCIe SGL pool: dma_pool_alloc failed\n" ); goto out; }for (j =0 ; j < ioc->chains_per_prp_buffer; j++) {
@@ -4724,20 +4662,20 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) } } -dinitprintk (ioc,pr_info (MPT3SAS_FMT "PCIe sgl pool depth(%d), " -"element_size(%d), pool_size(%d kB)\n" , ioc->name, - ioc->scsiio_depth, sz, (sz * ioc->scsiio_depth)/1024 )); -dinitprintk (ioc,pr_info (MPT3SAS_FMT "Number of chains can " -"fit in a PRP page(%d)\n" , ioc->name, - ioc->chains_per_prp_buffer)); +dinitprintk (ioc, +ioc_info (ioc,"PCIe sgl pool depth(%d), element_size(%d), pool_size(%d kB)\n" , + ioc->scsiio_depth, sz, + (sz * ioc->scsiio_depth) /1024 )); +dinitprintk (ioc, +ioc_info (ioc,"Number of chains can fit in a PRP page(%d)\n" , + ioc->chains_per_prp_buffer)); total_sz += sz * ioc->scsiio_depth; } ioc->chain_dma_pool =dma_pool_create ("chain pool" , &ioc->pdev->dev, ioc->chain_segment_sz,16 ,0 );if (!ioc->chain_dma_pool) { -pr_err (MPT3SAS_FMT "chain_dma_pool: dma_pool_create failed\n" , - ioc->name); +ioc_err (ioc,"chain_dma_pool: dma_pool_create failed\n" ); goto out; }for (i =0 ; i < ioc->scsiio_depth; i++) {
@@ -4748,8 +4686,7 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) ioc->chain_dma_pool,GFP_KERNEL , &ct->chain_buffer_dma);if (!ct->chain_buffer) { -pr_err (MPT3SAS_FMT "chain_lookup: " -" pci_pool_alloc failed\n" , ioc->name); +ioc_err (ioc,"chain_lookup: pci_pool_alloc failed\n" );_base_release_memory_pools (ioc); goto out; }
@@ -4757,25 +4694,23 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) total_sz += ioc->chain_segment_sz; } -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"chain pool depth(%d), frame_size(%d), pool_size(%d kB)\n" , - ioc->name, ioc->chain_depth, ioc->chain_segment_sz, - ((ioc->chain_depth * ioc->chain_segment_sz))/1024 )); +dinitprintk (ioc, +ioc_info (ioc,"chain pool depth(%d), frame_size(%d), pool_size(%d kB)\n" , + ioc->chain_depth, ioc->chain_segment_sz, + (ioc->chain_depth * ioc->chain_segment_sz) /1024 ));/* sense buffers, 4 byte align */ sz = ioc->scsiio_depth *SCSI_SENSE_BUFFERSIZE ; ioc->sense_dma_pool =dma_pool_create ("sense pool" , &ioc->pdev->dev, sz,4 ,0 );if (!ioc->sense_dma_pool) { -pr_err (MPT3SAS_FMT "sense pool: dma_pool_create failed\n" , - ioc->name); +ioc_err (ioc,"sense pool: dma_pool_create failed\n" ); goto out; } ioc->sense =dma_pool_alloc (ioc->sense_dma_pool,GFP_KERNEL , &ioc->sense_dma);if (!ioc->sense) { -pr_err (MPT3SAS_FMT "sense pool: dma_pool_alloc failed\n" , - ioc->name); +ioc_err (ioc,"sense pool: dma_pool_alloc failed\n" ); goto out; }/* sense buffer requires to be in same 4 gb region.
@@ -4797,24 +4732,23 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)dma_pool_create ("sense pool" , &ioc->pdev->dev, sz,roundup_pow_of_two (sz),0 );if (!ioc->sense_dma_pool) { -pr_err (MPT3SAS_FMT "sense pool: pci_pool_create failed\n" , - ioc->name); +ioc_err (ioc,"sense pool: pci_pool_create failed\n" ); goto out; } ioc->sense =dma_pool_alloc (ioc->sense_dma_pool,GFP_KERNEL , &ioc->sense_dma);if (!ioc->sense) { -pr_err (MPT3SAS_FMT "sense pool: pci_pool_alloc failed\n" , - ioc->name); +ioc_err (ioc,"sense pool: pci_pool_alloc failed\n" ); goto out; } } -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"sense pool(0x%p): depth(%d), element_size(%d), pool_size" -"(%d kB)\n" , ioc->name, ioc->sense, ioc->scsiio_depth, -SCSI_SENSE_BUFFERSIZE , sz/1024 )); -dinitprintk (ioc,pr_info (MPT3SAS_FMT "sense_dma(0x%llx)\n" , - ioc->name, (unsigned long long )ioc->sense_dma)); +dinitprintk (ioc, +ioc_info (ioc,"sense pool(0x%p): depth(%d), element_size(%d), pool_size(%d kB)\n" , + ioc->sense, ioc->scsiio_depth, +SCSI_SENSE_BUFFERSIZE , sz /1024 )); +dinitprintk (ioc, +ioc_info (ioc,"sense_dma(0x%llx)\n" , + (unsigned long long )ioc->sense_dma)); total_sz += sz;/* reply pool, 4 byte align */
@@ -4822,25 +4756,24 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) ioc->reply_dma_pool =dma_pool_create ("reply pool" , &ioc->pdev->dev, sz,4 ,0 );if (!ioc->reply_dma_pool) { -pr_err (MPT3SAS_FMT "reply pool: dma_pool_create failed\n" , - ioc->name); +ioc_err (ioc,"reply pool: dma_pool_create failed\n" ); goto out; } ioc->reply =dma_pool_alloc (ioc->reply_dma_pool,GFP_KERNEL , &ioc->reply_dma);if (!ioc->reply) { -pr_err (MPT3SAS_FMT "reply pool: dma_pool_alloc failed\n" , - ioc->name); +ioc_err (ioc,"reply pool: dma_pool_alloc failed\n" ); goto out; } ioc->reply_dma_min_address = (u32)(ioc->reply_dma); ioc->reply_dma_max_address = (u32)(ioc->reply_dma) + sz; -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"reply pool(0x%p): depth(%d), frame_size(%d), pool_size(%d kB)\n" , - ioc->name, ioc->reply, - ioc->reply_free_queue_depth, ioc->reply_sz, sz/1024 )); -dinitprintk (ioc,pr_info (MPT3SAS_FMT "reply_dma(0x%llx)\n" , - ioc->name, (unsigned long long )ioc->reply_dma)); +dinitprintk (ioc, +ioc_info (ioc,"reply pool(0x%p): depth(%d), frame_size(%d), pool_size(%d kB)\n" , + ioc->reply, ioc->reply_free_queue_depth, + ioc->reply_sz, sz /1024 )); +dinitprintk (ioc, +ioc_info (ioc,"reply_dma(0x%llx)\n" , + (unsigned long long )ioc->reply_dma)); total_sz += sz;/* reply free queue, 16 byte align */
@@ -4848,24 +4781,23 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) ioc->reply_free_dma_pool =dma_pool_create ("reply_free pool" , &ioc->pdev->dev, sz,16 ,0 );if (!ioc->reply_free_dma_pool) { -pr_err (MPT3SAS_FMT "reply_free pool: dma_pool_create failed\n" , - ioc->name); +ioc_err (ioc,"reply_free pool: dma_pool_create failed\n" ); goto out; } ioc->reply_free =dma_pool_alloc (ioc->reply_free_dma_pool,GFP_KERNEL , &ioc->reply_free_dma);if (!ioc->reply_free) { -pr_err (MPT3SAS_FMT "reply_free pool: dma_pool_alloc failed\n" , - ioc->name); +ioc_err (ioc,"reply_free pool: dma_pool_alloc failed\n" ); goto out; }memset (ioc->reply_free,0 , sz); -dinitprintk (ioc,pr_info (MPT3SAS_FMT "reply_free pool(0x%p): " \ -"depth(%d), element_size(%d), pool_size(%d kB)\n" , ioc->name, - ioc->reply_free, ioc->reply_free_queue_depth,4 , sz/1024 )); -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"reply_free_dma (0x%llx)\n" , - ioc->name, (unsigned long long )ioc->reply_free_dma)); +dinitprintk (ioc, +ioc_info (ioc,"reply_free pool(0x%p): depth(%d), element_size(%d), pool_size(%d kB)\n" , + ioc->reply_free, ioc->reply_free_queue_depth, +4 , sz /1024 )); +dinitprintk (ioc, +ioc_info (ioc,"reply_free_dma (0x%llx)\n" , + (unsigned long long )ioc->reply_free_dma)); total_sz += sz;if (ioc->rdpq_array_enable) {
@@ -4876,8 +4808,7 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) &ioc->pdev->dev, reply_post_free_array_sz, 16, 0);if (!ioc->reply_post_free_array_dma_pool) {dinitprintk (ioc, -pr_info (MPT3SAS_FMT "reply_post_free_array pool: " -"dma_pool_create failed\n" , ioc->name)); +ioc_info (ioc,"reply_post_free_array pool: dma_pool_create failed\n" )); goto out; } ioc->reply_post_free_array =
@@ -4885,8 +4816,7 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) GFP_KERNEL, &ioc->reply_post_free_array_dma);if (!ioc->reply_post_free_array) {dinitprintk (ioc, -pr_info (MPT3SAS_FMT "reply_post_free_array pool: " -"dma_pool_alloc failed\n" , ioc->name)); +ioc_info (ioc,"reply_post_free_array pool: dma_pool_alloc failed\n" )); goto out; } }
@@ -4894,25 +4824,23 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) ioc->config_page =pci_alloc_consistent (ioc->pdev, ioc->config_page_sz, &ioc->config_page_dma);if (!ioc->config_page) { -pr_err (MPT3SAS_FMT -"config page: dma_pool_alloc failed\n" , - ioc->name); +ioc_err (ioc,"config page: dma_pool_alloc failed\n" ); goto out; } -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"config page(0x%p): size(%d)\n" , - ioc->name, ioc->config_page, ioc->config_page_sz)); -dinitprintk (ioc,pr_info (MPT3SAS_FMT "config_page_dma(0x%llx)\n" , - ioc->name, (unsigned long long )ioc->config_page_dma)); +dinitprintk (ioc, +ioc_info (ioc,"config page(0x%p): size(%d)\n" , + ioc->config_page, ioc->config_page_sz)); +dinitprintk (ioc, +ioc_info (ioc,"config_page_dma(0x%llx)\n" , + (unsigned long long )ioc->config_page_dma)); total_sz += ioc->config_page_sz; -pr_info (MPT3SAS_FMT "Allocated physical memory: size(%d kB)\n" , - ioc->name, total_sz/1024 ); -pr_info (MPT3SAS_FMT -"Current Controller Queue Depth(%d),Max Controller Queue Depth(%d)\n" , - ioc->name, ioc->shost->can_queue, facts->RequestCredit); -pr_info (MPT3SAS_FMT "Scatter Gather Elements per IO(%d)\n" , - ioc->name, ioc->shost->sg_tablesize); +ioc_info (ioc,"Allocated physical memory: size(%d kB)\n" , + total_sz /1024 ); +ioc_info (ioc,"Current Controller Queue Depth(%d),Max Controller Queue Depth(%d)\n" , + ioc->shost->can_queue, facts->RequestCredit); +ioc_info (ioc,"Scatter Gather Elements per IO(%d)\n" , + ioc->shost->sg_tablesize);return 0 ; out:
@@ -4990,9 +4918,9 @@ _base_wait_for_doorbell_int(struct MPT3SAS_ADAPTER *ioc, int timeout) do { int_status = readl(&ioc->chip->HostInterruptStatus); if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) { - dhsprintk(ioc, pr_info(MPT3SAS_FMT - "%s: successful count(%d), timeout(%d)\n", - ioc->name, __func__, count, timeout)); + dhsprintk(ioc, + ioc_info(ioc, "%s: successful count(%d), timeout(%d)\n", + __func__, count, timeout)); return 0; }
@@ -5000,9 +4928,8 @@ _base_wait_for_doorbell_int(struct MPT3SAS_ADAPTER *ioc, int timeout) count++; }while (--cntdn); -pr_err (MPT3SAS_FMT -"%s: failed due to timeout count(%d), int_status(%x)!\n" , - ioc->name, __func__, count, int_status); +ioc_err (ioc,"%s: failed due to timeout count(%d), int_status(%x)!\n" , + __func__, count, int_status);return -EFAULT ; }
@@ -5017,9 +4944,9 @@ _base_spin_on_doorbell_int(struct MPT3SAS_ADAPTER *ioc, int timeout) do { int_status = readl(&ioc->chip->HostInterruptStatus); if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) { - dhsprintk(ioc, pr_info(MPT3SAS_FMT - "%s: successful count(%d), timeout(%d)\n", - ioc->name, __func__, count, timeout)); + dhsprintk(ioc, + ioc_info(ioc, "%s: successful count(%d), timeout(%d)\n", + __func__, count, timeout)); return 0; }
@@ -5027,9 +4954,8 @@ _base_spin_on_doorbell_int(struct MPT3SAS_ADAPTER *ioc, int timeout) count++; }while (--cntdn); -pr_err (MPT3SAS_FMT -"%s: failed due to timeout count(%d), int_status(%x)!\n" , - ioc->name, __func__, count, int_status); +ioc_err (ioc,"%s: failed due to timeout count(%d), int_status(%x)!\n" , + __func__, count, int_status);return -EFAULT ; }
@@ -5056,9 +4982,9 @@ _base_wait_for_doorbell_ack(struct MPT3SAS_ADAPTER *ioc, int timeout) do { int_status = readl(&ioc->chip->HostInterruptStatus); if (!(int_status & MPI2_HIS_SYS2IOC_DB_STATUS)) { - dhsprintk(ioc, pr_info(MPT3SAS_FMT - "%s: successful count(%d), timeout(%d)\n", - ioc->name, __func__, count, timeout)); + dhsprintk(ioc, + ioc_info(ioc, "%s: successful count(%d), timeout(%d)\n", + __func__, count, timeout)); return 0; } else if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) { doorbell = readl(&ioc->chip->Doorbell);
@@ -5075,9 +5001,8 @@ _base_wait_for_doorbell_ack(struct MPT3SAS_ADAPTER *ioc, int timeout) }while (--cntdn); out: -pr_err (MPT3SAS_FMT -"%s: failed due to timeout count(%d), int_status(%x)!\n" , - ioc->name, __func__, count, int_status); +ioc_err (ioc,"%s: failed due to timeout count(%d), int_status(%x)!\n" , + __func__, count, int_status);return -EFAULT ; }
@@ -5099,9 +5024,9 @@ _base_wait_for_doorbell_not_used(struct MPT3SAS_ADAPTER *ioc, int timeout) do { doorbell_reg = readl(&ioc->chip->Doorbell); if (!(doorbell_reg & MPI2_DOORBELL_USED)) { - dhsprintk(ioc, pr_info(MPT3SAS_FMT - "%s: successful count(%d), timeout(%d)\n", - ioc->name, __func__, count, timeout)); + dhsprintk(ioc, + ioc_info(ioc, "%s: successful count(%d), timeout(%d)\n", + __func__, count, timeout)); return 0; }
@@ -5109,9 +5034,8 @@ _base_wait_for_doorbell_not_used(struct MPT3SAS_ADAPTER *ioc, int timeout) count++; }while (--cntdn); -pr_err (MPT3SAS_FMT -"%s: failed due to timeout count(%d), doorbell_reg(%x)!\n" , - ioc->name, __func__, count, doorbell_reg); +ioc_err (ioc,"%s: failed due to timeout count(%d), doorbell_reg(%x)!\n" , + __func__, count, doorbell_reg);return -EFAULT ; }
@@ -5130,8 +5054,7 @@ _base_send_ioc_reset(struct MPT3SAS_ADAPTER *ioc, u8 reset_type, int timeout)int r =0 ;if (reset_type !=MPI2_FUNCTION_IOC_MESSAGE_UNIT_RESET ) { -pr_err (MPT3SAS_FMT "%s: unknown reset_type\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: unknown reset_type\n" , __func__);return -EFAULT ; }
@@ -5139,7 +5062,7 @@ _base_send_ioc_reset(struct MPT3SAS_ADAPTER *ioc, u8 reset_type, int timeout) MPI2_IOCFACTS_CAPABILITY_EVENT_REPLAY))return -EFAULT ; -pr_info (MPT3SAS_FMT "sending message unit reset !!\n" , ioc->name); +ioc_info (ioc,"sending message unit reset !!\n" );writel (reset_type <<MPI2_DOORBELL_FUNCTION_SHIFT , &ioc->chip->Doorbell);
@@ -5149,15 +5072,14 @@ _base_send_ioc_reset(struct MPT3SAS_ADAPTER *ioc, u8 reset_type, int timeout) } ioc_state =_base_wait_on_iocstate (ioc,MPI2_IOC_STATE_READY , timeout);if (ioc_state) { -pr_err (MPT3SAS_FMT -"%s: failed going to ready state (ioc_state=0x%x)\n" , - ioc->name, __func__, ioc_state); +ioc_err (ioc,"%s: failed going to ready state (ioc_state=0x%x)\n" , + __func__, ioc_state); r = -EFAULT ; goto out; } out: -pr_info (MPT3SAS_FMT "message unit reset: %s\n" , - ioc->name, ((r ==0 ) ?"SUCCESS" :"FAILED" )); +ioc_info (ioc,"message unit reset: %s\n" , + r ==0 ?"SUCCESS" :"FAILED" );return r; }
@@ -5183,9 +5105,7 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes,/* make sure doorbell is not in use */ if ((readl (&ioc->chip->Doorbell) &MPI2_DOORBELL_USED )) { -pr_err (MPT3SAS_FMT -"doorbell is in use (line=%d)\n" , - ioc->name, __LINE__); +ioc_err (ioc,"doorbell is in use (line=%d)\n" , __LINE__);return -EFAULT ; }
@@ -5200,17 +5120,15 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, &ioc->chip->Doorbell);if ((_base_spin_on_doorbell_int (ioc,5 ))) { -pr_err (MPT3SAS_FMT -"doorbell handshake int failed (line=%d)\n" , - ioc->name, __LINE__); +ioc_err (ioc,"doorbell handshake int failed (line=%d)\n" , + __LINE__);return -EFAULT ; }writel (0 , &ioc->chip->HostInterruptStatus);if ((_base_wait_for_doorbell_ack (ioc,5 ))) { -pr_err (MPT3SAS_FMT -"doorbell handshake ack failed (line=%d)\n" , - ioc->name, __LINE__); +ioc_err (ioc,"doorbell handshake ack failed (line=%d)\n" , + __LINE__);return -EFAULT ; }
@@ -5222,17 +5140,15 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, }if (failed) { -pr_err (MPT3SAS_FMT -"doorbell handshake sending request failed (line=%d)\n" , - ioc->name, __LINE__); +ioc_err (ioc,"doorbell handshake sending request failed (line=%d)\n" , + __LINE__);return -EFAULT ; }/* now wait for the reply */ if ((_base_wait_for_doorbell_int (ioc, timeout))) { -pr_err (MPT3SAS_FMT -"doorbell handshake int failed (line=%d)\n" , - ioc->name, __LINE__); +ioc_err (ioc,"doorbell handshake int failed (line=%d)\n" , + __LINE__);return -EFAULT ; }
@@ -5241,9 +5157,8 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, & MPI2_DOORBELL_DATA_MASK);writel (0 , &ioc->chip->HostInterruptStatus);if ((_base_wait_for_doorbell_int (ioc,5 ))) { -pr_err (MPT3SAS_FMT -"doorbell handshake int failed (line=%d)\n" , - ioc->name, __LINE__); +ioc_err (ioc,"doorbell handshake int failed (line=%d)\n" , + __LINE__);return -EFAULT ; } reply[1] = le16_to_cpu(readl(&ioc->chip->Doorbell)
@@ -5252,9 +5167,8 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes,for (i =2 ; i < default_reply->MsgLength *2 ; i++) {if ((_base_wait_for_doorbell_int (ioc,5 ))) { -pr_err (MPT3SAS_FMT -"doorbell handshake int failed (line=%d)\n" , - ioc->name, __LINE__); +ioc_err (ioc,"doorbell handshake int failed (line=%d)\n" , + __LINE__);return -EFAULT ; }if (i >= reply_bytes/2 )/* overflow case */
@@ -5267,8 +5181,9 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes,_base_wait_for_doorbell_int (ioc,5 );if (_base_wait_for_doorbell_not_used (ioc,5 ) !=0 ) { -dhsprintk (ioc,pr_info (MPT3SAS_FMT -"doorbell is in use (line=%d)\n" , ioc->name, __LINE__)); +dhsprintk (ioc, +ioc_info (ioc,"doorbell is in use (line=%d)\n" , + __LINE__)); }writel (0 , &ioc->chip->HostInterruptStatus);
@@ -5308,14 +5223,12 @@ mpt3sas_base_sas_iounit_control(struct MPT3SAS_ADAPTER *ioc,void *request;u16 wait_state_count; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));mutex_lock (&ioc->base_cmds.mutex);if (ioc->base_cmds.status !=MPT3_CMD_NOT_USED ) { -pr_err (MPT3SAS_FMT "%s: base_cmd in use\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: base_cmd in use\n" , __func__); rc = -EAGAIN ; goto out; }
@@ -5324,23 +5237,20 @@ mpt3sas_base_sas_iounit_control(struct MPT3SAS_ADAPTER *ioc, ioc_state =mpt3sas_base_get_iocstate (ioc,1 );while (ioc_state !=MPI2_IOC_STATE_OPERATIONAL ) {if (wait_state_count++ ==10 ) { -pr_err (MPT3SAS_FMT -"%s: failed due to ioc not operational\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: failed due to ioc not operational\n" , + __func__); rc = -EFAULT ; goto out; }ssleep (1 ); ioc_state =mpt3sas_base_get_iocstate (ioc,1 ); -pr_info (MPT3SAS_FMT -"%s: waiting for operational state(count=%d)\n" , - ioc->name, __func__, wait_state_count); +ioc_info (ioc,"%s: waiting for operational state(count=%d)\n" , + __func__, wait_state_count); } smid =mpt3sas_base_get_smid (ioc, ioc->base_cb_idx);if (!smid) { -pr_err (MPT3SAS_FMT "%s: failed obtaining a smid\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: failed obtaining a smid\n" , __func__); rc = -EAGAIN ; goto out; }
@@ -5408,14 +5318,12 @@ mpt3sas_base_scsi_enclosure_processor(struct MPT3SAS_ADAPTER *ioc,void *request;u16 wait_state_count; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));mutex_lock (&ioc->base_cmds.mutex);if (ioc->base_cmds.status !=MPT3_CMD_NOT_USED ) { -pr_err (MPT3SAS_FMT "%s: base_cmd in use\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: base_cmd in use\n" , __func__); rc = -EAGAIN ; goto out; }
@@ -5424,24 +5332,20 @@ mpt3sas_base_scsi_enclosure_processor(struct MPT3SAS_ADAPTER *ioc, ioc_state =mpt3sas_base_get_iocstate (ioc,1 );while (ioc_state !=MPI2_IOC_STATE_OPERATIONAL ) {if (wait_state_count++ ==10 ) { -pr_err (MPT3SAS_FMT -"%s: failed due to ioc not operational\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: failed due to ioc not operational\n" , + __func__); rc = -EFAULT ; goto out; }ssleep (1 ); ioc_state =mpt3sas_base_get_iocstate (ioc,1 ); -pr_info (MPT3SAS_FMT -"%s: waiting for operational state(count=%d)\n" , - ioc->name, - __func__, wait_state_count); +ioc_info (ioc,"%s: waiting for operational state(count=%d)\n" , + __func__, wait_state_count); } smid =mpt3sas_base_get_smid (ioc, ioc->base_cb_idx);if (!smid) { -pr_err (MPT3SAS_FMT "%s: failed obtaining a smid\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: failed obtaining a smid\n" , __func__); rc = -EAGAIN ; goto out; }
@@ -5495,8 +5399,7 @@ _base_get_port_facts(struct MPT3SAS_ADAPTER *ioc, int port)struct mpt3sas_port_facts *pfacts;int mpi_reply_sz, mpi_request_sz, r; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__)); mpi_reply_sz =sizeof (Mpi2PortFactsReply_t); mpi_request_sz =sizeof (Mpi2PortFactsRequest_t);
@@ -5507,8 +5410,7 @@ _base_get_port_facts(struct MPT3SAS_ADAPTER *ioc, int port) (u32 *)&mpi_request, mpi_reply_sz, (u16 *)&mpi_reply, 5);if (r !=0 ) { -pr_err (MPT3SAS_FMT "%s: handshake failed (r=%d)\n" , - ioc->name, __func__, r); +ioc_err (ioc,"%s: handshake failed (r=%d)\n" , __func__, r);return r; }
@@ -5592,8 +5494,7 @@ _base_get_ioc_facts(struct MPT3SAS_ADAPTER *ioc)struct mpt3sas_facts *facts;int mpi_reply_sz, mpi_request_sz, r; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__)); r =_base_wait_for_iocstate (ioc,10 );if (r) {
@@ -5610,8 +5511,7 @@ _base_get_ioc_facts(struct MPT3SAS_ADAPTER *ioc) (u32 *)&mpi_request, mpi_reply_sz, (u16 *)&mpi_reply, 5);if (r !=0 ) { -pr_err (MPT3SAS_FMT "%s: handshake failed (r=%d)\n" , - ioc->name, __func__, r); +ioc_err (ioc,"%s: handshake failed (r=%d)\n" , __func__, r);return r; }
@@ -5663,20 +5563,20 @@ _base_get_ioc_facts(struct MPT3SAS_ADAPTER *ioc)*/ ioc->page_size =1 << facts->CurrentHostPageSize;if (ioc->page_size ==1 ) { -pr_info (MPT3SAS_FMT "CurrentHostPageSize is 0: Setting " -"default host page size to 4k\n" , ioc->name); +ioc_info (ioc,"CurrentHostPageSize is 0: Setting default host page size to 4k\n" ); ioc->page_size =1 <<MPT3SAS_HOST_PAGE_SIZE_4K ; } -dinitprintk (ioc,pr_info (MPT3SAS_FMT "CurrentHostPageSize(%d)\n" , - ioc->name, facts->CurrentHostPageSize)); - -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"hba queue depth(%d), max chains per io(%d)\n" , - ioc->name, facts->RequestCredit, - facts->MaxChainDepth)); -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"request frame size(%d), reply frame size(%d)\n" , ioc->name, - facts->IOCRequestFrameSize *4 , facts->ReplyFrameSize *4 )); +dinitprintk (ioc, +ioc_info (ioc,"CurrentHostPageSize(%d)\n" , + facts->CurrentHostPageSize)); + +dinitprintk (ioc, +ioc_info (ioc,"hba queue depth(%d), max chains per io(%d)\n" , + facts->RequestCredit, facts->MaxChainDepth)); +dinitprintk (ioc, +ioc_info (ioc,"request frame size(%d), reply frame size(%d)\n" , + facts->IOCRequestFrameSize *4 , + facts->ReplyFrameSize *4 ));return 0 ; }
@@ -5696,8 +5596,7 @@ _base_send_ioc_init(struct MPT3SAS_ADAPTER *ioc)u16 ioc_status;u32 reply_post_free_array_sz =0 ; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));memset (&mpi_request,0 ,sizeof (Mpi2IOCInitRequest_t)); mpi_request.Function =MPI2_FUNCTION_IOC_INIT ;
@@ -5763,15 +5662,14 @@ _base_send_ioc_init(struct MPT3SAS_ADAPTER *ioc) sizeof(Mpi2IOCInitReply_t), (u16 *)&mpi_reply, 10);if (r !=0 ) { -pr_err (MPT3SAS_FMT "%s: handshake failed (r=%d)\n" , - ioc->name, __func__, r); +ioc_err (ioc,"%s: handshake failed (r=%d)\n" , __func__, r);return r; } ioc_status =le16_to_cpu (mpi_reply.IOCStatus) &MPI2_IOCSTATUS_MASK ;if (ioc_status !=MPI2_IOCSTATUS_SUCCESS || mpi_reply.IOCLogInfo) { -pr_err (MPT3SAS_FMT "%s: failed\n" , ioc->name, __func__); +ioc_err (ioc,"%s: failed\n" , __func__); r = -EIO ; }
@@ -5842,18 +5740,16 @@ _base_send_port_enable(struct MPT3SAS_ADAPTER *ioc)u16 smid;u16 ioc_status; -pr_info (MPT3SAS_FMT "sending port enable !!\n" , ioc->name); +ioc_info (ioc,"sending port enable !!\n" );if (ioc->port_enable_cmds.status &MPT3_CMD_PENDING ) { -pr_err (MPT3SAS_FMT "%s: internal command already in use\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: internal command already in use\n" , __func__);return -EAGAIN ; } smid =mpt3sas_base_get_smid (ioc, ioc->port_enable_cb_idx);if (!smid) { -pr_err (MPT3SAS_FMT "%s: failed obtaining a smid\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: failed obtaining a smid\n" , __func__);return -EAGAIN ; }
@@ -5867,8 +5763,7 @@ _base_send_port_enable(struct MPT3SAS_ADAPTER *ioc)mpt3sas_base_put_smid_default (ioc, smid);wait_for_completion_timeout (&ioc->port_enable_cmds.done,300 *HZ );if (!(ioc->port_enable_cmds.status &MPT3_CMD_COMPLETE )) { -pr_err (MPT3SAS_FMT "%s: timeout\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: timeout\n" , __func__);_debug_dump_mf (mpi_request,sizeof (Mpi2PortEnableRequest_t)/4 );if (ioc->port_enable_cmds.status &MPT3_CMD_RESET )
@@ -5881,16 +5776,15 @@ _base_send_port_enable(struct MPT3SAS_ADAPTER *ioc) mpi_reply = ioc->port_enable_cmds.reply; ioc_status =le16_to_cpu (mpi_reply->IOCStatus) &MPI2_IOCSTATUS_MASK ;if (ioc_status !=MPI2_IOCSTATUS_SUCCESS ) { -pr_err (MPT3SAS_FMT "%s: failed with (ioc_status=0x%08x)\n" , - ioc->name, __func__, ioc_status); +ioc_err (ioc,"%s: failed with (ioc_status=0x%08x)\n" , + __func__, ioc_status); r = -EFAULT ; goto out; } out: ioc->port_enable_cmds.status =MPT3_CMD_NOT_USED ; -pr_info (MPT3SAS_FMT "port enable: %s\n" , ioc->name, ((r ==0 ) ? -"SUCCESS" :"FAILED" )); +ioc_info (ioc,"port enable: %s\n" , r ==0 ?"SUCCESS" :"FAILED" );return r; }
@@ -5906,18 +5800,16 @@ mpt3sas_port_enable(struct MPT3SAS_ADAPTER *ioc)Mpi2PortEnableRequest_t *mpi_request;u16 smid; -pr_info (MPT3SAS_FMT "sending port enable !!\n" , ioc->name); +ioc_info (ioc,"sending port enable !!\n" );if (ioc->port_enable_cmds.status &MPT3_CMD_PENDING ) { -pr_err (MPT3SAS_FMT "%s: internal command already in use\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: internal command already in use\n" , __func__);return -EAGAIN ; } smid =mpt3sas_base_get_smid (ioc, ioc->port_enable_cb_idx);if (!smid) { -pr_err (MPT3SAS_FMT "%s: failed obtaining a smid\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: failed obtaining a smid\n" , __func__);return -EAGAIN ; }
@@ -6020,19 +5912,16 @@ _base_event_notification(struct MPT3SAS_ADAPTER *ioc)int r =0 ;int i; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));if (ioc->base_cmds.status &MPT3_CMD_PENDING ) { -pr_err (MPT3SAS_FMT "%s: internal command already in use\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: internal command already in use\n" , __func__);return -EAGAIN ; } smid =mpt3sas_base_get_smid (ioc, ioc->base_cb_idx);if (!smid) { -pr_err (MPT3SAS_FMT "%s: failed obtaining a smid\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: failed obtaining a smid\n" , __func__);return -EAGAIN ; } ioc->base_cmds.status =MPT3_CMD_PENDING ;
@@ -6049,8 +5938,7 @@ _base_event_notification(struct MPT3SAS_ADAPTER *ioc)mpt3sas_base_put_smid_default (ioc, smid);wait_for_completion_timeout (&ioc->base_cmds.done,30 *HZ );if (!(ioc->base_cmds.status &MPT3_CMD_COMPLETE )) { -pr_err (MPT3SAS_FMT "%s: timeout\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: timeout\n" , __func__);_debug_dump_mf (mpi_request,sizeof (Mpi2EventNotificationRequest_t)/4 );if (ioc->base_cmds.status &MPT3_CMD_RESET )
@@ -6058,8 +5946,7 @@ _base_event_notification(struct MPT3SAS_ADAPTER *ioc)else r = -ETIME ; }else -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s: complete\n" , - ioc->name, __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s: complete\n" , __func__)); ioc->base_cmds.status =MPT3_CMD_NOT_USED ;return r; }
@@ -6115,18 +6002,16 @@ _base_diag_reset(struct MPT3SAS_ADAPTER *ioc)u32 count;u32 hcb_size; -pr_info (MPT3SAS_FMT "sending diag reset !!\n" , ioc->name); +ioc_info (ioc,"sending diag reset !!\n" ); -drsprintk (ioc,pr_info (MPT3SAS_FMT "clear interrupts\n" , - ioc->name)); +drsprintk (ioc,ioc_info (ioc,"clear interrupts\n" )); count =0 ; do { /* Write magic sequence to WriteSequence register * Loop until in diagnostic mode */ - drsprintk(ioc, pr_info(MPT3SAS_FMT - "write magic sequence\n", ioc->name)); + drsprintk(ioc, ioc_info(ioc, "write magic sequence\n")); writel(MPI2_WRSEQ_FLUSH_KEY_VALUE, &ioc->chip->WriteSequence); writel(MPI2_WRSEQ_1ST_KEY_VALUE, &ioc->chip->WriteSequence); writel(MPI2_WRSEQ_2ND_KEY_VALUE, &ioc->chip->WriteSequence);
@@ -6142,16 +6027,15 @@ _base_diag_reset(struct MPT3SAS_ADAPTER *ioc) goto out; host_diagnostic =readl (&ioc->chip->HostDiagnostic); -drsprintk (ioc,pr_info (MPT3SAS_FMT -"wrote magic sequence: count(%d), host_diagnostic(0x%08x)\n" , - ioc->name, count, host_diagnostic)); +drsprintk (ioc, +ioc_info (ioc,"wrote magic sequence: count(%d), host_diagnostic(0x%08x)\n" , + count, host_diagnostic)); }while ((host_diagnostic &MPI2_DIAG_DIAG_WRITE_ENABLE ) ==0 ); hcb_size =readl (&ioc->chip->HCBSize); -drsprintk (ioc,pr_info (MPT3SAS_FMT "diag reset: issued\n" , - ioc->name)); +drsprintk (ioc,ioc_info (ioc,"diag reset: issued\n" ));writel (host_diagnostic |MPI2_DIAG_RESET_ADAPTER , &ioc->chip->HostDiagnostic);
@@ -6174,43 +6058,38 @@ _base_diag_reset(struct MPT3SAS_ADAPTER *ioc)if (host_diagnostic &MPI2_DIAG_HCB_MODE ) { -drsprintk (ioc,pr_info (MPT3SAS_FMT -"restart the adapter assuming the HCB Address points to good F/W\n" , - ioc->name)); +drsprintk (ioc, +ioc_info (ioc,"restart the adapter assuming the HCB Address points to good F/W\n" )); host_diagnostic &= ~MPI2_DIAG_BOOT_DEVICE_SELECT_MASK ; host_diagnostic |=MPI2_DIAG_BOOT_DEVICE_SELECT_HCDW ;writel (host_diagnostic, &ioc->chip->HostDiagnostic); -drsprintk (ioc,pr_info (MPT3SAS_FMT -"re-enable the HCDW\n" , ioc->name)); +drsprintk (ioc,ioc_info (ioc,"re-enable the HCDW\n" ));writel (hcb_size |MPI2_HCB_SIZE_HCB_ENABLE , &ioc->chip->HCBSize); } -drsprintk (ioc,pr_info (MPT3SAS_FMT "restart the adapter\n" , - ioc->name)); +drsprintk (ioc,ioc_info (ioc,"restart the adapter\n" ));writel (host_diagnostic & ~MPI2_DIAG_HOLD_IOC_RESET , &ioc->chip->HostDiagnostic); -drsprintk (ioc,pr_info (MPT3SAS_FMT -"disable writes to the diagnostic register\n" , ioc->name)); +drsprintk (ioc, +ioc_info (ioc,"disable writes to the diagnostic register\n" ));writel (MPI2_WRSEQ_FLUSH_KEY_VALUE , &ioc->chip->WriteSequence); -drsprintk (ioc,pr_info (MPT3SAS_FMT -"Wait for FW to go to the READY state\n" , ioc->name)); +drsprintk (ioc,ioc_info (ioc,"Wait for FW to go to the READY state\n" )); ioc_state =_base_wait_on_iocstate (ioc,MPI2_IOC_STATE_READY ,20 );if (ioc_state) { -pr_err (MPT3SAS_FMT -"%s: failed going to ready state (ioc_state=0x%x)\n" , - ioc->name, __func__, ioc_state); +ioc_err (ioc,"%s: failed going to ready state (ioc_state=0x%x)\n" , + __func__, ioc_state); goto out; } -pr_info (MPT3SAS_FMT "diag reset: SUCCESS\n" , ioc->name); +ioc_info (ioc,"diag reset: SUCCESS\n" );return 0 ; out: -pr_err (MPT3SAS_FMT "diag reset: FAILED\n" , ioc->name); +ioc_err (ioc,"diag reset: FAILED\n" );return -EFAULT ; }
@@ -6228,15 +6107,15 @@ _base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, enum reset_type type)int rc;int count; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));if (ioc->pci_error_recovery)return 0 ; ioc_state =mpt3sas_base_get_iocstate (ioc,0 ); -dhsprintk (ioc,pr_info (MPT3SAS_FMT "%s: ioc_state(0x%08x)\n" , - ioc->name, __func__, ioc_state)); +dhsprintk (ioc, +ioc_info (ioc,"%s: ioc_state(0x%08x)\n" , + __func__, ioc_state));/* if in RESET state, it should move to READY state shortly */ count =0 ;
@@ -6244,9 +6123,8 @@ _base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, enum reset_type type)while ((ioc_state &MPI2_IOC_STATE_MASK ) !=MPI2_IOC_STATE_READY ) {if (count++ ==10 ) { -pr_err (MPT3SAS_FMT -"%s: failed going to ready state (ioc_state=0x%x)\n" , - ioc->name, __func__, ioc_state); +ioc_err (ioc,"%s: failed going to ready state (ioc_state=0x%x)\n" , + __func__, ioc_state);return -EFAULT ; }ssleep (1 );
@@ -6258,9 +6136,7 @@ _base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, enum reset_type type)return 0 ;if (ioc_state &MPI2_DOORBELL_USED ) { -dhsprintk (ioc,pr_info (MPT3SAS_FMT -"unexpected doorbell active!\n" , - ioc->name)); +dhsprintk (ioc,ioc_info (ioc,"unexpected doorbell active!\n" )); goto issue_diag_reset; }
@@ -6304,8 +6180,7 @@ _base_make_ioc_operational(struct MPT3SAS_ADAPTER *ioc)struct adapter_reply_queue *reply_q;Mpi2ReplyDescriptorsUnion_t *reply_post_free_contig; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));/* clean the delayed target reset list */ list_for_each_entry_safe(delayed_tr, delayed_tr_next,
@@ -6465,8 +6340,7 @@ _base_make_ioc_operational(struct MPT3SAS_ADAPTER *ioc)void mpt3sas_base_free_resources (struct MPT3SAS_ADAPTER *ioc) { -dexitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dexitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));/* synchronizing freeing resource with pci_access_mutex lock */ mutex_lock (&ioc->pci_access_mutex);
@@ -6494,8 +6368,7 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)int r, i;int cpu_id, last_cpu_id =0 ; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));/* setup cpu_msix_table */ ioc->cpu_count =num_online_cpus ();
@@ -6505,9 +6378,8 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc) ioc->cpu_msix_table =kzalloc (ioc->cpu_msix_table_sz,GFP_KERNEL ); ioc->reply_queue_count =1 ;if (!ioc->cpu_msix_table) { -dfailprintk (ioc,pr_info (MPT3SAS_FMT -"allocation for cpu_msix_table failed!!!\n" , - ioc->name)); +dfailprintk (ioc, +ioc_info (ioc,"allocation for cpu_msix_table failed!!!\n" )); r = -ENOMEM ; goto out_free_resources; }
@@ -6516,9 +6388,8 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc) ioc->reply_post_host_index =kcalloc (ioc->cpu_msix_table_sz,sizeof (resource_size_t *),GFP_KERNEL );if (!ioc->reply_post_host_index) { -dfailprintk (ioc,pr_info (MPT3SAS_FMT "allocation " -"for reply_post_host_index failed!!!\n" , - ioc->name)); +dfailprintk (ioc, +ioc_info (ioc,"allocation for reply_post_host_index failed!!!\n" )); r = -ENOMEM ; goto out_free_resources; }
@@ -6747,8 +6618,7 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)void mpt3sas_base_detach (struct MPT3SAS_ADAPTER *ioc) { -dexitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dexitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));mpt3sas_base_stop_watchdog (ioc);mpt3sas_base_free_resources (ioc);
@@ -6781,8 +6651,7 @@ static void _base_pre_reset_handler(struct MPT3SAS_ADAPTER *ioc) {mpt3sas_scsih_pre_reset_handler (ioc);mpt3sas_ctl_pre_reset_handler (ioc); -dtmprintk (ioc,pr_info (MPT3SAS_FMT -"%s: MPT3_IOC_PRE_RESET\n" , ioc->name, __func__)); +dtmprintk (ioc,ioc_info (ioc,"%s: MPT3_IOC_PRE_RESET\n" , __func__)); }/**
@@ -6793,8 +6662,7 @@ static void _base_after_reset_handler(struct MPT3SAS_ADAPTER *ioc) {mpt3sas_scsih_after_reset_handler (ioc);mpt3sas_ctl_after_reset_handler (ioc); -dtmprintk (ioc,pr_info (MPT3SAS_FMT -"%s: MPT3_IOC_AFTER_RESET\n" , ioc->name, __func__)); +dtmprintk (ioc,ioc_info (ioc,"%s: MPT3_IOC_AFTER_RESET\n" , __func__));if (ioc->transport_cmds.status &MPT3_CMD_PENDING ) { ioc->transport_cmds.status |=MPT3_CMD_RESET ;mpt3sas_base_free_smid (ioc, ioc->transport_cmds.smid);
@@ -6835,8 +6703,7 @@ static void _base_reset_done_handler(struct MPT3SAS_ADAPTER *ioc) {mpt3sas_scsih_reset_done_handler (ioc);mpt3sas_ctl_reset_done_handler (ioc); -dtmprintk (ioc,pr_info (MPT3SAS_FMT -"%s: MPT3_IOC_DONE_RESET\n" , ioc->name, __func__)); +dtmprintk (ioc,ioc_info (ioc,"%s: MPT3_IOC_DONE_RESET\n" , __func__)); }/**
@@ -6883,12 +6750,10 @@ mpt3sas_base_hard_reset_handler(struct MPT3SAS_ADAPTER *ioc,u32 ioc_state;u8 is_fault =0 , is_trigger =0 ; -dtmprintk (ioc,pr_info (MPT3SAS_FMT "%s: enter\n" , ioc->name, - __func__)); +dtmprintk (ioc,ioc_info (ioc,"%s: enter\n" , __func__));if (ioc->pci_error_recovery) { -pr_err (MPT3SAS_FMT "%s: pci error recovery reset\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: pci error recovery reset\n" , __func__); r =0 ; goto out_unlocked; }
@@ -6942,8 +6807,9 @@ mpt3sas_base_hard_reset_handler(struct MPT3SAS_ADAPTER *ioc,_base_reset_done_handler (ioc); out: -dtmprintk (ioc,pr_info (MPT3SAS_FMT "%s: %s\n" , - ioc->name, __func__, ((r ==0 ) ?"SUCCESS" :"FAILED" ))); +dtmprintk (ioc, +ioc_info (ioc,"%s: %s\n" , + __func__, r ==0 ?"SUCCESS" :"FAILED" ));spin_lock_irqsave (&ioc->ioc_reset_in_progress_lock, flags); ioc->shost_recovery =0 ;
@@ -6959,7 +6825,6 @@ mpt3sas_base_hard_reset_handler(struct MPT3SAS_ADAPTER *ioc,mpt3sas_trigger_master (ioc,MASTER_TRIGGER_ADAPTER_RESET ); } -dtmprintk (ioc,pr_info (MPT3SAS_FMT "%s: exit\n" , ioc->name, - __func__)); +dtmprintk (ioc,ioc_info (ioc,"%s: exit\n" , __func__));return r; }
drivers/scsi/mpt3sas/mpt3sas_config.c +20 -28
99 lines not on this page · raw message
drivers/scsi/mpt3sas/mpt3sas_ctl.c +208 -285
707 lines not on this page · raw message
drivers/scsi/mpt3sas/mpt3sas_scsih.c +623 -802
1,425 lines not on this page · raw message
drivers/scsi/mpt3sas/mpt3sas_transport.c +140 -173
313 lines not on this page · raw message
drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c +50 -51
101 lines not on this page · raw message
drivers/scsi/mpt3sas/mpt3sas_warpdrive.c +27 -43
70 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.15.0
Part of the diff is not shown here. View the raw message.
PATCH 3/7 mpt3sas: Convert mlsleading uses of pr_<level> with MPT3SAS_FMT
In reply to Joe PerchesThese have misordered uses of __func__ and ioc->name that could mismatch MPT3SAS_FMT and "%s: ".
Convert them to ioc_<level>.
Signed-off-by Joe Perches <[email protected]>
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 50 +++++++++++++++----------------- drivers/scsi/mpt3sas/mpt3sas_transport.c | 18 ++++-------- 2 files changed, 29 insertions(+), 39 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +23 -27
@@ -2627,15 +2627,13 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, u64 lun,lockdep_assert_held (&ioc->tm_cmds.mutex);if (ioc->tm_cmds.status !=MPT3_CMD_NOT_USED ) { -pr_info (MPT3SAS_FMT "%s: tm_cmd busy!!!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: tm_cmd busy!!!\n" , __func__);return FAILED ; }if (ioc->shost_recovery || ioc->remove_host || ioc->pci_error_recovery) { -pr_info (MPT3SAS_FMT "%s: host reset in progress!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: host reset in progress!\n" , __func__);return FAILED ; }
@@ -3550,18 +3548,16 @@ _scsih_tm_tr_send(struct MPT3SAS_ADAPTER *ioc, u16 handle)u8 tr_method =0 ;if (ioc->pci_error_recovery) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host in pci error recovery: handle(0x%04x)\n" , - __func__, ioc->name, - handle)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host in pci error recovery: handle(0x%04x)\n" , + __func__, handle));return ; } ioc_state =mpt3sas_base_get_iocstate (ioc,1 );if (ioc_state !=MPI2_IOC_STATE_OPERATIONAL ) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host is not operational: handle(0x%04x)\n" , - __func__, ioc->name, - handle)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host is not operational: handle(0x%04x)\n" , + __func__, handle));return ; }
@@ -3811,9 +3807,9 @@ _scsih_tm_tr_volume_send(struct MPT3SAS_ADAPTER *ioc, u16 handle)struct _tr_list *delayed_tr;if (ioc->pci_error_recovery) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host reset in progress!\n" , - __func__, ioc->name)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host reset in progress!\n" , + __func__));return ; }
@@ -3863,9 +3859,9 @@ _scsih_tm_volume_tr_complete(struct MPT3SAS_ADAPTER *ioc, u16 smid,mpt3sas_base_get_reply_virt_addr (ioc, reply);if (ioc->shost_recovery || ioc->pci_error_recovery) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host reset in progress!\n" , - __func__, ioc->name)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host reset in progress!\n" , + __func__));return 1 ; }if (unlikely (!mpi_reply)) {
@@ -3950,21 +3946,21 @@ _scsih_issue_delayed_sas_io_unit_ctrl(struct MPT3SAS_ADAPTER *ioc,unsigned long flags;if (ioc->remove_host) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host has been removed\n" , - __func__, ioc->name)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host has been removed\n" , + __func__));return ; }else if (ioc->pci_error_recovery) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host in pci error recovery\n" , - __func__, ioc->name)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host in pci error recovery\n" , + __func__));return ; } ioc_state =mpt3sas_base_get_iocstate (ioc,1 );if (ioc_state !=MPI2_IOC_STATE_OPERATIONAL ) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host is not operational\n" , - __func__, ioc->name)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host is not operational\n" , + __func__));return ; }
drivers/scsi/mpt3sas/mpt3sas_transport.c +6 -12
@@ -146,8 +146,7 @@ _transport_set_identify(struct MPT3SAS_ADAPTER *ioc, u16 handle,u32 ioc_status;if (ioc->shost_recovery || ioc->pci_error_recovery) { -pr_info (MPT3SAS_FMT "%s: host reset in progress!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: host reset in progress!\n" , __func__);return -EFAULT ; }
@@ -308,8 +307,7 @@ _transport_expander_report_manufacture(struct MPT3SAS_ADAPTER *ioc,u16 wait_state_count;if (ioc->shost_recovery || ioc->pci_error_recovery) { -pr_info (MPT3SAS_FMT "%s: host reset in progress!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: host reset in progress!\n" , __func__);return -EFAULT ; }
@@ -1088,8 +1086,7 @@ _transport_get_expander_phy_error_log(struct MPT3SAS_ADAPTER *ioc,u16 wait_state_count;if (ioc->shost_recovery || ioc->pci_error_recovery) { -pr_info (MPT3SAS_FMT "%s: host reset in progress!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: host reset in progress!\n" , __func__);return -EFAULT ; }
@@ -1393,8 +1390,7 @@ _transport_expander_phy_control(struct MPT3SAS_ADAPTER *ioc,u16 wait_state_count;if (ioc->shost_recovery || ioc->pci_error_recovery) { -pr_info (MPT3SAS_FMT "%s: host reset in progress!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: host reset in progress!\n" , __func__);return -EFAULT ; }
@@ -1894,8 +1890,7 @@ _transport_smp_handler(struct bsg_job *job, struct Scsi_Host *shost,unsigned int reslen =0 ;if (ioc->shost_recovery || ioc->pci_error_recovery) { -pr_info (MPT3SAS_FMT "%s: host reset in progress!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: host reset in progress!\n" , __func__); rc = -EFAULT ; goto job_done; }
@@ -1975,8 +1970,7 @@ _transport_smp_handler(struct bsg_job *job, struct Scsi_Host *shost,wait_for_completion_timeout (&ioc->transport_cmds.done,10 *HZ );if (!(ioc->transport_cmds.status &MPT3_CMD_COMPLETE )) { -pr_err (MPT3SAS_FMT "%s : timeout\n" , - __func__, ioc->name); +ioc_err (ioc,"%s: timeout\n" , __func__);_debug_dump_mf (mpi_request,sizeof (Mpi2SmpPassthroughRequest_t)/4 );if (!(ioc->transport_cmds.status &MPT3_CMD_RESET )) {
Signature · 1 line
2.15.0
PATCH 4/7 mpt3sas: Convert logging uses with MPT3SAS_FMT and reply_q_name to %s:
In reply to Joe PerchesConvert the existing 2 uses to make the format and arguments matching more obvious.
Miscellanea:
o Move the word "enabled" into the format to trivially reduce object size
o Remove unnecessary parentheses
Signed-off-by Joe Perches <[email protected]>
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +5 -5
@@ -2705,7 +2705,7 @@ _base_request_irq(struct MPT3SAS_ADAPTER *ioc, u8 index) r =request_irq (pci_irq_vector (pdev, index), _base_interrupt,IRQF_SHARED , reply_q->name, reply_q);if (r) { -pr_err (MPT3SAS_FMT "unable to allocate interrupt %d!\n" , +pr_err ("%s: unable to allocate interrupt %d!\n" , reply_q->name,pci_irq_vector (pdev, index));kfree (reply_q);return -EBUSY ;
@@ -3034,10 +3034,10 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc) }list_for_each_entry (reply_q, &ioc->reply_queue_list, list) -pr_info (MPT3SAS_FMT "%s: IRQ %d\n" , - reply_q->name, ((ioc->msix_enable) ?"PCI-MSI-X enabled" : -"IO-APIC enabled" ), -pci_irq_vector (ioc->pdev, reply_q->msix_index)); +pr_info ("%s: %s enabled: IRQ %d\n" , + reply_q->name, + ioc->msix_enable ?"PCI-MSI-X" :"IO-APIC" , +pci_irq_vector (ioc->pdev, reply_q->msix_index));ioc_info (ioc,"iomem(%pap), mapped(0x%p), size(%d)\n" , &chip_phys, ioc->chip, memap_sz);
Signature · 1 line
2.15.0
PATCH 5/7 mpt3sas: Remove KERN_WARNING from panic uses
In reply to Joe PerchesRemove the logging level as panic calls stop the machine and should always be emitted regardless of requested logging level.
These existing panic uses are perhaps inappropriate.
Miscellanea:
o Coalesce formats and convert MPT3SAS_FMT to "%s: " to improve clarity
Signed-off-by Joe Perches <[email protected]>
--- drivers/scsi/mpt3sas/mpt3sas_config.c | 41 +++++++++++++---------------------- 1 file changed, 15 insertions(+), 26 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_config.c +15 -26
@@ -421,12 +421,10 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t (mpi_reply->Header.PageType & 0xF)) {_debug_dump_mf (mpi_request, ioc->request_sz/4 );_debug_dump_reply (mpi_reply, ioc->request_sz/4 ); - panic(KERN_WARNING MPT3SAS_FMT "%s: Firmware BUG:" \ -" mpi_reply mismatch: Requested PageType(0x%02x)" \ -" Reply PageType(0x%02x)\n" , \ - ioc->name, __func__, - (mpi_request->Header.PageType &0xF ), - (mpi_reply->Header.PageType & 0xF)); +panic ("%s: %s: Firmware BUG: mpi_reply mismatch: Requested PageType(0x%02x) Reply PageType(0x%02x)\n" , + ioc->name, __func__, + mpi_request->Header.PageType &0xF , + mpi_reply->Header.PageType &0xF ); } if (((mpi_request->Header.PageType & 0xF) ==
@@ -434,11 +432,10 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t mpi_request->ExtPageType != mpi_reply->ExtPageType) {_debug_dump_mf (mpi_request, ioc->request_sz/4 );_debug_dump_reply (mpi_reply, ioc->request_sz/4 ); - panic(KERN_WARNING MPT3SAS_FMT "%s: Firmware BUG:" \ -" mpi_reply mismatch: Requested ExtPageType(0x%02x)" -" Reply ExtPageType(0x%02x)\n" , - ioc->name, __func__, mpi_request->ExtPageType, - mpi_reply->ExtPageType); +panic ("%s: %s: Firmware BUG: mpi_reply mismatch: Requested ExtPageType(0x%02x) Reply ExtPageType(0x%02x)\n" , + ioc->name, __func__, + mpi_request->ExtPageType, + mpi_reply->ExtPageType); } ioc_status =le16_to_cpu (mpi_reply->IOCStatus) &MPI2_IOCSTATUS_MASK ;
@@ -461,14 +458,10 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t_debug_dump_reply (mpi_reply, ioc->request_sz/4 );_debug_dump_config (p,min_t (u16, mem.sz, config_page_sz)/4 ); - panic(KERN_WARNING MPT3SAS_FMT -"%s: Firmware BUG:" \ -" config page mismatch:" -" Requested PageType(0x%02x)" -" Reply PageType(0x%02x)\n" , - ioc->name, __func__, - (mpi_request->Header.PageType &0xF ), - (p[3] & 0xF)); +panic ("%s: %s: Firmware BUG: config page mismatch: Requested PageType(0x%02x) Reply PageType(0x%02x)\n" , + ioc->name, __func__, + mpi_request->Header.PageType &0xF , + p[3 ] &0xF ); } if (((mpi_request->Header.PageType & 0xF) ==
@@ -478,13 +471,9 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t_debug_dump_reply (mpi_reply, ioc->request_sz/4 );_debug_dump_config (p,min_t (u16, mem.sz, config_page_sz)/4 ); - panic(KERN_WARNING MPT3SAS_FMT -"%s: Firmware BUG:" \ -" config page mismatch:" -" Requested ExtPageType(0x%02x)" -" Reply ExtPageType(0x%02x)\n" , - ioc->name, __func__, - mpi_request->ExtPageType, p[6]); +panic ("%s: %s: Firmware BUG: config page mismatch: Requested ExtPageType(0x%02x) Reply ExtPageType(0x%02x)\n" , + ioc->name, __func__, + mpi_request->ExtPageType, p[6 ]); } } memcpy(config_page, mem.page, min_t(u16, mem.sz,
Signature · 1 line
2.15.0
PATCH 6/7 mpt3sas: Convert logging uses with MPT3SAS_FMT without logging levels
In reply to Joe PerchesConvert these uses to ioc_<level> where appropriate.
Signed-off-by Joe Perches <[email protected]>
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 41 +++++++++++++++----------------- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 12 +++++----- drivers/scsi/mpt3sas/mpt3sas_transport.c | 6 ++--- 3 files changed, 28 insertions(+), 31 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +19 -22
@@ -2819,9 +2819,8 @@ _base_enable_msix(struct MPT3SAS_ADAPTER *ioc) ioc->reply_queue_count =min_t (int, ioc->cpu_count, ioc->msix_vector_count); -printk (MPT3SAS_FMT "MSI-X vectors supported: %d, no of cores" -": %d, max_msix_vectors: %d\n" , ioc->name, ioc->msix_vector_count, - ioc->cpu_count, max_msix_vectors); +ioc_info (ioc,"MSI-X vectors supported: %d, no of cores: %d, max_msix_vectors: %d\n" , + ioc->msix_vector_count, ioc->cpu_count, max_msix_vectors);if (!ioc->rdpq_array_enable && max_msix_vectors ==-1 ) local_max_msix_vectors = (reset_devices) ?1 :8 ;
@@ -2886,8 +2885,7 @@ mpt3sas_base_unmap_resources(struct MPT3SAS_ADAPTER *ioc) {struct pci_dev *pdev = ioc->pdev; -dexitprintk (ioc,printk (MPT3SAS_FMT "%s\n" , - ioc->name, __func__)); +dexitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));_base_free_irq (ioc);_base_disable_msix (ioc);
@@ -3007,9 +3005,8 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc) ioc->combined_reply_index_count, sizeof(resource_size_t *), GFP_KERNEL);if (!ioc->replyPostRegisterIndex) { -dfailprintk (ioc,printk (MPT3SAS_FMT -"allocation for reply Post Register Index failed!!!\n" , - ioc->name)); +dfailprintk (ioc, +ioc_warn (ioc,"allocation for reply Post Register Index failed!!!\n" )); r = -ENOMEM ; goto out_fail; }
@@ -5438,26 +5435,26 @@ _base_wait_for_iocstate(struct MPT3SAS_ADAPTER *ioc, int timeout)u32 ioc_state;int rc; -dinitprintk (ioc,printk (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));if (ioc->pci_error_recovery) { -dfailprintk (ioc,printk (MPT3SAS_FMT -"%s: host in pci error recovery\n" , ioc->name, __func__)); +dfailprintk (ioc, +ioc_info (ioc,"%s: host in pci error recovery\n" , + __func__));return -EFAULT ; } ioc_state =mpt3sas_base_get_iocstate (ioc,0 ); -dhsprintk (ioc,printk (MPT3SAS_FMT "%s: ioc_state(0x%08x)\n" , - ioc->name, __func__, ioc_state)); +dhsprintk (ioc, +ioc_info (ioc,"%s: ioc_state(0x%08x)\n" , + __func__, ioc_state));if (((ioc_state &MPI2_IOC_STATE_MASK ) ==MPI2_IOC_STATE_READY ) || (ioc_state &MPI2_IOC_STATE_MASK ) ==MPI2_IOC_STATE_OPERATIONAL )return 0 ;if (ioc_state &MPI2_DOORBELL_USED ) { -dhsprintk (ioc,printk (MPT3SAS_FMT -"unexpected doorbell active!\n" , ioc->name)); +dhsprintk (ioc,ioc_info (ioc,"unexpected doorbell active!\n" )); goto issue_diag_reset; }
@@ -5469,9 +5466,9 @@ _base_wait_for_iocstate(struct MPT3SAS_ADAPTER *ioc, int timeout) ioc_state =_base_wait_on_iocstate (ioc,MPI2_IOC_STATE_READY , timeout);if (ioc_state) { -dfailprintk (ioc,printk (MPT3SAS_FMT -"%s: failed going to ready state (ioc_state=0x%x)\n" , - ioc->name, __func__, ioc_state)); +dfailprintk (ioc, +ioc_info (ioc,"%s: failed going to ready state (ioc_state=0x%x)\n" , + __func__, ioc_state));return -EFAULT ; }
@@ -5498,9 +5495,9 @@ _base_get_ioc_facts(struct MPT3SAS_ADAPTER *ioc) r =_base_wait_for_iocstate (ioc,10 );if (r) { -dfailprintk (ioc,printk (MPT3SAS_FMT -"%s: failed getting to correct state\n" , - ioc->name, __func__)); +dfailprintk (ioc, +ioc_info (ioc,"%s: failed getting to correct state\n" , + __func__));return r; } mpi_reply_sz =sizeof (Mpi2IOCFactsReply_t);
drivers/scsi/mpt3sas/mpt3sas_scsih.c +6 -6
@@ -4999,16 +4999,16 @@ _scsih_turn_off_pfa_led(struct MPT3SAS_ADAPTER *ioc, mpi_request.Flags =MPI2_SEP_REQ_FLAGS_ENCLOSURE_SLOT_ADDRESS ;if ((mpt3sas_base_scsi_enclosure_processor (ioc, &mpi_reply, &mpi_request)) !=0 ) { -printk (MPT3SAS_FMT "failure at %s:%d/%s()!\n" , ioc->name, - __FILE__, __LINE__, __func__); +ioc_err (ioc,"failure at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__);return ; }if (mpi_reply.IOCStatus || mpi_reply.IOCLogInfo) { -dewtprintk (ioc,printk (MPT3SAS_FMT -"enclosure_processor: ioc_status (0x%04x), loginfo(0x%08x)\n" , - ioc->name,le16_to_cpu (mpi_reply.IOCStatus), -le32_to_cpu (mpi_reply.IOCLogInfo))); +dewtprintk (ioc, +ioc_info (ioc,"enclosure_processor: ioc_status (0x%04x), loginfo(0x%08x)\n" , +le16_to_cpu (mpi_reply.IOCStatus), +le32_to_cpu (mpi_reply.IOCLogInfo)));return ; } }
drivers/scsi/mpt3sas/mpt3sas_transport.c +3 -3
@@ -717,9 +717,9 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, sas_device =mpt3sas_get_sdev_by_addr (ioc, mpt3sas_port->remote_identify.sas_address);if (!sas_device) { -dfailprintk (ioc,printk (MPT3SAS_FMT -"failure at %s:%d/%s()!\n" , - ioc->name, __FILE__, __LINE__, __func__)); +dfailprintk (ioc, +ioc_info (ioc,"failure at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__)); goto out_fail; } sas_device->pend_sas_rphy_add =1 ;
Signature · 1 line
2.15.0
PATCH 7/7 mpt3sas: Remove unused macro MPT3SAS_FMT
In reply to Joe PerchesAll the uses have been removed, delete the macro.
Signed-off-by Joe Perches <[email protected]>
--- drivers/scsi/mpt3sas/mpt3sas_base.h | 2 -- 1 file changed, 2 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.h +0 -2
@@ -158,8 +158,6 @@ struct mpt3sas_nvme_cmd {/* * logging format */ -#define MPT3SAS_FMT "%s: " -#define ioc_err (ioc, fmt, ...) \ pr_err("%s: " fmt, (ioc)->name, ##__VA_ARGS__)#define ioc_notice (ioc, fmt, ...) \
Signature · 1 line
2.15.0
Quoted 7 lines · Joe Perches
Several defects exist in the logging uses
o Missing KERN_<LEVEL>
o Unnecessary KERN_<LEVEL> uses with panic
o MismatchedMPT3SAS_FMTand %s: with name and__func__Correct these defects and perhaps add some clarity to the logging.
Submitted 2 weeks ago now without comment.
ping...
Quoted 19 lines
Joe Perches (7):
mpt3sas: Add ioc_<level> logging macros
mpt3sas: Convert uses of pr_<level> withMPT3SAS_FMTto ioc_<level>
mpt3sas: Convert mlsleading uses of pr_<level> withMPT3SAS_FMT
mpt3sas: Convert logging uses withMPT3SAS_FMTandreply_q_nameto %s:
mpt3sas: RemoveKERN_WARNINGfrom panic uses
mpt3sas: Convert logging uses withMPT3SAS_FMTwithout logging levels
mpt3sas: Remove unused macroMPT3SAS_FMTdrivers/scsi/mpt3sas/mpt3sas_base.c | 1116 +++++++++----------- drivers/scsi/mpt3sas/mpt3sas_base.h | 9 +- drivers/scsi/mpt3sas/mpt3sas_config.c | 89 +- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 493 ++++----- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1487 ++++++++++++--------------- drivers/scsi/mpt3sas/mpt3sas_transport.c | 337 +++--- drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 101 +- drivers/scsi/mpt3sas/mpt3sas_warpdrive.c | 70 +- 8 files changed, 1618 insertions(+), 2084 deletions(-)
Suganath Prabu Subramani
maintainerRe: [PATCH 1/7] mpt3sas: Add ioc_<level> logging macros
In reply to Joe PerchesHi,
Please consider this patch as Acked-by: Suganath Prabu <[email protected]>
Thanks.
Quoted 32 lines · Joe Perches
These macros can help identify specific logging uses and eventually perhaps reduce object sizes.
Signed-off-by Joe Perches <[email protected]>--- drivers/scsi/mpt3sas/mpt3sas_base.h | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/scsi/mpt3sas/mpt3sas_base.h +9
-1@@ -160,6 +160,15 @@ struct mpt3sas_nvme_cmd {*/ #define MPT3SAS_FMT "%s: " +#define ioc_err (ioc, fmt, ...) \ + pr_err("%s: " fmt, (ioc)->name, ##__VA_ARGS__) +#define ioc_notice (ioc, fmt, ...) \ + pr_notice("%s: " fmt, (ioc)->name, ##__VA_ARGS__) +#define ioc_warn (ioc, fmt, ...) \ + pr_warn("%s: " fmt, (ioc)->name, ##__VA_ARGS__) +#define ioc_info (ioc, fmt, ...) \ + pr_info("%s: " fmt, (ioc)->name, ##__VA_ARGS__) +/* * WarpDrive Specific Log codes */ --2.15.0
Suganath Prabu Subramani
maintainerRe: [PATCH 2/7] mpt3sas: Convert uses of pr_<level> with MPT3SAS_FMT to ioc_<level>
In reply to Joe PerchesHi,
Please consider this patch as Acked-by: Suganath Prabu <[email protected]>
Thanks.
Quoted 949 lines · Joe Perches
Use a more common logging style.
Done using the perl script below and some typing
$ git grep --name-only -w MPT3SAS_FMT -- "*.c" | \ xargs perl -i -e 'local $/; while (<>) { s/\bpr_(info|err|notice|warn)\s*\(\s*MPT3SAS_FMT\s*("[^"]+"(?:\s*\\?\s*"[^"]+"\s*){0,5}\s*),\s*ioc->name\s*/ioc_\1(ioc, \2/g; print;}'Miscellanea for these conversions:
o Coalesce formats
o Realign arguments
o Remove unnecessary parentheses
o Use casts to u64 instead of unsigned long long where appropriate
o Convert brokenpr_infouses topr_cont
o Fix broken format string concatenation with line continuations and excess whitespaceSigned-off-by Joe Perches <[email protected]>--- drivers/scsi/mpt3sas/mpt3sas_base.c | 1065 +++++++++----------- drivers/scsi/mpt3sas/mpt3sas_config.c | 48 +- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 493 ++++----- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1425 ++++++++++++--------------- drivers/scsi/mpt3sas/mpt3sas_transport.c | 313 +++--- drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 101 +- drivers/scsi/mpt3sas/mpt3sas_warpdrive.c | 70 +- 7 files changed, 1533 insertions(+), 1982 deletions(-)drivers/scsi/mpt3sas/mpt3sas_base.c +198
-241@@ -122,8 +122,8 @@ mpt3sas_base_check_cmd_timeout(struct MPT3SAS_ADAPTER *ioc,if (!(status &MPT3_CMD_RESET )) issue_reset =1 ; -pr_err (MPT3SAS_FMT "Command %s\n" , ioc->name, - ((issue_reset ==0 ) ?"terminated due to Host Reset" :"Timeout" )); +ioc_err (ioc,"Command %s\n" , + issue_reset ==0 ?"terminated due to Host Reset" :"Timeout" );_debug_dump_mf (mpi_request, sz);return issue_reset;@@ -336,9 +336,7 @@ _base_get_chain_buffer_dma_to_chain_buffer(struct MPT3SAS_ADAPTER *ioc,return ct->chain_buffer; } } -pr_info (MPT3SAS_FMT -"Provided chain_buffer_dma address is not in the lookup list\n" , - ioc->name); +ioc_info (ioc,"Provided chain_buffer_dma address is not in the lookup list\n" );return NULL ; }@@ -394,7 +392,7 @@ static void _clone_sg_entries(struct MPT3SAS_ADAPTER *ioc,/* Get scsi_cmd using smid */ scmd =mpt3sas_scsih_scsi_lookup_get (ioc, smid);if (scmd ==NULL ) { -pr_err (MPT3SAS_FMT "scmd is NULL\n" , ioc->name); +ioc_err (ioc,"scmd is NULL\n" );return ; }@@ -566,8 +564,7 @@ _base_fault_reset_work(struct work_struct *work) doorbell =mpt3sas_base_get_iocstate (ioc,0 );if ((doorbell &MPI2_IOC_STATE_MASK ) ==MPI2_IOC_STATE_MASK ) { -pr_err (MPT3SAS_FMT "SAS host is non-operational !!!!\n" , - ioc->name); +ioc_err (ioc,"SAS host is non-operational !!!!\n" );/* It may be possible that EEH recovery can resolve some of * pci bus failure issues rather removing the dead ioc function @@ -600,13 +597,11 @@ _base_fault_reset_work(struct work_struct *work) p =kthread_run (mpt3sas_remove_dead_ioc_func, ioc,"%s_dead_ioc_%d" , ioc->driver_name, ioc->id);if (IS_ERR (p)) -pr_err (MPT3SAS_FMT -"%s: Running mpt3sas_dead_ioc thread failed !!!!\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: Running mpt3sas_dead_ioc thread failed !!!!\n" , + __func__);else -pr_err (MPT3SAS_FMT -"%s: Running mpt3sas_dead_ioc thread success !!!!\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: Running mpt3sas_dead_ioc thread success !!!!\n" , + __func__);return ;/* don't rearm timer */ }@@ -614,8 +609,8 @@ _base_fault_reset_work(struct work_struct *work)if ((doorbell &MPI2_IOC_STATE_MASK ) !=MPI2_IOC_STATE_OPERATIONAL ) { rc =mpt3sas_base_hard_reset_handler (ioc,FORCE_BIG_HAMMER ); -pr_warn (MPT3SAS_FMT "%s: hard reset: %s\n" , ioc->name, - __func__, (rc ==0 ) ?"success" :"failed" ); +ioc_warn (ioc,"%s: hard reset: %s\n" , + __func__, rc ==0 ?"success" :"failed" ); doorbell =mpt3sas_base_get_iocstate (ioc,0 );if ((doorbell &MPI2_IOC_STATE_MASK ) ==MPI2_IOC_STATE_FAULT ) mpt3sas_base_fault_info(ioc, doorbell &@@ -657,8 +652,7 @@ mpt3sas_base_start_watchdog(struct MPT3SAS_ADAPTER *ioc) ioc->fault_reset_work_q =create_singlethread_workqueue (ioc->fault_reset_work_q_name);if (!ioc->fault_reset_work_q) { -pr_err (MPT3SAS_FMT "%s: failed (line=%d)\n" , - ioc->name, __func__, __LINE__); +ioc_err (ioc,"%s: failed (line=%d)\n" , __func__, __LINE__);return ; }spin_lock_irqsave (&ioc->ioc_reset_in_progress_lock, flags);@@ -700,8 +694,7 @@ mpt3sas_base_stop_watchdog(struct MPT3SAS_ADAPTER *ioc)void mpt3sas_base_fault_info (struct MPT3SAS_ADAPTER *ioc ,u16 fault_code) { -pr_err (MPT3SAS_FMT "fault_state(0x%04x)!\n" , - ioc->name, fault_code); +ioc_err (ioc,"fault_state(0x%04x)!\n" , fault_code); }/** @@ -728,8 +721,7 @@ mpt3sas_halt_firmware(struct MPT3SAS_ADAPTER *ioc)mpt3sas_base_fault_info (ioc , doorbell); else {writel (0xC0FFEE00 , &ioc->chip->Doorbell); -pr_err (MPT3SAS_FMT "Firmware is halted due to command timeout\n" , - ioc->name); +ioc_err (ioc,"Firmware is halted due to command timeout\n" ); }if (ioc->fwfault_debug ==2 )@@ -956,8 +948,8 @@ _base_sas_ioc_info(struct MPT3SAS_ADAPTER *ioc, MPI2DefaultReply_t *mpi_reply,break ; } -pr_warn (MPT3SAS_FMT "ioc_status: %s(0x%04x), request(0x%p),(%s)\n" , - ioc->name, desc, ioc_status, request_hdr, func_str); +ioc_warn (ioc,"ioc_status: %s(0x%04x), request(0x%p),(%s)\n" , + desc, ioc_status, request_hdr, func_str);_debug_dump_mf (request_hdr, frame_sz/4 ); }@@ -1003,9 +995,9 @@ _base_display_event_data(struct MPT3SAS_ADAPTER *ioc, {Mpi2EventDataSasDiscovery_t *event_data = (Mpi2EventDataSasDiscovery_t *)mpi_reply->EventData; -pr_info (MPT3SAS_FMT "Discovery: (%s)" , ioc->name, - (event_data->ReasonCode ==MPI2_EVENT_SAS_DISC_RC_STARTED ) ? -"start" :"stop" ); +ioc_info (ioc,"Discovery: (%s)" , + event_data->ReasonCode ==MPI2_EVENT_SAS_DISC_RC_STARTED ? +"start" :"stop" );if (event_data->DiscoveryStatus)pr_cont (" discovery_status(0x%08x)" ,le32_to_cpu (event_data->DiscoveryStatus));@@ -1059,14 +1051,13 @@ _base_display_event_data(struct MPT3SAS_ADAPTER *ioc, {Mpi26EventDataPCIeEnumeration_t *event_data = (Mpi26EventDataPCIeEnumeration_t *)mpi_reply->EventData; -pr_info (MPT3SAS_FMT "PCIE Enumeration: (%s)" , ioc->name, - (event_data->ReasonCode == -MPI26_EVENT_PCIE_ENUM_RC_STARTED ) ? -"start" :"stop" ); +ioc_info (ioc,"PCIE Enumeration: (%s)" , + event_data->ReasonCode ==MPI26_EVENT_PCIE_ENUM_RC_STARTED ? +"start" :"stop" );if (event_data->EnumerationStatus) -pr_info ("enumeration_status(0x%08x)" , -le32_to_cpu (event_data->EnumerationStatus)); -pr_info ("\n" ); +pr_cont ("enumeration_status(0x%08x)" , +le32_to_cpu (event_data->EnumerationStatus)); +pr_cont ("\n" );return ; }case MPI2_EVENT_PCIE_TOPOLOGY_CHANGE_LIST :@@ -1077,7 +1068,7 @@ _base_display_event_data(struct MPT3SAS_ADAPTER *ioc,if (!desc)return ; -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, desc); +ioc_info (ioc,"%s\n" , desc); }/** @@ -1128,11 +1119,9 @@ _base_sas_log_info(struct MPT3SAS_ADAPTER *ioc , u32 log_info)break ; } -pr_warn (MPT3SAS_FMT -"log_info(0x%08x): originator(%s), code(0x%02x), sub_code(0x%04x)\n" , - ioc->name, log_info, - originator_str, sas_loginfo.dw.code, - sas_loginfo.dw.subcode); +ioc_warn (ioc,"log_info(0x%08x): originator(%s), code(0x%02x), sub_code(0x%04x)\n" , + log_info, + originator_str, sas_loginfo.dw.code, sas_loginfo.dw.subcode); }/** @@ -1152,8 +1141,8 @@ _base_display_reply_info(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, mpi_reply =mpt3sas_base_get_reply_virt_addr (ioc, reply);if (unlikely (!mpi_reply)) { -pr_err (MPT3SAS_FMT "mpi_reply not valid at %s:%d/%s()!\n" , - ioc->name, __FILE__, __LINE__, __func__); +ioc_err (ioc,"mpi_reply not valid at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__);return ; } ioc_status =le16_to_cpu (mpi_reply->IOCStatus);@@ -1249,9 +1238,9 @@ _base_async_event(struct MPT3SAS_ADAPTER *ioc, u8 msix_index, u32 reply) delayed_event_ack->EventContext = mpi_reply->EventContext;list_add_tail (&delayed_event_ack->list, &ioc->delayed_event_ack_list); -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"DELAYED: EVENT ACK: event (0x%04x)\n" , - ioc->name,le16_to_cpu (mpi_reply->Event))); +dewtprintk (ioc, +ioc_info (ioc,"DELAYED: EVENT ACK: event (0x%04x)\n" , +le16_to_cpu (mpi_reply->Event))); goto out; }@@ -2598,9 +2587,8 @@ _base_config_dma_addressing(struct MPT3SAS_ADAPTER *ioc, struct pci_dev *pdev) out:si_meminfo (&s); -pr_info (MPT3SAS_FMT -"%d BIT PCI BUS DMA ADDRESSING SUPPORTED, total mem (%ld kB)\n" , - ioc->name, ioc->dma_mask,convert_to_kb (s.totalram)); +ioc_info (ioc,"%d BIT PCI BUS DMA ADDRESSING SUPPORTED, total mem (%ld kB)\n" , + ioc->dma_mask,convert_to_kb (s.totalram));return 0 ; }@@ -2639,8 +2627,7 @@ _base_check_enable_msix(struct MPT3SAS_ADAPTER *ioc) base =pci_find_capability (ioc->pdev,PCI_CAP_ID_MSIX );if (!base) { -dfailprintk (ioc,pr_info (MPT3SAS_FMT "msix not supported\n" , - ioc->name)); +dfailprintk (ioc,ioc_info (ioc,"msix not supported\n" ));return -EINVAL ; }@@ -2658,9 +2645,8 @@ _base_check_enable_msix(struct MPT3SAS_ADAPTER *ioc)pci_read_config_word (ioc->pdev, base +2 , &message_control); ioc->msix_vector_count = (message_control &0x3FF ) +1 ; } -dinitprintk (ioc,pr_info (MPT3SAS_FMT -"msix is supported, vector_count(%d)\n" , - ioc->name, ioc->msix_vector_count)); +dinitprintk (ioc,ioc_info (ioc,"msix is supported, vector_count(%d)\n" , + ioc->msix_vector_count));return 0 ; }@@ -2702,8 +2688,8 @@ _base_request_irq(struct MPT3SAS_ADAPTER *ioc, u8 index) reply_q =kzalloc (sizeof (struct adapter_reply_queue ),GFP_KERNEL );if (!reply_q) { -pr_err (MPT3SAS_FMT "unable to allocate memory %d!\n" , - ioc->name, (int )sizeof (struct adapter_reply_queue )); +ioc_err (ioc,"unable to allocate memory %zu!\n" , +sizeof (struct adapter_reply_queue ));return -ENOMEM ; } reply_q->ioc = ioc;@@ -2761,8 +2747,8 @@ _base_assign_reply_queues(struct MPT3SAS_ADAPTER *ioc)const cpumask_t *mask =pci_irq_get_affinity (ioc->pdev, reply_q->msix_index);if (!mask) { -pr_warn (MPT3SAS_FMT "no affinity for msi %x\n" , - ioc->name, reply_q->msix_index); +ioc_warn (ioc,"no affinity for msi %x\n" , + reply_q->msix_index);continue ; }@@ -2857,9 +2843,9 @@ _base_enable_msix(struct MPT3SAS_ADAPTER *ioc) r =pci_alloc_irq_vectors (ioc->pdev,1 , ioc->reply_queue_count, irq_flags);if (r <0 ) { -dfailprintk (ioc,pr_info (MPT3SAS_FMT -"pci_alloc_irq_vectors failed (r=%d) !!!\n" , - ioc->name, r)); +dfailprintk (ioc, +ioc_info (ioc,"pci_alloc_irq_vectors failed (r=%d) !!!\n" , + r)); goto try_ioapic; }@@ -2882,9 +2868,9 @@ _base_enable_msix(struct MPT3SAS_ADAPTER *ioc) ioc->reply_queue_count =1 ; r =pci_alloc_irq_vectors (ioc->pdev,1 ,1 ,PCI_IRQ_LEGACY );if (r <0 ) { -dfailprintk (ioc,pr_info (MPT3SAS_FMT -"pci_alloc_irq_vector(legacy) failed (r=%d) !!!\n" , - ioc->name, r)); +dfailprintk (ioc, +ioc_info (ioc,"pci_alloc_irq_vector(legacy) failed (r=%d) !!!\n" , + r)); }else r =_base_request_irq (ioc,0 );@@ -2939,13 +2925,11 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc)phys_addr_t chip_phys =0 ;struct adapter_reply_queue *reply_q; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , - ioc->name, __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__)); ioc->bars =pci_select_bars (pdev,IORESOURCE_MEM );if (pci_enable_device_mem (pdev)) { -pr_warn (MPT3SAS_FMT "pci_enable_device_mem: failed\n" , - ioc->name); +ioc_warn (ioc,"pci_enable_device_mem: failed\n" ); ioc->bars =0 ;return -ENODEV ; }@@ -2953,8 +2937,7 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc)if (pci_request_selected_regions (pdev, ioc->bars, ioc->driver_name)) { -pr_warn (MPT3SAS_FMT "pci_request_selected_regions: failed\n" , - ioc->name); +ioc_warn (ioc,"pci_request_selected_regions: failed\n" ); ioc->bars =0 ; r = -ENODEV ; goto out_fail;@@ -2967,8 +2950,7 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc)if (_base_config_dma_addressing (ioc, pdev) !=0 ) { -pr_warn (MPT3SAS_FMT "no suitable DMA mask for %s\n" , - ioc->name,pci_name (pdev)); +ioc_warn (ioc,"no suitable DMA mask for %s\n" ,pci_name (pdev)); r = -ENODEV ; goto out_fail; }@@ -2991,8 +2973,7 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc) }if (ioc->chip ==NULL ) { -pr_err (MPT3SAS_FMT "unable to map adapter memory! " -" or resource not found\n" , ioc->name); +ioc_err (ioc,"unable to map adapter memory! or resource not found\n" ); r = -EINVAL ; goto out_fail; }@@ -3058,10 +3039,10 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc) "IO-APIC enabled"), pci_irq_vector(ioc->pdev, reply_q->msix_index)); -pr_info (MPT3SAS_FMT "iomem(%pap), mapped(0x%p), size(%d)\n" , - ioc->name, &chip_phys, ioc->chip, memap_sz); -pr_info (MPT3SAS_FMT "ioport(0x%016llx), size(%d)\n" , - ioc->name, (unsigned long long )pio_chip, pio_sz); +ioc_info (ioc,"iomem(%pap), mapped(0x%p), size(%d)\n" , + &chip_phys, ioc->chip, memap_sz); +ioc_info (ioc,"ioport(0x%016llx), size(%d)\n" , + (unsigned long long )pio_chip, pio_sz);/* Save PCI configuration state for recovery from PCI AER/EEH errors */ pci_save_state (pdev);@@ -3176,8 +3157,7 @@ mpt3sas_base_get_smid(struct MPT3SAS_ADAPTER *ioc, u8 cb_idx)spin_lock_irqsave (&ioc->scsi_lookup_lock, flags);if (list_empty (&ioc->internal_free_list)) {spin_unlock_irqrestore (&ioc->scsi_lookup_lock, flags); -pr_err (MPT3SAS_FMT "%s: smid not available\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: smid not available\n" , __func__);return 0 ; }@@ -3545,89 +3525,85 @@ _base_display_OEMs_branding(struct MPT3SAS_ADAPTER *ioc)case MPI2_MFGPAGE_DEVID_SAS2008 :switch (ioc->pdev->subsystem_device) {case MPT2SAS_INTEL_RMS2LL080_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS2LL080_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS2LL080_BRANDING );break ;case MPT2SAS_INTEL_RMS2LL040_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS2LL040_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS2LL040_BRANDING );break ;case MPT2SAS_INTEL_SSD910_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_SSD910_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_SSD910_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Intel(R) Controller: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Intel(R) Controller: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }case MPI2_MFGPAGE_DEVID_SAS2308_2 :switch (ioc->pdev->subsystem_device) {case MPT2SAS_INTEL_RS25GB008_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RS25GB008_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RS25GB008_BRANDING );break ;case MPT2SAS_INTEL_RMS25JB080_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS25JB080_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS25JB080_BRANDING );break ;case MPT2SAS_INTEL_RMS25JB040_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS25JB040_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS25JB040_BRANDING );break ;case MPT2SAS_INTEL_RMS25KB080_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS25KB080_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS25KB080_BRANDING );break ;case MPT2SAS_INTEL_RMS25KB040_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS25KB040_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS25KB040_BRANDING );break ;case MPT2SAS_INTEL_RMS25LB040_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS25LB040_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS25LB040_BRANDING );break ;case MPT2SAS_INTEL_RMS25LB080_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_INTEL_RMS25LB080_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_INTEL_RMS25LB080_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Intel(R) Controller: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Intel(R) Controller: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }case MPI25_MFGPAGE_DEVID_SAS3008 :switch (ioc->pdev->subsystem_device) {case MPT3SAS_INTEL_RMS3JC080_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_INTEL_RMS3JC080_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_INTEL_RMS3JC080_BRANDING );break ;case MPT3SAS_INTEL_RS3GC008_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_INTEL_RS3GC008_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_INTEL_RS3GC008_BRANDING );break ;case MPT3SAS_INTEL_RS3FC044_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_INTEL_RS3FC044_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_INTEL_RS3FC044_BRANDING );break ;case MPT3SAS_INTEL_RS3UC080_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_INTEL_RS3UC080_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_INTEL_RS3UC080_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Intel(R) Controller: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Intel(R) Controller: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;default : -pr_info (MPT3SAS_FMT -"Intel(R) Controller: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Intel(R) Controller: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;@@ -3636,57 +3612,54 @@ _base_display_OEMs_branding(struct MPT3SAS_ADAPTER *ioc)case MPI2_MFGPAGE_DEVID_SAS2008 :switch (ioc->pdev->subsystem_device) {case MPT2SAS_DELL_6GBPS_SAS_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING );break ;case MPT2SAS_DELL_PERC_H200_ADAPTER_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING );break ;case MPT2SAS_DELL_PERC_H200_INTEGRATED_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING );break ;case MPT2SAS_DELL_PERC_H200_MODULAR_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING );break ;case MPT2SAS_DELL_PERC_H200_EMBEDDED_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING );break ;case MPT2SAS_DELL_PERC_H200_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_PERC_H200_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_PERC_H200_BRANDING );break ;case MPT2SAS_DELL_6GBPS_SAS_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_DELL_6GBPS_SAS_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_DELL_6GBPS_SAS_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Dell 6Gbps HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Dell 6Gbps HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;case MPI25_MFGPAGE_DEVID_SAS3008 :switch (ioc->pdev->subsystem_device) {case MPT3SAS_DELL_12G_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_DELL_12G_HBA_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_DELL_12G_HBA_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Dell 12Gbps HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Dell 12Gbps HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;default : -pr_info (MPT3SAS_FMT -"Dell HBA: Subsystem ID: 0x%X\n" , ioc->name, - ioc->pdev->subsystem_device); +ioc_info (ioc,"Dell HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;@@ -3695,46 +3668,42 @@ _base_display_OEMs_branding(struct MPT3SAS_ADAPTER *ioc)case MPI25_MFGPAGE_DEVID_SAS3008 :switch (ioc->pdev->subsystem_device) {case MPT3SAS_CISCO_12G_8E_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_CISCO_12G_8E_HBA_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_CISCO_12G_8E_HBA_BRANDING );break ;case MPT3SAS_CISCO_12G_8I_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_CISCO_12G_8I_HBA_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_CISCO_12G_8I_HBA_BRANDING );break ;case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;case MPI25_MFGPAGE_DEVID_SAS3108_1 :switch (ioc->pdev->subsystem_device) {case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING );break ;case MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_BRANDING - ); +ioc_info (ioc,"%s\n" , +MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;default : -pr_info (MPT3SAS_FMT -"Cisco SAS HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"Cisco SAS HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }break ;@@ -3743,43 +3712,40 @@ _base_display_OEMs_branding(struct MPT3SAS_ADAPTER *ioc)case MPI2_MFGPAGE_DEVID_SAS2004 :switch (ioc->pdev->subsystem_device) {case MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }case MPI2_MFGPAGE_DEVID_SAS2308_2 :switch (ioc->pdev->subsystem_device) {case MPT2SAS_HP_2_4_INTERNAL_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_HP_2_4_INTERNAL_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_HP_2_4_INTERNAL_BRANDING );break ;case MPT2SAS_HP_2_4_EXTERNAL_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_HP_2_4_EXTERNAL_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_HP_2_4_EXTERNAL_BRANDING );break ;case MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_BRANDING );break ;case MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_SSDID : -pr_info (MPT3SAS_FMT "%s\n" , ioc->name, -MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_BRANDING ); +ioc_info (ioc,"%s\n" , +MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_BRANDING );break ;default : -pr_info (MPT3SAS_FMT -"HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }default : -pr_info (MPT3SAS_FMT -"HP SAS HBA: Subsystem ID: 0x%X\n" , - ioc->name, ioc->pdev->subsystem_device); +ioc_info (ioc,"HP SAS HBA: Subsystem ID: 0x%X\n" , + ioc->pdev->subsystem_device);break ; }default :@@ -3806,12 +3772,10 @@ _base_display_fwpkg_version(struct MPT3SAS_ADAPTER *ioc)u16 smid, ioc_status;size_t data_length; -dinitprintk (ioc,pr_info (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));if (ioc->base_cmds.status &MPT3_CMD_PENDING ) { -pr_err (MPT3SAS_FMT "%s: internal command already in use\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: internal command already in use\n" , __func__);return -EAGAIN ; }@@ -3819,15 +3783,14 @@ _base_display_fwpkg_version(struct MPT3SAS_ADAPTER *ioc) fwpkg_data =pci_alloc_consistent (ioc->pdev, data_length, &fwpkg_data_dma);if (!fwpkg_data) { -pr_err (MPT3SAS_FMT "failure at %s:%d/%s()!\n" , - ioc->name, __FILE__, __LINE__, __func__); +ioc_err (ioc,"failure at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__);return -ENOMEM ; } smid =mpt3sas_base_get_smid (ioc, ioc->base_cb_idx);if (!smid) { -pr_err (MPT3SAS_FMT "%s: failed obtaining a smid\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: failed obtaining a smid\n" , __func__); r = -EAGAIN ; goto out; }@@ -3846,11 +3809,9 @@ _base_display_fwpkg_version(struct MPT3SAS_ADAPTER *ioc)/* Wait for 15 seconds */ wait_for_completion_timeout (&ioc->base_cmds.done,FW_IMG_HDR_READ_TIMEOUT *HZ ); -pr_info (MPT3SAS_FMT "%s: complete\n" , - ioc->name, __func__); +ioc_info (ioc,"%s: complete\n" , __func__);if (!(ioc->base_cmds.status &MPT3_CMD_COMPLETE )) { -pr_err (MPT3SAS_FMT "%s: timeout\n" , - ioc->name, __func__); +ioc_err (ioc,"%s: timeout\n" , __func__);_debug_dump_mf (mpi_request,sizeof (Mpi25FWUploadRequest_t)/4 ); r = -ETIME ;@@ -3864,13 +3825,11 @@ _base_display_fwpkg_version(struct MPT3SAS_ADAPTER *ioc)if (ioc_status ==MPI2_IOCSTATUS_SUCCESS ) { FWImgHdr = (Mpi2FWImageHeader_t *)fwpkg_data;if (FWImgHdr->PackageVersion.Word) { -pr_info (MPT3SAS_FMT "FW Package Version" -"(%02d.%02d.%02d.%02d)\n" , - ioc->name, - FWImgHdr->PackageVersion.Struct.Major, - FWImgHdr->PackageVersion.Struct.Minor, - FWImgHdr->PackageVersion.Struct.Unit, - FWImgHdr->PackageVersion.Struct.Dev); +ioc_info (ioc,"FW Package Version (%02d.%02d.%02d.%02d)\n" , + FWImgHdr->PackageVersion.Struct.Major, + FWImgHdr->PackageVersion.Struct.Minor, + FWImgHdr->PackageVersion.Struct.Unit, + FWImgHdr->PackageVersion.Struct.Dev); } }else { _debug_dump_mf(&mpi_reply,@@ -3900,18 +3859,17 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc) bios_version =le32_to_cpu (ioc->bios_pg3.BiosVersion);strncpy (desc, ioc->manu_pg0.ChipName,16 ); -pr_info (MPT3SAS_FMT "%s: FWVersion(%02d.%02d.%02d.%02d), " \ -"ChipRevision(0x%02x), BiosVersion(%02d.%02d.%02d.%02d)\n" , - ioc->name, desc, - (ioc->facts.FWVersion.Word &0xFF000000 ) >>24 , - (ioc->facts.FWVersion.Word &0x00FF0000 ) >>16 , - (ioc->facts.FWVersion.Word &0x0000FF00 ) >>8 , - ioc->facts.FWVersion.Word &0x000000FF , - ioc->pdev->revision, - (bios_version &0xFF000000 ) >>24 , - (bios_version &0x00FF0000 ) >>16 , - (bios_version &0x0000FF00 ) >>8 , - bios_version &0x000000FF ); +ioc_info (ioc,"%s: FWVersion(%02d.%02d.%02d.%02d), ChipRevision(0x%02x), BiosVersion(%02d.%02d.%02d.%02d)\n" , + desc, + (ioc->facts.FWVersion.Word &0xFF000000 ) >>24 , + (ioc->facts.FWVersion.Word &0x00FF0000 ) >>16 , + (ioc->facts.FWVersion.Word &0x0000FF00 ) >>8 , + ioc->facts.FWVersion.Word &0x000000FF , + ioc->pdev->revision, + (bios_version &0xFF000000 ) >>24 , + (bios_version &0x00FF0000 ) >>16 , + (bios_version &0x0000FF00 ) >>8 , + bios_version &0x000000FF );_base_display_OEMs_branding (ioc);@@ -3920,82 +3878,81 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc) i++; } -pr_info (MPT3SAS_FMT "Protocol=(" , ioc->name); +ioc_info (ioc,"Protocol=(" );if (ioc->facts.ProtocolFlags &MPI2_IOCFACTS_PROTOCOL_SCSI_INITIATOR ) { -pr_info ("Initiator" ); +pr_cont ("Initiator" ); i++; }if (ioc->facts.ProtocolFlags &MPI2_IOCFACTS_PROTOCOL_SCSI_TARGET ) { -pr_info ("%sTarget" , i ?"," :"" ); +pr_cont ("%sTarget" , i ?"," :"" ); i++; } i =0 ; -pr_info ("), " ); -pr_info ("Capabilities=(" ); +pr_cont ("), Capabilities=(" );if (!ioc->hide_ir_msg) {if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_INTEGRATED_RAID ) { -pr_info ("Raid" ); +pr_cont ("Raid" ); i++; } }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_TLR ) { -pr_info ("%sTLR" , i ?"," :"" ); +pr_cont ("%sTLR" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_MULTICAST ) { -pr_info ("%sMulticast" , i ?"," :"" ); +pr_cont ("%sMulticast" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_BIDIRECTIONAL_TARGET ) { -pr_info ("%sBIDI Target" , i ?"," :"" ); +pr_cont ("%sBIDI Target" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_EEDP ) { -pr_info ("%sEEDP" , i ?"," :"" ); +pr_cont ("%sEEDP" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_SNAPSHOT_BUFFER ) { -pr_info ("%sSnapshot Buffer" , i ?"," :"" ); +pr_cont ("%sSnapshot Buffer" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_DIAG_TRACE_BUFFER ) { -pr_info ("%sDiag Trace Buffer" , i ?"," :"" ); +pr_cont ("%sDiag Trace Buffer" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_EXTENDED_BUFFER ) { -pr_info ("%sDiag Extended Buffer" , i ?"," :"" ); +pr_cont ("%sDiag Extended Buffer" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_TASK_SET_FULL_HANDLING ) { -pr_info ("%sTask Set Full" , i ?"," :"" ); +pr_cont ("%sTask Set Full" , i ?"," :"" ); i++; } iounit_pg1_flags =le32_to_cpu (ioc->iounit_pg1.Flags);if (!(iounit_pg1_flags &MPI2_IOUNITPAGE1_NATIVE_COMMAND_Q_DISABLE )) { -pr_info ("%sNCQ" , i ?"," :"" ); +pr_cont ("%sNCQ" , i ?"," :"" ); i++; } -pr_info (")\n" ); +pr_cont (")\n" ); }/** @@ -4028,21 +3985,21 @@ mpt3sas_base_update_missing_delay(struct MPT3SAS_ADAPTER *ioc, sizeof(Mpi2SasIOUnit1PhyData_t)); sas_iounit_pg1 =kzalloc (sz,GFP_KERNEL );if (!sas_iounit_pg1) { -pr_err (MPT3SAS_FMT "failure at %s:%d/%s()!\n" , - ioc->name, __FILE__, __LINE__, __func__); +ioc_err (ioc,"failure at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__); goto out; }if ((mpt3sas_config_get_sas_iounit_pg1 (ioc, &mpi_reply, sas_iounit_pg1, sz))) { -pr_err (MPT3SAS_FMT "failure at %s:%d/%s()!\n" , - ioc->name, __FILE__, __LINE__, __func__); +ioc_err (ioc,"failure at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__); goto out; } ioc_status =le16_to_cpu (mpi_reply.IOCStatus) &MPI2_IOCSTATUS_MASK ;if (ioc_status !=MPI2_IOCSTATUS_SUCCESS ) { -pr_err (MPT3SAS_FMT "failure at %s:%d/%s()!\n" , - ioc->name, __FILE__, __LINE__, __func__); +ioc_err (ioc,"failure at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__); goto out; }@@ -4074,11 +4031,11 @@ mpt3sas_base_update_missing_delay(struct MPT3SAS_ADAPTER *ioc,else dmd_new = dmd &MPI2_SASIOUNIT1_REPORT_MISSING_TIMEOUT_MASK ; -pr_info (MPT3SAS_FMT "device_missing_delay: old(%d), new(%d)\n" , - ioc->name, dmd_orignal, dmd_new); -pr_info (MPT3SAS_FMT "ioc_missing_delay: old(%d), new(%d)\n" , - ioc->name, io_missing_delay_original, - io_missing_delay); +ioc_info (ioc,"device_missing_delay: old(%d), new(%d)\n" , + dmd_orignal, dmd_new); +ioc_info (ioc,"ioc_missing_delay: old(%d), new(%d)\n" , + io_missing_delay_original, + io_missing_delay); ioc->device_missing_delay = dmd_new; ioc->io_missing_delay = io_missing_delay; }@@ -4189,33 +4146,32 @@ _base_release_memo
Suganath Prabu Subramani
maintainerRe: [PATCH 3/7] mpt3sas: Convert mlsleading uses of pr_<level> with MPT3SAS_FMT
In reply to Joe PerchesHi,
Please consider this patch as Acked-by: Suganath Prabu <[email protected]>
Thanks.
Quoted 183 lines · Joe Perches
These have misordered uses of
__func__andioc->namethat could mismatchMPT3SAS_FMTand "%s: ".Convert them to ioc_<level>.
Signed-off-by Joe Perches <[email protected]>--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 50 +++++++++++++++----------------- drivers/scsi/mpt3sas/mpt3sas_transport.c | 18 ++++-------- 2 files changed, 29 insertions(+), 39 deletions(-)drivers/scsi/mpt3sas/mpt3sas_scsih.c +23
-27@@ -2627,15 +2627,13 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, u64 lun,lockdep_assert_held (&ioc->tm_cmds.mutex);if (ioc->tm_cmds.status !=MPT3_CMD_NOT_USED ) { -pr_info (MPT3SAS_FMT "%s: tm_cmd busy!!!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: tm_cmd busy!!!\n" , __func__);return FAILED ; }if (ioc->shost_recovery || ioc->remove_host || ioc->pci_error_recovery) { -pr_info (MPT3SAS_FMT "%s: host reset in progress!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: host reset in progress!\n" , __func__);return FAILED ; }@@ -3550,18 +3548,16 @@ _scsih_tm_tr_send(struct MPT3SAS_ADAPTER *ioc, u16 handle)u8 tr_method =0 ;if (ioc->pci_error_recovery) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host in pci error recovery: handle(0x%04x)\n" , - __func__, ioc->name, - handle)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host in pci error recovery: handle(0x%04x)\n" , + __func__, handle));return ; } ioc_state =mpt3sas_base_get_iocstate (ioc,1 );if (ioc_state !=MPI2_IOC_STATE_OPERATIONAL ) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host is not operational: handle(0x%04x)\n" , - __func__, ioc->name, - handle)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host is not operational: handle(0x%04x)\n" , + __func__, handle));return ; }@@ -3811,9 +3807,9 @@ _scsih_tm_tr_volume_send(struct MPT3SAS_ADAPTER *ioc, u16 handle)struct _tr_list *delayed_tr;if (ioc->pci_error_recovery) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host reset in progress!\n" , - __func__, ioc->name)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host reset in progress!\n" , + __func__));return ; }@@ -3863,9 +3859,9 @@ _scsih_tm_volume_tr_complete(struct MPT3SAS_ADAPTER *ioc, u16 smid,mpt3sas_base_get_reply_virt_addr (ioc, reply);if (ioc->shost_recovery || ioc->pci_error_recovery) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host reset in progress!\n" , - __func__, ioc->name)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host reset in progress!\n" , + __func__));return 1 ; }if (unlikely (!mpi_reply)) {@@ -3950,21 +3946,21 @@ _scsih_issue_delayed_sas_io_unit_ctrl(struct MPT3SAS_ADAPTER *ioc,unsigned long flags;if (ioc->remove_host) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host has been removed\n" , - __func__, ioc->name)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host has been removed\n" , + __func__));return ; }else if (ioc->pci_error_recovery) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host in pci error recovery\n" , - __func__, ioc->name)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host in pci error recovery\n" , + __func__));return ; } ioc_state =mpt3sas_base_get_iocstate (ioc,1 );if (ioc_state !=MPI2_IOC_STATE_OPERATIONAL ) { -dewtprintk (ioc,pr_info (MPT3SAS_FMT -"%s: host is not operational\n" , - __func__, ioc->name)); +dewtprintk (ioc, +ioc_info (ioc,"%s: host is not operational\n" , + __func__));return ; }drivers/scsi/mpt3sas/mpt3sas_transport.c +6
-13@@ -146,8 +146,7 @@ _transport_set_identify(struct MPT3SAS_ADAPTER *ioc, u16 handle,u32 ioc_status;if (ioc->shost_recovery || ioc->pci_error_recovery) { -pr_info (MPT3SAS_FMT "%s: host reset in progress!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: host reset in progress!\n" , __func__);return -EFAULT ; }@@ -308,8 +307,7 @@ _transport_expander_report_manufacture(struct MPT3SAS_ADAPTER *ioc,u16 wait_state_count;if (ioc->shost_recovery || ioc->pci_error_recovery) { -pr_info (MPT3SAS_FMT "%s: host reset in progress!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: host reset in progress!\n" , __func__);return -EFAULT ; }@@ -1088,8 +1086,7 @@ _transport_get_expander_phy_error_log(struct MPT3SAS_ADAPTER *ioc,u16 wait_state_count;if (ioc->shost_recovery || ioc->pci_error_recovery) { -pr_info (MPT3SAS_FMT "%s: host reset in progress!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: host reset in progress!\n" , __func__);return -EFAULT ; }@@ -1393,8 +1390,7 @@ _transport_expander_phy_control(struct MPT3SAS_ADAPTER *ioc,u16 wait_state_count;if (ioc->shost_recovery || ioc->pci_error_recovery) { -pr_info (MPT3SAS_FMT "%s: host reset in progress!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: host reset in progress!\n" , __func__);return -EFAULT ; }@@ -1894,8 +1890,7 @@ _transport_smp_handler(struct bsg_job *job, struct Scsi_Host *shost,unsigned int reslen =0 ;if (ioc->shost_recovery || ioc->pci_error_recovery) { -pr_info (MPT3SAS_FMT "%s: host reset in progress!\n" , - __func__, ioc->name); +ioc_info (ioc,"%s: host reset in progress!\n" , __func__); rc = -EFAULT ; goto job_done; }@@ -1975,8 +1970,7 @@ _transport_smp_handler(struct bsg_job *job, struct Scsi_Host *shost,wait_for_completion_timeout (&ioc->transport_cmds.done,10 *HZ );if (!(ioc->transport_cmds.status &MPT3_CMD_COMPLETE )) { -pr_err (MPT3SAS_FMT "%s : timeout\n" , - __func__, ioc->name); +ioc_err (ioc,"%s: timeout\n" , __func__);_debug_dump_mf (mpi_request,sizeof (Mpi2SmpPassthroughRequest_t)/4 );if (!(ioc->transport_cmds.status &MPT3_CMD_RESET )) { --2.15.0
Suganath Prabu Subramani
maintainerRe: [PATCH 4/7] mpt3sas: Convert logging uses with MPT3SAS_FMT and reply_q_name to %s:
In reply to Joe PerchesPlease consider this patch as Acked-by: Suganath Prabu <[email protected]>
Thanks.
Quoted 45 lines · Joe Perches
Convert the existing 2 uses to make the format and arguments matching more obvious.
Miscellanea:
o Move the word "enabled" into the format to trivially reduce object size
o Remove unnecessary parenthesesSigned-off-by Joe Perches <[email protected]>--- drivers/scsi/mpt3sas/mpt3sas_base.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/scsi/mpt3sas/mpt3sas_base.c +5
-6@@ -2705,7 +2705,7 @@ _base_request_irq(struct MPT3SAS_ADAPTER *ioc, u8 index) r =request_irq (pci_irq_vector (pdev, index), _base_interrupt,IRQF_SHARED , reply_q->name, reply_q);if (r) { -pr_err (MPT3SAS_FMT "unable to allocate interrupt %d!\n" , +pr_err ("%s: unable to allocate interrupt %d!\n" , reply_q->name,pci_irq_vector (pdev, index));kfree (reply_q);return -EBUSY ;@@ -3034,10 +3034,10 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc) }list_for_each_entry (reply_q, &ioc->reply_queue_list, list) -pr_info (MPT3SAS_FMT "%s: IRQ %d\n" , - reply_q->name, ((ioc->msix_enable) ?"PCI-MSI-X enabled" : -"IO-APIC enabled" ), -pci_irq_vector (ioc->pdev, reply_q->msix_index)); +pr_info ("%s: %s enabled: IRQ %d\n" , + reply_q->name, + ioc->msix_enable ?"PCI-MSI-X" :"IO-APIC" , +pci_irq_vector (ioc->pdev, reply_q->msix_index));ioc_info (ioc,"iomem(%pap), mapped(0x%p), size(%d)\n" , &chip_phys, ioc->chip, memap_sz); --2.15.0
Suganath Prabu Subramani
maintainerRe: [PATCH 5/7] mpt3sas: Remove KERN_WARNING from panic uses
In reply to Joe PerchesPlease consider this patch as Acked-by: Suganath Prabu <[email protected]>
Thanks.
Quoted 91 lines · Joe Perches
Remove the logging level as panic calls stop the machine and should always be emitted regardless of requested logging level.
These existing panic uses are perhaps inappropriate.
Miscellanea:
o Coalesce formats and convert
MPT3SAS_FMTto "%s: " to improve claritySigned-off-by Joe Perches <[email protected]>--- drivers/scsi/mpt3sas/mpt3sas_config.c | 41 +++++++++++++---------------------- 1 file changed, 15 insertions(+), 26 deletions(-)drivers/scsi/mpt3sas/mpt3sas_config.c +15
-27@@ -421,12 +421,10 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t (mpi_reply->Header.PageType & 0xF)) {_debug_dump_mf (mpi_request, ioc->request_sz/4 );_debug_dump_reply (mpi_reply, ioc->request_sz/4 ); - panic(KERN_WARNING MPT3SAS_FMT "%s: Firmware BUG:" \ -" mpi_reply mismatch: Requested PageType(0x%02x)" \ -" Reply PageType(0x%02x)\n" , \ - ioc->name, __func__, - (mpi_request->Header.PageType &0xF ), - (mpi_reply->Header.PageType & 0xF)); +panic ("%s: %s: Firmware BUG: mpi_reply mismatch: Requested PageType(0x%02x) Reply PageType(0x%02x)\n" , + ioc->name, __func__, + mpi_request->Header.PageType &0xF , + mpi_reply->Header.PageType &0xF ); } if (((mpi_request->Header.PageType & 0xF) ==@@ -434,11 +432,10 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t mpi_request->ExtPageType != mpi_reply->ExtPageType) {_debug_dump_mf (mpi_request, ioc->request_sz/4 );_debug_dump_reply (mpi_reply, ioc->request_sz/4 ); - panic(KERN_WARNING MPT3SAS_FMT "%s: Firmware BUG:" \ -" mpi_reply mismatch: Requested ExtPageType(0x%02x)" -" Reply ExtPageType(0x%02x)\n" , - ioc->name, __func__, mpi_request->ExtPageType, - mpi_reply->ExtPageType); +panic ("%s: %s: Firmware BUG: mpi_reply mismatch: Requested ExtPageType(0x%02x) Reply ExtPageType(0x%02x)\n" , + ioc->name, __func__, + mpi_request->ExtPageType, + mpi_reply->ExtPageType); } ioc_status =le16_to_cpu (mpi_reply->IOCStatus) &MPI2_IOCSTATUS_MASK ;@@ -461,14 +458,10 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t_debug_dump_reply (mpi_reply, ioc->request_sz/4 );_debug_dump_config (p,min_t (u16, mem.sz, config_page_sz)/4 ); - panic(KERN_WARNING MPT3SAS_FMT -"%s: Firmware BUG:" \ -" config page mismatch:" -" Requested PageType(0x%02x)" -" Reply PageType(0x%02x)\n" , - ioc->name, __func__, - (mpi_request->Header.PageType &0xF ), - (p[3] & 0xF)); +panic ("%s: %s: Firmware BUG: config page mismatch: Requested PageType(0x%02x) Reply PageType(0x%02x)\n" , + ioc->name, __func__, + mpi_request->Header.PageType &0xF , + p[3 ] &0xF ); } if (((mpi_request->Header.PageType & 0xF) ==@@ -478,13 +471,9 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t_debug_dump_reply (mpi_reply, ioc->request_sz/4 );_debug_dump_config (p,min_t (u16, mem.sz, config_page_sz)/4 ); - panic(KERN_WARNING MPT3SAS_FMT -"%s: Firmware BUG:" \ -" config page mismatch:" -" Requested ExtPageType(0x%02x)" -" Reply ExtPageType(0x%02x)\n" , - ioc->name, __func__, - mpi_request->ExtPageType, p[6]); +panic ("%s: %s: Firmware BUG: config page mismatch: Requested ExtPageType(0x%02x) Reply ExtPageType(0x%02x)\n" , + ioc->name, __func__, + mpi_request->ExtPageType, p[6 ]); } } memcpy(config_page, mem.page, min_t(u16, mem.sz, --2.15.0
Suganath Prabu Subramani
maintainerRe: [PATCH 6/7] mpt3sas: Convert logging uses with MPT3SAS_FMT without logging levels
In reply to Joe PerchesHi,
Please consider this patch as Acked-by: Suganath Prabu <[email protected]>
Thanks.
Quoted 156 lines · Joe Perches
Convert these uses to ioc_<level> where appropriate.
Signed-off-by Joe Perches <[email protected]>--- drivers/scsi/mpt3sas/mpt3sas_base.c | 41 +++++++++++++++----------------- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 12 +++++----- drivers/scsi/mpt3sas/mpt3sas_transport.c | 6 ++--- 3 files changed, 28 insertions(+), 31 deletions(-)drivers/scsi/mpt3sas/mpt3sas_base.c +19
-22@@ -2819,9 +2819,8 @@ _base_enable_msix(struct MPT3SAS_ADAPTER *ioc) ioc->reply_queue_count =min_t (int, ioc->cpu_count, ioc->msix_vector_count); -printk (MPT3SAS_FMT "MSI-X vectors supported: %d, no of cores" -": %d, max_msix_vectors: %d\n" , ioc->name, ioc->msix_vector_count, - ioc->cpu_count, max_msix_vectors); +ioc_info (ioc,"MSI-X vectors supported: %d, no of cores: %d, max_msix_vectors: %d\n" , + ioc->msix_vector_count, ioc->cpu_count, max_msix_vectors);if (!ioc->rdpq_array_enable && max_msix_vectors ==-1 ) local_max_msix_vectors = (reset_devices) ?1 :8 ;@@ -2886,8 +2885,7 @@ mpt3sas_base_unmap_resources(struct MPT3SAS_ADAPTER *ioc) {struct pci_dev *pdev = ioc->pdev; -dexitprintk (ioc,printk (MPT3SAS_FMT "%s\n" , - ioc->name, __func__)); +dexitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));_base_free_irq (ioc);_base_disable_msix (ioc);@@ -3007,9 +3005,8 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc) ioc->combined_reply_index_count, sizeof(resource_size_t *), GFP_KERNEL);if (!ioc->replyPostRegisterIndex) { -dfailprintk (ioc,printk (MPT3SAS_FMT -"allocation for reply Post Register Index failed!!!\n" , - ioc->name)); +dfailprintk (ioc, +ioc_warn (ioc,"allocation for reply Post Register Index failed!!!\n" )); r = -ENOMEM ; goto out_fail; }@@ -5438,26 +5435,26 @@ _base_wait_for_iocstate(struct MPT3SAS_ADAPTER *ioc, int timeout)u32 ioc_state;int rc; -dinitprintk (ioc,printk (MPT3SAS_FMT "%s\n" , ioc->name, - __func__)); +dinitprintk (ioc,ioc_info (ioc,"%s\n" , __func__));if (ioc->pci_error_recovery) { -dfailprintk (ioc,printk (MPT3SAS_FMT -"%s: host in pci error recovery\n" , ioc->name, __func__)); +dfailprintk (ioc, +ioc_info (ioc,"%s: host in pci error recovery\n" , + __func__));return -EFAULT ; } ioc_state =mpt3sas_base_get_iocstate (ioc,0 ); -dhsprintk (ioc,printk (MPT3SAS_FMT "%s: ioc_state(0x%08x)\n" , - ioc->name, __func__, ioc_state)); +dhsprintk (ioc, +ioc_info (ioc,"%s: ioc_state(0x%08x)\n" , + __func__, ioc_state));if (((ioc_state &MPI2_IOC_STATE_MASK ) ==MPI2_IOC_STATE_READY ) || (ioc_state &MPI2_IOC_STATE_MASK ) ==MPI2_IOC_STATE_OPERATIONAL )return 0 ;if (ioc_state &MPI2_DOORBELL_USED ) { -dhsprintk (ioc,printk (MPT3SAS_FMT -"unexpected doorbell active!\n" , ioc->name)); +dhsprintk (ioc,ioc_info (ioc,"unexpected doorbell active!\n" )); goto issue_diag_reset; }@@ -5469,9 +5466,9 @@ _base_wait_for_iocstate(struct MPT3SAS_ADAPTER *ioc, int timeout) ioc_state =_base_wait_on_iocstate (ioc,MPI2_IOC_STATE_READY , timeout);if (ioc_state) { -dfailprintk (ioc,printk (MPT3SAS_FMT -"%s: failed going to ready state (ioc_state=0x%x)\n" , - ioc->name, __func__, ioc_state)); +dfailprintk (ioc, +ioc_info (ioc,"%s: failed going to ready state (ioc_state=0x%x)\n" , + __func__, ioc_state));return -EFAULT ; }@@ -5498,9 +5495,9 @@ _base_get_ioc_facts(struct MPT3SAS_ADAPTER *ioc) r =_base_wait_for_iocstate (ioc,10 );if (r) { -dfailprintk (ioc,printk (MPT3SAS_FMT -"%s: failed getting to correct state\n" , - ioc->name, __func__)); +dfailprintk (ioc, +ioc_info (ioc,"%s: failed getting to correct state\n" , + __func__));return r; } mpi_reply_sz =sizeof (Mpi2IOCFactsReply_t);drivers/scsi/mpt3sas/mpt3sas_scsih.c +6
-6@@ -4999,16 +4999,16 @@ _scsih_turn_off_pfa_led(struct MPT3SAS_ADAPTER *ioc, mpi_request.Flags =MPI2_SEP_REQ_FLAGS_ENCLOSURE_SLOT_ADDRESS ;if ((mpt3sas_base_scsi_enclosure_processor (ioc, &mpi_reply, &mpi_request)) !=0 ) { -printk (MPT3SAS_FMT "failure at %s:%d/%s()!\n" , ioc->name, - __FILE__, __LINE__, __func__); +ioc_err (ioc,"failure at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__);return ; }if (mpi_reply.IOCStatus || mpi_reply.IOCLogInfo) { -dewtprintk (ioc,printk (MPT3SAS_FMT -"enclosure_processor: ioc_status (0x%04x), loginfo(0x%08x)\n" , - ioc->name,le16_to_cpu (mpi_reply.IOCStatus), -le32_to_cpu (mpi_reply.IOCLogInfo))); +dewtprintk (ioc, +ioc_info (ioc,"enclosure_processor: ioc_status (0x%04x), loginfo(0x%08x)\n" , +le16_to_cpu (mpi_reply.IOCStatus), +le32_to_cpu (mpi_reply.IOCLogInfo)));return ; } }drivers/scsi/mpt3sas/mpt3sas_transport.c +3
-4@@ -717,9 +717,9 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, sas_device =mpt3sas_get_sdev_by_addr (ioc, mpt3sas_port->remote_identify.sas_address);if (!sas_device) { -dfailprintk (ioc,printk (MPT3SAS_FMT -"failure at %s:%d/%s()!\n" , - ioc->name, __FILE__, __LINE__, __func__)); +dfailprintk (ioc, +ioc_info (ioc,"failure at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__)); goto out_fail; } sas_device->pend_sas_rphy_add =1 ; --2.15.0
Suganath Prabu Subramani
maintainerRe: [PATCH 7/7] mpt3sas: Remove unused macro MPT3SAS_FMT
In reply to Joe PerchesHi,
Please consider this patch as Acked-by: Suganath Prabu <[email protected]>
Thanks.
Quoted 24 lines · Joe Perches
All the uses have been removed, delete the macro.
Signed-off-by Joe Perches <[email protected]>--- drivers/scsi/mpt3sas/mpt3sas_base.h | 2 -- 1 file changed, 2 deletions(-)drivers/scsi/mpt3sas/mpt3sas_base.h +0
-3@@ -158,8 +158,6 @@ struct mpt3sas_nvme_cmd {/* * logging format */ -#define MPT3SAS_FMT "%s: " -#define ioc_err (ioc, fmt, ...) \ pr_err("%s: " fmt, (ioc)->name, ##__VA_ARGS__)#define ioc_notice (ioc, fmt, ...) \ --2.15.0
Martin K. Petersen
AppliedJoe,
Quoted 7 lines
Several defects exist in the logging uses
o Missing KERN_<LEVEL>
o Unnecessary KERN_<LEVEL> uses with panic
o MismatchedMPT3SAS_FMTand %s: with name and__func__Correct these defects and perhaps add some clarity to the logging.
Applied to 4.20/scsi-queue, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Quoted 11 lines · Martin K. Petersen
Joe,
Quoted 7 lines
Several defects exist in the logging uses
o Missing KERN_<LEVEL>
o Unnecessary KERN_<LEVEL> uses with panic
o MismatchedMPT3SAS_FMTand %s: with name and__func__Correct these defects and perhaps add some clarity to the logging.
Applied to 4.20/scsi-queue, thanks!
Is this branch also applied to Stephen Rothwell's -next?
Joe,
Quoted 3 lines
Quoted 1 line
Applied to 4.20/scsi-queue, thanks!
Is this branch also applied to Stephen Rothwell's -next?
Yes.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Quoted 7 lines · Martin K. Petersen
Joe,
Quoted 3 lines
Quoted 1 line
Applied to 4.20/scsi-queue, thanks!
Is this branch also applied to Stephen Rothwell's -next?
Yes.
Via what tree? It doesn't seem directly pulled.
Joe,
Quoted 1 line
Via what tree? It doesn't seem directly pulled.
Stephen pulls both my for-next and my fixes branches.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering