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

Commit af009411 authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by Martin K. Petersen
Browse files

mpt2sas, mpt3sas: Remove SCSI_MPTXSAS_LOGGING entry from Kconfig 



Currently there is a logging level option provided for each of our
drivers in the kernel configuration utility. Users can enable this
option to get more verbose information. By default it is enabled.

Only when this option is enabled will the functions which display the
required information get compiled in.

As we are merging the both drivers we can no longer provide this
configuration option. Remove the SCSI_MPTXSAS_LOGGING entry from Kconfig
and unconditionally enable logging (by removing the #ifdef
CONFIG_SCSI_MPT3SAS_LOGGING preprocessor check conditions) so that all
functions which are defined to display more verbose information get
compiled in.

Signed-off-by: default avatarSreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d357e84d

drivers/scsi/mpt2sas/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -59,9 +59,3 @@ config SCSI_MPT2SAS_MAX_SGE 
	SAFE_PHYS_SEGMENTS.  However, it may decreased down to 16.

	Decreasing this parameter will reduce memory requirements

	on a per controller instance.
 


config SCSI_MPT2SAS_LOGGING

	bool "LSI MPT Fusion logging facility"

	depends on PCI && SCSI && SCSI_MPT2SAS

	---help---

	This turns on a logging facility.

drivers/scsi/mpt3sas/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -59,9 +59,3 @@ config SCSI_MPT3SAS_MAX_SGE 
	MAX_PHYS_SEGMENTS in most kernels.  However in SuSE kernels this

	can be 256. However, it may decreased down to 16.  Decreasing this

	parameter will reduce memory requirements on a per controller instance.
 


config SCSI_MPT3SAS_LOGGING

	bool "LSI MPT Fusion logging facility"

	depends on PCI && SCSI && SCSI_MPT3SAS

	---help---

	This turns on a logging facility.

drivers/scsi/mpt3sas/mpt3sas_base.c

+4 −6
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ mpt3sas_halt_firmware(struct MPT3SAS_ADAPTER *ioc) 
		panic("panic in %s\n", __func__);

}



#ifdef CONFIG_SCSI_MPT3SAS_LOGGING

