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

Commit 5eb30ced authored by Felipe Balbi's avatar Felipe Balbi
Browse files

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: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 2870e501

drivers/usb/dwc3/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)),)

drivers/usb/dwc3/core.c

+3 −12
Original line number Diff line number Diff line
@@ -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;

	}

drivers/usb/dwc3/debug.c

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/**

 * 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);

}

drivers/usb/dwc3/debug.h

+0 −7
Original line number Diff line number Diff line
@@ -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 *);

drivers/usb/dwc3/ep0.c

+10 −36
Original line number Diff line number Diff line
@@ -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;

		}