Commit 5d062aba authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman
Browse files

usb: host: xhci: fix up Control Transfer TRB decoder 



Format for each TRB in each control transfer stage differs. Let's make
sure we correctly pretty print these fields to avoid confusion.

Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19a7d0d6

drivers/usb/host/xhci.h

+37 −22
Original line number Diff line number Diff line
@@ -2217,8 +2217,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2, 


		break;

	case TRB_SETUP:

		sprintf(str,

			"bRequestType %02x bRequest %02x wValue %02x%02x wIndex %02x%02x wLength %d length %d TD size %d intr %d type '%s' flags %c:%c:%c:%c:%c:%c:%c:%c",

		sprintf(str, "bRequestType %02x bRequest %02x wValue %02x%02x wIndex %02x%02x wLength %d length %d TD size %d intr %d type '%s' flags %c:%c:%c",

				field0 & 0xff,

				(field0 & 0xff00) >> 8,

				(field0 & 0xff000000) >> 24,
@@ -2230,7 +2229,15 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2, 
				TRB_LEN(field2), GET_TD_SIZE(field2),

				GET_INTR_TARGET(field2),

				xhci_trb_type_string(TRB_FIELD_TO_TYPE(field3)),

			field3 & TRB_BEI ? 'B' : 'b',

				field3 & TRB_IDT ? 'I' : 'i',

				field3 & TRB_IOC ? 'I' : 'i',

				field3 & TRB_CYCLE ? 'C' : 'c');

		break;

	case TRB_DATA:

		sprintf(str, "Buffer %08x%08x length %d TD size %d intr %d type '%s' flags %c:%c:%c:%c:%c:%c:%c",

				field1, field0, TRB_LEN(field2), GET_TD_SIZE(field2),

				GET_INTR_TARGET(field2),

				xhci_trb_type_string(TRB_FIELD_TO_TYPE(field3)),

				field3 & TRB_IDT ? 'I' : 'i',

				field3 & TRB_IOC ? 'I' : 'i',

				field3 & TRB_CHAIN ? 'C' : 'c',
@@ -2239,9 +2246,17 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2, 
				field3 & TRB_ENT ? 'E' : 'e',

				field3 & TRB_CYCLE ? 'C' : 'c');

		break;

	case TRB_NORMAL:

	case TRB_DATA:

	case TRB_STATUS:

		sprintf(str, "Buffer %08x%08x length %d TD size %d intr %d type '%s' flags %c:%c:%c:%c",

				field1, field0, TRB_LEN(field2), GET_TD_SIZE(field2),

				GET_INTR_TARGET(field2),

				xhci_trb_type_string(TRB_FIELD_TO_TYPE(field3)),

				field3 & TRB_IOC ? 'I' : 'i',

				field3 & TRB_CHAIN ? 'C' : 'c',

				field3 & TRB_ENT ? 'E' : 'e',

				field3 & TRB_CYCLE ? 'C' : 'c');

		break;

	case TRB_NORMAL:

	case TRB_ISOC:

	case TRB_EVENT_DATA:

	case TRB_TR_NOOP:

CRA Git | Maintained and supported by SUSTech CRA and CCSE