* [PATCH] usb: dwc3: gadget: Check for disabled LPM quirk
@ 2021-04-14 1:36 Thinh Nguyen
2021-04-14 2:13 ` [PATCH v2 0/2] usb: dwc3: gadget: Add disabling LPM option Thinh Nguyen
2021-04-14 9:36 ` [PATCH] " Felipe Balbi
0 siblings, 2 replies; 7+ messages in thread
From: Thinh Nguyen @ 2021-04-14 1:36 UTC (permalink / raw)
To: Felipe Balbi, Greg Kroah-Hartman, linux-usb; +Cc: John Youn
If the device doesn't support LPM, make sure to disable the LPM
capability and don't advertise to the host that it supports it.
Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
---
drivers/usb/dwc3/gadget.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index e1b04c976da5..509f01b1d830 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -3484,6 +3484,7 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
/* Enable USB2 LPM Capability */
if (!DWC3_VER_IS_WITHIN(DWC3, ANY, 194A) &&
+ !dwc->usb2_lpm_disable &&
(speed != DWC3_DSTS_SUPERSPEED) &&
(speed != DWC3_DSTS_SUPERSPEED_PLUS)) {
reg = dwc3_readl(dwc->regs, DWC3_DCFG);
@@ -3510,6 +3511,12 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
dwc3_gadget_dctl_write_safe(dwc, reg);
} else {
+ if (dwc->usb2_lpm_disable) {
+ reg = dwc3_readl(dwc->regs, DWC3_DCFG);
+ reg &= ~DWC3_DCFG_LPM_CAP;
+ dwc3_writel(dwc->regs, DWC3_DCFG, reg);
+ }
+
reg = dwc3_readl(dwc->regs, DWC3_DCTL);
reg &= ~DWC3_DCTL_HIRD_THRES_MASK;
dwc3_gadget_dctl_write_safe(dwc, reg);
@@ -3958,7 +3965,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
dwc->gadget->ssp_rate = USB_SSP_GEN_UNKNOWN;
dwc->gadget->sg_supported = true;
dwc->gadget->name = "dwc3-gadget";
- dwc->gadget->lpm_capable = true;
+ dwc->gadget->lpm_capable = !dwc->usb2_lpm_disable;
/*
* FIXME We might be setting max_speed to <SUPER, however versions
base-commit: 401411bbc4e62bcbcc020c2c458ecb90843140a8
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 0/2] usb: dwc3: gadget: Add disabling LPM option
2021-04-14 1:36 [PATCH] usb: dwc3: gadget: Check for disabled LPM quirk Thinh Nguyen
@ 2021-04-14 2:13 ` Thinh Nguyen
2021-04-14 2:13 ` [PATCH v2 1/2] dt-bindings: usb: dwc3: Add disabling LPM for gadget Thinh Nguyen
2021-04-14 2:13 ` [PATCH v2 2/2] usb: dwc3: gadget: Check for disabled LPM quirk Thinh Nguyen
2021-04-14 9:36 ` [PATCH] " Felipe Balbi
1 sibling, 2 replies; 7+ messages in thread
From: Thinh Nguyen @ 2021-04-14 2:13 UTC (permalink / raw)
To: Felipe Balbi, Greg Kroah-Hartman, Thinh.Nguyen, linux-usb,
devicetree, Rob Herring
Cc: John Youn
Add a new option to disable LPM for gadget side. Some device may need to
disable this capability.
Changes in v2:
- Add cover letter
- Add new DT property for disabling LPM for gadget
Thinh Nguyen (2):
dt-bindings: usb: dwc3: Add disabling LPM for gadget
usb: dwc3: gadget: Check for disabled LPM quirk
Documentation/devicetree/bindings/usb/snps,dwc3.yaml | 8 +++++++-
drivers/usb/dwc3/core.c | 2 ++
drivers/usb/dwc3/core.h | 4 +++-
drivers/usb/dwc3/gadget.c | 9 ++++++++-
4 files changed, 20 insertions(+), 3 deletions(-)
base-commit: 401411bbc4e62bcbcc020c2c458ecb90843140a8
--
2.28.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] dt-bindings: usb: dwc3: Add disabling LPM for gadget
2021-04-14 2:13 ` [PATCH v2 0/2] usb: dwc3: gadget: Add disabling LPM option Thinh Nguyen
@ 2021-04-14 2:13 ` Thinh Nguyen
2021-04-15 21:18 ` Rob Herring
2021-04-14 2:13 ` [PATCH v2 2/2] usb: dwc3: gadget: Check for disabled LPM quirk Thinh Nguyen
1 sibling, 1 reply; 7+ messages in thread
From: Thinh Nguyen @ 2021-04-14 2:13 UTC (permalink / raw)
To: Felipe Balbi, Greg Kroah-Hartman, Thinh.Nguyen, linux-usb,
devicetree, Rob Herring
Cc: John Youn
Add a new DT option to disable LPM for gadget and update the description
for usb2-lpm-disable related to host for clarity.
Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
---
Changes in v2:
- New patch
Documentation/devicetree/bindings/usb/snps,dwc3.yaml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
index 2247da77eac1..41416fbd92aa 100644
--- a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
+++ b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
@@ -87,13 +87,19 @@ properties:
minItems: 1
snps,usb2-lpm-disable:
- description: Indicate if we don't want to enable USB2 HW LPM
+ description: Indicate if we don't want to enable USB2 HW LPM for host
+ mode.
type: boolean
snps,usb3_lpm_capable:
description: Determines if platform is USB3 LPM capable
type: boolean
+ snps,usb2-gadget-lpm-disable:
+ description: Indicate if we don't want to enable USB2 HW LPM for gadget
+ mode.
+ type: boolean
+
snps,dis-start-transfer-quirk:
description:
When set, disable isoc START TRANSFER command failure SW work-around
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] usb: dwc3: gadget: Check for disabled LPM quirk
2021-04-14 2:13 ` [PATCH v2 0/2] usb: dwc3: gadget: Add disabling LPM option Thinh Nguyen
2021-04-14 2:13 ` [PATCH v2 1/2] dt-bindings: usb: dwc3: Add disabling LPM for gadget Thinh Nguyen
@ 2021-04-14 2:13 ` Thinh Nguyen
2021-04-14 9:37 ` Felipe Balbi
1 sibling, 1 reply; 7+ messages in thread
From: Thinh Nguyen @ 2021-04-14 2:13 UTC (permalink / raw)
To: Felipe Balbi, Greg Kroah-Hartman, Thinh.Nguyen, linux-usb; +Cc: John Youn
If the device doesn't support LPM, make sure to disable the LPM
capability and don't advertise to the host that it supports it.
Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
---
Changes in v2:
- Use a different DT property than usb2-lpm-disable (since it's host specific)
drivers/usb/dwc3/core.c | 2 ++
drivers/usb/dwc3/core.h | 4 +++-
drivers/usb/dwc3/gadget.c | 9 ++++++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 05e2e54cbbdc..f3316caefbad 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1286,6 +1286,8 @@ static void dwc3_get_properties(struct dwc3 *dwc)
"snps,usb3_lpm_capable");
dwc->usb2_lpm_disable = device_property_read_bool(dev,
"snps,usb2-lpm-disable");
+ dwc->usb2_gadget_lpm_disable = device_property_read_bool(dev,
+ "snps,usb2-gadget-lpm-disable");
device_property_read_u8(dev, "snps,rx-thr-num-pkt-prd",
&rx_thr_num_pkt_prd);
device_property_read_u8(dev, "snps,rx-max-burst-prd",
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 6e9abfbccaa6..83086e71122d 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -1035,7 +1035,8 @@ struct dwc3_scratchpad_array {
* @dis_start_transfer_quirk: set if start_transfer failure SW workaround is
* not needed for DWC_usb31 version 1.70a-ea06 and below
* @usb3_lpm_capable: set if hadrware supports Link Power Management
- * @usb2_lpm_disable: set to disable usb2 lpm
+ * @usb2_lpm_disable: set to disable usb2 lpm for host
+ * @usb2_gadget_lpm_disable: set to disable usb2 lpm for gadget
* @disable_scramble_quirk: set if we enable the disable scramble quirk
* @u2exit_lfps_quirk: set if we enable u2exit lfps quirk
* @u2ss_inp3_quirk: set if we enable P3 OK for U2/SS Inactive quirk
@@ -1241,6 +1242,7 @@ struct dwc3 {
unsigned dis_start_transfer_quirk:1;
unsigned usb3_lpm_capable:1;
unsigned usb2_lpm_disable:1;
+ unsigned usb2_gadget_lpm_disable:1;
unsigned disable_scramble_quirk:1;
unsigned u2exit_lfps_quirk:1;
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index e1b04c976da5..767661b740ab 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -3484,6 +3484,7 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
/* Enable USB2 LPM Capability */
if (!DWC3_VER_IS_WITHIN(DWC3, ANY, 194A) &&
+ !dwc->usb2_gadget_lpm_disable &&
(speed != DWC3_DSTS_SUPERSPEED) &&
(speed != DWC3_DSTS_SUPERSPEED_PLUS)) {
reg = dwc3_readl(dwc->regs, DWC3_DCFG);
@@ -3510,6 +3511,12 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
dwc3_gadget_dctl_write_safe(dwc, reg);
} else {
+ if (dwc->usb2_gadget_lpm_disable) {
+ reg = dwc3_readl(dwc->regs, DWC3_DCFG);
+ reg &= ~DWC3_DCFG_LPM_CAP;
+ dwc3_writel(dwc->regs, DWC3_DCFG, reg);
+ }
+
reg = dwc3_readl(dwc->regs, DWC3_DCTL);
reg &= ~DWC3_DCTL_HIRD_THRES_MASK;
dwc3_gadget_dctl_write_safe(dwc, reg);
@@ -3958,7 +3965,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
dwc->gadget->ssp_rate = USB_SSP_GEN_UNKNOWN;
dwc->gadget->sg_supported = true;
dwc->gadget->name = "dwc3-gadget";
- dwc->gadget->lpm_capable = true;
+ dwc->gadget->lpm_capable = !dwc->usb2_gadget_lpm_disable;
/*
* FIXME We might be setting max_speed to <SUPER, however versions
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] usb: dwc3: gadget: Check for disabled LPM quirk
2021-04-14 1:36 [PATCH] usb: dwc3: gadget: Check for disabled LPM quirk Thinh Nguyen
2021-04-14 2:13 ` [PATCH v2 0/2] usb: dwc3: gadget: Add disabling LPM option Thinh Nguyen
@ 2021-04-14 9:36 ` Felipe Balbi
1 sibling, 0 replies; 7+ messages in thread
From: Felipe Balbi @ 2021-04-14 9:36 UTC (permalink / raw)
To: Thinh Nguyen, Greg Kroah-Hartman, linux-usb; +Cc: John Youn
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
Thinh Nguyen <Thinh.Nguyen@synopsys.com> writes:
> If the device doesn't support LPM, make sure to disable the LPM
> capability and don't advertise to the host that it supports it.
>
> Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Acked-by: Felipe Balbi <balbi@kernel.org>
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 857 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] usb: dwc3: gadget: Check for disabled LPM quirk
2021-04-14 2:13 ` [PATCH v2 2/2] usb: dwc3: gadget: Check for disabled LPM quirk Thinh Nguyen
@ 2021-04-14 9:37 ` Felipe Balbi
0 siblings, 0 replies; 7+ messages in thread
From: Felipe Balbi @ 2021-04-14 9:37 UTC (permalink / raw)
To: Thinh Nguyen, Greg Kroah-Hartman, Thinh.Nguyen, linux-usb; +Cc: John Youn
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
Thinh Nguyen <Thinh.Nguyen@synopsys.com> writes:
> If the device doesn't support LPM, make sure to disable the LPM
> capability and don't advertise to the host that it supports it.
>
> Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Sorry, acked the wrong version :-)
Acked-by: Felipe Balbi <balbi@kernel.org>
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 857 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: usb: dwc3: Add disabling LPM for gadget
2021-04-14 2:13 ` [PATCH v2 1/2] dt-bindings: usb: dwc3: Add disabling LPM for gadget Thinh Nguyen
@ 2021-04-15 21:18 ` Rob Herring
0 siblings, 0 replies; 7+ messages in thread
From: Rob Herring @ 2021-04-15 21:18 UTC (permalink / raw)
To: Thinh Nguyen
Cc: Felipe Balbi, linux-usb, Greg Kroah-Hartman, Rob Herring,
devicetree, John Youn
On Tue, 13 Apr 2021 19:13:11 -0700, Thinh Nguyen wrote:
> Add a new DT option to disable LPM for gadget and update the description
> for usb2-lpm-disable related to host for clarity.
>
> Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
> ---
> Changes in v2:
> - New patch
>
> Documentation/devicetree/bindings/usb/snps,dwc3.yaml | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-04-15 21:18 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-14 1:36 [PATCH] usb: dwc3: gadget: Check for disabled LPM quirk Thinh Nguyen
2021-04-14 2:13 ` [PATCH v2 0/2] usb: dwc3: gadget: Add disabling LPM option Thinh Nguyen
2021-04-14 2:13 ` [PATCH v2 1/2] dt-bindings: usb: dwc3: Add disabling LPM for gadget Thinh Nguyen
2021-04-15 21:18 ` Rob Herring
2021-04-14 2:13 ` [PATCH v2 2/2] usb: dwc3: gadget: Check for disabled LPM quirk Thinh Nguyen
2021-04-14 9:37 ` Felipe Balbi
2021-04-14 9:36 ` [PATCH] " Felipe Balbi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.