hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SCSI] pmcraid: Changed driver prints to scmd/sdev_printk 

1.Changed driver prints to use scmd_printk, sdev_printk
2.Changed dev_err calls to scmd_printk for scsi related print messages

Signed-off-by: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Anil Ravindranath 2009-09-09 15:54:57 -07:00 committed by James Bottomley
parent f31491dc73
commit 348764024f
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/scsi/pmcraid.c
View File

@ -46,6 +46,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_tcq.h> #include <scsi/scsi_tcq.h>
#include <scsi/scsi_eh.h> #include <scsi/scsi_eh.h>
#include <scsi/scsi_cmnd.h> #include <scsi/scsi_cmnd.h>
@ -684,7 +685,7 @@ static void pmcraid_timeout_handler(struct pmcraid_cmd *cmd)
struct pmcraid_instance *pinstance = cmd->drv_inst; struct pmcraid_instance *pinstance = cmd->drv_inst;
unsigned long lock_flags; unsigned long lock_flags;
dev_err(&pinstance->pdev->dev, dev_info(&pinstance->pdev->dev,
"Adapter being reset due to command timeout.\n"); "Adapter being reset due to command timeout.\n");
/* Command timeouts result in hard reset sequence. The command that got /* Command timeouts result in hard reset sequence. The command that got
@ -815,7 +816,8 @@ static void pmcraid_erp_done(struct pmcraid_cmd *cmd)
if (PMCRAID_IOASC_SENSE_KEY(ioasc) > 0) { if (PMCRAID_IOASC_SENSE_KEY(ioasc) > 0) {
scsi_cmd->result |= (DID_ERROR << 16); scsi_cmd->result |= (DID_ERROR << 16);
pmcraid_err("command CDB[0] = %x failed with IOASC: 0x%08X\n", scmd_printk(KERN_INFO, scsi_cmd,
"command CDB[0] = %x failed with IOASC: 0x%08X\n",
cmd->ioa_cb->ioarcb.cdb[0], ioasc); cmd->ioa_cb->ioarcb.cdb[0], ioasc);
} }
@ -1541,13 +1543,13 @@ static void pmcraid_handle_error_log(struct pmcraid_instance *pinstance)
if (pinstance->ldn.hcam->notification_lost == if (pinstance->ldn.hcam->notification_lost ==
HOSTRCB_NOTIFICATIONS_LOST) HOSTRCB_NOTIFICATIONS_LOST)
dev_err(&pinstance->pdev->dev, "Error notifications lost\n"); dev_info(&pinstance->pdev->dev, "Error notifications lost\n");
ioasc = le32_to_cpu(hcam_ldn->error_log.fd_ioasc); ioasc = le32_to_cpu(hcam_ldn->error_log.fd_ioasc);
if (ioasc == PMCRAID_IOASC_UA_BUS_WAS_RESET || if (ioasc == PMCRAID_IOASC_UA_BUS_WAS_RESET ||
ioasc == PMCRAID_IOASC_UA_BUS_WAS_RESET_BY_OTHER) { ioasc == PMCRAID_IOASC_UA_BUS_WAS_RESET_BY_OTHER) {
dev_err(&pinstance->pdev->dev, dev_info(&pinstance->pdev->dev,
"UnitAttention due to IOA Bus Reset\n"); "UnitAttention due to IOA Bus Reset\n");
scsi_report_bus_reset( scsi_report_bus_reset(
pinstance->host, pinstance->host,
@ -1584,7 +1586,7 @@ static void pmcraid_process_ccn(struct pmcraid_cmd *cmd)
atomic_read(&pinstance->ccn.ignore) == 1) { atomic_read(&pinstance->ccn.ignore) == 1) {
return; return;
} else if (ioasc) { } else if (ioasc) {
dev_err(&pinstance->pdev->dev, dev_info(&pinstance->pdev->dev,
"Host RCB (CCN) failed with IOASC: 0x%08X\n", ioasc); "Host RCB (CCN) failed with IOASC: 0x%08X\n", ioasc);
spin_lock_irqsave(pinstance->host->host_lock, lock_flags); spin_lock_irqsave(pinstance->host->host_lock, lock_flags);
pmcraid_send_hcam(pinstance, PMCRAID_HCAM_CODE_CONFIG_CHANGE); pmcraid_send_hcam(pinstance, PMCRAID_HCAM_CODE_CONFIG_CHANGE);
@ -1634,7 +1636,7 @@ static void pmcraid_process_ldn(struct pmcraid_cmd *cmd)
return; return;
} }
} else { } else {
dev_err(&pinstance->pdev->dev, dev_info(&pinstance->pdev->dev,
"Host RCB(LDN) failed with IOASC: 0x%08X\n", ioasc); "Host RCB(LDN) failed with IOASC: 0x%08X\n", ioasc);
} }
/* send netlink message for HCAM notification if enabled */ /* send netlink message for HCAM notification if enabled */
@ -1822,7 +1824,6 @@ static void pmcraid_fail_outstanding_cmds(struct pmcraid_instance *pinstance)
scsi_dma_unmap(scsi_cmd); scsi_dma_unmap(scsi_cmd);
pmcraid_return_cmd(cmd); pmcraid_return_cmd(cmd);
pmcraid_info("failing(%d) CDB[0] = %x result: %x\n", pmcraid_info("failing(%d) CDB[0] = %x result: %x\n",
le32_to_cpu(resp) >> 2, le32_to_cpu(resp) >> 2,
cmd->ioa_cb->ioarcb.cdb[0], cmd->ioa_cb->ioarcb.cdb[0],
@ -2514,7 +2515,8 @@ static int pmcraid_reset_device(
res = scsi_cmd->device->hostdata; res = scsi_cmd->device->hostdata;
if (!res) { if (!res) {
pmcraid_err("reset_device: NULL resource pointer\n"); sdev_printk(KERN_ERR, scsi_cmd->device,
"reset_device: NULL resource pointer\n");
return FAILED; return FAILED;
} }
@ -2752,7 +2754,7 @@ static int pmcraid_eh_abort_handler(struct scsi_cmnd *scsi_cmd)
pinstance = pinstance =
(struct pmcraid_instance *)scsi_cmd->device->host->hostdata; (struct pmcraid_instance *)scsi_cmd->device->host->hostdata;
dev_err(&pinstance->pdev->dev, scmd_printk(KERN_INFO, scsi_cmd,
"I/O command timed out, aborting it.\n"); "I/O command timed out, aborting it.\n");
res = scsi_cmd->device->hostdata; res = scsi_cmd->device->hostdata;
@ -2824,7 +2826,8 @@ static int pmcraid_eh_abort_handler(struct scsi_cmnd *scsi_cmd)
*/ */
static int pmcraid_eh_device_reset_handler(struct scsi_cmnd *scmd) static int pmcraid_eh_device_reset_handler(struct scsi_cmnd *scmd)
{ {
pmcraid_err("Doing device reset due to an I/O command timeout.\n"); scmd_printk(KERN_INFO, scmd,
"resetting device due to an I/O command timeout.\n");
return pmcraid_reset_device(scmd, return pmcraid_reset_device(scmd,
PMCRAID_INTERNAL_TIMEOUT, PMCRAID_INTERNAL_TIMEOUT,
RESET_DEVICE_LUN); RESET_DEVICE_LUN);
@ -2832,7 +2835,8 @@ static int pmcraid_eh_device_reset_handler(struct scsi_cmnd *scmd)
static int pmcraid_eh_bus_reset_handler(struct scsi_cmnd *scmd) static int pmcraid_eh_bus_reset_handler(struct scsi_cmnd *scmd)
{ {
pmcraid_err("Doing bus reset due to an I/O command timeout.\n"); scmd_printk(KERN_INFO, scmd,
"Doing bus reset due to an I/O command timeout.\n");
return pmcraid_reset_device(scmd, return pmcraid_reset_device(scmd,
PMCRAID_RESET_BUS_TIMEOUT, PMCRAID_RESET_BUS_TIMEOUT,
RESET_DEVICE_BUS); RESET_DEVICE_BUS);
@ -2840,7 +2844,8 @@ static int pmcraid_eh_bus_reset_handler(struct scsi_cmnd *scmd)
static int pmcraid_eh_target_reset_handler(struct scsi_cmnd *scmd) static int pmcraid_eh_target_reset_handler(struct scsi_cmnd *scmd)
{ {
pmcraid_err("Doing target reset due to an I/O command timeout.\n"); scmd_printk(KERN_INFO, scmd,
"Doing target reset due to an I/O command timeout.\n");
return pmcraid_reset_device(scmd, return pmcraid_reset_device(scmd,
PMCRAID_INTERNAL_TIMEOUT, PMCRAID_INTERNAL_TIMEOUT,
RESET_DEVICE_TARGET); RESET_DEVICE_TARGET);
@ -2988,11 +2993,11 @@ static int pmcraid_build_ioadl(
nseg = scsi_dma_map(scsi_cmd); nseg = scsi_dma_map(scsi_cmd);
if (nseg < 0) { if (nseg < 0) {
dev_err(&pinstance->pdev->dev, "scsi_map_dma failed!\n"); scmd_printk(KERN_ERR, scsi_cmd, "scsi_map_dma failed!\n");
return -1; return -1;
} else if (nseg > PMCRAID_MAX_IOADLS) { } else if (nseg > PMCRAID_MAX_IOADLS) {
scsi_dma_unmap(scsi_cmd); scsi_dma_unmap(scsi_cmd);
dev_err(&pinstance->pdev->dev, scmd_printk(KERN_ERR, scsi_cmd,
"sg count is (%d) more than allowed!\n", nseg); "sg count is (%d) more than allowed!\n", nseg);
return -1; return -1;
} }
@ -5040,7 +5045,7 @@ static int pmcraid_resume(struct pci_dev *pdev)
rc = pci_enable_device(pdev); rc = pci_enable_device(pdev);
if (rc) { if (rc) {
pmcraid_err("pmcraid: Enable device failed\n"); dev_err(&pdev->dev, "resume: Enable device failed\n");
return rc; return rc;
} }
@ -5054,7 +5059,7 @@ static int pmcraid_resume(struct pci_dev *pdev)
rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
if (rc != 0) { if (rc != 0) {
dev_err(&pdev->dev, "Failed to set PCI DMA mask\n"); dev_err(&pdev->dev, "resume: Failed to set PCI DMA mask\n");
goto disable_device; goto disable_device;
} }
@ -5063,7 +5068,8 @@ static int pmcraid_resume(struct pci_dev *pdev)
rc = pmcraid_register_interrupt_handler(pinstance); rc = pmcraid_register_interrupt_handler(pinstance);
if (rc) { if (rc) {
pmcraid_err("resume: couldn't register interrupt handlers\n"); dev_err(&pdev->dev,
"resume: couldn't register interrupt handlers\n");
rc = -ENODEV; rc = -ENODEV;
goto release_host; goto release_host;
} }
@ -5080,7 +5086,7 @@ static int pmcraid_resume(struct pci_dev *pdev)
* state. * state.
*/ */
if (pmcraid_reset_bringup(pinstance)) { if (pmcraid_reset_bringup(pinstance)) {
pmcraid_err("couldn't initialize IOA \n"); dev_err(&pdev->dev, "couldn't initialize IOA \n");
rc = -ENODEV; rc = -ENODEV;
goto release_tasklets; goto release_tasklets;
} }
@ -5187,7 +5193,7 @@ static void pmcraid_init_res_table(struct pmcraid_cmd *cmd)
LIST_HEAD(old_res); LIST_HEAD(old_res);
if (pinstance->cfg_table->flags & MICROCODE_UPDATE_REQUIRED) if (pinstance->cfg_table->flags & MICROCODE_UPDATE_REQUIRED)
dev_err(&pinstance->pdev->dev, "Require microcode download\n"); pmcraid_err("IOA requires microcode download\n");
/* resource list is protected by pinstance->resource_lock. /* resource list is protected by pinstance->resource_lock.
* init_res_table can be called from probe (user-thread) or runtime * init_res_table can be called from probe (user-thread) or runtime
@ -5224,8 +5230,7 @@ static void pmcraid_init_res_table(struct pmcraid_cmd *cmd)
if (!found) { if (!found) {
if (list_empty(&pinstance->free_res_q)) { if (list_empty(&pinstance->free_res_q)) {
dev_err(&pinstance->pdev->dev, pmcraid_err("Too many devices attached\n");
"Too many devices attached\n");
break; break;
} }
@ -5442,7 +5447,7 @@ static int __devinit pmcraid_probe(
rc = pmcraid_register_interrupt_handler(pinstance); rc = pmcraid_register_interrupt_handler(pinstance);
if (rc) { if (rc) {
pmcraid_err("couldn't register interrupt handler\n"); dev_err(&pdev->dev, "couldn't register interrupt handler\n");
goto out_scsi_host_put; goto out_scsi_host_put;
} }
@ -5466,7 +5471,7 @@ static int __devinit pmcraid_probe(
*/ */
pmcraid_info("starting IOA initialization sequence\n"); pmcraid_info("starting IOA initialization sequence\n");
if (pmcraid_reset_bringup(pinstance)) { if (pmcraid_reset_bringup(pinstance)) {
pmcraid_err("couldn't initialize IOA \n"); dev_err(&pdev->dev, "couldn't initialize IOA \n");
rc = 1; rc = 1;
goto out_release_bufs; goto out_release_bufs;
} }
@ -5534,7 +5539,6 @@ static struct pci_driver pmcraid_driver = {
.shutdown = pmcraid_shutdown .shutdown = pmcraid_shutdown
}; };
/** /**
* pmcraid_init - module load entry point * pmcraid_init - module load entry point
*/ */
@ -5566,7 +5570,6 @@ static int __init pmcraid_init(void)
goto out_unreg_chrdev; goto out_unreg_chrdev;
} }
error = pmcraid_netlink_init(); error = pmcraid_netlink_init();
if (error) if (error)
@ -5584,6 +5587,7 @@ static int __init pmcraid_init(void)
out_unreg_chrdev: out_unreg_chrdev:
unregister_chrdev_region(MKDEV(pmcraid_major, 0), PMCRAID_MAX_ADAPTERS); unregister_chrdev_region(MKDEV(pmcraid_major, 0), PMCRAID_MAX_ADAPTERS);
out_init: out_init:
return error; return error;
} }