Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6ecdd63 authored by Prakash, Sathya's avatar Prakash, Sathya Committed by James Bottomley
Browse files

[SCSI] mpt fusion: Changes in mptfc.c mptlan.c mptsas.c and mptspi.c for logging support 



This patch contains changes in mptfc.c, mptlan.c, mptsas.c and mptspi.c to
support logging in MPT fusion drivers.

The changes are majorly in debug printks, the existing debugprintk are
modified accroding to new debug macros defined in the file mptbdebug.h

signed-off-by: default avatarSathya Prakash <sathya.prakash@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 6757d6b4

drivers/message/fusion/mptfc.c

+47 −61
Original line number Diff line number Diff line
@@ -188,16 +188,18 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt, 
			  int (*func)(struct scsi_cmnd *SCpnt),

			  const char *caller)

{

	MPT_SCSI_HOST		*hd;

	struct scsi_device	*sdev = SCpnt->device;

	struct Scsi_Host	*shost = sdev->host;

	struct fc_rport		*rport = starget_to_rport(scsi_target(sdev));

	unsigned long		flags;

	int			ready;



	hd = (MPT_SCSI_HOST *) SCpnt->device->host->hostdata;

	spin_lock_irqsave(shost->host_lock, flags);

	while ((ready = fc_remote_port_chkready(rport) >> 16) == DID_IMM_RETRY) {

		spin_unlock_irqrestore(shost->host_lock, flags);

		dfcprintk ((MYIOC_s_INFO_FMT

		dfcprintk (hd->ioc, printk(MYIOC_s_DEBUG_FMT

			"mptfc_block_error_handler.%d: %d:%d, port status is "

			"DID_IMM_RETRY, deferring %s recovery.\n",

			((MPT_SCSI_HOST *) shost->hostdata)->ioc->name,
@@ -209,7 +211,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt, 
	spin_unlock_irqrestore(shost->host_lock, flags);



	if (ready == DID_NO_CONNECT || !SCpnt->device->hostdata) {

		dfcprintk ((MYIOC_s_INFO_FMT

		dfcprintk (hd->ioc, printk(MYIOC_s_DEBUG_FMT

			"%s.%d: %d:%d, failing recovery, "

			"port state %d, vdev %p.\n", caller,

			((MPT_SCSI_HOST *) shost->hostdata)->ioc->name,
@@ -218,7 +220,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt, 
			SCpnt->device->hostdata));

		return FAILED;

	}

	dfcprintk ((MYIOC_s_INFO_FMT

	dfcprintk (hd->ioc, printk(MYIOC_s_DEBUG_FMT

		"%s.%d: %d:%d, executing recovery.\n", caller,

		((MPT_SCSI_HOST *) shost->hostdata)->ioc->name,

		((MPT_SCSI_HOST *) shost->hostdata)->ioc->sh->host_no,
@@ -483,7 +485,7 @@ mptfc_register_dev(MPT_ADAPTER *ioc, int channel, FCDevicePage0_t *pg0) 


			pn = (u64)ri->pg0.WWPN.High << 32 | (u64)ri->pg0.WWPN.Low;

			nn = (u64)ri->pg0.WWNN.High << 32 | (u64)ri->pg0.WWNN.Low;

			dfcprintk ((MYIOC_s_INFO_FMT

			dfcprintk (ioc, printk(MYIOC_s_DEBUG_FMT

				"mptfc_reg_dev.%d: %x, %llx / %llx, tid %d, "

				"rport tid %d, tmo %d\n",

					ioc->name,
@@ -559,6 +561,35 @@ mptfc_target_alloc(struct scsi_target *starget) 


	return rc;

}

/*

 *	mptfc_dump_lun_info

 *	@ioc

 *	@rport

 *	@sdev

 *

 */

static void

mptfc_dump_lun_info(MPT_ADAPTER *ioc, struct fc_rport *rport, struct scsi_device *sdev,

		VirtTarget *vtarget)

{

	u64 nn, pn;

	struct mptfc_rport_info *ri;



	ri = *((struct mptfc_rport_info **)rport->dd_data);

	pn = (u64)ri->pg0.WWPN.High << 32 | (u64)ri->pg0.WWPN.Low;

	nn = (u64)ri->pg0.WWNN.High << 32 | (u64)ri->pg0.WWNN.Low;

	dfcprintk (ioc, printk(MYIOC_s_DEBUG_FMT

		"mptfc_slv_alloc.%d: num_luns %d, sdev.id %d, "

		"CurrentTargetID %d, %x %llx %llx\n",

		ioc->name,

		sdev->host->host_no,

		vtarget->num_luns,

		sdev->id, ri->pg0.CurrentTargetID,

		ri->pg0.PortIdentifier,

		(unsigned long long)pn,

		(unsigned long long)nn));

}





/*

 *	OS entry point to allow host driver to alloc memory
@@ -606,25 +637,7 @@ mptfc_slave_alloc(struct scsi_device *sdev) 
	vtarget->num_luns++;





#ifdef DMPT_DEBUG_FC

	{

	u64 nn, pn;

	struct mptfc_rport_info *ri;

	ri = *((struct mptfc_rport_info **)rport->dd_data);

	pn = (u64)ri->pg0.WWPN.High << 32 | (u64)ri->pg0.WWPN.Low;

	nn = (u64)ri->pg0.WWNN.High << 32 | (u64)ri->pg0.WWNN.Low;

	dfcprintk ((MYIOC_s_INFO_FMT

		"mptfc_slv_alloc.%d: num_luns %d, sdev.id %d, "

	        "CurrentTargetID %d, %x %llx %llx\n",

		hd->ioc->name,

		sdev->host->host_no,

		vtarget->num_luns,

		sdev->id, ri->pg0.CurrentTargetID,

		ri->pg0.PortIdentifier,

		(unsigned long long)pn,

		(unsigned long long)nn));

	}

#endif

	mptfc_dump_lun_info(hd->ioc, rport, sdev, vtarget);



	return 0;

}
@@ -653,27 +666,12 @@ mptfc_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *)) 
	/* dd_data is null until finished adding target */

	ri = *((struct mptfc_rport_info **)rport->dd_data);

	if (unlikely(!ri)) {

		dfcprintk ((MYIOC_s_INFO_FMT

			"mptfc_qcmd.%d: %d:%d, dd_data is null.\n",

			((MPT_SCSI_HOST *) SCpnt->device->host->hostdata)->ioc->name,

			((MPT_SCSI_HOST *) SCpnt->device->host->hostdata)->ioc->sh->host_no,

			SCpnt->device->id,SCpnt->device->lun));

		SCpnt->result = DID_IMM_RETRY << 16;

		done(SCpnt);

		return 0;

	}



	err = mptscsih_qcmd(SCpnt,done);

#ifdef DMPT_DEBUG_FC

	if (unlikely(err)) {

		dfcprintk ((MYIOC_s_INFO_FMT

			"mptfc_qcmd.%d: %d:%d, mptscsih_qcmd returns non-zero, (%x).\n",

			((MPT_SCSI_HOST *) SCpnt->device->host->hostdata)->ioc->name,

			((MPT_SCSI_HOST *) SCpnt->device->host->hostdata)->ioc->sh->host_no,

			SCpnt->device->id,SCpnt->device->lun,err));

	}

#endif

	return err;

	return mptscsih_qcmd(SCpnt,done);

}



/*
@@ -1041,7 +1039,7 @@ mptfc_setup_reset(struct work_struct *work) 


			pn = (u64)ri->pg0.WWPN.High << 32 |

			     (u64)ri->pg0.WWPN.Low;

			dfcprintk ((MYIOC_s_INFO_FMT

			dfcprintk (ioc, printk(MYIOC_s_DEBUG_FMT

				"mptfc_setup_reset.%d: %llx deleted\n",

				ioc->name,

				ioc->sh->host_no,
@@ -1088,7 +1086,7 @@ mptfc_rescan_devices(struct work_struct *work) 


			pn = (u64)ri->pg0.WWPN.High << 32 |

			     (u64)ri->pg0.WWPN.Low;

			dfcprintk ((MYIOC_s_INFO_FMT

			dfcprintk (ioc, printk(MYIOC_s_DEBUG_FMT

				"mptfc_rescan.%d: %llx deleted\n",

				ioc->name,

				ioc->sh->host_no,
@@ -1212,7 +1210,7 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	if (numSGE < sh->sg_tablesize) {

		/* Reset this value */

		dprintk((MYIOC_s_INFO_FMT

		dprintk(ioc, printk(MYIOC_s_DEBUG_FMT

		  "Resetting sg_tablesize to %d from %d\n",

		  ioc->name, numSGE, sh->sg_tablesize));

		sh->sg_tablesize = numSGE;
@@ -1232,7 +1230,7 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto out_mptfc_probe;

	}



	dprintk((MYIOC_s_INFO_FMT "ScsiLookup @ %p\n",

	dprintk(ioc, printk(MYIOC_s_DEBUG_FMT "ScsiLookup @ %p\n",

		 ioc->name, hd->ScsiLookup));



	/* Clear the TM flags
@@ -1264,7 +1262,7 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	sh->transportt = mptfc_transport_template;

	error = scsi_add_host (sh, &ioc->pcidev->dev);

	if(error) {

		dprintk((KERN_ERR MYNAM

		dprintk(ioc, printk(KERN_ERR MYNAM

		  "scsi_add_host failed\n"));

		goto out_mptfc_probe;

	}
@@ -1323,7 +1321,7 @@ mptfc_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply) 
	unsigned long flags;

	int rc=1;



	devtverboseprintk((MYIOC_s_INFO_FMT "MPT event (=%02Xh) routed to SCSI host driver!\n",

	devtverboseprintk(ioc, printk(MYIOC_s_DEBUG_FMT "MPT event (=%02Xh) routed to SCSI host driver!\n",

			ioc->name, event));



	if (ioc->sh == NULL ||
@@ -1357,8 +1355,8 @@ mptfc_ioc_reset(MPT_ADAPTER *ioc, int reset_phase) 
		return rc;





	dtmprintk((KERN_WARNING MYNAM

		": IOC %s_reset routed to FC host driver!\n",

	dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT

		": IOC %s_reset routed to FC host driver!\n",ioc->name,

		reset_phase==MPT_IOC_SETUP_RESET ? "setup" : (

		reset_phase==MPT_IOC_PRE_RESET ? "pre" : "post")));
@@ -1413,15 +1411,8 @@ mptfc_init(void) 
	mptfcTaskCtx = mpt_register(mptscsih_taskmgmt_complete, MPTFC_DRIVER);

	mptfcInternalCtx = mpt_register(mptscsih_scandv_complete, MPTFC_DRIVER);



	if (mpt_event_register(mptfcDoneCtx, mptfc_event_process) == 0) {

		devtverboseprintk((KERN_INFO MYNAM

		  ": Registered for IOC event notifications\n"));

	}



	if (mpt_reset_register(mptfcDoneCtx, mptfc_ioc_reset) == 0) {

		dprintk((KERN_INFO MYNAM

		  ": Registered for IOC reset notifications\n"));

	}

	mpt_event_register(mptfcDoneCtx, mptfc_event_process);

	mpt_reset_register(mptfcDoneCtx, mptfc_ioc_reset);



	error = pci_register_driver(&mptfc_driver);

	if (error)
@@ -1486,12 +1477,7 @@ mptfc_exit(void) 
	fc_release_transport(mptfc_transport_template);



	mpt_reset_deregister(mptfcDoneCtx);

	dprintk((KERN_INFO MYNAM

	  ": Deregistered for IOC reset notifications\n"));



	mpt_event_deregister(mptfcDoneCtx);

	dprintk((KERN_INFO MYNAM

	  ": Deregistered for IOC event notifications\n"));



	mpt_deregister(mptfcInternalCtx);

	mpt_deregister(mptfcTaskCtx);

drivers/message/fusion/mptlan.c

+1 −2
Original line number Diff line number Diff line
@@ -1524,8 +1524,7 @@ static int __init mpt_lan_init (void) 


	dlprintk((KERN_INFO MYNAM ": Registered for IOC reset notifications\n"));

	

	if (mpt_device_driver_register(&mptlan_driver, MPTLAN_DRIVER))

		dprintk((KERN_INFO MYNAM ": failed to register dd callbacks\n"));

	mpt_device_driver_register(&mptlan_driver, MPTLAN_DRIVER);

	return 0;

}

drivers/message/fusion/mptsas.c

+125 −151

File changed.

Preview size limit exceeded, changes collapsed.

drivers/message/fusion/mptspi.c

+21 −32
Original line number Diff line number Diff line
@@ -138,7 +138,9 @@ mptspi_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtTarget *target, 
				else {

					factor = MPT_ULTRA320;

					if (scsi_device_qas(sdev)) {

						ddvprintk((KERN_INFO "Enabling QAS due to byte56=%02x on id=%d!\n", scsi_device_qas(sdev), id));

						ddvprintk(hd->ioc,

						printk(KERN_DEBUG "Enabling QAS due to "

						"byte56=%02x on id=%d!\n", scsi_device_qas(sdev), id));

						noQas = 0;

					}

					if (sdev->type == TYPE_TAPE &&
@@ -225,7 +227,8 @@ mptspi_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtTarget *target, 
		/* Disable QAS in a mixed configuration case

		 */



		ddvprintk((KERN_INFO "Disabling QAS due to noQas=%02x on id=%d!\n", noQas, id));

		ddvprintk(hd->ioc, printk(KERN_DEBUG

			"Disabling QAS due to noQas=%02x on id=%d!\n", noQas, id));

	}

}
@@ -256,8 +259,8 @@ mptspi_writeIOCPage4(MPT_SCSI_HOST *hd, u8 channel , u8 id) 
	/* Get a MF for this command.

	 */

	if ((mf = mpt_get_msg_frame(ioc->DoneCtx, ioc)) == NULL) {

		dfailprintk((MYIOC_s_WARN_FMT "writeIOCPage4 : no msg frames!\n",

					ioc->name));

		dfailprintk(ioc, printk(MYIOC_s_WARN_FMT

				"writeIOCPage4 : no msg frames!\n",ioc->name));

		return -EAGAIN;

	}
@@ -297,7 +300,7 @@ mptspi_writeIOCPage4(MPT_SCSI_HOST *hd, u8 channel , u8 id) 


	mpt_add_sge((char *)&pReq->PageBufferSGE, flagsLength, dataDma);



	ddvprintk((MYIOC_s_INFO_FMT

	ddvprintk(ioc, printk(MYIOC_s_DEBUG_FMT

		"writeIOCPage4: MaxSEP=%d ActiveSEP=%d id=%d bus=%d\n",

			ioc->name, IOCPage4Ptr->MaxSEP, IOCPage4Ptr->ActiveSEP, id, channel));
@@ -422,7 +425,7 @@ static int mptspi_target_alloc(struct scsi_target *starget) 
	if (starget->channel == 0 &&

	    mptspi_is_raid(hd, starget->id)) {

		vtarget->raidVolume = 1;

		ddvprintk((KERN_INFO

		ddvprintk(hd->ioc, printk(KERN_DEBUG

		    "RAID Volume @ channel=%d id=%d\n", starget->channel,

		    starget->id));

	}
@@ -462,7 +465,7 @@ mptspi_target_destroy(struct scsi_target *starget) 
static void

mptspi_print_write_nego(struct _MPT_SCSI_HOST *hd, struct scsi_target *starget, u32 ii)

{

	ddvprintk((MYIOC_s_INFO_FMT "id=%d Requested = 0x%08x"

	ddvprintk(hd->ioc, printk(MYIOC_s_DEBUG_FMT "id=%d Requested = 0x%08x"

	    " ( %s factor = 0x%02x @ offset = 0x%02x %s%s%s%s%s%s%s%s)\n",

	    hd->ioc->name, starget->id, ii,

	    ii & MPI_SCSIDEVPAGE0_NP_WIDE ? "Wide ": "",
@@ -487,7 +490,7 @@ mptspi_print_write_nego(struct _MPT_SCSI_HOST *hd, struct scsi_target *starget, 
static void

mptspi_print_read_nego(struct _MPT_SCSI_HOST *hd, struct scsi_target *starget, u32 ii)

{

	ddvprintk((MYIOC_s_INFO_FMT "id=%d Read = 0x%08x"

	ddvprintk(hd->ioc, printk(MYIOC_s_DEBUG_FMT "id=%d Read = 0x%08x"

	    " ( %s factor = 0x%02x @ offset = 0x%02x %s%s%s%s%s%s%s%s)\n",

	    hd->ioc->name, starget->id, ii,

	    ii & MPI_SCSIDEVPAGE0_NP_WIDE ? "Wide ": "",
@@ -613,7 +616,7 @@ mptscsih_quiesce_raid(MPT_SCSI_HOST *hd, int quiesce, u8 channel, u8 id) 
	/* Get and Populate a free Frame

	 */

	if ((mf = mpt_get_msg_frame(hd->ioc->InternalCtx, hd->ioc)) == NULL) {

		ddvprintk((MYIOC_s_WARN_FMT "_do_raid: no msg frames!\n",

		ddvprintk(hd->ioc, printk(MYIOC_s_WARN_FMT "_do_raid: no msg frames!\n",

					hd->ioc->name));

		return -EAGAIN;

	}
@@ -635,7 +638,7 @@ mptscsih_quiesce_raid(MPT_SCSI_HOST *hd, int quiesce, u8 channel, u8 id) 
	mpt_add_sge((char *)&pReq->ActionDataSGE,

		MPT_SGE_FLAGS_SSIMPLE_READ | 0, (dma_addr_t) -1);



	ddvprintk((MYIOC_s_INFO_FMT "RAID Volume action=%x channel=%d id=%d\n",

	ddvprintk(hd->ioc, printk(MYIOC_s_DEBUG_FMT "RAID Volume action=%x channel=%d id=%d\n",

			hd->ioc->name, pReq->Action, channel, id));



	hd->pLocal = NULL;
@@ -735,7 +738,7 @@ static int mptspi_slave_configure(struct scsi_device *sdev) 
	if (ret)

		return ret;



	ddvprintk((MYIOC_s_INFO_FMT "id=%d min_period=0x%02x"

	ddvprintk(hd->ioc, printk(MYIOC_s_DEBUG_FMT "id=%d min_period=0x%02x"

		" max_offset=0x%02x max_width=%d\n", hd->ioc->name,

		sdev->id, spi_min_period(scsi_target(sdev)),

		spi_max_offset(scsi_target(sdev)),
@@ -768,10 +771,8 @@ mptspi_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *)) 
		return 0;

	}



#ifdef MPT_DEBUG_DV

	if (spi_dv_pending(scsi_target(SCpnt->device)))

		scsi_print_command(SCpnt);

#endif

		ddvprintk(hd->ioc, scsi_print_command(SCpnt));



	return mptscsih_qcmd(SCpnt,done);

}
@@ -1415,7 +1416,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	if (numSGE < sh->sg_tablesize) {

		/* Reset this value */

		dprintk((MYIOC_s_INFO_FMT

		dprintk(ioc, printk(MYIOC_s_INFO_FMT

		  "Resetting sg_tablesize to %d from %d\n",

		  ioc->name, numSGE, sh->sg_tablesize));

		sh->sg_tablesize = numSGE;
@@ -1435,7 +1436,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto out_mptspi_probe;

	}



	dprintk((MYIOC_s_INFO_FMT "ScsiLookup @ %p\n",

	dprintk(ioc, printk(MYIOC_s_DEBUG_FMT "ScsiLookup @ %p\n",

		 ioc->name, hd->ScsiLookup));



	/* Clear the TM flags
@@ -1463,7 +1464,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	ioc->spi_data.Saf_Te = mpt_saf_te;



	hd->negoNvram = MPT_SCSICFG_USE_NVRAM;

	ddvprintk((MYIOC_s_INFO_FMT

	ddvprintk(ioc, printk(MYIOC_s_DEBUG_FMT

		"saf_te %x\n",

		ioc->name,

		mpt_saf_te));
@@ -1481,7 +1482,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	error = scsi_add_host (sh, &ioc->pcidev->dev);

	if(error) {

		dprintk((KERN_ERR MYNAM

		dprintk(ioc, printk(KERN_ERR MYNAM

		  "scsi_add_host failed\n"));

		goto out_mptspi_probe;

	}
@@ -1536,15 +1537,8 @@ mptspi_init(void) 
	mptspiTaskCtx = mpt_register(mptscsih_taskmgmt_complete, MPTSPI_DRIVER);

	mptspiInternalCtx = mpt_register(mptscsih_scandv_complete, MPTSPI_DRIVER);



	if (mpt_event_register(mptspiDoneCtx, mptspi_event_process) == 0) {

		devtverboseprintk((KERN_INFO MYNAM

		  ": Registered for IOC event notifications\n"));

	}



	if (mpt_reset_register(mptspiDoneCtx, mptspi_ioc_reset) == 0) {

		dprintk((KERN_INFO MYNAM

		  ": Registered for IOC reset notifications\n"));

	}

	mpt_event_register(mptspiDoneCtx, mptspi_event_process);

	mpt_reset_register(mptspiDoneCtx, mptspi_ioc_reset);



	error = pci_register_driver(&mptspi_driver);

	if (error)
@@ -1564,12 +1558,7 @@ mptspi_exit(void) 
	pci_unregister_driver(&mptspi_driver);



	mpt_reset_deregister(mptspiDoneCtx);

	dprintk((KERN_INFO MYNAM

	  ": Deregistered for IOC reset notifications\n"));



	mpt_event_deregister(mptspiDoneCtx);

	dprintk((KERN_INFO MYNAM

	  ": Deregistered for IOC event notifications\n"));



	mpt_deregister(mptspiInternalCtx);

	mpt_deregister(mptspiTaskCtx);