EHCI: HSIC: Add payload support for control transfers logging
Print first 16 bytes of control transfer's data to debug entries.
This is helpful in debugging QMI transactions. The current code
determines the direction (IN/OUT) using ep descriptor. This is
correct for all endpoints except ep0. Use URB helper functions.
CRs-Fixed: 466603
Change-Id: I8bd3e7990259587aa026bd476ac5a4d5e7f049ca
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
diff --git a/drivers/usb/host/ehci-msm-hsic.c b/drivers/usb/host/ehci-msm-hsic.c
index 48b4484..6cb663d 100644
--- a/drivers/usb/host/ehci-msm-hsic.c
+++ b/drivers/usb/host/ehci-msm-hsic.c
@@ -188,11 +188,11 @@
return tbuf;
}
-static int allow_dbg_log(int ep_addr)
+static int allow_dbg_log(struct urb *urb, int ep_addr)
{
int dir, num;
- dir = ep_addr & USB_DIR_IN ? USB_DIR_IN : USB_DIR_OUT;
+ dir = usb_urb_dir_in(urb) ? USB_DIR_IN : USB_DIR_OUT;
num = ep_addr & ~USB_DIR_IN;
num = 1 << num;
@@ -204,9 +204,9 @@
return 0;
}
-static char *get_hex_data(char *dbuf, struct urb *urb, int event, int status)
+static char *
+get_hex_data(char *dbuf, struct urb *urb, int event, int status, size_t max_len)
{
- int ep_addr = urb->ep->desc.bEndpointAddress;
char *ubuf = urb->transfer_buffer;
size_t len = event ? \
urb->actual_length : urb->transfer_buffer_length;
@@ -214,12 +214,11 @@
if (status == -EINPROGRESS)
status = 0;
- /*Only dump ep in completions and epout submissions*/
- if (len && !status &&
- (((ep_addr & USB_DIR_IN) && event) ||
- (!(ep_addr & USB_DIR_IN) && !event))) {
- if (len >= 32)
- len = 32;
+ /*Only dump ep in successful completions and epout submissions*/
+ if (len && !status && ((usb_urb_dir_in(urb) && event) ||
+ (usb_urb_dir_out(urb) && !event))) {
+ if (len >= max_len)
+ len = max_len;
hex_dump_to_buffer(ubuf, len, 32, 4, dbuf, HEX_DUMP_LEN, 0);
} else {
dbuf = "";
@@ -248,7 +247,7 @@
}
ep_addr = urb->ep->desc.bEndpointAddress;
- if (!allow_dbg_log(ep_addr))
+ if (!allow_dbg_log(urb, ep_addr))
return;
if ((ep_addr & 0x0f) == 0x0) {
@@ -257,9 +256,9 @@
write_lock_irqsave(&dbg_hsic_ctrl.lck, flags);
scnprintf(dbg_hsic_ctrl.buf[dbg_hsic_ctrl.idx],
DBG_MSG_LEN, "%s: [%s : %p]:[%s] "
- "%02x %02x %04x %04x %04x %u %d",
+ "%02x %02x %04x %04x %04x %u %d %s",
get_timestamp(tbuf), event, urb,
- (ep_addr & USB_DIR_IN) ? "in" : "out",
+ usb_urb_dir_in(urb) ? "in" : "out",
urb->setup_packet[0], urb->setup_packet[1],
(urb->setup_packet[3] << 8) |
urb->setup_packet[2],
@@ -267,17 +266,21 @@
urb->setup_packet[4],
(urb->setup_packet[7] << 8) |
urb->setup_packet[6],
- urb->transfer_buffer_length, extra);
+ urb->transfer_buffer_length, extra,
+ enable_payload_log ? get_hex_data(dbuf, urb,
+ str_to_event(event), extra, 16) : "");
dbg_inc(&dbg_hsic_ctrl.idx);
write_unlock_irqrestore(&dbg_hsic_ctrl.lck, flags);
} else {
write_lock_irqsave(&dbg_hsic_ctrl.lck, flags);
scnprintf(dbg_hsic_ctrl.buf[dbg_hsic_ctrl.idx],
- DBG_MSG_LEN, "%s: [%s : %p]:[%s] %u %d",
+ DBG_MSG_LEN, "%s: [%s : %p]:[%s] %u %d %s",
get_timestamp(tbuf), event, urb,
- (ep_addr & USB_DIR_IN) ? "in" : "out",
- urb->actual_length, extra);
+ usb_urb_dir_in(urb) ? "in" : "out",
+ urb->actual_length, extra,
+ enable_payload_log ? get_hex_data(dbuf, urb,
+ str_to_event(event), extra, 16) : "");
dbg_inc(&dbg_hsic_ctrl.idx);
write_unlock_irqrestore(&dbg_hsic_ctrl.lck, flags);
@@ -287,11 +290,11 @@
scnprintf(dbg_hsic_data.buf[dbg_hsic_data.idx], DBG_MSG_LEN,
"%s: [%s : %p]:ep%d[%s] %u %d %s",
get_timestamp(tbuf), event, urb, ep_addr & 0x0f,
- (ep_addr & USB_DIR_IN) ? "in" : "out",
+ usb_urb_dir_in(urb) ? "in" : "out",
str_to_event(event) ? urb->actual_length :
urb->transfer_buffer_length, extra,
enable_payload_log ? get_hex_data(dbuf, urb,
- str_to_event(event), extra) : "");
+ str_to_event(event), extra, 32) : "");
dbg_inc(&dbg_hsic_data.idx);
write_unlock_irqrestore(&dbg_hsic_data.lck, flags);