android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

megaraid_sas: use dev_printk when possible

Browse Source 
Use dev_printk() when possible to make messages more useful.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Sumit Saxena <sumit.saxena@avagotech.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
This commit is contained in:
Bjorn Helgaas
2015-07-07 15:52:34 -05:00
committed by James Bottomley
parent 3b8a1ba378
commit 1be1825453
2 changed files with 196 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

304
drivers/scsi/megaraid/megaraid_sas_base.c
View File

File diff suppressed because it is too large Load Diff

95
drivers/scsi/megaraid/megaraid_sas_fusion.c
View File

@ -221,7 +221,7 @@ static void megasas_teardown_frame_pool_fusion(
struct megasas_cmd_fusion *cmd; struct megasas_cmd_fusion *cmd;
if (!fusion->sg_dma_pool || !fusion->sense_dma_pool) { if (!fusion->sg_dma_pool || !fusion->sense_dma_pool) {
printk(KERN_ERR "megasas: dma pool is null. SG Pool %p, " dev_err(&instance->pdev->dev, "dma pool is null. SG Pool %p, "
"sense pool : %p\n", fusion->sg_dma_pool, "sense pool : %p\n", fusion->sg_dma_pool,
fusion->sense_dma_pool); fusion->sense_dma_pool);
return; return;
@ -332,8 +332,7 @@ static int megasas_create_frame_pool_fusion(struct megasas_instance *instance)
total_sz_chain_frame, 4, total_sz_chain_frame, 4,
0); 0);
if (!fusion->sg_dma_pool) { if (!fusion->sg_dma_pool) {
printk(KERN_DEBUG "megasas: failed to setup request pool " dev_printk(KERN_DEBUG, &instance->pdev->dev, "failed to setup request pool fusion\n");
"fusion\n");
return -ENOMEM; return -ENOMEM;
} }
fusion->sense_dma_pool = pci_pool_create("megasas sense pool fusion", fusion->sense_dma_pool = pci_pool_create("megasas sense pool fusion",
@ -341,8 +340,7 @@ static int megasas_create_frame_pool_fusion(struct megasas_instance *instance)
SCSI_SENSE_BUFFERSIZE, 64, 0); SCSI_SENSE_BUFFERSIZE, 64, 0);
if (!fusion->sense_dma_pool) { if (!fusion->sense_dma_pool) {
printk(KERN_DEBUG "megasas: failed to setup sense pool " dev_printk(KERN_DEBUG, &instance->pdev->dev, "failed to setup sense pool fusion\n");
"fusion\n");
pci_pool_destroy(fusion->sg_dma_pool); pci_pool_destroy(fusion->sg_dma_pool);
fusion->sg_dma_pool = NULL; fusion->sg_dma_pool = NULL;
return -ENOMEM; return -ENOMEM;
@ -366,7 +364,7 @@ static int megasas_create_frame_pool_fusion(struct megasas_instance *instance)
* whatever has been allocated * whatever has been allocated
*/ */
if (!cmd->sg_frame || !cmd->sense) { if (!cmd->sg_frame || !cmd->sense) {
printk(KERN_DEBUG "megasas: pci_pool_alloc failed\n"); dev_printk(KERN_DEBUG, &instance->pdev->dev, "pci_pool_alloc failed\n");
megasas_teardown_frame_pool_fusion(instance); megasas_teardown_frame_pool_fusion(instance);
return -ENOMEM; return -ENOMEM;
} }
@ -412,7 +410,7 @@ megasas_alloc_cmds_fusion(struct megasas_instance *instance)
&fusion->req_frames_desc_phys, GFP_KERNEL); &fusion->req_frames_desc_phys, GFP_KERNEL);
if (!fusion->req_frames_desc) { if (!fusion->req_frames_desc) {
printk(KERN_ERR "megasas; Could not allocate memory for " dev_err(&instance->pdev->dev, "Could not allocate memory for "
"request_frames\n"); "request_frames\n");
goto fail_req_desc; goto fail_req_desc;
} }
@ -423,7 +421,7 @@ megasas_alloc_cmds_fusion(struct megasas_instance *instance)
fusion->reply_alloc_sz * count, 16, 0); fusion->reply_alloc_sz * count, 16, 0);
if (!fusion->reply_frames_desc_pool) { if (!fusion->reply_frames_desc_pool) {
printk(KERN_ERR "megasas; Could not allocate memory for " dev_err(&instance->pdev->dev, "Could not allocate memory for "
"reply_frame pool\n"); "reply_frame pool\n");
goto fail_reply_desc; goto fail_reply_desc;
} }
@ -432,7 +430,7 @@ megasas_alloc_cmds_fusion(struct megasas_instance *instance)
pci_pool_alloc(fusion->reply_frames_desc_pool, GFP_KERNEL, pci_pool_alloc(fusion->reply_frames_desc_pool, GFP_KERNEL,
&fusion->reply_frames_desc_phys); &fusion->reply_frames_desc_phys);
if (!fusion->reply_frames_desc) { if (!fusion->reply_frames_desc) {
printk(KERN_ERR "megasas; Could not allocate memory for " dev_err(&instance->pdev->dev, "Could not allocate memory for "
"reply_frame pool\n"); "reply_frame pool\n");
pci_pool_destroy(fusion->reply_frames_desc_pool); pci_pool_destroy(fusion->reply_frames_desc_pool);
goto fail_reply_desc; goto fail_reply_desc;
@ -449,7 +447,7 @@ megasas_alloc_cmds_fusion(struct megasas_instance *instance)
fusion->io_frames_alloc_sz, 16, 0); fusion->io_frames_alloc_sz, 16, 0);
if (!fusion->io_request_frames_pool) { if (!fusion->io_request_frames_pool) {
printk(KERN_ERR "megasas: Could not allocate memory for " dev_err(&instance->pdev->dev, "Could not allocate memory for "
"io_request_frame pool\n"); "io_request_frame pool\n");
goto fail_io_frames; goto fail_io_frames;
} }
@ -458,7 +456,7 @@ megasas_alloc_cmds_fusion(struct megasas_instance *instance)
pci_pool_alloc(fusion->io_request_frames_pool, GFP_KERNEL, pci_pool_alloc(fusion->io_request_frames_pool, GFP_KERNEL,
&fusion->io_request_frames_phys); &fusion->io_request_frames_phys);
if (!fusion->io_request_frames) { if (!fusion->io_request_frames) {
printk(KERN_ERR "megasas: Could not allocate memory for " dev_err(&instance->pdev->dev, "Could not allocate memory for "
"io_request_frames frames\n"); "io_request_frames frames\n");
pci_pool_destroy(fusion->io_request_frames_pool); pci_pool_destroy(fusion->io_request_frames_pool);
goto fail_io_frames; goto fail_io_frames;
@ -473,7 +471,7 @@ megasas_alloc_cmds_fusion(struct megasas_instance *instance)
* max_cmd, GFP_KERNEL); * max_cmd, GFP_KERNEL);
if (!fusion->cmd_list) { if (!fusion->cmd_list) {
printk(KERN_DEBUG "megasas: out of memory. Could not alloc " dev_printk(KERN_DEBUG, &instance->pdev->dev, "out of memory. Could not alloc "
"memory for cmd_list_fusion\n"); "memory for cmd_list_fusion\n");
goto fail_cmd_list; goto fail_cmd_list;
} }
@ -483,7 +481,7 @@ megasas_alloc_cmds_fusion(struct megasas_instance *instance)
fusion->cmd_list[i] = kmalloc(sizeof(struct megasas_cmd_fusion), fusion->cmd_list[i] = kmalloc(sizeof(struct megasas_cmd_fusion),
GFP_KERNEL); GFP_KERNEL);
if (!fusion->cmd_list[i]) { if (!fusion->cmd_list[i]) {
printk(KERN_ERR "Could not alloc cmd list fusion\n"); dev_err(&instance->pdev->dev, "Could not alloc cmd list fusion\n");
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
kfree(fusion->cmd_list[j]); kfree(fusion->cmd_list[j]);
@ -527,7 +525,7 @@ megasas_alloc_cmds_fusion(struct megasas_instance *instance)
* Create a frame pool and assign one frame to each cmd * Create a frame pool and assign one frame to each cmd
*/ */
if (megasas_create_frame_pool_fusion(instance)) { if (megasas_create_frame_pool_fusion(instance)) {
printk(KERN_DEBUG "megasas: Error creating frame DMA pool\n"); dev_printk(KERN_DEBUG, &instance->pdev->dev, "Error creating frame DMA pool\n");
megasas_free_cmds_fusion(instance); megasas_free_cmds_fusion(instance);
goto fail_req_desc; goto fail_req_desc;
} }
@ -613,7 +611,7 @@ megasas_ioc_init_fusion(struct megasas_instance *instance)
cmd = megasas_get_cmd(instance); cmd = megasas_get_cmd(instance);
if (!cmd) { if (!cmd) {
printk(KERN_ERR "Could not allocate cmd for INIT Frame\n"); dev_err(&instance->pdev->dev, "Could not allocate cmd for INIT Frame\n");
ret = 1; ret = 1;
goto fail_get_cmd; goto fail_get_cmd;
} }
@ -624,7 +622,7 @@ megasas_ioc_init_fusion(struct megasas_instance *instance)
&ioc_init_handle, GFP_KERNEL); &ioc_init_handle, GFP_KERNEL);
if (!IOCInitMessage) { if (!IOCInitMessage) {
printk(KERN_ERR "Could not allocate memory for " dev_err(&instance->pdev->dev, "Could not allocate memory for "
"IOCInitMessage\n"); "IOCInitMessage\n");
ret = 1; ret = 1;
goto fail_fw_init; goto fail_fw_init;
@ -714,7 +712,7 @@ megasas_ioc_init_fusion(struct megasas_instance *instance)
ret = 1; ret = 1;
goto fail_fw_init; goto fail_fw_init;
} }
printk(KERN_ERR "megasas:IOC Init cmd success\n"); dev_err(&instance->pdev->dev, "Init cmd success\n");
ret = 0; ret = 0;
@ -757,7 +755,7 @@ megasas_get_ld_map_info(struct megasas_instance *instance)
cmd = megasas_get_cmd(instance); cmd = megasas_get_cmd(instance);
if (!cmd) { if (!cmd) {
printk(KERN_DEBUG "megasas: Failed to get cmd for map info.\n"); dev_printk(KERN_DEBUG, &instance->pdev->dev, "Failed to get cmd for map info\n");
return -ENOMEM; return -ENOMEM;
} }
@ -776,7 +774,7 @@ megasas_get_ld_map_info(struct megasas_instance *instance)
ci_h = fusion->ld_map_phys[(instance->map_id & 1)]; ci_h = fusion->ld_map_phys[(instance->map_id & 1)];
if (!ci) { if (!ci) {
printk(KERN_DEBUG "Failed to alloc mem for ld_map_info\n"); dev_printk(KERN_DEBUG, &instance->pdev->dev, "Failed to alloc mem for ld_map_info\n");
megasas_return_cmd(instance, cmd); megasas_return_cmd(instance, cmd);
return -ENOMEM; return -ENOMEM;
} }
@ -851,8 +849,7 @@ megasas_sync_map_info(struct megasas_instance *instance)
cmd = megasas_get_cmd(instance); cmd = megasas_get_cmd(instance);
if (!cmd) { if (!cmd) {
printk(KERN_DEBUG "megasas: Failed to get cmd for sync" dev_printk(KERN_DEBUG, &instance->pdev->dev, "Failed to get cmd for sync info\n");
"info.\n");
return -ENOMEM; return -ENOMEM;
} }
@ -1097,7 +1094,7 @@ megasas_init_adapter_fusion(struct megasas_instance *instance)
&fusion->ld_map_phys[i], &fusion->ld_map_phys[i],
GFP_KERNEL); GFP_KERNEL);
if (!fusion->ld_map[i]) { if (!fusion->ld_map[i]) {
printk(KERN_ERR "megasas: Could not allocate memory " dev_err(&instance->pdev->dev, "Could not allocate memory "
"for map info\n"); "for map info\n");
goto fail_map_info; goto fail_map_info;
} }
@ -1162,7 +1159,7 @@ map_cmd_status(struct megasas_cmd_fusion *cmd, u8 status, u8 ext_status)
cmd->scmd->result = DID_IMM_RETRY << 16; cmd->scmd->result = DID_IMM_RETRY << 16;
break; break;
default: default:
printk(KERN_DEBUG "megasas: FW status %#x\n", status); dev_printk(KERN_DEBUG, &cmd->instance->pdev->dev, "FW status %#x\n", status);
cmd->scmd->result = DID_ERROR << 16; cmd->scmd->result = DID_ERROR << 16;
break; break;
} }
@ -1851,7 +1848,7 @@ megasas_build_io_fusion(struct megasas_instance *instance,
&io_request->SGL, cmd); &io_request->SGL, cmd);
if (sge_count > instance->max_num_sge) { if (sge_count > instance->max_num_sge) {
printk(KERN_ERR "megasas: Error. sge_count (0x%x) exceeds " dev_err(&instance->pdev->dev, "Error. sge_count (0x%x) exceeds "
"max (0x%x) allowed\n", sge_count, "max (0x%x) allowed\n", sge_count,
instance->max_num_sge); instance->max_num_sge);
return 1; return 1;
@ -1885,7 +1882,7 @@ megasas_get_request_descriptor(struct megasas_instance *instance, u16 index)
struct fusion_context *fusion; struct fusion_context *fusion;
if (index >= instance->max_fw_cmds) { if (index >= instance->max_fw_cmds) {
printk(KERN_ERR "megasas: Invalid SMID (0x%x)request for " dev_err(&instance->pdev->dev, "Invalid SMID (0x%x)request for "
"descriptor for scsi%d\n", index, "descriptor for scsi%d\n", index,
instance->host->host_no); instance->host->host_no);
return NULL; return NULL;
@ -1927,7 +1924,7 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance,
if (megasas_build_io_fusion(instance, scmd, cmd)) { if (megasas_build_io_fusion(instance, scmd, cmd)) {
megasas_return_cmd_fusion(instance, cmd); megasas_return_cmd_fusion(instance, cmd);
printk(KERN_ERR "megasas: Error building command.\n"); dev_err(&instance->pdev->dev, "Error building command\n");
cmd->request_desc = NULL; cmd->request_desc = NULL;
return 1; return 1;
} }
@ -1937,7 +1934,7 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance,
if (cmd->io_request->ChainOffset != 0 && if (cmd->io_request->ChainOffset != 0 &&
cmd->io_request->ChainOffset != 0xF) cmd->io_request->ChainOffset != 0xF)
printk(KERN_ERR "megasas: The chain offset value is not " dev_err(&instance->pdev->dev, "The chain offset value is not "
"correct : %x\n", cmd->io_request->ChainOffset); "correct : %x\n", cmd->io_request->ChainOffset);
/* /*
@ -2025,7 +2022,7 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex)
if (reply_descript_type == if (reply_descript_type ==
MPI2_RPY_DESCRIPT_FLAGS_SCSI_IO_SUCCESS) { MPI2_RPY_DESCRIPT_FLAGS_SCSI_IO_SUCCESS) {
if (megasas_dbg_lvl == 5) if (megasas_dbg_lvl == 5)
printk(KERN_ERR "\nmegasas: FAST Path " dev_err(&instance->pdev->dev, "\nFAST Path "
"IO Success\n"); "IO Success\n");
} }
/* Fall thru and complete IO */ /* Fall thru and complete IO */
@ -2186,7 +2183,7 @@ irqreturn_t megasas_isr_fusion(int irq, void *devp)
else if (fw_state == MFI_STATE_FAULT) else if (fw_state == MFI_STATE_FAULT)
schedule_work(&instance->work_init); schedule_work(&instance->work_init);
} else if (fw_state == MFI_STATE_FAULT) { } else if (fw_state == MFI_STATE_FAULT) {
printk(KERN_WARNING "megaraid_sas: Iop2SysDoorbellInt" dev_warn(&instance->pdev->dev, "Iop2SysDoorbellInt"
"for scsi%d\n", instance->host->host_no); "for scsi%d\n", instance->host->host_no);
schedule_work(&instance->work_init); schedule_work(&instance->work_init);
} }
@ -2269,7 +2266,7 @@ build_mpt_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd)
u16 index; u16 index;
if (build_mpt_mfi_pass_thru(instance, cmd)) { if (build_mpt_mfi_pass_thru(instance, cmd)) {
printk(KERN_ERR "Couldn't build MFI pass thru cmd\n"); dev_err(&instance->pdev->dev, "Couldn't build MFI pass thru cmd\n");
return NULL; return NULL;
} }
@ -2303,7 +2300,7 @@ megasas_issue_dcmd_fusion(struct megasas_instance *instance,
req_desc = build_mpt_cmd(instance, cmd); req_desc = build_mpt_cmd(instance, cmd);
if (!req_desc) { if (!req_desc) {
printk(KERN_ERR "Couldn't issue MFI pass thru cmd\n"); dev_err(&instance->pdev->dev, "Couldn't issue MFI pass thru cmd\n");
return; return;
} }
megasas_fire_cmd_fusion(instance, req_desc); megasas_fire_cmd_fusion(instance, req_desc);
@ -2413,7 +2410,7 @@ int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance,
fw_state = instance->instancet->read_fw_status_reg( fw_state = instance->instancet->read_fw_status_reg(
instance->reg_set) & MFI_STATE_MASK; instance->reg_set) & MFI_STATE_MASK;
if (fw_state == MFI_STATE_FAULT) { if (fw_state == MFI_STATE_FAULT) {
printk(KERN_WARNING "megasas: Found FW in FAULT state," dev_warn(&instance->pdev->dev, "Found FW in FAULT state,"
" will reset adapter scsi%d.\n", " will reset adapter scsi%d.\n",
instance->host->host_no); instance->host->host_no);
retval = 1; retval = 1;
@ -2436,7 +2433,7 @@ int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance,
hb_seconds_missed++; hb_seconds_missed++;
if (hb_seconds_missed == if (hb_seconds_missed ==
(MEGASAS_SRIOV_HEARTBEAT_INTERVAL_VF/HZ)) { (MEGASAS_SRIOV_HEARTBEAT_INTERVAL_VF/HZ)) {
printk(KERN_WARNING "megasas: SR-IOV:" dev_warn(&instance->pdev->dev, "SR-IOV:"
" Heartbeat never completed " " Heartbeat never completed "
" while polling during I/O " " while polling during I/O "
" timeout handling for " " timeout handling for "
@ -2454,7 +2451,7 @@ int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance,
goto out; goto out;
if (!(i % MEGASAS_RESET_NOTICE_INTERVAL)) { if (!(i % MEGASAS_RESET_NOTICE_INTERVAL)) {
printk(KERN_NOTICE "megasas: [%2d]waiting for %d " dev_notice(&instance->pdev->dev, "[%2d]waiting for %d "
"commands to complete for scsi%d\n", i, "commands to complete for scsi%d\n", i,
outstanding, instance->host->host_no); outstanding, instance->host->host_no);
megasas_complete_cmd_dpc_fusion( megasas_complete_cmd_dpc_fusion(
@ -2464,7 +2461,7 @@ int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance,
} }
if (atomic_read(&instance->fw_outstanding)) { if (atomic_read(&instance->fw_outstanding)) {
printk("megaraid_sas: pending commands remain after waiting, " dev_err(&instance->pdev->dev, "pending commands remain after waiting, "
"will reset adapter scsi%d.\n", "will reset adapter scsi%d.\n",
instance->host->host_no); instance->host->host_no);
retval = 1; retval = 1;
@ -2564,7 +2561,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int iotimeout)
mutex_lock(&instance->reset_mutex); mutex_lock(&instance->reset_mutex);
if (instance->adprecovery == MEGASAS_HW_CRITICAL_ERROR) { if (instance->adprecovery == MEGASAS_HW_CRITICAL_ERROR) {
printk(KERN_WARNING "megaraid_sas: Hardware critical error, " dev_warn(&instance->pdev->dev, "Hardware critical error, "
"returning FAILED for scsi%d.\n", "returning FAILED for scsi%d.\n",
instance->host->host_no); instance->host->host_no);
mutex_unlock(&instance->reset_mutex); mutex_unlock(&instance->reset_mutex);
@ -2618,7 +2615,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int iotimeout)
if (megasas_wait_for_outstanding_fusion(instance, iotimeout, if (megasas_wait_for_outstanding_fusion(instance, iotimeout,
&convert)) { &convert)) {
instance->adprecovery = MEGASAS_ADPRESET_SM_INFAULT; instance->adprecovery = MEGASAS_ADPRESET_SM_INFAULT;
printk(KERN_WARNING "megaraid_sas: resetting fusion " dev_warn(&instance->pdev->dev, "resetting fusion "
"adapter scsi%d.\n", instance->host->host_no); "adapter scsi%d.\n", instance->host->host_no);
if (convert) if (convert)
iotimeout = 0; iotimeout = 0;
@ -2645,7 +2642,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int iotimeout)
if (instance->disableOnlineCtrlReset || if (instance->disableOnlineCtrlReset ||
(abs_state == MFI_STATE_FAULT && !reset_adapter)) { (abs_state == MFI_STATE_FAULT && !reset_adapter)) {
/* Reset not supported, kill adapter */ /* Reset not supported, kill adapter */
printk(KERN_WARNING "megaraid_sas: Reset not supported" dev_warn(&instance->pdev->dev, "Reset not supported"
", killing adapter scsi%d.\n", ", killing adapter scsi%d.\n",
instance->host->host_no); instance->host->host_no);
megaraid_sas_kill_hba(instance); megaraid_sas_kill_hba(instance);
@ -2663,7 +2660,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int iotimeout)
instance->hb_host_mem->HB.driverCounter)) { instance->hb_host_mem->HB.driverCounter)) {
instance->hb_host_mem->HB.driverCounter = instance->hb_host_mem->HB.driverCounter =
instance->hb_host_mem->HB.fwCounter; instance->hb_host_mem->HB.fwCounter;
printk(KERN_WARNING "megasas: SR-IOV:" dev_warn(&instance->pdev->dev, "SR-IOV:"
"Late FW heartbeat update for " "Late FW heartbeat update for "
"scsi%d.\n", "scsi%d.\n",
instance->host->host_no); instance->host->host_no);
@ -2679,8 +2676,8 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int iotimeout)
abs_state = status_reg & abs_state = status_reg &
MFI_STATE_MASK; MFI_STATE_MASK;
if (abs_state == MFI_STATE_READY) { if (abs_state == MFI_STATE_READY) {
printk(KERN_WARNING "megasas" dev_warn(&instance->pdev->dev,
": SR-IOV: FW was found" "SR-IOV: FW was found"
"to be in ready state " "to be in ready state "
"for scsi%d.\n", "for scsi%d.\n",
instance->host->host_no); instance->host->host_no);
@ -2689,7 +2686,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int iotimeout)
msleep(20); msleep(20);
} }
if (abs_state != MFI_STATE_READY) { if (abs_state != MFI_STATE_READY) {
printk(KERN_WARNING "megasas: SR-IOV: " dev_warn(&instance->pdev->dev, "SR-IOV: "
"FW not in ready state after %d" "FW not in ready state after %d"
" seconds for scsi%d, status_reg = " " seconds for scsi%d, status_reg = "
"0x%x.\n", "0x%x.\n",
@ -2731,7 +2728,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int iotimeout)
host_diag = host_diag =
readl(&instance->reg_set->fusion_host_diag); readl(&instance->reg_set->fusion_host_diag);
if (retry++ == 100) { if (retry++ == 100) {
printk(KERN_WARNING "megaraid_sas: " dev_warn(&instance->pdev->dev,
"Host diag unlock failed! " "Host diag unlock failed! "
"for scsi%d\n", "for scsi%d\n",
instance->host->host_no); instance->host->host_no);
@ -2754,7 +2751,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int iotimeout)
host_diag = host_diag =
readl(&instance->reg_set->fusion_host_diag); readl(&instance->reg_set->fusion_host_diag);
if (retry++ == 1000) { if (retry++ == 1000) {
printk(KERN_WARNING "megaraid_sas: " dev_warn(&instance->pdev->dev,
"Diag reset adapter never " "Diag reset adapter never "
"cleared for scsi%d!\n", "cleared for scsi%d!\n",
instance->host->host_no); instance->host->host_no);
@ -2777,7 +2774,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int iotimeout)
instance->reg_set) & MFI_STATE_MASK; instance->reg_set) & MFI_STATE_MASK;
} }
if (abs_state <= MFI_STATE_FW_INIT) { if (abs_state <= MFI_STATE_FW_INIT) {
printk(KERN_WARNING "megaraid_sas: firmware " dev_warn(&instance->pdev->dev, "firmware "
"state < MFI_STATE_FW_INIT, state = " "state < MFI_STATE_FW_INIT, state = "
"0x%x for scsi%d\n", abs_state, "0x%x for scsi%d\n", abs_state,
instance->host->host_no); instance->host->host_no);
@ -2786,7 +2783,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int iotimeout)
/* Wait for FW to become ready */ /* Wait for FW to become ready */
if (megasas_transition_to_ready(instance, 1)) { if (megasas_transition_to_ready(instance, 1)) {
printk(KERN_WARNING "megaraid_sas: Failed to " dev_warn(&instance->pdev->dev, "Failed to "
"transition controller to ready " "transition controller to ready "
"for scsi%d.\n", "for scsi%d.\n",
instance->host->host_no); instance->host->host_no);
@ -2795,7 +2792,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int iotimeout)
megasas_reset_reply_desc(instance); megasas_reset_reply_desc(instance);
if (megasas_ioc_init_fusion(instance)) { if (megasas_ioc_init_fusion(instance)) {
printk(KERN_WARNING "megaraid_sas: " dev_warn(&instance->pdev->dev,
"megasas_ioc_init_fusion() failed!" "megasas_ioc_init_fusion() failed!"
" for scsi%d\n", " for scsi%d\n",
instance->host->host_no); instance->host->host_no);
@ -2836,7 +2833,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int iotimeout)
} }
/* Adapter reset completed successfully */ /* Adapter reset completed successfully */
printk(KERN_WARNING "megaraid_sas: Reset " dev_warn(&instance->pdev->dev, "Reset "
"successful for scsi%d.\n", "successful for scsi%d.\n",
instance->host->host_no); instance->host->host_no);
@ -2852,7 +2849,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int iotimeout)
goto out; goto out;
} }
/* Reset failed, kill the adapter */ /* Reset failed, kill the adapter */
printk(KERN_WARNING "megaraid_sas: Reset failed, killing " dev_warn(&instance->pdev->dev, "Reset failed, killing "
"adapter scsi%d.\n", instance->host->host_no); "adapter scsi%d.\n", instance->host->host_no);
megaraid_sas_kill_hba(instance); megaraid_sas_kill_hba(instance);
instance->skip_heartbeat_timer_del = 1; instance->skip_heartbeat_timer_del = 1;