MLK-18579-1 usb: cdns3: using upstream multiple TD driver

Keep the internal framework, just use the UDC driver from
upstream version which supports multiple TD.

Reviewed-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>

10 files changed, 4502 insertions, 2103 deletions

diff --git a/drivers/usb/cdns3/Makefile b/drivers/usb/cdns3/Makefile
index 7328cb9fcc89..f76e772c2587 100644
--- a/drivers/usb/cdns3/Makefile
+++ b/drivers/usb/cdns3/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_USB_CDNS3)		+= cdns3.o
 
 cdns3-y				:= core.o
-cdns3-$(CONFIG_USB_CDNS3_GADGET)	+= gadget.o
+cdns3-$(CONFIG_USB_CDNS3_GADGET)	+= gadget.o ep0.o trace.o
 cdns3-$(CONFIG_USB_CDNS3_HOST)	+= host.o
diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index 063678b6b577..ab2886a39ee8 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -1,7 +1,7 @@
 /**
  * core.c - Cadence USB3 DRD Controller Core file
  *
- * Copyright 2017 NXP
+ * Copyright 2017-2019 NXP
  *
  * Authors: Peter Chen <peter.chen@nxp.com>
  *
@@ -36,6 +36,39 @@
 #include "host-export.h"
 #include "gadget-export.h"
 
+/**
+ * cdns3_handshake - spin reading  until handshake completes or fails
+ * @ptr: address of device controller register to be read
+ * @mask: bits to look at in result of read
+ * @done: value of those bits when handshake succeeds
+ * @usec: timeout in microseconds
+ *
+ * Returns negative errno, or zero on success
+ *
+ * Success happens when the "mask" bits have the specified value (hardware
+ * handshake done). There are two failure modes: "usec" have passed (major
+ * hardware flakeout), or the register reads as all-ones (hardware removed).
+ */
+int cdns3_handshake(void __iomem *ptr, u32 mask, u32 done, int usec)
+{
+	u32 result;
+
+	do {
+		result = readl(ptr);
+		if (result == ~(u32)0)  /* card removed */
+			return -ENODEV;
+
+		result &= mask;
+		if (result == done)
+			return 0;
+
+		udelay(1);
+		usec--;
+	} while (usec > 0);
+
+	return -ETIMEDOUT;
+}
+
 static void cdns3_usb_phy_init(void __iomem *regs)
 {
 	u32 value;
@@ -311,6 +344,18 @@ static irqreturn_t cdns3_irq(int irq, void *data)
 	return ret;
 }
 
+static irqreturn_t cdns3_thread_irq(int irq, void *data)
+{
+	struct cdns3 *cdns = data;
+	irqreturn_t ret = IRQ_NONE;
+
+	/* Handle device/host interrupt */
+	if (cdns->role != CDNS3_ROLE_END && cdns3_role(cdns)->thread_irq)
+		ret = cdns3_role(cdns)->thread_irq(cdns);
+
+	return ret;
+}
+
 static int cdns3_get_clks(struct device *dev)
 {
 	struct cdns3 *cdns = dev_get_drvdata(dev);
@@ -388,7 +433,7 @@ static void cdns3_disable_unprepare_clks(struct device *dev)
 
 static void cdns3_remove_roles(struct cdns3 *cdns)
 {
-	cdns3_gadget_remove(cdns);
+	cdns3_gadget_exit(cdns);
 	cdns3_host_remove(cdns);
 }
 
@@ -656,8 +701,8 @@ static int cdns3_probe(struct platform_device *pdev)
 		goto err3;
 	}
 
-	ret = devm_request_irq(dev, cdns->irq, cdns3_irq, IRQF_SHARED,
-			dev_name(dev), cdns);
+	ret = devm_request_threaded_irq(dev, cdns->irq, cdns3_irq,
+			cdns3_thread_irq, IRQF_SHARED, dev_name(dev), cdns);
 	if (ret)
 		goto err4;
 
diff --git a/drivers/usb/cdns3/core.h b/drivers/usb/cdns3/core.h
index 738dbfa836cf..a6bd1cfb4c7d 100644
--- a/drivers/usb/cdns3/core.h
+++ b/drivers/usb/cdns3/core.h
@@ -1,7 +1,7 @@
 /**
  * core.h - Cadence USB3 DRD Controller Core header file
  *
- * Copyright 2017 NXP
+ * Copyright 2017-2019 NXP
  *
  * Authors: Peter Chen <peter.chen@nxp.com>
  *
@@ -35,6 +35,7 @@ enum cdns3_roles {
  * @suspend: suspend callback for this role
  * @resume: resume callback for this role
  * @irq: irq handler for this role
+ * @thread_irq: thread irq handler for this role
  * @name: role name string (host/gadget)
  */
 struct cdns3_role_driver {
@@ -43,6 +44,7 @@ struct cdns3_role_driver {
 	int (*suspend)(struct cdns3 *, bool do_wakeup);
 	int (*resume)(struct cdns3 *, bool hibernated);
 	irqreturn_t (*irq)(struct cdns3 *);
+	irqreturn_t (*thread_irq)(struct cdns3 *);
 	const char *name;
 };
 
@@ -74,7 +76,7 @@ struct cdns3 {
 	struct device *dev;
 	void __iomem *xhci_regs;
 	struct resource *xhci_res;
-	struct usbss_dev_register_block_type __iomem *dev_regs;
+	struct cdns3_usb_regs __iomem *dev_regs;
 	void __iomem *none_core_regs;
 	void __iomem *phy_regs;
 	void __iomem *otg_regs;
@@ -82,7 +84,7 @@ struct cdns3 {
 	struct cdns3_role_driver *roles[CDNS3_ROLE_END];
 	enum cdns3_roles role;
 	struct device *host_dev;
-	struct device *gadget_dev;
+	struct cdns3_device *gadget_dev;
 	struct usb_phy *usbphy;
 	struct clk *cdns3_clks[CDNS3_NUM_OF_CLKS];
 	struct extcon_dev *extcon;
@@ -127,5 +129,6 @@ static inline void cdns3_role_stop(struct cdns3 *cdns)
 	cdns->role = CDNS3_ROLE_END;
 	mutex_unlock(&cdns->mutex);
 }
+int cdns3_handshake(void __iomem *ptr, u32 mask, u32 done, int usec);
 
 #endif /* __DRIVERS_USB_CDNS3_CORE_H */
diff --git a/drivers/usb/cdns3/debug.h b/drivers/usb/cdns3/debug.h
new file mode 100644
index 000000000000..8193676dc9f3
--- /dev/null
+++ b/drivers/usb/cdns3/debug.h
@@ -0,0 +1,155 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Cadence USBSS DRD Driver.
+ * Debug header file.
+ *
+ * Copyright (C) 2018-2019 Cadence.
+ *
+ * Author: Pawel Laszczak <pawell@cadence.com>
+ */
+#ifndef __LINUX_CDNS3_DEBUG
+#define __LINUX_CDNS3_DEBUG
+
+static inline char *cdns3_decode_usb_irq(char *str,
+					 enum usb_device_speed speed,
+					 u32 usb_ists)
+{
+	int ret;
+
+	ret = sprintf(str, "IRQ %08x = ", usb_ists);
+
+	if (usb_ists & (USB_ISTS_CON2I | USB_ISTS_CONI)) {
+		ret += sprintf(str + ret, "Connection %s\n",
+			       usb_speed_string(speed));
+	}
+	if (usb_ists & USB_ISTS_DIS2I || usb_ists & USB_ISTS_DISI)
+		ret += sprintf(str + ret, "Disconnection ");
+	if (usb_ists & USB_ISTS_L2ENTI)
+		ret += sprintf(str + ret, "suspended ");
+
+	if (usb_ists & USB_ISTS_L2EXTI)
+		ret += sprintf(str + ret, "L2 exit ");
+	if (usb_ists & USB_ISTS_U3EXTI)
+		ret += sprintf(str + ret, "U3 exit ");
+	if (usb_ists & USB_ISTS_UWRESI)
+		ret += sprintf(str + ret, "Warm Reset ");
+	if (usb_ists & USB_ISTS_UHRESI)
+		ret += sprintf(str + ret, "Hot Reset ");
+	if (usb_ists & USB_ISTS_U2RESI)
+		ret += sprintf(str + ret, "Reset");
+
+	return str;
+}
+
+static inline  char *cdns3_decode_ep_irq(char *str,
+					 u32 ep_sts,
+					 const char *ep_name)
+{
+	int ret;
+
+	ret = sprintf(str, "IRQ for %s: %08x ", ep_name, ep_sts);
+
+	if (ep_sts & EP_STS_SETUP)
+		ret += sprintf(str + ret, "SETUP ");
+	if (ep_sts & EP_STS_IOC)
+		ret += sprintf(str + ret, "IOC ");
+	if (ep_sts & EP_STS_ISP)
+		ret += sprintf(str + ret, "ISP ");
+	if (ep_sts & EP_STS_DESCMIS)
+		ret += sprintf(str + ret, "DESCMIS ");
+	if (ep_sts & EP_STS_STREAMR)
+		ret += sprintf(str + ret, "STREAMR ");
+	if (ep_sts & EP_STS_MD_EXIT)
+		ret += sprintf(str + ret, "MD_EXIT ");
+	if (ep_sts & EP_STS_TRBERR)
+		ret += sprintf(str + ret, "TRBERR ");
+	if (ep_sts & EP_STS_NRDY)
+		ret += sprintf(str + ret, "NRDY ");
+	if (ep_sts & EP_STS_PRIME)
+		ret += sprintf(str + ret, "PRIME ");
+	if (ep_sts & EP_STS_SIDERR)
+		ret += sprintf(str + ret, "SIDERRT ");
+	if (ep_sts & EP_STS_OUTSMM)
+		ret += sprintf(str + ret, "OUTSMM ");
+	if (ep_sts & EP_STS_ISOERR)
+		ret += sprintf(str + ret, "ISOERR ");
+	if (ep_sts & EP_STS_IOT)
+		ret += sprintf(str + ret, "IOT ");
+
+	return str;
+}
+
+static inline char *cdns3_decode_epx_irq(char *str,
+					 char *ep_name,
+					 u32 ep_sts)
+{
+	return cdns3_decode_ep_irq(str, ep_sts, ep_name);
+}
+
+static inline char *cdns3_decode_ep0_irq(char *str,
+					 int dir,
+					 u32 ep_sts)
+{
+	return cdns3_decode_ep_irq(str, ep_sts,
+				   dir ? "ep0IN" : "ep0OUT");
+}
+
+/**
+ * Debug a transfer ring.
+ *
+ * Prints out all TRBs in the endpoint ring, even those after the Link TRB.
+ *.
+ */
+static inline char *cdns3_dbg_ring(struct cdns3_endpoint *priv_ep,
+				   struct cdns3_trb *ring, char *str)
+{
+	dma_addr_t addr = priv_ep->trb_pool_dma;
+	struct cdns3_trb *trb;
+	int trb_per_sector;
+	int ret = 0;
+	int i;
+
+	trb_per_sector = GET_TRBS_PER_SEGMENT(priv_ep->type);
+
+	trb = &priv_ep->trb_pool[priv_ep->dequeue];
+	ret += sprintf(str + ret, "\n\t\tRing contents for %s:", priv_ep->name);
+
+	ret += sprintf(str + ret,
+		       "\n\t\tRing deq index: %d, trb: %p (virt), 0x%llx (dma)\n",
+		       priv_ep->dequeue, trb,
+		       (unsigned long long)cdns3_trb_virt_to_dma(priv_ep, trb));
+
+	trb = &priv_ep->trb_pool[priv_ep->enqueue];
+	ret += sprintf(str + ret,
+		       "\t\tRing enq index: %d, trb: %p (virt), 0x%llx (dma)\n",
+		       priv_ep->enqueue, trb,
+		       (unsigned long long)cdns3_trb_virt_to_dma(priv_ep, trb));
+
+	ret += sprintf(str + ret,
+		       "\t\tfree trbs: %d, CCS=%d, PCS=%d\n",
+		       priv_ep->free_trbs, priv_ep->ccs, priv_ep->pcs);
+
+	if (trb_per_sector > TRBS_PER_SEGMENT)
+		trb_per_sector = TRBS_PER_SEGMENT;
+
+	if (trb_per_sector > TRBS_PER_SEGMENT) {
+		sprintf(str + ret, "\t\tTo big transfer ring %d\n",
+			trb_per_sector);
+		return str;
+	}
+
+	for (i = 0; i < trb_per_sector; ++i) {
+		trb = &ring[i];
+		ret += sprintf(str + ret,
+			"\t\t@%pad %08x %08x %08x\n", &addr,
+			le32_to_cpu(trb->buffer),
+			le32_to_cpu(trb->length),
+			le32_to_cpu(trb->control));
+		addr += sizeof(*trb);
+	}
+
+	return str;
+}
+
+void cdns3_dbg(struct cdns3_device *priv_dev, const char *fmt, ...);
+#endif /*__LINUX_CDNS3_DEBUG*/
diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c
new file mode 100644
index 000000000000..7eded8a5b3c4
--- /dev/null
+++ b/drivers/usb/cdns3/ep0.c
@@ -0,0 +1,914 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Cadence USBSS DRD Driver - gadget side.
+ *
+ * Copyright (C) 2018 Cadence Design Systems.
+ * Copyright (C) 2017-2018 NXP
+ *
+ * Authors: Pawel Jez <pjez@cadence.com>,
+ *          Pawel Laszczak <pawell@cadence.com>
+ *	    Peter Chen <peter.chen@nxp.com>
+ */
+
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/usb/composite.h>
+
+#include "gadget.h"
+#include "trace.h"
+#include "core.h"
+
+static struct usb_endpoint_descriptor cdns3_gadget_ep0_desc = {
+	.bLength = USB_DT_ENDPOINT_SIZE,
+	.bDescriptorType = USB_DT_ENDPOINT,
+	.bmAttributes =	USB_ENDPOINT_XFER_CONTROL,
+};
+
+/**
+ * cdns3_ep0_run_transfer - Do transfer on default endpoint hardware
+ * @priv_dev: extended gadget object
+ * @dma_addr: physical address where data is/will be stored
+ * @length: data length
+ * @erdy: set it to 1 when ERDY packet should be sent -
+ *        exit from flow control state
+ */
+static void cdns3_ep0_run_transfer(struct cdns3_device *priv_dev,
+				   dma_addr_t dma_addr,
+				   unsigned int length, int erdy)
+{
+	struct cdns3_usb_regs __iomem *regs = priv_dev->regs;
+	struct cdns3_endpoint *priv_ep = priv_dev->eps[0];
+
+	priv_ep->trb_pool->buffer = TRB_BUFFER(dma_addr);
+	priv_ep->trb_pool->length = TRB_LEN(length);
+	priv_ep->trb_pool->control = TRB_CYCLE | TRB_IOC | TRB_TYPE(TRB_NORMAL);
+
+	trace_cdns3_prepare_trb(priv_ep, priv_ep->trb_pool);
+
+	cdns3_select_ep(priv_dev, priv_dev->ep0_data_dir);
+
+	writel(EP_STS_TRBERR, &regs->ep_sts);
+	writel(EP_TRADDR_TRADDR(priv_ep->trb_pool_dma), &regs->ep_traddr);
+	trace_cdns3_doorbell_ep0(priv_dev->ep0_data_dir ? "ep0in" : "ep0out",
+				 readl(&regs->ep_traddr));
+
+	/* TRB should be prepared before starting transfer */
+	writel(EP_CMD_DRDY, &regs->ep_cmd);
+
+	if (erdy)
+		writel(EP_CMD_ERDY, &priv_dev->regs->ep_cmd);
+}
+
+/**
+ * cdns3_ep0_delegate_req - Returns status of handling setup packet
+ * Setup is handled by gadget driver
+ * @priv_dev: extended gadget object
+ * @ctrl_req: pointer to received setup packet
+ *
+ * Returns zero on success or negative value on failure
+ */
+static int cdns3_ep0_delegate_req(struct cdns3_device *priv_dev,
+				  struct usb_ctrlrequest *ctrl_req)
+{
+	int ret;
+
+	spin_unlock(&priv_dev->lock);
+	priv_dev->setup_pending = 1;
+	ret = priv_dev->gadget_driver->setup(&priv_dev->gadget, ctrl_req);
+	priv_dev->setup_pending = 0;
+	spin_lock(&priv_dev->lock);
+	return ret;
+}
+
+static void cdns3_prepare_setup_packet(struct cdns3_device *priv_dev)
+{
+	priv_dev->ep0_data_dir = 0;
+	priv_dev->ep0_stage = CDNS3_SETUP_STAGE;
+	cdns3_ep0_run_transfer(priv_dev, priv_dev->setup_dma,
+			       sizeof(struct usb_ctrlrequest), 0);
+}
+
+static void cdns3_ep0_complete_setup(struct cdns3_device *priv_dev,
+				     u8 send_stall, u8 send_erdy)
+{
+	struct cdns3_endpoint *priv_ep = priv_dev->eps[0];
+	struct usb_request *request;
+
+	request = cdns3_next_request(&priv_ep->pending_req_list);
+	if (request)
+		list_del_init(&request->list);
+
+	if (send_stall) {
+		cdns3_dbg(priv_ep->cdns3_dev, "STALL for ep0\n");
+		/* set_stall on ep0 */
+		cdns3_select_ep(priv_dev, 0x00);
+		writel(EP_CMD_SSTALL, &priv_dev->regs->ep_cmd);
+	} else {
+		cdns3_prepare_setup_packet(priv_dev);
+	}
+
+	priv_dev->ep0_stage = CDNS3_SETUP_STAGE;
+	writel((send_erdy ? EP_CMD_ERDY : 0) | EP_CMD_REQ_CMPL,
+	       &priv_dev->regs->ep_cmd);
+}
+
+/**
+ * cdns3_req_ep0_set_configuration - Handling of SET_CONFIG standard USB request
+ * @priv_dev: extended gadget object
+ * @ctrl_req: pointer to received setup packet
+ *
+ * Returns 0 if success, USB_GADGET_DELAYED_STATUS on deferred status stage,
+ * error code on error
+ */
+static int cdns3_req_ep0_set_configuration(struct cdns3_device *priv_dev,
+					   struct usb_ctrlrequest *ctrl_req)
+{
+	enum usb_device_state device_state = priv_dev->gadget.state;
+	struct cdns3_endpoint *priv_ep;
+	u32 config = le16_to_cpu(ctrl_req->wValue);
+	int result = 0;
+	int i;
+
+	switch (device_state) {
+	case USB_STATE_ADDRESS:
+		/* Configure non-control EPs */
+		for (i = 0; i < CDNS3_ENDPOINTS_MAX_COUNT; i++) {
+			priv_ep = priv_dev->eps[i];
+			if (!priv_ep)
+				continue;
+
+			if (priv_ep->flags & EP_CLAIMED)
+				cdns3_ep_config(priv_ep);
+		}
+
+		result = cdns3_ep0_delegate_req(priv_dev, ctrl_req);
+
+		if (result)
+			return result;
+
+		if (config) {
+			cdns3_set_hw_configuration(priv_dev);
+		} else {
+			cdns3_hw_reset_eps_config(priv_dev);
+			usb_gadget_set_state(&priv_dev->gadget,
+					     USB_STATE_ADDRESS);
+		}
+		break;
+	case USB_STATE_CONFIGURED:
+		result = cdns3_ep0_delegate_req(priv_dev, ctrl_req);
+
+		if (!config && !result) {
+			cdns3_hw_reset_eps_config(priv_dev);
+			usb_gadget_set_state(&priv_dev->gadget,
+					     USB_STATE_ADDRESS);
+		}
+		break;
+	default:
+		result = -EINVAL;
+	}
+
+	return result;
+}
+
+/**
+ * cdns3_req_ep0_set_address - Handling of SET_ADDRESS standard USB request
+ * @priv_dev: extended gadget object
+ * @ctrl_req: pointer to received setup packet
+ *
+ * Returns 0 if success, error code on error
+ */
+static int cdns3_req_ep0_set_address(struct cdns3_device *priv_dev,
+				     struct usb_ctrlrequest *ctrl_req)
+{
+	enum usb_device_state device_state = priv_dev->gadget.state;
+	u32 reg;
+	u32 addr;
+
+	addr = le16_to_cpu(ctrl_req->wValue);
+
+	if (addr > USB_DEVICE_MAX_ADDRESS) {
+		dev_err(priv_dev->dev,
+			"Device address (%d) cannot be greater than %d\n",
+			addr, USB_DEVICE_MAX_ADDRESS);
+		return -EINVAL;
+	}
+
+	if (device_state == USB_STATE_CONFIGURED) {
+		dev_err(priv_dev->dev,
+			"can't set_address from configured state\n");
+		return -EINVAL;
+	}
+
+	reg = readl(&priv_dev->regs->usb_cmd);
+
+	writel(reg | USB_CMD_FADDR(addr) | USB_CMD_SET_ADDR,
+	       &priv_dev->regs->usb_cmd);
+
+	usb_gadget_set_state(&priv_dev->gadget,
+			     (addr ? USB_STATE_ADDRESS : USB_STATE_DEFAULT));
+
+	return 0;
+}
+
+/**
+ * cdns3_req_ep0_get_status - Handling of GET_STATUS standard USB request
+ * @priv_dev: extended gadget object
+ * @ctrl_req: pointer to received setup packet
+ *
+ * Returns 0 if success, error code on error
+ */
+static int cdns3_req_ep0_get_status(struct cdns3_device *priv_dev,
+				    struct usb_ctrlrequest *ctrl)
+{
+	__le16 *response_pkt;
+	u16 usb_status = 0;
+	u32 recip;
+	u32 reg;
+
+	recip = ctrl->bRequestType & USB_RECIP_MASK;
+
+	switch (recip) {
+	case USB_RECIP_DEVICE:
+		/* self powered */
+		if (priv_dev->is_selfpowered)
+			usb_status = BIT(USB_DEVICE_SELF_POWERED);
+
+		if (priv_dev->wake_up_flag)
+			usb_status |= BIT(USB_DEVICE_REMOTE_WAKEUP);
+
+		if (priv_dev->gadget.speed != USB_SPEED_SUPER)
+			break;
+
+		reg = readl(&priv_dev->regs->usb_sts);
+
+		if (priv_dev->u1_allowed)
+			usb_status |= BIT(USB_DEV_STAT_U1_ENABLED);
+
+		if (priv_dev->u2_allowed)
+			usb_status |= BIT(USB_DEV_STAT_U2_ENABLED);
+
+		break;
+	case USB_RECIP_INTERFACE:
+		return cdns3_ep0_delegate_req(priv_dev, ctrl);
+	case USB_RECIP_ENDPOINT:
+		/* check if endpoint is stalled */
+		cdns3_select_ep(priv_dev, ctrl->wIndex);
+		if (EP_STS_STALL(readl(&priv_dev->regs->ep_sts)))
+			usb_status =  BIT(USB_ENDPOINT_HALT);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	response_pkt = (__le16 *)priv_dev->setup_buf;
+	*response_pkt = cpu_to_le16(usb_status);
+
+	cdns3_ep0_run_transfer(priv_dev, priv_dev->setup_dma,
+			       sizeof(*response_pkt), 1);
+	return 0;
+}
+
+static int cdns3_ep0_feature_handle_device(struct cdns3_device *priv_dev,
+					   struct usb_ctrlrequest *ctrl,
+					   int set)
+{
+	enum usb_device_state state;
+	enum usb_device_speed speed;
+	int ret = 0;
+	u32 wValue;
+	u32 wIndex;
+	u16 tmode;
+
+	wValue = le16_to_cpu(ctrl->wValue);
+	wIndex = le16_to_cpu(ctrl->wIndex);
+	state = priv_dev->gadget.state;
+	speed = priv_dev->gadget.speed;
+
+	switch (ctrl->wValue) {
+	case USB_DEVICE_REMOTE_WAKEUP:
+		priv_dev->wake_up_flag = !!set;
+		break;
+	case USB_DEVICE_U1_ENABLE:
+		if (state != USB_STATE_CONFIGURED || speed != USB_SPEED_SUPER)
+			return -EINVAL;
+
+		priv_dev->u1_allowed = !!set;
+		break;
+	case USB_DEVICE_U2_ENABLE:
+		if (state != USB_STATE_CONFIGURED || speed != USB_SPEED_SUPER)
+			return -EINVAL;
+
+		priv_dev->u2_allowed = !!set;
+		break;
+	case USB_DEVICE_LTM_ENABLE:
+		ret = -EINVAL;
+		break;
+	case USB_DEVICE_TEST_MODE:
+		if (state != USB_STATE_CONFIGURED || speed > USB_SPEED_HIGH)
+			return -EINVAL;
+
+		tmode = le16_to_cpu(ctrl->wIndex);
+
+		if (!set || (tmode & 0xff) != 0)
+			return -EINVAL;
+
+		switch (tmode >> 8) {
+		case TEST_J:
+		case TEST_K:
+		case TEST_SE0_NAK:
+		case TEST_PACKET:
+			cdns3_ep0_complete_setup(priv_dev, 0, 1);
+			/**
+			 *  Little delay to give the controller some time
+			 * for sending status stage.
+			 * This time should be less then 3ms.
+			 */
+			usleep_range(1000, 2000);
+			cdns3_set_register_bit(&priv_dev->regs->usb_cmd,
+					       USB_CMD_STMODE |
+					       USB_STS_TMODE_SEL(tmode - 1));
+			break;
+		default:
+			ret = -EINVAL;
+		}
+		break;
+	default:
+		ret = -EINVAL;
+	}
+
+	return ret;
+}
+
+static int cdns3_ep0_feature_handle_intf(struct cdns3_device *priv_dev,
+					 struct usb_ctrlrequest *ctrl,
+					 int set)
+{
+	u32 wValue;
+	int ret = 0;
+
+	wValue = le16_to_cpu(ctrl->wValue);
+
+	switch (wValue) {
+	case USB_INTRF_FUNC_SUSPEND:
+		break;
+	default:
+		ret = -EINVAL;
+	}
+
+	return ret;
+}
+
+static int cdns3_ep0_feature_handle_endpoint(struct cdns3_device *priv_dev,
+					     struct usb_ctrlrequest *ctrl,
+					     int set)
+{
+	struct cdns3_endpoint *priv_ep;
+	int ret = 0;
+	u8 index;
+
+	if (le16_to_cpu(ctrl->wValue) != USB_ENDPOINT_HALT)
+		return -EINVAL;
+
+	if (!(ctrl->wIndex & ~USB_DIR_IN))
+		return 0;
+
+	index = cdns3_ep_addr_to_index(ctrl->wIndex);
+	priv_ep = priv_dev->eps[index];
+
+	cdns3_select_ep(priv_dev, ctrl->wIndex);
+
+	if (set) {
+		cdns3_dbg(priv_ep->cdns3_dev, "Stall endpoint %s\n",
+			  priv_ep->name);
+		writel(EP_CMD_SSTALL, &priv_dev->regs->ep_cmd);
+		priv_ep->flags |= EP_STALL;
+	} else {
+		struct usb_request *request;
+
+		if (priv_dev->eps[index]->flags & EP_WEDGE) {
+			cdns3_select_ep(priv_dev, 0x00);
+			return 0;
+		}
+
+		cdns3_dbg(priv_ep->cdns3_dev, "Clear Stalled endpoint %s\n",
+			  priv_ep->name);
+
+		writel(EP_CMD_CSTALL | EP_CMD_EPRST, &priv_dev->regs->ep_cmd);
+
+		/* wait for EPRST cleared */
+		ret = cdns3_handshake(&priv_dev->regs->ep_cmd,
+				      EP_CMD_EPRST, 0, 100);
+		if (ret)
+			return -EINVAL;
+
+		priv_ep->flags &= ~EP_STALL;
+
+		request = cdns3_next_request(&priv_ep->pending_req_list);
+		if (request) {
+			cdns3_dbg(priv_ep->cdns3_dev, "Resume transfer for %s\n",
+				  priv_ep->name);
+
+			cdns3_rearm_transfer(priv_ep, 1);
+		}
+	}
+
+	return ret;
+}
+
+/**
+ * cdns3_req_ep0_handle_feature -
+ * Handling of GET/SET_FEATURE standard USB request
+ *
+ * @priv_dev: extended gadget object
+ * @ctrl_req: pointer to received setup packet
+ * @set: must be set to 1 for SET_FEATURE request
+ *
+ * Returns 0 if success, error code on error
+ */
+static int cdns3_req_ep0_handle_feature(struct cdns3_device *priv_dev,
+					struct usb_ctrlrequest *ctrl,
+					int set)
+{
+	int ret = 0;
+	u32 recip;
+
+	recip = ctrl->bRequestType & USB_RECIP_MASK;
+
+	switch (recip) {
+	case USB_RECIP_DEVICE:
+		ret = cdns3_ep0_feature_handle_device(priv_dev, ctrl, set);
+		break;
+	case USB_RECIP_INTERFACE:
+		ret = cdns3_ep0_feature_handle_intf(priv_dev, ctrl, set);
+		break;
+	case USB_RECIP_ENDPOINT:
+		ret = cdns3_ep0_feature_handle_endpoint(priv_dev, ctrl, set);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return ret;
+}
+
+/**
+ * cdns3_req_ep0_set_sel - Handling of SET_SEL standard USB request
+ * @priv_dev: extended gadget object
+ * @ctrl_req: pointer to received setup packet
+ *
+ * Returns 0 if success, error code on error
+ */
+static int cdns3_req_ep0_set_sel(struct cdns3_device *priv_dev,
+				 struct usb_ctrlrequest *ctrl_req)
+{
+	if (priv_dev->gadget.state < USB_STATE_ADDRESS)
+		return -EINVAL;
+
+	if (ctrl_req->wLength != 6) {
+		dev_err(priv_dev->dev, "Set SEL should be 6 bytes, got %d\n",
+			ctrl_req->wLength);
+		return -EINVAL;
+	}
+
+	cdns3_ep0_run_transfer(priv_dev, priv_dev->setup_dma, 6, 1);
+	return 0;
+}
+
+/**
+ * cdns3_req_ep0_set_isoch_delay -
+ * Handling of GET_ISOCH_DELAY standard USB request
+ * @priv_dev: extended gadget object
+ * @ctrl_req: pointer to received setup packet
+ *
+ * Returns 0 if success, error code on error
+ */
+static int cdns3_req_ep0_set_isoch_delay(struct cdns3_device *priv_dev,
+					 struct usb_ctrlrequest *ctrl_req)
+{
+	if (ctrl_req->wIndex || ctrl_req->wLength)
+		return -EINVAL;
+
+	priv_dev->isoch_delay = ctrl_req->wValue;
+
+	return 0;
+}
+
+/**
+ * cdns3_ep0_standard_request - Handling standard USB requests
+ * @priv_dev: extended gadget object
+ * @ctrl_req: pointer to received setup packet
+ *
+ * Returns 0 if success, error code on error
+ */
+static int cdns3_ep0_standard_request(struct cdns3_device *priv_dev,
+				      struct usb_ctrlrequest *ctrl_req)
+{
+	int ret;
+
+	switch (ctrl_req->bRequest) {
+	case USB_REQ_SET_ADDRESS:
+		ret = cdns3_req_ep0_set_address(priv_dev, ctrl_req);
+		break;
+	case USB_REQ_SET_CONFIGURATION:
+		ret = cdns3_req_ep0_set_configuration(priv_dev, ctrl_req);
+		break;
+	case USB_REQ_GET_STATUS:
+		ret = cdns3_req_ep0_get_status(priv_dev, ctrl_req);
+		break;
+	case USB_REQ_CLEAR_FEATURE:
+		ret = cdns3_req_ep0_handle_feature(priv_dev, ctrl_req, 0);
+		break;
+	case USB_REQ_SET_FEATURE:
+		ret = cdns3_req_ep0_handle_feature(priv_dev, ctrl_req, 1);
+		break;
+	case USB_REQ_SET_SEL:
+		ret = cdns3_req_ep0_set_sel(priv_dev, ctrl_req);
+		break;
+	case USB_REQ_SET_ISOCH_DELAY:
+		ret = cdns3_req_ep0_set_isoch_delay(priv_dev, ctrl_req);
+		break;
+	default:
+		ret = cdns3_ep0_delegate_req(priv_dev, ctrl_req);
+		break;
+	}
+
+	return ret;
+}
+
+static void __pending_setup_status_handler(struct cdns3_device *priv_dev)
+{
+	struct usb_request *request = priv_dev->pending_status_request;
+
+	if (priv_dev->status_completion_no_call && request &&
+	    request->complete) {
+		request->complete(&priv_dev->eps[0]->endpoint, request);
+		priv_dev->status_completion_no_call = 0;
+	}
+}
+
+void cdns3_pending_setup_status_handler(struct work_struct *work)
+{
+	struct cdns3_device *priv_dev = container_of(work, struct cdns3_device,
+			pending_status_wq);
+	unsigned long flags;
+
+	spin_lock_irqsave(&priv_dev->lock, flags);
+	__pending_setup_status_handler(priv_dev);
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
+}
+
+/**
+ * cdns3_gadget_ep_giveback - call struct usb_request's ->complete callback
+ * @priv_ep: The endpoint to whom the request belongs to
+ * @priv_req: The request we're giving back
+ * @status: completion code for the request
+ *
+ * Must be called with controller's lock held and interrupts disabled. This
+ * function will unmap @req and call its ->complete() callback to notify upper
+ * layers that it has completed.
+ */
+
+void cdns3_gadget_ep0_giveback(struct cdns3_device *priv_dev,
+			       int status)
+{
+	struct cdns3_endpoint *priv_ep;
+	struct usb_request *request;
+
+	priv_ep = priv_dev->eps[0];
+	request = cdns3_next_request(&priv_ep->pending_req_list);
+
+	priv_ep->dir = priv_dev->ep0_data_dir;
+	cdns3_gadget_giveback(priv_ep, to_cdns3_request(request), status);
+}
+
+/**
+ * cdns3_ep0_setup_phase - Handling setup USB requests
+ * @priv_dev: extended gadget object
+ */
+static void cdns3_ep0_setup_phase(struct cdns3_device *priv_dev)
+{
+	struct usb_ctrlrequest *ctrl = priv_dev->setup_buf;
+	struct cdns3_endpoint *priv_ep = priv_dev->eps[0];
+	int result;
+
+	priv_dev->ep0_data_dir = ctrl->bRequestType & USB_DIR_IN;
+
+	trace_cdns3_ctrl_req(ctrl);
+
+	if (!list_empty(&priv_ep->pending_req_list)) {
+		struct usb_request *request;
+
+		request = cdns3_next_request(&priv_ep->pending_req_list);
+		priv_ep->dir = priv_dev->ep0_data_dir;
+		cdns3_gadget_giveback(priv_ep, to_cdns3_request(request),
+				      -ECONNRESET);
+	}
+
+	if (le16_to_cpu(ctrl->wLength))
+		priv_dev->ep0_stage = CDNS3_DATA_STAGE;
+	else
+		priv_dev->ep0_stage = CDNS3_STATUS_STAGE;
+
+	if ((ctrl->bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD)
+		result = cdns3_ep0_standard_request(priv_dev, ctrl);
+	else
+		result = cdns3_ep0_delegate_req(priv_dev, ctrl);
+
+	if (result == USB_GADGET_DELAYED_STATUS)
+		return;
+
+	if (result < 0)
+		cdns3_ep0_complete_setup(priv_dev, 1, 1);
+	else if (priv_dev->ep0_stage == CDNS3_STATUS_STAGE)
+		cdns3_ep0_complete_setup(priv_dev, 0, 1);
+}
+
+static void cdns3_transfer_completed(struct cdns3_device *priv_dev)
+{
+	struct cdns3_endpoint *priv_ep = priv_dev->eps[0];
+
+	if (!list_empty(&priv_ep->pending_req_list)) {
+		struct usb_request *request;
+
+		trace_cdns3_complete_trb(priv_ep, priv_ep->trb_pool);
+		request = cdns3_next_request(&priv_ep->pending_req_list);
+
+		request->actual =
+			TRB_LEN(le32_to_cpu(priv_ep->trb_pool->length));
+
+		priv_ep->dir = priv_dev->ep0_data_dir;
+		if (request->zero && request->length && priv_ep->dir
+		    && (request->length % priv_dev->gadget.ep0->maxpacket == 0))
+			cdns3_ep0_run_transfer(priv_dev, request->dma, 0, 1);
+
+		cdns3_gadget_giveback(priv_ep, to_cdns3_request(request), 0);
+	}
+
+	cdns3_ep0_complete_setup(priv_dev, 0, 0);
+}
+
+/**
+ * cdns3_check_new_setup - Check if controller receive new SETUP packet.
+ * @priv_dev: extended gadget object
+ *
+ * The SETUP packet can be kept in on-chip memory or in system memory.
+ */
+static bool cdns3_check_new_setup(struct cdns3_device *priv_dev)
+{
+	u32 ep_sts_reg;
+
+	cdns3_select_ep(priv_dev, 0 | USB_DIR_OUT);
+	ep_sts_reg = readl(&priv_dev->regs->ep_sts);
+
+	return !!(ep_sts_reg & (EP_STS_SETUP | EP_STS_STPWAIT));
+}
+
+/**
+ * cdns3_check_ep0_interrupt_proceed - Processes interrupt related to endpoint 0
+ * @priv_dev: extended gadget object
+ * @dir: USB_DIR_IN for IN direction, USB_DIR_OUT for OUT direction
+ */
+void cdns3_check_ep0_interrupt_proceed(struct cdns3_device *priv_dev, int dir)
+{
+	u32 ep_sts_reg;
+
+	cdns3_select_ep(priv_dev, dir);
+
+	ep_sts_reg = readl(&priv_dev->regs->ep_sts);
+	writel(ep_sts_reg, &priv_dev->regs->ep_sts);
+
+	trace_cdns3_ep0_irq(priv_dev, ep_sts_reg);
+
+	__pending_setup_status_handler(priv_dev);
+
+	if ((ep_sts_reg & EP_STS_SETUP)) {
+		cdns3_ep0_setup_phase(priv_dev);
+	} else if ((ep_sts_reg & EP_STS_IOC) || (ep_sts_reg & EP_STS_ISP)) {
+		priv_dev->ep0_data_dir = dir;
+		cdns3_transfer_completed(priv_dev);
+	}
+
+	if (ep_sts_reg & EP_STS_DESCMIS) {
+		if (dir == 0 && !priv_dev->setup_pending)
+			cdns3_prepare_setup_packet(priv_dev);
+	}
+}
+
+/**
+ * cdns3_gadget_ep0_enable
+ * Function shouldn't be called by gadget driver,
+ * endpoint 0 is allways active
+ */
+static int cdns3_gadget_ep0_enable(struct usb_ep *ep,
+				   const struct usb_endpoint_descriptor *desc)
+{
+	return -EINVAL;
+}
+
+/**
+ * cdns3_gadget_ep0_disable
+ * Function shouldn't be called by gadget driver,
+ * endpoint 0 is allways active
+ */
+static int cdns3_gadget_ep0_disable(struct usb_ep *ep)
+{
+	return -EINVAL;
+}
+
+/**
+ * cdns3_gadget_ep0_set_halt
+ * @ep: pointer to endpoint zero object
+ * @value: 1 for set stall, 0 for clear stall
+ *
+ * Returns 0
+ */
+static int cdns3_gadget_ep0_set_halt(struct usb_ep *ep, int value)
+{
+	/* TODO */
+	return 0;
+}
+
+/**
+ * cdns3_gadget_ep0_queue Transfer data on endpoint zero
+ * @ep: pointer to endpoint zero object
+ * @request: pointer to request object
+ * @gfp_flags: gfp flags
+ *
+ * Returns 0 on success, error code elsewhere
+ */
+static int cdns3_gadget_ep0_queue(struct usb_ep *ep,
+				  struct usb_request *request,
+				  gfp_t gfp_flags)
+{
+	struct cdns3_endpoint *priv_ep = ep_to_cdns3_ep(ep);
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
+	unsigned long flags;
+	int erdy_sent = 0;
+	int ret = 0;
+
+	cdns3_dbg(priv_ep->cdns3_dev, "Queue to Ep0%s L: %d\n",
+		  priv_dev->ep0_data_dir ? "IN" : "OUT",
+		  request->length);
+
+	/* cancel the request if controller receive new SETUP packet. */
+	if (cdns3_check_new_setup(priv_dev))
+		return -ECONNRESET;
+
+	/* send STATUS stage. Should be called only for SET_CONFIGURATION */
+	if (priv_dev->ep0_stage == CDNS3_STATUS_STAGE) {
+		spin_lock_irqsave(&priv_dev->lock, flags);
+		cdns3_select_ep(priv_dev, 0x00);
+
+		erdy_sent = !priv_dev->hw_configured_flag;
+		cdns3_set_hw_configuration(priv_dev);
+
+		if (!erdy_sent)
+			cdns3_ep0_complete_setup(priv_dev, 0, 1);
+
+		request->actual = 0;
+		priv_dev->status_completion_no_call = true;
+		priv_dev->pending_status_request = request;
+		spin_unlock_irqrestore(&priv_dev->lock, flags);
+
+		/*
+		 * Since there is no completion interrupt for status stage,
+		 * it needs to call ->completion in software after
+		 * ep0_queue is back.
+		 */
+		queue_work(system_freezable_wq, &priv_dev->pending_status_wq);
+		return 0;
+	}
+
+	spin_lock_irqsave(&priv_dev->lock, flags);
+	if (!list_empty(&priv_ep->pending_req_list)) {
+		dev_err(priv_dev->dev,
+			"can't handle multiple requests for ep0\n");
+		spin_unlock_irqrestore(&priv_dev->lock, flags);
+		return -EBUSY;
+	}
+
+	ret = usb_gadget_map_request_by_dev(priv_dev->sysdev, request,
+					    priv_dev->ep0_data_dir);
+	if (ret) {
+		spin_unlock_irqrestore(&priv_dev->lock, flags);
+		dev_err(priv_dev->dev, "failed to map request\n");
+		return -EINVAL;
+	}
+
+	request->status = -EINPROGRESS;
+	list_add_tail(&request->list, &priv_ep->pending_req_list);
+	cdns3_ep0_run_transfer(priv_dev, request->dma, request->length, 1);
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
+
+	return ret;
+}
+
+/**
+ * cdns3_gadget_ep_set_wedge Set wedge on selected endpoint
+ * @ep: endpoint object
+ *
+ * Returns 0
+ */
+int cdns3_gadget_ep_set_wedge(struct usb_ep *ep)
+{
+	struct cdns3_endpoint *priv_ep = ep_to_cdns3_ep(ep);
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
+
+	dev_dbg(priv_dev->dev, "Wedge for %s\n", ep->name);
+	cdns3_gadget_ep_set_halt(ep, 1);
+	priv_ep->flags |= EP_WEDGE;
+
+	return 0;
+}
+
+const struct usb_ep_ops cdns3_gadget_ep0_ops = {
+	.enable = cdns3_gadget_ep0_enable,
+	.disable = cdns3_gadget_ep0_disable,
+	.alloc_request = cdns3_gadget_ep_alloc_request,
+	.free_request = cdns3_gadget_ep_free_request,
+	.queue = cdns3_gadget_ep0_queue,
+	.dequeue = cdns3_gadget_ep_dequeue,
+	.set_halt = cdns3_gadget_ep0_set_halt,
+	.set_wedge = cdns3_gadget_ep_set_wedge,
+};
+
+/**
+ * cdns3_ep0_config - Configures default endpoint
+ * @priv_dev: extended gadget object
+ *
+ * Functions sets parameters: maximal packet size and enables interrupts
+ */
+void cdns3_ep0_config(struct cdns3_device *priv_dev)
+{
+	struct cdns3_usb_regs __iomem *regs;
+	struct cdns3_endpoint *priv_ep;
+	u32 max_packet_size = 64;
+
+	regs = priv_dev->regs;
+
+	if (priv_dev->gadget.speed == USB_SPEED_SUPER)
+		max_packet_size = 512;
+
+	priv_ep = priv_dev->eps[0];
+
+	if (!list_empty(&priv_ep->pending_req_list)) {
+		struct usb_request *request;
+
+		request = cdns3_next_request(&priv_ep->pending_req_list);
+		list_del_init(&request->list);
+	}
+
+	priv_dev->u1_allowed = 0;
+	priv_dev->u2_allowed = 0;
+
+	priv_dev->gadget.ep0->maxpacket = max_packet_size;
+	cdns3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(max_packet_size);
+
+	/* init ep out */
+	cdns3_select_ep(priv_dev, USB_DIR_OUT);
+
+	writel(EP_CFG_ENABLE | EP_CFG_MAXPKTSIZE(max_packet_size),
+	       &regs->ep_cfg);
+
+	writel(EP_STS_EN_SETUPEN | EP_STS_EN_DESCMISEN | EP_STS_EN_TRBERREN,
+	       &regs->ep_sts_en);
+
+	/* init ep in */
+	cdns3_select_ep(priv_dev, USB_DIR_IN);
+
+	writel(EP_CFG_ENABLE | EP_CFG_MAXPKTSIZE(max_packet_size),
+	       &regs->ep_cfg);
+
+	writel(EP_STS_EN_SETUPEN | EP_STS_EN_TRBERREN, &regs->ep_sts_en);
+
+	cdns3_set_register_bit(&regs->usb_conf, USB_CONF_U1DS | USB_CONF_U2DS);
+}
+
+/**
+ * cdns3_init_ep0 Initializes software endpoint 0 of gadget
+ * @priv_dev: extended gadget object
+ * @ep_priv: extended endpoint object
+ *
+ * Returns 0 on success else error code.
+ */
+int cdns3_init_ep0(struct cdns3_device *priv_dev,
+		   struct cdns3_endpoint *priv_ep)
+{
+	sprintf(priv_ep->name, "ep0");
+
+	/* fill linux fields */
+	priv_ep->endpoint.ops = &cdns3_gadget_ep0_ops;
+	priv_ep->endpoint.maxburst = 1;
+	usb_ep_set_maxpacket_limit(&priv_ep->endpoint,
+				   CDNS3_EP0_MAX_PACKET_LIMIT);
+	priv_ep->endpoint.address = 0;
+	priv_ep->endpoint.caps.type_control = 1;
+	priv_ep->endpoint.caps.dir_in = 1;
+	priv_ep->endpoint.caps.dir_out = 1;
+	priv_ep->endpoint.name = priv_ep->name;
+	priv_ep->endpoint.desc = &cdns3_gadget_ep0_desc;
+	priv_dev->gadget.ep0 = &priv_ep->endpoint;
+	priv_ep->type = USB_ENDPOINT_XFER_CONTROL;
+
+	return cdns3_allocate_trb_pool(priv_ep);
+}
diff --git a/drivers/usb/cdns3/gadget-export.h b/drivers/usb/cdns3/gadget-export.h
index e085ed38ea05..7d8692409483 100644
--- a/drivers/usb/cdns3/gadget-export.h
+++ b/drivers/usb/cdns3/gadget-export.h
@@ -1,24 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
- * gadget-export.h - Gadget Export APIs
+ * Cadence USBSS DRD Driver - Gadget Export APIs.
  *
- * Copyright 2017 NXP
- * Authors: Peter Chen <peter.chen@nxp.com>
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * Copyright (C) 2017-2019 NXP
  *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * Authors: Peter Chen <peter.chen@nxp.com>
  */
-
-#ifndef __CDNS3_GADGET_EXPORT_H
-#define __CDNS3_GADGET_EXPORT_H
+#ifndef __LINUX_CDNS3_GADGET_EXPORT
+#define __LINUX_CDNS3_GADGET_EXPORT
 
 #ifdef CONFIG_USB_CDNS3_GADGET
 
 int cdns3_gadget_init(struct cdns3 *cdns);
-void cdns3_gadget_remove(struct cdns3 *cdns);
+void cdns3_gadget_exit(struct cdns3 *cdns);
 #else
 
 static inline int cdns3_gadget_init(struct cdns3 *cdns)
@@ -26,11 +20,8 @@ static inline int cdns3_gadget_init(struct cdns3 *cdns)
 	return -ENXIO;
 }
 
-static inline void cdns3_gadget_remove(struct cdns3 *cdns)
-{
-
-}
+static inline void cdns3_gadget_exit(struct cdns3 *cdns) { }
 
 #endif
 
-#endif /* __CDNS3_GADGET_EXPORT_H */
+#endif /* __LINUX_CDNS3_GADGET_EXPORT */
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index 985601354468..b68e44b7f755 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -1,1510 +1,1216 @@
-/**
- * gadget.c - Cadence USB3 Device Core file
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Cadence USBSS DRD Driver - gadget side.
  *
- * Copyright (C) 2016 Cadence Design Systems - http://www.cadence.com
- * Copyright 2017 NXP
+ * Copyright (C) 2018-2019 Cadence Design Systems.
+ * Copyright (C) 2017-2019 NXP
  *
  * Authors: Pawel Jez <pjez@cadence.com>,
- *          Konrad Kociolek <konrad@cadence.com>
+ *          Pawel Laszczak <pawell@cadence.com>
  *	    Peter Chen <peter.chen@nxp.com>
+ */
+
+/*
+ * Work around 1:
+ * At some situations, the controller may get stale data address in TRB
+ * at below sequences:
+ * 1. Controller read TRB includes data address
+ * 2. Software updates TRBs includes data address and Cycle bit
+ * 3. Controller read TRB which includes Cycle bit
+ * 4. DMA run with stale data address
+ *
+ * To fix this problem, driver needs to make the first TRB in TD as invalid.
+ * After preparing all TRBs driver needs to check the position of DMA and
+ * if the DMA point to the first just added TRB and doorbell is 1,
+ * then driver must defer making this TRB as valid. This TRB will be make
+ * as valid during adding next TRB only if DMA is stopped or at TRBERR
+ * interrupt.
+ *
+ * Work around 2:
+ * Controller for OUT endpoints has shared on-chip buffers for all incoming
+ * packets, including ep0out. It's FIFO buffer, so packets must be handle by DMA
+ * in correct order. If the first packet in the buffer will not be handled,
+ * then the following packets directed for other endpoints and  functions
+ * will be blocked.
+ * Additionally the packets directed to one endpoint can block entire on-chip
+ * buffers. In this case transfer to other endpoints also will blocked.
+ *
+ * To resolve this issue after raising the descriptor missing interrupt
+ * driver prepares internal usb_request object and use it to arm DMA transfer.
+ *
+ * The problematic situation was observed in case when endpoint has been enabled
+ * but no usb_request were queued. Driver try detects such endpoints and will
+ * use this workaround only for these endpoint.
  *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * Driver use limited number of buffer. This number can be set by macro
+ * CDNS_WA2_NUM_BUFFERS.
  *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * Such blocking situation was observed on ACM gadget. For this function
+ * host send OUT data packet but ACM function is not prepared for this packet.
+ * It's cause that buffer placed in on chip memory block transfer to other
+ * endpoints.
+ *
+ * It's limitation of controller but maybe this issues should be fixed in
+ * function driver.
+ *
+ * This work around can be disabled/enabled by means of quirk_internal_buffer
+ * module parameter. By default feature is enabled. It can has impact to
+ * transfer performance and in most case this feature can be disabled.
  */
 
-#include <linux/platform_device.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
-#include <linux/pm_runtime.h>
-#include <linux/usb/composite.h>
-#include <linux/of_platform.h>
+#include <linux/interrupt.h>
 #include <linux/usb/gadget.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/byteorder/generic.h>
-#include <linux/ctype.h>
+#include <linux/pm_runtime.h>
+#include <linux/module.h>
 
 #include "core.h"
 #include "gadget-export.h"
 #include "gadget.h"
-#include "io.h"
-
-/*-------------------------------------------------------------------------*/
-/* Function declarations */
-
-static void select_ep(struct usb_ss_dev *usb_ss, u32 ep);
-static int usb_ss_allocate_trb_pool(struct usb_ss_endpoint *usb_ss_ep);
-static void cdns_ep_stall_flush(struct usb_ss_endpoint *usb_ss_ep);
-static void cdns_ep0_config(struct usb_ss_dev *usb_ss);
-static void cdns_gadget_unconfig(struct usb_ss_dev *usb_ss);
-static void cdns_ep0_run_transfer(struct usb_ss_dev *usb_ss,
-	dma_addr_t dma_addr, unsigned int length, int erdy);
-static int cdns_ep_run_transfer(struct usb_ss_endpoint *usb_ss_ep);
-static int cdns_get_setup_ret(struct usb_ss_dev *usb_ss,
-	struct usb_ctrlrequest *ctrl_req);
-static int cdns_req_ep0_set_address(struct usb_ss_dev *usb_ss,
-	struct usb_ctrlrequest *ctrl_req);
-static int cdns_req_ep0_get_status(struct usb_ss_dev *usb_ss,
-	struct usb_ctrlrequest *ctrl_req);
-static int cdns_req_ep0_handle_feature(struct usb_ss_dev *usb_ss,
-	struct usb_ctrlrequest *ctrl_req, int set);
-static int cdns_req_ep0_set_sel(struct usb_ss_dev *usb_ss,
-	struct usb_ctrlrequest *ctrl_req);
-static int cdns_req_ep0_set_isoch_delay(struct usb_ss_dev *usb_ss,
-	struct usb_ctrlrequest *ctrl_req);
-static int cdns_req_ep0_set_configuration(struct usb_ss_dev *usb_ss,
-	struct usb_ctrlrequest *ctrl_req);
-static int cdns_ep0_standard_request(struct usb_ss_dev *usb_ss,
-	struct usb_ctrlrequest *ctrl_req);
-static void cdns_ep0_setup_phase(struct usb_ss_dev *usb_ss);
-static int cdns_check_ep_interrupt_proceed(struct usb_ss_endpoint *usb_ss_ep);
-static void cdns_check_ep0_interrupt_proceed(struct usb_ss_dev *usb_ss,
-	int dir);
-static void cdns_check_usb_interrupt_proceed(struct usb_ss_dev *usb_ss,
-	u32 usb_ists);
-static int usb_ss_gadget_ep0_enable(struct usb_ep *ep,
-	const struct usb_endpoint_descriptor *desc);
-static int usb_ss_gadget_ep0_disable(struct usb_ep *ep);
-static int usb_ss_gadget_ep0_set_halt(struct usb_ep *ep, int value);
-static int usb_ss_gadget_ep0_queue(struct usb_ep *ep,
-	struct usb_request *request, gfp_t gfp_flags);
-static int usb_ss_gadget_ep_enable(struct usb_ep *ep,
-	const struct usb_endpoint_descriptor *desc);
-static int usb_ss_gadget_ep_disable(struct usb_ep *ep);
-static struct usb_request *usb_ss_gadget_ep_alloc_request(struct usb_ep *ep,
-	gfp_t gfp_flags);
-static void usb_ss_gadget_ep_free_request(struct usb_ep *ep,
-	struct usb_request *request);
-static int usb_ss_gadget_ep_queue(struct usb_ep *ep,
-	struct usb_request *request, gfp_t gfp_flags);
-static int usb_ss_gadget_ep_dequeue(struct usb_ep *ep,
-	struct usb_request *request);
-static int usb_ss_gadget_ep_set_halt(struct usb_ep *ep, int value);
-static int usb_ss_gadget_ep_set_wedge(struct usb_ep *ep);
-static int usb_ss_gadget_get_frame(struct usb_gadget *gadget);
-static int usb_ss_gadget_wakeup(struct usb_gadget *gadget);
-static int usb_ss_gadget_set_selfpowered(struct usb_gadget *gadget,
-	int is_selfpowered);
-static int usb_ss_gadget_pullup(struct usb_gadget *gadget, int is_on);
-static int usb_ss_gadget_udc_start(struct usb_gadget *gadget,
-	struct usb_gadget_driver *driver);
-static int usb_ss_gadget_udc_stop(struct usb_gadget *gadget);
-static int usb_ss_init_ep(struct usb_ss_dev *usb_ss);
-static int usb_ss_init_ep0(struct usb_ss_dev *usb_ss);
-static void __cdns3_gadget_start(struct usb_ss_dev *usb_ss);
-static void cdns_prepare_setup_packet(struct usb_ss_dev *usb_ss);
-static void cdns_ep_config(struct usb_ss_endpoint *usb_ss_ep);
-static void cdns_enable_l1(struct usb_ss_dev *usb_ss, int enable);
-static void __pending_setup_status_handler(struct usb_ss_dev *usb_ss);
-static void cdns_enable_u1(struct usb_ss_dev *usb_ss, int enable);
-static void cdns_enable_u2(struct usb_ss_dev *usb_ss, int enable);
-
-static struct usb_endpoint_descriptor cdns3_gadget_ep0_desc = {
-	.bLength	= USB_DT_ENDPOINT_SIZE,
-	.bDescriptorType = USB_DT_ENDPOINT,
-	.bmAttributes	= USB_ENDPOINT_XFER_CONTROL,
-};
+#include "trace.h"
+
+static int __cdns3_gadget_ep_queue(struct usb_ep *ep,
+				   struct usb_request *request,
+				   gfp_t gfp_flags);
+
+/*
+ * Parameter allows to disable/enable handling of work around 2 feature.
+ * By default this value is enabled.
+ */
+static bool quirk_internal_buffer = 1;
+module_param(quirk_internal_buffer, bool, 0644);
+MODULE_PARM_DESC(quirk_internal_buffer, "Disable/enable WA2 algorithm");
 
-static u32 gadget_readl(struct usb_ss_dev *usb_ss, uint32_t __iomem *reg)
+/**
+ * cdns3_set_register_bit - set bit in given register.
+ * @ptr: address of device controller register to be read and changed
+ * @mask: bits requested to set
+ */
+void cdns3_set_register_bit(void __iomem *ptr, u32 mask)
 {
-	return cdns_readl(reg);
+	mask = readl(ptr) | mask;
+	writel(mask, ptr);
 }
 
-static void gadget_writel(struct usb_ss_dev *usb_ss,
-		uint32_t __iomem *reg, u32 value)
+/**
+ * cdns3_ep_addr_to_index - Macro converts endpoint address to
+ * index of endpoint object in cdns3_device.eps[] container
+ * @ep_addr: endpoint address for which endpoint object is required
+ *
+ */
+u8 cdns3_ep_addr_to_index(u8 ep_addr)
 {
-	cdns_writel(reg, value);
+	return (((ep_addr & 0x7F)) + ((ep_addr & USB_DIR_IN) ? 16 : 0));
 }
 
 /**
- * next_request - returns next request from list
+ * cdns3_next_request - returns next request from list
  * @list: list containing requests
  *
  * Returns request or NULL if no requests in list
  */
-static struct usb_request *next_request(struct list_head *list)
+struct usb_request *cdns3_next_request(struct list_head *list)
 {
-	if (list_empty(list))
-		return NULL;
-	return list_first_entry(list, struct usb_request, list);
+	return list_first_entry_or_null(list, struct usb_request, list);
 }
 
 /**
- * wait_reg_bit - Read reg and compare until equal to specific value
- * @reg: the register address to read
- * @value: the value to compare
- * @wait_value: 0 or 1
- * @timeout_ms: timeout value in milliseconds, must be larger than 1
+ * cdns3_aligned_buf - returns next buffer from list
+ * @list: list containing buffers
  *
- * Returns -ETIMEDOUT if timeout occurs
+ * Returns buffer or NULL if no buffers in list
  */
-static int wait_reg_bit(struct usb_ss_dev *usb_ss, u32 __iomem *reg,
-		u32 value, int wait_value, int timeout_ms)
+struct cdns3_aligned_buf *cdns3_next_align_buf(struct list_head *list)
 {
-	u32 temp;
-
-	WARN_ON(timeout_ms <= 0);
-	timeout_ms *= 100;
-	temp = cdns_readl(reg);
-	while (timeout_ms-- > 0) {
-		if (!!(temp & value) == wait_value)
-			return 0;
-		temp = cdns_readl(reg);
-		udelay(10);
-	}
-
-	dev_err(&usb_ss->dev, "wait register timeout %s\n", __func__);
-	return -ETIMEDOUT;
-}
-
-static int wait_reg_bit_set(struct usb_ss_dev *usb_ss, u32 __iomem *reg,
-		u32 value, int timeout_ms)
-{
-	return wait_reg_bit(usb_ss, reg, value, 1, timeout_ms);
+	return list_first_entry_or_null(list, struct cdns3_aligned_buf, list);
 }
 
-static int wait_reg_bit_clear(struct usb_ss_dev *usb_ss, u32 __iomem *reg,
-		u32 value, int timeout_ms)
+/**
+ * cdns3_next_priv_request - returns next request from list
+ * @list: list containing requests
+ *
+ * Returns request or NULL if no requests in list
+ */
+struct cdns3_request *cdns3_next_priv_request(struct list_head *list)
 {
-	return wait_reg_bit(usb_ss, reg, value, 0, timeout_ms);
+	return list_first_entry_or_null(list, struct cdns3_request, list);
 }
 
 /**
  * select_ep - selects endpoint
- * @usb_ss: extended gadget object
+ * @priv_dev:  extended gadget object
  * @ep: endpoint address
  */
-static void select_ep(struct usb_ss_dev *usb_ss, u32 ep)
+void cdns3_select_ep(struct cdns3_device *priv_dev, u32 ep)
 {
-	if (!usb_ss || !usb_ss->regs) {
-		dev_err(&usb_ss->dev, "Failed to select endpoint!\n");
+	if (priv_dev->selected_ep == ep)
 		return;
-	}
 
-	gadget_writel(usb_ss, &usb_ss->regs->ep_sel, ep);
+	priv_dev->selected_ep = ep;
+	writel(ep, &priv_dev->regs->ep_sel);
+}
+
+dma_addr_t cdns3_trb_virt_to_dma(struct cdns3_endpoint *priv_ep,
+				 struct cdns3_trb *trb)
+{
+	u32 offset = (char *)trb - (char *)priv_ep->trb_pool;
+
+	return priv_ep->trb_pool_dma + offset;
+}
+
+int cdns3_ring_size(struct cdns3_endpoint *priv_ep)
+{
+	switch (priv_ep->type) {
+	case USB_ENDPOINT_XFER_ISOC:
+		return TRB_ISO_RING_SIZE;
+	case USB_ENDPOINT_XFER_CONTROL:
+		return TRB_CTRL_RING_SIZE;
+	default:
+		return TRB_RING_SIZE;
+	}
 }
 
 /**
- * usb_ss_allocate_trb_pool - Allocates TRB's pool for selected endpoint
- * @usb_ss_ep: extended endpoint object
+ * cdns3_allocate_trb_pool - Allocates TRB's pool for selected endpoint
+ * @priv_ep:  endpoint object
  *
  * Function will return 0 on success or -ENOMEM on allocation error
  */
-static int usb_ss_allocate_trb_pool(struct usb_ss_endpoint *usb_ss_ep)
-{
-	struct usb_ss_dev *usb_ss = usb_ss_ep->usb_ss;
-
-	if (!usb_ss_ep->trb_pool) {
-		usb_ss_ep->trb_pool = dma_alloc_coherent(usb_ss->sysdev,
-			sizeof(struct usb_ss_trb) * USB_SS_TRBS_NUM,
-		&usb_ss_ep->trb_pool_dma, GFP_DMA);
-		if (!usb_ss_ep->trb_pool)
+int cdns3_allocate_trb_pool(struct cdns3_endpoint *priv_ep)
+{
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
+	int ring_size = cdns3_ring_size(priv_ep);
+	struct cdns3_trb *link_trb;
+
+	if (!priv_ep->trb_pool) {
+		priv_ep->trb_pool = dma_alloc_coherent(priv_dev->sysdev,
+							ring_size,
+							&priv_ep->trb_pool_dma,
+							GFP_DMA);
+		if (!priv_ep->trb_pool)
 			return -ENOMEM;
+	} else {
+		memset(priv_ep->trb_pool, 0, ring_size);
 	}
 
-	if (!usb_ss_ep->cpu_addr) {
-		usb_ss_ep->cpu_addr = dma_alloc_coherent(usb_ss->sysdev,
-				CDNS3_UNALIGNED_BUF_SIZE,
-				&usb_ss_ep->dma_addr, GFP_DMA);
-		if (!usb_ss_ep->cpu_addr)
-			return -ENOMEM;
-	}
+	if (!priv_ep->num)
+		return 0;
+
+	priv_ep->num_trbs = ring_size / TRB_SIZE;
+	/* Initialize the last TRB as Link TRB */
+	link_trb = (priv_ep->trb_pool + (priv_ep->num_trbs - 1));
+	link_trb->buffer = TRB_BUFFER(priv_ep->trb_pool_dma);
+	link_trb->control = TRB_CYCLE | TRB_TYPE(TRB_LINK) |
+			    TRB_CHAIN | TRB_TOGGLE;
 
 	return 0;
 }
 
-/**
- * cdns_data_flush - do flush data at onchip buffer
- * @usb_ss_ep: extended endpoint object
- *
- * Endpoint must be selected before call to this function
- *
- * Returns zero on success or negative value on failure
- */
-static int cdns_data_flush(struct usb_ss_endpoint *usb_ss_ep)
+static void cdns3_free_trb_pool(struct cdns3_endpoint *priv_ep)
 {
-	struct usb_ss_dev *usb_ss = usb_ss_ep->usb_ss;
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
 
-	gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-		EP_CMD__DFLUSH__MASK);
-	/* wait for DFLUSH cleared */
-	return wait_reg_bit_clear(usb_ss, &usb_ss->regs->ep_cmd,
-		EP_CMD__DFLUSH__MASK, 100);
+	if (priv_ep->trb_pool) {
+		dma_free_coherent(priv_dev->sysdev,
+				  cdns3_ring_size(priv_ep),
+				  priv_ep->trb_pool, priv_ep->trb_pool_dma);
+		priv_ep->trb_pool = NULL;
+	}
 }
 
 /**
- * cdns_ep_stall_flush - Stalls and flushes selected endpoint
- * @usb_ss_ep: extended endpoint object
+ * cdns3_ep_stall_flush - Stalls and flushes selected endpoint
+ * @priv_ep: endpoint object
  *
  * Endpoint must be selected before call to this function
  */
-static void cdns_ep_stall_flush(struct usb_ss_endpoint *usb_ss_ep)
+static void cdns3_ep_stall_flush(struct cdns3_endpoint *priv_ep)
 {
-	struct usb_ss_dev *usb_ss = usb_ss_ep->usb_ss;
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
 
-	gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-		EP_CMD__DFLUSH__MASK | EP_CMD__ERDY__MASK |
-		EP_CMD__SSTALL__MASK);
+	cdns3_dbg(priv_ep->cdns3_dev, "Stall & flush endpoint %s\n",
+		  priv_ep->name);
+
+	writel(EP_CMD_DFLUSH | EP_CMD_ERDY | EP_CMD_SSTALL,
+	       &priv_dev->regs->ep_cmd);
 
 	/* wait for DFLUSH cleared */
-	wait_reg_bit_clear(usb_ss, &usb_ss->regs->ep_cmd,
-		EP_CMD__DFLUSH__MASK, 100);
-	usb_ss_ep->stalled_flag = 1;
+	cdns3_handshake(&priv_dev->regs->ep_cmd, EP_CMD_DFLUSH, 0, 1000);
+	priv_ep->flags |= EP_STALL;
 }
 
 /**
- * cdns_ep0_config - Configures default endpoint
- * @usb_ss: extended gadget object
- *
- * Functions sets parameters: maximal packet size and enables interrupts
+ * cdns3_hw_reset_eps_config - reset endpoints configuration kept by controller.
+ * @priv_dev: extended gadget object
  */
-static void cdns_ep0_config(struct usb_ss_dev *usb_ss)
+void cdns3_hw_reset_eps_config(struct cdns3_device *priv_dev)
 {
-	u32 reg, max_packet_size = 0;
-
-	switch (usb_ss->gadget.speed) {
-	case USB_SPEED_UNKNOWN:
-		max_packet_size = ENDPOINT_MAX_PACKET_SIZE_0;
-		usb_ss->gadget.ep0->maxpacket = ENDPOINT_MAX_PACKET_SIZE_0;
-		cdns3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(0);
-		break;
-
-	case USB_SPEED_LOW:
-		max_packet_size = ENDPOINT_MAX_PACKET_SIZE_8;
-		usb_ss->gadget.ep0->maxpacket = ENDPOINT_MAX_PACKET_SIZE_8;
-		cdns3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(8);
-		break;
-
-	case USB_SPEED_FULL:
-		max_packet_size = ENDPOINT_MAX_PACKET_SIZE_64;
-		usb_ss->gadget.ep0->maxpacket = ENDPOINT_MAX_PACKET_SIZE_64;
-		cdns3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(64);
-		break;
-
-	case USB_SPEED_HIGH:
-		max_packet_size = ENDPOINT_MAX_PACKET_SIZE_64;
-		usb_ss->gadget.ep0->maxpacket = ENDPOINT_MAX_PACKET_SIZE_64;
-		cdns3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(64);
-		break;
-
-	case USB_SPEED_WIRELESS:
-		max_packet_size = ENDPOINT_MAX_PACKET_SIZE_64;
-		usb_ss->gadget.ep0->maxpacket = ENDPOINT_MAX_PACKET_SIZE_64;
-		cdns3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(64);
-		break;
+	writel(USB_CONF_CFGRST, &priv_dev->regs->usb_conf);
 
-	case USB_SPEED_SUPER:
-		max_packet_size = ENDPOINT_MAX_PACKET_SIZE_512;
-		usb_ss->gadget.ep0->maxpacket = ENDPOINT_MAX_PACKET_SIZE_512;
-		cdns3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512);
-		break;
+	cdns3_allow_enable_l1(priv_dev, 0);
+	priv_dev->hw_configured_flag = 0;
+	priv_dev->onchip_mem_allocated_size = 0;
+	priv_dev->out_mem_is_allocated = 0;
+}
 
-	case USB_SPEED_SUPER_PLUS:
-		dev_warn(&usb_ss->dev, "USB 3.1 is not supported\n");
-		usb_ss->gadget.ep0->maxpacket = ENDPOINT_MAX_PACKET_SIZE_512;
-		cdns3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512);
-		max_packet_size = ENDPOINT_MAX_PACKET_SIZE_512;
-		break;
+/**
+ * cdns3_ep_inc_trb - increment a trb index.
+ * @index: Pointer to the TRB index to increment.
+ * @cs: Cycle state
+ * @trb_in_seg: number of TRBs in segment
+ *
+ * The index should never point to the link TRB. After incrementing,
+ * if it is point to the link TRB, wrap around to the beginning and revert
+ * cycle state bit The
+ * link TRB is always at the last TRB entry.
+ */
+static void cdns3_ep_inc_trb(int *index, u8 *cs, int trb_in_seg)
+{
+	(*index)++;
+	if (*index == (trb_in_seg - 1)) {
+		*index = 0;
+		*cs ^=  1;
 	}
-
-	/* init ep out */
-	select_ep(usb_ss, USB_DIR_OUT);
-
-	gadget_writel(usb_ss, &usb_ss->regs->ep_cfg,
-		EP_CFG__ENABLE__MASK |
-		EP_CFG__MAXPKTSIZE__WRITE(max_packet_size));
-	gadget_writel(usb_ss, &usb_ss->regs->ep_sts_en,
-		EP_STS_EN__SETUPEN__MASK |
-		EP_STS_EN__DESCMISEN__MASK |
-		EP_STS_EN__TRBERREN__MASK);
-
-	/* init ep in */
-	select_ep(usb_ss, USB_DIR_IN);
-
-	gadget_writel(usb_ss, &usb_ss->regs->ep_cfg,
-		EP_CFG__ENABLE__MASK |
-		EP_CFG__MAXPKTSIZE__WRITE(max_packet_size));
-	gadget_writel(usb_ss, &usb_ss->regs->ep_sts_en,
-		EP_STS_EN__SETUPEN__MASK |
-		EP_STS_EN__TRBERREN__MASK);
-
-	reg = gadget_readl(usb_ss, &usb_ss->regs->usb_conf);
-	reg |= USB_CONF__U1DS__MASK | USB_CONF__U2DS__MASK;
-	gadget_writel(usb_ss, &usb_ss->regs->usb_conf, reg);
-
-	cdns_prepare_setup_packet(usb_ss);
 }
 
 /**
- * cdns_gadget_unconfig - Unconfigures device controller
- * @usb_ss: extended gadget object
+ * cdns3_ep_inc_enq - increment endpoint's enqueue pointer
+ * @priv_ep: The endpoint whose enqueue pointer we're incrementing
  */
-static void cdns_gadget_unconfig(struct usb_ss_dev *usb_ss)
+static void cdns3_ep_inc_enq(struct cdns3_endpoint *priv_ep)
 {
-	/* RESET CONFIGURATION */
-	gadget_writel(usb_ss, &usb_ss->regs->usb_conf,
-		USB_CONF__CFGRST__MASK);
-
-	cdns_enable_l1(usb_ss, 0);
-	usb_ss->hw_configured_flag = 0;
-	usb_ss->onchip_mem_allocated_size = 0;
-	usb_ss->out_mem_is_allocated = 0;
+	priv_ep->free_trbs--;
+	cdns3_ep_inc_trb(&priv_ep->enqueue, &priv_ep->pcs, priv_ep->num_trbs);
 }
 
 /**
- * cdns_ep0_run_transfer - Do transfer on default endpoint hardware
- * @usb_ss: extended gadget object
- * @dma_addr: physical address where data is/will be stored
- * @length: data length
- * @erdy: set it to 1 when ERDY packet should be sent -
- *        exit from flow control state
+ * cdns3_ep_inc_deq - increment endpoint's dequeue pointer
+ * @priv_ep: The endpoint whose dequeue pointer we're incrementing
  */
-static void cdns_ep0_run_transfer(struct usb_ss_dev *usb_ss,
-		dma_addr_t dma_addr, unsigned int length, int erdy)
+static void cdns3_ep_inc_deq(struct cdns3_endpoint *priv_ep)
 {
-	usb_ss->trb_ep0[0] = TRB_SET_DATA_BUFFER_POINTER(dma_addr);
-	usb_ss->trb_ep0[1] = TRB_SET_TRANSFER_LENGTH((u32)length);
-	usb_ss->trb_ep0[2] = TRB_SET_CYCLE_BIT |
-		TRB_SET_INT_ON_COMPLETION | TRB_TYPE_NORMAL;
-
-	dev_dbg(&usb_ss->dev, "DRBL(%02X)\n",
-		usb_ss->ep0_data_dir ? USB_DIR_IN : USB_DIR_OUT);
+	priv_ep->free_trbs++;
+	cdns3_ep_inc_trb(&priv_ep->dequeue, &priv_ep->ccs, priv_ep->num_trbs);
+}
 
-	select_ep(usb_ss, usb_ss->ep0_data_dir
-		? USB_DIR_IN : USB_DIR_OUT);
+void cdns3_move_deq_to_next_trb(struct cdns3_request *priv_req)
+{
+	struct cdns3_endpoint *priv_ep = priv_req->priv_ep;
+	int current_trb = priv_req->start_trb;
 
-	gadget_writel(usb_ss, &usb_ss->regs->ep_traddr,
-			EP_TRADDR__TRADDR__WRITE(usb_ss->trb_ep0_dma));
-	gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-		EP_CMD__DRDY__MASK); /* drbl */
+	while (current_trb != priv_req->end_trb) {
+		cdns3_ep_inc_deq(priv_ep);
+		current_trb = priv_ep->dequeue;
+	}
 
-	if (erdy)
-		gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-			EP_CMD__ERDY__MASK);
+	cdns3_ep_inc_deq(priv_ep);
 }
 
 /**
- * cdns_ep_run_transfer - Do transfer on no-default endpoint hardware
- * @usb_ss_ep: extended endpoint object
+ * cdns3_allow_enable_l1 - enable/disable permits to transition to L1.
+ * @priv_dev: Extended gadget object
+ * @enable: Enable/disable permit to transition to L1.
  *
- * Returns zero on success or negative value on failure
+ * If bit USB_CONF_L1EN is set and device receive Extended Token packet,
+ * then controller answer with ACK handshake.
+ * If bit USB_CONF_L1DS is set and device receive Extended Token packet,
+ * then controller answer with NYET handshake.
  */
-static int cdns_ep_run_transfer(struct usb_ss_endpoint *usb_ss_ep)
+void cdns3_allow_enable_l1(struct cdns3_device *priv_dev, int enable)
 {
-	dma_addr_t trb_dma;
-	struct usb_request *request = next_request(&usb_ss_ep->request_list);
-	struct usb_ss_dev *usb_ss = usb_ss_ep->usb_ss;
-	int sg_iter = 0;
-	struct usb_ss_trb *trb;
-
-	if (request == NULL)
-		return -EINVAL;
-
-	if (request->num_sgs > USB_SS_TRBS_NUM)
-		return -EINVAL;
-
-	dev_dbg(&usb_ss->dev, "DRBL(%02X)\n",
-		usb_ss_ep->endpoint.desc->bEndpointAddress);
-
-	usb_ss_ep->hw_pending_flag = 1;
-	trb_dma = request->dma;
-
-	/* must allocate buffer aligned to 8 */
-	if ((request->dma % ADDR_MODULO_8)) {
-		if (request->length <= CDNS3_UNALIGNED_BUF_SIZE) {
-			memcpy(usb_ss_ep->cpu_addr, request->buf,
-				request->length);
-			trb_dma = usb_ss_ep->dma_addr;
-		} else {
-			return -ENOMEM;
-		}
-	}
-
-	trb = usb_ss_ep->trb_pool;
-
-	do {
-	/* fill TRB */
-		trb->offset0 = TRB_SET_DATA_BUFFER_POINTER(request->num_sgs == 0
-				? trb_dma : request->sg[sg_iter].dma_address);
-
-		trb->offset4 = TRB_SET_BURST_LENGTH(16) |
-			TRB_SET_TRANSFER_LENGTH(request->num_sgs == 0 ?
-				request->length : request->sg[sg_iter].length);
-
-		trb->offset8 = TRB_SET_CYCLE_BIT
-			| TRB_SET_INT_ON_COMPLETION
-			| TRB_SET_INT_ON_SHORT_PACKET
-			| TRB_TYPE_NORMAL;
+	if (enable)
+		writel(USB_CONF_L1EN, &priv_dev->regs->usb_conf);
+	else
+		writel(USB_CONF_L1DS, &priv_dev->regs->usb_conf);
+}
 
-		++sg_iter;
-		++trb;
+enum usb_device_speed cdns3_get_speed(struct cdns3_device *priv_dev)
+{
+	u32 reg;
 
-	} while (sg_iter < request->num_sgs);
+	reg = readl(&priv_dev->regs->usb_sts);
 
-	/* arm transfer on selected endpoint */
-	select_ep(usb_ss_ep->usb_ss,
-			usb_ss_ep->endpoint.desc->bEndpointAddress);
-	gadget_writel(usb_ss, &usb_ss->regs->ep_traddr,
-			EP_TRADDR__TRADDR__WRITE(usb_ss_ep->trb_pool_dma));
-	gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-		EP_CMD__DRDY__MASK); /* DRDY */
-	return 0;
+	if (DEV_SUPERSPEED(reg))
+		return USB_SPEED_SUPER;
+	else if (DEV_HIGHSPEED(reg))
+		return USB_SPEED_HIGH;
+	else if (DEV_FULLSPEED(reg))
+		return USB_SPEED_FULL;
+	else if (DEV_LOWSPEED(reg))
+		return USB_SPEED_LOW;
+	return USB_SPEED_UNKNOWN;
 }
 
 /**
- * cdns_get_setup_ret - Returns status of handling setup packet
- * Setup is handled by gadget driver
- * @usb_ss: extended gadget object
- * @ctrl_req: pointer to received setup packet
+ * cdns3_start_all_request - add to ring all request not started
+ * @priv_dev: Extended gadget object
+ * @priv_ep: The endpoint for whom request will be started.
  *
- * Returns zero on success or negative value on failure
+ * Returns return ENOMEM if transfer ring i not enough TRBs to start
+ *         all requests.
  */
-static int cdns_get_setup_ret(struct usb_ss_dev *usb_ss,
-		struct usb_ctrlrequest *ctrl_req)
+static int cdns3_start_all_request(struct cdns3_device *priv_dev,
+				   struct cdns3_endpoint *priv_ep)
 {
+	struct cdns3_request *priv_req;
+	struct usb_request *request;
 	int ret = 0;
 
-	spin_unlock(&usb_ss->lock);
-	usb_ss->setup_pending = 1;
-	WARN_ON(!usb_ss->gadget_driver);
-	if (usb_ss->gadget_driver && usb_ss->gadget_driver->setup)
-		ret = usb_ss->gadget_driver->setup(&usb_ss->gadget, ctrl_req);
-	usb_ss->setup_pending = 0;
-	spin_lock(&usb_ss->lock);
-	return ret;
-}
+	while (!list_empty(&priv_ep->deferred_req_list)) {
+		request = cdns3_next_request(&priv_ep->deferred_req_list);
+		priv_req = to_cdns3_request(request);
 
-static void cdns_prepare_setup_packet(struct usb_ss_dev *usb_ss)
-{
-	usb_ss->ep0_data_dir = 0;
-	cdns_ep0_run_transfer(usb_ss, usb_ss->setup_dma, 8, 0);
+		ret = cdns3_ep_run_transfer(priv_ep, request);
+		if (ret)
+			return ret;
+
+		list_del(&request->list);
+		list_add_tail(&request->list,
+			      &priv_ep->pending_req_list);
+	}
+
+	priv_ep->flags &= ~EP_RING_FULL;
+	return ret;
 }
 
 /**
- * cdns_req_ep0_set_address - Handling of SET_ADDRESS standard USB request
- * @usb_ss: extended gadget object
- * @ctrl_req: pointer to received setup packet
- *
- * Returns 0 if success, error code on error
+ * cdns3_descmiss_copy_data copy data from internal requests to request queued
+ * by class driver.
+ * @priv_ep: extended endpoint object
+ * @request: request object
  */
-static int cdns_req_ep0_set_address(struct usb_ss_dev *usb_ss,
-		struct usb_ctrlrequest *ctrl_req)
+static void cdns3_descmiss_copy_data(struct cdns3_endpoint *priv_ep,
+				     struct usb_request *request)
 {
-	enum usb_device_state device_state = usb_ss->gadget.state;
-	u32 reg;
-	u32 addr;
+	struct usb_request *descmiss_req;
+	struct cdns3_request *descmiss_priv_req;
 
-	addr = le16_to_cpu(ctrl_req->wValue);
+	while (!list_empty(&priv_ep->descmiss_req_list)) {
+		int chunk_end;
+		int length;
 
-	if (addr > DEVICE_ADDRESS_MAX) {
-		dev_err(&usb_ss->dev,
-			"Device address (%d) cannot be greater than %d\n",
-				addr, DEVICE_ADDRESS_MAX);
-		return -EINVAL;
-	}
+		descmiss_priv_req =
+			cdns3_next_priv_request(&priv_ep->descmiss_req_list);
+		descmiss_req = &descmiss_priv_req->request;
 
-	if (device_state == USB_STATE_CONFIGURED) {
-		dev_err(&usb_ss->dev, "USB device already configured\n");
-		return -EINVAL;
-	}
+		/* driver can't touch pending request */
+		if (descmiss_priv_req->flags & REQUEST_PENDING)
+			break;
 
-	reg = gadget_readl(usb_ss, &usb_ss->regs->usb_cmd);
+		chunk_end = descmiss_priv_req->flags & REQUEST_INTERNAL_CH;
+		length = request->actual + descmiss_req->actual;
 
-	gadget_writel(usb_ss, &usb_ss->regs->usb_cmd, reg
-			| USB_CMD__FADDR__WRITE(addr)
-			| USB_CMD__SET_ADDR__MASK);
+		if (length <= request->length) {
+			memcpy(&((u8 *)request->buf)[request->actual],
+			       descmiss_req->buf,
+			       descmiss_req->actual);
+			request->actual = length;
+		} else {
+			/* It should never occures */
+			request->status = -ENOMEM;
+		}
 
-	usb_gadget_set_state(&usb_ss->gadget,
-		(addr ? USB_STATE_ADDRESS : USB_STATE_DEFAULT));
+		list_del_init(&descmiss_priv_req->list);
 
-	cdns_prepare_setup_packet(usb_ss);
+		kfree(descmiss_req->buf);
+		cdns3_gadget_ep_free_request(&priv_ep->endpoint, descmiss_req);
 
-	gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-		EP_CMD__ERDY__MASK | EP_CMD__REQ_CMPL__MASK);
-	return 0;
+		if (!chunk_end)
+			break;
+	}
 }
 
 /**
- * cdns_req_ep0_get_status - Handling of GET_STATUS standard USB request
- * @usb_ss: extended gadget object
- * @ctrl_req: pointer to received setup packet
+ * cdns3_gadget_giveback - call struct usb_request's ->complete callback
+ * @priv_ep: The endpoint to whom the request belongs to
+ * @priv_req: The request we're giving back
+ * @status: completion code for the request
  *
- * Returns 0 if success, error code on error
+ * Must be called with controller's lock held and interrupts disabled. This
+ * function will unmap @req and call its ->complete() callback to notify upper
+ * layers that it has completed.
  */
-static int cdns_req_ep0_get_status(struct usb_ss_dev *usb_ss,
-		struct usb_ctrlrequest *ctrl_req)
+void cdns3_gadget_giveback(struct cdns3_endpoint *priv_ep,
+			   struct cdns3_request *priv_req,
+			   int status)
 {
-	u16 usb_status = 0;
-	unsigned int length = 2;
-	u32 recip = ctrl_req->bRequestType & USB_RECIP_MASK;
-	u32 reg;
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
+	struct usb_request *request = &priv_req->request;
 
-	switch (recip) {
+	list_del_init(&request->list);
 
-	case USB_RECIP_DEVICE:
-		/* handling otg features */
-		if (ctrl_req->wIndex == OTG_STS_SELECTOR) {
-			length = 1;
-			usb_status = usb_ss->gadget.host_request_flag;
-		} else {
+	if (request->status == -EINPROGRESS)
+		request->status = status;
+
+	usb_gadget_unmap_request_by_dev(priv_dev->sysdev, request,
+					priv_ep->dir);
 
-			reg = gadget_readl(usb_ss, &usb_ss->regs->usb_sts);
+	if ((priv_req->flags & REQUEST_UNALIGNED) &&
+	    priv_ep->dir == USB_DIR_OUT && !request->status)
+		memcpy(request->buf, priv_req->aligned_buf->buf,
+		       request->length);
 
-			if (reg & USB_STS__U1ENS__MASK)
-				usb_status |= 1uL << USB_DEV_STAT_U1_ENABLED;
+	priv_req->flags &= ~(REQUEST_PENDING | REQUEST_UNALIGNED);
+	trace_cdns3_gadget_giveback(priv_req);
 
-			if (reg & USB_STS__U2ENS__MASK)
-				usb_status |= 1uL << USB_DEV_STAT_U2_ENABLED;
+	/* WA2: */
+	if (priv_ep->flags & EP_QUIRK_EXTRA_BUF_EN &&
+	    priv_req->flags & REQUEST_INTERNAL) {
+		struct usb_request *req;
 
-			if (usb_ss->wake_up_flag)
-				usb_status |= 1uL << USB_DEVICE_REMOTE_WAKEUP;
+		req = cdns3_next_request(&priv_ep->deferred_req_list);
+		request = req;
+		priv_ep->descmis_req = NULL;
 
-			/* self powered */
-			usb_status |= usb_ss->gadget.is_selfpowered;
+		if (!req)
+			return;
+
+		cdns3_descmiss_copy_data(priv_ep, req);
+		if (!(priv_ep->flags & EP_QUIRK_END_TRANSFER) &&
+		    req->length != req->actual) {
+			/* wait for next part of transfer */
+			return;
 		}
-		break;
 
-	case USB_RECIP_INTERFACE:
-		return cdns_get_setup_ret(usb_ss, ctrl_req);
+		if (req->status == -EINPROGRESS)
+			req->status = 0;
 
-	case USB_RECIP_ENDPOINT:
-		/* check if endpoint is stalled */
-		select_ep(usb_ss, ctrl_req->wIndex);
-		if (gadget_readl(usb_ss, &usb_ss->regs->ep_sts)
-			& EP_STS__STALL__MASK)
-			usb_status = 1;
-		break;
+		list_del_init(&req->list);
+		cdns3_start_all_request(priv_dev, priv_ep);
+	}
 
-	default:
-		return -EINVAL;
+	/* Start all not pending request */
+	if (priv_ep->flags & EP_RING_FULL)
+		cdns3_start_all_request(priv_dev, priv_ep);
+
+	if (request->complete) {
+		spin_unlock(&priv_dev->lock);
+		usb_gadget_giveback_request(&priv_ep->endpoint,
+					    request);
+		spin_lock(&priv_dev->lock);
 	}
 
-	*(u16 *)usb_ss->setup = cpu_to_le16(usb_status);
+	if (request->buf == priv_dev->zlp_buf)
+		cdns3_gadget_ep_free_request(&priv_ep->endpoint, request);
+}
 
-	usb_ss->actual_ep0_request = NULL;
-	cdns_ep0_run_transfer(usb_ss, usb_ss->setup_dma, length, 1);
-	return 0;
+void cdns3_wa1_restore_cycle_bit(struct cdns3_endpoint *priv_ep)
+{
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
+
+	/* Work around for stale data address in TRB*/
+	if (priv_ep->wa1_set) {
+		cdns3_dbg(priv_dev, "WA1: update cycle bit\n");
+		priv_ep->wa1_set = 0;
+		priv_ep->wa1_trb_index = 0xFFFF;
+		if (priv_ep->wa1_cycle_bit) {
+			priv_ep->wa1_trb->control =
+				priv_ep->wa1_trb->control | 0x1;
+		} else {
+			priv_ep->wa1_trb->control =
+				priv_ep->wa1_trb->control & ~0x1;
+		}
+	}
 }
 
-/**
- * cdns_req_ep0_handle_feature -
- * Handling of GET/SET_FEATURE standard USB request
- *
- * @usb_ss: extended gadget object
- * @ctrl_req: pointer to received setup packet
- * @set: must be set to 1 for SET_FEATURE request
- *
- * Returns 0 if success, error code on error
- */
-static int cdns_req_ep0_handle_feature(struct usb_ss_dev *usb_ss,
-		struct usb_ctrlrequest *ctrl_req, int set)
+static int cdns3_prepare_aligned_request_buf(struct cdns3_request *priv_req)
 {
-	u32 recip = ctrl_req->bRequestType & USB_RECIP_MASK;
-	struct usb_ss_endpoint *usb_ss_ep;
-	u32 reg;
-	u8 tmode = 0;
-	int ret = 0;
+	struct cdns3_endpoint *priv_ep = priv_req->priv_ep;
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
+	struct cdns3_aligned_buf *buf;
 
-	switch (recip) {
-	case USB_RECIP_DEVICE:
-		switch (ctrl_req->wValue) {
-		case USB_DEVICE_U1_ENABLE:
-			if (usb_ss->gadget.state != USB_STATE_CONFIGURED)
-				return -EINVAL;
-			if (usb_ss->gadget.speed != USB_SPEED_SUPER)
-				return -EINVAL;
-
-			if (set)
-				/* set U1EN */
-				cdns_enable_u1(usb_ss, 1);
-			else
-				/* set U1 disable */
-				cdns_enable_u1(usb_ss, 0);
-			break;
-		case USB_DEVICE_U2_ENABLE:
-			if (usb_ss->gadget.state != USB_STATE_CONFIGURED)
-				return -EINVAL;
-			if (usb_ss->gadget.speed != USB_SPEED_SUPER)
-				return -EINVAL;
-
-			if (set)
-				/* set U2EN */
-				cdns_enable_u2(usb_ss, 1);
-			else
-				/* set U2 disable */
-				cdns_enable_u2(usb_ss, 0);
-			break;
-		case USB_DEVICE_A_ALT_HNP_SUPPORT:
-			break;
-		case USB_DEVICE_A_HNP_SUPPORT:
-			break;
-		case USB_DEVICE_B_HNP_ENABLE:
-			if (!usb_ss->gadget.b_hnp_enable && set)
-				usb_ss->gadget.b_hnp_enable = 1;
-			break;
-		case USB_DEVICE_REMOTE_WAKEUP:
-			usb_ss->wake_up_flag = !!set;
-			break;
-		case USB_DEVICE_TEST_MODE:
-			if (usb_ss->gadget.state != USB_STATE_CONFIGURED)
-				return -EINVAL;
-			if (usb_ss->gadget.speed != USB_SPEED_HIGH &&
-				usb_ss->gadget.speed !=	USB_SPEED_FULL)
-				return -EINVAL;
-			if (ctrl_req->wLength != 0 ||
-				ctrl_req->bRequestType & USB_DIR_IN) {
-				dev_err(&usb_ss->dev, "req is error\n");
-				return -EINVAL;
-			}
-			tmode = le16_to_cpu(ctrl_req->wIndex) >> 8;
-			switch (tmode) {
-			case TEST_J:
-			case TEST_K:
-			case TEST_SE0_NAK:
-			case TEST_PACKET:
-				reg = gadget_readl(usb_ss,
-					&usb_ss->regs->usb_cmd);
-				tmode -= 1;
-				reg |= USB_CMD__STMODE |
-					USB_CMD__TMODE_SEL(tmode);
-				gadget_writel(usb_ss, &usb_ss->regs->usb_cmd,
-						reg);
-				dev_info(&usb_ss->dev,
-					"set test mode, val=0x%x", reg);
-				break;
-			default:
-				return -EINVAL;
-			}
-			break;
+	/* check if buffer is aligned to 8. */
+	if (!((uintptr_t)priv_req->request.buf & 0x7))
+		return 0;
 
-		default:
-			return -EINVAL;
+	buf = priv_req->aligned_buf;
 
-		}
-		break;
-	case USB_RECIP_INTERFACE:
-		return cdns_get_setup_ret(usb_ss, ctrl_req);
-	case USB_RECIP_ENDPOINT:
-		select_ep(usb_ss, ctrl_req->wIndex);
-		if (set) {
-			/* set stall */
-			gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-			EP_CMD__SSTALL__MASK);
-
-			/* handle non zero endpoint software endpoint */
-			if (ctrl_req->wIndex & 0x7F) {
-				usb_ss_ep = usb_ss->eps[CAST_EP_ADDR_TO_INDEX(
-						ctrl_req->wIndex)];
-				usb_ss_ep->stalled_flag = 1;
-			}
-		} else {
-			struct usb_request *request;
+	if (!buf || priv_req->request.length > buf->size) {
+		buf = kzalloc(sizeof(*buf), GFP_ATOMIC);
+		if (!buf)
+			return -ENOMEM;
 
-			if (ctrl_req->wIndex & 0x7F) {
-				if (usb_ss->eps[CAST_EP_ADDR_TO_INDEX(
-					ctrl_req->wIndex)]->wedge_flag)
-					goto jmp_wedge;
-			}
+		buf->size = priv_req->request.length;
 
-			/* clear stall */
-			gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-			EP_CMD__CSTALL__MASK | EP_CMD__EPRST__MASK);
-			/* wait for EPRST cleared */
-			ret = wait_reg_bit_clear(usb_ss, &usb_ss->regs->ep_cmd,
-				EP_CMD__EPRST__MASK, 100);
-
-			/* handle non zero endpoint software endpoint */
-			if (ctrl_req->wIndex & 0x7F) {
-				usb_ss_ep = usb_ss->eps[CAST_EP_ADDR_TO_INDEX(
-						ctrl_req->wIndex)];
-				usb_ss_ep->stalled_flag = 0;
-
-				request = next_request(
-						&usb_ss_ep->request_list);
-				if (request)
-					cdns_ep_run_transfer(usb_ss_ep);
-			}
+		buf->buf = dma_alloc_coherent(priv_dev->sysdev,
+					      buf->size,
+					      &buf->dma,
+					      GFP_ATOMIC);
+		if (!buf->buf) {
+			kfree(buf);
+			return -ENOMEM;
 		}
-jmp_wedge:
-		select_ep(usb_ss, 0x00);
-		break;
 
-	default:
-		return -EINVAL;
-	}
+		if (priv_req->aligned_buf) {
+			trace_cdns3_free_aligned_request(priv_req);
+			priv_req->aligned_buf->in_use = 0;
+			priv_dev->run_garbage_colector = 1;
+		}
 
-	gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-		EP_CMD__ERDY__MASK | EP_CMD__REQ_CMPL__MASK);
-	return ret;
-}
+		buf->in_use = 1;
+		priv_req->aligned_buf = buf;
 
-/**
- * cdns_req_ep0_set_sel - Handling of SET_SEL standard USB request
- * @usb_ss: extended gadget object
- * @ctrl_req: pointer to received setup packet
- *
- * Returns 0 if success, error code on error
- */
-static int cdns_req_ep0_set_sel(struct usb_ss_dev *usb_ss,
-		struct usb_ctrlrequest *ctrl_req)
-{
-	if (usb_ss->gadget.state < USB_STATE_ADDRESS)
-		return -EINVAL;
+		list_add_tail(&buf->list,
+			      &priv_dev->aligned_buf_list);
+	}
 
-	if (ctrl_req->wLength != 6) {
-		dev_err(&usb_ss->dev, "Set SEL should be 6 bytes, got %d\n",
-				ctrl_req->wLength);
-		return -EINVAL;
+	if (priv_ep->dir == USB_DIR_IN) {
+		memcpy(buf->buf, priv_req->request.buf,
+		       priv_req->request.length);
 	}
 
-	usb_ss->ep0_data_dir = 0;
-	usb_ss->actual_ep0_request = NULL;
-	cdns_ep0_run_transfer(usb_ss, usb_ss->setup_dma, 6, 1);
+	priv_req->flags |= REQUEST_UNALIGNED;
+	trace_cdns3_prepare_aligned_request(priv_req);
+
 	return 0;
 }
 
 /**
- * cdns_req_ep0_set_isoch_delay -
- * Handling of GET_ISOCH_DELAY standard USB request
- * @usb_ss: extended gadget object
- * @ctrl_req: pointer to received setup packet
+ * cdns3_ep_run_transfer - start transfer on no-default endpoint hardware
+ * @priv_ep: endpoint object
  *
- * Returns 0 if success, error code on error
+ * Returns zero on success or negative value on failure
  */
-static int cdns_req_ep0_set_isoch_delay(struct usb_ss_dev *usb_ss,
-		struct usb_ctrlrequest *ctrl_req)
+int cdns3_ep_run_transfer(struct cdns3_endpoint *priv_ep,
+			  struct usb_request *request)
 {
-	if (ctrl_req->wIndex || ctrl_req->wLength)
-		return -EINVAL;
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
+	struct cdns3_request *priv_req;
+	struct cdns3_trb *trb;
+	dma_addr_t trb_dma;
+	int prev_enqueue;
+	u32 togle_pcs = 1;
+	int sg_iter = 0;
+	int dma_index;
+	u32 doorbell;
+	int num_trb;
+	int address;
+	u32 control;
+	int pcs;
+
+	if (priv_ep->type == USB_ENDPOINT_XFER_ISOC)
+		num_trb = priv_ep->interval;
+	else
+		num_trb = request->num_sgs ? request->num_sgs : 1;
 
-	usb_ss->isoch_delay = ctrl_req->wValue;
-	gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-	EP_CMD__ERDY__MASK | EP_CMD__REQ_CMPL__MASK);
-	return 0;
-}
+	if (num_trb > priv_ep->free_trbs) {
+		priv_ep->flags |= EP_RING_FULL;
+		return -ENOBUFS;
+	}
 
-static void cdns_enable_l1(struct usb_ss_dev *usb_ss, int enable)
-{
-	if (enable)
-		gadget_writel(usb_ss, &usb_ss->regs->usb_conf,
-				USB_CONF__L1EN__MASK);
-	else
-		gadget_writel(usb_ss, &usb_ss->regs->usb_conf,
-				USB_CONF__L1DS__MASK);
-}
+	priv_req = to_cdns3_request(request);
+	address = priv_ep->endpoint.desc->bEndpointAddress;
 
-static void cdns_enable_u1(struct usb_ss_dev *usb_ss, int enable)
-{
-	if (enable)
-		gadget_writel(usb_ss, &usb_ss->regs->usb_conf,
-				USB_CONF__U1EN__MASK);
-	else
-		gadget_writel(usb_ss, &usb_ss->regs->usb_conf,
-				USB_CONF__U1DS__MASK);
-}
+	priv_ep->flags |= EP_PENDING_REQUEST;
 
-static void cdns_enable_u2(struct usb_ss_dev *usb_ss, int enable)
-{
-	if (enable)
-		gadget_writel(usb_ss, &usb_ss->regs->usb_conf,
-				USB_CONF__U2EN__MASK);
+	/* must allocate buffer aligned to 8 */
+	if (priv_req->flags & REQUEST_UNALIGNED)
+		trb_dma = priv_req->aligned_buf->dma;
 	else
-		gadget_writel(usb_ss, &usb_ss->regs->usb_conf,
-				USB_CONF__U2DS__MASK);
-}
+		trb_dma = request->dma;
 
-/**
- * cdns_req_ep0_set_configuration - Handling of SET_CONFIG standard USB request
- * @usb_ss: extended gadget object
- * @ctrl_req: pointer to received setup packet
- *
- * Returns 0 if success, 0x7FFF on deferred status stage, error code on error
- */
-static int cdns_req_ep0_set_configuration(struct usb_ss_dev *usb_ss,
-		struct usb_ctrlrequest *ctrl_req)
-{
-	enum usb_device_state device_state = usb_ss->gadget.state;
-	u32 config = le16_to_cpu(ctrl_req->wValue);
-	struct usb_ep *ep;
-	struct usb_ss_endpoint *usb_ss_ep, *temp_ss_ep;
-	int i, result = 0;
-
-	switch (device_state) {
-	case USB_STATE_ADDRESS:
-		/* Configure non-control EPs */
-		list_for_each_entry_safe(usb_ss_ep, temp_ss_ep,
-			&usb_ss->ep_match_list, ep_match_pending_list)
-			cdns_ep_config(usb_ss_ep);
-
-		result = cdns_get_setup_ret(usb_ss, ctrl_req);
-
-		if (result != 0)
-			return result;
-
-		if (config) {
-			if (!usb_ss->hw_configured_flag) {
-				/* SET CONFIGURATION */
-				gadget_writel(usb_ss, &usb_ss->regs->usb_conf,
-					USB_CONF__CFGSET__MASK);
-				gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-					EP_CMD__ERDY__MASK |
-					EP_CMD__REQ_CMPL__MASK);
-				/* wait until configuration set */
-				result = wait_reg_bit_set(usb_ss,
-					&usb_ss->regs->usb_sts,
-					USB_STS__CFGSTS__MASK, 100);
-				usb_ss->hw_configured_flag = 1;
-				cdns_enable_l1(usb_ss, 1);
-				if (usb_ss->gadget.speed == USB_SPEED_SUPER) {
-					cdns_enable_u1(usb_ss, 1);
-					cdns_enable_u2(usb_ss, 1);
-				}
-
-				list_for_each_entry(ep,
-					&usb_ss->gadget.ep_list,
-					ep_list) {
-					if (ep->enabled)
-						cdns_ep_run_transfer(
-							to_usb_ss_ep(ep));
-				}
-			}
+	trb = priv_ep->trb_pool + priv_ep->enqueue;
+	priv_req->start_trb = priv_ep->enqueue;
+	priv_req->trb = trb;
+	prev_enqueue = priv_ep->enqueue;
+
+	/* prepare ring */
+	if ((priv_ep->enqueue + num_trb)  >= (priv_ep->num_trbs - 1)) {
+		/*updating C bt in  Link TRB before starting DMA*/
+		struct cdns3_trb *link_trb = priv_ep->trb_pool +
+					     (priv_ep->num_trbs - 1);
+		link_trb->control = ((priv_ep->pcs) ? TRB_CYCLE : 0) |
+				    TRB_TYPE(TRB_LINK) | TRB_CHAIN |
+				    TRB_TOGGLE;
+	}
+
+	/* arm transfer on selected endpoint */
+	cdns3_select_ep(priv_ep->cdns3_dev, address);
+
+	doorbell = !!(readl(&priv_dev->regs->ep_cmd) & EP_CMD_DRDY);
+
+	if (!priv_ep->wa1_set) {
+		if (doorbell) {
+			priv_ep->wa1_cycle_bit = priv_ep->pcs ? TRB_CYCLE : 0;
+			priv_ep->wa1_set = 1;
+			priv_ep->wa1_trb = trb;
+			priv_ep->wa1_trb_index = priv_ep->enqueue;
+			togle_pcs = 0;
+			cdns3_dbg(priv_dev, "WA1 set guard\n");
+		}
+	}
+
+	/* set incorrect Cycle Bit for first trb*/
+	control = priv_ep->pcs ? 0 : TRB_CYCLE;
+	do {
+		/* fill TRB */
+		control |= TRB_TYPE(TRB_NORMAL);
+		trb->buffer = TRB_BUFFER(request->num_sgs == 0
+				? trb_dma : request->sg[sg_iter].dma_address);
+
+		trb->length = TRB_BURST_LEN(16/*priv_ep->trb_burst_size*/) |
+		    TRB_LEN(request->num_sgs == 0 ?
+				request->length : request->sg[sg_iter].length);
+
+		pcs = priv_ep->pcs ? TRB_CYCLE : 0;
+
+		/*
+		 * first trb should be prepared as last to avoid processing
+		 *  transfer to early
+		 */
+		if (sg_iter != 0)
+			control |= pcs;
+
+		if (priv_ep->type == USB_ENDPOINT_XFER_ISOC  && !priv_ep->dir) {
+			control |= TRB_IOC | TRB_ISP;
 		} else {
-			cdns_gadget_unconfig(usb_ss);
-			for (i = 0; i < usb_ss->ep_nums; i++)
-				usb_ss->eps[i]->endpoint.enabled = 0;
-			usb_gadget_set_state(&usb_ss->gadget,
-				USB_STATE_ADDRESS);
+			/* for last element in TD or in SG list */
+			if (sg_iter == (num_trb - 1) && sg_iter != 0)
+				control |= pcs | TRB_IOC | TRB_ISP;
 		}
-		break;
-	case USB_STATE_CONFIGURED:
-		result = cdns_get_setup_ret(usb_ss, ctrl_req);
-		if (!config && !result) {
-			cdns_gadget_unconfig(usb_ss);
-			for (i = 0; i < usb_ss->ep_nums; i++)
-				usb_ss->eps[i]->endpoint.enabled = 0;
-			usb_gadget_set_state(&usb_ss->gadget,
-				USB_STATE_ADDRESS);
+
+		if (sg_iter) {
+			trb->control = control;
+			control = 0;
 		}
-		break;
-	default:
-		result = -EINVAL;
-	}
 
-	return result;
-}
+		++sg_iter;
+		priv_req->end_trb = priv_ep->enqueue;
+		cdns3_ep_inc_enq(priv_ep);
+		trb = priv_ep->trb_pool + priv_ep->enqueue;
+	} while (sg_iter < num_trb);
 
-/**
- * cdns_ep0_standard_request - Handling standard USB requests
- * @usb_ss: extended gadget object
- * @ctrl_req: pointer to received setup packet
- *
- * Returns 0 if success, error code on error
- */
-static int cdns_ep0_standard_request(struct usb_ss_dev *usb_ss,
-		struct usb_ctrlrequest *ctrl_req)
-{
-	switch (ctrl_req->bRequest) {
-	case USB_REQ_SET_ADDRESS:
-		return cdns_req_ep0_set_address(usb_ss, ctrl_req);
-	case USB_REQ_SET_CONFIGURATION:
-		return cdns_req_ep0_set_configuration(usb_ss, ctrl_req);
-	case USB_REQ_GET_STATUS:
-		return cdns_req_ep0_get_status(usb_ss, ctrl_req);
-	case USB_REQ_CLEAR_FEATURE:
-		return cdns_req_ep0_handle_feature(usb_ss, ctrl_req, 0);
-	case USB_REQ_SET_FEATURE:
-		return cdns_req_ep0_handle_feature(usb_ss, ctrl_req, 1);
-	case USB_REQ_SET_SEL:
-		return cdns_req_ep0_set_sel(usb_ss, ctrl_req);
-	case USB_REQ_SET_ISOCH_DELAY:
-		return cdns_req_ep0_set_isoch_delay(usb_ss, ctrl_req);
-	default:
-		return cdns_get_setup_ret(usb_ss, ctrl_req);
+	trb = priv_req->trb;
+
+	priv_req->flags |= REQUEST_PENDING;
+
+	/* give the TD to the consumer*/
+	if (sg_iter == 1)
+		control |= TRB_IOC | TRB_ISP;
+
+	/*
+	 * Memory barrier - cycle bit must be set before other filds in trb.
+	 */
+	wmb();
+
+	if (togle_pcs)
+		trb->control = control ^ 1;
+	else
+		trb->control = control;
+
+	doorbell = !!(readl(&priv_dev->regs->ep_cmd) & EP_CMD_DRDY);
+	dma_index = (readl(&priv_dev->regs->ep_traddr) -
+			 priv_ep->trb_pool_dma) / TRB_SIZE;
+
+	cdns3_dbg(priv_dev, "dorbel %d, dma_index %d, prev_enqueu %d",
+		  doorbell, dma_index, prev_enqueue);
+
+	if (!doorbell || dma_index != priv_ep->wa1_trb_index)
+		cdns3_wa1_restore_cycle_bit(priv_ep);
+
+	trace_cdns3_prepare_trb(priv_ep, priv_req->trb);
+
+	/*
+	 * Memory barrier - Cycle Bit must be set before trb->length  and
+	 * trb->buffer fields.
+	 */
+	wmb();
+
+	/*
+	 * For DMULT mode we can set address to transfer ring only once after
+	 * enabling endpoint.
+	 */
+	if (priv_ep->flags & EP_UPDATE_EP_TRBADDR) {
+		writel(EP_TRADDR_TRADDR(priv_ep->trb_pool_dma +
+					priv_req->start_trb * TRB_SIZE),
+		       &priv_dev->regs->ep_traddr);
+
+		cdns3_dbg(priv_ep->cdns3_dev, "Update ep_trbaddr for %s to %08x\n",
+			  priv_ep->name, readl(&priv_dev->regs->ep_traddr));
+
+		priv_ep->flags &= ~EP_UPDATE_EP_TRBADDR;
 	}
+
+	if (!priv_ep->wa1_set && !(priv_ep->flags & EP_STALL)) {
+		trace_cdns3_ring(priv_ep);
+		/*clearing TRBERR and EP_STS_DESCMIS before seting DRDY*/
+		writel(EP_STS_TRBERR | EP_STS_DESCMIS, &priv_dev->regs->ep_sts);
+		writel(EP_CMD_DRDY, &priv_dev->regs->ep_cmd);
+		trace_cdns3_doorbell_epx(priv_ep->name,
+					 readl(&priv_dev->regs->ep_traddr));
+	}
+
+	return 0;
 }
 
-/**
- * cdns_ep0_setup_phase - Handling setup USB requests
- * @usb_ss: extended gadget object
- */
-static void cdns_ep0_setup_phase(struct usb_ss_dev *usb_ss)
+void cdns3_set_hw_configuration(struct cdns3_device *priv_dev)
 {
-	int result;
-	struct usb_ctrlrequest *ctrl_req =
-			(struct usb_ctrlrequest *)usb_ss->setup;
+	struct cdns3_endpoint *priv_ep;
+	struct usb_ep *ep;
+	int result = 0;
 
-	if ((ctrl_req->bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD)
-		result = cdns_ep0_standard_request(usb_ss, ctrl_req);
-	else
-		result = cdns_get_setup_ret(usb_ss, ctrl_req);
+	if (priv_dev->hw_configured_flag)
+		return;
+
+	writel(USB_CONF_CFGSET, &priv_dev->regs->usb_conf);
+	writel(EP_CMD_ERDY | EP_CMD_REQ_CMPL, &priv_dev->regs->ep_cmd);
+
+	cdns3_set_register_bit(&priv_dev->regs->usb_conf,
+			       USB_CONF_U1EN | USB_CONF_U2EN);
+
+	/* wait until configuration set */
+	result = cdns3_handshake(&priv_dev->regs->usb_sts,
+				 USB_STS_CFGSTS_MASK, 1, 100);
 
-	if (result != 0 && result != USB_GADGET_DELAYED_STATUS) {
-		dev_dbg(&usb_ss->dev, "STALL(00) %d\n", result);
-		/* set_stall on ep0 */
-		select_ep(usb_ss, 0x00);
-		gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-			EP_CMD__SSTALL__MASK);
-		gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-			EP_CMD__ERDY__MASK | EP_CMD__REQ_CMPL__MASK);
+	priv_dev->hw_configured_flag = 1;
+//	cdns3_allow_enable_l1(priv_dev, 1);
+
+	list_for_each_entry(ep, &priv_dev->gadget.ep_list, ep_list) {
+		if (ep->enabled) {
+			priv_ep = ep_to_cdns3_ep(ep);
+			cdns3_start_all_request(priv_dev, priv_ep);
+		}
 	}
 }
 
 /**
- * cdns_check_ep_interrupt_proceed - Processes interrupt related to endpoint
- * @usb_ss_ep: extended endpoint object
+ * cdns3_request_handled - check whether request has been handled by DMA
  *
- * Returns 0
+ * @priv_ep: extended endpoint object.
+ * @priv_req: request object for checking
+ *
+ * Endpoint must be selected before invoking this function.
+ *
+ * Returns false if request has not been handled by DMA, else returns true.
+ *
+ * SR - start ring
+ * ER -  end ring
+ * DQ = priv_ep->dequeue - dequeue position
+ * EQ = priv_ep->enqueue -  enqueue position
+ * ST = priv_req->start_trb - index of first TRB in transfer ring
+ * ET = priv_req->end_trb - index of last TRB in transfer ring
+ * CI = current_index - index of processed TRB by DMA.
+ *
+ * As first step, function checks if cycle bit for priv_req->start_trb is
+ * correct.
+ *
+ * some rules:
+ * 1. priv_ep->dequeue never exceed current_index.
+ * 2  priv_ep->enqueue never exceed priv_ep->dequeue
+ *
+ * Then We can split recognition into two parts:
+ * Case 1 - priv_ep->dequeue < current_index
+ *      SR ... EQ ... DQ ... CI ... ER
+ *      SR ... DQ ... CI ... EQ ... ER
+ *
+ *      Request has been handled by DMA if ST and ET is between DQ and CI.
+ *
+ * Case 2 - priv_ep->dequeue > current_index
+ * This situation take place when CI go through the LINK TRB at the end of
+ * transfer ring.
+ *      SR ... CI ... EQ ... DQ ... ER
+ *
+ *      Request has been handled by DMA if ET is less then CI or
+ *      ET is greater or equal DQ.
  */
-static int cdns_check_ep_interrupt_proceed(struct usb_ss_endpoint *usb_ss_ep)
+static bool cdns3_request_handled(struct cdns3_endpoint *priv_ep,
+				  struct cdns3_request *priv_req)
 {
-	struct usb_ss_dev *usb_ss = usb_ss_ep->usb_ss;
-	struct usb_request *request;
-	u32 ep_sts_reg;
-
-	select_ep(usb_ss, usb_ss_ep->endpoint.address);
-	ep_sts_reg = gadget_readl(usb_ss, &usb_ss->regs->ep_sts);
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
+	struct cdns3_trb *trb = priv_req->trb;
+	int current_index = 0;
+	int handled = 0;
 
-	dev_dbg(&usb_ss->dev, "EP_STS: %08X\n", ep_sts_reg);
+	current_index = (readl(&priv_dev->regs->ep_traddr) -
+			 priv_ep->trb_pool_dma) / TRB_SIZE;
 
-	if (ep_sts_reg & EP_STS__TRBERR__MASK) {
-		gadget_writel(usb_ss,
-			&usb_ss->regs->ep_sts, EP_STS__TRBERR__MASK);
+	trb = &priv_ep->trb_pool[priv_req->start_trb];
 
-		dev_dbg(&usb_ss->dev, "TRBERR(%02X)\n",
-			usb_ss_ep->endpoint.desc->bEndpointAddress);
-	}
+	if ((trb->control  & TRB_CYCLE) != priv_ep->ccs)
+		goto finish;
 
-	if (ep_sts_reg & EP_STS__ISOERR__MASK) {
-		gadget_writel(usb_ss,
-			&usb_ss->regs->ep_sts, EP_STS__ISOERR__MASK);
-		dev_dbg(&usb_ss->dev, "ISOERR(%02X)\n",
-			usb_ss_ep->endpoint.desc->bEndpointAddress);
-	}
+	if (priv_ep->dequeue < current_index) {
+		if ((current_index == (priv_ep->num_trbs - 1)) &&
+		    !priv_ep->dequeue)
+			goto finish;
 
-	if (ep_sts_reg & EP_STS__OUTSMM__MASK) {
-		gadget_writel(usb_ss, &usb_ss->regs->ep_sts,
-			EP_STS__OUTSMM__MASK);
-		dev_dbg(&usb_ss->dev, "OUTSMM(%02X)\n",
-			usb_ss_ep->endpoint.desc->bEndpointAddress);
+		if (priv_req->end_trb >= priv_ep->dequeue &&
+		    priv_req->end_trb < current_index)
+			handled = 1;
+	} else if (priv_ep->dequeue  > current_index) {
+		if (priv_req->end_trb  < current_index ||
+		    priv_req->end_trb >= priv_ep->dequeue)
+			handled = 1;
 	}
 
-	if (ep_sts_reg & EP_STS__NRDY__MASK) {
-		gadget_writel(usb_ss,
-			&usb_ss->regs->ep_sts, EP_STS__NRDY__MASK);
-		dev_dbg(&usb_ss->dev, "NRDY(%02X)\n",
-			usb_ss_ep->endpoint.desc->bEndpointAddress);
-	}
+finish:
+	trace_cdns3_request_handled(priv_req, current_index, handled);
 
-	if ((ep_sts_reg & EP_STS__IOC__MASK)
-			|| (ep_sts_reg & EP_STS__ISP__MASK)) {
-		gadget_writel(usb_ss, &usb_ss->regs->ep_sts,
-		EP_STS__IOC__MASK | EP_STS__ISP__MASK);
+	return handled;
+}
 
-		/* get just completed request */
-		request = next_request(&usb_ss_ep->request_list);
-		if (!request)
-			return 0;
+static void cdns3_transfer_completed(struct cdns3_device *priv_dev,
+				     struct cdns3_endpoint *priv_ep)
+{
+	struct cdns3_request *priv_req;
+	struct usb_request *request;
+	struct cdns3_trb *trb;
 
-		if ((request->dma % ADDR_MODULO_8) &&
-				(usb_ss_ep->dir == USB_DIR_OUT))
-			memcpy(request->buf, usb_ss_ep->cpu_addr,
-					request->length);
+	while (!list_empty(&priv_ep->pending_req_list)) {
+		request = cdns3_next_request(&priv_ep->pending_req_list);
+		priv_req = to_cdns3_request(request);
 
-		usb_gadget_unmap_request_by_dev(usb_ss->sysdev, request,
-			usb_ss_ep->endpoint.desc->bEndpointAddress
-			& ENDPOINT_DIR_MASK);
+		/* Re-select endpoint. It could be changed by other CPU during
+		 * handling usb_gadget_giveback_request.
+		 */
+		cdns3_select_ep(priv_dev, priv_ep->endpoint.address);
 
-		request->status = 0;
-		request->actual =
-			le32_to_cpu(((u32 *) usb_ss_ep->trb_pool)[1])
-			& ACTUAL_TRANSFERRED_BYTES_MASK;
+		if (!cdns3_request_handled(priv_ep, priv_req))
+			return;
 
-		dev_dbg(&usb_ss->dev, "IOC(%02X) %d\n",
-			usb_ss_ep->endpoint.desc->bEndpointAddress,
-			request->actual);
+		trb = priv_ep->trb_pool + priv_ep->dequeue;
+		trace_cdns3_complete_trb(priv_ep, trb);
 
-		list_del(&request->list);
+		if (trb != priv_req->trb)
+			dev_warn(priv_dev->dev,
+				 "request_trb=0x%p, queue_trb=0x%p\n",
+				 priv_req->trb, trb);
 
-		usb_ss_ep->hw_pending_flag = 0;
-		if (request->complete) {
-			spin_unlock(&usb_ss->lock);
-			usb_gadget_giveback_request(&usb_ss_ep->endpoint,
-				request);
-			spin_lock(&usb_ss->lock);
-		}
+		request->actual = TRB_LEN(le32_to_cpu(trb->length));
+		cdns3_move_deq_to_next_trb(priv_req);
+		cdns3_gadget_giveback(priv_ep, priv_req, 0);
+	}
+	priv_ep->flags &= ~EP_PENDING_REQUEST;
+}
 
-		if (request->buf == usb_ss->zlp_buf)
-			kfree(request);
+void cdns3_rearm_transfer(struct cdns3_endpoint *priv_ep, u8 rearm)
+{
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
 
-		/* handle deferred STALL */
-		if (usb_ss_ep->stalled_flag) {
-			cdns_ep_stall_flush(usb_ss_ep);
-			return 0;
-		}
+	cdns3_wa1_restore_cycle_bit(priv_ep);
 
-		/* exit if hardware transfer already started */
-		if (usb_ss_ep->hw_pending_flag)
-			return 0;
+	if (rearm) {
+		trace_cdns3_ring(priv_ep);
 
-		/* if any request queued run it! */
-		if (!list_empty(&usb_ss_ep->request_list))
-			cdns_ep_run_transfer(usb_ss_ep);
-	}
+		/* Cycle Bit must be updated before arming DMA. */
+		wmb();
+		writel(EP_CMD_DRDY, &priv_dev->regs->ep_cmd);
 
-	if (ep_sts_reg & EP_STS__DESCMIS__MASK) {
-		gadget_writel(usb_ss,
-			&usb_ss->regs->ep_sts, EP_STS__DESCMIS__MASK);
-		dev_dbg(&usb_ss->dev, "DESCMIS(%02X)\n",
-			usb_ss_ep->endpoint.desc->bEndpointAddress);
+		trace_cdns3_doorbell_epx(priv_ep->name,
+					 readl(&priv_dev->regs->ep_traddr));
 	}
-
-	return 0;
 }
 
 /**
- * cdns_check_ep0_interrupt_proceed - Processes interrupt related to endpoint 0
- * @usb_ss: extended gadget object
- * @dir: 1 for IN direction, 0 for OUT direction
+ * cdns3_descmissing_packet - handles descriptor missing event.
+ * @priv_dev: extended gadget object
+ *
+ * This function is used only for WA2. For more information see Work around 2
+ * description.
  */
-static void cdns_check_ep0_interrupt_proceed(struct usb_ss_dev *usb_ss, int dir)
+static int cdns3_descmissing_packet(struct cdns3_endpoint *priv_ep)
 {
-	u32 ep_sts_reg;
-	int i;
+	struct cdns3_request *priv_req;
+	struct usb_request *request;
 
-	select_ep(usb_ss, 0 | (dir ? USB_DIR_IN : USB_DIR_OUT));
-	ep_sts_reg = gadget_readl(usb_ss, &usb_ss->regs->ep_sts);
+	if (priv_ep->flags & EP_QUIRK_EXTRA_BUF_DET) {
+		priv_ep->flags &= ~EP_QUIRK_EXTRA_BUF_DET;
+		priv_ep->flags |= EP_QUIRK_EXTRA_BUF_EN;
+	}
 
-	dev_dbg(&usb_ss->dev, "EP_STS: %08X\n", ep_sts_reg);
+	cdns3_dbg(priv_ep->cdns3_dev, "WA2: Description Missing detected\n");
 
-	__pending_setup_status_handler(usb_ss);
+	request = cdns3_gadget_ep_alloc_request(&priv_ep->endpoint,
+						GFP_ATOMIC);
+	if (!request)
+		return -ENOMEM;
 
-	if ((ep_sts_reg & EP_STS__SETUP__MASK) && (dir == 0)) {
-		dev_dbg(&usb_ss->dev, "SETUP(%02X)\n", 0x00);
+	priv_req = to_cdns3_request(request);
+	priv_req->flags |= REQUEST_INTERNAL;
+
+	/* if this field is still assigned it indicate that transfer related
+	 * with this request has not been finished yet. Driver in this
+	 * case simply allocate next request and assign flag REQUEST_INTERNAL_CH
+	 * flag to previous one. It will indicate that current request is
+	 * part of the previous one.
+	 */
+	if (priv_ep->descmis_req)
+		priv_ep->descmis_req->flags |= REQUEST_INTERNAL_CH;
+
+	priv_req->request.buf = kzalloc(CDNS3_DESCMIS_BUF_SIZE,
+					GFP_ATOMIC);
+	if (!priv_req->request.buf) {
+		cdns3_gadget_ep_free_request(&priv_ep->endpoint, request);
+		return -ENOMEM;
+	}
 
-		gadget_writel(usb_ss, &usb_ss->regs->ep_sts,
-			EP_STS__SETUP__MASK |
-			EP_STS__IOC__MASK | EP_STS__ISP__MASK);
+	priv_req->request.length = CDNS3_DESCMIS_BUF_SIZE;
+	priv_ep->descmis_req = priv_req;
 
-		dev_dbg(&usb_ss->dev, "SETUP: ");
-		for (i = 0; i < 8; i++)
-			dev_dbg(&usb_ss->dev, "%02X ", usb_ss->setup[i]);
-		dev_dbg(&usb_ss->dev, "\nSTATE: %d\n", usb_ss->gadget.state);
-		usb_ss->ep0_data_dir = usb_ss->setup[0] & USB_DIR_IN;
-		cdns_ep0_setup_phase(usb_ss);
-		ep_sts_reg &= ~(EP_STS__SETUP__MASK |
-			EP_STS__IOC__MASK |
-			EP_STS__ISP__MASK);
-	}
+	__cdns3_gadget_ep_queue(&priv_ep->endpoint,
+				&priv_ep->descmis_req->request,
+				GFP_ATOMIC);
 
-	if (ep_sts_reg & EP_STS__TRBERR__MASK) {
-		gadget_writel(usb_ss,
-			&usb_ss->regs->ep_sts, EP_STS__TRBERR__MASK);
-		dev_dbg(&usb_ss->dev, "TRBERR(%02X)\n",
-			dir ? USB_DIR_IN : USB_DIR_OUT);
-	}
+	return 0;
+}
 
-	if (ep_sts_reg & EP_STS__DESCMIS__MASK) {
-		gadget_writel(usb_ss,
-			&usb_ss->regs->ep_sts, EP_STS__DESCMIS__MASK);
+/**
+ * cdns3_check_ep_interrupt_proceed - Processes interrupt related to endpoint
+ * @priv_ep: endpoint object
+ *
+ * Returns 0
+ */
+static int cdns3_check_ep_interrupt_proceed(struct cdns3_endpoint *priv_ep)
+{
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
+	u32 ep_sts_reg;
 
-		dev_dbg(&usb_ss->dev, "DESCMIS(%02X)\n",
-			dir ? USB_DIR_IN : USB_DIR_OUT);
+	cdns3_select_ep(priv_dev, priv_ep->endpoint.address);
 
-		if (dir == 0 && !usb_ss->setup_pending) {
-			usb_ss->ep0_data_dir = 0;
-			cdns_ep0_run_transfer(usb_ss,
-				usb_ss->setup_dma, 8, 0);
-		}
-	}
+	trace_cdns3_epx_irq(priv_dev, priv_ep);
 
-	if ((ep_sts_reg & EP_STS__IOC__MASK)
-			|| (ep_sts_reg & EP_STS__ISP__MASK)) {
-		gadget_writel(usb_ss,
-			&usb_ss->regs->ep_sts, EP_STS__IOC__MASK);
-		if (usb_ss->actual_ep0_request) {
-			usb_gadget_unmap_request_by_dev(usb_ss->sysdev,
-					usb_ss->actual_ep0_request,
-					usb_ss->ep0_data_dir);
+	ep_sts_reg = readl(&priv_dev->regs->ep_sts);
+	writel(ep_sts_reg, &priv_dev->regs->ep_sts);
 
-			usb_ss->actual_ep0_request->actual =
-				le32_to_cpu((usb_ss->trb_ep0)[1])
-				& ACTUAL_TRANSFERRED_BYTES_MASK;
+	if (ep_sts_reg & EP_STS_TRBERR) {
+		/*
+		 * For isochronous transfer driver completes request on
+		 * IOC or on TRBERR. IOC appears only when device receive
+		 * OUT data packet. If host disable stream or lost some packet
+		 * then the only way to finish all queued transfer is to do it
+		 * on TRBERR event.
+		 */
+		if (priv_ep->type == USB_ENDPOINT_XFER_ISOC &&
+		    !priv_ep->wa1_set)
+			cdns3_transfer_completed(priv_dev, priv_ep);
+		else
+			cdns3_rearm_transfer(priv_ep, priv_ep->wa1_set);
+	}
 
-			dev_dbg(&usb_ss->dev, "IOC(%02X) %d\n",
-				dir ? USB_DIR_IN : USB_DIR_OUT,
-				usb_ss->actual_ep0_request->actual);
-			list_del_init(&usb_ss->actual_ep0_request->list);
+	if ((ep_sts_reg & EP_STS_IOC) || (ep_sts_reg & EP_STS_ISP)) {
+		if (priv_ep->flags & EP_QUIRK_EXTRA_BUF_EN) {
+			if (ep_sts_reg & EP_STS_ISP)
+				priv_ep->flags |= EP_QUIRK_END_TRANSFER;
+			else
+				priv_ep->flags &= ~EP_QUIRK_END_TRANSFER;
 		}
 
-		if (usb_ss->actual_ep0_request
-				&& usb_ss->actual_ep0_request->complete) {
-			spin_unlock(&usb_ss->lock);
-			usb_ss->actual_ep0_request->complete(usb_ss->gadget.ep0,
-					usb_ss->actual_ep0_request);
-			spin_lock(&usb_ss->lock);
-		}
-		cdns_prepare_setup_packet(usb_ss);
-		gadget_writel(usb_ss,
-			&usb_ss->regs->ep_cmd, EP_CMD__REQ_CMPL__MASK);
+		cdns3_transfer_completed(priv_dev, priv_ep);
+	}
+
+	/*
+	 * WA2: this condition should only be meet when
+	 * priv_ep->flags & EP_QUIRK_EXTRA_BUF_DET or
+	 * priv_ep->flags & EP_QUIRK_EXTRA_BUF_EN.
+	 * In other cases this interrupt will be disabled/
+	 */
+	if (ep_sts_reg & EP_STS_DESCMIS) {
+		int err;
+
+		err = cdns3_descmissing_packet(priv_ep);
+		if (err)
+			dev_err(priv_dev->dev,
+				"Failed: No sufficient memory for DESCMIS\n");
 	}
+
+	return 0;
 }
 
 /**
- * cdns_check_usb_interrupt_proceed - Processes interrupt related to device
- * @usb_ss: extended gadget object
+ * cdns3_check_usb_interrupt_proceed - Processes interrupt related to device
+ * @priv_dev: extended gadget object
  * @usb_ists: bitmap representation of device's reported interrupts
  * (usb_ists register value)
  */
-static void cdns_check_usb_interrupt_proceed(struct usb_ss_dev *usb_ss,
-		u32 usb_ists)
-{
-	int interrupt_bit = ffs(usb_ists) - 1;
-	int speed;
-	u32 val;
-
-	dev_dbg(&usb_ss->dev, "USB interrupt detected\n");
-
-	switch (interrupt_bit) {
-	case USB_ISTS__CON2I__SHIFT:
-		/* FS/HS Connection detected */
-		dev_dbg(&usb_ss->dev,
-			"[Interrupt] FS/HS Connection detected\n");
-		val = gadget_readl(usb_ss, &usb_ss->regs->usb_sts);
-		speed = USB_STS__USBSPEED__READ(val);
-		if (speed == USB_SPEED_WIRELESS)
-			speed = USB_SPEED_SUPER;
-		dev_dbg(&usb_ss->dev, "Speed value: %s (%d), usbsts:0x%x\n",
-			usb_speed_string(speed), speed, val);
-		usb_ss->gadget.speed = speed;
-		usb_ss->is_connected = 1;
-		usb_gadget_set_state(&usb_ss->gadget, USB_STATE_POWERED);
-		cdns_ep0_config(usb_ss);
-		break;
-	case USB_ISTS__CONI__SHIFT:
-		/* SS Connection detected */
-		dev_dbg(&usb_ss->dev, "[Interrupt] SS Connection detected\n");
-		val = gadget_readl(usb_ss, &usb_ss->regs->usb_sts);
-		speed = USB_STS__USBSPEED__READ(val);
-		if (speed == USB_SPEED_WIRELESS)
-			speed = USB_SPEED_SUPER;
-		dev_dbg(&usb_ss->dev, "Speed value: %s (%d), usbsts:0x%x\n",
-			usb_speed_string(speed), speed, val);
-		usb_ss->gadget.speed = speed;
-		usb_ss->is_connected = 1;
-		usb_gadget_set_state(&usb_ss->gadget, USB_STATE_POWERED);
-		cdns_ep0_config(usb_ss);
-		break;
-	case USB_ISTS__DIS2I__SHIFT:
-	case USB_ISTS__DISI__SHIFT:
-		/* SS Disconnection detected */
-		val = gadget_readl(usb_ss, &usb_ss->regs->usb_sts);
-		dev_dbg(&usb_ss->dev,
-			"[Interrupt] Disconnection detected: usbsts:0x%x\n",
-			val);
-		if (usb_ss->gadget_driver
-			&& usb_ss->gadget_driver->disconnect) {
-
-			spin_unlock(&usb_ss->lock);
-			usb_ss->gadget_driver->disconnect(&usb_ss->gadget);
-			spin_lock(&usb_ss->lock);
+static void cdns3_check_usb_interrupt_proceed(struct cdns3_device *priv_dev,
+					      u32 usb_ists)
+{
+	int speed = 0;
+
+	trace_cdns3_usb_irq(priv_dev, usb_ists);
+	/* Connection detected */
+	if (usb_ists & (USB_ISTS_CON2I | USB_ISTS_CONI)) {
+		speed = cdns3_get_speed(priv_dev);
+		priv_dev->gadget.speed = speed;
+		usb_gadget_set_state(&priv_dev->gadget, USB_STATE_POWERED);
+		cdns3_ep0_config(priv_dev);
+	}
+
+	/* Disconnection detected */
+	if (usb_ists & (USB_ISTS_DIS2I | USB_ISTS_DISI)) {
+		if (priv_dev->gadget_driver &&
+		    priv_dev->gadget_driver->disconnect) {
+			spin_unlock(&priv_dev->lock);
+			priv_dev->gadget_driver->disconnect(&priv_dev->gadget);
+			spin_lock(&priv_dev->lock);
 		}
-		usb_ss->gadget.speed = USB_SPEED_UNKNOWN;
-		usb_gadget_set_state(&usb_ss->gadget, USB_STATE_NOTATTACHED);
-		usb_ss->is_connected = 0;
-		cdns_gadget_unconfig(usb_ss);
-		break;
-	case USB_ISTS__L2ENTI__SHIFT:
-		dev_dbg(&usb_ss->dev,
-			 "[Interrupt] Device suspended\n");
-		break;
-	case USB_ISTS__L2EXTI__SHIFT:
-		dev_dbg(&usb_ss->dev, "[Interrupt] L2 exit detected\n");
-		/*
-		 * Exit from standby mode
-		 * on L2 exit (Suspend in HS/FS or SS)
-		 */
-		break;
-	case USB_ISTS__U3EXTI__SHIFT:
-		/*
-		 * Exit from standby mode
-		 * on U3 exit (Suspend in HS/FS or SS)
-		 */
-		dev_dbg(&usb_ss->dev, "[Interrupt] U3 exit detected\n");
-		break;
 
-		/* resets cases */
-	case USB_ISTS__UWRESI__SHIFT:
-	case USB_ISTS__UHRESI__SHIFT:
-	case USB_ISTS__U2RESI__SHIFT:
-		dev_dbg(&usb_ss->dev, "[Interrupt] Reset detected\n");
-		speed = USB_STS__USBSPEED__READ(
-				gadget_readl(usb_ss, &usb_ss->regs->usb_sts));
-		if (speed == USB_SPEED_WIRELESS)
-			speed = USB_SPEED_SUPER;
-		usb_gadget_set_state(&usb_ss->gadget, USB_STATE_DEFAULT);
-		usb_ss->gadget.speed = speed;
-		cdns_gadget_unconfig(usb_ss);
-		cdns_ep0_config(usb_ss);
-		break;
-	default:
-		break;
+		priv_dev->gadget.speed = USB_SPEED_UNKNOWN;
+		usb_gadget_set_state(&priv_dev->gadget, USB_STATE_NOTATTACHED);
+		cdns3_hw_reset_eps_config(priv_dev);
 	}
 
-	/* Clear interrupt bit */
-	gadget_writel(usb_ss, &usb_ss->regs->usb_ists, (1uL << interrupt_bit));
+	/* reset*/
+	if (usb_ists & (USB_ISTS_UWRESI | USB_ISTS_UHRESI | USB_ISTS_U2RESI)) {
+		if (priv_dev->gadget_driver &&
+		    priv_dev->gadget_driver->reset) {
+			spin_unlock(&priv_dev->lock);
+			priv_dev->gadget_driver->reset(&priv_dev->gadget);
+			spin_lock(&priv_dev->lock);
+		}
+
+		/*read again to check the actual speed*/
+		speed = cdns3_get_speed(priv_dev);
+		usb_gadget_set_state(&priv_dev->gadget, USB_STATE_DEFAULT);
+		priv_dev->gadget.speed = speed;
+		cdns3_hw_reset_eps_config(priv_dev);
+		cdns3_ep0_config(priv_dev);
+	}
 }
 
 /**
- * cdns_irq_handler - irq line interrupt handler
- * @cdns: cdns3 instance
+ * cdns3_device_irq_handler- interrupt handler for device part of controller
  *
- * Returns IRQ_HANDLED when interrupt raised by USBSS_DEV,
- * IRQ_NONE when interrupt raised by other device connected
- * to the irq line
+ * @cdns: structure of cdns3
+ *
+ * Returns IRQ_HANDLED or IRQ_NONE
  */
-static irqreturn_t cdns_irq_handler_thread(struct cdns3 *cdns)
+static irqreturn_t cdns3_device_irq_handler(struct cdns3 *cdns)
 {
-	struct usb_ss_dev *usb_ss =
-		container_of(cdns->gadget_dev, struct usb_ss_dev, dev);
-	u32 reg;
-	enum irqreturn ret = IRQ_NONE;
+	struct cdns3_device *priv_dev;
+	irqreturn_t ret = IRQ_NONE;
 	unsigned long flags;
+	u32 reg;
 
-	spin_lock_irqsave(&usb_ss->lock, flags);
+	priv_dev = cdns->gadget_dev;
+	spin_lock_irqsave(&priv_dev->lock, flags);
 
 	/* check USB device interrupt */
-	reg = gadget_readl(usb_ss, &usb_ss->regs->usb_ists);
+	reg = readl(&priv_dev->regs->usb_ists);
+	writel(reg, &priv_dev->regs->usb_ists);
+
 	if (reg) {
-		dev_dbg(&usb_ss->dev, "usb_ists: %08X\n", reg);
-		cdns_check_usb_interrupt_proceed(usb_ss, reg);
+		cdns3_check_usb_interrupt_proceed(priv_dev, reg);
 		ret = IRQ_HANDLED;
 	}
 
 	/* check endpoint interrupt */
-	reg = gadget_readl(usb_ss, &usb_ss->regs->ep_ists);
-	if (reg != 0) {
-		dev_dbg(&usb_ss->dev, "ep_ists: %08X\n", reg);
-	} else {
-		if (gadget_readl(usb_ss, &usb_ss->regs->usb_sts) &
-				USB_STS__CFGSTS__MASK)
-			ret = IRQ_HANDLED;
-		goto irqend;
+	reg = readl(&priv_dev->regs->ep_ists);
+
+	if (reg) {
+		priv_dev->shadow_ep_en |= reg;
+		reg = ~reg & readl(&priv_dev->regs->ep_ien);
+		/* mask deferred interrupt. */
+		writel(reg, &priv_dev->regs->ep_ien);
+		ret = IRQ_WAKE_THREAD;
 	}
 
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
+	return ret;
+}
+
+/**
+ * cdns3_device_thread_irq_handler- interrupt handler for device part
+ * of controller
+ *
+ * @irq: irq number for cdns3 core device
+ * @data: structure of cdns3
+ *
+ * Returns IRQ_HANDLED or IRQ_NONE
+ */
+static irqreturn_t cdns3_device_thread_irq_handler(struct cdns3 *cdns)
+{
+	struct cdns3_device *priv_dev;
+	irqreturn_t ret = IRQ_NONE;
+	unsigned long flags;
+	u32 ep_ien;
+	int bit;
+	u32 reg;
+
+	priv_dev = cdns->gadget_dev;
+	spin_lock_irqsave(&priv_dev->lock, flags);
+
+	reg = readl(&priv_dev->regs->ep_ists);
+
 	/* handle default endpoint OUT */
-	if (reg & EP_ISTS__EOUT0__MASK) {
-		cdns_check_ep0_interrupt_proceed(usb_ss, 0);
+	if (reg & EP_ISTS_EP_OUT0) {
+		cdns3_check_ep0_interrupt_proceed(priv_dev, USB_DIR_OUT);
 		ret = IRQ_HANDLED;
 	}
 
 	/* handle default endpoint IN */
-	if (reg & EP_ISTS__EIN0__MASK) {
-		cdns_check_ep0_interrupt_proceed(usb_ss, 1);
+	if (reg & EP_ISTS_EP_IN0) {
+		cdns3_check_ep0_interrupt_proceed(priv_dev, USB_DIR_IN);
 		ret = IRQ_HANDLED;
 	}
 
 	/* check if interrupt from non default endpoint, if no exit */
-	reg &= ~(EP_ISTS__EOUT0__MASK | EP_ISTS__EIN0__MASK);
+	reg &= ~(EP_ISTS_EP_OUT0 | EP_ISTS_EP_IN0);
 	if (!reg)
 		goto irqend;
 
-	do {
-		unsigned int bit_pos = ffs(reg);
-		u32 bit_mask = 1 << (bit_pos - 1);
-
-		dev_dbg(&usb_ss->dev, "Interrupt on index: %d bitmask %08X\n",
-				CAST_EP_REG_POS_TO_INDEX(bit_pos), bit_mask);
-		cdns_check_ep_interrupt_proceed(
-				usb_ss->eps[CAST_EP_REG_POS_TO_INDEX(bit_pos)]);
-		reg &= ~bit_mask;
+	for_each_set_bit(bit, (unsigned long *)&reg,
+			 sizeof(u32) * BITS_PER_BYTE) {
+		priv_dev->shadow_ep_en |= BIT(bit);
+		cdns3_check_ep_interrupt_proceed(priv_dev->eps[bit]);
 		ret = IRQ_HANDLED;
-	} while (reg);
-
-irqend:
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
-	return ret;
-}
-
-/**
- * usb_ss_gadget_ep0_enable
- * Function shouldn't be called by gadget driver,
- * endpoint 0 is allways active
- */
-static int usb_ss_gadget_ep0_enable(struct usb_ep *ep,
-		const struct usb_endpoint_descriptor *desc)
-{
-	return -EINVAL;
-}
-
-/**
- * usb_ss_gadget_ep0_disable
- * Function shouldn't be called by gadget driver,
- * endpoint 0 is allways active
- */
-static int usb_ss_gadget_ep0_disable(struct usb_ep *ep)
-{
-	return -EINVAL;
-}
-
-/**
- * usb_ss_gadget_ep0_set_halt
- * @ep: pointer to endpoint zero object
- * @value: 1 for set stall, 0 for clear stall
- *
- * Returns 0
- */
-static int usb_ss_gadget_ep0_set_halt(struct usb_ep *ep, int value)
-{
-	/* TODO */
-	return 0;
-}
-
-static void __pending_setup_status_handler(struct usb_ss_dev *usb_ss)
-{
-	struct usb_request *request = usb_ss->pending_status_request;
-
-	if (usb_ss->status_completion_no_call && request && request->complete) {
-		request->complete(usb_ss->gadget.ep0, request);
-		usb_ss->status_completion_no_call = 0;
 	}
-}
 
-static void pending_setup_status_handler(struct work_struct *work)
-{
-	struct usb_ss_dev *usb_ss = container_of(work, struct usb_ss_dev,
-			pending_status_wq);
-	unsigned long flags;
-
-	spin_lock_irqsave(&usb_ss->lock, flags);
-	__pending_setup_status_handler(usb_ss);
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
-}
+	if (priv_dev->run_garbage_colector) {
+		struct cdns3_aligned_buf *buf, *tmp;
 
-/**
- * usb_ss_gadget_ep0_queue Transfer data on endpoint zero
- * @ep: pointer to endpoint zero object
- * @request: pointer to request object
- * @gfp_flags: gfp flags
- *
- * Returns 0 on success, error code elsewhere
- */
-static int usb_ss_gadget_ep0_queue(struct usb_ep *ep,
-		struct usb_request *request, gfp_t gfp_flags)
-{
-	int ret = 0;
-	unsigned long flags;
-	int erdy_sent = 0;
-	/* get extended endpoint */
-	struct usb_ss_endpoint *usb_ss_ep =
-		to_usb_ss_ep(ep);
-	struct usb_ss_dev *usb_ss = usb_ss_ep->usb_ss;
-
-	dev_dbg(&usb_ss->dev, "QUEUE(%02X) %d\n",
-		usb_ss->ep0_data_dir ? USB_DIR_IN : USB_DIR_OUT,
-		request->length);
-
-	/* send STATUS stage */
-	if (request->length == 0 && request->zero == 0) {
-		spin_lock_irqsave(&usb_ss->lock, flags);
-		select_ep(usb_ss, 0x00);
-		if (!usb_ss->hw_configured_flag) {
-			gadget_writel(usb_ss, &usb_ss->regs->usb_conf,
-			USB_CONF__CFGSET__MASK); /* SET CONFIGURATION */
-			gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-				EP_CMD__ERDY__MASK | EP_CMD__REQ_CMPL__MASK);
-			/* wait until configuration set */
-			ret = wait_reg_bit_set(usb_ss, &usb_ss->regs->usb_sts,
-				USB_STS__CFGSTS__MASK, 100);
-			erdy_sent = 1;
-			usb_ss->hw_configured_flag = 1;
-			cdns_enable_l1(usb_ss, 1);
-			/* Enable U1/U2 at Configuration state */
-			if (usb_ss->gadget.speed == USB_SPEED_SUPER) {
-				cdns_enable_u1(usb_ss, 1);
-				cdns_enable_u2(usb_ss, 1);
-			}
+		list_for_each_entry_safe(buf, tmp, &priv_dev->aligned_buf_list,
+					 list) {
+			if (!buf->in_use) {
+				list_del(&buf->list);
 
-			list_for_each_entry(ep,
-				&usb_ss->gadget.ep_list,
-				ep_list) {
+				spin_unlock_irqrestore(&priv_dev->lock, flags);
+				dma_free_coherent(priv_dev->sysdev, buf->size,
+						  buf->buf,
+						  buf->dma);
+				spin_lock_irqsave(&priv_dev->lock, flags);
 
-				if (ep->enabled)
-					cdns_ep_run_transfer(
-						to_usb_ss_ep(ep));
+				kfree(buf);
 			}
 		}
-		if (!erdy_sent)
-			gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-			EP_CMD__ERDY__MASK | EP_CMD__REQ_CMPL__MASK);
-
-		cdns_prepare_setup_packet(usb_ss);
-		request->actual = 0;
-		usb_ss->status_completion_no_call = true;
-		usb_ss->pending_status_request = request;
-		spin_unlock_irqrestore(&usb_ss->lock, flags);
-		/*
-		 * Since there is no completion interrupt for status stage,
-		 * it needs to call ->completion in software after
-		 * ep0_queue is back.
-		 */
-		queue_work(system_freezable_wq, &usb_ss->pending_status_wq);
-		return 0;
-	}
-
-	spin_lock_irqsave(&usb_ss->lock, flags);
-	if (!list_empty(&usb_ss_ep->request_list)) {
-		dev_err(&usb_ss->dev,
-			"can't handle multiple requests for ep0\n");
-		spin_unlock_irqrestore(&usb_ss->lock, flags);
-		return -EOPNOTSUPP;
-	}
 
-	ret = usb_gadget_map_request_by_dev(usb_ss->sysdev, request,
-			usb_ss->ep0_data_dir);
-	if (ret) {
-		spin_unlock_irqrestore(&usb_ss->lock, flags);
-		dev_err(&usb_ss->dev, "failed to map request\n");
-		return -EINVAL;
+		priv_dev->run_garbage_colector = 0;
 	}
 
-	usb_ss->actual_ep0_request = request;
-	cdns_ep0_run_transfer(usb_ss, request->dma, request->length, 1);
-	list_add_tail(&request->list, &usb_ss_ep->request_list);
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
+irqend:
+	ep_ien = readl(&priv_dev->regs->ep_ien) | priv_dev->shadow_ep_en;
+	priv_dev->shadow_ep_en = 0;
+	/* Unmask all handled EP interrupts */
+	writel(ep_ien, &priv_dev->regs->ep_ien);
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
 	return ret;
 }
+
 /**
- * ep_onchip_buffer_alloc - Try to allocate onchip buf for EP
+ * cdns3_ep_onchip_buffer_reserve - Try to reserve onchip buf for EP
  *
- * The real allocation will occur during write to EP_CFG register,
- * this function is used to check if the 'size' allocation is allowed.
+ * The real reservation will occur during write to EP_CFG register,
+ * this function is used to check if the 'size' reservation is allowed.
  *
- * @usb_ss: extended gadget object
+ * @priv_dev: extended gadget object
  * @size: the size (KB) for EP would like to allocate
- * @is_in: the direction for EP
  *
- * Return 0 if the later allocation is allowed or negative value on failure
+ * Return 0 if the required size can met or negative value on failure
  */
-
-static int ep_onchip_buffer_alloc(struct usb_ss_dev *usb_ss,
-		int size, int is_in)
+#define CDNS3_ONCHIP_BUF_SIZE 16
+static int cdns3_ep_onchip_buffer_reserve(struct cdns3_device *priv_dev,
+					  int size, int is_in)
 {
 	if (is_in) {
-		usb_ss->onchip_mem_allocated_size += size;
-	} else if (!usb_ss->out_mem_is_allocated) {
+		priv_dev->onchip_mem_allocated_size += size;
+	} else if (!priv_dev->out_mem_is_allocated) {
 		 /* ALL OUT EPs are shared the same chunk onchip memory */
-		usb_ss->onchip_mem_allocated_size += size;
-		usb_ss->out_mem_is_allocated = 1;
+		priv_dev->onchip_mem_allocated_size += size;
+		priv_dev->out_mem_is_allocated = 1;
 	}
 
-	if (usb_ss->onchip_mem_allocated_size > CDNS3_ONCHIP_BUF_SIZE) {
-		usb_ss->onchip_mem_allocated_size -= size;
+	if (priv_dev->onchip_mem_allocated_size > CDNS3_ONCHIP_BUF_SIZE) {
+		priv_dev->onchip_mem_allocated_size -= size;
 		return -EPERM;
 	} else {
 		return 0;
@@ -1512,150 +1218,105 @@ static int ep_onchip_buffer_alloc(struct usb_ss_dev *usb_ss,
 }
 
 /**
- * cdns_ep_config Configure hardware endpoint
- * @usb_ss_ep: extended endpoint object
+ * cdns3_ep_config Configure hardware endpoint
+ * @priv_ep: extended endpoint object
  */
-static void cdns_ep_config(struct usb_ss_endpoint *usb_ss_ep)
+void cdns3_ep_config(struct cdns3_endpoint *priv_ep)
 {
-	struct usb_ss_dev *usb_ss = usb_ss_ep->usb_ss;
-	u32 ep_cfg = 0;
+	bool is_iso_ep = (priv_ep->type == USB_ENDPOINT_XFER_ISOC);
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
+	u32 bEndpointAddress = priv_ep->num | priv_ep->dir;
 	u32 max_packet_size = 0;
-	u32 bEndpointAddress = usb_ss_ep->num | usb_ss_ep->dir;
-	u32 interrupt_mask = 0;
-	int is_in = !!usb_ss_ep->dir;
-	bool is_iso_ep = (usb_ss_ep->type == USB_ENDPOINT_XFER_ISOC);
-	int default_buf_size = CDNS3_EP_BUF_SIZE;
-
-	dev_dbg(&usb_ss->dev, "%s: %s addr=0x%x\n", __func__,
-			usb_ss_ep->name, bEndpointAddress);
-
-	if (is_iso_ep) {
-		ep_cfg = EP_CFG__EPTYPE__WRITE(USB_ENDPOINT_XFER_ISOC);
-		interrupt_mask = INTERRUPT_MASK;
-	} else {
-		ep_cfg = EP_CFG__EPTYPE__WRITE(USB_ENDPOINT_XFER_BULK);
-	}
+	u8 buffering;
+	u8 maxburst = 0;
+	u32 ep_cfg = 0;
+	u8 mult = 0;
+	int ret;
 
-	switch (usb_ss->gadget.speed) {
-	case USB_SPEED_UNKNOWN:
-		max_packet_size = ENDPOINT_MAX_PACKET_SIZE_0;
+	buffering = CDNS3_EP_BUF_SIZE - 1;
+
+	switch (priv_ep->type) {
+	case USB_ENDPOINT_XFER_INT:
+		ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_INT);
 		break;
-	case USB_SPEED_LOW:
-		max_packet_size = ENDPOINT_MAX_PACKET_SIZE_8;
+	case USB_ENDPOINT_XFER_BULK:
+		ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_BULK);
 		break;
+	default:
+		ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_ISOC);
+		mult = CDNS3_EP_ISO_HS_MULT - 1;
+		buffering = mult + 1;
+	}
+
+	switch (priv_dev->gadget.speed) {
 	case USB_SPEED_FULL:
-		max_packet_size = (is_iso_ep ?
-			ENDPOINT_MAX_PACKET_SIZE_1023 :
-			ENDPOINT_MAX_PACKET_SIZE_64);
+		max_packet_size = is_iso_ep ? 1023 : 64;
 		break;
 	case USB_SPEED_HIGH:
-		max_packet_size = (is_iso_ep ?
-			ENDPOINT_MAX_PACKET_SIZE_1024 :
-			ENDPOINT_MAX_PACKET_SIZE_512);
-		break;
-	case USB_SPEED_WIRELESS:
-		max_packet_size = ENDPOINT_MAX_PACKET_SIZE_512;
+		max_packet_size = is_iso_ep ? 1024 : 512;
 		break;
 	case USB_SPEED_SUPER:
-		max_packet_size = ENDPOINT_MAX_PACKET_SIZE_1024;
-		break;
-	case USB_SPEED_SUPER_PLUS:
-		dev_warn(&usb_ss->dev, "USB 3.1 is not supported\n");
-		max_packet_size = ENDPOINT_MAX_PACKET_SIZE_1024;
+		/* It's limitation that driver assumes in driver. */
+		mult = 0;
+		max_packet_size = 1024;
+		if (priv_ep->type == USB_ENDPOINT_XFER_ISOC) {
+			maxburst = CDNS3_EP_ISO_SS_BURST - 1;
+			buffering = (mult + 1) *
+				    (maxburst + 1);
+
+			if (priv_ep->interval > 1)
+				buffering++;
+		} else {
+			maxburst = CDNS3_EP_BUF_SIZE - 1;
+		}
 		break;
-	}
-
-	if (ep_onchip_buffer_alloc(usb_ss, default_buf_size, is_in)) {
-		dev_err(&usb_ss->dev, "onchip mem is full, ep is invalid\n");
+	default:
+		/* all other speed are not supported */
 		return;
 	}
 
-	ep_cfg |= EP_CFG__MAXPKTSIZE__WRITE(max_packet_size) |
-		EP_CFG__BUFFERING__WRITE(default_buf_size - 1) |
-		EP_CFG__MAXBURST__WRITE(usb_ss_ep->endpoint.maxburst);
-
-	select_ep(usb_ss, bEndpointAddress);
-	gadget_writel(usb_ss, &usb_ss->regs->ep_cfg, ep_cfg);
-	gadget_writel(usb_ss, &usb_ss->regs->ep_sts_en,
-		EP_STS_EN__TRBERREN__MASK | interrupt_mask);
-
-	/* enable interrupt for selected endpoint */
-	ep_cfg = gadget_readl(usb_ss, &usb_ss->regs->ep_ien);
-	ep_cfg |= CAST_EP_ADDR_TO_BIT_POS(bEndpointAddress);
-	gadget_writel(usb_ss, &usb_ss->regs->ep_ien, ep_cfg);
-}
-
-/**
- * usb_ss_gadget_ep_enable Enable endpoint
- * @ep: endpoint object
- * @desc: endpoint descriptor
- *
- * Returns 0 on success, error code elsewhere
- */
-static int usb_ss_gadget_ep_enable(struct usb_ep *ep,
-		const struct usb_endpoint_descriptor *desc)
-{
-	struct usb_ss_endpoint *usb_ss_ep;
-	struct usb_ss_dev *usb_ss;
-	unsigned long flags;
-	int ret;
-	u32 ep_cfg;
-
-	usb_ss_ep = to_usb_ss_ep(ep);
-	usb_ss = usb_ss_ep->usb_ss;
+	if (max_packet_size == 1024)
+		priv_ep->trb_burst_size = 128;
+	else if (max_packet_size >= 512)
+		priv_ep->trb_burst_size = 64;
+	else
+		priv_ep->trb_burst_size = 16;
 
-	if (!ep || !desc || desc->bDescriptorType != USB_DT_ENDPOINT) {
-		dev_err(&usb_ss->dev, "usb-ss: invalid parameters\n");
-		return -EINVAL;
+	ret = cdns3_ep_onchip_buffer_reserve(priv_dev, buffering,
+		!!priv_ep->dir);
+	if (ret) {
+		dev_err(priv_dev->dev, "onchip mem is full, ep is invalid\n");
+		return;
 	}
 
-	if (!desc->wMaxPacketSize) {
-		dev_err(&usb_ss->dev, "usb-ss: missing wMaxPacketSize\n");
-		return -EINVAL;
-	}
+	ep_cfg |= EP_CFG_MAXPKTSIZE(max_packet_size) |
+		  EP_CFG_MULT(mult) |
+		  EP_CFG_BUFFERING(buffering) |
+		  EP_CFG_MAXBURST(maxburst);
 
-	ret = usb_ss_allocate_trb_pool(usb_ss_ep);
-	if (ret)
-		return ret;
+	cdns3_select_ep(priv_dev, bEndpointAddress);
+	writel(ep_cfg, &priv_dev->regs->ep_cfg);
 
-	dev_dbg(&usb_ss->dev, "Enabling endpoint: %s, addr=0x%x\n",
-		ep->name, desc->bEndpointAddress);
-	spin_lock_irqsave(&usb_ss->lock, flags);
-	select_ep(usb_ss, desc->bEndpointAddress);
-	gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-		EP_CMD__EPRST__MASK);
-	ret = wait_reg_bit_clear(usb_ss, &usb_ss->regs->ep_cmd,
-		EP_CMD__EPRST__MASK, 100);
-	ep_cfg = gadget_readl(usb_ss, &usb_ss->regs->ep_cfg);
-	ep_cfg |= EP_CFG__ENABLE__MASK;
-	gadget_writel(usb_ss, &usb_ss->regs->ep_cfg, ep_cfg);
-
-	ep->enabled = 1;
-	ep->desc = desc;
-	usb_ss_ep->hw_pending_flag = 0;
-	usb_ss_ep->stalled_flag = 0;
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
-	return 0;
+	dev_dbg(priv_dev->dev, "Configure %s: with val %08x\n",
+		priv_ep->name, ep_cfg);
 }
 
 /* Find correct direction for HW endpoint according to description */
-static int ep_dir_is_correct(struct usb_endpoint_descriptor *desc,
-	struct usb_ss_endpoint *usb_ss_ep)
+static int cdns3_ep_dir_is_correct(struct usb_endpoint_descriptor *desc,
+				   struct cdns3_endpoint *priv_ep)
 {
-	return (usb_ss_ep->endpoint.caps.dir_in &&
-			!!(desc->bEndpointAddress & USB_DIR_IN))
-			|| (usb_ss_ep->endpoint.caps.dir_out
-			&& ((desc->bEndpointAddress & 0x80) == USB_DIR_OUT));
+	return (priv_ep->endpoint.caps.dir_in && usb_endpoint_dir_in(desc)) ||
+	       (priv_ep->endpoint.caps.dir_out && usb_endpoint_dir_out(desc));
 }
 
-static struct usb_ss_endpoint *find_available_ss_ep(
-		struct usb_ss_dev *usb_ss,
-		struct usb_endpoint_descriptor *desc)
+static struct
+cdns3_endpoint *cdns3_find_available_ep(struct cdns3_device *priv_dev,
+					struct usb_endpoint_descriptor *desc)
 {
 	struct usb_ep *ep;
-	struct usb_ss_endpoint *usb_ss_ep;
+	struct cdns3_endpoint *priv_ep;
 
-	list_for_each_entry(ep, &usb_ss->gadget.ep_list, ep_list) {
+	list_for_each_entry(ep, &priv_dev->gadget.ep_list, ep_list) {
 		unsigned long num;
 		int ret;
 		/* ep name pattern likes epXin or epXout */
@@ -1665,849 +1326,987 @@ static struct usb_ss_endpoint *find_available_ss_ep(
 		if (ret)
 			return ERR_PTR(ret);
 
-		usb_ss_ep = to_usb_ss_ep(ep);
-		if (ep_dir_is_correct(desc, usb_ss_ep)) {
-			if (!usb_ss_ep->used) {
-				usb_ss_ep->num  = num;
-				usb_ss_ep->used = true;
-				return usb_ss_ep;
+		priv_ep = ep_to_cdns3_ep(ep);
+		if (cdns3_ep_dir_is_correct(desc, priv_ep)) {
+			if (!(priv_ep->flags & EP_CLAIMED)) {
+				priv_ep->num  = num;
+				return priv_ep;
 			}
 		}
 	}
+
 	return ERR_PTR(-ENOENT);
 }
 
-static struct usb_ep *usb_ss_gadget_match_ep(struct usb_gadget *gadget,
-		struct usb_endpoint_descriptor *desc,
-		struct usb_ss_ep_comp_descriptor *comp_desc)
+/*
+ *  Cadence IP has one limitation that all endpoints must be configured
+ * (Type & MaxPacketSize) before setting configuration through hardware
+ * register, it means we can't change endpoints configuration after
+ * set_configuration.
+ *
+ * This function set EP_CLAIMED flag which is added when the gadget driver
+ * uses usb_ep_autoconfig to configure specific endpoint;
+ * When the udc driver receives set_configurion request,
+ * it goes through all claimed endpoints, and configure all endpoints
+ * accordingly.
+ *
+ * At usb_ep_ops.enable/disable, we only enable and disable endpoint through
+ * ep_cfg register which can be changed after set_configuration, and do
+ * some software operation accordingly.
+ */
+static struct
+usb_ep *cdns3_gadget_match_ep(struct usb_gadget *gadget,
+			      struct usb_endpoint_descriptor *desc,
+			      struct usb_ss_ep_comp_descriptor *comp_desc)
 {
-	struct usb_ss_dev *usb_ss = gadget_to_usb_ss(gadget);
-	struct usb_ss_endpoint *usb_ss_ep;
+	struct cdns3_device *priv_dev = gadget_to_cdns3_device(gadget);
+	struct cdns3_endpoint *priv_ep;
 	unsigned long flags;
 
-	usb_ss_ep = find_available_ss_ep(usb_ss, desc);
-	if (IS_ERR(usb_ss_ep)) {
-		dev_err(&usb_ss->dev, "no available ep\n");
+	priv_ep = cdns3_find_available_ep(priv_dev, desc);
+	if (IS_ERR(priv_ep)) {
+		dev_err(priv_dev->dev, "no available ep\n");
 		return NULL;
 	}
 
-	dev_dbg(&usb_ss->dev, "match endpoint: %s\n", usb_ss_ep->name);
-	spin_lock_irqsave(&usb_ss->lock, flags);
-	usb_ss_ep->endpoint.desc = desc;
-	usb_ss_ep->dir  = usb_endpoint_dir_in(desc) ? USB_DIR_IN : USB_DIR_OUT;
-	usb_ss_ep->type = usb_endpoint_type(desc);
+	dev_dbg(priv_dev->dev, "match endpoint: %s\n", priv_ep->name);
+
+	spin_lock_irqsave(&priv_dev->lock, flags);
+	priv_ep->endpoint.desc = desc;
+	priv_ep->dir  = usb_endpoint_dir_in(desc) ? USB_DIR_IN : USB_DIR_OUT;
+	priv_ep->type = usb_endpoint_type(desc);
+	priv_ep->flags |= EP_CLAIMED;
+	priv_ep->interval = desc->bInterval ? BIT(desc->bInterval - 1) : 0;
 
-	list_add_tail(&usb_ss_ep->ep_match_pending_list,
-			&usb_ss->ep_match_list);
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
-	return &usb_ss_ep->endpoint;
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
+	return &priv_ep->endpoint;
 }
 
-static void usb_ss_free_trb_pool(struct usb_ss_endpoint *usb_ss_ep)
+/**
+ * cdns3_gadget_ep_alloc_request Allocates request
+ * @ep: endpoint object associated with request
+ * @gfp_flags: gfp flags
+ *
+ * Returns allocated request address, NULL on allocation error
+ */
+struct usb_request *cdns3_gadget_ep_alloc_request(struct usb_ep *ep,
+						  gfp_t gfp_flags)
 {
-	struct usb_ss_dev *usb_ss = usb_ss_ep->usb_ss;
+	struct cdns3_endpoint *priv_ep = ep_to_cdns3_ep(ep);
+	struct cdns3_request *priv_req;
 
-	if (usb_ss_ep->trb_pool) {
-		dma_free_coherent(usb_ss->sysdev,
-			sizeof(struct usb_ss_trb) * USB_SS_TRBS_NUM,
-			usb_ss_ep->trb_pool, usb_ss_ep->trb_pool_dma);
-		usb_ss_ep->trb_pool = NULL;
-	}
+	priv_req = kzalloc(sizeof(*priv_req), gfp_flags);
+	if (!priv_req)
+		return NULL;
 
-	if (usb_ss_ep->cpu_addr) {
-		dma_free_coherent(usb_ss->sysdev, CDNS3_UNALIGNED_BUF_SIZE,
-			usb_ss_ep->cpu_addr, usb_ss_ep->dma_addr);
-		usb_ss_ep->cpu_addr = NULL;
-	}
+	priv_req->priv_ep = priv_ep;
+
+	trace_cdns3_alloc_request(priv_req);
+	return &priv_req->request;
 }
 
 /**
- * usb_ss_gadget_ep_disable Disable endpoint
+ * cdns3_gadget_ep_free_request Free memory occupied by request
+ * @ep: endpoint object associated with request
+ * @request: request to free memory
+ */
+void cdns3_gadget_ep_free_request(struct usb_ep *ep,
+				  struct usb_request *request)
+{
+	struct cdns3_request *priv_req = to_cdns3_request(request);
+
+	if (priv_req->aligned_buf)
+		priv_req->aligned_buf->in_use = 0;
+
+	trace_cdns3_free_request(priv_req);
+	kfree(priv_req);
+}
+
+/**
+ * cdns3_gadget_ep_enable Enable endpoint
  * @ep: endpoint object
+ * @desc: endpoint descriptor
  *
  * Returns 0 on success, error code elsewhere
  */
-static int usb_ss_gadget_ep_disable(struct usb_ep *ep)
+static int cdns3_gadget_ep_enable(struct usb_ep *ep,
+				  const struct usb_endpoint_descriptor *desc)
 {
-	struct usb_ss_endpoint *usb_ss_ep;
-	struct usb_ss_dev *usb_ss;
+	struct cdns3_endpoint *priv_ep;
+	struct cdns3_device *priv_dev;
+	u32 reg = EP_STS_EN_TRBERREN;
+	u32 bEndpointAddress;
 	unsigned long flags;
-	int ret = 0;
-	struct usb_request *request;
-	u32 ep_cfg;
+	int ret;
 
-	if (!ep) {
-		pr_debug("usb-ss: invalid parameters\n");
+	priv_ep = ep_to_cdns3_ep(ep);
+	priv_dev = priv_ep->cdns3_dev;
+
+	if (!ep || !desc || desc->bDescriptorType != USB_DT_ENDPOINT) {
+		dev_dbg(priv_dev->dev, "usbss: invalid parameters\n");
 		return -EINVAL;
 	}
 
-	usb_ss_ep = to_usb_ss_ep(ep);
-	usb_ss = usb_ss_ep->usb_ss;
+	if (!desc->wMaxPacketSize) {
+		dev_err(priv_dev->dev, "usbss: missing wMaxPacketSize\n");
+		return -EINVAL;
+	}
 
-	spin_lock_irqsave(&usb_ss->lock, flags);
-	if (!usb_ss->start_gadget) {
-		dev_dbg(&usb_ss->dev,
-			"Disabling endpoint at disconnection: %s\n", ep->name);
-		spin_unlock_irqrestore(&usb_ss->lock, flags);
+	if (dev_WARN_ONCE(priv_dev->dev, priv_ep->flags & EP_ENABLED,
+			  "%s is already enabled\n", priv_ep->name))
 		return 0;
+
+	spin_lock_irqsave(&priv_dev->lock, flags);
+
+	priv_ep->endpoint.desc = desc;
+	priv_ep->type = usb_endpoint_type(desc);
+	priv_ep->interval = desc->bInterval ? BIT(desc->bInterval - 1) : 0;
+
+	if (priv_ep->interval > ISO_MAX_INTERVAL &&
+	    priv_ep->type == USB_ENDPOINT_XFER_ISOC) {
+		dev_err(priv_dev->dev, "Driver is limited to %d period\n",
+			ISO_MAX_INTERVAL);
+
+		ret =  -EINVAL;
+		goto exit;
 	}
 
-	dev_dbg(&usb_ss->dev,
-		"Disabling endpoint: %s\n", ep->name);
+	ret = cdns3_allocate_trb_pool(priv_ep);
 
-	select_ep(usb_ss, ep->desc->bEndpointAddress);
-	ret = cdns_data_flush(usb_ss_ep);
-	while (!list_empty(&usb_ss_ep->request_list)) {
+	if (ret)
+		goto exit;
 
-		request = next_request(&usb_ss_ep->request_list);
-		usb_gadget_unmap_request_by_dev(usb_ss->sysdev, request,
-				ep->desc->bEndpointAddress & USB_DIR_IN);
-		request->status = -ESHUTDOWN;
-		list_del(&request->list);
-		spin_unlock(&usb_ss->lock);
-		usb_gadget_giveback_request(ep, request);
-		spin_lock(&usb_ss->lock);
+	bEndpointAddress = priv_ep->num | priv_ep->dir;
+	cdns3_select_ep(priv_dev, bEndpointAddress);
+
+	trace_cdns3_gadget_ep_enable(priv_ep);
+
+	writel(EP_CMD_EPRST, &priv_dev->regs->ep_cmd);
+
+	ret = cdns3_handshake(&priv_dev->regs->ep_cmd,
+			      EP_CMD_CSTALL | EP_CMD_EPRST, 0, 1000);
+
+	/* enable interrupt for selected endpoint */
+	cdns3_set_register_bit(&priv_dev->regs->ep_ien,
+			       BIT(cdns3_ep_addr_to_index(bEndpointAddress)));
+	/*
+	 * WA2: Set flag for all not ISOC OUT endpoints. If this flag is set
+	 * driver try to detect whether endpoint need additional internal
+	 * buffer for unblocking on-chip FIFO buffer. This flag will be cleared
+	 * if before first DESCMISS interrupt the DMA will be armed.
+	 */
+	if (quirk_internal_buffer) {
+		if (!priv_ep->dir && priv_ep->type != USB_ENDPOINT_XFER_ISOC) {
+			priv_ep->flags |= EP_QUIRK_EXTRA_BUF_DET;
+			reg |= EP_STS_EN_DESCMISEN;
+		}
 	}
 
-	ep_cfg = gadget_readl(usb_ss, &usb_ss->regs->ep_cfg);
-	ep_cfg &= ~EP_CFG__ENABLE__MASK;
-	gadget_writel(usb_ss, &usb_ss->regs->ep_cfg, ep_cfg);
-	ep->desc = NULL;
-	ep->enabled = 0;
+	writel(reg, &priv_dev->regs->ep_sts_en);
 
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
+	cdns3_set_register_bit(&priv_dev->regs->ep_cfg, EP_CFG_ENABLE);
+
+	ep->desc = desc;
+	priv_ep->flags &= ~(EP_PENDING_REQUEST | EP_STALL |
+			    EP_QUIRK_EXTRA_BUF_EN);
+	priv_ep->flags |= EP_ENABLED | EP_UPDATE_EP_TRBADDR;
+	priv_ep->wa1_set = 0;
+	priv_ep->enqueue = 0;
+	priv_ep->dequeue = 0;
+	reg = readl(&priv_dev->regs->ep_sts);
+	priv_ep->pcs = !!EP_STS_CCS(reg);
+	priv_ep->ccs = !!EP_STS_CCS(reg);
+	/* one TRB is reserved for link TRB used in DMULT mode*/
+	priv_ep->free_trbs = priv_ep->num_trbs - 1;
+exit:
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
 
 	return ret;
 }
 
 /**
- * usb_ss_gadget_ep_alloc_request Allocates request
- * @ep: endpoint object associated with request
- * @gfp_flags: gfp flags
+ * cdns3_gadget_ep_disable Disable endpoint
+ * @ep: endpoint object
  *
- * Returns allocated request address, NULL on allocation error
+ * Returns 0 on success, error code elsewhere
  */
-static struct usb_request *usb_ss_gadget_ep_alloc_request(struct usb_ep *ep,
-		gfp_t gfp_flags)
+static int cdns3_gadget_ep_disable(struct usb_ep *ep)
 {
+	struct cdns3_endpoint *priv_ep;
+	struct cdns3_request *priv_req;
+	struct cdns3_device *priv_dev;
 	struct usb_request *request;
+	unsigned long flags;
+	int ret = 0;
+	u32 ep_cfg;
 
-	request = kzalloc(sizeof(struct usb_request), gfp_flags);
-	if (!request)
-		return NULL;
+	if (!ep) {
+		pr_err("usbss: invalid parameters\n");
+		return -EINVAL;
+	}
 
-	return request;
-}
+	priv_ep = ep_to_cdns3_ep(ep);
+	priv_dev = priv_ep->cdns3_dev;
 
-/**
- * usb_ss_gadget_ep_free_request Free memory occupied by request
- * @ep: endpoint object associated with request
- * @request: request to free memory
- */
-static void usb_ss_gadget_ep_free_request(struct usb_ep *ep,
-		struct usb_request *request)
-{
-	kfree(request);
-	request = NULL;
+	if (dev_WARN_ONCE(priv_dev->dev, !(priv_ep->flags & EP_ENABLED),
+			  "%s is already disabled\n", priv_ep->name))
+		return 0;
+
+	pm_runtime_get_sync(priv_dev->dev);
+	spin_lock_irqsave(&priv_dev->lock, flags);
+
+	trace_cdns3_gadget_ep_disable(priv_ep);
+
+	cdns3_select_ep(priv_dev, ep->desc->bEndpointAddress);
+
+	ep_cfg = readl(&priv_dev->regs->ep_cfg);
+	ep_cfg &= ~EP_CFG_ENABLE;
+	writel(ep_cfg, &priv_dev->regs->ep_cfg);
+
+	writel(EP_CMD_EPRST, &priv_dev->regs->ep_cmd);
+
+	ret = cdns3_handshake(&priv_dev->regs->ep_cmd,
+			      EP_CMD_CSTALL | EP_CMD_EPRST, 0, 1000);
+	while (!list_empty(&priv_ep->pending_req_list)) {
+		request = cdns3_next_request(&priv_ep->pending_req_list);
+
+		cdns3_gadget_giveback(priv_ep, to_cdns3_request(request),
+				      -ESHUTDOWN);
+	}
+
+	while (!list_empty(&priv_ep->descmiss_req_list)) {
+		priv_req = cdns3_next_priv_request(&priv_ep->descmiss_req_list);
+
+		kfree(priv_req->request.buf);
+		cdns3_gadget_ep_free_request(&priv_ep->endpoint,
+					     &priv_req->request);
+		list_del_init(&priv_req->list);
+	}
+
+	while (!list_empty(&priv_ep->deferred_req_list)) {
+		request = cdns3_next_request(&priv_ep->deferred_req_list);
+
+		cdns3_gadget_giveback(priv_ep, to_cdns3_request(request),
+				      -ESHUTDOWN);
+	}
+
+	priv_ep->descmis_req = NULL;
+
+	ep->desc = NULL;
+	priv_ep->flags &= ~EP_ENABLED;
+
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
+	pm_runtime_put_sync(priv_dev->dev);
+
+	return ret;
 }
 
 /**
- * usb_ss_gadget_ep_queue Transfer data on endpoint
+ * cdns3_gadget_ep_queue Transfer data on endpoint
  * @ep: endpoint object
  * @request: request object
  * @gfp_flags: gfp flags
  *
  * Returns 0 on success, error code elsewhere
  */
-static int __usb_ss_gadget_ep_queue(struct usb_ep *ep,
-		struct usb_request *request, gfp_t gfp_flags)
-{
-	struct usb_ss_endpoint *usb_ss_ep =
-		to_usb_ss_ep(ep);
-	struct usb_ss_dev *usb_ss = usb_ss_ep->usb_ss;
+static int __cdns3_gadget_ep_queue(struct usb_ep *ep,
+				   struct usb_request *request,
+				   gfp_t gfp_flags)
+{
+	struct cdns3_endpoint *priv_ep = ep_to_cdns3_ep(ep);
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
+	struct cdns3_request *priv_req;
+	int deferred = 0;
 	int ret = 0;
-	int empty_list = 0;
 
 	request->actual = 0;
 	request->status = -EINPROGRESS;
+	priv_req = to_cdns3_request(request);
+	trace_cdns3_ep_queue(priv_req);
 
-	dev_dbg(&usb_ss->dev,
-		"Queuing endpoint: %s\n", usb_ss_ep->name);
+	/*
+	 * WA2: if transfer was queued before DESCMISS appear than we
+	 * can disable handling of DESCMISS interrupt. Driver assumes that it
+	 * can disable special treatment for this endpoint.
+	 */
+	if (priv_ep->flags & EP_QUIRK_EXTRA_BUF_DET) {
+		u32 reg;
 
-	dev_dbg(&usb_ss->dev, "QUEUE(%02X) %d\n",
-		ep->desc->bEndpointAddress, request->length);
+		cdns3_select_ep(priv_dev, priv_ep->num | priv_ep->dir);
+		priv_ep->flags &= ~EP_QUIRK_EXTRA_BUF_DET;
+		reg = readl(&priv_dev->regs->ep_sts_en);
+		reg &= ~EP_STS_EN_DESCMISEN;
+		writel(reg, &priv_dev->regs->ep_sts_en);
+	}
 
-	ret = usb_gadget_map_request_by_dev(usb_ss->sysdev, request,
-			ep->desc->bEndpointAddress & USB_DIR_IN);
+	/* WA2 */
+	if (priv_ep->flags & EP_QUIRK_EXTRA_BUF_EN) {
+		u8 pending_empty = list_empty(&priv_ep->pending_req_list);
+		u8 descmiss_empty = list_empty(&priv_ep->descmiss_req_list);
 
-	if (ret)
+		/*
+		 *  DESCMISS transfer has been finished, so data will be
+		 *  directly copied from internal allocated usb_request
+		 *  objects.
+		 */
+		if (pending_empty && !descmiss_empty &&
+		    !(priv_req->flags & REQUEST_INTERNAL)) {
+			cdns3_descmiss_copy_data(priv_ep, request);
+			list_add_tail(&request->list,
+				      &priv_ep->pending_req_list);
+			cdns3_gadget_giveback(priv_ep, priv_req,
+					      request->status);
+			return ret;
+		}
+
+		/*
+		 * WA2 driver will wait for completion DESCMISS transfer,
+		 * before starts new, not DESCMISS transfer.
+		 */
+		if (!pending_empty && !descmiss_empty)
+			deferred = 1;
+
+		if (priv_req->flags & REQUEST_INTERNAL)
+			list_add_tail(&priv_req->list,
+				      &priv_ep->descmiss_req_list);
+	}
+
+	ret = cdns3_prepare_aligned_request_buf(priv_req);
+	if (ret < 0)
 		return ret;
 
-	empty_list = list_empty(&usb_ss_ep->request_list);
-	list_add_tail(&request->list, &usb_ss_ep->request_list);
+	ret = usb_gadget_map_request_by_dev(priv_dev->sysdev, request,
+					    usb_endpoint_dir_in(ep->desc));
+	if (ret)
+		return ret;
 
-	if (!usb_ss->hw_configured_flag)
-		return 0;
+	/*
+	 * If hardware endpoint configuration has not been set yet then
+	 * just queue request in deferred list. Transfer will be started in
+	 * cdns3_set_hw_configuration.
+	 */
+	if (!priv_dev->hw_configured_flag)
+		deferred = 1;
+	else
+		ret = cdns3_ep_run_transfer(priv_ep, request);
 
-	if (empty_list) {
-		if (!usb_ss_ep->stalled_flag)
-			ret = cdns_ep_run_transfer(usb_ss_ep);
-	}
+	if (ret || deferred)
+		list_add_tail(&request->list, &priv_ep->deferred_req_list);
+	else
+		list_add_tail(&request->list, &priv_ep->pending_req_list);
 
 	return ret;
 }
 
-static int usb_ss_gadget_ep_queue(struct usb_ep *ep,
-		struct usb_request *request, gfp_t gfp_flags)
+static int cdns3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,
+				 gfp_t gfp_flags)
 {
-	struct usb_ss_endpoint *usb_ss_ep = to_usb_ss_ep(ep);
-	struct usb_ss_dev *usb_ss = usb_ss_ep->usb_ss;
 	struct usb_request *zlp_request;
+	struct cdns3_endpoint *priv_ep;
+	struct cdns3_device *priv_dev;
 	unsigned long flags;
 	int ret;
 
-	spin_lock_irqsave(&usb_ss->lock, flags);
+	if (!request || !ep)
+		return -EINVAL;
+
+	priv_ep = ep_to_cdns3_ep(ep);
+	priv_dev = priv_ep->cdns3_dev;
+
+	spin_lock_irqsave(&priv_dev->lock, flags);
+
+	ret = __cdns3_gadget_ep_queue(ep, request, gfp_flags);
 
-	ret = __usb_ss_gadget_ep_queue(ep, request, gfp_flags);
 	if (ret == 0 && request->zero && request->length &&
-			(request->length % ep->maxpacket == 0)) {
-		zlp_request = usb_ss_gadget_ep_alloc_request(ep, GFP_ATOMIC);
+	    (request->length % ep->maxpacket == 0)) {
+		struct cdns3_request *priv_req;
+
+		zlp_request = cdns3_gadget_ep_alloc_request(ep, GFP_ATOMIC);
+		zlp_request->buf = priv_dev->zlp_buf;
 		zlp_request->length = 0;
-		zlp_request->buf = usb_ss->zlp_buf;
 
-		dev_dbg(&usb_ss->dev, "Queuing ZLP for endpoint: %s\n",
-			usb_ss_ep->name);
-		ret = __usb_ss_gadget_ep_queue(ep, zlp_request, gfp_flags);
+		priv_req = to_cdns3_request(zlp_request);
+		priv_req->flags |= REQUEST_ZLP;
+
+		dev_dbg(priv_dev->dev, "Queuing ZLP for endpoint: %s\n",
+			priv_ep->name);
+		ret = __cdns3_gadget_ep_queue(ep, zlp_request, gfp_flags);
 	}
 
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
 	return ret;
 }
 
 /**
- * usb_ss_gadget_ep_dequeue Remove request from transfer queue
+ * cdns3_gadget_ep_dequeue Remove request from transfer queue
  * @ep: endpoint object associated with request
  * @request: request object
  *
  * Returns 0 on success, error code elsewhere
  */
-static int usb_ss_gadget_ep_dequeue(struct usb_ep *ep,
-		struct usb_request *request)
+int cdns3_gadget_ep_dequeue(struct usb_ep *ep,
+			    struct usb_request *request)
 {
-	struct usb_ss_endpoint *usb_ss_ep =
-		to_usb_ss_ep(ep);
-	struct usb_ss_dev *usb_ss = usb_ss_ep->usb_ss;
-	unsigned long flags;
+	struct cdns3_endpoint *priv_ep = ep_to_cdns3_ep(ep);
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
 	struct usb_request *req, *req_temp;
+	struct cdns3_request *priv_req;
+	struct cdns3_trb *link_trb;
+	unsigned long flags;
 	int ret = 0;
 
-	if (ep == NULL || request == NULL || ep->desc == NULL)
+	if (!ep || !request || !ep->desc)
 		return -EINVAL;
 
-	spin_lock_irqsave(&usb_ss->lock, flags);
-	dev_dbg(&usb_ss->dev, "DEQUEUE(%02X) %d\n",
-		ep->address, request->length);
-
-	select_ep(usb_ss, ep->desc->bEndpointAddress);
-	if (usb_ss->start_gadget)
-		ret = cdns_data_flush(usb_ss_ep);
-
-	list_for_each_entry_safe(req, req_temp,
-		&usb_ss_ep->request_list, list) {
-		if (request == req) {
-			request->status = -ECONNRESET;
-			usb_gadget_unmap_request_by_dev(usb_ss->sysdev, request,
-				ep->address & USB_DIR_IN);
-			list_del_init(&request->list);
-			if (request->complete) {
-				spin_unlock(&usb_ss->lock);
-				usb_gadget_giveback_request
-					(&usb_ss_ep->endpoint, request);
-				spin_lock(&usb_ss->lock);
-			}
-			break;
-		}
+	spin_lock_irqsave(&priv_dev->lock, flags);
+
+	priv_req = to_cdns3_request(request);
+
+	trace_cdns3_ep_dequeue(priv_req);
+
+	cdns3_select_ep(priv_dev, ep->desc->bEndpointAddress);
+
+	list_for_each_entry_safe(req, req_temp, &priv_ep->pending_req_list,
+				 list) {
+		if (request == req)
+			goto found;
 	}
 
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
-	if (&usb_ss_ep->endpoint == usb_ss->gadget.ep0)
-		flush_work(&usb_ss->pending_status_wq);
+	list_for_each_entry_safe(req, req_temp, &priv_ep->deferred_req_list,
+				 list) {
+		if (request == req)
+			goto found;
+	}
 
+	goto not_found;
+
+found:
+
+	if (priv_ep->wa1_trb == priv_req->trb)
+		cdns3_wa1_restore_cycle_bit(priv_ep);
+
+	link_trb = priv_req->trb;
+	cdns3_move_deq_to_next_trb(priv_req);
+	cdns3_gadget_giveback(priv_ep, priv_req, -ECONNRESET);
+
+	/* Update ring */
+	request = cdns3_next_request(&priv_ep->deferred_req_list);
+	if (request) {
+		priv_req = to_cdns3_request(request);
+
+		link_trb->buffer = TRB_BUFFER(priv_ep->trb_pool_dma +
+					      (priv_req->start_trb * TRB_SIZE));
+		link_trb->control = (link_trb->control & TRB_CYCLE) |
+				    TRB_TYPE(TRB_LINK) | TRB_CHAIN | TRB_TOGGLE;
+	} else {
+		priv_ep->flags |= EP_UPDATE_EP_TRBADDR;
+	}
+
+not_found:
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
 	return ret;
 }
 
 /**
- * usb_ss_gadget_ep_set_halt Sets/clears stall on selected endpoint
+ * cdns3_gadget_ep_set_halt Sets/clears stall on selected endpoint
  * @ep: endpoint object to set/clear stall on
  * @value: 1 for set stall, 0 for clear stall
  *
  * Returns 0 on success, error code elsewhere
  */
-static int usb_ss_gadget_ep_set_halt(struct usb_ep *ep, int value)
+int cdns3_gadget_ep_set_halt(struct usb_ep *ep, int value)
 {
-	struct usb_ss_endpoint *usb_ss_ep =
-		to_usb_ss_ep(ep);
-	struct usb_ss_dev *usb_ss = usb_ss_ep->usb_ss;
+	struct cdns3_endpoint *priv_ep = ep_to_cdns3_ep(ep);
+	struct cdns3_device *priv_dev = priv_ep->cdns3_dev;
 	unsigned long flags;
 	int ret = 0;
 
-	/* return error when endpoint disabled */
-	if (!ep->enabled)
+	if (!(priv_ep->flags & EP_ENABLED))
 		return -EPERM;
 
-	/* if actual transfer is pending defer setting stall on this endpoint */
-	if (usb_ss_ep->hw_pending_flag && value) {
-		usb_ss_ep->stalled_flag = 1;
-		return 0;
-	}
-
-	dev_dbg(&usb_ss->dev, "HALT(%02X) %d\n", ep->address, value);
-
-	spin_lock_irqsave(&usb_ss->lock, flags);
+	spin_lock_irqsave(&priv_dev->lock, flags);
 
-	select_ep(usb_ss, ep->desc->bEndpointAddress);
+	cdns3_select_ep(priv_dev, ep->desc->bEndpointAddress);
 	if (value) {
-		cdns_ep_stall_flush(usb_ss_ep);
+		cdns3_ep_stall_flush(priv_ep);
 	} else {
-		/*
-		 * TODO:
-		 * epp->wedgeFlag = 0;
-		 */
-		usb_ss_ep->wedge_flag = 0;
-		gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-		EP_CMD__CSTALL__MASK | EP_CMD__EPRST__MASK);
+		priv_ep->flags &= ~EP_WEDGE;
+
+		cdns3_dbg(priv_ep->cdns3_dev, "Clear stalled endpoint %s\n",
+			  priv_ep->name);
+
+		writel(EP_CMD_CSTALL | EP_CMD_EPRST, &priv_dev->regs->ep_cmd);
+
 		/* wait for EPRST cleared */
-		ret = wait_reg_bit_clear(usb_ss, &usb_ss->regs->ep_cmd,
-			EP_CMD__EPRST__MASK, 100);
-		usb_ss_ep->stalled_flag = 0;
+		ret = cdns3_handshake(&priv_dev->regs->ep_cmd,
+				      EP_CMD_EPRST, 0, 100);
+		if (unlikely(ret)) {
+			dev_err(priv_dev->dev,
+				"Clearing halt condition failed for %s\n",
+				priv_ep->name);
+			goto finish;
+
+		} else {
+			priv_ep->flags &= ~EP_STALL;
+		}
 	}
-	usb_ss_ep->hw_pending_flag = 0;
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
 
-	return ret;
-}
+	priv_ep->flags &= ~EP_PENDING_REQUEST;
+finish:
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
 
-/**
- * usb_ss_gadget_ep_set_wedge Set wedge on selected endpoint
- * @ep: endpoint object
- *
- * Returns 0
- */
-static int usb_ss_gadget_ep_set_wedge(struct usb_ep *ep)
-{
-	struct usb_ss_endpoint *usb_ss_ep = to_usb_ss_ep(ep);
-	struct usb_ss_dev *usb_ss = usb_ss_ep->usb_ss;
-
-	dev_dbg(&usb_ss->dev, "WEDGE(%02X)\n", ep->address);
-	usb_ss_gadget_ep_set_halt(ep, 1);
-	usb_ss_ep->wedge_flag = 1;
-	return 0;
+	return ret;
 }
 
-static const struct usb_ep_ops usb_ss_gadget_ep0_ops = {
-	.enable = usb_ss_gadget_ep0_enable,
-	.disable = usb_ss_gadget_ep0_disable,
-	.alloc_request = usb_ss_gadget_ep_alloc_request,
-	.free_request = usb_ss_gadget_ep_free_request,
-	.queue = usb_ss_gadget_ep0_queue,
-	.dequeue = usb_ss_gadget_ep_dequeue,
-	.set_halt = usb_ss_gadget_ep0_set_halt,
-	.set_wedge = usb_ss_gadget_ep_set_wedge,
-};
+extern const struct usb_ep_ops cdns3_gadget_ep0_ops;
 
-static const struct usb_ep_ops usb_ss_gadget_ep_ops = {
-	.enable = usb_ss_gadget_ep_enable,
-	.disable = usb_ss_gadget_ep_disable,
-	.alloc_request = usb_ss_gadget_ep_alloc_request,
-	.free_request = usb_ss_gadget_ep_free_request,
-	.queue = usb_ss_gadget_ep_queue,
-	.dequeue = usb_ss_gadget_ep_dequeue,
-	.set_halt = usb_ss_gadget_ep_set_halt,
-	.set_wedge = usb_ss_gadget_ep_set_wedge,
+static const struct usb_ep_ops cdns3_gadget_ep_ops = {
+	.enable = cdns3_gadget_ep_enable,
+	.disable = cdns3_gadget_ep_disable,
+	.alloc_request = cdns3_gadget_ep_alloc_request,
+	.free_request = cdns3_gadget_ep_free_request,
+	.queue = cdns3_gadget_ep_queue,
+	.dequeue = cdns3_gadget_ep_dequeue,
+	.set_halt = cdns3_gadget_ep_set_halt,
+	.set_wedge = cdns3_gadget_ep_set_wedge,
 };
 
 /**
- * usb_ss_gadget_get_frame Returns number of actual ITP frame
+ * cdns3_gadget_get_frame Returns number of actual ITP frame
  * @gadget: gadget object
  *
  * Returns number of actual ITP frame
  */
-static int usb_ss_gadget_get_frame(struct usb_gadget *gadget)
+static int cdns3_gadget_get_frame(struct usb_gadget *gadget)
 {
-	struct usb_ss_dev *usb_ss = gadget_to_usb_ss(gadget);
+	struct cdns3_device *priv_dev = gadget_to_cdns3_device(gadget);
 
-	dev_dbg(&usb_ss->dev, "usb_ss_gadget_get_frame\n");
-	return gadget_readl(usb_ss, &usb_ss->regs->usb_iptn);
+	return readl(&priv_dev->regs->usb_itpn);
 }
 
-static int usb_ss_gadget_wakeup(struct usb_gadget *gadget)
+static int cdns3_gadget_wakeup(struct usb_gadget *gadget)
 {
-	struct usb_ss_dev *usb_ss = gadget_to_usb_ss(gadget);
-
-	dev_dbg(&usb_ss->dev, "usb_ss_gadget_wakeup\n");
 	return 0;
 }
 
-static int usb_ss_gadget_set_selfpowered(struct usb_gadget *gadget,
-		int is_selfpowered)
+static int cdns3_gadget_set_selfpowered(struct usb_gadget *gadget,
+					int is_selfpowered)
 {
-	struct usb_ss_dev *usb_ss = gadget_to_usb_ss(gadget);
+	struct cdns3_device *priv_dev = gadget_to_cdns3_device(gadget);
 	unsigned long flags;
 
-	dev_dbg(&usb_ss->dev, "usb_ss_gadget_set_selfpowered: %d\n",
-		is_selfpowered);
-
-	spin_lock_irqsave(&usb_ss->lock, flags);
-	gadget->is_selfpowered = !!is_selfpowered;
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
+	spin_lock_irqsave(&priv_dev->lock, flags);
+	priv_dev->is_selfpowered = !!is_selfpowered;
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
 	return 0;
 }
 
-static int usb_ss_gadget_pullup(struct usb_gadget *gadget, int is_on)
+static int cdns3_gadget_pullup(struct usb_gadget *gadget, int is_on)
 {
-	struct usb_ss_dev *usb_ss = gadget_to_usb_ss(gadget);
+	struct cdns3_device *priv_dev = gadget_to_cdns3_device(gadget);
 
-	if (!usb_ss->start_gadget)
+	if (!priv_dev->start_gadget)
 		return 0;
 
-	dev_dbg(&usb_ss->dev, "usb_ss_gadget_pullup: %d\n", is_on);
-
 	if (is_on)
-		gadget_writel(usb_ss, &usb_ss->regs->usb_conf,
-				USB_CONF__DEVEN__MASK);
+		writel(USB_CONF_DEVEN, &priv_dev->regs->usb_conf);
 	else
-		gadget_writel(usb_ss, &usb_ss->regs->usb_conf,
-				USB_CONF__DEVDS__MASK);
+		writel(USB_CONF_DEVDS, &priv_dev->regs->usb_conf);
 
 	return 0;
 }
 
+static void cdns3_gadget_config(struct cdns3_device *priv_dev)
+{
+	struct cdns3_usb_regs __iomem *regs = priv_dev->regs;
+
+	cdns3_ep0_config(priv_dev);
+
+	/* enable interrupts for endpoint 0 (in and out) */
+	writel(EP_IEN_EP_OUT0 | EP_IEN_EP_IN0, &regs->ep_ien);
+
+	/*
+	 *Driver need modify LFPS minimal U1 Exit time for 0x00024505 revision
+	 * of controller
+	 */
+	if (priv_dev->dev_ver == 0x00024505) {
+		u32 reg = readl(&regs->dbg_link1);
+
+		reg &= ~DBG_LINK1_LFPS_MIN_GEN_U1_EXIT_MASK;
+		reg |= DBG_LINK1_LFPS_MIN_GEN_U1_EXIT(0x55) |
+		       DBG_LINK1_LFPS_MIN_GEN_U1_EXIT_SET;
+		writel(reg, &regs->dbg_link1);
+	}
+
+	/* enable generic interrupt*/
+	writel(USB_IEN_INIT, &regs->usb_ien);
+	writel(USB_CONF_CLK2OFFDS | USB_CONF_L1DS, &regs->usb_conf);
+	writel(USB_CONF_DMULT, &regs->usb_conf);
+	cdns3_gadget_pullup(&priv_dev->gadget, 1);
+}
+
 /**
- * usb_ss_gadget_udc_start Gadget start
+ * cdns3_gadget_udc_start Gadget start
  * @gadget: gadget object
  * @driver: driver which operates on this gadget
  *
  * Returns 0 on success, error code elsewhere
  */
-static int usb_ss_gadget_udc_start(struct usb_gadget *gadget,
-		struct usb_gadget_driver *driver)
+static int cdns3_gadget_udc_start(struct usb_gadget *gadget,
+				  struct usb_gadget_driver *driver)
 {
-	struct usb_ss_dev *usb_ss = gadget_to_usb_ss(gadget);
+	struct cdns3_device *priv_dev = gadget_to_cdns3_device(gadget);
 	unsigned long flags;
 
-	if (usb_ss->gadget_driver) {
-		dev_err(&usb_ss->dev, "%s is already bound to %s\n",
-				usb_ss->gadget.name,
-				usb_ss->gadget_driver->driver.name);
-		return -EBUSY;
-	}
-
-	dev_dbg(&usb_ss->dev, "%s begins\n", __func__);
-
-	spin_lock_irqsave(&usb_ss->lock, flags);
-	usb_ss->gadget_driver = driver;
-	if (!usb_ss->start_gadget) {
-		spin_unlock_irqrestore(&usb_ss->lock, flags);
+	dev_dbg(priv_dev->dev, "%s begins\n", __func__);
+	spin_lock_irqsave(&priv_dev->lock, flags);
+	priv_dev->gadget_driver = driver;
+	if (!priv_dev->start_gadget) {
+		spin_unlock_irqrestore(&priv_dev->lock, flags);
 		return 0;
 	}
 
-	__cdns3_gadget_start(usb_ss);
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
-	dev_dbg(&usb_ss->dev, "%s ends\n", __func__);
+	cdns3_gadget_config(priv_dev);
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
 	return 0;
 }
 
 /**
- * usb_ss_gadget_udc_stop Stops gadget
+ * cdns3_gadget_udc_stop Stops gadget
  * @gadget: gadget object
  *
  * Returns 0
  */
-static int usb_ss_gadget_udc_stop(struct usb_gadget *gadget)
+static int cdns3_gadget_udc_stop(struct usb_gadget *gadget)
 {
-	struct usb_ss_dev *usb_ss = gadget_to_usb_ss(gadget);
-	struct usb_ep *ep;
-	struct usb_ss_endpoint *usb_ss_ep, *temp_ss_ep;
-	int i;
+	struct cdns3_device *priv_dev = gadget_to_cdns3_device(gadget);
+	struct cdns3_endpoint *priv_ep;
 	u32 bEndpointAddress;
+	struct usb_ep *ep;
 	int ret = 0;
-	unsigned long flags;
-
-	dev_dbg(&usb_ss->dev, "%s start\n", __func__);
-
-	spin_lock_irqsave(&usb_ss->lock, flags);
-	usb_ss->status_completion_no_call = 0;
-	list_for_each_entry_safe(usb_ss_ep, temp_ss_ep,
-		&usb_ss->ep_match_list, ep_match_pending_list) {
-		list_del(&usb_ss_ep->ep_match_pending_list);
-		usb_ss_ep->used = false;
-	}
 
-	usb_ss->onchip_mem_allocated_size = 0;
-	usb_ss->out_mem_is_allocated = 0;
-	usb_ss->gadget.speed = USB_SPEED_UNKNOWN;
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
-	for (i = 0; i < usb_ss->ep_nums ; i++)
-		usb_ss_free_trb_pool(usb_ss->eps[i]);
+	priv_dev->gadget_driver = NULL;
 
-	spin_lock_irqsave(&usb_ss->lock, flags);
-	if (!usb_ss->start_gadget) {
-		usb_ss->gadget_driver = NULL;
-		spin_unlock_irqrestore(&usb_ss->lock, flags);
-		return 0;
-	}
+	priv_dev->onchip_mem_allocated_size = 0;
+	priv_dev->out_mem_is_allocated = 0;
+	priv_dev->gadget.speed = USB_SPEED_UNKNOWN;
 
-	list_for_each_entry(ep, &usb_ss->gadget.ep_list, ep_list) {
-		usb_ss_ep = to_usb_ss_ep(ep);
-		bEndpointAddress = usb_ss_ep->num | usb_ss_ep->dir;
-		select_ep(usb_ss, bEndpointAddress);
-		gadget_writel(usb_ss, &usb_ss->regs->ep_sts, ~0);
-		gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
-			EP_CMD__EPRST__MASK);
-		ret = wait_reg_bit_clear(usb_ss, &usb_ss->regs->ep_cmd,
-			EP_CMD__EPRST__MASK, 100);
+	list_for_each_entry(ep, &priv_dev->gadget.ep_list, ep_list) {
+		priv_ep = ep_to_cdns3_ep(ep);
+		bEndpointAddress = priv_ep->num | priv_ep->dir;
+		cdns3_select_ep(priv_dev, bEndpointAddress);
+		writel(EP_CMD_EPRST, &priv_dev->regs->ep_cmd);
+		ret = cdns3_handshake(&priv_dev->regs->ep_cmd,
+				      EP_CMD_EPRST, 0, 100);
+		cdns3_free_trb_pool(priv_ep);
 	}
 
 	/* disable interrupt for device */
-	gadget_writel(usb_ss, &usb_ss->regs->usb_ists, ~0);
-	gadget_writel(usb_ss, &usb_ss->regs->usb_ien, 0);
-	gadget_writel(usb_ss, &usb_ss->regs->usb_conf, USB_CONF__DEVDS__MASK);
-	usb_ss->gadget_driver = NULL;
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
+	writel(0, &priv_dev->regs->usb_ien);
+	writel(USB_CONF_DEVDS, &priv_dev->regs->usb_conf);
 
 	return ret;
 }
 
-static const struct usb_gadget_ops usb_ss_gadget_ops = {
-	.get_frame = usb_ss_gadget_get_frame,
-	.wakeup = usb_ss_gadget_wakeup,
-	.set_selfpowered = usb_ss_gadget_set_selfpowered,
-	.pullup = usb_ss_gadget_pullup,
-	.udc_start = usb_ss_gadget_udc_start,
-	.udc_stop = usb_ss_gadget_udc_stop,
-	.match_ep = usb_ss_gadget_match_ep,
+static const struct usb_gadget_ops cdns3_gadget_ops = {
+	.get_frame = cdns3_gadget_get_frame,
+	.wakeup = cdns3_gadget_wakeup,
+	.set_selfpowered = cdns3_gadget_set_selfpowered,
+	.pullup = cdns3_gadget_pullup,
+	.udc_start = cdns3_gadget_udc_start,
+	.udc_stop = cdns3_gadget_udc_stop,
+	.match_ep = cdns3_gadget_match_ep,
 };
 
+static void cdns3_free_all_eps(struct cdns3_device *priv_dev)
+{
+	int i;
+
+	/*ep0 OUT point to ep0 IN*/
+	priv_dev->eps[16] = NULL;
+
+	cdns3_free_trb_pool(priv_dev->eps[0]);
+
+	for (i = 0; i < CDNS3_ENDPOINTS_MAX_COUNT; i++)
+		if (priv_dev->eps[i])
+			devm_kfree(priv_dev->dev, priv_dev->eps[i]);
+}
+
 /**
- * usb_ss_init_ep Initializes software endpoints of gadget
- * @usb_ss: extended gadget object
+ * cdns3_init_eps Initializes software endpoints of gadget
+ * @cdns3: extended gadget object
  *
  * Returns 0 on success, error code elsewhere
  */
-static int usb_ss_init_ep(struct usb_ss_dev *usb_ss)
+static int cdns3_init_eps(struct cdns3_device *priv_dev)
 {
-	struct usb_ss_endpoint *usb_ss_ep;
-	u32 ep_enabled_reg, iso_ep_reg, bulk_ep_reg;
+	u32 ep_enabled_reg, iso_ep_reg;
+	struct cdns3_endpoint *priv_ep;
+	int ep_dir, ep_number;
+	u32 ep_mask;
+	int ret = 0;
 	int i;
-	int ep_reg_pos, ep_dir, ep_number;
-	int found_endpoints = 0;
 
-	/* Read it from USB_CAP3 to USB_CAP5 */
+	/* Read it from USB_CAP3 and USB_CAP4 */
 	ep_enabled_reg = 0x00ff00ff;
 	iso_ep_reg = 0x00fe00fe;
-	bulk_ep_reg = 0x00fe00fe;
 
-	dev_dbg(&usb_ss->dev, "Initializing non-zero endpoints\n");
+	dev_dbg(priv_dev->dev, "Initializing non-zero endpoints\n");
 
-	for (i = 0; i < USB_SS_ENDPOINTS_MAX_COUNT; i++) {
-		ep_number = (i / 2) + 1;
-		ep_dir = i % 2;
-		ep_reg_pos = (16 * ep_dir) + ep_number;
+	for (i = 0; i < CDNS3_ENDPOINTS_MAX_COUNT; i++) {
+		ep_dir = i >> 4;	/* i div 16 */
+		ep_number = i & 0xF;	/* i % 16 */
+		ep_mask = BIT(i);
 
-		if (!(ep_enabled_reg & (1uL << ep_reg_pos)))
+		if (!(ep_enabled_reg & ep_mask))
 			continue;
 
-		/* create empty endpoint object */
-		usb_ss_ep = devm_kzalloc(&usb_ss->dev, sizeof(*usb_ss_ep),
-			GFP_KERNEL);
-		if (!usb_ss_ep)
-			return -ENOMEM;
+		if (ep_dir && !ep_number) {
+			priv_dev->eps[i] = priv_dev->eps[0];
+			continue;
+		}
+
+		priv_ep = devm_kzalloc(priv_dev->dev, sizeof(*priv_ep),
+				       GFP_KERNEL);
+		if (!priv_ep) {
+			ret = -ENOMEM;
+			goto err;
+		}
 
 		/* set parent of endpoint object */
-		usb_ss_ep->usb_ss = usb_ss;
-
-		/* set index of endpoint in endpoints container */
-		usb_ss->eps[found_endpoints++] = usb_ss_ep;
-
-		/* set name of endpoint */
-		snprintf(usb_ss_ep->name, sizeof(usb_ss_ep->name), "ep%d%s",
-				ep_number, !!ep_dir ? "in" : "out");
-		usb_ss_ep->endpoint.name = usb_ss_ep->name;
-		dev_dbg(&usb_ss->dev, "Initializing endpoint: %s\n",
-				usb_ss_ep->name);
-
-		usb_ep_set_maxpacket_limit(&usb_ss_ep->endpoint,
-		ENDPOINT_MAX_PACKET_LIMIT);
-		usb_ss_ep->endpoint.max_streams = ENDPOINT_MAX_STREAMS;
-		usb_ss_ep->endpoint.ops = &usb_ss_gadget_ep_ops;
-		if (ep_dir)
-			usb_ss_ep->endpoint.caps.dir_in = 1;
-		else
-			usb_ss_ep->endpoint.caps.dir_out = 1;
+		priv_ep->cdns3_dev = priv_dev;
+		priv_dev->eps[i] = priv_ep;
+		priv_ep->num = ep_number;
+		priv_ep->dir = ep_dir ? USB_DIR_IN : USB_DIR_OUT;
+
+		if (!ep_number) {
+			ret = cdns3_init_ep0(priv_dev, priv_ep);
+			if (ret) {
+				dev_err(priv_dev->dev, "Failed to init ep0\n");
+				goto err;
+			}
+		} else {
+			snprintf(priv_ep->name, sizeof(priv_ep->name), "ep%d%s",
+				 ep_number, !!ep_dir ? "in" : "out");
+			priv_ep->endpoint.name = priv_ep->name;
+
+			usb_ep_set_maxpacket_limit(&priv_ep->endpoint,
+						   CDNS3_EP_MAX_PACKET_LIMIT);
+			priv_ep->endpoint.max_streams = CDNS3_EP_MAX_STREAMS;
+			priv_ep->endpoint.ops = &cdns3_gadget_ep_ops;
+			if (ep_dir)
+				priv_ep->endpoint.caps.dir_in = 1;
+			else
+				priv_ep->endpoint.caps.dir_out = 1;
+
+			if (iso_ep_reg & ep_mask)
+				priv_ep->endpoint.caps.type_iso = 1;
 
-		/* check endpoint type */
-		if (iso_ep_reg & (1uL << ep_reg_pos))
-			usb_ss_ep->endpoint.caps.type_iso = 1;
+			priv_ep->endpoint.caps.type_bulk = 1;
+			priv_ep->endpoint.caps.type_int = 1;
 
-		if (bulk_ep_reg & (1uL << ep_reg_pos)) {
-			usb_ss_ep->endpoint.caps.type_bulk = 1;
-			usb_ss_ep->endpoint.caps.type_int = 1;
-			usb_ss_ep->endpoint.maxburst = CDNS3_EP_BUF_SIZE - 1;
+			list_add_tail(&priv_ep->endpoint.ep_list,
+				      &priv_dev->gadget.ep_list);
 		}
 
-		list_add_tail(&usb_ss_ep->endpoint.ep_list,
-				&usb_ss->gadget.ep_list);
-		INIT_LIST_HEAD(&usb_ss_ep->request_list);
-		INIT_LIST_HEAD(&usb_ss_ep->ep_match_pending_list);
+		priv_ep->flags = 0;
+
+		dev_dbg(priv_dev->dev, "Initialized  %s support: %s %s\n",
+			 priv_ep->name,
+			 priv_ep->endpoint.caps.type_bulk ? "BULK, INT" : "",
+			 priv_ep->endpoint.caps.type_iso ? "ISO" : "");
+
+		INIT_LIST_HEAD(&priv_ep->pending_req_list);
+		INIT_LIST_HEAD(&priv_ep->deferred_req_list);
+		INIT_LIST_HEAD(&priv_ep->descmiss_req_list);
 	}
 
-	usb_ss->ep_nums = found_endpoints;
 	return 0;
+err:
+	cdns3_free_all_eps(priv_dev);
+	return -ENOMEM;
 }
 
-/**
- * usb_ss_init_ep0 Initializes software endpoint 0 of gadget
- * @usb_ss: extended gadget object
- *
- * Returns 0 on success, error code elsewhere
- */
-static int usb_ss_init_ep0(struct usb_ss_dev *usb_ss)
+static void cdns3_gadget_disable(struct cdns3 *cdns)
 {
-	struct usb_ss_endpoint *ep0;
+	struct cdns3_device *priv_dev;
 
-	dev_dbg(&usb_ss->dev, "Initializing EP0\n");
-	ep0 = devm_kzalloc(&usb_ss->dev, sizeof(struct usb_ss_endpoint),
-		GFP_KERNEL);
+	priv_dev = cdns->gadget_dev;
 
-	if (!ep0)
-		return -ENOMEM;
+	if (priv_dev->gadget_driver) {
+		priv_dev->gadget_driver->disconnect(&priv_dev->gadget);
+		usb_gadget_disconnect(&priv_dev->gadget);
+	}
+
+	priv_dev->gadget.speed = USB_SPEED_UNKNOWN;
+}
 
-	/* fill CDNS fields */
-	ep0->usb_ss = usb_ss;
-	sprintf(ep0->name, "ep0");
-
-	/* fill linux fields */
-	ep0->endpoint.ops = &usb_ss_gadget_ep0_ops;
-	ep0->endpoint.maxburst = 1;
-	usb_ep_set_maxpacket_limit(&ep0->endpoint, ENDPOINT0_MAX_PACKET_LIMIT);
-	ep0->endpoint.address = 0;
-	ep0->endpoint.enabled = 1;
-	ep0->endpoint.caps.type_control = 1;
-	ep0->endpoint.caps.dir_in = 1;
-	ep0->endpoint.caps.dir_out = 1;
-	ep0->endpoint.name = ep0->name;
-	ep0->endpoint.desc = &cdns3_gadget_ep0_desc;
-	usb_ss->gadget.ep0 = &ep0->endpoint;
-	INIT_LIST_HEAD(&ep0->request_list);
+void cdns3_gadget_exit(struct cdns3 *cdns)
+{
+	struct cdns3_device *priv_dev;
 
-	return 0;
+	priv_dev = cdns->gadget_dev;
+
+	cdns3_gadget_disable(cdns);
+
+	pm_runtime_mark_last_busy(cdns->dev);
+	pm_runtime_put_autosuspend(cdns->dev);
+
+	usb_del_gadget_udc(&priv_dev->gadget);
+
+	cdns3_free_all_eps(priv_dev);
+
+	while (!list_empty(&priv_dev->aligned_buf_list)) {
+		struct cdns3_aligned_buf *buf;
+
+		buf = cdns3_next_align_buf(&priv_dev->aligned_buf_list);
+
+		dma_free_coherent(priv_dev->sysdev, buf->size,
+				  buf->buf,
+				  buf->dma);
+
+		list_del(&buf->list);
+		kfree(buf);
+	}
+
+	dma_free_coherent(priv_dev->sysdev, 8, priv_dev->setup_buf,
+			  priv_dev->setup_dma);
+
+	kfree(priv_dev->zlp_buf);
+	kfree(priv_dev);
+	cdns->gadget_dev = NULL;
 }
 
-static void cdns3_gadget_release(struct device *dev)
+static int cdns3_gadget_start(struct cdns3 *cdns)
 {
-	struct usb_ss_dev *usb_ss = container_of(dev, struct usb_ss_dev, dev);
+	struct cdns3_device *priv_dev = cdns->gadget_dev;
+	unsigned long flags;
+
+	pm_runtime_get_sync(cdns->dev);
+	spin_lock_irqsave(&priv_dev->lock, flags);
+	priv_dev->start_gadget = 1;
+	if (!priv_dev->gadget_driver) {
+		spin_unlock_irqrestore(&priv_dev->lock, flags);
+		return 0;
+	}
+
+	cdns3_gadget_config(priv_dev);
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
 
-	dev_dbg(dev, "releasing '%s'\n", dev_name(dev));
-	kfree(usb_ss);
+	return 0;
 }
 
 static int __cdns3_gadget_init(struct cdns3 *cdns)
 {
-	struct usb_ss_dev *usb_ss;
-	int ret;
-	struct device *dev;
+	struct cdns3_device *priv_dev;
+	u32 max_speed;
+	int ret = 0;
 
-	usb_ss = kzalloc(sizeof(*usb_ss), GFP_KERNEL);
-	if (!usb_ss)
+	priv_dev = kzalloc(sizeof(*priv_dev), GFP_KERNEL);
+	if (!priv_dev)
 		return -ENOMEM;
 
-	dev = &usb_ss->dev;
-	dev->release = cdns3_gadget_release;
-	dev->parent = cdns->dev;
-	dev_set_name(dev, "gadget-cdns3");
-	cdns->gadget_dev = dev;
-	usb_ss->sysdev = cdns->dev;
-	ret = device_register(dev);
-	if (ret)
-		goto err1;
+	cdns->gadget_dev = priv_dev;
+	priv_dev->sysdev = cdns->dev;
+	priv_dev->dev = cdns->dev;
+	priv_dev->regs = cdns->dev_regs;
+
+	max_speed = usb_get_maximum_speed(cdns->dev);
 
-	usb_ss->regs = cdns->dev_regs;
+	/* Check the maximum_speed parameter */
+	switch (max_speed) {
+	case USB_SPEED_FULL:
+	case USB_SPEED_HIGH:
+	case USB_SPEED_SUPER:
+		break;
+	default:
+		dev_err(cdns->dev, "invalid maximum_speed parameter %d\n",
+			max_speed);
+		/* fall through */
+	case USB_SPEED_UNKNOWN:
+		/* default to superspeed */
+		max_speed = USB_SPEED_SUPER;
+		break;
+	}
 
 	/* fill gadget fields */
-	usb_ss->gadget.ops = &usb_ss_gadget_ops;
-	usb_ss->gadget.max_speed = USB_SPEED_SUPER;
-	usb_ss->gadget.speed = USB_SPEED_UNKNOWN;
-	usb_ss->gadget.name = "usb-ss-gadget";
-	usb_ss->gadget.sg_supported = 1;
-	usb_ss->is_connected = 0;
-	spin_lock_init(&usb_ss->lock);
-	INIT_WORK(&usb_ss->pending_status_wq, pending_setup_status_handler);
+	priv_dev->gadget.max_speed = max_speed;
+	priv_dev->gadget.speed = USB_SPEED_UNKNOWN;
+	priv_dev->gadget.ops = &cdns3_gadget_ops;
+	priv_dev->gadget.name = "usb-ss-gadget";
+	priv_dev->gadget.sg_supported = 1;
+	priv_dev->gadget.quirk_avoids_skb_reserve = 1;
 
-	usb_ss->in_standby_mode = 1;
+	spin_lock_init(&priv_dev->lock);
+	INIT_WORK(&priv_dev->pending_status_wq,
+		  cdns3_pending_setup_status_handler);
 
 	/* initialize endpoint container */
-	INIT_LIST_HEAD(&usb_ss->gadget.ep_list);
-	INIT_LIST_HEAD(&usb_ss->ep_match_list);
-	ret = usb_ss_init_ep0(usb_ss);
-	if (ret) {
-		dev_err(dev, "Failed to create endpoint 0\n");
-		ret = -ENOMEM;
-		goto err2;
-	}
+	INIT_LIST_HEAD(&priv_dev->gadget.ep_list);
+	INIT_LIST_HEAD(&priv_dev->aligned_buf_list);
 
-	ret = usb_ss_init_ep(usb_ss);
+	pm_runtime_get_sync(cdns->dev);
+	ret = cdns3_init_eps(priv_dev);
 	if (ret) {
-		dev_err(dev, "Failed to create non zero endpoints\n");
-		ret = -ENOMEM;
-		goto err2;
+		dev_err(priv_dev->dev, "Failed to create endpoints\n");
+		goto err1;
 	}
 
-	/* allocate memory for default endpoint TRB */
-	usb_ss->trb_ep0 = (u32 *)dma_alloc_coherent(usb_ss->sysdev, 20,
-			&usb_ss->trb_ep0_dma, GFP_DMA);
-	if (!usb_ss->trb_ep0) {
-		dev_err(dev, "Failed to allocate memory for ep0 TRB\n");
+	/* allocate memory for setup packet buffer */
+	priv_dev->setup_buf = dma_alloc_coherent(priv_dev->sysdev, 8,
+						 &priv_dev->setup_dma, GFP_DMA);
+	if (!priv_dev->setup_buf) {
+		dev_err(priv_dev->dev, "Failed to allocate memory for SETUP buffer\n");
 		ret = -ENOMEM;
 		goto err2;
 	}
 
-	/* allocate memory for setup packet buffer */
-	usb_ss->setup = (u8 *)dma_alloc_coherent(usb_ss->sysdev, 8,
-			&usb_ss->setup_dma,
-			GFP_DMA);
-	if (!usb_ss->setup) {
-		dev_err(dev, "Failed to allocate memory for SETUP buffer\n");
+	priv_dev->zlp_buf = kzalloc(CDNS3_EP_ZLP_BUF_SIZE, GFP_KERNEL);
+	if (!priv_dev->zlp_buf) {
 		ret = -ENOMEM;
 		goto err3;
 	}
 
 	/* add USB gadget device */
-	ret = usb_add_gadget_udc(&usb_ss->dev, &usb_ss->gadget);
+	ret = usb_add_gadget_udc(priv_dev->dev, &priv_dev->gadget);
 	if (ret < 0) {
-		dev_err(dev, "Failed to register USB device controller\n");
+		dev_err(priv_dev->dev,
+			"Failed to register USB device controller\n");
 		goto err4;
 	}
 
-	usb_ss->zlp_buf = kzalloc(ENDPOINT_ZLP_BUF_SIZE, GFP_KERNEL);
-	if (!usb_ss->zlp_buf) {
-		ret = -ENOMEM;
+	if (ret)
 		goto err4;
-	}
 
+
+	pm_runtime_put_sync(cdns->dev);
 	return 0;
 err4:
-	dma_free_coherent(usb_ss->sysdev, 8, usb_ss->setup,
-			usb_ss->setup_dma);
+	kfree(priv_dev->zlp_buf);
 err3:
-	dma_free_coherent(usb_ss->sysdev, 20, usb_ss->trb_ep0,
-			usb_ss->trb_ep0_dma);
+	dma_free_coherent(priv_dev->sysdev, 8, priv_dev->setup_buf,
+			  priv_dev->setup_dma);
 err2:
-	device_del(dev);
+	cdns3_free_all_eps(priv_dev);
 err1:
-	put_device(dev);
 	cdns->gadget_dev = NULL;
+	pm_runtime_put_sync(cdns->dev);
 	return ret;
 }
 
-/**
- * cdns3_gadget_remove: parent must call this to remove UDC
- *
- * cdns: cdns3 instance
- *
- */
-void cdns3_gadget_remove(struct cdns3 *cdns)
-{
-	struct usb_ss_dev *usb_ss;
-
-	if (!cdns->roles[CDNS3_ROLE_GADGET])
-		return;
-
-	usb_ss = container_of(cdns->gadget_dev, struct usb_ss_dev, dev);
-	usb_del_gadget_udc(&usb_ss->gadget);
-	dma_free_coherent(usb_ss->sysdev, 8, usb_ss->setup, usb_ss->setup_dma);
-	dma_free_coherent(usb_ss->sysdev, 20, usb_ss->trb_ep0,
-			usb_ss->trb_ep0_dma);
-	kfree(usb_ss->zlp_buf);
-	device_unregister(cdns->gadget_dev);
-	cdns->gadget_dev = NULL;
-}
-
-static void __cdns3_gadget_start(struct usb_ss_dev *usb_ss)
-{
-
-	/* configure endpoint 0 hardware */
-	cdns_ep0_config(usb_ss);
-
-	/* enable interrupts for endpoint 0 (in and out) */
-	gadget_writel(usb_ss, &usb_ss->regs->ep_ien,
-		EP_IEN__EOUTEN0__MASK | EP_IEN__EINEN0__MASK);
-
-	/* enable interrupt for device */
-	gadget_writel(usb_ss, &usb_ss->regs->usb_ien,
-			USB_IEN__U2RESIEN__MASK
-			| USB_ISTS__DIS2I__MASK
-			| USB_IEN__CON2IEN__MASK
-			| USB_IEN__UHRESIEN__MASK
-			| USB_IEN__UWRESIEN__MASK
-			| USB_IEN__DISIEN__MASK
-			| USB_IEN__CONIEN__MASK
-			| USB_IEN__U3EXTIEN__MASK
-			| USB_IEN__L2ENTIEN__MASK
-			| USB_IEN__L2EXTIEN__MASK);
-
-	gadget_writel(usb_ss, &usb_ss->regs->usb_conf,
-		    USB_CONF__CLK2OFFDS__MASK
-	/*	    | USB_CONF__USB3DIS__MASK */
-		    | USB_CONF__L1DS__MASK);
-
-	gadget_writel(usb_ss, &usb_ss->regs->usb_conf,
-			USB_CONF__U1DS__MASK
-			| USB_CONF__U2DS__MASK
-			);
-
-	gadget_writel(usb_ss, &usb_ss->regs->usb_conf, USB_CONF__DEVEN__MASK);
-}
-
-static int cdns3_gadget_start(struct cdns3 *cdns)
-{
-	struct usb_ss_dev *usb_ss = container_of(cdns->gadget_dev,
-			struct usb_ss_dev, dev);
-	unsigned long flags;
-
-	dev_dbg(&usb_ss->dev, "%s begins\n", __func__);
-
-	pm_runtime_get_sync(cdns->dev);
-	spin_lock_irqsave(&usb_ss->lock, flags);
-	usb_ss->start_gadget = 1;
-	if (!usb_ss->gadget_driver) {
-		spin_unlock_irqrestore(&usb_ss->lock, flags);
-		return 0;
-	}
-
-	__cdns3_gadget_start(usb_ss);
-	usb_ss->in_standby_mode = 0;
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
-	dev_dbg(&usb_ss->dev, "%s ends\n", __func__);
-	return 0;
-}
-
 static void __cdns3_gadget_stop(struct cdns3 *cdns)
 {
-	struct usb_ss_dev *usb_ss;
+	struct cdns3_device *priv_dev = cdns->gadget_dev;
 	unsigned long flags;
 
-	usb_ss = container_of(cdns->gadget_dev, struct usb_ss_dev, dev);
-	if (usb_ss->gadget_driver)
-		usb_ss->gadget_driver->disconnect(&usb_ss->gadget);
-	usb_gadget_disconnect(&usb_ss->gadget);
-	spin_lock_irqsave(&usb_ss->lock, flags);
-	usb_ss->gadget.speed = USB_SPEED_UNKNOWN;
-	usb_gadget_set_state(&usb_ss->gadget, USB_STATE_NOTATTACHED);
+	cdns3_gadget_disable(cdns);
+	spin_lock_irqsave(&priv_dev->lock, flags);
+	usb_gadget_set_state(&priv_dev->gadget, USB_STATE_NOTATTACHED);
 	/* disable interrupt for device */
-	gadget_writel(usb_ss, &usb_ss->regs->usb_ien, 0);
-	gadget_writel(usb_ss, &usb_ss->regs->usb_conf, USB_CONF__DEVDS__MASK);
-	usb_ss->start_gadget = 0;
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
+	writel(0, &priv_dev->regs->usb_ien);
+	writel(USB_CONF_DEVDS, &priv_dev->regs->usb_conf);
+	priv_dev->start_gadget = 0;
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
 }
 
 static void cdns3_gadget_stop(struct cdns3 *cdns)
@@ -2526,20 +2325,19 @@ static int cdns3_gadget_suspend(struct cdns3 *cdns, bool do_wakeup)
 
 static int cdns3_gadget_resume(struct cdns3 *cdns, bool hibernated)
 {
-	struct usb_ss_dev *usb_ss = container_of(cdns->gadget_dev,
-			struct usb_ss_dev, dev);
+	struct cdns3_device *priv_dev = cdns->gadget_dev;
 	unsigned long flags;
 
-	spin_lock_irqsave(&usb_ss->lock, flags);
-	usb_ss->start_gadget = 1;
-	if (!usb_ss->gadget_driver) {
-		spin_unlock_irqrestore(&usb_ss->lock, flags);
+	spin_lock_irqsave(&priv_dev->lock, flags);
+	priv_dev->start_gadget = 1;
+
+	if (!priv_dev->gadget_driver) {
+		spin_unlock_irqrestore(&priv_dev->lock, flags);
 		return 0;
 	}
 
-	__cdns3_gadget_start(usb_ss);
-	usb_ss->in_standby_mode = 0;
-	spin_unlock_irqrestore(&usb_ss->lock, flags);
+	cdns3_gadget_config(priv_dev);
+	spin_unlock_irqrestore(&priv_dev->lock, flags);
 	return 0;
 }
 
@@ -2562,8 +2360,10 @@ int cdns3_gadget_init(struct cdns3 *cdns)
 	rdrv->stop	= cdns3_gadget_stop;
 	rdrv->suspend	= cdns3_gadget_suspend;
 	rdrv->resume	= cdns3_gadget_resume;
-	rdrv->irq	= cdns_irq_handler_thread;
+	rdrv->irq	= cdns3_device_irq_handler;
+	rdrv->thread_irq = cdns3_device_thread_irq_handler;
 	rdrv->name	= "gadget";
 	cdns->roles[CDNS3_ROLE_GADGET] = rdrv;
+
 	return __cdns3_gadget_init(cdns);
 }
diff --git a/drivers/usb/cdns3/gadget.h b/drivers/usb/cdns3/gadget.h
index f0a576d8a4ea..5188f9b6ed3e 100644
--- a/drivers/usb/cdns3/gadget.h
+++ b/drivers/usb/cdns3/gadget.h
@@ -1,225 +1,1247 @@
-/**
- * gadget.h - Cadence USB3 device Controller Core file
- *
- * Copyright (C) 2016 Cadence Design Systems - http://www.cadence.com
- * Copyright 2017 NXP
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * USBSS device controller driver header file
  *
- * Authors: Pawel Jez <pjez@cadence.com>,
- *          Konrad Kociolek <konrad@cadence.com>,
- *          Peter Chen <peter.chen@nxp.com>
+ * Copyright (C) 2018-2019 Cadence.
+ * Copyright (C) 2017-2019 NXP
  *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * Author: Pawel Laszczak <pawell@cadence.com>
+ *         Pawel Jez <pjez@cadence.com>
+ *         Peter Chen <peter.chen@nxp.com>
  */
-#ifndef __DRIVERS_CDNS3_GADGET
-#define __DRIVERS_CDNS3_GADGET
+#ifndef __LINUX_CDNS3_GADGET
+#define __LINUX_CDNS3_GADGET
+#include <linux/usb/gadget.h>
 
-#include "dev-regs-map.h"
+/*
+ * USBSS-DEV register interface.
+ * This corresponds to the USBSS Device Controller Interface
+ */
 
-#if IS_ENABLED(CONFIG_USB_CDNS_MISC)
-#include "cdns_misc.h"
-#endif
+/**
+ * struct cdns3_usb_regs - device controller registers.
+ * @usb_conf:      Global Configuration Register.
+ * @usb_sts:       Global Status Register.
+ * @usb_cmd:       Global Command Register.
+ * @usb_itpn:      ITP/SOF number Register.
+ * @usb_lpm:       Global Command Register.
+ * @usb_ien:       USB Interrupt Enable Register.
+ * @usb_ists:      USB Interrupt Status Register.
+ * @ep_sel:        Endpoint Select Register.
+ * @ep_traddr:     Endpoint Transfer Ring Address Register.
+ * @ep_cfg:        Endpoint Configuration Register.
+ * @ep_cmd:        Endpoint Command Register.
+ * @ep_sts:        Endpoint Status Register.
+ * @ep_sts_sid:    Endpoint Status Register.
+ * @ep_sts_en:     Endpoint Status Register Enable.
+ * @drbl:          Doorbell Register.
+ * @ep_ien:        EP Interrupt Enable Register.
+ * @ep_ists:       EP Interrupt Status Register.
+ * @usb_pwr:       Global Power Configuration Register.
+ * @usb_conf2:     Global Configuration Register 2.
+ * @usb_cap1:      Capability Register 1.
+ * @usb_cap2:      Capability Register 2.
+ * @usb_cap3:      Capability Register 3.
+ * @usb_cap4:      Capability Register 4.
+ * @usb_cap5:      Capability Register 5.
+ * @usb_cap6:      Capability Register 6.
+ * @usb_cpkt1:     Custom Packet Register 1.
+ * @usb_cpkt2:     Custom Packet Register 2.
+ * @usb_cpkt3:     Custom Packet Register 3.
+ * @reserved1:     Reserved.
+ * @cfg_regs:      Configuration registers.
+ * @reserved2:     Reserved.
+ * @dma_axi_ctrl:  AXI Control register.
+ * @dma_axi_id:    AXI ID register.
+ * @dma_axi_cap:   AXI Capability register.
+ * @dma_axi_ctrl0: AXI Control 0 register.
+ * @dma_axi_ctrl1: AXI Control 1 register.
+ */
+struct cdns3_usb_regs {
+	__le32 usb_conf;
+	__le32 usb_sts;
+	__le32 usb_cmd;
+	__le32 usb_itpn;
+	__le32 usb_lpm;
+	__le32 usb_ien;
+	__le32 usb_ists;
+	__le32 ep_sel;
+	__le32 ep_traddr;
+	__le32 ep_cfg;
+	__le32 ep_cmd;
+	__le32 ep_sts;
+	__le32 ep_sts_sid;
+	__le32 ep_sts_en;
+	__le32 drbl;
+	__le32 ep_ien;
+	__le32 ep_ists;
+	__le32 usb_pwr;
+	__le32 usb_conf2;
+	__le32 usb_cap1;
+	__le32 usb_cap2;
+	__le32 usb_cap3;
+	__le32 usb_cap4;
+	__le32 usb_cap5;
+	__le32 usb_cap6;
+	__le32 usb_cpkt1;
+	__le32 usb_cpkt2;
+	__le32 usb_cpkt3;
+	__le32 reserved1[36];
+	__le32 cfg_reg1;
+	__le32 dbg_link1;
+	__le32 dbg_link2;
+	__le32 cfg_regs[74];
+	__le32 reserved2[34];
+	__le32 dma_axi_ctrl;
+	__le32 dma_axi_id;
+	__le32 dma_axi_cap;
+	__le32 dma_axi_ctrl0;
+	__le32 dma_axi_ctrl1;
+};
 
-#define gadget_to_usb_ss(g)  \
-	(container_of(g, struct usb_ss_dev, gadget))
+/* USB_CONF - bitmasks */
+/* Reset USB device configuration. */
+#define USB_CONF_CFGRST		BIT(0)
+/* Set Configuration. */
+#define USB_CONF_CFGSET		BIT(1)
+/* Disconnect USB device in SuperSpeed. */
+#define USB_CONF_USB3DIS	BIT(3)
+/* Disconnect USB device in HS/FS */
+#define USB_CONF_USB2DIS	BIT(4)
+/* Little Endian access - default */
+#define USB_CONF_LENDIAN	BIT(5)
+/*
+ * Big Endian access. Driver assume that byte order for
+ * SFRs access always is as Little Endian so this bit
+ * is not used.
+ */
+#define USB_CONF_BENDIAN	BIT(6)
+/* Device software reset. */
+#define USB_CONF_SWRST		BIT(7)
+/* Singular DMA transfer mode. */
+#define USB_CONF_DSING		BIT(8)
+/* Multiple DMA transfers mode. */
+#define USB_CONF_DMULT		BIT(9)
+/* DMA clock turn-off enable. */
+#define USB_CONF_DMAOFFEN	BIT(10)
+/* DMA clock turn-off disable. */
+#define USB_CONF_DMAOFFDS	BIT(11)
+/* Clear Force Full Speed. */
+#define USB_CONF_CFORCE_FS	BIT(12)
+/* Set Force Full Speed. */
+#define USB_CONF_SFORCE_FS	BIT(13)
+/* Device enable. */
+#define USB_CONF_DEVEN		BIT(14)
+/* Device disable. */
+#define USB_CONF_DEVDS		BIT(15)
+/* L1 LPM state entry enable (used in HS/FS mode). */
+#define USB_CONF_L1EN		BIT(16)
+/* L1 LPM state entry disable (used in HS/FS mode). */
+#define USB_CONF_L1DS		BIT(17)
+/* USB 2.0 clock gate disable. */
+#define USB_CONF_CLK2OFFEN	BIT(18)
+/* USB 2.0 clock gate enable. */
+#define USB_CONF_CLK2OFFDS	BIT(19)
+/* L0 LPM state entry request (used in HS/FS mode). */
+#define USB_CONF_LGO_L0		BIT(20)
+/* USB 3.0 clock gate disable. */
+#define USB_CONF_CLK3OFFEN	BIT(21)
+/* USB 3.0 clock gate enable. */
+#define USB_CONF_CLK3OFFDS	BIT(22)
+/* Bit 23 is reserved*/
+/* U1 state entry enable (used in SS mode). */
+#define USB_CONF_U1EN		BIT(24)
+/* U1 state entry disable (used in SS mode). */
+#define USB_CONF_U1DS		BIT(25)
+/* U2 state entry enable (used in SS mode). */
+#define USB_CONF_U2EN		BIT(26)
+/* U2 state entry disable (used in SS mode). */
+#define USB_CONF_U2DS		BIT(27)
+/* U0 state entry request (used in SS mode). */
+#define USB_CONF_LGO_U0		BIT(28)
+/* U1 state entry request (used in SS mode). */
+#define USB_CONF_LGO_U1		BIT(29)
+/* U2 state entry request (used in SS mode). */
+#define USB_CONF_LGO_U2		BIT(30)
+/* SS.Inactive state entry request (used in SS mode) */
+#define USB_CONF_LGO_SSINACT	BIT(31)
 
-#define to_usb_ss_ep(ep) \
-	(container_of(ep, struct usb_ss_endpoint, endpoint))
+/* USB_STS - bitmasks */
+/*
+ * Configuration status.
+ * 1 - device is in the configured state.
+ * 0 - device is not configured.
+ */
+#define USB_STS_CFGSTS_MASK	BIT(0)
+#define USB_STS_CFGSTS(p)	((p) & USB_STS_CFGSTS_MASK)
+/*
+ * On-chip memory overflow.
+ * 0 - On-chip memory status OK.
+ * 1 - On-chip memory overflow.
+ */
+#define USB_STS_OV_MASK		BIT(1)
+#define USB_STS_OV(p)		((p) & USB_STS_OV_MASK)
+/*
+ * SuperSpeed connection status.
+ * 0 - USB in SuperSpeed mode disconnected.
+ * 1 - USB in SuperSpeed mode connected.
+ */
+#define USB_STS_USB3CONS_MASK	BIT(2)
+#define USB_STS_USB3CONS(p)	((p) & USB_STS_USB3CONS_MASK)
+/*
+ * DMA transfer configuration status.
+ * 0 - single request.
+ * 1 - multiple TRB chain
+ */
+#define USB_STS_DTRANS_MASK	BIT(3)
+#define USB_STS_DTRANS(p)	((p) & USB_STS_DTRANS_MASK)
+/*
+ * Device speed.
+ * 0 - Undefined (value after reset).
+ * 1 - Low speed
+ * 2 - Full speed
+ * 3 - High speed
+ * 4 - Super speed
+ */
+#define USB_STS_USBSPEED_MASK	GENMASK(6, 4)
+#define USB_STS_USBSPEED(p)	(((p) & USB_STS_USBSPEED_MASK) >> 4)
+#define USB_STS_LS		(0x1 << 4)
+#define USB_STS_FS		(0x2 << 4)
+#define USB_STS_HS		(0x3 << 4)
+#define USB_STS_SS		(0x4 << 4)
+#define DEV_UNDEFSPEED(p)	(((p) & USB_STS_USBSPEED_MASK) == (0x0 << 4))
+#define DEV_LOWSPEED(p)		(((p) & USB_STS_USBSPEED_MASK) == USB_STS_LS)
+#define DEV_FULLSPEED(p)	(((p) & USB_STS_USBSPEED_MASK) == USB_STS_FS)
+#define DEV_HIGHSPEED(p)	(((p) & USB_STS_USBSPEED_MASK) == USB_STS_HS)
+#define DEV_SUPERSPEED(p)	(((p) & USB_STS_USBSPEED_MASK) == USB_STS_SS)
+/*
+ * Endianness for SFR access.
+ * 0 - Little Endian order (default after hardware reset).
+ * 1 - Big Endian order
+ */
+#define USB_STS_ENDIAN_MASK	BIT(7)
+#define USB_STS_ENDIAN(p)	((p) & USB_STS_ENDIAN_MASK)
+/*
+ * HS/FS clock turn-off status.
+ * 0 - hsfs clock is always on.
+ * 1 - hsfs clock turn-off in L2 (HS/FS mode) is enabled
+ *          (default after hardware reset).
+ */
+#define USB_STS_CLK2OFF_MASK	BIT(8)
+#define USB_STS_CLK2OFF(p)	((p) & USB_STS_CLK2OFF_MASK)
+/*
+ * PCLK clock turn-off status.
+ * 0 - pclk clock is always on.
+ * 1 - pclk clock turn-off in U3 (SS mode) is enabled
+ *          (default after hardware reset).
+ */
+#define USB_STS_CLK3OFF_MASK	BIT(9)
+#define USB_STS_CLK3OFF(p)	((p) & USB_STS_CLK3OFF_MASK)
+/*
+ * Controller in reset state.
+ * 0 - Internal reset is active.
+ * 1 - Internal reset is not active and controller is fully operational.
+ */
+#define USB_STS_IN_RST_MASK	BIT(10)
+#define USB_STS_IN_RST(p)	((p) & USB_STS_IN_RST_MASK)
+/*
+ * Device enable Status.
+ * 0 - USB device is disabled (VBUS input is disconnected from internal logic).
+ * 1 - USB device is enabled (VBUS input is connected to the internal logic).
+ */
+#define USB_STS_DEVS_MASK	BIT(14)
+#define USB_STS_DEVS(p)		((p) & USB_STS_DEVS_MASK)
+/*
+ * DAddress statuss.
+ * 0 - USB device is default state.
+ * 1 - USB device is at least in address state.
+ */
+#define USB_STS_ADDRESSED_MASK	BIT(15)
+#define USB_STS_ADDRESSED(p)	((p) & USB_STS_ADDRESSED_MASK)
+/*
+ * L1 LPM state enable status (used in HS/FS mode).
+ * 0 - Entering to L1 LPM state disabled.
+ * 1 - Entering to L1 LPM state enabled.
+ */
+#define USB_STS_L1ENS_MASK	BIT(16)
+#define USB_STS_L1ENS(p)	((p) & USB_STS_L1ENS_MASK)
+/*
+ * Internal VBUS connection status (used both in HS/FS  and SS mode).
+ * 0 - internal VBUS is not detected.
+ * 1 - internal VBUS is detected.
+ */
+#define USB_STS_VBUSS_MASK	BIT(17)
+#define USB_STS_VBUSS(p)	((p) & USB_STS_VBUSS_MASK)
+/*
+ * HS/FS LPM  state (used in FS/HS mode).
+ * 0 - L0 State
+ * 1 - L1 State
+ * 2 - L2 State
+ * 3 - L3 State
+ */
+#define USB_STS_LPMST_MASK	GENMASK(19, 18)
+#define DEV_L0_STATE(p)		(((p) & USB_STS_LPMST_MASK) == (0x0 << 18))
+#define DEV_L1_STATE(p)		(((p) & USB_STS_LPMST_MASK) == (0x1 << 18))
+#define DEV_L2_STATE(p)		(((p) & USB_STS_LPMST_MASK) == (0x2 << 18))
+#define DEV_L3_STATE(p)		(((p) & USB_STS_LPMST_MASK) == (0x3 << 18))
+/*
+ * Disable HS status (used in FS/HS mode).
+ * 0 - the disconnect bit for HS/FS mode is set .
+ * 1 - the disconnect bit for HS/FS mode is not set.
+ */
+#define USB_STS_USB2CONS_MASK	BIT(20)
+#define USB_STS_USB2CONS(p)	((p) & USB_STS_USB2CONS_MASK)
+/*
+ * HS/FS mode connection status (used in FS/HS mode).
+ * 0 - High Speed operations in USB2.0 (FS/HS) mode not disabled.
+ * 1 - High Speed operations in USB2.0 (FS/HS).
+ */
+#define USB_STS_DISABLE_HS_MASK	BIT(21)
+#define USB_STS_DISABLE_HS(p)	((p) & USB_STS_DISABLE_HS_MASK)
+/*
+ * U1 state enable status (used in SS mode).
+ * 0 - Entering to  U1 state disabled.
+ * 1 - Entering to  U1 state enabled.
+ */
+#define USB_STS_U1ENS_MASK	BIT(24)
+#define USB_STS_U1ENS(p)	((p) & USB_STS_U1ENS_MASK)
+/*
+ * U2 state enable status (used in SS mode).
+ * 0 - Entering to  U2 state disabled.
+ * 1 - Entering to  U2 state enabled.
+ */
+#define USB_STS_U2ENS_MASK	BIT(25)
+#define USB_STS_U2ENS(p)	((p) & USB_STS_U2ENS_MASK)
+/*
+ * SuperSpeed Link LTSSM state. This field reflects USBSS-DEV current
+ * SuperSpeed link state
+ */
+#define USB_STS_LST_MASK	GENMASK(29, 26)
+#define DEV_LST_U0		(((p) & USB_STS_LST_MASK) == (0x0 << 26))
+#define DEV_LST_U1		(((p) & USB_STS_LST_MASK) == (0x1 << 26))
+#define DEV_LST_U2		(((p) & USB_STS_LST_MASK) == (0x2 << 26))
+#define DEV_LST_U3		(((p) & USB_STS_LST_MASK) == (0x3 << 26))
+#define DEV_LST_DISABLED	(((p) & USB_STS_LST_MASK) == (0x4 << 26))
+#define DEV_LST_RXDETECT	(((p) & USB_STS_LST_MASK) == (0x5 << 26))
+#define DEV_LST_INACTIVE	(((p) & USB_STS_LST_MASK) == (0x6 << 26))
+#define DEV_LST_POLLING		(((p) & USB_STS_LST_MASK) == (0x7 << 26))
+#define DEV_LST_RECOVERY	(((p) & USB_STS_LST_MASK) == (0x8 << 26))
+#define DEV_LST_HOT_RESET	(((p) & USB_STS_LST_MASK) == (0x9 << 26))
+#define DEV_LST_COMP_MODE	(((p) & USB_STS_LST_MASK) == (0xa << 26))
+#define DEV_LST_LB_STATE	(((p) & USB_STS_LST_MASK) == (0xb << 26))
+/*
+ * DMA clock turn-off status.
+ * 0 - DMA clock is always on (default after hardware reset).
+ * 1 - DMA clock turn-off in U1, U2 and U3 (SS mode) is enabled.
+ */
+#define USB_STS_DMAOFF_MASK	BIT(30)
+#define USB_STS_DMAOFF(p)	((p) & USB_STS_DMAOFF_MASK)
+/*
+ * SFR Endian statuss.
+ * 0 - Little Endian order (default after hardware reset).
+ * 1 - Big Endian order.
+ */
+#define USB_STS_ENDIAN2_MASK	BIT(31)
+#define USB_STS_ENDIAN2(p)	((p) & USB_STS_ENDIAN2_MASK)
 
-#define ep_to_usb_ss_ep(ep) \
-	(container_of(ep, struct usb_ss_endpoint, endpoint))
+/* USB_CMD -  bitmasks */
+/* Set Function Address */
+#define USB_CMD_SET_ADDR	BIT(0)
+/*
+ * Function Address This field is saved to the device only when the field
+ * SET_ADDR is set '1 ' during write to USB_CMD register.
+ * Software is responsible for entering the address of the device during
+ * SET_ADDRESS request service. This field should be set immediately after
+ * the SETUP packet is decoded, and prior to confirmation of the status phase
+ */
+#define USB_CMD_FADDR_MASK	GENMASK(7, 1)
+#define USB_CMD_FADDR(p)	(((p) << 1) & USB_CMD_FADDR_MASK)
+/* Send Function Wake Device Notification TP (used only in SS mode). */
+#define USB_CMD_SDNFW		BIT(8)
+/* Set Test Mode (used only in HS/FS mode). */
+#define USB_CMD_STMODE		BIT(9)
+/* Test mode selector (used only in HS/FS mode) */
+#define USB_STS_TMODE_SEL_MASK	GENMASK(11, 10)
+#define USB_STS_TMODE_SEL(p)	(((p) << 10) & USB_STS_TMODE_SEL_MASK)
+/*
+ *  Send Latency Tolerance Message Device Notification TP (used only
+ *  in SS mode).
+ */
+#define USB_CMD_SDNLTM		BIT(12)
+/* Send Custom Transaction Packet (used only in SS mode) */
+#define USB_CMD_SPKT		BIT(13)
+/*Device Notification 'Function Wake' - Interface value (only in SS mode. */
+#define USB_CMD_DNFW_INT_MASK	GENMASK(23, 16)
+#define USB_STS_DNFW_INT(p)	(((p) << 16) & USB_CMD_DNFW_INT_MASK)
+/*
+ * Device Notification 'Latency Tolerance Message' -373 BELT value [7:0]
+ * (used only in SS mode).
+ */
+#define USB_CMD_DNLTM_BELT_MASK	GENMASK(27, 16)
+#define USB_STS_DNLTM_BELT(p)	(((p) << 16) & USB_CMD_DNLTM_BELT_MASK)
 
-/*-------------------------------------------------------------------------*/
-/* TRB macros */
+/* USB_ITPN - bitmasks */
+/*
+ * ITP(SS) / SOF (HS/FS) number
+ * In SS mode this field represent number of last ITP received from host.
+ * In HS/FS mode this field represent number of last SOF received from host.
+ */
+#define USB_ITPN_MASK		GENMASK(13, 0)
+#define USB_ITPN(p)		((p) & USB_ITPN_MASK)
 
-/* Common TRB fields */
-#define TRB_SET_CYCLE_BIT		1uL
-#define TRB_SET_CHAIN_BIT		0x10
+/* USB_LPM - bitmasks */
+/* Host Initiated Resume Duration. */
+#define USB_LPM_HIRD_MASK	GENMASK(3, 0)
+#define USB_LPM_HIRD(p)		((p) & USB_LPM_HIRD_MASK)
+/* Remote Wakeup Enable (bRemoteWake). */
+#define USB_LPM_BRW		BIT(4)
 
-/* offset 0 */
-#define TRB_DATA_BUFFER_POINTER_MASK	0xFFFFFFFF
-#define TRB_SET_DATA_BUFFER_POINTER(p)	(p & TRB_DATA_BUFFER_POINTER_MASK)
+/* USB_IEN - bitmasks */
+/* SS connection interrupt enable */
+#define USB_IEN_CONIEN		BIT(0)
+/* SS disconnection interrupt enable. */
+#define USB_IEN_DISIEN		BIT(1)
+/* USB SS warm reset interrupt enable. */
+#define USB_IEN_UWRESIEN	BIT(2)
+/* USB SS hot reset interrupt enable */
+#define USB_IEN_UHRESIEN	BIT(3)
+/* SS link U3 state enter interrupt enable (suspend).*/
+#define USB_IEN_U3ENTIEN	BIT(4)
+/* SS link U3 state exit interrupt enable (wakeup). */
+#define USB_IEN_U3EXTIEN	BIT(5)
+/* SS link U2 state enter interrupt enable.*/
+#define USB_IEN_U2ENTIEN	BIT(6)
+/* SS link U2 state exit interrupt enable.*/
+#define USB_IEN_U2EXTIEN	BIT(7)
+/* SS link U1 state enter interrupt enable.*/
+#define USB_IEN_U1ENTIEN	BIT(8)
+/* SS link U1 state exit interrupt enable.*/
+#define USB_IEN_U1EXTIEN	BIT(9)
+/* ITP/SOF packet detected interrupt enable.*/
+#define USB_IEN_ITPIEN		BIT(10)
+/* Wakeup interrupt enable.*/
+#define USB_IEN_WAKEIEN		BIT(11)
+/* Send Custom Packet interrupt enable.*/
+#define USB_IEN_SPKTIEN		BIT(12)
+/* HS/FS mode connection interrupt enable.*/
+#define USB_IEN_CON2IEN		BIT(16)
+/* HS/FS mode disconnection interrupt enable.*/
+#define USB_IEN_DIS2IEN		BIT(17)
+/* USB reset (HS/FS mode) interrupt enable.*/
+#define USB_IEN_U2RESIEN	BIT(18)
+/* LPM L2 state enter interrupt enable.*/
+#define USB_IEN_L2ENTIEN	BIT(20)
+/* LPM  L2 state exit interrupt enable.*/
+#define USB_IEN_L2EXTIEN	BIT(21)
+/* LPM L1 state enter interrupt enable.*/
+#define USB_IEN_L1ENTIEN	BIT(24)
+/* LPM  L1 state exit interrupt enable.*/
+#define USB_IEN_L1EXTIEN	BIT(25)
+/* Configuration reset interrupt enable.*/
+#define USB_IEN_CFGRESIEN	BIT(26)
+/* Start of the USB SS warm reset interrupt enable.*/
+#define USB_IEN_UWRESSIEN	BIT(28)
+/* End of the USB SS warm reset interrupt enable.*/
+#define USB_IEN_UWRESEIEN	BIT(29)
 
-/* offset 4 */
-#define TRB_TRANSFER_LENGTH_MASK	0x1FFFF
-#define TRB_SET_TRANSFER_LENGTH(l)	(l & TRB_TRANSFER_LENGTH_MASK)
+#define USB_IEN_INIT  (USB_IEN_U2RESIEN | USB_ISTS_DIS2I | USB_IEN_CON2IEN \
+		       | USB_IEN_UHRESIEN | USB_IEN_UWRESIEN | USB_IEN_DISIEN \
+		       | USB_IEN_CONIEN | USB_IEN_U3EXTIEN | USB_IEN_L2ENTIEN \
+		       | USB_IEN_L2EXTIEN)
 
-#define TRB_BURST_LENGTH_MASK		0xFF
-#define TRB_SET_BURST_LENGTH(l)		((l & TRB_BURST_LENGTH_MASK) << 24)
+/* USB_ISTS - bitmasks */
+/* SS Connection detected. */
+#define USB_ISTS_CONI		BIT(0)
+/* SS Disconnection detected. */
+#define USB_ISTS_DISI		BIT(1)
+/* UUSB warm reset detectede. */
+#define USB_ISTS_UWRESI		BIT(2)
+/* USB hot reset detected. */
+#define USB_ISTS_UHRESI		BIT(3)
+/* U3 link state enter detected (suspend).*/
+#define USB_ISTS_U3ENTI		BIT(4)
+/* U3 link state exit detected (wakeup). */
+#define USB_ISTS_U3EXTI		BIT(5)
+/* U2 link state enter detected.*/
+#define USB_ISTS_U2ENTI		BIT(6)
+/* U2 link state exit detected.*/
+#define USB_ISTS_U2EXTI		BIT(7)
+/* U1 link state enter detected.*/
+#define USB_ISTS_U1ENTI		BIT(8)
+/* U1 link state exit detected.*/
+#define USB_ISTS_U1EXTI		BIT(9)
+/* ITP/SOF packet detected.*/
+#define USB_ISTS_ITPI		BIT(10)
+/* Wakeup detected.*/
+#define USB_ISTS_WAKEI		BIT(11)
+/* Send Custom Packet detected.*/
+#define USB_ISTS_SPKTI		BIT(12)
+/* HS/FS mode connection detected.*/
+#define USB_ISTS_CON2I		BIT(16)
+/* HS/FS mode disconnection detected.*/
+#define USB_ISTS_DIS2I		BIT(17)
+/* USB reset (HS/FS mode) detected.*/
+#define USB_ISTS_U2RESI		BIT(18)
+/* LPM L2 state enter detected.*/
+#define USB_ISTS_L2ENTI		BIT(20)
+/* LPM  L2 state exit detected.*/
+#define USB_ISTS_L2EXTI		BIT(21)
+/* LPM L1 state enter detected.*/
+#define USB_ISTS_L1ENTI		BIT(24)
+/* LPM L1 state exit detected.*/
+#define USB_ISTS_L1EXTI		BIT(25)
+/* USB configuration reset detected.*/
+#define USB_ISTS_CFGRESI	BIT(26)
+/* Start of the USB warm reset detected.*/
+#define USB_ISTS_UWRESSI	BIT(28)
+/* End of the USB warm reset detected.*/
+#define USB_ISTS_UWRESEI	BIT(29)
 
-/* offset 8 */
-#define TRB_SET_INT_ON_SHORT_PACKET	0x04
-#define TRB_SET_FIFO_MODE		0x08
-#define TRB_SET_INT_ON_COMPLETION	0x20
+/* USB_SEL - bitmasks */
+#define EP_SEL_EPNO_MASK	GENMASK(3, 0)
+/* Endpoint number. */
+#define EP_SEL_EPNO(p)		((p) & EP_SEL_EPNO_MASK)
+/* Endpoint direction bit - 0 - OUT, 1 - IN. */
+#define EP_SEL_DIR		BIT(7)
 
-#define TRB_TYPE_NORMAL			0x400
+#define select_ep_in(nr)	(EP_SEL_EPNO(p) | EP_SEL_DIR)
+#define select_ep_out		(EP_SEL_EPNO(p))
 
-#define TRB_STREAM_ID_MASK		0xFFFF
-#define TRB_SET_STREAM_ID(sid)		((sid & TRB_STREAM_ID_MASK) << 16)
+/* EP_TRADDR - bitmasks */
+/* Transfer Ring address. */
+#define EP_TRADDR_TRADDR(p)	((p))
 
-/*-------------------------------------------------------------------------*/
-/* Driver numeric constants */
+/* EP_CFG - bitmasks */
+/* Endpoint enable */
+#define EP_CFG_ENABLE		BIT(0)
+/*
+ *  Endpoint type.
+ * 1 - isochronous
+ * 2 - bulk
+ * 3 - interrupt
+ */
+#define EP_CFG_EPTYPE_MASK	GENMASK(2, 1)
+#define EP_CFG_EPTYPE(p)	(((p) << 1)  & EP_CFG_EPTYPE_MASK)
+/* Stream support enable (only in SS mode). */
+#define EP_CFG_STREAM_EN	BIT(3)
+/* TDL check (only in SS mode for BULK EP). */
+#define EP_CFG_TDL_CHK		BIT(4)
+/* SID check (only in SS mode for BULK OUT EP). */
+#define EP_CFG_SID_CHK		BIT(5)
+/* DMA transfer endianness. */
+#define EP_CFG_EPENDIAN		BIT(7)
+/* Max burst size (used only in SS mode). */
+#define EP_CFG_MAXBURST_MASK	GENMASK(11, 8)
+#define EP_CFG_MAXBURST(p)	(((p) << 8) & EP_CFG_MAXBURST_MASK)
+/* ISO max burst. */
+#define EP_CFG_MULT_MASK	GENMASK(15, 14)
+#define EP_CFG_MULT(p)		(((p) << 14) & EP_CFG_MULT_MASK)
+/* ISO max burst. */
+#define EP_CFG_MAXPKTSIZE_MASK	GENMASK(26, 16)
+#define EP_CFG_MAXPKTSIZE(p)	(((p) << 16) & EP_CFG_MAXPKTSIZE_MASK)
+/* Max number of buffered packets. */
+#define EP_CFG_BUFFERING_MASK	GENMASK(31, 27)
+#define EP_CFG_BUFFERING(p)	(((p) << 27) & EP_CFG_BUFFERING_MASK)
 
+/* EP_CMD - bitmasks */
+/* Endpoint reset. */
+#define EP_CMD_EPRST		BIT(0)
+/* Endpoint STALL set. */
+#define EP_CMD_SSTALL		BIT(1)
+/* Endpoint STALL clear. */
+#define EP_CMD_CSTALL		BIT(2)
+/* Send ERDY TP. */
+#define EP_CMD_ERDY		BIT(3)
+/* Request complete. */
+#define EP_CMD_REQ_CMPL		BIT(5)
+/* Transfer descriptor ready. */
+#define EP_CMD_DRDY		BIT(6)
+/* Data flush. */
+#define EP_CMD_DFLUSH		BIT(7)
+/*
+ * Transfer Descriptor Length write  (used only for Bulk Stream capable
+ * endpoints in SS mode).
+ */
+#define EP_CMD_STDL		BIT(8)
+/* Transfer Descriptor Length (used only in SS mode for bulk endpoints). */
+#define EP_CMD_TDL_MASK		GENMASK(15, 9)
+#define EP_CMD_TDL(p)		(((p) << 9) & EP_CMD_TDL_MASK)
+/* ERDY Stream ID value (used in SS mode). */
+#define EP_CMD_ERDY_SID_MASK	GENMASK(31, 16)
+#define EP_CMD_ERDY_SID(p)	(((p) << 16) & EP_CMD_SID_MASK)
 
-#define DEVICE_ADDRESS_MAX		127
+/* EP_STS - bitmasks */
+/* Setup transfer complete. */
+#define EP_STS_SETUP		BIT(0)
+/* Endpoint STALL status. */
+#define EP_STS_STALL(p)		((p) & BIT(1))
+/* Interrupt On Complete. */
+#define EP_STS_IOC		BIT(2)
+/* Interrupt on Short Packet. */
+#define EP_STS_ISP		BIT(3)
+/* Transfer descriptor missing. */
+#define EP_STS_DESCMIS		BIT(4)
+/* Stream Rejected (used only in SS mode) */
+#define EP_STS_STREAMR		BIT(5)
+/* EXIT from MOVE DATA State (used only for stream transfers in SS mode). */
+#define EP_STS_MD_EXIT		BIT(6)
+/* TRB error. */
+#define EP_STS_TRBERR		BIT(7)
+/* Not ready (used only in SS mode). */
+#define EP_STS_NRDY		BIT(8)
+/* DMA busy. */
+#define EP_STS_DBUSY(p)		((p) & BIT(9))
+/* Endpoint Buffer Empty */
+#define EP_STS_BUFFEMPTY(p)	((p) & BIT(10))
+/* Current Cycle Status */
+#define EP_STS_CCS(p)		((p) & BIT(11))
+/* Prime (used only in SS mode. */
+#define EP_STS_PRIME		BIT(12)
+/* Stream error (used only in SS mode). */
+#define EP_STS_SIDERR		BIT(13)
+/* OUT size mismatch. */
+#define EP_STS_OUTSMM		BIT(14)
+/* ISO transmission error. */
+#define EP_STS_ISOERR		BIT(15)
+/* Host Packet Pending (only for SS mode). */
+#define EP_STS_HOSTPP(p)	((p) & BIT(16))
+/* Stream Protocol State Machine State (only for Bulk stream endpoints). */
+#define EP_STS_SPSMST_MASK		GENMASK(18, 17)
+#define EP_STS_SPSMST_DISABLED(p)	(((p) & EP_STS_SPSMST_MASK) >> 17)
+#define EP_STS_SPSMST_IDLE(p)		(((p) & EP_STS_SPSMST_MASK) >> 17)
+#define EP_STS_SPSMST_START_STREAM(p)	(((p) & EP_STS_SPSMST_MASK) >> 17)
+#define EP_STS_SPSMST_MOVE_DATA(p)	(((p) & EP_STS_SPSMST_MASK) >> 17)
+/* Interrupt On Transfer complete. */
+#define EP_STS_IOT		BIT(19)
+/* OUT queue endpoint number. */
+#define EP_STS_OUTQ_NO_MASK	GENMASK(27, 24)
+#define EP_STS_OUTQ_NO(p)	(((p) & EP_STS_OUTQ_NO_MASK) >> 24)
+/* OUT queue valid flag. */
+#define EP_STS_OUTQ_VAL_MASK	BIT(28)
+#define EP_STS_OUTQ_VAL(p)	((p) & EP_STS_OUTQ_VAL_MASK)
+/* SETUP WAIT. */
+#define EP_STS_STPWAIT		BIT(31)
 
-/* Endpoint init values */
-#define ENDPOINT_MAX_PACKET_LIMIT	1024
-#define ENDPOINT_MAX_STREAMS		15
+/* EP_STS_SID - bitmasks */
+/* Stream ID (used only in SS mode). */
+#define EP_STS_SID_MASK		GENMASK(15, 0)
+#define EP_STS_SID(p)		((p) & EP_STS_SID_MASK)
 
-#define ENDPOINT0_MAX_PACKET_LIMIT	512
+/* EP_STS_EN - bitmasks */
+/* SETUP interrupt enable. */
+#define EP_STS_EN_SETUPEN	BIT(0)
+/* OUT transfer missing descriptor enable. */
+#define EP_STS_EN_DESCMISEN	BIT(4)
+/* Stream Rejected enable. */
+#define EP_STS_EN_STREAMREN	BIT(5)
+/* Move Data Exit enable.*/
+#define EP_STS_EN_MD_EXITEN	BIT(6)
+/* TRB enable. */
+#define EP_STS_EN_TRBERREN	BIT(7)
+/* NRDY enable. */
+#define EP_STS_EN_NRDYEN	BIT(8)
+/* Prime enable. */
+#define EP_STS_EN_PRIMEEEN	BIT(12)
+/* Stream error enable. */
+#define EP_STS_EN_SIDERREN	BIT(13)
+/* OUT size mismatch enable. */
+#define EP_STS_EN_OUTSMMEN	BIT(14)
+/* ISO transmission error enable. */
+#define EP_STS_EN_ISOERREN	BIT(15)
+/* Interrupt on Transmission complete enable. */
+#define EP_STS_EN_IOTEN		BIT(19)
+/* Setup Wait interrupt enable. */
+#define EP_STS_EN_STPWAITEN	BIT(31)
 
-/* All endpoints except EP0 */
-#define USB_SS_ENDPOINTS_MAX_COUNT	30
+/* DRBL- bitmasks */
+#define DB_VALUE_BY_INDEX(index) (1 << (index))
+#define DB_VALUE_EP0_OUT	BIT(0)
+#define DB_VALUE_EP0_IN		BIT(16)
 
-#define USB_SS_TRBS_NUM			32
+/* EP_IEN - bitmasks */
+#define EP_IEN(index)		(1 << (index))
+#define EP_IEN_EP_OUT0		BIT(0)
+#define EP_IEN_EP_IN0		BIT(16)
 
-/* Standby mode */
-#define STB_CLK_SWITCH_DONE_MASK	0x200
-#define STB_CLK_SWITCH_EN_MASK		0x100
-#define STB_CLK_SWITCH_EN_SHIFT		8
+/* EP_ISTS - bitmasks */
+#define EP_ISTS(index)		(1 << (index))
+#define EP_ISTS_EP_OUT0		BIT(0)
+#define EP_ISTS_EP_IN0		BIT(16)
+
+/* EP_PWR- bitmasks */
+/*Power Shut Off capability enable*/
+#define PUSB_PWR_PSO_EN		BIT(0)
+/*Power Shut Off capability disable*/
+#define PUSB_PWR_PSO_DS		BIT(1)
+/*
+ * Enables turning-off Reference Clock.
+ * This bit is optional and implemented only when support for OTG is
+ * implemented (indicated by OTG_READY bit set to '1').
+ */
+#define PUSB_PWR_STB_CLK_SWITCH_EN	BIT(8)
+/*
+ * Status bit indicating that operation required by STB_CLK_SWITCH_EN write
+ * is completed
+ */
+#define PUSB_PWR_STB_CLK_SWITCH_DONE	BIT(9)
+/* This bit informs if Fast Registers Access is enabled. */
+#define PUSB_PWR_FST_REG_ACCESS_STAT	BIT(30)
+/* Fast Registers Access Enable. */
+#define PUSB_PWR_FST_REG_ACCESS	BIT(31)
+
+/* USB_CAP1- bitmasks */
+/*
+ * SFR Interface type
+ * These field reflects type of SFR interface implemented:
+ * 0x0 - OCP
+ * 0x1 - AHB,
+ * 0x2 - PLB
+ * 0x3 - AXI
+ * 0x4-0xF - reserved
+ */
+#define USB_CAP1_SFR_TYPE_MASK	GENMASK(3, 0)
+#define DEV_SFR_TYPE_OCP(p)	(((p) & USB_CAP1_SFR_TYPE_MASK) == 0x0)
+#define DEV_SFR_TYPE_AHB(p)	(((p) & USB_CAP1_SFR_TYPE_MASK) == 0x1)
+#define DEV_SFR_TYPE_PLB(p)	(((p) & USB_CAP1_SFR_TYPE_MASK) == 0x2)
+#define DEV_SFR_TYPE_AXI(p)	(((p) & USB_CAP1_SFR_TYPE_MASK) == 0x3)
+/*
+ * SFR Interface width
+ * These field reflects width of SFR interface implemented:
+ * 0x0 - 8 bit interface,
+ * 0x1 - 16 bit interface,
+ * 0x2 - 32 bit interface
+ * 0x3 - 64 bit interface
+ * 0x4-0xF - reserved
+ */
+#define USB_CAP1_SFR_WIDTH_MASK	GENMASK(7, 4)
+#define DEV_SFR_WIDTH_8(p)	(((p) & USB_CAP1_SFR_WIDTH_MASK) == (0x0 << 4))
+#define DEV_SFR_WIDTH_16(p)	(((p) & USB_CAP1_SFR_WIDTH_MASK) == (0x1 << 4))
+#define DEV_SFR_WIDTH_32(p)	(((p) & USB_CAP1_SFR_WIDTH_MASK) == (0x2 << 4))
+#define DEV_SFR_WIDTH_64(p)	(((p) & USB_CAP1_SFR_WIDTH_MASK) == (0x3 << 4))
+/*
+ * DMA Interface type
+ * These field reflects type of DMA interface implemented:
+ * 0x0 - OCP
+ * 0x1 - AHB,
+ * 0x2 - PLB
+ * 0x3 - AXI
+ * 0x4-0xF - reserved
+ */
+#define USB_CAP1_DMA_TYPE_MASK	GENMASK(11, 8)
+#define DEV_DMA_TYPE_OCP(p)	(((p) & USB_CAP1_DMA_TYPE_MASK) == (0x0 << 8))
+#define DEV_DMA_TYPE_AHB(p)	(((p) & USB_CAP1_DMA_TYPE_MASK) == (0x1 << 8))
+#define DEV_DMA_TYPE_PLB(p)	(((p) & USB_CAP1_DMA_TYPE_MASK) == (0x2 << 8))
+#define DEV_DMA_TYPE_AXI(p)	(((p) & USB_CAP1_DMA_TYPE_MASK) == (0x3 << 8))
+/*
+ * DMA Interface width
+ * These field reflects width of DMA interface implemented:
+ * 0x0 - reserved,
+ * 0x1 - reserved,
+ * 0x2 - 32 bit interface
+ * 0x3 - 64 bit interface
+ * 0x4-0xF - reserved
+ */
+#define USB_CAP1_DMA_WIDTH_MASK	GENMASK(15, 12)
+#define DEV_DMA_WIDTH_32(p)	(((p) & USB_CAP1_DMA_WIDTH_MASK) == (0x2 << 12))
+#define DEV_DMA_WIDTH_64(p)	(((p) & USB_CAP1_DMA_WIDTH_MASK) == (0x3 << 12))
+/*
+ * USB3 PHY Interface type
+ * These field reflects type of USB3 PHY interface implemented:
+ * 0x0 - USB PIPE,
+ * 0x1 - RMMI,
+ * 0x2-0xF - reserved
+ */
+#define USB_CAP1_U3PHY_TYPE_MASK GENMASK(19, 16)
+#define DEV_U3PHY_PIPE(p) (((p) & USB_CAP1_U3PHY_TYPE_MASK) == (0x0 << 16))
+#define DEV_U3PHY_RMMI(p) (((p) & USB_CAP1_U3PHY_TYPE_MASK) == (0x1 << 16))
+/*
+ * USB3 PHY Interface width
+ * These field reflects width of USB3 PHY interface implemented:
+ * 0x0 - 8 bit PIPE interface,
+ * 0x1 - 16 bit PIPE interface,
+ * 0x2 - 32 bit PIPE interface,
+ * 0x3 - 64 bit PIPE interface
+ * 0x4-0xF - reserved
+ * Note: When SSIC interface is implemented this field shows the width of
+ * internal PIPE interface. The RMMI interface is always 20bit wide.
+ */
+#define USB_CAP1_U3PHY_WIDTH_MASK GENMASK(23, 20)
+#define DEV_U3PHY_WIDTH_8(p) \
+	(((p) & USB_CAP1_U3PHY_WIDTH_MASK) == (0x0 << 20))
+#define DEV_U3PHY_WIDTH_16(p) \
+	(((p) & USB_CAP1_U3PHY_WIDTH_MASK) == (0x1 << 16))
+#define DEV_U3PHY_WIDTH_32(p) \
+	(((p) & USB_CAP1_U3PHY_WIDTH_MASK) == (0x2 << 20))
+#define DEV_U3PHY_WIDTH_64(p) \
+	(((p) & USB_CAP1_U3PHY_WIDTH_MASK) == (0x3 << 16))
 
-#define ENDPOINT_MAX_PACKET_SIZE_0	0
-#define ENDPOINT_MAX_PACKET_SIZE_8	8
-#define ENDPOINT_MAX_PACKET_SIZE_64	64
-#define ENDPOINT_MAX_PACKET_SIZE_512	512
-#define ENDPOINT_MAX_PACKET_SIZE_1023	1023
-#define ENDPOINT_MAX_PACKET_SIZE_1024	1024
+/*
+ * USB2 PHY Interface enable
+ * These field informs if USB2 PHY interface is implemented:
+ * 0x0 - interface NOT implemented,
+ * 0x1 - interface implemented
+ */
+#define USB_CAP1_U2PHY_EN(p)	((p) & BIT(24))
+/*
+ * USB2 PHY Interface type
+ * These field reflects type of USB2 PHY interface implemented:
+ * 0x0 - UTMI,
+ * 0x1 - ULPI
+ */
+#define DEV_U2PHY_ULPI(p)	((p) & BIT(25))
+/*
+ * USB2 PHY Interface width
+ * These field reflects width of USB2 PHY interface implemented:
+ * 0x0 - 8 bit interface,
+ * 0x1 - 16 bit interface,
+ * Note: The ULPI interface is always 8bit wide.
+ */
+#define DEV_U2PHY_WIDTH_16(p)	((p) & BIT(26))
+/*
+ * OTG Ready
+ * 0x0 - pure device mode
+ * 0x1 - some features and ports for CDNS USB OTG controller are implemented.
+ */
+#define USB_CAP1_OTG_READY(p)	((p) & BIT(27))
 
-#define SS_LINK_STATE_U3		3
-#define FSHS_LPM_STATE_L2		2
+/* USB_CAP2- bitmasks */
+/*
+ * The actual size of the connected On-chip RAM memory in kB:
+ * - 0 means 256 kB (max supported mem size)
+ * - value other than 0 reflects the mem size in kB
+ */
+#define USB_CAP2_ACTUAL_MEM_SIZE(p) ((p) & GENMASK(7, 0))
+/*
+ * Max supported mem size
+ * These field reflects width of on-chip RAM address bus width,
+ * which determines max supported mem size:
+ * 0x0-0x7 - reserved,
+ * 0x8 - support for 4kB mem,
+ * 0x9 - support for 8kB mem,
+ * 0xA - support for 16kB mem,
+ * 0xB - support for 32kB mem,
+ * 0xC - support for 64kB mem,
+ * 0xD - support for 128kB mem,
+ * 0xE - support for 256kB mem,
+ * 0xF - reserved
+ */
+#define USB_CAP2_MAX_MEM_SIZE(p) ((p) & GENMASK(11, 8))
 
-#define ADDR_MODULO_8			8
+/* USB_CAP3- bitmasks */
+#define EP_IS_IMPLEMENTED(reg, index) ((reg) & (1 << (index)))
 
-#define INTERRUPT_MASK			0xFFFFFFFF
+/* USB_CAP4- bitmasks */
+#define EP_SUPPORT_ISO(reg, index) ((reg) & (1 << (index)))
 
-#define ACTUAL_TRANSFERRED_BYTES_MASK	0x1FFFF
+/* USB_CAP5- bitmasks */
+#define EP_SUPPORT_STREAM(reg, index) ((reg) & (1 << (index)))
 
-#define ENDPOINT_DIR_MASK		0x80
+/* USB_CAP6- bitmasks */
+/* The USBSS-DEV Controller  Internal build number. */
+#define GET_DEV_BASE_VERSION(p) ((p) & GENMASK(23, 0))
+/* The USBSS-DEV Controller  version number. */
+#define GET_DEV_CUSTOM_VERSION(p) ((p) & GENMASK(31, 24))
 
-#define ENDPOINT_ZLP_BUF_SIZE		1024
-/*-------------------------------------------------------------------------*/
+#define DEV_VER_NXP_V1		0x00024502
+#define DEV_VER_TI_V1		0x00024509
+#define DEV_VER_LATEST		0x0002450B
 
-/**
- * IS_REG_REQUIRING_ACTIVE_REF_CLOCK - Macro checks if desired
- * register requires active clock, it involves such registers as:
- * EP_CFG, EP_TR_ADDR, EP_CMD, EP_SEL, USB_CONF
- * @usb_ss: extended gadget object
- * @reg: register address
+/* DBG_LINK1- bitmasks */
+/*
+ * LFPS_MIN_DET_U1_EXIT value This parameter configures the minimum
+ * time required for decoding the received LFPS as an LFPS.U1_Exit.
+ */
+#define DBG_LINK1_LFPS_MIN_DET_U1_EXIT(p)	((p) & GENMASK(7, 0))
+/*
+ * LFPS_MIN_GEN_U1_EXIT value This parameter configures the minimum time for
+ * phytxelecidle deassertion when LFPS.U1_Exit
+ */
+#define DBG_LINK1_LFPS_MIN_GEN_U1_EXIT_MASK	GENMASK(15, 8)
+#define DBG_LINK1_LFPS_MIN_GEN_U1_EXIT(p)	(((p) << 8) & GENMASK(15, 8))
+/*
+ * RXDET_BREAK_DIS value This parameter configures terminating the Far-end
+ * Receiver termination detection sequence:
+ * 0: it is possible that USBSS_DEV will terminate Farend receiver
+ *    termination detection sequence
+ * 1: USBSS_DEV will not terminate Far-end receiver termination
+ *    detection sequence
+ */
+#define DBG_LINK1_RXDET_BREAK_DIS		BIT(16)
+/* LFPS_GEN_PING value This parameter configures the LFPS.Ping generation */
+#define DBG_LINK1_LFPS_GEN_PING(p)		(((p) << 17) & GENMASK(21, 17))
+/*
+ * Set the LFPS_MIN_DET_U1_EXIT value Writing '1' to this bit writes the
+ * LFPS_MIN_DET_U1_EXIT field value to the device. This bit is automatically
+ * cleared. Writing '0' has no effect
+ */
+#define DBG_LINK1_LFPS_MIN_DET_U1_EXIT_SET	BIT(24)
+/*
+ * Set the LFPS_MIN_GEN_U1_EXIT value. Writing '1' to this bit writes the
+ * LFPS_MIN_GEN_U1_EXIT field value to the device. This bit is automatically
+ * cleared. Writing '0' has no effect
  */
-#define IS_REG_REQUIRING_ACTIVE_REF_CLOCK(usb_ss, reg)	(!reg || \
-	(reg >= &usb_ss->regs->ep_sel && reg <= &usb_ss->regs->ep_cmd))
+#define DBG_LINK1_LFPS_MIN_GEN_U1_EXIT_SET	BIT(25)
+/*
+ * Set the RXDET_BREAK_DIS value Writing '1' to this bit writes
+ * the RXDET_BREAK_DIS field value to the device. This bit is automatically
+ * cleared. Writing '0' has no effect
+ */
+#define DBG_LINK1_RXDET_BREAK_DIS_SET		BIT(26)
+/*
+ * Set the LFPS_GEN_PING_SET value Writing '1' to this bit writes
+ * the LFPS_GEN_PING field value to the device. This bit is automatically
+ * cleared. Writing '0' has no effect."
+ */
+#define DBG_LINK1_LFPS_GEN_PING_SET		BIT(27)
 
-/**
- * CAST_EP_REG_POS_TO_INDEX - Macro converts bit position of ep_ists register to
- * index of endpoint object in usb_ss_dev.eps[] container
- * @i: bit position of endpoint for which endpoint object is required
- *
- * Remember that endpoint container doesn't contain default endpoint
+#define gadget_to_cdns3_device(g) (container_of(g, struct cdns3_device, gadget))
+
+#define ep_to_cdns3_ep(ep) (container_of(ep, struct cdns3_endpoint, endpoint))
+
+/*-------------------------------------------------------------------------*/
+/*
+ * USBSS-DEV DMA interface.
  */
-#define CAST_EP_REG_POS_TO_INDEX(i) (((i) / 16) + ((((i) % 16) - 2) * 2))
+#define TRBS_PER_SEGMENT	40
 
-/**
- * CAST_EP_ADDR_TO_INDEX - Macro converts endpoint address to
- * index of endpoint object in usb_ss_dev.eps[] container
- * @ep_addr: endpoint address for which endpoint object is required
- *
- * Remember that endpoint container doesn't contain default endpoint
+#define ISO_MAX_INTERVAL	10
+
+/*
+ *Only for ISOC endpoints - maximum number of TRBs is calculated as
+ * pow(2, bInterval-1) * number of usb requests. It is limitation made by
+ * driver to save memory. Controller must prepare TRB for each ITP even
+ * if bInterval > 1. It's the reason why driver needs so many TRBs for
+ * isochronous endpoints.
  */
-#define CAST_EP_ADDR_TO_INDEX(ep_addr) \
-	(((ep_addr & 0x7F) - 1) + ((ep_addr & 0x80) ? 1 : 0))
+#define TRBS_PER_ISOC_SEGMENT	(ISO_MAX_INTERVAL * 8)
 
+#define GET_TRBS_PER_SEGMENT(ep_type) ((ep_type) == USB_ENDPOINT_XFER_ISOC ? \
+				      TRBS_PER_ISOC_SEGMENT : TRBS_PER_SEGMENT)
 /**
- * CAST_EP_ADDR_TO_BIT_POS - Macro converts endpoint address to
- * bit position in ep_ists register
- * @ep_addr: endpoint address for which bit position is required
+ * struct cdns3_trb - represent Transfer Descriptor block.
+ * @buffer:	pointer to buffer data
+ * @length:	length of data
+ * @control:	control flags.
  *
- * Remember that endpoint container doesn't contain default endpoint
+ * This structure describes transfer block serviced by DMA module.
+ */
+struct cdns3_trb {
+	__le32 buffer;
+	__le32 length;
+	__le32 control;
+};
+
+#define TRB_SIZE		(sizeof(struct cdns3_trb))
+#define TRB_RING_SIZE		(TRB_SIZE * TRBS_PER_SEGMENT)
+#define TRB_ISO_RING_SIZE	(TRB_SIZE * TRBS_PER_ISOC_SEGMENT)
+#define TRB_CTRL_RING_SIZE	(TRB_SIZE * 2)
+
+/* TRB bit mask */
+#define TRB_TYPE_BITMASK	GENMASK(15, 10)
+#define TRB_TYPE(p)		((p) << 10)
+#define TRB_FIELD_TO_TYPE(p)	(((p) & TRB_TYPE_BITMASK) >> 10)
+
+/* TRB type IDs */
+/* bulk, interrupt, isoc , and control data stage */
+#define TRB_NORMAL		1
+/* TRB for linking ring segments */
+#define TRB_LINK		6
+
+/* Cycle bit - indicates TRB ownership by driver or hw*/
+#define TRB_CYCLE		BIT(0)
+/*
+ * When set to '1', the device will toggle its interpretation of the Cycle bit
  */
-#define CAST_EP_ADDR_TO_BIT_POS(ep_addr) \
-	(((uint32_t)1 << (ep_addr & 0x7F))  << ((ep_addr & 0x80) ? 16 : 0))
+#define TRB_TOGGLE		BIT(1)
+
+/* Interrupt on short packet*/
+#define TRB_ISP			BIT(2)
+/*Setting this bit enables FIFO DMA operation mode*/
+#define TRB_FIFO_MODE		BIT(3)
+/* Set PCIe no snoop attribute */
+#define TRB_CHAIN		BIT(4)
+/* Interrupt on completion */
+#define TRB_IOC			BIT(5)
+
+/* stream ID bitmasks. */
+#define TRB_STREAM_ID(p)	((p) & GENMASK(31, 16))
+
+/* transfer_len bitmasks. */
+#define TRB_LEN(p)		((p) & GENMASK(16, 0))
 
+/* transfer_len bitmasks - bits 31:24 */
+#define TRB_BURST_LEN(p)	(((p) << 24) & GENMASK(31, 24))
+#define TRB_BURST_LEN_GET(p)	(((p) & GENMASK(31, 24)) >> 24)
 
-#define CAST_INDEX_TO_EP_ADDR(index) \
-	((index / 2 + 1) | ((index % 2) ? 0x80 : 0x00))
+/* Data buffer pointer bitmasks*/
+#define TRB_BUFFER(p)		((p) & GENMASK(31, 0))
 
-/* 18KB is the total size, and 2KB is used for EP0 and configuration */
-#define CDNS3_ONCHIP_BUF_SIZE	16	/* KB */
-#define CDNS3_EP_BUF_SIZE	2	/* KB */
-#define CDNS3_UNALIGNED_BUF_SIZE	16384 /* Bytes */
+/*-------------------------------------------------------------------------*/
+/* Driver numeric constants */
+
+/* Such declaration should be added to ch9.h */
+#define USB_DEVICE_MAX_ADDRESS		127
+
+/* Endpoint init values */
+#define CDNS3_EP_MAX_PACKET_LIMIT	1024
+#define CDNS3_EP_MAX_STREAMS		15
+#define CDNS3_EP0_MAX_PACKET_LIMIT	512
+
+/* All endpoints including EP0 */
+#define CDNS3_ENDPOINTS_MAX_COUNT	32
+#define CDNS3_EP_ZLP_BUF_SIZE		1024
+
+#define CDNS3_EP_BUF_SIZE		2	/* KB */
+#define CDNS3_EP_ISO_HS_MULT		3
+#define CDNS3_EP_ISO_SS_BURST		3
+#define CDNS3_MAX_NUM_DESCMISS_BUF	32
+#define CDNS3_DESCMIS_BUF_SIZE		2048	/* Bytes */
 /*-------------------------------------------------------------------------*/
 /* Used structs */
 
-struct usb_ss_trb {
-	u32 offset0;
-	u32 offset4;
-	u32 offset8;
+struct cdns3_device;
+
+/**
+ * struct cdns3_endpoint - extended device side representation of USB endpoint.
+ * @endpoint: usb endpoint
+ * @pending_req_list: list of requests queuing on transfer ring.
+ * @deferred_req_list: list of requests waiting for queuing on transfer ring.
+ * @descmiss_req_list: list of requests internally allocated by driver (WA2).
+ * @trb_pool: transfer ring - array of transaction buffers
+ * @trb_pool_dma: dma address of transfer ring
+ * @cdns3_dev: device associated with this endpoint
+ * @name: a human readable name e.g. ep1out
+ * @flags: specify the current state of endpoint
+ * @descmis_req: internal transfer object used for getting data from on-chip
+ *     buffer. It can happen only if function driver doesn't send usb_request
+ *     object on time.
+ * @dir: endpoint direction
+ * @num: endpoint number (1 - 15)
+ * @type: set to bmAttributes & USB_ENDPOINT_XFERTYPE_MASK
+ * @interval: interval between packets used for ISOC endpoint.
+ * @free_trbs: number of free TRBs in transfer ring
+ * @num_trbs: number of all TRBs in transfer ring
+ * @pcs: producer cycle state
+ * @ccs: consumer cycle state
+ * @enqueue: enqueue index in transfer ring
+ * @dequeue: dequeue index in transfer ring
+ * @trb_burst_size: number of burst used in trb.
+ */
+struct cdns3_endpoint {
+	struct usb_ep		endpoint;
+	struct list_head	pending_req_list;
+	struct list_head	deferred_req_list;
+	struct list_head	descmiss_req_list;
+
+	struct cdns3_trb	*trb_pool;
+	dma_addr_t		trb_pool_dma;
+
+	struct cdns3_device	*cdns3_dev;
+	char			name[20];
+
+#define EP_ENABLED		BIT(0)
+#define EP_STALL		BIT(1)
+#define EP_WEDGE		BIT(2)
+#define EP_TRANSFER_STARTED	BIT(3)
+#define EP_UPDATE_EP_TRBADDR	BIT(4)
+#define EP_PENDING_REQUEST	BIT(5)
+#define EP_RING_FULL		BIT(6)
+#define EP_CLAIMED		BIT(7)
+#define EP_QUIRK_EXTRA_BUF_DET	BIT(8)
+#define EP_QUIRK_EXTRA_BUF_EN	BIT(9)
+#define EP_QUIRK_END_TRANSFER	BIT(10)
+
+	u32			flags;
+
+	struct cdns3_request	*descmis_req;
+
+	u8			dir;
+	u8			num;
+	u8			type;
+	int			interval;
+
+	int			free_trbs;
+	int			num_trbs;
+	u8			pcs;
+	u8			ccs;
+	int			enqueue;
+	int			dequeue;
+	u8			trb_burst_size;
+
+	unsigned int		wa1_set:1;
+	struct cdns3_trb	*wa1_trb;
+	unsigned int		wa1_trb_index;
+	unsigned int		wa1_cycle_bit:1;
 };
 
-struct usb_ss_dev;
-
-struct usb_ss_endpoint {
-	struct usb_ep endpoint;
-	struct list_head request_list;
-	struct list_head ep_match_pending_list;
-
-	struct usb_ss_trb *trb_pool;
-	dma_addr_t trb_pool_dma;
-
-	struct usb_ss_dev *usb_ss;
-	char name[20];
-	int hw_pending_flag;
-	int stalled_flag;
-	int wedge_flag;
-	void *cpu_addr;
-	dma_addr_t dma_addr;
-	u8					dir;
-	u8					num;
-	u8					type;
-	bool					used;
+/**
+ * struct cdns3_aligned_buf - represent aligned buffer used for DMA transfer
+ * @buf: aligned to 8 bytes data buffer. Buffer address used in
+ *       TRB shall be aligned to 8.
+ * @dma: dma address
+ * @size: size of buffer
+ * @in_use: inform if this buffer is associated with usb_request
+ * @list: used to adding instance of this object to list
+ */
+struct cdns3_aligned_buf {
+	void			*buf;
+	dma_addr_t		dma;
+	u32			size;
+	int			in_use:1;
+	struct list_head	list;
 };
 
-struct usb_ss_dev {
-	struct device dev;
-	struct usbss_dev_register_block_type __iomem *regs;
-
-	struct usb_gadget gadget;
-	struct usb_gadget_driver *gadget_driver;
-
-	dma_addr_t setup_dma;
-	dma_addr_t trb_ep0_dma;
-	u32 *trb_ep0;
-	u8 *setup;
-	void *zlp_buf;
-
-	struct usb_ss_endpoint *eps[USB_SS_ENDPOINTS_MAX_COUNT];
-	int ep_nums;
-	struct usb_request *actual_ep0_request;
-	int ep0_data_dir;
-	int hw_configured_flag;
-	int wake_up_flag;
-	u16 isoch_delay;
-	spinlock_t lock;
-
-	unsigned is_connected:1;
-	unsigned in_standby_mode:1;
-	unsigned status_completion_no_call:1;
-
-	u32 usb_ien;
-	u32 ep_ien;
-	int setup_pending;
-	struct device *sysdev;
-	bool start_gadget; /* The device mode is enabled */
-	struct list_head ep_match_list;
-	int onchip_mem_allocated_size; /* KB */
-	/* Memory is allocated for OUT */
-	int out_mem_is_allocated:1;
-	struct work_struct pending_status_wq;
-	struct usb_request *pending_status_request;
+/**
+ * struct cdns3_request - extended device side representation of usb_request
+ *                        object .
+ * @request: generic usb_request object describing single I/O request.
+ * @priv_ep: extended representation of usb_ep object
+ * @trb: the first TRB association with this request
+ * @start_trb: number of the first TRB in transfer ring
+ * @end_trb: number of the last TRB in transfer ring
+ * @aligned_buf: object holds information about aligned buffer associated whit
+ *               this endpoint
+ * @flags: flag specifying special usage of request
+ * @list: used by internally allocated request to add to descmiss_req_list.
+ */
+struct cdns3_request {
+	struct usb_request		request;
+	struct cdns3_endpoint		*priv_ep;
+	struct cdns3_trb		*trb;
+	int				start_trb;
+	int				end_trb;
+	struct cdns3_aligned_buf	*aligned_buf;
+#define REQUEST_PENDING			BIT(0)
+#define REQUEST_INTERNAL		BIT(1)
+#define REQUEST_INTERNAL_CH		BIT(2)
+#define REQUEST_ZLP			BIT(3)
+#define REQUEST_UNALIGNED		BIT(4)
+	u32				flags;
+	struct list_head		list;
+};
+
+#define to_cdns3_request(r) (container_of(r, struct cdns3_request, request))
+
+/*Stages used during enumeration process.*/
+#define CDNS3_SETUP_STAGE		0x0
+#define CDNS3_DATA_STAGE		0x1
+#define CDNS3_STATUS_STAGE		0x2
+
+/**
+ * struct cdns3_device - represent USB device.
+ * @dev: pointer to device structure associated whit this controller
+ * @sysdev: pointer to the DMA capable device
+ * @gadget: device side representation of the peripheral controller
+ * @gadget_driver: pointer to the gadget driver
+ * @dev_ver: device controller version.
+ * @lock: for synchronizing
+ * @regs: base address for device side registers
+ * @setup_buf: used while processing usb control requests
+ * @setup_dma: dma address for setup_buf
+ * @zlp_buf - zlp buffer
+ * @ep0_stage: ep0 stage during enumeration process.
+ * @ep0_data_dir: direction for control transfer
+ * @eps: array of pointers to all endpoints with exclusion ep0
+ * @aligned_buf_list: list of aligned buffers internally allocated by driver
+ * @run_garbage_colector: infroms that at least one element of aligned_buf_list
+ *                        can be freed
+ * @selected_ep: actually selected endpoint. It's used only to improve
+ *               performance.
+ * @isoch_delay: value from Set Isoch Delay request. Only valid on SS/SSP.
+ * @u1_allowed: allow device transition to u1 state
+ * @u2_allowed: allow device transition to u2 state
+ * @is_selfpowered: device is self powered
+ * @setup_pending: setup packet is processing by gadget driver
+ * @hw_configured_flag: hardware endpoint configuration was set.
+ * @wake_up_flag: allow device to remote up the host
+ * @status_completion_no_call: indicate that driver is waiting for status s
+ *     stage completion. It's used in deferred SET_CONFIGURATION request.
+ * @onchip_mem_allocated_size: actual size of on-chip memory assigned
+ *     to endpoints
+ * @pending_status_wq: workqueue handling status stage for deferred requests.
+ * @shadow_ep_en: hold information about endpoints that will be enabled
+ *     in soft irq.
+ * @pending_status_request: request for which status stage was deferred
+ * @start_gadget: the current role is at CDNS3_ROLE_GADGET
+ */
+struct cdns3_device {
+	struct device			*dev;
+	struct device			*sysdev;
+
+	struct usb_gadget		gadget;
+	struct usb_gadget_driver	*gadget_driver;
+
+#define CDNS_REVISION_V0		0x00024501
+#define CDNS_REVISION_V1		0x00024509
+	u32				dev_ver;
+
+	/* generic spin-lock for drivers */
+	spinlock_t			lock;
+
+	struct cdns3_usb_regs		__iomem *regs;
+
+	struct usb_ctrlrequest		*setup_buf;
+	dma_addr_t			setup_dma;
+	void				*zlp_buf;
+
+	u8				ep0_stage;
+	int				ep0_data_dir;
+
+	struct cdns3_endpoint		*eps[CDNS3_ENDPOINTS_MAX_COUNT];
+
+	struct list_head		aligned_buf_list;
+	unsigned			run_garbage_colector:1;
+
+	u32				selected_ep;
+	u16				isoch_delay;
+
+	unsigned			u1_allowed:1;
+	unsigned			u2_allowed:1;
+	unsigned			is_selfpowered:1;
+	unsigned			setup_pending:1;
+	int				hw_configured_flag:1;
+	int				wake_up_flag:1;
+	unsigned			status_completion_no_call:1;
+	int				out_mem_is_allocated:1;
+
+	struct work_struct		pending_status_wq;
+	struct usb_request		*pending_status_request;
+	u32				shadow_ep_en;
+	/*in KB */
+	int				onchip_mem_allocated_size;
+	unsigned			start_gadget:1;
 };
 
-#endif /* __DRIVERS_CDNS3_GADGET */
+void cdns3_set_register_bit(void __iomem *ptr, u32 mask);
+dma_addr_t cdns3_trb_virt_to_dma(struct cdns3_endpoint *priv_ep,
+				 struct cdns3_trb *trb);
+enum usb_device_speed cdns3_get_speed(struct cdns3_device *priv_dev);
+void cdns3_pending_setup_status_handler(struct work_struct *work);
+void cdns3_hw_reset_eps_config(struct cdns3_device *priv_dev);
+void cdns3_set_hw_configuration(struct cdns3_device *priv_dev);
+void cdns3_select_ep(struct cdns3_device *priv_dev, u32 ep);
+void cdns3_allow_enable_l1(struct cdns3_device *priv_dev, int enable);
+struct usb_request *cdns3_next_request(struct list_head *list);
+int cdns3_ep_run_transfer(struct cdns3_endpoint *priv_ep,
+			  struct usb_request *request);
+void cdns3_rearm_transfer(struct cdns3_endpoint *priv_ep, u8 rearm);
+int cdns3_allocate_trb_pool(struct cdns3_endpoint *priv_ep);
+u8 cdns3_ep_addr_to_index(u8 ep_addr);
+int cdns3_gadget_ep_set_wedge(struct usb_ep *ep);
+int cdns3_gadget_ep_set_halt(struct usb_ep *ep, int value);
+struct usb_request *cdns3_gadget_ep_alloc_request(struct usb_ep *ep,
+						  gfp_t gfp_flags);
+void cdns3_gadget_ep_free_request(struct usb_ep *ep,
+				  struct usb_request *request);
+int cdns3_gadget_ep_dequeue(struct usb_ep *ep, struct usb_request *request);
+void cdns3_gadget_giveback(struct cdns3_endpoint *priv_ep,
+			   struct cdns3_request *priv_req,
+			   int status);
+
+int cdns3_init_ep0(struct cdns3_device *priv_dev,
+		   struct cdns3_endpoint *priv_ep);
+void cdns3_ep0_config(struct cdns3_device *priv_dev);
+void cdns3_ep_config(struct cdns3_endpoint *priv_ep);
+void cdns3_check_ep0_interrupt_proceed(struct cdns3_device *priv_dev, int dir);
+
+#endif /* __LINUX_CDNS3_GADGET */
diff --git a/drivers/usb/cdns3/trace.c b/drivers/usb/cdns3/trace.c
new file mode 100644
index 000000000000..9431eb86d4ff
--- /dev/null
+++ b/drivers/usb/cdns3/trace.c
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * USBSS device controller driver Trace Support
+ *
+ * Copyright (C) 2018 Cadence.
+ *
+ * Author: Pawel Laszczak <pawell@cadence.com>
+ */
+
+#define CREATE_TRACE_POINTS
+#include "trace.h"
+
+void cdns3_dbg(struct cdns3_device *priv_dev, const char *fmt, ...)
+{
+	struct va_format vaf;
+	va_list args;
+
+	va_start(args, fmt);
+	vaf.fmt = fmt;
+	vaf.va = &args;
+	trace_cdns3_log(priv_dev, &vaf);
+	va_end(args);
+}
diff --git a/drivers/usb/cdns3/trace.h b/drivers/usb/cdns3/trace.h
new file mode 100644
index 000000000000..7f852a7e9ab5
--- /dev/null
+++ b/drivers/usb/cdns3/trace.h
@@ -0,0 +1,446 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * USBSS device controller driver.
+ * Trace support header file.
+ *
+ * Copyright (C) 2018 Cadence.
+ *
+ * Author: Pawel Laszczak <pawell@cadence.com>
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM cdns3
+
+#if !defined(__LINUX_CDNS3_TRACE) || defined(TRACE_HEADER_MULTI_READ)
+#define __LINUX_CDNS3_TRACE
+
+#include <linux/types.h>
+#include <linux/tracepoint.h>
+#include <asm/byteorder.h>
+#include <linux/usb/ch9.h>
+#include "gadget.h"
+#include "debug.h"
+
+#define CDNS3_MSG_MAX	500
+
+TRACE_EVENT(cdns3_log,
+	TP_PROTO(struct cdns3_device *priv_dev, struct va_format *vaf),
+	TP_ARGS(priv_dev, vaf),
+	TP_STRUCT__entry(
+		__string(name, dev_name(priv_dev->dev))
+		__dynamic_array(char, msg, CDNS3_MSG_MAX)
+	),
+	TP_fast_assign(
+		__assign_str(name, dev_name(priv_dev->dev));
+		vsnprintf(__get_str(msg), CDNS3_MSG_MAX, vaf->fmt, *vaf->va);
+	),
+	TP_printk("%s: %s", __get_str(name), __get_str(msg))
+);
+
+DECLARE_EVENT_CLASS(cdns3_log_doorbell,
+	TP_PROTO(const char *ep_name, u32 ep_trbaddr),
+	TP_ARGS(ep_name, ep_trbaddr),
+	TP_STRUCT__entry(
+		__string(name, ep_name)
+		__field(u32, ep_trbaddr)
+	),
+	TP_fast_assign(
+		__assign_str(name, ep_name);
+		__entry->ep_trbaddr = ep_trbaddr;
+	),
+	TP_printk("//Ding Dong %s, ep_trbaddr %08x", __get_str(name),
+		  __entry->ep_trbaddr)
+);
+
+DEFINE_EVENT(cdns3_log_doorbell, cdns3_doorbell_ep0,
+	TP_PROTO(const char *ep_name, u32 ep_trbaddr),
+	TP_ARGS(ep_name, ep_trbaddr)
+);
+
+DEFINE_EVENT(cdns3_log_doorbell, cdns3_doorbell_epx,
+	TP_PROTO(const char *ep_name, u32 ep_trbaddr),
+	TP_ARGS(ep_name, ep_trbaddr)
+);
+
+DECLARE_EVENT_CLASS(cdns3_log_usb_irq,
+	TP_PROTO(struct cdns3_device *priv_dev, u32 usb_ists),
+	TP_ARGS(priv_dev, usb_ists),
+	TP_STRUCT__entry(
+		__field(enum usb_device_speed, speed)
+		__field(u32, usb_ists)
+		__dynamic_array(char, str, CDNS3_MSG_MAX)
+	),
+	TP_fast_assign(
+		__entry->speed = cdns3_get_speed(priv_dev);
+		__entry->usb_ists = usb_ists;
+	),
+	TP_printk("%s", cdns3_decode_usb_irq(__get_str(str), __entry->speed,
+					     __entry->usb_ists))
+);
+
+DEFINE_EVENT(cdns3_log_usb_irq, cdns3_usb_irq,
+	TP_PROTO(struct cdns3_device *priv_dev, u32 usb_ists),
+	TP_ARGS(priv_dev, usb_ists)
+);
+
+DECLARE_EVENT_CLASS(cdns3_log_epx_irq,
+	TP_PROTO(struct cdns3_device *priv_dev, struct cdns3_endpoint *priv_ep),
+	TP_ARGS(priv_dev, priv_ep),
+	TP_STRUCT__entry(
+		__string(ep_name, priv_ep->name)
+		__field(u32, ep_sts)
+		__field(u32, ep_traddr)
+		__dynamic_array(char, str, CDNS3_MSG_MAX)
+	),
+	TP_fast_assign(
+		__assign_str(ep_name, priv_ep->name);
+		__entry->ep_sts = readl(&priv_dev->regs->ep_sts);
+		__entry->ep_traddr = readl(&priv_dev->regs->ep_traddr);
+	),
+	TP_printk("%s, ep_traddr: %08x",
+		  cdns3_decode_epx_irq(__get_str(str),
+				       __get_str(ep_name),
+				       __entry->ep_sts),
+		  __entry->ep_traddr)
+);
+
+DEFINE_EVENT(cdns3_log_epx_irq, cdns3_epx_irq,
+	TP_PROTO(struct cdns3_device *priv_dev, struct cdns3_endpoint *priv_ep),
+	TP_ARGS(priv_dev, priv_ep)
+);
+
+DECLARE_EVENT_CLASS(cdns3_log_ep0_irq,
+	TP_PROTO(struct cdns3_device *priv_dev,  u32 ep_sts),
+	TP_ARGS(priv_dev, ep_sts),
+	TP_STRUCT__entry(
+		__field(int, ep_dir)
+		__field(u32, ep_sts)
+		__dynamic_array(char, str, CDNS3_MSG_MAX)
+	),
+	TP_fast_assign(
+		__entry->ep_dir = priv_dev->ep0_data_dir;
+		__entry->ep_sts = ep_sts;
+	),
+	TP_printk("%s", cdns3_decode_ep0_irq(__get_str(str),
+					     __entry->ep_dir,
+					     __entry->ep_sts))
+);
+
+DEFINE_EVENT(cdns3_log_ep0_irq, cdns3_ep0_irq,
+	TP_PROTO(struct cdns3_device *priv_dev, u32 ep_sts),
+	TP_ARGS(priv_dev, ep_sts)
+);
+
+DECLARE_EVENT_CLASS(cdns3_log_ctrl,
+	TP_PROTO(struct usb_ctrlrequest *ctrl),
+	TP_ARGS(ctrl),
+	TP_STRUCT__entry(
+		__field(u8, bRequestType)
+		__field(u8, bRequest)
+		__field(u16, wValue)
+		__field(u16, wIndex)
+		__field(u16, wLength)
+		__dynamic_array(char, str, CDNS3_MSG_MAX)
+	),
+	TP_fast_assign(
+		__entry->bRequestType = ctrl->bRequestType;
+		__entry->bRequest = ctrl->bRequest;
+		__entry->wValue = le16_to_cpu(ctrl->wValue);
+		__entry->wIndex = le16_to_cpu(ctrl->wIndex);
+		__entry->wLength = le16_to_cpu(ctrl->wLength);
+	),
+	TP_printk("%s", usb_decode_ctrl(__get_str(str), CDNS3_MSG_MAX,
+					__entry->bRequestType,
+					__entry->bRequest, __entry->wValue,
+					__entry->wIndex, __entry->wLength)
+	)
+);
+
+DEFINE_EVENT(cdns3_log_ctrl, cdns3_ctrl_req,
+	TP_PROTO(struct usb_ctrlrequest *ctrl),
+	TP_ARGS(ctrl)
+);
+
+DECLARE_EVENT_CLASS(cdns3_log_request,
+	TP_PROTO(struct cdns3_request *req),
+	TP_ARGS(req),
+	TP_STRUCT__entry(
+		__string(name, req->priv_ep->name)
+		__field(struct cdns3_request *, req)
+		__field(void *, buf)
+		__field(unsigned int, actual)
+		__field(unsigned int, length)
+		__field(int, status)
+		__field(int, zero)
+		__field(int, short_not_ok)
+		__field(int, no_interrupt)
+		__field(int, start_trb)
+		__field(int, end_trb)
+		__field(struct cdns3_trb *, start_trb_addr)
+		__field(int, flags)
+	),
+	TP_fast_assign(
+		__assign_str(name, req->priv_ep->name);
+		__entry->req = req;
+		__entry->buf = req->request.buf;
+		__entry->actual = req->request.actual;
+		__entry->length = req->request.length;
+		__entry->status = req->request.status;
+		__entry->zero = req->request.zero;
+		__entry->short_not_ok = req->request.short_not_ok;
+		__entry->no_interrupt = req->request.no_interrupt;
+		__entry->start_trb = req->start_trb;
+		__entry->end_trb = req->end_trb;
+		__entry->start_trb_addr = req->trb;
+		__entry->flags = req->flags;
+	),
+	TP_printk("%s: req: %p, req buff %p, length: %u/%u %s%s%s, status: %d,"
+		  " trb: [start:%d, end:%d: virt addr %pa], flags:%x ",
+		__get_str(name), __entry->req, __entry->buf, __entry->actual,
+		__entry->length,
+		__entry->zero ? "zero | " : "",
+		__entry->short_not_ok ? "short | " : "",
+		__entry->no_interrupt ? "no int" : "",
+		__entry->status,
+		__entry->start_trb,
+		__entry->end_trb,
+		__entry->start_trb_addr,
+		__entry->flags
+	)
+);
+
+DEFINE_EVENT(cdns3_log_request, cdns3_alloc_request,
+	TP_PROTO(struct cdns3_request *req),
+	TP_ARGS(req)
+);
+
+DEFINE_EVENT(cdns3_log_request, cdns3_free_request,
+	TP_PROTO(struct cdns3_request *req),
+	TP_ARGS(req)
+);
+
+DEFINE_EVENT(cdns3_log_request, cdns3_ep_queue,
+	TP_PROTO(struct cdns3_request *req),
+	TP_ARGS(req)
+);
+
+DEFINE_EVENT(cdns3_log_request, cdns3_ep_dequeue,
+	TP_PROTO(struct cdns3_request *req),
+	TP_ARGS(req)
+);
+
+DEFINE_EVENT(cdns3_log_request, cdns3_gadget_giveback,
+	TP_PROTO(struct cdns3_request *req),
+	TP_ARGS(req)
+);
+
+DECLARE_EVENT_CLASS(cdns3_log_aligned_request,
+	TP_PROTO(struct cdns3_request *priv_req),
+	TP_ARGS(priv_req),
+	TP_STRUCT__entry(
+		__string(name, priv_req->priv_ep->name)
+		__field(struct usb_request *, req)
+		__field(void *, buf)
+		__field(dma_addr_t, dma)
+		__field(void *, aligned_buf)
+		__field(dma_addr_t, aligned_dma)
+		__field(u32, aligned_buf_size)
+	),
+	TP_fast_assign(
+		__assign_str(name, priv_req->priv_ep->name);
+		__entry->req = &priv_req->request;
+		__entry->buf = priv_req->request.buf;
+		__entry->dma = priv_req->request.dma;
+		__entry->aligned_buf = priv_req->aligned_buf->buf;
+		__entry->aligned_dma = priv_req->aligned_buf->dma;
+		__entry->aligned_buf_size = priv_req->aligned_buf->size;
+	),
+	TP_printk("%s: req: %p, req buf %p, dma %08llx a_buf %p a_dma %08llx, size %d",
+		__get_str(name), __entry->req, __entry->buf, __entry->dma,
+		__entry->aligned_buf, __entry->aligned_dma,
+		__entry->aligned_buf_size
+	)
+);
+
+DEFINE_EVENT(cdns3_log_aligned_request, cdns3_free_aligned_request,
+	TP_PROTO(struct cdns3_request *req),
+	TP_ARGS(req)
+);
+
+DEFINE_EVENT(cdns3_log_aligned_request, cdns3_prepare_aligned_request,
+	TP_PROTO(struct cdns3_request *req),
+	TP_ARGS(req)
+);
+
+DECLARE_EVENT_CLASS(cdns3_log_trb,
+	TP_PROTO(struct cdns3_endpoint *priv_ep, struct cdns3_trb *trb),
+	TP_ARGS(priv_ep, trb),
+	TP_STRUCT__entry(
+		__string(name, priv_ep->name)
+		__field(struct cdns3_trb *, trb)
+		__field(u32, buffer)
+		__field(u32, length)
+		__field(u32, control)
+		__field(u32, type)
+	),
+	TP_fast_assign(
+		__assign_str(name, priv_ep->name);
+		__entry->trb = trb;
+		__entry->buffer = trb->buffer;
+		__entry->length = trb->length;
+		__entry->control = trb->control;
+		__entry->type = usb_endpoint_type(priv_ep->endpoint.desc);
+	),
+	TP_printk("%s: trb %p, dma buf: 0x%08x, size: %ld, burst: %d ctrl: 0x%08x (%s%s%s%s%s%s%s)",
+		__get_str(name), __entry->trb, __entry->buffer,
+		TRB_LEN(__entry->length),
+		(u8)TRB_BURST_LEN_GET(__entry->length),
+		__entry->control,
+		__entry->control & TRB_CYCLE ? "C=1, " : "C=0, ",
+		__entry->control & TRB_TOGGLE ? "T=1, " : "T=0, ",
+		__entry->control & TRB_ISP ? "ISP, " : "",
+		__entry->control & TRB_FIFO_MODE ? "FIFO, " : "",
+		__entry->control & TRB_CHAIN ? "CHAIN, " : "",
+		__entry->control & TRB_IOC ? "IOC, " : "",
+		TRB_FIELD_TO_TYPE(__entry->control) == TRB_NORMAL ? "Normal" : "LINK"
+	)
+);
+
+DEFINE_EVENT(cdns3_log_trb, cdns3_prepare_trb,
+	TP_PROTO(struct cdns3_endpoint *priv_ep, struct cdns3_trb *trb),
+	TP_ARGS(priv_ep, trb)
+);
+
+DEFINE_EVENT(cdns3_log_trb, cdns3_complete_trb,
+	TP_PROTO(struct cdns3_endpoint *priv_ep, struct cdns3_trb *trb),
+	TP_ARGS(priv_ep, trb)
+);
+
+DECLARE_EVENT_CLASS(cdns3_log_ring,
+	TP_PROTO(struct cdns3_endpoint *priv_ep),
+	TP_ARGS(priv_ep),
+	TP_STRUCT__entry(
+		__dynamic_array(u8, ring, TRB_RING_SIZE)
+		__dynamic_array(u8, priv_ep, sizeof(struct cdns3_endpoint))
+		__dynamic_array(char, buffer,
+				(TRBS_PER_SEGMENT * 65) + CDNS3_MSG_MAX)
+	),
+	TP_fast_assign(
+		memcpy(__get_dynamic_array(priv_ep), priv_ep,
+		       sizeof(struct cdns3_endpoint));
+		memcpy(__get_dynamic_array(ring), priv_ep->trb_pool,
+		       TRB_RING_SIZE);
+	),
+
+	TP_printk("%s",
+		  cdns3_dbg_ring((struct cdns3_endpoint *)__get_str(priv_ep),
+				 (struct cdns3_trb *)__get_str(ring),
+				 __get_str(buffer)))
+);
+
+DEFINE_EVENT(cdns3_log_ring, cdns3_ring,
+	TP_PROTO(struct cdns3_endpoint *priv_ep),
+	TP_ARGS(priv_ep)
+);
+
+DECLARE_EVENT_CLASS(cdns3_log_ep,
+	TP_PROTO(struct cdns3_endpoint *priv_ep),
+	TP_ARGS(priv_ep),
+	TP_STRUCT__entry(
+		__string(name, priv_ep->name)
+		__field(unsigned int, maxpacket)
+		__field(unsigned int, maxpacket_limit)
+		__field(unsigned int, max_streams)
+		__field(unsigned int, maxburst)
+		__field(unsigned int, flags)
+		__field(unsigned int, dir)
+		__field(u8, enqueue)
+		__field(u8, dequeue)
+	),
+	TP_fast_assign(
+		__assign_str(name, priv_ep->name);
+		__entry->maxpacket = priv_ep->endpoint.maxpacket;
+		__entry->maxpacket_limit = priv_ep->endpoint.maxpacket_limit;
+		__entry->max_streams = priv_ep->endpoint.max_streams;
+		__entry->maxburst = priv_ep->endpoint.maxburst;
+		__entry->flags = priv_ep->flags;
+		__entry->dir = priv_ep->dir;
+		__entry->enqueue = priv_ep->enqueue;
+		__entry->dequeue = priv_ep->dequeue;
+	),
+	TP_printk("%s: mps: %d/%d. streams: %d, burst: %d, enq idx: %d, "
+		  "deq idx: %d, flags %s%s%s%s%s%s%s%s, dir: %s",
+		__get_str(name), __entry->maxpacket,
+		__entry->maxpacket_limit, __entry->max_streams,
+		__entry->maxburst, __entry->enqueue,
+		__entry->dequeue,
+		__entry->flags & EP_ENABLED ? "EN | " : "",
+		__entry->flags & EP_STALL ? "STALL | " : "",
+		__entry->flags & EP_WEDGE ? "WEDGE | " : "",
+		__entry->flags & EP_TRANSFER_STARTED ? "STARTED | " : "",
+		__entry->flags & EP_UPDATE_EP_TRBADDR ? "UPD TRB | " : "",
+		__entry->flags & EP_PENDING_REQUEST ? "REQ PEN | " : "",
+		__entry->flags & EP_RING_FULL ? "RING FULL |" : "",
+		__entry->flags & EP_CLAIMED ?  "CLAIMED " : "",
+		__entry->dir ? "IN" : "OUT"
+	)
+);
+
+DEFINE_EVENT(cdns3_log_ep, cdns3_gadget_ep_enable,
+	TP_PROTO(struct cdns3_endpoint *priv_ep),
+	TP_ARGS(priv_ep)
+);
+
+DEFINE_EVENT(cdns3_log_ep, cdns3_gadget_ep_disable,
+	TP_PROTO(struct cdns3_endpoint *priv_ep),
+	TP_ARGS(priv_ep)
+);
+
+DECLARE_EVENT_CLASS(cdns3_log_request_handled,
+	TP_PROTO(struct cdns3_request *priv_req, int current_index,
+		 int handled),
+	TP_ARGS(priv_req, current_index, handled),
+	TP_STRUCT__entry(
+		__field(struct cdns3_request *, priv_req)
+		__field(unsigned int, dma_position)
+		__field(unsigned int, handled)
+		__field(unsigned int, dequeue_idx)
+		__field(unsigned int, enqueue_idx)
+		__field(unsigned int, start_trb)
+		__field(unsigned int, end_trb)
+	),
+	TP_fast_assign(
+		__entry->priv_req = priv_req;
+		__entry->dma_position = current_index;
+		__entry->handled = handled;
+		__entry->dequeue_idx = priv_req->priv_ep->dequeue;
+		__entry->enqueue_idx = priv_req->priv_ep->enqueue;
+		__entry->start_trb = priv_req->start_trb;
+		__entry->end_trb = priv_req->end_trb;
+	),
+	TP_printk("Req: %p %s, DMA pos: %d, ep deq: %d, ep enq: %d,"
+		  " start trb: %d, end trb: %d",
+		__entry->priv_req,
+		__entry->handled ? "handled" : "not handled",
+		__entry->dma_position, __entry->dequeue_idx,
+		__entry->enqueue_idx, __entry->start_trb,
+		__entry->end_trb
+	)
+);
+
+DEFINE_EVENT(cdns3_log_request_handled, cdns3_request_handled,
+	TP_PROTO(struct cdns3_request *priv_req, int current_index,
+		 int handled),
+	TP_ARGS(priv_req, current_index, handled)
+);
+#endif /* __LINUX_CDNS3_TRACE */
+
+/* this part must be outside header guard */
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE trace
+
+#include <trace/define_trace.h>