Commit 139b83dd authored by Michael Ernst's avatar Michael Ernst Committed by Martin Schwidefsky
Browse files

[S390] cio: Remove cio_msg kernel parameter. 



The only sporadically used CIO_DEBUG messages are replaced by ordinary
CIO_MSG_EVENT messages. The CIO_MSG_EVENT messages debug levels are
consolidated.

Signed-off-by: default avatarMichael Ernst <mernst@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 0eaeafa1

Documentation/s390/CommonIO

+0 −11
Original line number Diff line number Diff line
@@ -8,17 +8,6 @@ Command line parameters 


  Enable logging of debug information in case of ccw device timeouts.





* cio_msg = yes | no

  

  Determines whether information on found devices and sensed device 

  characteristics should be shown during startup or when new devices are

  found, i. e. messages of the types "Detected device 0.0.4711 on subchannel

  0.0.0042" and "SenseID: Device 0.0.4711 reports: ...".



  Default is off.





* cio_ignore = {all} |

	       {<device> | <range of devices>} |

	       {!<device> | !<range of devices>}

drivers/s390/cio/blacklist.c

+0 −1
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ blacklist_parse_parameters (char *str, range_action action) 
static int __init

blacklist_setup (char *str)

{

	CIO_MSG_EVENT(6, "Reading blacklist parameters\n");

	return blacklist_parse_parameters (str, add);

}

drivers/s390/cio/cio.c

+10 −29
Original line number Diff line number Diff line
@@ -39,23 +39,6 @@ debug_info_t *cio_debug_msg_id; 
debug_info_t *cio_debug_trace_id;

debug_info_t *cio_debug_crw_id;



int cio_show_msg;



static int __init

cio_setup (char *parm)

{

	if (!strcmp (parm, "yes"))

		cio_show_msg = 1;

	else if (!strcmp (parm, "no"))

		cio_show_msg = 0;

	else

		printk(KERN_ERR "cio: cio_setup: "

		       "invalid cio_msg parameter '%s'", parm);

	return 1;

}



__setup ("cio_msg=", cio_setup);



/*

 * Function: cio_debug_init

 * Initializes three debug logs for common I/O:
@@ -166,7 +149,7 @@ cio_start_handle_notoper(struct subchannel *sch, __u8 lpm) 


	stsch (sch->schid, &sch->schib);



	CIO_MSG_EVENT(0, "cio_start: 'not oper' status for "

	CIO_MSG_EVENT(2, "cio_start: 'not oper' status for "

		      "subchannel 0.%x.%04x!\n", sch->schid.ssid,

		      sch->schid.sch_no);

	sprintf(dbf_text, "no%s", sch->dev.bus_id);
@@ -567,8 +550,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid) 
	 * ... just being curious we check for non I/O subchannels

	 */

	if (sch->st != 0) {

		CIO_DEBUG(KERN_INFO, 0,

			  "Subchannel 0.%x.%04x reports "

		CIO_MSG_EVENT(4, "Subchannel 0.%x.%04x reports "

			      "non-I/O subchannel type %04X\n",

			      sch->schid.ssid, sch->schid.sch_no, sch->st);

		/* We stop here for non-io subchannels. */
@@ -588,7 +570,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid) 
		 * This device must not be known to Linux. So we simply

		 * say that there is no device and return ENODEV.

		 */

		CIO_MSG_EVENT(4, "Blacklisted device detected "

		CIO_MSG_EVENT(6, "Blacklisted device detected "

			      "at devno %04X, subchannel set %x\n",

			      sch->schib.pmcw.dev, sch->schid.ssid);

		err = -ENODEV;
@@ -601,8 +583,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid) 
	sch->lpm = sch->schib.pmcw.pam & sch->opm;

	sch->isc = 3;



	CIO_DEBUG(KERN_INFO, 0,

		  "Detected device %04x on subchannel 0.%x.%04X"

	CIO_MSG_EVENT(6, "Detected device %04x on subchannel 0.%x.%04X "

		      "- PIM = %02X, PAM = %02X, POM = %02X\n",

		      sch->schib.pmcw.dev, sch->schid.ssid,

		      sch->schid.sch_no, sch->schib.pmcw.pim,

drivers/s390/cio/cio.h

+0 −2
Original line number Diff line number Diff line
@@ -118,6 +118,4 @@ extern void *cio_get_console_priv(void); 
#define cio_get_console_priv() NULL

#endif



extern int cio_show_msg;



#endif

drivers/s390/cio/cio_debug.h

+0 −6
Original line number Diff line number Diff line
@@ -31,10 +31,4 @@ static inline void CIO_HEX_EVENT(int level, void *data, int length) 
	}

}



#define CIO_DEBUG(printk_level, event_level, msg...) do {	\

		if (cio_show_msg)				\

			printk(printk_level "cio: " msg);	\

		CIO_MSG_EVENT(event_level, msg);		\

	} while (0)



#endif