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

Commit 6bc9dace authored by Andreas Herrmann's avatar Andreas Herrmann Committed by James Bottomley
Browse files

[SCSI] zfcp: remove flags_dump feature 



Removes the rarely used "flags_dump" mechanism of zfcp.

Equivalent debug information will be provided with a reworking of
zfcp's s390dbf-facilities which is in preparation.

Signed-off-by: default avatarAndreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent eb0df996

drivers/s390/scsi/zfcp_aux.c

+0 −9
Original line number Diff line number Diff line
@@ -97,11 +97,6 @@ MODULE_PARM_DESC(loglevel, 
		 "FC ERP QDIO CIO Config FSF SCSI Other, "

		 "levels: 0=none 1=normal 2=devel 3=trace");



#ifdef ZFCP_PRINT_FLAGS

u32 flags_dump = 0;

module_param(flags_dump, uint, 0);

#endif



/****************************************************************/

/************** Functions without logging ***********************/

/****************************************************************/
@@ -1483,19 +1478,15 @@ zfcp_fsf_incoming_els_rscn(struct zfcp_adapter *adapter, 
		fcp_rscn_element++;

		switch (fcp_rscn_element->addr_format) {

		case ZFCP_PORT_ADDRESS:

			ZFCP_LOG_FLAGS(1, "ZFCP_PORT_ADDRESS\n");

			range_mask = ZFCP_PORTS_RANGE_PORT;

			break;

		case ZFCP_AREA_ADDRESS:

			ZFCP_LOG_FLAGS(1, "ZFCP_AREA_ADDRESS\n");

			range_mask = ZFCP_PORTS_RANGE_AREA;

			break;

		case ZFCP_DOMAIN_ADDRESS:

			ZFCP_LOG_FLAGS(1, "ZFCP_DOMAIN_ADDRESS\n");

			range_mask = ZFCP_PORTS_RANGE_DOMAIN;

			break;

		case ZFCP_FABRIC_ADDRESS:

			ZFCP_LOG_FLAGS(1, "ZFCP_FABRIC_ADDRESS\n");

			range_mask = ZFCP_PORTS_RANGE_FABRIC;

			break;

		default:

drivers/s390/scsi/zfcp_def.h

+0 −14
Original line number Diff line number Diff line
@@ -62,9 +62,6 @@ 
#include <linux/syscalls.h>

#include <linux/ioctl.h>



/************************ DEBUG FLAGS *****************************************/



#define	ZFCP_PRINT_FLAGS



/********************* GENERAL DEFINES *********************************/
@@ -472,17 +469,6 @@ do { \ 
	ZFCP_LOG(ZFCP_LOG_LEVEL_TRACE, fmt , ##args)

#endif



#ifndef ZFCP_PRINT_FLAGS

# define ZFCP_LOG_FLAGS(level, fmt, args...)

#else

extern u32 flags_dump;

# define ZFCP_LOG_FLAGS(level, fmt, args...) \

do { \

	if (level <= flags_dump) \

		_ZFCP_LOG(fmt, ##args); \

} while (0)

#endif



/*************** ADAPTER/PORT/UNIT AND FSF_REQ STATUS FLAGS ******************/



/*

drivers/s390/scsi/zfcp_fsf.c

+0 −173

File changed.

Preview size limit exceeded, changes collapsed.

drivers/s390/scsi/zfcp_qdio.c

+1 −39
Original line number Diff line number Diff line
@@ -229,52 +229,14 @@ zfcp_qdio_handler_error_check(struct zfcp_adapter *adapter, 
			ZFCP_LOG_TRACE("status is"

				       " QDIO_STATUS_OUTBOUND_INT \n");

		}

	}			// if (ZFCP_LOG_CHECK(ZFCP_LOG_LEVEL_TRACE))

	}

	if (unlikely(status & QDIO_STATUS_LOOK_FOR_ERROR)) {

		retval = -EIO;



		ZFCP_LOG_FLAGS(1, "QDIO_STATUS_LOOK_FOR_ERROR \n");



		ZFCP_LOG_INFO("QDIO problem occurred (status=0x%x, "

			      "qdio_error=0x%x, siga_error=0x%x)\n",

			      status, qdio_error, siga_error);



		if (status & QDIO_STATUS_ACTIVATE_CHECK_CONDITION) {

			ZFCP_LOG_FLAGS(2,

				       "QDIO_STATUS_ACTIVATE_CHECK_CONDITION\n");

		}

		if (status & QDIO_STATUS_MORE_THAN_ONE_QDIO_ERROR) {

			ZFCP_LOG_FLAGS(2,

				       "QDIO_STATUS_MORE_THAN_ONE_QDIO_ERROR\n");

		}

		if (status & QDIO_STATUS_MORE_THAN_ONE_SIGA_ERROR) {

			ZFCP_LOG_FLAGS(2,

				       "QDIO_STATUS_MORE_THAN_ONE_SIGA_ERROR\n");

		}



		if (siga_error & QDIO_SIGA_ERROR_ACCESS_EXCEPTION) {

			ZFCP_LOG_FLAGS(2, "QDIO_SIGA_ERROR_ACCESS_EXCEPTION\n");

		}



		if (siga_error & QDIO_SIGA_ERROR_B_BIT_SET) {

			ZFCP_LOG_FLAGS(2, "QDIO_SIGA_ERROR_B_BIT_SET\n");

		}



		switch (qdio_error) {

		case 0:

			ZFCP_LOG_FLAGS(3, "QDIO_OK");

			break;

		case SLSB_P_INPUT_ERROR:

			ZFCP_LOG_FLAGS(1, "SLSB_P_INPUT_ERROR\n");

			break;

		case SLSB_P_OUTPUT_ERROR:

			ZFCP_LOG_FLAGS(1, "SLSB_P_OUTPUT_ERROR\n");

			break;

		default:

			ZFCP_LOG_NORMAL("bug: unknown QDIO error 0x%x\n",

					qdio_error);

			break;

		}

		/* Restarting IO on the failed adapter from scratch */

		debug_text_event(adapter->erp_dbf, 1, "qdio_err");

               /*