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

Commit efd986db authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

[S390] cio: increase trace level 



Move debug traces for start I/O and interrupt events to exclusive
trace levels. Also change tracing in hot-path from sprintf (costly)
to hex.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 626e476a

drivers/s390/cio/cio.c

+15 −29
Original line number Diff line number Diff line
@@ -139,12 +139,11 @@ cio_start_key (struct subchannel *sch, /* subchannel structure */ 
	       __u8 lpm,		/* logical path mask */

	       __u8 key)                /* storage key */

{

	char dbf_txt[15];

	int ccode;

	union orb *orb;



	CIO_TRACE_EVENT(4, "stIO");

	CIO_TRACE_EVENT(4, dev_name(&sch->dev));

	CIO_TRACE_EVENT(5, "stIO");

	CIO_TRACE_EVENT(5, dev_name(&sch->dev));



	orb = &to_io_private(sch)->orb;

	memset(orb, 0, sizeof(union orb));
@@ -169,8 +168,7 @@ cio_start_key (struct subchannel *sch, /* subchannel structure */ 
	ccode = ssch(sch->schid, orb);



	/* process condition code */

	sprintf(dbf_txt, "ccode:%d", ccode);

	CIO_TRACE_EVENT(4, dbf_txt);

	CIO_HEX_EVENT(5, &ccode, sizeof(ccode));



	switch (ccode) {

	case 0:
@@ -201,7 +199,6 @@ cio_start (struct subchannel *sch, struct ccw1 *cpa, __u8 lpm) 
int

cio_resume (struct subchannel *sch)

{

	char dbf_txt[15];

	int ccode;



	CIO_TRACE_EVENT(4, "resIO");
@@ -209,8 +206,7 @@ cio_resume (struct subchannel *sch) 


	ccode = rsch (sch->schid);



	sprintf (dbf_txt, "ccode:%d", ccode);

	CIO_TRACE_EVENT (4, dbf_txt);

	CIO_HEX_EVENT(4, &ccode, sizeof(ccode));



	switch (ccode) {

	case 0:
@@ -235,7 +231,6 @@ cio_resume (struct subchannel *sch) 
int

cio_halt(struct subchannel *sch)

{

	char dbf_txt[15];

	int ccode;



	if (!sch)
@@ -249,8 +244,7 @@ cio_halt(struct subchannel *sch) 
	 */

	ccode = hsch (sch->schid);



	sprintf (dbf_txt, "ccode:%d", ccode);

	CIO_TRACE_EVENT (2, dbf_txt);

	CIO_HEX_EVENT(2, &ccode, sizeof(ccode));



	switch (ccode) {

	case 0:
@@ -270,7 +264,6 @@ cio_halt(struct subchannel *sch) 
int

cio_clear(struct subchannel *sch)

{

	char dbf_txt[15];

	int ccode;



	if (!sch)
@@ -284,8 +277,7 @@ cio_clear(struct subchannel *sch) 
	 */

	ccode = csch (sch->schid);



	sprintf (dbf_txt, "ccode:%d", ccode);

	CIO_TRACE_EVENT (2, dbf_txt);

	CIO_HEX_EVENT(2, &ccode, sizeof(ccode));



	switch (ccode) {

	case 0:
@@ -306,7 +298,6 @@ cio_clear(struct subchannel *sch) 
int

cio_cancel (struct subchannel *sch)

{

	char dbf_txt[15];

	int ccode;



	if (!sch)
@@ -317,8 +308,7 @@ cio_cancel (struct subchannel *sch) 


	ccode = xsch (sch->schid);



	sprintf (dbf_txt, "ccode:%d", ccode);

	CIO_TRACE_EVENT (2, dbf_txt);

	CIO_HEX_EVENT(2, &ccode, sizeof(ccode));



	switch (ccode) {

	case 0:		/* success */
@@ -429,7 +419,6 @@ EXPORT_SYMBOL_GPL(cio_update_schib); 
 */

int cio_enable_subchannel(struct subchannel *sch, u32 intparm)

{

	char dbf_txt[15];

	int retry;

	int ret;
@@ -460,8 +449,7 @@ int cio_enable_subchannel(struct subchannel *sch, u32 intparm) 
		} else

			break;

	}

	sprintf (dbf_txt, "ret:%d", ret);

	CIO_TRACE_EVENT (2, dbf_txt);

	CIO_HEX_EVENT(2, &ret, sizeof(ret));

	return ret;

}

EXPORT_SYMBOL_GPL(cio_enable_subchannel);
@@ -472,7 +460,6 @@ EXPORT_SYMBOL_GPL(cio_enable_subchannel); 
 */

int cio_disable_subchannel(struct subchannel *sch)

{

	char dbf_txt[15];

	int retry;

	int ret;
@@ -495,8 +482,7 @@ int cio_disable_subchannel(struct subchannel *sch) 
		} else

			break;

	}

	sprintf (dbf_txt, "ret:%d", ret);

	CIO_TRACE_EVENT (2, dbf_txt);

	CIO_HEX_EVENT(2, &ret, sizeof(ret));

	return ret;

}

EXPORT_SYMBOL_GPL(cio_disable_subchannel);

drivers/s390/cio/device.c

+2 −2
Original line number Diff line number Diff line
@@ -1168,8 +1168,8 @@ static void io_subchannel_irq(struct subchannel *sch) 


	cdev = sch_get_cdev(sch);



	CIO_TRACE_EVENT(3, "IRQ");

	CIO_TRACE_EVENT(3, dev_name(&sch->dev));

	CIO_TRACE_EVENT(6, "IRQ");

	CIO_TRACE_EVENT(6, dev_name(&sch->dev));

	if (cdev)

		dev_fsm_event(cdev, DEV_EVENT_INTERRUPT);

}