Merge "usb: gadget: Add new ipc log buffer to log request and dma" (a5ed2070) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/usb/dwc3/core.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1406,6 +1406,7 @@ static int dwc3_probe(struct platform_device *pdev)

		void __iomem *regs;
		int irq;
		char dma_ipc_log_ctx_name[40];

		if (count >= DWC_CTRL_COUNT) {
		dev_err(dev, "Err dwc instance %d >= %d available\n",
		@@ -1545,6 +1546,13 @@ static int dwc3_probe(struct platform_device *pdev)
		if (!dwc->dwc_ipc_log_ctxt)
		dev_err(dwc->dev, "Error getting ipc_log_ctxt\n");

		snprintf(dma_ipc_log_ctx_name, sizeof(dma_ipc_log_ctx_name),
		"%s.ep_events", dev_name(dwc->dev));
		dwc->dwc_dma_ipc_log_ctxt = ipc_log_context_create(NUM_LOG_PAGES,
		dma_ipc_log_ctx_name, 0);
		if (!dwc->dwc_dma_ipc_log_ctxt)
		dev_err(dwc->dev, "Error getting ipc_log_ctxt for ep_events\n");

		dwc3_instance[count] = dwc;
		dwc->index = count;
		count++;

drivers/usb/dwc3/core.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -1318,6 +1318,7 @@ struct dwc3 {

		unsigned int index;
		void *dwc_ipc_log_ctxt;
		void *dwc_dma_ipc_log_ctxt;
		struct dwc3_gadget_events dbg_gadget_events;
		int tx_fifo_size;
		int last_fifo_depth;

drivers/usb/dwc3/debug.h

+20 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,18 @@
		#define dbg_setup(ep_num, req) \
		dwc3_dbg_setup(dwc, ep_num, req)

		#define dbg_ep_queue(ep_num, req) \
		dwc3_dbg_dma_queue(dwc, ep_num, req)

		#define dbg_ep_dequeue(ep_num, req) \
		dwc3_dbg_dma_dequeue(dwc, ep_num, req)

		#define dbg_ep_unmap(ep_num, req) \
		dwc3_dbg_dma_unmap(dwc, ep_num, req)

		#define dbg_ep_map(ep_num, req) \
		dwc3_dbg_dma_map(dwc, ep_num, req)

		#define dbg_log_string(fmt, ...) \
		ipc_log_string(dwc->dwc_ipc_log_ctxt,\
		"%s: " fmt, __func__, ##__VA_ARGS__)
		@@ -660,6 +672,14 @@ void dwc3_dbg_setup(struct dwc3 *dwc, u8 ep_num,
		const struct usb_ctrlrequest *req);
		void dwc3_dbg_print_reg(struct dwc3 *dwc,
		const char *name, int reg);
		void dwc3_dbg_dma_queue(struct dwc3 *dwc, u8 ep_num,
		struct dwc3_request *req);
		void dwc3_dbg_dma_dequeue(struct dwc3 *dwc, u8 ep_num,
		struct dwc3_request *req);
		void dwc3_dbg_dma_map(struct dwc3 *dwc, u8 ep_num,
		struct dwc3_request *req);
		void dwc3_dbg_dma_unmap(struct dwc3 *dwc, u8 ep_num,
		struct dwc3_request *req);

		#ifdef CONFIG_DEBUG_FS
		extern void dwc3_debugfs_init(struct dwc3 *);

drivers/usb/dwc3/debug_ipc.c

+45 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
		*/

		#include "debug.h"
		@@ -136,3 +136,47 @@ void dwc3_dbg_print_reg(struct dwc3 dwc, const char name, int reg)

		ipc_log_string(dwc->dwc_ipc_log_ctxt, "%s = 0x%08x", name, reg);
		}

		void dwc3_dbg_dma_unmap(struct dwc3 dwc, u8 ep_num, struct dwc3_request req)
		{
		if (ep_num < 2)
		return;

		ipc_log_string(dwc->dwc_dma_ipc_log_ctxt,
		"%02X-%-3.3s %-25.25s 0x%pK 0x%lx %u 0x%lx %d", ep_num >> 1,
		ep_num & 1 ? "IN":"OUT", "UNMAP", &req->request,
		req->request.dma, req->request.length, req->trb_dma,
		req->trb->ctrl & DWC3_TRB_CTRL_HWO);
		}

		void dwc3_dbg_dma_map(struct dwc3 dwc, u8 ep_num, struct dwc3_request req)
		{
		if (ep_num < 2)
		return;

		ipc_log_string(dwc->dwc_dma_ipc_log_ctxt,
		"%02X-%-3.3s %-25.25s 0x%pK 0x%lx %u 0x%lx", ep_num >> 1,
		ep_num & 1 ? "IN":"OUT", "MAP", &req->request, req->request.dma,
		req->request.length, req->trb_dma);
		}

		void dwc3_dbg_dma_dequeue(struct dwc3 dwc, u8 ep_num, struct dwc3_request req)
		{
		if (ep_num < 2)
		return;

		ipc_log_string(dwc->dwc_dma_ipc_log_ctxt,
		"%02X-%-3.3s %-25.25s 0x%pK 0x%lx 0x%lx", ep_num >> 1,
		ep_num & 1 ? "IN":"OUT", "DEQUEUE", &req->request,
		req->request.dma, req->trb_dma);
		}

		void dwc3_dbg_dma_queue(struct dwc3 dwc, u8 ep_num, struct dwc3_request req)
		{
		if (ep_num < 2)
		return;

		ipc_log_string(dwc->dwc_dma_ipc_log_ctxt,
		"%02X-%-3.3s %-25.25s 0x%pK", ep_num >> 1,
		ep_num & 1 ? "IN":"OUT", "QUEUE", &req->request);
		}

drivers/usb/dwc3/gadget.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -289,9 +289,11 @@ static void dwc3_gadget_del_and_unmap_request(struct dwc3_ep *dep,
		if (req->request.status == -EINPROGRESS)
		req->request.status = status;

		if (req->trb)
		if (req->trb) {
		dbg_ep_unmap(dep->number, req);
		usb_gadget_unmap_request_by_dev(dwc->sysdev,
		&req->request, req->direction);
		}

		req->trb = NULL;
		trace_dwc3_gadget_giveback(req);
		@@ -1401,6 +1403,7 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep)
		else
		dwc3_prepare_one_trb_linear(dep, req);

		dbg_ep_map(dep->number, req);
		if (!dwc3_calc_trbs_left(dep))
		return;
		}
		@@ -1545,6 +1548,7 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep dep, struct dwc3_request req)

		list_add_tail(&req->list, &dep->pending_list);

		dbg_ep_queue(dep->number, req);
		/*
		* NOTICE: Isochronous endpoints should NEVER be prestarted. We must
		* wait for a XferNotReady event so we will know what's the current
		@@ -1704,7 +1708,7 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
		}

		out1:
		dbg_event(dep->number, "DEQUEUE", 0);
		dbg_ep_dequeue(dep->number, req);
		/* giveback the request */

		dwc3_gadget_giveback(dep, req, -ECONNRESET);