diff options
Diffstat (limited to 'drivers/usb/host/uhci-debug.c')
| -rw-r--r-- | drivers/usb/host/uhci-debug.c | 267 | 
1 files changed, 167 insertions, 100 deletions
diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c index 6e7fb5f38db..1b28a000d5c 100644 --- a/drivers/usb/host/uhci-debug.c +++ b/drivers/usb/host/uhci-debug.c @@ -12,14 +12,15 @@  #include <linux/slab.h>  #include <linux/kernel.h>  #include <linux/debugfs.h> -#include <linux/smp_lock.h>  #include <asm/io.h>  #include "uhci-hcd.h" +#define EXTRA_SPACE	1024 +  static struct dentry *uhci_debugfs_root; -#ifdef DEBUG +#ifdef CONFIG_DYNAMIC_DEBUG  /* Handle REALLY large printks so we don't overflow buffers */  static void lprintk(char *buf) @@ -38,18 +39,16 @@ static void lprintk(char *buf)  	}  } -static int uhci_show_td(struct uhci_td *td, char *buf, int len, int space) +static int uhci_show_td(struct uhci_hcd *uhci, struct uhci_td *td, char *buf, +			int len, int space)  {  	char *out = buf;  	char *spid;  	u32 status, token; -	/* Try to make sure there's enough memory */ -	if (len < 160) -		return 0; - -	status = td_status(td); -	out += sprintf(out, "%*s[%p] link (%08x) ", space, "", td, le32_to_cpu(td->link)); +	status = td_status(uhci, td); +	out += sprintf(out, "%*s[%p] link (%08x) ", space, "", td, +		hc32_to_cpu(uhci, td->link));  	out += sprintf(out, "e%d %s%s%s%s%s%s%s%s%s%sLength=%x ",  		((status >> 27) & 3),  		(status & TD_CTRL_SPD) ?      "SPD " : "", @@ -63,8 +62,10 @@ static int uhci_show_td(struct uhci_td *td, char *buf, int len, int space)  		(status & TD_CTRL_CRCTIMEO) ? "CRC/Timeo " : "",  		(status & TD_CTRL_BITSTUFF) ? "BitStuff " : "",  		status & 0x7ff); +	if (out - buf > len) +		goto done; -	token = td_token(td); +	token = td_token(uhci, td);  	switch (uhci_packetid(token)) {  		case USB_PID_SETUP:  			spid = "SETUP"; @@ -87,20 +88,22 @@ static int uhci_show_td(struct uhci_td *td, char *buf, int len, int space)  		(token >> 8) & 127,  		(token & 0xff),  		spid); -	out += sprintf(out, "(buf=%08x)\n", le32_to_cpu(td->buffer)); +	out += sprintf(out, "(buf=%08x)\n", hc32_to_cpu(uhci, td->buffer)); +done: +	if (out - buf > len) +		out += sprintf(out, " ...\n");  	return out - buf;  } -static int uhci_show_urbp(struct urb_priv *urbp, char *buf, int len, int space) +static int uhci_show_urbp(struct uhci_hcd *uhci, struct urb_priv *urbp, +			char *buf, int len, int space)  {  	char *out = buf;  	struct uhci_td *td;  	int i, nactive, ninactive;  	char *ptype; -	if (len < 200) -		return 0;  	out += sprintf(out, "urb_priv [%p] ", urbp);  	out += sprintf(out, "urb [%p] ", urbp->urb); @@ -108,6 +111,8 @@ static int uhci_show_urbp(struct urb_priv *urbp, char *buf, int len, int space)  	out += sprintf(out, "Dev=%d ", usb_pipedevice(urbp->urb->pipe));  	out += sprintf(out, "EP=%x(%s) ", usb_pipeendpoint(urbp->urb->pipe),  			(usb_pipein(urbp->urb->pipe) ? "IN" : "OUT")); +	if (out - buf > len) +		goto done;  	switch (usb_pipetype(urbp->urb->pipe)) {  	case PIPE_ISOCHRONOUS: ptype = "ISO"; break; @@ -126,24 +131,33 @@ static int uhci_show_urbp(struct urb_priv *urbp, char *buf, int len, int space)  		out += sprintf(out, " Unlinked=%d", urbp->urb->unlinked);  	out += sprintf(out, "\n"); +	if (out - buf > len) +		goto done; +  	i = nactive = ninactive = 0;  	list_for_each_entry(td, &urbp->td_list, list) {  		if (urbp->qh->type != USB_ENDPOINT_XFER_ISOC &&  				(++i <= 10 || debug > 2)) {  			out += sprintf(out, "%*s%d: ", space + 2, "", i); -			out += uhci_show_td(td, out, len - (out - buf), 0); +			out += uhci_show_td(uhci, td, out, +					len - (out - buf), 0); +			if (out - buf > len) +				goto tail;  		} else { -			if (td_status(td) & TD_CTRL_ACTIVE) +			if (td_status(uhci, td) & TD_CTRL_ACTIVE)  				++nactive;  			else  				++ninactive;  		}  	}  	if (nactive + ninactive > 0) -		out += sprintf(out, "%*s[skipped %d inactive and %d active " -				"TDs]\n", +		out += sprintf(out, +				"%*s[skipped %d inactive and %d active TDs]\n",  				space, "", ninactive, nactive); - +done: +	if (out - buf > len) +		out += sprintf(out, " ...\n"); +tail:  	return out - buf;  } @@ -152,13 +166,9 @@ static int uhci_show_qh(struct uhci_hcd *uhci,  {  	char *out = buf;  	int i, nurbs; -	__le32 element = qh_element(qh); +	__hc32 element = qh_element(qh);  	char *qtype; -	/* Try to make sure there's enough memory */ -	if (len < 80 * 7) -		return 0; -  	switch (qh->type) {  	case USB_ENDPOINT_XFER_ISOC: qtype = "ISO"; break;  	case USB_ENDPOINT_XFER_INT: qtype = "INT"; break; @@ -169,47 +179,59 @@ static int uhci_show_qh(struct uhci_hcd *uhci,  	out += sprintf(out, "%*s[%p] %s QH link (%08x) element (%08x)\n",  			space, "", qh, qtype, -			le32_to_cpu(qh->link), le32_to_cpu(element)); +			hc32_to_cpu(uhci, qh->link), +			hc32_to_cpu(uhci, element));  	if (qh->type == USB_ENDPOINT_XFER_ISOC) -		out += sprintf(out, "%*s    period %d phase %d load %d us, " -				"frame %x desc [%p]\n", +		out += sprintf(out, +				"%*s    period %d phase %d load %d us, frame %x desc [%p]\n",  				space, "", qh->period, qh->phase, qh->load,  				qh->iso_frame, qh->iso_packet_desc);  	else if (qh->type == USB_ENDPOINT_XFER_INT)  		out += sprintf(out, "%*s    period %d phase %d load %d us\n",  				space, "", qh->period, qh->phase, qh->load); +	if (out - buf > len) +		goto done; -	if (element & UHCI_PTR_QH) +	if (element & UHCI_PTR_QH(uhci))  		out += sprintf(out, "%*s  Element points to QH (bug?)\n", space, ""); -	if (element & UHCI_PTR_DEPTH) +	if (element & UHCI_PTR_DEPTH(uhci))  		out += sprintf(out, "%*s  Depth traverse\n", space, ""); -	if (element & cpu_to_le32(8)) +	if (element & cpu_to_hc32(uhci, 8))  		out += sprintf(out, "%*s  Bit 3 set (bug?)\n", space, ""); -	if (!(element & ~(UHCI_PTR_QH | UHCI_PTR_DEPTH))) +	if (!(element & ~(UHCI_PTR_QH(uhci) | UHCI_PTR_DEPTH(uhci))))  		out += sprintf(out, "%*s  Element is NULL (bug?)\n", space, ""); +	if (out - buf > len) +		goto done; +  	if (list_empty(&qh->queue)) {  		out += sprintf(out, "%*s  queue is empty\n", space, ""); -		if (qh == uhci->skel_async_qh) -			out += uhci_show_td(uhci->term_td, out, +		if (qh == uhci->skel_async_qh) { +			out += uhci_show_td(uhci, uhci->term_td, out,  					len - (out - buf), 0); +			if (out - buf > len) +				goto tail; +		}  	} else {  		struct urb_priv *urbp = list_entry(qh->queue.next,  				struct urb_priv, node);  		struct uhci_td *td = list_entry(urbp->td_list.next,  				struct uhci_td, list); -		if (element != LINK_TO_TD(td)) +		if (element != LINK_TO_TD(uhci, td))  			out += sprintf(out, "%*s Element != First TD\n",  					space, "");  		i = nurbs = 0;  		list_for_each_entry(urbp, &qh->queue, node) { -			if (++i <= 10) -				out += uhci_show_urbp(urbp, out, +			if (++i <= 10) { +				out += uhci_show_urbp(uhci, urbp, out,  						len - (out - buf), space + 2); +				if (out - buf > len) +					goto tail; +			}  			else  				++nurbs;  		} @@ -218,23 +240,27 @@ static int uhci_show_qh(struct uhci_hcd *uhci,  					space, "", nurbs);  	} +	if (out - buf > len) +		goto done; +  	if (qh->dummy_td) {  		out += sprintf(out, "%*s  Dummy TD\n", space, ""); -		out += uhci_show_td(qh->dummy_td, out, len - (out - buf), 0); +		out += uhci_show_td(uhci, qh->dummy_td, out, +				len - (out - buf), 0); +		if (out - buf > len) +			goto tail;  	} +done: +	if (out - buf > len) +		out += sprintf(out, " ...\n"); +tail:  	return out - buf;  } -static int uhci_show_sc(int port, unsigned short status, char *buf, int len) +static int uhci_show_sc(int port, unsigned short status, char *buf)  { -	char *out = buf; - -	/* Try to make sure there's enough memory */ -	if (len < 160) -		return 0; - -	out += sprintf(out, "  stat%d     =     %04x  %s%s%s%s%s%s%s%s%s%s\n", +	return sprintf(buf, "  stat%d     =     %04x  %s%s%s%s%s%s%s%s%s%s\n",  		port,  		status,  		(status & USBPORTSC_SUSP) ?	" Suspend" : "", @@ -247,19 +273,12 @@ static int uhci_show_sc(int port, unsigned short status, char *buf, int len)  		(status & USBPORTSC_PE) ?	" Enabled" : "",  		(status & USBPORTSC_CSC) ?	" ConnectChange" : "",  		(status & USBPORTSC_CCS) ?	" Connected" : ""); - -	return out - buf;  } -static int uhci_show_root_hub_state(struct uhci_hcd *uhci, char *buf, int len) +static int uhci_show_root_hub_state(struct uhci_hcd *uhci, char *buf)  { -	char *out = buf;  	char *rh_state; -	/* Try to make sure there's enough memory */ -	if (len < 60) -		return 0; -  	switch (uhci->rh_state) {  	    case UHCI_RH_RESET:  		rh_state = "reset";		break; @@ -278,32 +297,27 @@ static int uhci_show_root_hub_state(struct uhci_hcd *uhci, char *buf, int len)  	    default:  		rh_state = "?";			break;  	} -	out += sprintf(out, "Root-hub state: %s   FSBR: %d\n", +	return sprintf(buf, "Root-hub state: %s   FSBR: %d\n",  			rh_state, uhci->fsbr_is_on); -	return out - buf;  }  static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)  {  	char *out = buf; -	unsigned long io_addr = uhci->io_addr;  	unsigned short usbcmd, usbstat, usbint, usbfrnum;  	unsigned int flbaseadd;  	unsigned char sof;  	unsigned short portsc1, portsc2; -	/* Try to make sure there's enough memory */ -	if (len < 80 * 9) -		return 0; -	usbcmd    = inw(io_addr + 0); -	usbstat   = inw(io_addr + 2); -	usbint    = inw(io_addr + 4); -	usbfrnum  = inw(io_addr + 6); -	flbaseadd = inl(io_addr + 8); -	sof       = inb(io_addr + 12); -	portsc1   = inw(io_addr + 16); -	portsc2   = inw(io_addr + 18); +	usbcmd    = uhci_readw(uhci, USBCMD); +	usbstat   = uhci_readw(uhci, USBSTS); +	usbint    = uhci_readw(uhci, USBINTR); +	usbfrnum  = uhci_readw(uhci, USBFRNUM); +	flbaseadd = uhci_readl(uhci, USBFLBASEADD); +	sof       = uhci_readb(uhci, USBSOF); +	portsc1   = uhci_readw(uhci, USBPORTSC1); +	portsc2   = uhci_readw(uhci, USBPORTSC2);  	out += sprintf(out, "  usbcmd    =     %04x   %s%s%s%s%s%s%s%s\n",  		usbcmd, @@ -315,6 +329,8 @@ static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)  		(usbcmd & USBCMD_GRESET) ?  "GRESET " : "",  		(usbcmd & USBCMD_HCRESET) ? "HCRESET " : "",  		(usbcmd & USBCMD_RS) ?      "RS " : ""); +	if (out - buf > len) +		goto done;  	out += sprintf(out, "  usbstat   =     %04x   %s%s%s%s%s%s\n",  		usbstat, @@ -324,19 +340,33 @@ static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)  		(usbstat & USBSTS_RD) ?     "ResumeDetect " : "",  		(usbstat & USBSTS_ERROR) ?  "USBError " : "",  		(usbstat & USBSTS_USBINT) ? "USBINT " : ""); +	if (out - buf > len) +		goto done;  	out += sprintf(out, "  usbint    =     %04x\n", usbint);  	out += sprintf(out, "  usbfrnum  =   (%d)%03x\n", (usbfrnum >> 10) & 1,  		0xfff & (4*(unsigned int)usbfrnum));  	out += sprintf(out, "  flbaseadd = %08x\n", flbaseadd);  	out += sprintf(out, "  sof       =       %02x\n", sof); -	out += uhci_show_sc(1, portsc1, out, len - (out - buf)); -	out += uhci_show_sc(2, portsc2, out, len - (out - buf)); -	out += sprintf(out, "Most recent frame: %x (%d)   " -			"Last ISO frame: %x (%d)\n", +	if (out - buf > len) +		goto done; + +	out += uhci_show_sc(1, portsc1, out); +	if (out - buf > len) +		goto done; + +	out += uhci_show_sc(2, portsc2, out); +	if (out - buf > len) +		goto done; + +	out += sprintf(out, +			"Most recent frame: %x (%d)   Last ISO frame: %x (%d)\n",  			uhci->frame_number, uhci->frame_number & 1023,  			uhci->last_iso_frame, uhci->last_iso_frame & 1023); +done: +	if (out - buf > len) +		out += sprintf(out, " ...\n");  	return out - buf;  } @@ -348,17 +378,21 @@ static int uhci_sprint_schedule(struct uhci_hcd *uhci, char *buf, int len)  	struct uhci_td *td;  	struct list_head *tmp, *head;  	int nframes, nerrs; -	__le32 link; -	__le32 fsbr_link; +	__hc32 link; +	__hc32 fsbr_link;  	static const char * const qh_names[] = {  		"unlink", "iso", "int128", "int64", "int32", "int16",  		"int8", "int4", "int2", "async", "term"  	}; -	out += uhci_show_root_hub_state(uhci, out, len - (out - buf)); +	out += uhci_show_root_hub_state(uhci, out); +	if (out - buf > len) +		goto done;  	out += sprintf(out, "HC status\n");  	out += uhci_show_status(uhci, out, len - (out - buf)); +	if (out - buf > len) +		goto tail;  	out += sprintf(out, "Periodic load table\n");  	for (i = 0; i < MAX_PHASE; ++i) { @@ -371,14 +405,16 @@ static int uhci_sprint_schedule(struct uhci_hcd *uhci, char *buf, int len)  			uhci_to_hcd(uhci)->self.bandwidth_int_reqs,  			uhci_to_hcd(uhci)->self.bandwidth_isoc_reqs);  	if (debug <= 1) -		return out - buf; +		goto tail;  	out += sprintf(out, "Frame List\n");  	nframes = 10;  	nerrs = 0;  	for (i = 0; i < UHCI_NUMFRAMES; ++i) { -		__le32 qh_dma; +		__hc32 qh_dma; +		if (out - buf > len) +			goto done;  		j = 0;  		td = uhci->frame_cpu[i];  		link = uhci->frame[i]; @@ -387,7 +423,7 @@ static int uhci_sprint_schedule(struct uhci_hcd *uhci, char *buf, int len)  		if (nframes > 0) {  			out += sprintf(out, "- Frame %d -> (%08x)\n", -					i, le32_to_cpu(link)); +					i, hc32_to_cpu(uhci, link));  			j = 1;  		} @@ -396,16 +432,21 @@ static int uhci_sprint_schedule(struct uhci_hcd *uhci, char *buf, int len)  		do {  			td = list_entry(tmp, struct uhci_td, fl_list);  			tmp = tmp->next; -			if (link != LINK_TO_TD(td)) { -				if (nframes > 0) -					out += sprintf(out, "    link does " -						"not match list entry!\n"); -				else +			if (link != LINK_TO_TD(uhci, td)) { +				if (nframes > 0) { +					out += sprintf(out, +						"    link does not match list entry!\n"); +					if (out - buf > len) +						goto done; +				} else  					++nerrs;  			} -			if (nframes > 0) -				out += uhci_show_td(td, out, +			if (nframes > 0) { +				out += uhci_show_td(uhci, td, out,  						len - (out - buf), 4); +				if (out - buf > len) +					goto tail; +			}  			link = td->link;  		} while (tmp != head); @@ -416,11 +457,14 @@ check_link:  				if (!j) {  					out += sprintf(out,  						"- Frame %d -> (%08x)\n", -						i, le32_to_cpu(link)); +						i, hc32_to_cpu(uhci, link));  					j = 1;  				} -				out += sprintf(out, "   link does not match " -					"QH (%08x)!\n", le32_to_cpu(qh_dma)); +				out += sprintf(out, +					"   link does not match QH (%08x)!\n", +					hc32_to_cpu(uhci, qh_dma)); +				if (out - buf > len) +					goto done;  			} else  				++nerrs;  		} @@ -431,21 +475,30 @@ check_link:  	out += sprintf(out, "Skeleton QHs\n"); +	if (out - buf > len) +		goto done; +  	fsbr_link = 0;  	for (i = 0; i < UHCI_NUM_SKELQH; ++i) {  		int cnt = 0;  		qh = uhci->skelqh[i]; -		out += sprintf(out, "- skel_%s_qh\n", qh_names[i]); \ +		out += sprintf(out, "- skel_%s_qh\n", qh_names[i]);  		out += uhci_show_qh(uhci, qh, out, len - (out - buf), 4); +		if (out - buf > len) +			goto tail;  		/* Last QH is the Terminating QH, it's different */  		if (i == SKEL_TERM) { -			if (qh_element(qh) != LINK_TO_TD(uhci->term_td)) -				out += sprintf(out, "    skel_term_qh element is not set to term_td!\n"); +			if (qh_element(qh) != LINK_TO_TD(uhci, uhci->term_td)) { +				out += sprintf(out, +					"    skel_term_qh element is not set to term_td!\n"); +				if (out - buf > len) +					goto done; +			}  			link = fsbr_link;  			if (!link) -				link = LINK_TO_QH(uhci->skel_term_qh); +				link = LINK_TO_QH(uhci, uhci->skel_term_qh);  			goto check_qh_link;  		} @@ -455,29 +508,40 @@ check_link:  		while (tmp != head) {  			qh = list_entry(tmp, struct uhci_qh, node);  			tmp = tmp->next; -			if (++cnt <= 10) +			if (++cnt <= 10) {  				out += uhci_show_qh(uhci, qh, out,  						len - (out - buf), 4); +				if (out - buf > len) +					goto tail; +			}  			if (!fsbr_link && qh->skel >= SKEL_FSBR) -				fsbr_link = LINK_TO_QH(qh); +				fsbr_link = LINK_TO_QH(uhci, qh);  		}  		if ((cnt -= 10) > 0)  			out += sprintf(out, "    Skipped %d QHs\n", cnt); -		link = UHCI_PTR_TERM; +		link = UHCI_PTR_TERM(uhci);  		if (i <= SKEL_ISO)  			;  		else if (i < SKEL_ASYNC) -			link = LINK_TO_QH(uhci->skel_async_qh); +			link = LINK_TO_QH(uhci, uhci->skel_async_qh);  		else if (!uhci->fsbr_is_on)  			;  		else -			link = LINK_TO_QH(uhci->skel_term_qh); +			link = LINK_TO_QH(uhci, uhci->skel_term_qh);  check_qh_link:  		if (qh->link != link) -			out += sprintf(out, "    last QH not linked to next skeleton!\n"); +			out += sprintf(out, +				"    last QH not linked to next skeleton!\n"); + +		if (out - buf > len) +			goto done;  	} +done: +	if (out - buf > len) +		out += sprintf(out, " ...\n"); +tail:  	return out - buf;  } @@ -509,7 +573,8 @@ static int uhci_debug_open(struct inode *inode, struct file *file)  	up->size = 0;  	spin_lock_irqsave(&uhci->lock, flags);  	if (uhci->is_initialized) -		up->size = uhci_sprint_schedule(uhci, up->data, MAX_OUTPUT); +		up->size = uhci_sprint_schedule(uhci, up->data, +					MAX_OUTPUT - EXTRA_SPACE);  	spin_unlock_irqrestore(&uhci->lock, flags);  	file->private_data = up; @@ -524,7 +589,9 @@ static loff_t uhci_debug_lseek(struct file *file, loff_t off, int whence)  	up = file->private_data; -	/* XXX: atomic 64bit seek access, but that needs to be fixed in the VFS */ +	/* +	 * XXX: atomic 64bit seek access, but that needs to be fixed in the VFS +	 */  	switch (whence) {  	case 0:  		new = off; @@ -568,7 +635,7 @@ static const struct file_operations uhci_debug_operations = {  #endif	/* CONFIG_DEBUG_FS */ -#else	/* DEBUG */ +#else	/* CONFIG_DYNAMIC_DEBUG*/  static inline void lprintk(char *buf)  {}  | 
