mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 09:50:04 +00:00
usb: dwc3: trace: purge dwc3_trace()
Finally get rid of dwc3_trace() hack. If any other message is truly needed, we should add proper tracepoints for them instead of hacking around with dwc3_trace() or similar. Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Felipe Balbi
parent
2870e5013e
commit
5eb30cedce
6 changed files with 24 additions and 135 deletions
|
|
@ -6,7 +6,7 @@ obj-$(CONFIG_USB_DWC3) += dwc3.o
|
|||
dwc3-y := core.o
|
||||
|
||||
ifneq ($(CONFIG_FTRACE),)
|
||||
dwc3-y += debug.o trace.o
|
||||
dwc3-y += trace.o
|
||||
endif
|
||||
|
||||
ifneq ($(filter y,$(CONFIG_USB_DWC3_HOST) $(CONFIG_USB_DWC3_DUAL_ROLE)),)
|
||||
|
|
|
|||
|
|
@ -305,13 +305,7 @@ static int dwc3_event_buffers_setup(struct dwc3 *dwc)
|
|||
struct dwc3_event_buffer *evt;
|
||||
|
||||
evt = dwc->ev_buf;
|
||||
dwc3_trace(trace_dwc3_core,
|
||||
"Event buf %p dma %08llx length %d\n",
|
||||
evt->buf, (unsigned long long) evt->dma,
|
||||
evt->length);
|
||||
|
||||
evt->lpos = 0;
|
||||
|
||||
dwc3_writel(dwc->regs, DWC3_GEVNTADRLO(0),
|
||||
lower_32_bits(evt->dma));
|
||||
dwc3_writel(dwc->regs, DWC3_GEVNTADRHI(0),
|
||||
|
|
@ -428,9 +422,6 @@ static void dwc3_core_num_eps(struct dwc3 *dwc)
|
|||
|
||||
dwc->num_in_eps = DWC3_NUM_IN_EPS(parms);
|
||||
dwc->num_out_eps = DWC3_NUM_EPS(parms) - dwc->num_in_eps;
|
||||
|
||||
dwc3_trace(trace_dwc3_core, "found %d IN and %d OUT endpoints",
|
||||
dwc->num_in_eps, dwc->num_out_eps);
|
||||
}
|
||||
|
||||
static void dwc3_cache_hwparams(struct dwc3 *dwc)
|
||||
|
|
@ -656,13 +647,13 @@ static void dwc3_core_setup_global_control(struct dwc3 *dwc)
|
|||
reg |= DWC3_GCTL_GBLHIBERNATIONEN;
|
||||
break;
|
||||
default:
|
||||
dwc3_trace(trace_dwc3_core, "No power optimization available\n");
|
||||
/* nothing */
|
||||
break;
|
||||
}
|
||||
|
||||
/* check if current dwc3 is on simulation board */
|
||||
if (dwc->hwparams.hwparams6 & DWC3_GHWPARAMS6_EN_FPGA) {
|
||||
dwc3_trace(trace_dwc3_core,
|
||||
"running on FPGA platform\n");
|
||||
dev_info(dwc->dev, "Running with FPGA optmizations\n");
|
||||
dwc->is_fpga = true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
/**
|
||||
* debug.c - DesignWare USB3 DRD Controller Debug/Trace Support
|
||||
*
|
||||
* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com
|
||||
*
|
||||
* Author: Felipe Balbi <balbi@ti.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 of
|
||||
* the License as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
void dwc3_trace(void (*trace)(struct va_format *), const char *fmt, ...)
|
||||
{
|
||||
struct va_format vaf;
|
||||
va_list args;
|
||||
|
||||
va_start(args, fmt);
|
||||
vaf.fmt = fmt;
|
||||
vaf.va = &args;
|
||||
|
||||
trace(&vaf);
|
||||
|
||||
va_end(args);
|
||||
}
|
||||
|
|
@ -345,13 +345,6 @@ static inline const char *dwc3_gadget_generic_cmd_status_string(int status)
|
|||
}
|
||||
|
||||
|
||||
#if IS_ENABLED(CONFIG_FTRACE)
|
||||
void dwc3_trace(void (*trace)(struct va_format *), const char *fmt, ...);
|
||||
#else
|
||||
static inline void dwc3_trace(void (*trace)(struct va_format *), const char *fmt, ...)
|
||||
{ }
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
extern void dwc3_debugfs_init(struct dwc3 *);
|
||||
extern void dwc3_debugfs_exit(struct dwc3 *);
|
||||
|
|
|
|||
|
|
@ -49,10 +49,8 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma,
|
|||
int ret;
|
||||
|
||||
dep = dwc->eps[epnum];
|
||||
if (dep->flags & DWC3_EP_BUSY) {
|
||||
dwc3_trace(trace_dwc3_ep0, "%s still busy", dep->name);
|
||||
if (dep->flags & DWC3_EP_BUSY)
|
||||
return 0;
|
||||
}
|
||||
|
||||
trb = &dwc->ep0_trb[dep->trb_enqueue];
|
||||
|
||||
|
|
@ -144,9 +142,6 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
|
|||
|
||||
if (dwc->ep0state == EP0_STATUS_PHASE)
|
||||
__dwc3_ep0_do_control_status(dwc, dwc->eps[direction]);
|
||||
else
|
||||
dwc3_trace(trace_dwc3_ep0,
|
||||
"too early for delayed status");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -210,9 +205,8 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,
|
|||
|
||||
spin_lock_irqsave(&dwc->lock, flags);
|
||||
if (!dep->endpoint.desc) {
|
||||
dwc3_trace(trace_dwc3_ep0,
|
||||
"trying to queue request %p to disabled %s",
|
||||
request, dep->name);
|
||||
dev_err(dwc->dev, "%s: can't queue to disabled endpoint\n",
|
||||
dep->name);
|
||||
ret = -ESHUTDOWN;
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -574,13 +568,12 @@ static int dwc3_ep0_set_address(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
|
|||
|
||||
addr = le16_to_cpu(ctrl->wValue);
|
||||
if (addr > 127) {
|
||||
dwc3_trace(trace_dwc3_ep0, "invalid device address %d", addr);
|
||||
dev_err(dwc->dev, "invalid device address %d\n", addr);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (state == USB_STATE_CONFIGURED) {
|
||||
dwc3_trace(trace_dwc3_ep0,
|
||||
"trying to set address when configured");
|
||||
dev_err(dwc->dev, "can't SetAddress() from Configured State\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
@ -765,35 +758,27 @@ static int dwc3_ep0_std_request(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
|
|||
|
||||
switch (ctrl->bRequest) {
|
||||
case USB_REQ_GET_STATUS:
|
||||
dwc3_trace(trace_dwc3_ep0, "USB_REQ_GET_STATUS");
|
||||
ret = dwc3_ep0_handle_status(dwc, ctrl);
|
||||
break;
|
||||
case USB_REQ_CLEAR_FEATURE:
|
||||
dwc3_trace(trace_dwc3_ep0, "USB_REQ_CLEAR_FEATURE");
|
||||
ret = dwc3_ep0_handle_feature(dwc, ctrl, 0);
|
||||
break;
|
||||
case USB_REQ_SET_FEATURE:
|
||||
dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_FEATURE");
|
||||
ret = dwc3_ep0_handle_feature(dwc, ctrl, 1);
|
||||
break;
|
||||
case USB_REQ_SET_ADDRESS:
|
||||
dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_ADDRESS");
|
||||
ret = dwc3_ep0_set_address(dwc, ctrl);
|
||||
break;
|
||||
case USB_REQ_SET_CONFIGURATION:
|
||||
dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_CONFIGURATION");
|
||||
ret = dwc3_ep0_set_config(dwc, ctrl);
|
||||
break;
|
||||
case USB_REQ_SET_SEL:
|
||||
dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_SEL");
|
||||
ret = dwc3_ep0_set_sel(dwc, ctrl);
|
||||
break;
|
||||
case USB_REQ_SET_ISOCH_DELAY:
|
||||
dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_ISOCH_DELAY");
|
||||
ret = dwc3_ep0_set_isoch_delay(dwc, ctrl);
|
||||
break;
|
||||
default:
|
||||
dwc3_trace(trace_dwc3_ep0, "Forwarding to gadget driver");
|
||||
ret = dwc3_ep0_delegate_req(dwc, ctrl);
|
||||
break;
|
||||
}
|
||||
|
|
@ -869,9 +854,6 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
|
|||
status = DWC3_TRB_SIZE_TRBSTS(trb->size);
|
||||
if (status == DWC3_TRBSTS_SETUP_PENDING) {
|
||||
dwc->setup_packet_pending = true;
|
||||
|
||||
dwc3_trace(trace_dwc3_ep0, "Setup Pending received");
|
||||
|
||||
if (r)
|
||||
dwc3_gadget_giveback(ep0, r, -ECONNRESET);
|
||||
|
||||
|
|
@ -961,7 +943,7 @@ static void dwc3_ep0_complete_status(struct dwc3 *dwc,
|
|||
|
||||
ret = dwc3_gadget_set_test_mode(dwc, dwc->test_mode_nr);
|
||||
if (ret < 0) {
|
||||
dwc3_trace(trace_dwc3_ep0, "Invalid Test #%d",
|
||||
dev_err(dwc->dev, "invalid test #%d\n",
|
||||
dwc->test_mode_nr);
|
||||
dwc3_ep0_stall_and_restart(dwc);
|
||||
return;
|
||||
|
|
@ -969,10 +951,8 @@ static void dwc3_ep0_complete_status(struct dwc3 *dwc,
|
|||
}
|
||||
|
||||
status = DWC3_TRB_SIZE_TRBSTS(trb->size);
|
||||
if (status == DWC3_TRBSTS_SETUP_PENDING) {
|
||||
if (status == DWC3_TRBSTS_SETUP_PENDING)
|
||||
dwc->setup_packet_pending = true;
|
||||
dwc3_trace(trace_dwc3_ep0, "Setup Pending received");
|
||||
}
|
||||
|
||||
dwc->ep0state = EP0_SETUP_PHASE;
|
||||
dwc3_ep0_out_start(dwc);
|
||||
|
|
@ -1022,10 +1002,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
|
|||
|
||||
ret = usb_gadget_map_request(&dwc->gadget, &req->request,
|
||||
dep->number);
|
||||
if (ret) {
|
||||
dwc3_trace(trace_dwc3_ep0, "failed to map request");
|
||||
if (ret)
|
||||
return;
|
||||
}
|
||||
|
||||
maxpacket = dep->endpoint.maxpacket;
|
||||
|
||||
|
|
@ -1050,10 +1028,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
|
|||
} else {
|
||||
ret = usb_gadget_map_request(&dwc->gadget, &req->request,
|
||||
dep->number);
|
||||
if (ret) {
|
||||
dwc3_trace(trace_dwc3_ep0, "failed to map request");
|
||||
if (ret)
|
||||
return;
|
||||
}
|
||||
|
||||
ret = dwc3_ep0_start_trans(dwc, dep->number, req->request.dma,
|
||||
req->request.length, DWC3_TRBCTL_CONTROL_DATA,
|
||||
|
|
@ -1123,8 +1099,7 @@ static void dwc3_ep0_xfernotready(struct dwc3 *dwc,
|
|||
if (dwc->ep0_expect_in != event->endpoint_number) {
|
||||
struct dwc3_ep *dep = dwc->eps[dwc->ep0_expect_in];
|
||||
|
||||
dwc3_trace(trace_dwc3_ep0,
|
||||
"Wrong direction for Data phase");
|
||||
dev_err(dwc->dev, "unexpected direction for Data Phase\n");
|
||||
dwc3_ep0_end_control_data(dwc, dep);
|
||||
dwc3_ep0_stall_and_restart(dwc);
|
||||
return;
|
||||
|
|
@ -1140,7 +1115,6 @@ static void dwc3_ep0_xfernotready(struct dwc3 *dwc,
|
|||
|
||||
if (dwc->delayed_status) {
|
||||
WARN_ON_ONCE(event->endpoint_number != 1);
|
||||
dwc3_trace(trace_dwc3_ep0, "Delayed Status");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -139,9 +139,6 @@ int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum dwc3_link_state state)
|
|||
udelay(5);
|
||||
}
|
||||
|
||||
dwc3_trace(trace_dwc3_gadget,
|
||||
"link state change request timed out");
|
||||
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
|
||||
|
|
@ -1115,8 +1112,7 @@ static void __dwc3_gadget_start_isoc(struct dwc3 *dwc,
|
|||
u32 uf;
|
||||
|
||||
if (list_empty(&dep->pending_list)) {
|
||||
dwc3_trace(trace_dwc3_gadget,
|
||||
"ISOC ep %s run out for requests",
|
||||
dev_info(dwc->dev, "%s: ran out of requests\n",
|
||||
dep->name);
|
||||
dep->flags |= DWC3_EP_PENDING_REQUEST;
|
||||
return;
|
||||
|
|
@ -1145,16 +1141,15 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
|
|||
int ret;
|
||||
|
||||
if (!dep->endpoint.desc) {
|
||||
dwc3_trace(trace_dwc3_gadget,
|
||||
"trying to queue request %p to disabled %s",
|
||||
&req->request, dep->endpoint.name);
|
||||
dev_err(dwc->dev, "%s: can't queue to disabled endpoint\n",
|
||||
dep->name);
|
||||
return -ESHUTDOWN;
|
||||
}
|
||||
|
||||
if (WARN(req->dep != dep, "request %p belongs to '%s'\n",
|
||||
&req->request, req->dep->name)) {
|
||||
dwc3_trace(trace_dwc3_gadget, "request %p belongs to '%s'",
|
||||
&req->request, req->dep->name);
|
||||
dev_err(dwc->dev, "%s: request %p belongs to '%s'\n",
|
||||
dep->name, &req->request, req->dep->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
@ -1204,10 +1199,6 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
|
|||
return 0;
|
||||
|
||||
ret = __dwc3_gadget_kick_transfer(dep, 0);
|
||||
if (ret && ret != -EBUSY)
|
||||
dwc3_trace(trace_dwc3_gadget,
|
||||
"%s: failed to kick transfers",
|
||||
dep->name);
|
||||
if (ret == -EBUSY)
|
||||
ret = 0;
|
||||
|
||||
|
|
@ -1226,7 +1217,6 @@ static int __dwc3_gadget_ep_queue_zlp(struct dwc3 *dwc, struct dwc3_ep *dep)
|
|||
struct usb_request *request;
|
||||
struct usb_ep *ep = &dep->endpoint;
|
||||
|
||||
dwc3_trace(trace_dwc3_gadget, "queueing ZLP");
|
||||
request = dwc3_gadget_ep_alloc_request(ep, GFP_ATOMIC);
|
||||
if (!request)
|
||||
return -ENOMEM;
|
||||
|
|
@ -1345,9 +1335,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol)
|
|||
|
||||
if (!protocol && ((dep->direction && transfer_in_flight) ||
|
||||
(!dep->direction && started))) {
|
||||
dwc3_trace(trace_dwc3_gadget,
|
||||
"%s: pending request, cannot halt",
|
||||
dep->name);
|
||||
return -EAGAIN;
|
||||
}
|
||||
|
||||
|
|
@ -1465,10 +1452,8 @@ static int __dwc3_gadget_wakeup(struct dwc3 *dwc)
|
|||
|
||||
speed = reg & DWC3_DSTS_CONNECTSPD;
|
||||
if ((speed == DWC3_DSTS_SUPERSPEED) ||
|
||||
(speed == DWC3_DSTS_SUPERSPEED_PLUS)) {
|
||||
dwc3_trace(trace_dwc3_gadget, "no wakeup on SuperSpeed");
|
||||
(speed == DWC3_DSTS_SUPERSPEED_PLUS))
|
||||
return 0;
|
||||
}
|
||||
|
||||
link_state = DWC3_DSTS_USBLNKST(reg);
|
||||
|
||||
|
|
@ -1477,9 +1462,6 @@ static int __dwc3_gadget_wakeup(struct dwc3 *dwc)
|
|||
case DWC3_LINK_STATE_U3: /* in HS, means SUSPEND */
|
||||
break;
|
||||
default:
|
||||
dwc3_trace(trace_dwc3_gadget,
|
||||
"can't wakeup from '%s'",
|
||||
dwc3_gadget_link_string(link_state));
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
@ -1584,11 +1566,6 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend)
|
|||
if (!timeout)
|
||||
return -ETIMEDOUT;
|
||||
|
||||
dwc3_trace(trace_dwc3_gadget, "gadget %s data soft-%s",
|
||||
dwc->gadget_driver
|
||||
? dwc->gadget_driver->function : "no-function",
|
||||
is_on ? "connect" : "disconnect");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1910,8 +1887,6 @@ static int dwc3_gadget_init_hw_endpoints(struct dwc3 *dwc,
|
|||
dep->endpoint.name = dep->name;
|
||||
spin_lock_init(&dep->lock);
|
||||
|
||||
dwc3_trace(trace_dwc3_gadget, "initializing %s", dep->name);
|
||||
|
||||
if (epnum == 0 || epnum == 1) {
|
||||
usb_ep_set_maxpacket_limit(&dep->endpoint, 512);
|
||||
dep->endpoint.maxburst = 1;
|
||||
|
|
@ -1958,15 +1933,13 @@ static int dwc3_gadget_init_endpoints(struct dwc3 *dwc)
|
|||
|
||||
ret = dwc3_gadget_init_hw_endpoints(dwc, dwc->num_out_eps, 0);
|
||||
if (ret < 0) {
|
||||
dwc3_trace(trace_dwc3_gadget,
|
||||
"failed to allocate OUT endpoints");
|
||||
dev_err(dwc->dev, "failed to initialize OUT endpoints\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = dwc3_gadget_init_hw_endpoints(dwc, dwc->num_in_eps, 1);
|
||||
if (ret < 0) {
|
||||
dwc3_trace(trace_dwc3_gadget,
|
||||
"failed to allocate IN endpoints");
|
||||
dev_err(dwc->dev, "failed to initialize IN endpoints\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -2041,9 +2014,6 @@ static int __dwc3_cleanup_done_trbs(struct dwc3 *dwc, struct dwc3_ep *dep,
|
|||
if (count) {
|
||||
trb_status = DWC3_TRB_SIZE_TRBSTS(trb->size);
|
||||
if (trb_status == DWC3_TRBSTS_MISSED_ISOC) {
|
||||
dwc3_trace(trace_dwc3_gadget,
|
||||
"%s: incomplete IN transfer",
|
||||
dep->name);
|
||||
/*
|
||||
* If missed isoc occurred and there is
|
||||
* no request queued then issue END
|
||||
|
|
@ -2669,8 +2639,6 @@ static void dwc3_gadget_linksts_change_interrupt(struct dwc3 *dwc,
|
|||
(pwropt != DWC3_GHWPARAMS1_EN_PWROPT_HIB)) {
|
||||
if ((dwc->link_state == DWC3_LINK_STATE_U3) &&
|
||||
(next == DWC3_LINK_STATE_RESUME)) {
|
||||
dwc3_trace(trace_dwc3_gadget,
|
||||
"ignoring transition U3 -> Resume");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -2804,11 +2772,7 @@ static void dwc3_gadget_interrupt(struct dwc3 *dwc,
|
|||
break;
|
||||
case DWC3_DEVICE_EVENT_EOPF:
|
||||
/* It changed to be suspend event for version 2.30a and above */
|
||||
if (dwc->revision < DWC3_REVISION_230A) {
|
||||
dwc3_trace(trace_dwc3_gadget, "End of Periodic Frame");
|
||||
} else {
|
||||
dwc3_trace(trace_dwc3_gadget, "U3/L1-L2 Suspend Event");
|
||||
|
||||
if (dwc->revision >= DWC3_REVISION_230A) {
|
||||
/*
|
||||
* Ignore suspend event until the gadget enters into
|
||||
* USB_STATE_CONFIGURED state.
|
||||
|
|
@ -3059,8 +3023,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
|
|||
* composite.c that we are USB 2.0 + LPM ECN.
|
||||
*/
|
||||
if (dwc->revision < DWC3_REVISION_220A)
|
||||
dwc3_trace(trace_dwc3_gadget,
|
||||
"Changing max_speed on rev %08x",
|
||||
dev_info(dwc->dev, "changing max_speed on rev %08x\n",
|
||||
dwc->revision);
|
||||
|
||||
dwc->gadget.max_speed = dwc->maximum_speed;
|
||||
|
|
|
|||
Loading…
Reference in a new issue