/**

 * _base_sas_ioc_info - verbose translation of the ioc status

 * @ioc: per adapter object
@@ -630,7 +629,6 @@ _base_display_event_data(struct MPT3SAS_ADAPTER *ioc, 


	pr_info(MPT3SAS_FMT "%s\n", ioc->name, desc);

}

#endif



/**

 * _base_sas_log_info - verbose translation of firmware log info
@@ -710,13 +708,13 @@ _base_display_reply_info(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, 
		return;

	}

	ioc_status = le16_to_cpu(mpi_reply->IOCStatus);

#ifdef CONFIG_SCSI_MPT3SAS_LOGGING



	if ((ioc_status & MPI2_IOCSTATUS_MASK) &&

	    (ioc->logging_level & MPT_DEBUG_REPLY)) {

		_base_sas_ioc_info(ioc , mpi_reply,

		   mpt3sas_base_get_msg_frame(ioc, smid));

	}

#endif



	if (ioc_status & MPI2_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE) {

		loginfo = le32_to_cpu(mpi_reply->IOCLogInfo);

		_base_sas_log_info(ioc, loginfo);
@@ -783,9 +781,9 @@ _base_async_event(struct MPT3SAS_ADAPTER *ioc, u8 msix_index, u32 reply) 
		return 1;

	if (mpi_reply->Function != MPI2_FUNCTION_EVENT_NOTIFICATION)

		return 1;

#ifdef CONFIG_SCSI_MPT3SAS_LOGGING



	_base_display_event_data(ioc, mpi_reply);

#endif



	if (!(mpi_reply->AckRequired & MPI2_EVENT_NOTIFICATION_ACK_REQUIRED))

		goto out;

	smid = mpt3sas_base_get_smid(ioc, ioc->base_cb_idx);

drivers/scsi/mpt3sas/mpt3sas_config.c

+0 −6
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ struct config_request { 
	dma_addr_t		page_dma;

};



#ifdef CONFIG_SCSI_MPT3SAS_LOGGING

/**

 * _config_display_some_debug - debug routine

 * @ioc: per adapter object
@@ -173,7 +172,6 @@ _config_display_some_debug(struct MPT3SAS_ADAPTER *ioc, u16 smid, 
		    ioc->name, le16_to_cpu(mpi_reply->IOCStatus),

		    le32_to_cpu(mpi_reply->IOCLogInfo));

}

#endif



/**

 * _config_alloc_config_dma_memory - obtain physical memory
@@ -255,9 +253,7 @@ mpt3sas_config_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, 
		    mpi_reply->MsgLength*4);

	}

	ioc->config_cmds.status &= ~MPT3_CMD_PENDING;

#ifdef CONFIG_SCSI_MPT3SAS_LOGGING

	_config_display_some_debug(ioc, smid, "config_done", mpi_reply);

#endif

	ioc->config_cmds.smid = USHRT_MAX;

	complete(&ioc->config_cmds.done);

	return 1;
@@ -387,9 +383,7 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t 
	config_request = mpt3sas_base_get_msg_frame(ioc, smid);

	ioc->config_cmds.smid = smid;

	memcpy(config_request, mpi_request, sizeof(Mpi2ConfigRequest_t));

#ifdef CONFIG_SCSI_MPT3SAS_LOGGING

	_config_display_some_debug(ioc, smid, "config_request", NULL);

#endif

	init_completion(&ioc->config_cmds.done);

	mpt3sas_base_put_smid_default(ioc, smid);

	timeleft = wait_for_completion_timeout(&ioc->config_cmds.done,

drivers/scsi/mpt3sas/mpt3sas_ctl.c

+1 −9
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ enum block_state { 
	BLOCKING,

};



#ifdef CONFIG_SCSI_MPT3SAS_LOGGING

/**

 * _ctl_sas_device_find_by_handle - sas device search

 * @ioc: per adapter object
@@ -254,8 +253,6 @@ _ctl_display_some_debug(struct MPT3SAS_ADAPTER *ioc, u16 smid, 
	}

}



#endif



/**

 * mpt3sas_ctl_done - ctl module completion routine

 * @ioc: per adapter object
@@ -302,9 +299,7 @@ mpt3sas_ctl_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, 
			}

		}

	}

#ifdef CONFIG_SCSI_MPT3SAS_LOGGING

	_ctl_display_some_debug(ioc, smid, "ctl_done", mpi_reply);

#endif

	ioc->ctl_cmds.status &= ~MPT3_CMD_PENDING;

	complete(&ioc->ctl_cmds.done);

	return 1;
@@ -759,9 +754,7 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg, 
	psge = (void *)request + (karg.data_sge_offset*4);



	/* send command to firmware */

#ifdef CONFIG_SCSI_MPT3SAS_LOGGING

	_ctl_display_some_debug(ioc, smid, "ctl_request", NULL);

#endif



	init_completion(&ioc->ctl_cmds.done);

	switch (mpi_request->Function) {
@@ -916,7 +909,6 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg, 
	mpi_reply = ioc->ctl_cmds.reply;

	ioc_status = le16_to_cpu(mpi_reply->IOCStatus) & MPI2_IOCSTATUS_MASK;



#ifdef CONFIG_SCSI_MPT3SAS_LOGGING

	if (mpi_reply->Function == MPI2_FUNCTION_SCSI_TASK_MGMT &&

	    (ioc->logging_level & MPT_DEBUG_TM)) {

		Mpi2SCSITaskManagementReply_t *tm_reply =
@@ -929,7 +921,7 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg, 
		    le32_to_cpu(tm_reply->IOCLogInfo),

		    le32_to_cpu(tm_reply->TerminationCount));

	}

#endif



	/* copy out xdata to user */

	if (data_in_sz) {

		if (copy_to_user(karg.data_in_buf_ptr, data_in,