Merge "dwc3: Add ipc debug log for USB GSI and USB endpoint operation" (26f802e8) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/usb/dwc3/dwc3-msm.c

+16 −14

Original line number	Diff line number	Diff line
		@@ -181,6 +181,13 @@ static const struct usb_irq usb_irq_info[USB_MAX_IRQ] = {
		{"ss_phy_irq", 0},
		};

		static const char * const gsi_op_strings[] = {
		"EP_CONFIG", "START_XFER", "STORE_DBL_INFO",
		"ENABLE_GSI", "UPDATE_XFER", "RING_DB",
		"END_XFER", "GET_CH_INFO", "PREPARE_TRBS",
		"FREE_TRBS", "SET_CLR_BLOCK_DBL", "CHECK_FOR_SUSP",
		"EP_DISABLE" };

		struct dwc3_msm;

		struct extcon_nb {
		@@ -1380,6 +1387,13 @@ static bool gsi_check_ready_to_suspend(struct usb_ep *ep, bool f_suspend)
		return true;
		}

		static inline const char *gsi_op_to_string(unsigned int op)
		{
		if (op < ARRAY_SIZE(gsi_op_strings))
		return gsi_op_strings[op];

		return "Invalid";
		}

		/**
		* Performs GSI operations or GSI EP related operations.
		@@ -1403,41 +1417,36 @@ static int dwc3_msm_gsi_ep_op(struct usb_ep *ep,
		bool block_db, f_suspend;
		unsigned long flags;

		dbg_log_string("%s(%d):%s", ep->name, ep->ep_num, gsi_op_to_string(op));

		switch (op) {
		case GSI_EP_OP_PREPARE_TRBS:
		request = (struct usb_gsi_request *)op_data;
		dev_dbg(mdwc->dev, "EP_OP_PREPARE_TRBS for %s\n", ep->name);
		ret = gsi_prepare_trbs(ep, request);
		break;
		case GSI_EP_OP_FREE_TRBS:
		dev_dbg(mdwc->dev, "EP_OP_FREE_TRBS for %s\n", ep->name);
		request = (struct usb_gsi_request *)op_data;
		gsi_free_trbs(ep, request);
		break;
		case GSI_EP_OP_CONFIG:
		request = (struct usb_gsi_request *)op_data;
		dev_dbg(mdwc->dev, "EP_OP_CONFIG for %s\n", ep->name);
		spin_lock_irqsave(&dwc->lock, flags);
		gsi_configure_ep(ep, request);
		spin_unlock_irqrestore(&dwc->lock, flags);
		break;
		case GSI_EP_OP_STARTXFER:
		dev_dbg(mdwc->dev, "EP_OP_STARTXFER for %s\n", ep->name);
		spin_lock_irqsave(&dwc->lock, flags);
		ret = gsi_startxfer_for_ep(ep);
		spin_unlock_irqrestore(&dwc->lock, flags);
		break;
		case GSI_EP_OP_GET_XFER_IDX:
		dev_dbg(mdwc->dev, "EP_OP_GET_XFER_IDX for %s\n", ep->name);
		ret = gsi_get_xfer_index(ep);
		break;
		case GSI_EP_OP_STORE_DBL_INFO:
		dev_dbg(mdwc->dev, "EP_OP_STORE_DBL_INFO\n");
		request = (struct usb_gsi_request *)op_data;
		gsi_store_ringbase_dbl_info(ep, request);
		break;
		case GSI_EP_OP_ENABLE_GSI:
		dev_dbg(mdwc->dev, "EP_OP_ENABLE_GSI\n");
		gsi_enable(ep);
		break;
		case GSI_EP_OP_GET_CH_INFO:
		@@ -1446,36 +1455,29 @@ static int dwc3_msm_gsi_ep_op(struct usb_ep *ep,
		break;
		case GSI_EP_OP_RING_DB:
		request = (struct usb_gsi_request *)op_data;
		dbg_print(0xFF, "RING_DB", 0, ep->name);
		gsi_ring_db(ep, request);
		break;
		case GSI_EP_OP_UPDATEXFER:
		request = (struct usb_gsi_request *)op_data;
		dev_dbg(mdwc->dev, "EP_OP_UPDATEXFER\n");
		spin_lock_irqsave(&dwc->lock, flags);
		ret = gsi_updatexfer_for_ep(ep, request);
		spin_unlock_irqrestore(&dwc->lock, flags);
		break;
		case GSI_EP_OP_ENDXFER:
		request = (struct usb_gsi_request *)op_data;
		dev_dbg(mdwc->dev, "EP_OP_ENDXFER for %s\n", ep->name);
		spin_lock_irqsave(&dwc->lock, flags);
		gsi_endxfer_for_ep(ep);
		spin_unlock_irqrestore(&dwc->lock, flags);
		break;
		case GSI_EP_OP_SET_CLR_BLOCK_DBL:
		block_db = ((bool )op_data);
		dev_dbg(mdwc->dev, "EP_OP_SET_CLR_BLOCK_DBL %d\n",
		block_db);
		gsi_set_clear_dbell(ep, block_db);
		break;
		case GSI_EP_OP_CHECK_FOR_SUSPEND:
		dev_dbg(mdwc->dev, "EP_OP_CHECK_FOR_SUSPEND\n");
		f_suspend = ((bool )op_data);
		ret = gsi_check_ready_to_suspend(ep, f_suspend);
		break;
		case GSI_EP_OP_DISABLE:
		dev_dbg(mdwc->dev, "EP_OP_DISABLE\n");
		ret = ep->ops->disable(ep);
		break;
		default:

drivers/usb/dwc3/gadget.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -846,6 +846,7 @@ static void dwc3_remove_requests(struct dwc3 dwc, struct dwc3_ep dep)
		{
		struct dwc3_request *req;

		dbg_log_string("START for %s(%d)", dep->name, dep->number);
		dwc3_stop_active_transfer(dwc, dep->number, true);

		/* - giveback all requests to gadget driver */
		@@ -860,12 +861,14 @@ static void dwc3_remove_requests(struct dwc3 dwc, struct dwc3_ep dep)

		dwc3_gadget_giveback(dep, req, -ESHUTDOWN);
		}
		dbg_log_string("DONE for %s(%d)", dep->name, dep->number);
		}

		static void dwc3_stop_active_transfers(struct dwc3 *dwc)
		{
		u32 epnum;

		dbg_log_string("START");
		for (epnum = 2; epnum < DWC3_ENDPOINTS_NUM; epnum++) {
		struct dwc3_ep *dep;

		@@ -878,6 +881,7 @@ static void dwc3_stop_active_transfers(struct dwc3 *dwc)

		dwc3_remove_requests(dwc, dep);
		}
		dbg_log_string("DONE");
		}

		/**
		@@ -3141,6 +3145,8 @@ void dwc3_stop_active_transfer(struct dwc3 *dwc, u32 epnum, bool force)
		dep->flags \|= DWC3_EP_END_TRANSFER_PENDING;
		udelay(100);
		}
		dbg_log_string("%s(%d): endxfer ret:%d)",
		dep->name, dep->number, ret);
		}

		static void dwc3_clear_stall_all_ep(struct dwc3 *dwc)