1cd8ae19a9
Add backported patched from 5.x from usb related fixes Up kernel version to most recent lts
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From 9aed8c08c82d8498769119b73358d070a7cbb54c Mon Sep 17 00:00:00 2001
|
|
From: Artur Petrosyan <arthur.petrosyan@synopsys.com>
|
|
Date: Fri, 2 Nov 2018 11:29:55 -0400
|
|
Subject: [PATCH 18/53] usb: dwc2: gadget: Accept LPM token when TxFIFO is not
|
|
empty
|
|
|
|
Set GLPMCFG_LPM_ACCEPT_CTRL_ISOC bit in GLPMCFG register
|
|
to accept LPM token during ISOC transfers when TxFIFO is
|
|
not empty.
|
|
|
|
- Added two definitions.
|
|
#define GLPMCFG_LPM_ACCEPT_CTRL_CONTROL BIT(21)
|
|
#define GLPMCFG_LPM_ACCEPT_CTRL_ISOC BIT(22)
|
|
This patch uses GLPMCFG_LPM_ACCEPT_CTRL_ISOC.
|
|
GLPMCFG_LPM_ACCEPT_CTRL_CONTROL is defined for further use.
|
|
|
|
- Added setting GLPMCFG_LPM_ACCEPT_CTRL_ISOC bit in GLPMCFG
|
|
register in dwc2_gadget_init_lpm function.
|
|
|
|
Signed-off-by: Artur Petrosyan <arturp@synopsys.com>
|
|
Signed-off-by: Minas Harutyunyan <hminas@synopsys.com>
|
|
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
|
---
|
|
drivers/usb/dwc2/gadget.c | 1 +
|
|
drivers/usb/dwc2/hw.h | 2 ++
|
|
2 files changed, 3 insertions(+)
|
|
|
|
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
|
|
index 6bd4054e894d..94f3ba995580 100644
|
|
--- a/drivers/usb/dwc2/gadget.c
|
|
+++ b/drivers/usb/dwc2/gadget.c
|
|
@@ -5026,6 +5026,7 @@ void dwc2_gadget_init_lpm(struct dwc2_hsotg *hsotg)
|
|
val |= hsotg->params.lpm_clock_gating ? GLPMCFG_ENBLSLPM : 0;
|
|
val |= hsotg->params.hird_threshold << GLPMCFG_HIRD_THRES_SHIFT;
|
|
val |= hsotg->params.besl ? GLPMCFG_ENBESL : 0;
|
|
+ val |= GLPMCFG_LPM_ACCEPT_CTRL_ISOC;
|
|
dwc2_writel(hsotg, val, GLPMCFG);
|
|
dev_dbg(hsotg->dev, "GLPMCFG=0x%08x\n", dwc2_readl(hsotg, GLPMCFG));
|
|
|
|
diff --git a/drivers/usb/dwc2/hw.h b/drivers/usb/dwc2/hw.h
|
|
index 2b1ea441b7d4..98af924a9a5c 100644
|
|
--- a/drivers/usb/dwc2/hw.h
|
|
+++ b/drivers/usb/dwc2/hw.h
|
|
@@ -333,6 +333,8 @@
|
|
#define GLPMCFG_SNDLPM BIT(24)
|
|
#define GLPMCFG_RETRY_CNT_MASK (0x7 << 21)
|
|
#define GLPMCFG_RETRY_CNT_SHIFT 21
|
|
+#define GLPMCFG_LPM_ACCEPT_CTRL_CONTROL BIT(21)
|
|
+#define GLPMCFG_LPM_ACCEPT_CTRL_ISOC BIT(22)
|
|
#define GLPMCFG_LPM_CHNL_INDX_MASK (0xf << 17)
|
|
#define GLPMCFG_LPM_CHNL_INDX_SHIFT 17
|
|
#define GLPMCFG_L1RESUMEOK BIT(16)
|
|
--
|
|
2.11.0
|
|
|