* [RFC v2 0/2] Add support for multiport controller
@ 2022-05-26 10:13 Harsh Agarwal
2022-05-26 10:13 ` [RFC v2 1/2] dt-bindings: usb: dwc3: Add support for multiport related properties Harsh Agarwal
2022-05-26 10:13 ` [RFC v2 2/2] usb: dwc3: Refactor PHY logic to support Multiport Controller Harsh Agarwal
0 siblings, 2 replies; 9+ messages in thread
From: Harsh Agarwal @ 2022-05-26 10:13 UTC (permalink / raw)
To: Greg Kroah-Hartman, Philipp Zabel, Rob Herring,
Krzysztof Kozlowski, Bjorn Andersson, Felipe Balbi
Cc: devicetree, linux-usb, linux-kernel, quic_pkondeti, quic_ppratap,
Harsh Agarwal
Currently the DWC3 driver supports only single port controller which
requires at most two PHYs ie HS and SS PHYs. There are SoCs that has
DWC3 controller with multiple ports that can operate in host mode. Some of
the port supports both SS+HS and other port supports only HS mode.
This change refactors the PHY logic to support multiport controller. The
patches have gone through basic sanity only.
For any multiport controller we would define a new node "multiport" inside
dwc3 and then add subsequent "mport" nodes inside it for individual ports
that it supports. Now each individual "mport" defines the PHYs that it
supports.
Looking for comments/feedback on the device tree bindings. Once the
bindings are locked, we can further factor the code.
e.g.
Consider a Dual port controller where each port supports HS+SS
multiport {
mp_1: mport@1 {
usb-phy = <usb2_phy0>, <usb3_phy0>;
/* Can define Generic PHYs also */
};
mp_2: mport@2 {
usb-phy = <usb2_phy1>, <usb3_phy1>;
};
Changes in v2:
Added support for Generic PHYs by making use of devm_of_phy_get. It works
for both normal controller and multiport controller.
Cleaned up dwc3_core_get_phy and created new API dwc3_core_get_phy_by_node
which works for both normal and multiport node case.
Addded new APIs to count PHYs defined in the multiport controller.
Changed Generic PHY to double pointer to work for multiport controller.
Added support for GUSB2PHYCFG and GUSB3PIPECTL registers
for multiport controller.
Harsh Agarwal (2):
dt-bindings: usb: dwc3: Add support for multiport related properties
usb: dwc3: Refactor PHY logic to support Multiport Controller
.../devicetree/bindings/usb/snps,dwc3.yaml | 55 +++
drivers/usb/dwc3/core.c | 420 +++++++++++++++------
drivers/usb/dwc3/core.h | 12 +-
drivers/usb/dwc3/drd.c | 16 +-
drivers/usb/dwc3/gadget.c | 4 +-
5 files changed, 381 insertions(+), 126 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [RFC v2 1/2] dt-bindings: usb: dwc3: Add support for multiport related properties 2022-05-26 10:13 [RFC v2 0/2] Add support for multiport controller Harsh Agarwal @ 2022-05-26 10:13 ` Harsh Agarwal 2022-05-26 12:40 ` Rob Herring 2022-05-26 10:13 ` [RFC v2 2/2] usb: dwc3: Refactor PHY logic to support Multiport Controller Harsh Agarwal 1 sibling, 1 reply; 9+ messages in thread From: Harsh Agarwal @ 2022-05-26 10:13 UTC (permalink / raw) To: Greg Kroah-Hartman, Philipp Zabel, Rob Herring, Krzysztof Kozlowski, Bjorn Andersson, Felipe Balbi Cc: devicetree, linux-usb, linux-kernel, quic_pkondeti, quic_ppratap, Harsh Agarwal Added support for multiport, mport, num-ssphy and num-hsphy properties. These properties are used to support devices having a multiport controller. Signed-off-by: Harsh Agarwal <quic_harshq@quicinc.com> --- .../devicetree/bindings/usb/snps,dwc3.yaml | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml index f4471f8..3a506aa 100644 --- a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml +++ b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml @@ -341,6 +341,34 @@ properties: This port is used with the 'usb-role-switch' property to connect the dwc3 to type C connector. + multiport: + description: + If a single USB controller supports multiple ports, then it's referred to as + a multiport controller. Each port of the multiport controller can support + either High Speed or Super Speed or both and have their own PHY phandles. Each + port is represented by "mport" node and all the "mport" nodes are grouped + together inside the "multiport" node where individual "mport" node defines the + PHYs supported by that port. + required: + - mport + + num-hsphy: + description: Total number of HS-PHYs defined by the multiport controller. + $ref: /schemas/types.yaml#/definitions/uint32 + + num-ssphy: + description: Total number of SS-PHYs defined by the multiport controller. + $ref: /schemas/types.yaml#/definitions/uint32 + + mport: + description: Each mport node represents one port of the multiport controller. + oneOf: + - required: + - usb-phy + - required: + - phys + - phy-names + unevaluatedProperties: false required: @@ -369,4 +397,31 @@ examples: snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; }; + - | + usb@4a000000 { + compatible = "snps,dwc3"; + reg = <0x4a000000 0xcfff>; + interrupts = <0 92 4>; + + multiport { + + MP_1: mport@1 { + usb-phy = <&usb2_phy0>, <&usb3_phy0>; + /* Can define Generic PHYs also */ + }; + + MP_2: mport@2 { + usb-phy = <&usb2_phy1>, <&usb3_phy1>; + }; + + MP_3: mport@3 { + usb-phy = <&usb2_phy2>; + }; + + MP_4: mport@4 { + usb-phy = <&usb2_phy3>; + }; + + }; + }; ... -- 2.7.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [RFC v2 1/2] dt-bindings: usb: dwc3: Add support for multiport related properties 2022-05-26 10:13 ` [RFC v2 1/2] dt-bindings: usb: dwc3: Add support for multiport related properties Harsh Agarwal @ 2022-05-26 12:40 ` Rob Herring 2022-05-27 11:00 ` Harsh Agarwal 0 siblings, 1 reply; 9+ messages in thread From: Rob Herring @ 2022-05-26 12:40 UTC (permalink / raw) To: Harsh Agarwal Cc: quic_pkondeti, Philipp Zabel, quic_ppratap, Greg Kroah-Hartman, linux-kernel, Bjorn Andersson, devicetree, linux-usb, Felipe Balbi, Rob Herring, Krzysztof Kozlowski On Thu, 26 May 2022 15:43:48 +0530, Harsh Agarwal wrote: > Added support for multiport, mport, num-ssphy and num-hsphy > properties. These properties are used to support devices having > a multiport controller. > > Signed-off-by: Harsh Agarwal <quic_harshq@quicinc.com> > --- > .../devicetree/bindings/usb/snps,dwc3.yaml | 55 ++++++++++++++++++++++ > 1 file changed, 55 insertions(+) > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: ./Documentation/devicetree/bindings/usb/snps,dwc3.yaml:366:8: [warning] wrong indentation: expected 6 but found 7 (indentation) ./Documentation/devicetree/bindings/usb/snps,dwc3.yaml:367:10: [warning] wrong indentation: expected 11 but found 9 (indentation) ./Documentation/devicetree/bindings/usb/snps,dwc3.yaml:369:11: [warning] wrong indentation: expected 11 but found 10 (indentation) dtschema/dtc warnings/errors: Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:86.27-89.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@1: node has a unit name, but no reg or ranges property Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:91.27-93.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@2: node has a unit name, but no reg or ranges property Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:95.27-97.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@3: node has a unit name, but no reg or ranges property Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:99.27-101.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@4: node has a unit name, but no reg or ranges property /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/snps,dwc3.example.dtb: usb@4a000000: multiport: 'mport' is a required property From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/snps,dwc3.yaml doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/patch/ This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC v2 1/2] dt-bindings: usb: dwc3: Add support for multiport related properties 2022-05-26 12:40 ` Rob Herring @ 2022-05-27 11:00 ` Harsh Agarwal 2022-05-31 20:10 ` Rob Herring 0 siblings, 1 reply; 9+ messages in thread From: Harsh Agarwal @ 2022-05-27 11:00 UTC (permalink / raw) To: Rob Herring Cc: quic_pkondeti, Philipp Zabel, quic_ppratap, Greg Kroah-Hartman, linux-kernel, Bjorn Andersson, devicetree, linux-usb, Felipe Balbi, Rob Herring, Krzysztof Kozlowski On 5/26/2022 6:10 PM, Rob Herring wrote: > On Thu, 26 May 2022 15:43:48 +0530, Harsh Agarwal wrote: >> Added support for multiport, mport, num-ssphy and num-hsphy >> properties. These properties are used to support devices having >> a multiport controller. >> >> Signed-off-by: Harsh Agarwal <quic_harshq@quicinc.com> >> --- >> .../devicetree/bindings/usb/snps,dwc3.yaml | 55 ++++++++++++++++++++++ >> 1 file changed, 55 insertions(+) >> > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' > on your patch (DT_CHECKER_FLAGS is new in v5.13): > > yamllint warnings/errors: > ./Documentation/devicetree/bindings/usb/snps,dwc3.yaml:366:8: [warning] wrong indentation: expected 6 but found 7 (indentation) > ./Documentation/devicetree/bindings/usb/snps,dwc3.yaml:367:10: [warning] wrong indentation: expected 11 but found 9 (indentation) > ./Documentation/devicetree/bindings/usb/snps,dwc3.yaml:369:11: [warning] wrong indentation: expected 11 but found 10 (indentation) > > dtschema/dtc warnings/errors: > Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:86.27-89.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@1: node has a unit name, but no reg or ranges property > Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:91.27-93.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@2: node has a unit name, but no reg or ranges property > Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:95.27-97.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@3: node has a unit name, but no reg or ranges property > Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:99.27-101.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@4: node has a unit name, but no reg or ranges property > /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/snps,dwc3.example.dtb: usb@4a000000: multiport: 'mport' is a required property > From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/snps,dwc3.yaml > > doc reference errors (make refcheckdocs): > > See https://patchwork.ozlabs.org/patch/ > > This check can fail if there are any dependencies. The base for a patch > series is generally the most recent rc1. > > If you already ran 'make dt_binding_check' and didn't see the above > error(s), then make sure 'yamllint' is installed and dt-schema is up to > date: > > pip3 install dtschema --upgrade > > Please check and re-submit. Indentation error I have rectified in my RFC v2. Regarding below warnings "Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:86.27-89.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@1: node has a unit name, but no reg or ranges property" Here the mport expects no "reg" or ranges" property as of now. Only thing that is mandated is either the USB-PHY phandles using "usb-phy" or the Generic PHY declaration using "phy" and "phy-names" Can you please suggest to mask these warnings or do I need to add something else ? ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC v2 1/2] dt-bindings: usb: dwc3: Add support for multiport related properties 2022-05-27 11:00 ` Harsh Agarwal @ 2022-05-31 20:10 ` Rob Herring 2022-06-05 18:31 ` Harsh Agarwal 0 siblings, 1 reply; 9+ messages in thread From: Rob Herring @ 2022-05-31 20:10 UTC (permalink / raw) To: Harsh Agarwal Cc: quic_pkondeti, Philipp Zabel, quic_ppratap, Greg Kroah-Hartman, linux-kernel, Bjorn Andersson, devicetree, linux-usb, Felipe Balbi, Krzysztof Kozlowski On Fri, May 27, 2022 at 04:30:34PM +0530, Harsh Agarwal wrote: > > On 5/26/2022 6:10 PM, Rob Herring wrote: > > On Thu, 26 May 2022 15:43:48 +0530, Harsh Agarwal wrote: > > > Added support for multiport, mport, num-ssphy and num-hsphy > > > properties. These properties are used to support devices having > > > a multiport controller. > > > > > > Signed-off-by: Harsh Agarwal <quic_harshq@quicinc.com> > > > --- > > > .../devicetree/bindings/usb/snps,dwc3.yaml | 55 ++++++++++++++++++++++ > > > 1 file changed, 55 insertions(+) > > > > > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' > > on your patch (DT_CHECKER_FLAGS is new in v5.13): > > > > yamllint warnings/errors: > > ./Documentation/devicetree/bindings/usb/snps,dwc3.yaml:366:8: [warning] wrong indentation: expected 6 but found 7 (indentation) > > ./Documentation/devicetree/bindings/usb/snps,dwc3.yaml:367:10: [warning] wrong indentation: expected 11 but found 9 (indentation) > > ./Documentation/devicetree/bindings/usb/snps,dwc3.yaml:369:11: [warning] wrong indentation: expected 11 but found 10 (indentation) > > > > dtschema/dtc warnings/errors: > > Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:86.27-89.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@1: node has a unit name, but no reg or ranges property > > Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:91.27-93.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@2: node has a unit name, but no reg or ranges property > > Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:95.27-97.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@3: node has a unit name, but no reg or ranges property > > Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:99.27-101.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@4: node has a unit name, but no reg or ranges property > > /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/snps,dwc3.example.dtb: usb@4a000000: multiport: 'mport' is a required property > > From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/snps,dwc3.yaml > > > > doc reference errors (make refcheckdocs): > > > > See https://patchwork.ozlabs.org/patch/ > > > > This check can fail if there are any dependencies. The base for a patch > > series is generally the most recent rc1. > > > > If you already ran 'make dt_binding_check' and didn't see the above > > error(s), then make sure 'yamllint' is installed and dt-schema is up to > > date: > > > > pip3 install dtschema --upgrade > > > > Please check and re-submit. > Indentation error I have rectified in my RFC v2. > Regarding below warnings > > "Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:86.27-89.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@1: node has a unit name, but no reg or ranges property" > Here the mport expects no "reg" or ranges" property as of now. Only thing that is mandated is either the USB-PHY phandles using "usb-phy" or the Generic PHY declaration using "phy" and "phy-names" > Can you please suggest to mask these warnings or do I need to add something else ? A unit-address requires 'reg' or 'ranges' and vice-versa. So you need 'reg'. However, usb-hcd.yaml already defines what child nodes are for USB hosts. Whatever you do here needs to be compatible with that. Rob ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC v2 1/2] dt-bindings: usb: dwc3: Add support for multiport related properties 2022-05-31 20:10 ` Rob Herring @ 2022-06-05 18:31 ` Harsh Agarwal 0 siblings, 0 replies; 9+ messages in thread From: Harsh Agarwal @ 2022-06-05 18:31 UTC (permalink / raw) To: Rob Herring Cc: quic_pkondeti, Philipp Zabel, quic_ppratap, Greg Kroah-Hartman, linux-kernel, Bjorn Andersson, devicetree, linux-usb, Felipe Balbi, Krzysztof Kozlowski On 6/1/2022 1:40 AM, Rob Herring wrote: > On Fri, May 27, 2022 at 04:30:34PM +0530, Harsh Agarwal wrote: >> On 5/26/2022 6:10 PM, Rob Herring wrote: >>> On Thu, 26 May 2022 15:43:48 +0530, Harsh Agarwal wrote: >>>> Added support for multiport, mport, num-ssphy and num-hsphy >>>> properties. These properties are used to support devices having >>>> a multiport controller. >>>> >>>> Signed-off-by: Harsh Agarwal <quic_harshq@quicinc.com> >>>> --- >>>> .../devicetree/bindings/usb/snps,dwc3.yaml | 55 ++++++++++++++++++++++ >>>> 1 file changed, 55 insertions(+) >>>> >>> My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' >>> on your patch (DT_CHECKER_FLAGS is new in v5.13): >>> >>> yamllint warnings/errors: >>> ./Documentation/devicetree/bindings/usb/snps,dwc3.yaml:366:8: [warning] wrong indentation: expected 6 but found 7 (indentation) >>> ./Documentation/devicetree/bindings/usb/snps,dwc3.yaml:367:10: [warning] wrong indentation: expected 11 but found 9 (indentation) >>> ./Documentation/devicetree/bindings/usb/snps,dwc3.yaml:369:11: [warning] wrong indentation: expected 11 but found 10 (indentation) >>> >>> dtschema/dtc warnings/errors: >>> Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:86.27-89.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@1: node has a unit name, but no reg or ranges property >>> Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:91.27-93.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@2: node has a unit name, but no reg or ranges property >>> Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:95.27-97.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@3: node has a unit name, but no reg or ranges property >>> Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:99.27-101.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@4: node has a unit name, but no reg or ranges property >>> /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/snps,dwc3.example.dtb: usb@4a000000: multiport: 'mport' is a required property >>> From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/snps,dwc3.yaml >>> >>> doc reference errors (make refcheckdocs): >>> >>> See https://patchwork.ozlabs.org/patch/ >>> >>> This check can fail if there are any dependencies. The base for a patch >>> series is generally the most recent rc1. >>> >>> If you already ran 'make dt_binding_check' and didn't see the above >>> error(s), then make sure 'yamllint' is installed and dt-schema is up to >>> date: >>> >>> pip3 install dtschema --upgrade >>> >>> Please check and re-submit. >> Indentation error I have rectified in my RFC v2. >> Regarding below warnings >> >> "Documentation/devicetree/bindings/usb/snps,dwc3.example.dts:86.27-89.15: Warning (unit_address_vs_reg): /example-2/usb@4a000000/multiport/mport@1: node has a unit name, but no reg or ranges property" >> Here the mport expects no "reg" or ranges" property as of now. Only thing that is mandated is either the USB-PHY phandles using "usb-phy" or the Generic PHY declaration using "phy" and "phy-names" >> Can you please suggest to mask these warnings or do I need to add something else ? > A unit-address requires 'reg' or 'ranges' and vice-versa. So you need > 'reg'. > > However, usb-hcd.yaml already defines what child nodes are for USB > hosts. Whatever you do here needs to be compatible with that. Thanks for the info. "@" is not actually a requirement for mport. We can name them as "mport1" instead of "mport@1". Now I do not see this reg, ranges warnings in latest PS v2 > > Rob ^ permalink raw reply [flat|nested] 9+ messages in thread
* [RFC v2 2/2] usb: dwc3: Refactor PHY logic to support Multiport Controller 2022-05-26 10:13 [RFC v2 0/2] Add support for multiport controller Harsh Agarwal 2022-05-26 10:13 ` [RFC v2 1/2] dt-bindings: usb: dwc3: Add support for multiport related properties Harsh Agarwal @ 2022-05-26 10:13 ` Harsh Agarwal 2022-05-27 2:31 ` Pavan Kondeti 1 sibling, 1 reply; 9+ messages in thread From: Harsh Agarwal @ 2022-05-26 10:13 UTC (permalink / raw) To: Greg Kroah-Hartman, Philipp Zabel, Rob Herring, Krzysztof Kozlowski, Bjorn Andersson, Felipe Balbi Cc: devicetree, linux-usb, linux-kernel, quic_pkondeti, quic_ppratap, Harsh Agarwal Currently the USB driver supports only single port controller which works with 2 PHYs at max ie HS and SS. But some devices have "multiport" controller where a single controller supports multiple ports and each port have their own PHYs. Refactor PHY logic to support the same. This implementation is compatible with existing glue drivers. Signed-off-by: Harsh Agarwal <quic_harshq@quicinc.com> --- drivers/usb/dwc3/core.c | 420 +++++++++++++++++++++++++++++++++------------- drivers/usb/dwc3/core.h | 12 +- drivers/usb/dwc3/drd.c | 16 +- drivers/usb/dwc3/gadget.c | 4 +- 4 files changed, 326 insertions(+), 126 deletions(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 2682469..def08ac 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -120,7 +120,7 @@ static void __dwc3_set_mode(struct work_struct *work) { struct dwc3 *dwc = work_to_dwc(work); unsigned long flags; - int ret; + int i, ret; u32 reg; mutex_lock(&dwc->mutex); @@ -189,10 +189,13 @@ static void __dwc3_set_mode(struct work_struct *work) if (ret) { dev_err(dwc->dev, "failed to initialize host\n"); } else { - if (dwc->usb2_phy) - otg_set_vbus(dwc->usb2_phy->otg, true); - phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_HOST); - phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_HOST); + for (i = 0; i < dwc->num_hsphy; i++) { + if (dwc->usb2_phy[i]) + otg_set_vbus(dwc->usb2_phy[i]->otg, true); + phy_set_mode(dwc->usb2_generic_phy[i], PHY_MODE_USB_HOST); + } + for (i = 0; i < dwc->num_ssphy; i++) + phy_set_mode(dwc->usb3_generic_phy[i], PHY_MODE_USB_HOST); if (dwc->dis_split_quirk) { reg = dwc3_readl(dwc->regs, DWC3_GUCTL3); reg |= DWC3_GUCTL3_SPLITDISABLE; @@ -205,10 +208,10 @@ static void __dwc3_set_mode(struct work_struct *work) dwc3_event_buffers_setup(dwc); - if (dwc->usb2_phy) - otg_set_vbus(dwc->usb2_phy->otg, false); - phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_DEVICE); - phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_DEVICE); + if (dwc->usb2_phy[0]) + otg_set_vbus(dwc->usb2_phy[0]->otg, false); + phy_set_mode(dwc->usb2_generic_phy[0], PHY_MODE_USB_DEVICE); + phy_set_mode(dwc->usb3_generic_phy[0], PHY_MODE_USB_DEVICE); ret = dwc3_gadget_init(dwc); if (ret) @@ -655,12 +658,18 @@ static int dwc3_core_ulpi_init(struct dwc3 *dwc) */ static int dwc3_phy_setup(struct dwc3 *dwc) { + int i; unsigned int hw_mode; u32 reg; hw_mode = DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0); reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)); + for (i = 1; i < dwc->num_ssphy; i++) { + if (reg != dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(i))) + dev_warn(dwc->dev, + "Reset values of pipectl registers 0 and %d are different!\n", i); + } /* * Make sure UX_EXIT_PX is cleared as that causes issues with some @@ -715,9 +724,15 @@ static int dwc3_phy_setup(struct dwc3 *dwc) if (dwc->dis_del_phy_power_chg_quirk) reg &= ~DWC3_GUSB3PIPECTL_DEPOCHANGE; - dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg); + for (i = 0; i < dwc->num_ssphy; i++) + dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(i), reg); reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); + for (i = 1; i < dwc->num_hsphy; i++) { + if (reg != dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i))) + dev_warn(dwc->dev, + "Reset values of usb2phycfg register 0 and %d are different!\n", i); + } /* Select the HS PHY interface */ switch (DWC3_GHWPARAMS3_HSPHY_IFC(dwc->hwparams.hwparams3)) { @@ -729,7 +744,8 @@ static int dwc3_phy_setup(struct dwc3 *dwc) } else if (dwc->hsphy_interface && !strncmp(dwc->hsphy_interface, "ulpi", 4)) { reg |= DWC3_GUSB2PHYCFG_ULPI_UTMI; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + for (i = 0; i < dwc->num_hsphy; i++) + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); } else { /* Relying on default value. */ if (!(reg & DWC3_GUSB2PHYCFG_ULPI_UTMI)) @@ -786,7 +802,8 @@ static int dwc3_phy_setup(struct dwc3 *dwc) if (dwc->dis_u2_freeclk_exists_quirk) reg &= ~DWC3_GUSB2PHYCFG_U2_FREECLK_EXISTS; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + for (i = 0; i < dwc->num_hsphy; i++) + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); return 0; } @@ -825,17 +842,29 @@ static void dwc3_clk_disable(struct dwc3 *dwc) static void dwc3_core_exit(struct dwc3 *dwc) { + int i; dwc3_event_buffers_cleanup(dwc); - usb_phy_shutdown(dwc->usb2_phy); - usb_phy_shutdown(dwc->usb3_phy); - phy_exit(dwc->usb2_generic_phy); - phy_exit(dwc->usb3_generic_phy); + for (i = 0; i < dwc->num_hsphy; i++) { + usb_phy_shutdown(dwc->usb2_phy[i]); + phy_exit(dwc->usb2_generic_phy[i]); + } + + for (i = 0; i < dwc->num_ssphy; i++) { + usb_phy_shutdown(dwc->usb3_phy[i]); + phy_exit(dwc->usb3_generic_phy[i]); + } + + for (i = 0; i < dwc->num_hsphy; i++) { + usb_phy_set_suspend(dwc->usb2_phy[i], 1); + phy_power_off(dwc->usb2_generic_phy[i]); + } + + for (i = 0; i < dwc->num_ssphy; i++) { + usb_phy_set_suspend(dwc->usb3_phy[i], 1); + phy_power_off(dwc->usb3_generic_phy[i]); + } - usb_phy_set_suspend(dwc->usb2_phy, 1); - usb_phy_set_suspend(dwc->usb3_phy, 1); - phy_power_off(dwc->usb2_generic_phy); - phy_power_off(dwc->usb3_generic_phy); dwc3_clk_disable(dwc); reset_control_assert(dwc->reset); } @@ -1038,7 +1067,7 @@ static int dwc3_core_init(struct dwc3 *dwc) { unsigned int hw_mode; u32 reg; - int ret; + int ret, i; hw_mode = DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0); @@ -1066,16 +1095,24 @@ static int dwc3_core_init(struct dwc3 *dwc) dwc->phys_ready = true; } - usb_phy_init(dwc->usb2_phy); - usb_phy_init(dwc->usb3_phy); - ret = phy_init(dwc->usb2_generic_phy); - if (ret < 0) - goto err0a; + for (i = 0; i < dwc->num_hsphy; i++) + usb_phy_init(dwc->usb2_phy[i]); + for (i = 0; i < dwc->num_ssphy; i++) + usb_phy_init(dwc->usb3_phy[i]); - ret = phy_init(dwc->usb3_generic_phy); - if (ret < 0) { - phy_exit(dwc->usb2_generic_phy); - goto err0a; + for (i = 0; i < dwc->num_hsphy; i++) { + ret = phy_init(dwc->usb2_generic_phy[i]); + if (ret < 0) + goto err0a; + } + + for (i = 0; i < dwc->num_ssphy; i++) { + ret = phy_init(dwc->usb3_generic_phy[i]); + if (ret < 0) { + for (i = 0; i < dwc->num_hsphy; i++) + phy_exit(dwc->usb2_generic_phy[i]); + goto err0a; + } } ret = dwc3_core_soft_reset(dwc); @@ -1085,15 +1122,19 @@ static int dwc3_core_init(struct dwc3 *dwc) if (hw_mode == DWC3_GHWPARAMS0_MODE_DRD && !DWC3_VER_IS_WITHIN(DWC3, ANY, 194A)) { if (!dwc->dis_u3_susphy_quirk) { - reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)); - reg |= DWC3_GUSB3PIPECTL_SUSPHY; - dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg); + for (i = 0; i < dwc->num_ssphy; i++) { + reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(i)); + reg |= DWC3_GUSB3PIPECTL_SUSPHY; + dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(i), reg); + } } if (!dwc->dis_u2_susphy_quirk) { - reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); - reg |= DWC3_GUSB2PHYCFG_SUSPHY; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + for (i = 0; i < dwc->num_hsphy; i++) { + reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i)); + reg |= DWC3_GUSB2PHYCFG_SUSPHY; + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); + } } } @@ -1112,15 +1153,19 @@ static int dwc3_core_init(struct dwc3 *dwc) dwc3_set_incr_burst_type(dwc); - usb_phy_set_suspend(dwc->usb2_phy, 0); - usb_phy_set_suspend(dwc->usb3_phy, 0); - ret = phy_power_on(dwc->usb2_generic_phy); - if (ret < 0) - goto err2; + for (i = 0; i < dwc->num_hsphy; i++) { + usb_phy_set_suspend(dwc->usb2_phy[i], 0); + ret = phy_power_on(dwc->usb2_generic_phy[i]); + if (ret < 0) + goto err2; + } - ret = phy_power_on(dwc->usb3_generic_phy); - if (ret < 0) - goto err3; + for (i = 0; i < dwc->num_ssphy; i++) { + usb_phy_set_suspend(dwc->usb3_phy[i], 0); + ret = phy_power_on(dwc->usb3_generic_phy[i]); + if (ret < 0) + goto err3; + } ret = dwc3_event_buffers_setup(dwc); if (ret) { @@ -1228,20 +1273,29 @@ static int dwc3_core_init(struct dwc3 *dwc) return 0; err4: - phy_power_off(dwc->usb3_generic_phy); + for (i = 0; i < dwc->num_ssphy; i++) + phy_power_off(dwc->usb3_generic_phy[i]); err3: - phy_power_off(dwc->usb2_generic_phy); + for (i = 0; i < dwc->num_hsphy; i++) + phy_power_off(dwc->usb2_generic_phy[i]); err2: - usb_phy_set_suspend(dwc->usb2_phy, 1); - usb_phy_set_suspend(dwc->usb3_phy, 1); + for (i = 0; i < dwc->num_hsphy; i++) + usb_phy_set_suspend(dwc->usb2_phy[i], 1); + for (i = 0; i < dwc->num_ssphy; i++) + usb_phy_set_suspend(dwc->usb3_phy[i], 1); err1: - usb_phy_shutdown(dwc->usb2_phy); - usb_phy_shutdown(dwc->usb3_phy); - phy_exit(dwc->usb2_generic_phy); - phy_exit(dwc->usb3_generic_phy); + for (i = 0; i < dwc->num_hsphy; i++) { + usb_phy_shutdown(dwc->usb2_phy[i]); + phy_exit(dwc->usb2_generic_phy[i]); + } + + for (i = 0; i < dwc->num_ssphy; i++) { + usb_phy_shutdown(dwc->usb3_phy[i]); + phy_exit(dwc->usb3_generic_phy[i]); + } err0a: dwc3_ulpi_exit(dwc); @@ -1250,53 +1304,173 @@ static int dwc3_core_init(struct dwc3 *dwc) return ret; } -static int dwc3_core_get_phy(struct dwc3 *dwc) +static struct usb_phy *dwc3_core_get_phy_by_handle_with_node(struct device *dev, + const char *phandle, u8 index, struct device_node *lookup_node) +{ + struct device_node *node; + struct usb_phy *phy; + + node = of_parse_phandle(lookup_node, phandle, index); + if (!node) { + dev_err(dev, "failed to get %s phandle in %pOF node\n", phandle, + dev->of_node); + return ERR_PTR(-ENODEV); + } + phy = devm_usb_get_phy_by_node(dev, node, NULL); + of_node_put(node); + return phy; +} + +static int dwc3_count_phys(struct dwc3 *dwc, struct device_node *lookup_node) +{ + int count; + + count = of_count_phandle_with_args(lookup_node, "phys", NULL); + + if (count == -ENOENT) + count = of_count_phandle_with_args(lookup_node, "usb-phy", NULL); + + if (count == 1) { + dwc->num_hsphy++; + } else if (count == 2) { + dwc->num_hsphy++; + dwc->num_ssphy++; + } else { + return count; + } + return 0; +} + +static int dwc3_extract_num_phys(struct dwc3 *dwc) +{ + struct device_node *ports, *port; + int ret; + + /* Find if any "multiport" child is present inside DWC3*/ + for_each_available_child_of_node(dwc->dev->of_node, ports) { + if (!strcmp(ports->name, "multiports")) + break; + } + if (!ports) { + dwc->num_hsphy = 1; + dwc->num_ssphy = 1; + } else { + for_each_available_child_of_node(ports, port) { + ret = dwc3_count_phys(dwc, port); + if (ret) + return ret; + } + } + dev_info(dwc->dev, "Num of HS and SS PHY are %u %u\n", dwc->num_hsphy, dwc->num_ssphy); + + dwc->usb2_phy = devm_kzalloc(dwc->dev, + sizeof(*dwc->usb2_phy) * dwc->num_hsphy, GFP_KERNEL); + if (!dwc->usb2_phy) + return -ENOMEM; + + dwc->usb3_phy = devm_kzalloc(dwc->dev, + sizeof(*dwc->usb3_phy) * dwc->num_ssphy, GFP_KERNEL); + if (!dwc->usb3_phy) + return -ENOMEM; + + dwc->usb2_generic_phy = devm_kzalloc(dwc->dev, + sizeof(*dwc->usb2_generic_phy) * dwc->num_hsphy, GFP_KERNEL); + if (!dwc->usb2_generic_phy) + return -ENOMEM; + + dwc->usb3_generic_phy = devm_kzalloc(dwc->dev, + sizeof(*dwc->usb3_generic_phy) * dwc->num_ssphy, GFP_KERNEL); + if (!dwc->usb3_generic_phy) + return -ENOMEM; + + return 0; +} + +static int dwc3_core_get_phy_by_node(struct dwc3 *dwc, + struct device_node *lookup_node, int i) { struct device *dev = dwc->dev; - struct device_node *node = dev->of_node; - int ret; + int ret; - if (node) { - dwc->usb2_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 0); - dwc->usb3_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 1); + if (lookup_node) { + dwc->usb2_phy[i] = dwc3_core_get_phy_by_handle_with_node(dev, + "usb-phy", 0, lookup_node); + dwc->usb3_phy[i] = dwc3_core_get_phy_by_handle_with_node(dev, + "usb-phy", 1, lookup_node); } else { - dwc->usb2_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); - dwc->usb3_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3); + dwc->usb2_phy[i] = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); + dwc->usb3_phy[i] = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3); } - if (IS_ERR(dwc->usb2_phy)) { - ret = PTR_ERR(dwc->usb2_phy); + if (IS_ERR(dwc->usb2_phy[i])) { + ret = PTR_ERR(dwc->usb2_phy[i]); if (ret == -ENXIO || ret == -ENODEV) - dwc->usb2_phy = NULL; + dwc->usb2_phy[i] = NULL; else return dev_err_probe(dev, ret, "no usb2 phy configured\n"); } - if (IS_ERR(dwc->usb3_phy)) { - ret = PTR_ERR(dwc->usb3_phy); + if (IS_ERR(dwc->usb3_phy[i])) { + ret = PTR_ERR(dwc->usb3_phy[i]); if (ret == -ENXIO || ret == -ENODEV) - dwc->usb3_phy = NULL; + dwc->usb3_phy[i] = NULL; else return dev_err_probe(dev, ret, "no usb3 phy configured\n"); } - dwc->usb2_generic_phy = devm_phy_get(dev, "usb2-phy"); - if (IS_ERR(dwc->usb2_generic_phy)) { - ret = PTR_ERR(dwc->usb2_generic_phy); - if (ret == -ENOSYS || ret == -ENODEV) - dwc->usb2_generic_phy = NULL; + dwc->usb2_generic_phy[i] = devm_of_phy_get(dev, lookup_node, "usb2-phy"); + if (IS_ERR(dwc->usb2_generic_phy[i])) { + ret = PTR_ERR(dwc->usb2_generic_phy[i]); + if (ret == -ENODEV) + dwc->usb2_generic_phy[i] = NULL; else return dev_err_probe(dev, ret, "no usb2 phy configured\n"); } - dwc->usb3_generic_phy = devm_phy_get(dev, "usb3-phy"); - if (IS_ERR(dwc->usb3_generic_phy)) { - ret = PTR_ERR(dwc->usb3_generic_phy); - if (ret == -ENOSYS || ret == -ENODEV) - dwc->usb3_generic_phy = NULL; + dwc->usb3_generic_phy[i] = devm_of_phy_get(dev, lookup_node, "usb3-phy"); + if (IS_ERR(dwc->usb3_generic_phy[i])) { + ret = PTR_ERR(dwc->usb3_generic_phy[i]); + if (ret == -ENODEV) + dwc->usb3_generic_phy[i] = NULL; else return dev_err_probe(dev, ret, "no usb3 phy configured\n"); } + return 0; +} + +static int dwc3_core_get_phy(struct dwc3 *dwc) +{ + struct device *dev = dwc->dev; + struct device_node *node = dev->of_node; + struct device_node *ports, *port; + + int ret, i = 0; + + ret = dwc3_extract_num_phys(dwc); + if (ret) { + dev_err(dwc->dev, "Unable to extract number of PHYs\n"); + return ret; + } + + /* Find if any "multiport" child is present inside DWC3*/ + for_each_available_child_of_node(node, ports) { + if (!strcmp(ports->name, "multiport")) + break; + } + + if (!ports) { + ret = dwc3_core_get_phy_by_node(dwc, node, 0); + if (ret) + return ret; + } else { + for_each_available_child_of_node(ports, port) { + ret = dwc3_core_get_phy_by_node(dwc, port, i); + if (ret) + return ret; + i++; + } + } + pr_info("USB phy all good\n"); return 0; } @@ -1304,16 +1478,16 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) static int dwc3_core_init_mode(struct dwc3 *dwc) { struct device *dev = dwc->dev; - int ret; + int i, ret; switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_DEVICE); - if (dwc->usb2_phy) - otg_set_vbus(dwc->usb2_phy->otg, false); - phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_DEVICE); - phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_DEVICE); + if (dwc->usb2_phy[0]) + otg_set_vbus(dwc->usb2_phy[0]->otg, false); + phy_set_mode(dwc->usb2_generic_phy[0], PHY_MODE_USB_DEVICE); + phy_set_mode(dwc->usb3_generic_phy[0], PHY_MODE_USB_DEVICE); ret = dwc3_gadget_init(dwc); if (ret) @@ -1322,10 +1496,15 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) case USB_DR_MODE_HOST: dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST); - if (dwc->usb2_phy) - otg_set_vbus(dwc->usb2_phy->otg, true); - phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_HOST); - phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_HOST); + for (i = 0; i < dwc->num_ssphy; i++) { + if (dwc->usb2_phy[i]) + otg_set_vbus(dwc->usb2_phy[i]->otg, true); + phy_set_mode(dwc->usb2_generic_phy[i], PHY_MODE_USB_HOST); + } + + + for (i = 0; i < dwc->num_ssphy; i++) + phy_set_mode(dwc->usb3_generic_phy[i], PHY_MODE_USB_HOST); ret = dwc3_host_init(dwc); if (ret) @@ -1673,7 +1852,7 @@ static int dwc3_probe(struct platform_device *pdev) struct resource *res, dwc_res; struct dwc3 *dwc; - int ret; + int ret, i; void __iomem *regs; @@ -1838,15 +2017,23 @@ static int dwc3_probe(struct platform_device *pdev) dwc3_debugfs_exit(dwc); dwc3_event_buffers_cleanup(dwc); - usb_phy_shutdown(dwc->usb2_phy); - usb_phy_shutdown(dwc->usb3_phy); - phy_exit(dwc->usb2_generic_phy); - phy_exit(dwc->usb3_generic_phy); + for (i = 0; i < dwc->num_hsphy; i++) { + usb_phy_shutdown(dwc->usb2_phy[i]); + phy_exit(dwc->usb2_generic_phy[i]); + } + for (i = 0; i < dwc->num_ssphy; i++) { + usb_phy_shutdown(dwc->usb3_phy[i]); + phy_exit(dwc->usb3_generic_phy[i]); + } - usb_phy_set_suspend(dwc->usb2_phy, 1); - usb_phy_set_suspend(dwc->usb3_phy, 1); - phy_power_off(dwc->usb2_generic_phy); - phy_power_off(dwc->usb3_generic_phy); + for (i = 0; i < dwc->num_hsphy; i++) { + usb_phy_set_suspend(dwc->usb2_phy[i], 1); + phy_power_off(dwc->usb2_generic_phy[i]); + } + for (i = 0; i < dwc->num_ssphy; i++) { + usb_phy_set_suspend(dwc->usb3_phy[i], 1); + phy_power_off(dwc->usb3_generic_phy[i]); + } dwc3_ulpi_exit(dwc); @@ -1928,6 +2115,7 @@ static int dwc3_core_init_for_resume(struct dwc3 *dwc) static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) { + int i; unsigned long flags; u32 reg; @@ -1950,17 +2138,21 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) /* Let controller to suspend HSPHY before PHY driver suspends */ if (dwc->dis_u2_susphy_quirk || dwc->dis_enblslpm_quirk) { - reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); - reg |= DWC3_GUSB2PHYCFG_ENBLSLPM | - DWC3_GUSB2PHYCFG_SUSPHY; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); - - /* Give some time for USB2 PHY to suspend */ - usleep_range(5000, 6000); + for (i = 0; i < dwc->num_hsphy; i++) { + reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i)); + reg |= DWC3_GUSB2PHYCFG_ENBLSLPM | + DWC3_GUSB2PHYCFG_SUSPHY; + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); + + /* Give some time for USB2 PHY to suspend */ + usleep_range(5000, 6000); + } } - phy_pm_runtime_put_sync(dwc->usb2_generic_phy); - phy_pm_runtime_put_sync(dwc->usb3_generic_phy); + for (i = 0; i < dwc->num_hsphy; i++) + phy_pm_runtime_put_sync(dwc->usb2_generic_phy[i]); + for (i = 0; i < dwc->num_ssphy; i++) + phy_pm_runtime_put_sync(dwc->usb3_generic_phy[i]); break; case DWC3_GCTL_PRTCAP_OTG: /* do nothing during runtime_suspend */ @@ -1988,7 +2180,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) { unsigned long flags; - int ret; + int i, ret; u32 reg; switch (dwc->current_dr_role) { @@ -2011,17 +2203,21 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) break; } /* Restore GUSB2PHYCFG bits that were modified in suspend */ - reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); - if (dwc->dis_u2_susphy_quirk) - reg &= ~DWC3_GUSB2PHYCFG_SUSPHY; + for (i = 0; i < dwc->num_hsphy; i++) { + reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i)); + if (dwc->dis_u2_susphy_quirk) + reg &= ~DWC3_GUSB2PHYCFG_SUSPHY; - if (dwc->dis_enblslpm_quirk) - reg &= ~DWC3_GUSB2PHYCFG_ENBLSLPM; + if (dwc->dis_enblslpm_quirk) + reg &= ~DWC3_GUSB2PHYCFG_ENBLSLPM; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); + } - phy_pm_runtime_get_sync(dwc->usb2_generic_phy); - phy_pm_runtime_get_sync(dwc->usb3_generic_phy); + for (i = 0; i < dwc->num_hsphy; i++) + phy_pm_runtime_get_sync(dwc->usb2_generic_phy[i]); + for (i = 0; i < dwc->num_ssphy; i++) + phy_pm_runtime_get_sync(dwc->usb3_generic_phy[i]); break; case DWC3_GCTL_PRTCAP_OTG: /* nothing to do on runtime_resume */ diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 81c486b..53b9f63c 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1020,6 +1020,8 @@ struct dwc3_scratchpad_array { * @usb_psy: pointer to power supply interface. * @usb2_phy: pointer to USB2 PHY * @usb3_phy: pointer to USB3 PHY + * @num_hsphy: Number of HS ports controlled by the core + * @num_dsphy: Number of SS ports controlled by the core * @usb2_generic_phy: pointer to USB2 PHY * @usb3_generic_phy: pointer to USB3 PHY * @phys_ready: flag to indicate that PHYs are ready @@ -1147,11 +1149,13 @@ struct dwc3 { struct reset_control *reset; - struct usb_phy *usb2_phy; - struct usb_phy *usb3_phy; + struct usb_phy **usb2_phy; + struct usb_phy **usb3_phy; + u32 num_hsphy; + u32 num_ssphy; - struct phy *usb2_generic_phy; - struct phy *usb3_generic_phy; + struct phy **usb2_generic_phy; + struct phy **usb3_generic_phy; bool phys_ready; diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c index 039bf24..404643f 100644 --- a/drivers/usb/dwc3/drd.c +++ b/drivers/usb/dwc3/drd.c @@ -384,10 +384,10 @@ void dwc3_otg_update(struct dwc3 *dwc, bool ignore_idstatus) if (ret) { dev_err(dwc->dev, "failed to initialize host\n"); } else { - if (dwc->usb2_phy) - otg_set_vbus(dwc->usb2_phy->otg, true); - if (dwc->usb2_generic_phy) - phy_set_mode(dwc->usb2_generic_phy, + if (dwc->usb2_phy[0]) + otg_set_vbus(dwc->usb2_phy[0]->otg, true); + if (dwc->usb2_generic_phy[0]) + phy_set_mode(dwc->usb2_generic_phy[0], PHY_MODE_USB_HOST); } break; @@ -398,10 +398,10 @@ void dwc3_otg_update(struct dwc3 *dwc, bool ignore_idstatus) dwc3_event_buffers_setup(dwc); spin_unlock_irqrestore(&dwc->lock, flags); - if (dwc->usb2_phy) - otg_set_vbus(dwc->usb2_phy->otg, false); - if (dwc->usb2_generic_phy) - phy_set_mode(dwc->usb2_generic_phy, + if (dwc->usb2_phy[0]) + otg_set_vbus(dwc->usb2_phy[0]->otg, false); + if (dwc->usb2_generic_phy[0]) + phy_set_mode(dwc->usb2_generic_phy[0], PHY_MODE_USB_DEVICE); ret = dwc3_gadget_init(dwc); if (ret) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 4f54f0e..c58a67c 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2870,8 +2870,8 @@ static int dwc3_gadget_vbus_draw(struct usb_gadget *g, unsigned int mA) union power_supply_propval val = {0}; int ret; - if (dwc->usb2_phy) - return usb_phy_set_power(dwc->usb2_phy, mA); + if (dwc->usb2_phy[0]) + return usb_phy_set_power(dwc->usb2_phy[0], mA); if (!dwc->usb_psy) return -EOPNOTSUPP; -- 2.7.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [RFC v2 2/2] usb: dwc3: Refactor PHY logic to support Multiport Controller 2022-05-26 10:13 ` [RFC v2 2/2] usb: dwc3: Refactor PHY logic to support Multiport Controller Harsh Agarwal @ 2022-05-27 2:31 ` Pavan Kondeti 2022-05-31 8:25 ` Harsh Agarwal 0 siblings, 1 reply; 9+ messages in thread From: Pavan Kondeti @ 2022-05-27 2:31 UTC (permalink / raw) To: Harsh Agarwal Cc: Greg Kroah-Hartman, Philipp Zabel, Rob Herring, Krzysztof Kozlowski, Bjorn Andersson, Felipe Balbi, devicetree, linux-usb, linux-kernel, quic_pkondeti, quic_ppratap Hi Harsh, On Thu, May 26, 2022 at 03:43:49PM +0530, Harsh Agarwal wrote: > Currently the USB driver supports only single port controller > which works with 2 PHYs at max ie HS and SS. > > But some devices have "multiport" controller where a single > controller supports multiple ports and each port have their own > PHYs. Refactor PHY logic to support the same. > > This implementation is compatible with existing glue drivers. > > Signed-off-by: Harsh Agarwal <quic_harshq@quicinc.com> > --- > drivers/usb/dwc3/core.c | 420 +++++++++++++++++++++++++++++++++------------- > drivers/usb/dwc3/core.h | 12 +- > drivers/usb/dwc3/drd.c | 16 +- > drivers/usb/dwc3/gadget.c | 4 +- > 4 files changed, 326 insertions(+), 126 deletions(-) > > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > index 2682469..def08ac 100644 > --- a/drivers/usb/dwc3/core.c > +++ b/drivers/usb/dwc3/core.c > @@ -120,7 +120,7 @@ static void __dwc3_set_mode(struct work_struct *work) > { > struct dwc3 *dwc = work_to_dwc(work); > unsigned long flags; > - int ret; > + int i, ret; > u32 reg; > > mutex_lock(&dwc->mutex); > @@ -189,10 +189,13 @@ static void __dwc3_set_mode(struct work_struct *work) > if (ret) { > dev_err(dwc->dev, "failed to initialize host\n"); > } else { > - if (dwc->usb2_phy) > - otg_set_vbus(dwc->usb2_phy->otg, true); > - phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_HOST); > - phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_HOST); > + for (i = 0; i < dwc->num_hsphy; i++) { > + if (dwc->usb2_phy[i]) > + otg_set_vbus(dwc->usb2_phy[i]->otg, true); > + phy_set_mode(dwc->usb2_generic_phy[i], PHY_MODE_USB_HOST); > + } > + for (i = 0; i < dwc->num_ssphy; i++) > + phy_set_mode(dwc->usb3_generic_phy[i], PHY_MODE_USB_HOST); > if (dwc->dis_split_quirk) { > reg = dwc3_readl(dwc->regs, DWC3_GUCTL3); > reg |= DWC3_GUCTL3_SPLITDISABLE; > @@ -205,10 +208,10 @@ static void __dwc3_set_mode(struct work_struct *work) > > dwc3_event_buffers_setup(dwc); > > - if (dwc->usb2_phy) > - otg_set_vbus(dwc->usb2_phy->otg, false); > - phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_DEVICE); > - phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_DEVICE); > + if (dwc->usb2_phy[0]) > + otg_set_vbus(dwc->usb2_phy[0]->otg, false); > + phy_set_mode(dwc->usb2_generic_phy[0], PHY_MODE_USB_DEVICE); > + phy_set_mode(dwc->usb3_generic_phy[0], PHY_MODE_USB_DEVICE); > > ret = dwc3_gadget_init(dwc); > if (ret) > @@ -655,12 +658,18 @@ static int dwc3_core_ulpi_init(struct dwc3 *dwc) > */ > static int dwc3_phy_setup(struct dwc3 *dwc) > { > + int i; > unsigned int hw_mode; > u32 reg; > > hw_mode = DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0); > > reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)); > + for (i = 1; i < dwc->num_ssphy; i++) { > + if (reg != dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(i))) > + dev_warn(dwc->dev, > + "Reset values of pipectl registers 0 and %d are different!\n", i); > + } Can you please elaborate on this? What is the purpose of checking POR reset values of other ports against first port? If this is some debug code, please remove it. > > /* > * Make sure UX_EXIT_PX is cleared as that causes issues with some > @@ -715,9 +724,15 @@ static int dwc3_phy_setup(struct dwc3 *dwc) > if (dwc->dis_del_phy_power_chg_quirk) > reg &= ~DWC3_GUSB3PIPECTL_DEPOCHANGE; > > - dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg); > + for (i = 0; i < dwc->num_ssphy; i++) > + dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(i), reg); > > reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); > + for (i = 1; i < dwc->num_hsphy; i++) { > + if (reg != dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i))) > + dev_warn(dwc->dev, > + "Reset values of usb2phycfg register 0 and %d are different!\n", i); > + } ditto > > /* Select the HS PHY interface */ > switch (DWC3_GHWPARAMS3_HSPHY_IFC(dwc->hwparams.hwparams3)) { > @@ -729,7 +744,8 @@ static int dwc3_phy_setup(struct dwc3 *dwc) > } else if (dwc->hsphy_interface && > !strncmp(dwc->hsphy_interface, "ulpi", 4)) { > reg |= DWC3_GUSB2PHYCFG_ULPI_UTMI; > - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); > + for (i = 0; i < dwc->num_hsphy; i++) > + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); > } else { > /* Relying on default value. */ > if (!(reg & DWC3_GUSB2PHYCFG_ULPI_UTMI)) > @@ -786,7 +802,8 @@ static int dwc3_phy_setup(struct dwc3 *dwc) > if (dwc->dis_u2_freeclk_exists_quirk) > reg &= ~DWC3_GUSB2PHYCFG_U2_FREECLK_EXISTS; > > - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); > + for (i = 0; i < dwc->num_hsphy; i++) > + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); > > return 0; > } > @@ -825,17 +842,29 @@ static void dwc3_clk_disable(struct dwc3 *dwc) > > static void dwc3_core_exit(struct dwc3 *dwc) > { > + int i; > dwc3_event_buffers_cleanup(dwc); > > - usb_phy_shutdown(dwc->usb2_phy); > - usb_phy_shutdown(dwc->usb3_phy); > - phy_exit(dwc->usb2_generic_phy); > - phy_exit(dwc->usb3_generic_phy); > + for (i = 0; i < dwc->num_hsphy; i++) { > + usb_phy_shutdown(dwc->usb2_phy[i]); > + phy_exit(dwc->usb2_generic_phy[i]); > + } > + > + for (i = 0; i < dwc->num_ssphy; i++) { > + usb_phy_shutdown(dwc->usb3_phy[i]); > + phy_exit(dwc->usb3_generic_phy[i]); > + } > + > + for (i = 0; i < dwc->num_hsphy; i++) { > + usb_phy_set_suspend(dwc->usb2_phy[i], 1); > + phy_power_off(dwc->usb2_generic_phy[i]); > + } can you club this block with the first for loop around num_hsphy? > + > + for (i = 0; i < dwc->num_ssphy; i++) { > + usb_phy_set_suspend(dwc->usb3_phy[i], 1); > + phy_power_off(dwc->usb3_generic_phy[i]); > + } can you club this block with the first for loop around num_ssphy? > > - usb_phy_set_suspend(dwc->usb2_phy, 1); > - usb_phy_set_suspend(dwc->usb3_phy, 1); > - phy_power_off(dwc->usb2_generic_phy); > - phy_power_off(dwc->usb3_generic_phy); > dwc3_clk_disable(dwc); > reset_control_assert(dwc->reset); > } > @@ -1038,7 +1067,7 @@ static int dwc3_core_init(struct dwc3 *dwc) > { > unsigned int hw_mode; > u32 reg; > - int ret; > + int ret, i; > > hw_mode = DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0); > > @@ -1066,16 +1095,24 @@ static int dwc3_core_init(struct dwc3 *dwc) > dwc->phys_ready = true; > } > > - usb_phy_init(dwc->usb2_phy); > - usb_phy_init(dwc->usb3_phy); > - ret = phy_init(dwc->usb2_generic_phy); > - if (ret < 0) > - goto err0a; > + for (i = 0; i < dwc->num_hsphy; i++) > + usb_phy_init(dwc->usb2_phy[i]); > + for (i = 0; i < dwc->num_ssphy; i++) > + usb_phy_init(dwc->usb3_phy[i]); > > - ret = phy_init(dwc->usb3_generic_phy); > - if (ret < 0) { > - phy_exit(dwc->usb2_generic_phy); > - goto err0a; > + for (i = 0; i < dwc->num_hsphy; i++) { > + ret = phy_init(dwc->usb2_generic_phy[i]); > + if (ret < 0) > + goto err0a; > + } > + > + for (i = 0; i < dwc->num_ssphy; i++) { > + ret = phy_init(dwc->usb3_generic_phy[i]); > + if (ret < 0) { > + for (i = 0; i < dwc->num_hsphy; i++) > + phy_exit(dwc->usb2_generic_phy[i]); > + goto err0a; > + } > } > > ret = dwc3_core_soft_reset(dwc); > @@ -1085,15 +1122,19 @@ static int dwc3_core_init(struct dwc3 *dwc) > if (hw_mode == DWC3_GHWPARAMS0_MODE_DRD && > !DWC3_VER_IS_WITHIN(DWC3, ANY, 194A)) { > if (!dwc->dis_u3_susphy_quirk) { > - reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)); > - reg |= DWC3_GUSB3PIPECTL_SUSPHY; > - dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg); > + for (i = 0; i < dwc->num_ssphy; i++) { > + reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(i)); > + reg |= DWC3_GUSB3PIPECTL_SUSPHY; > + dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(i), reg); > + } > } > > if (!dwc->dis_u2_susphy_quirk) { > - reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); > - reg |= DWC3_GUSB2PHYCFG_SUSPHY; > - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); > + for (i = 0; i < dwc->num_hsphy; i++) { > + reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i)); > + reg |= DWC3_GUSB2PHYCFG_SUSPHY; > + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); > + } > } > } > > @@ -1112,15 +1153,19 @@ static int dwc3_core_init(struct dwc3 *dwc) > > dwc3_set_incr_burst_type(dwc); > > - usb_phy_set_suspend(dwc->usb2_phy, 0); > - usb_phy_set_suspend(dwc->usb3_phy, 0); > - ret = phy_power_on(dwc->usb2_generic_phy); > - if (ret < 0) > - goto err2; > + for (i = 0; i < dwc->num_hsphy; i++) { > + usb_phy_set_suspend(dwc->usb2_phy[i], 0); > + ret = phy_power_on(dwc->usb2_generic_phy[i]); > + if (ret < 0) > + goto err2; > + } > > - ret = phy_power_on(dwc->usb3_generic_phy); > - if (ret < 0) > - goto err3; > + for (i = 0; i < dwc->num_ssphy; i++) { > + usb_phy_set_suspend(dwc->usb3_phy[i], 0); > + ret = phy_power_on(dwc->usb3_generic_phy[i]); > + if (ret < 0) > + goto err3; > + } > > ret = dwc3_event_buffers_setup(dwc); > if (ret) { > @@ -1228,20 +1273,29 @@ static int dwc3_core_init(struct dwc3 *dwc) > return 0; > > err4: > - phy_power_off(dwc->usb3_generic_phy); > + for (i = 0; i < dwc->num_ssphy; i++) > + phy_power_off(dwc->usb3_generic_phy[i]); > > err3: > - phy_power_off(dwc->usb2_generic_phy); > + for (i = 0; i < dwc->num_hsphy; i++) > + phy_power_off(dwc->usb2_generic_phy[i]); > > err2: > - usb_phy_set_suspend(dwc->usb2_phy, 1); > - usb_phy_set_suspend(dwc->usb3_phy, 1); > + for (i = 0; i < dwc->num_hsphy; i++) > + usb_phy_set_suspend(dwc->usb2_phy[i], 1); > + for (i = 0; i < dwc->num_ssphy; i++) > + usb_phy_set_suspend(dwc->usb3_phy[i], 1); > > err1: > - usb_phy_shutdown(dwc->usb2_phy); > - usb_phy_shutdown(dwc->usb3_phy); > - phy_exit(dwc->usb2_generic_phy); > - phy_exit(dwc->usb3_generic_phy); > + for (i = 0; i < dwc->num_hsphy; i++) { > + usb_phy_shutdown(dwc->usb2_phy[i]); > + phy_exit(dwc->usb2_generic_phy[i]); > + } > + > + for (i = 0; i < dwc->num_ssphy; i++) { > + usb_phy_shutdown(dwc->usb3_phy[i]); > + phy_exit(dwc->usb3_generic_phy[i]); > + } > > err0a: > dwc3_ulpi_exit(dwc); > @@ -1250,53 +1304,173 @@ static int dwc3_core_init(struct dwc3 *dwc) > return ret; > } > > -static int dwc3_core_get_phy(struct dwc3 *dwc) > +static struct usb_phy *dwc3_core_get_phy_by_handle_with_node(struct device *dev, > + const char *phandle, u8 index, struct device_node *lookup_node) > +{ > + struct device_node *node; > + struct usb_phy *phy; > + > + node = of_parse_phandle(lookup_node, phandle, index); > + if (!node) { > + dev_err(dev, "failed to get %s phandle in %pOF node\n", phandle, > + dev->of_node); > + return ERR_PTR(-ENODEV); > + } > + phy = devm_usb_get_phy_by_node(dev, node, NULL); > + of_node_put(node); > + return phy; > +} Can you call it devm_of_usb_get_phy_by_phandle() and add it to USB PHY library (include/linux/usb/phy.h and drivers/usb/phy/phy.c). A separate patch ofcourse. > + > +static int dwc3_count_phys(struct dwc3 *dwc, struct device_node *lookup_node) > +{ > + int count; > + > + count = of_count_phandle_with_args(lookup_node, "phys", NULL); > + > + if (count == -ENOENT) > + count = of_count_phandle_with_args(lookup_node, "usb-phy", NULL); > + > + if (count == 1) { > + dwc->num_hsphy++; > + } else if (count == 2) { > + dwc->num_hsphy++; > + dwc->num_ssphy++; > + } else { > + return count; > + } > + return 0; > +} > + > +static int dwc3_extract_num_phys(struct dwc3 *dwc) > +{ > + struct device_node *ports, *port; > + int ret; > + > + /* Find if any "multiport" child is present inside DWC3*/ > + for_each_available_child_of_node(dwc->dev->of_node, ports) { > + if (!strcmp(ports->name, "multiports")) > + break; > + } > + if (!ports) { > + dwc->num_hsphy = 1; > + dwc->num_ssphy = 1; > + } else { > + for_each_available_child_of_node(ports, port) { > + ret = dwc3_count_phys(dwc, port); > + if (ret) > + return ret; > + } > + } > + dev_info(dwc->dev, "Num of HS and SS PHY are %u %u\n", dwc->num_hsphy, dwc->num_ssphy); > + > + dwc->usb2_phy = devm_kzalloc(dwc->dev, > + sizeof(*dwc->usb2_phy) * dwc->num_hsphy, GFP_KERNEL); > + if (!dwc->usb2_phy) > + return -ENOMEM; > + > + dwc->usb3_phy = devm_kzalloc(dwc->dev, > + sizeof(*dwc->usb3_phy) * dwc->num_ssphy, GFP_KERNEL); > + if (!dwc->usb3_phy) > + return -ENOMEM; > + > + dwc->usb2_generic_phy = devm_kzalloc(dwc->dev, > + sizeof(*dwc->usb2_generic_phy) * dwc->num_hsphy, GFP_KERNEL); > + if (!dwc->usb2_generic_phy) > + return -ENOMEM; > + > + dwc->usb3_generic_phy = devm_kzalloc(dwc->dev, > + sizeof(*dwc->usb3_generic_phy) * dwc->num_ssphy, GFP_KERNEL); > + if (!dwc->usb3_generic_phy) > + return -ENOMEM; > + > + return 0; > +} > + The parsing scheme looks good to me. > +static int dwc3_core_get_phy_by_node(struct dwc3 *dwc, > + struct device_node *lookup_node, int i) > { > struct device *dev = dwc->dev; > - struct device_node *node = dev->of_node; > - int ret; > + int ret; > > - if (node) { > - dwc->usb2_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 0); > - dwc->usb3_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 1); > + if (lookup_node) { > + dwc->usb2_phy[i] = dwc3_core_get_phy_by_handle_with_node(dev, > + "usb-phy", 0, lookup_node); > + dwc->usb3_phy[i] = dwc3_core_get_phy_by_handle_with_node(dev, > + "usb-phy", 1, lookup_node); > } else { > - dwc->usb2_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); > - dwc->usb3_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3); > + dwc->usb2_phy[i] = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); > + dwc->usb3_phy[i] = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3); > } > > - if (IS_ERR(dwc->usb2_phy)) { > - ret = PTR_ERR(dwc->usb2_phy); > + if (IS_ERR(dwc->usb2_phy[i])) { > + ret = PTR_ERR(dwc->usb2_phy[i]); > if (ret == -ENXIO || ret == -ENODEV) > - dwc->usb2_phy = NULL; > + dwc->usb2_phy[i] = NULL; > else > return dev_err_probe(dev, ret, "no usb2 phy configured\n"); > } > > - if (IS_ERR(dwc->usb3_phy)) { > - ret = PTR_ERR(dwc->usb3_phy); > + if (IS_ERR(dwc->usb3_phy[i])) { > + ret = PTR_ERR(dwc->usb3_phy[i]); > if (ret == -ENXIO || ret == -ENODEV) > - dwc->usb3_phy = NULL; > + dwc->usb3_phy[i] = NULL; > else > return dev_err_probe(dev, ret, "no usb3 phy configured\n"); > } > > - dwc->usb2_generic_phy = devm_phy_get(dev, "usb2-phy"); > - if (IS_ERR(dwc->usb2_generic_phy)) { > - ret = PTR_ERR(dwc->usb2_generic_phy); > - if (ret == -ENOSYS || ret == -ENODEV) > - dwc->usb2_generic_phy = NULL; > + dwc->usb2_generic_phy[i] = devm_of_phy_get(dev, lookup_node, "usb2-phy"); > + if (IS_ERR(dwc->usb2_generic_phy[i])) { > + ret = PTR_ERR(dwc->usb2_generic_phy[i]); > + if (ret == -ENODEV) > + dwc->usb2_generic_phy[i] = NULL; > else > return dev_err_probe(dev, ret, "no usb2 phy configured\n"); > } > > - dwc->usb3_generic_phy = devm_phy_get(dev, "usb3-phy"); > - if (IS_ERR(dwc->usb3_generic_phy)) { > - ret = PTR_ERR(dwc->usb3_generic_phy); > - if (ret == -ENOSYS || ret == -ENODEV) > - dwc->usb3_generic_phy = NULL; > + dwc->usb3_generic_phy[i] = devm_of_phy_get(dev, lookup_node, "usb3-phy"); > + if (IS_ERR(dwc->usb3_generic_phy[i])) { > + ret = PTR_ERR(dwc->usb3_generic_phy[i]); > + if (ret == -ENODEV) > + dwc->usb3_generic_phy[i] = NULL; > else > return dev_err_probe(dev, ret, "no usb3 phy configured\n"); > } > + return 0; > +} > + > +static int dwc3_core_get_phy(struct dwc3 *dwc) > +{ > + struct device *dev = dwc->dev; > + struct device_node *node = dev->of_node; > + struct device_node *ports, *port; > + > + int ret, i = 0; nit: remove the above empty line. > + > + ret = dwc3_extract_num_phys(dwc); > + if (ret) { > + dev_err(dwc->dev, "Unable to extract number of PHYs\n"); > + return ret; > + } > + > + /* Find if any "multiport" child is present inside DWC3*/ > + for_each_available_child_of_node(node, ports) { > + if (!strcmp(ports->name, "multiport")) > + break; > + } > + > + if (!ports) { > + ret = dwc3_core_get_phy_by_node(dwc, node, 0); > + if (ret) > + return ret; > + } else { > + for_each_available_child_of_node(ports, port) { > + ret = dwc3_core_get_phy_by_node(dwc, port, i); > + if (ret) > + return ret; > + i++; > + } > + } > + pr_info("USB phy all good\n"); Remove this debug code. or make it dev_dbg with information. Thanks, Pavan ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC v2 2/2] usb: dwc3: Refactor PHY logic to support Multiport Controller 2022-05-27 2:31 ` Pavan Kondeti @ 2022-05-31 8:25 ` Harsh Agarwal 0 siblings, 0 replies; 9+ messages in thread From: Harsh Agarwal @ 2022-05-31 8:25 UTC (permalink / raw) To: Pavan Kondeti Cc: Greg Kroah-Hartman, Philipp Zabel, Rob Herring, Krzysztof Kozlowski, Bjorn Andersson, Felipe Balbi, devicetree, linux-usb, linux-kernel, quic_ppratap On 5/27/2022 8:01 AM, Pavan Kondeti wrote: > Hi Harsh, > > On Thu, May 26, 2022 at 03:43:49PM +0530, Harsh Agarwal wrote: >> Currently the USB driver supports only single port controller >> which works with 2 PHYs at max ie HS and SS. >> >> But some devices have "multiport" controller where a single >> controller supports multiple ports and each port have their own >> PHYs. Refactor PHY logic to support the same. >> >> This implementation is compatible with existing glue drivers. >> >> Signed-off-by: Harsh Agarwal <quic_harshq@quicinc.com> >> --- >> drivers/usb/dwc3/core.c | 420 +++++++++++++++++++++++++++++++++------------- >> drivers/usb/dwc3/core.h | 12 +- >> drivers/usb/dwc3/drd.c | 16 +- >> drivers/usb/dwc3/gadget.c | 4 +- >> 4 files changed, 326 insertions(+), 126 deletions(-) >> >> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c >> index 2682469..def08ac 100644 >> --- a/drivers/usb/dwc3/core.c >> +++ b/drivers/usb/dwc3/core.c >> @@ -120,7 +120,7 @@ static void __dwc3_set_mode(struct work_struct *work) >> { >> struct dwc3 *dwc = work_to_dwc(work); >> unsigned long flags; >> - int ret; >> + int i, ret; >> u32 reg; >> >> mutex_lock(&dwc->mutex); >> @@ -189,10 +189,13 @@ static void __dwc3_set_mode(struct work_struct *work) >> if (ret) { >> dev_err(dwc->dev, "failed to initialize host\n"); >> } else { >> - if (dwc->usb2_phy) >> - otg_set_vbus(dwc->usb2_phy->otg, true); >> - phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_HOST); >> - phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_HOST); >> + for (i = 0; i < dwc->num_hsphy; i++) { >> + if (dwc->usb2_phy[i]) >> + otg_set_vbus(dwc->usb2_phy[i]->otg, true); >> + phy_set_mode(dwc->usb2_generic_phy[i], PHY_MODE_USB_HOST); >> + } >> + for (i = 0; i < dwc->num_ssphy; i++) >> + phy_set_mode(dwc->usb3_generic_phy[i], PHY_MODE_USB_HOST); >> if (dwc->dis_split_quirk) { >> reg = dwc3_readl(dwc->regs, DWC3_GUCTL3); >> reg |= DWC3_GUCTL3_SPLITDISABLE; >> @@ -205,10 +208,10 @@ static void __dwc3_set_mode(struct work_struct *work) >> >> dwc3_event_buffers_setup(dwc); >> >> - if (dwc->usb2_phy) >> - otg_set_vbus(dwc->usb2_phy->otg, false); >> - phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_DEVICE); >> - phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_DEVICE); >> + if (dwc->usb2_phy[0]) >> + otg_set_vbus(dwc->usb2_phy[0]->otg, false); >> + phy_set_mode(dwc->usb2_generic_phy[0], PHY_MODE_USB_DEVICE); >> + phy_set_mode(dwc->usb3_generic_phy[0], PHY_MODE_USB_DEVICE); >> >> ret = dwc3_gadget_init(dwc); >> if (ret) >> @@ -655,12 +658,18 @@ static int dwc3_core_ulpi_init(struct dwc3 *dwc) >> */ >> static int dwc3_phy_setup(struct dwc3 *dwc) >> { >> + int i; >> unsigned int hw_mode; >> u32 reg; >> >> hw_mode = DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0); >> >> reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)); >> + for (i = 1; i < dwc->num_ssphy; i++) { >> + if (reg != dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(i))) >> + dev_warn(dwc->dev, >> + "Reset values of pipectl registers 0 and %d are different!\n", i); >> + } > Can you please elaborate on this? What is the purpose of checking POR reset > values of other ports against first port? If this is some debug code, please > remove it. I was just keeping a safe check incase all the SS PORTs of a multiport controller has same PIPECTL registers. I have removed it for now. > >> >> /* >> * Make sure UX_EXIT_PX is cleared as that causes issues with some >> @@ -715,9 +724,15 @@ static int dwc3_phy_setup(struct dwc3 *dwc) >> if (dwc->dis_del_phy_power_chg_quirk) >> reg &= ~DWC3_GUSB3PIPECTL_DEPOCHANGE; >> >> - dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg); >> + for (i = 0; i < dwc->num_ssphy; i++) >> + dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(i), reg); >> >> reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); >> + for (i = 1; i < dwc->num_hsphy; i++) { >> + if (reg != dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i))) >> + dev_warn(dwc->dev, >> + "Reset values of usb2phycfg register 0 and %d are different!\n", i); >> + } > ditto same > >> >> /* Select the HS PHY interface */ >> switch (DWC3_GHWPARAMS3_HSPHY_IFC(dwc->hwparams.hwparams3)) { >> @@ -729,7 +744,8 @@ static int dwc3_phy_setup(struct dwc3 *dwc) >> } else if (dwc->hsphy_interface && >> !strncmp(dwc->hsphy_interface, "ulpi", 4)) { >> reg |= DWC3_GUSB2PHYCFG_ULPI_UTMI; >> - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); >> + for (i = 0; i < dwc->num_hsphy; i++) >> + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); >> } else { >> /* Relying on default value. */ >> if (!(reg & DWC3_GUSB2PHYCFG_ULPI_UTMI)) >> @@ -786,7 +802,8 @@ static int dwc3_phy_setup(struct dwc3 *dwc) >> if (dwc->dis_u2_freeclk_exists_quirk) >> reg &= ~DWC3_GUSB2PHYCFG_U2_FREECLK_EXISTS; >> >> - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); >> + for (i = 0; i < dwc->num_hsphy; i++) >> + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); >> >> return 0; >> } >> @@ -825,17 +842,29 @@ static void dwc3_clk_disable(struct dwc3 *dwc) >> >> static void dwc3_core_exit(struct dwc3 *dwc) >> { >> + int i; >> dwc3_event_buffers_cleanup(dwc); >> >> - usb_phy_shutdown(dwc->usb2_phy); >> - usb_phy_shutdown(dwc->usb3_phy); >> - phy_exit(dwc->usb2_generic_phy); >> - phy_exit(dwc->usb3_generic_phy); >> + for (i = 0; i < dwc->num_hsphy; i++) { >> + usb_phy_shutdown(dwc->usb2_phy[i]); >> + phy_exit(dwc->usb2_generic_phy[i]); >> + } >> + >> + for (i = 0; i < dwc->num_ssphy; i++) { >> + usb_phy_shutdown(dwc->usb3_phy[i]); >> + phy_exit(dwc->usb3_generic_phy[i]); >> + } >> + >> + for (i = 0; i < dwc->num_hsphy; i++) { >> + usb_phy_set_suspend(dwc->usb2_phy[i], 1); >> + phy_power_off(dwc->usb2_generic_phy[i]); >> + } > can you club this block with the first for loop around num_hsphy? Done. Please check the new PS which is without RFC. > >> + >> + for (i = 0; i < dwc->num_ssphy; i++) { >> + usb_phy_set_suspend(dwc->usb3_phy[i], 1); >> + phy_power_off(dwc->usb3_generic_phy[i]); >> + } > can you club this block with the first for loop around num_ssphy? Done >> >> - usb_phy_set_suspend(dwc->usb2_phy, 1); >> - usb_phy_set_suspend(dwc->usb3_phy, 1); >> - phy_power_off(dwc->usb2_generic_phy); >> - phy_power_off(dwc->usb3_generic_phy); >> dwc3_clk_disable(dwc); >> reset_control_assert(dwc->reset); >> } >> @@ -1038,7 +1067,7 @@ static int dwc3_core_init(struct dwc3 *dwc) >> { >> unsigned int hw_mode; >> u32 reg; >> - int ret; >> + int ret, i; >> >> hw_mode = DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0); >> >> @@ -1066,16 +1095,24 @@ static int dwc3_core_init(struct dwc3 *dwc) >> dwc->phys_ready = true; >> } >> >> - usb_phy_init(dwc->usb2_phy); >> - usb_phy_init(dwc->usb3_phy); >> - ret = phy_init(dwc->usb2_generic_phy); >> - if (ret < 0) >> - goto err0a; >> + for (i = 0; i < dwc->num_hsphy; i++) >> + usb_phy_init(dwc->usb2_phy[i]); >> + for (i = 0; i < dwc->num_ssphy; i++) >> + usb_phy_init(dwc->usb3_phy[i]); >> >> - ret = phy_init(dwc->usb3_generic_phy); >> - if (ret < 0) { >> - phy_exit(dwc->usb2_generic_phy); >> - goto err0a; >> + for (i = 0; i < dwc->num_hsphy; i++) { >> + ret = phy_init(dwc->usb2_generic_phy[i]); >> + if (ret < 0) >> + goto err0a; >> + } >> + >> + for (i = 0; i < dwc->num_ssphy; i++) { >> + ret = phy_init(dwc->usb3_generic_phy[i]); >> + if (ret < 0) { >> + for (i = 0; i < dwc->num_hsphy; i++) >> + phy_exit(dwc->usb2_generic_phy[i]); >> + goto err0a; >> + } >> } >> >> ret = dwc3_core_soft_reset(dwc); >> @@ -1085,15 +1122,19 @@ static int dwc3_core_init(struct dwc3 *dwc) >> if (hw_mode == DWC3_GHWPARAMS0_MODE_DRD && >> !DWC3_VER_IS_WITHIN(DWC3, ANY, 194A)) { >> if (!dwc->dis_u3_susphy_quirk) { >> - reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)); >> - reg |= DWC3_GUSB3PIPECTL_SUSPHY; >> - dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg); >> + for (i = 0; i < dwc->num_ssphy; i++) { >> + reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(i)); >> + reg |= DWC3_GUSB3PIPECTL_SUSPHY; >> + dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(i), reg); >> + } >> } >> >> if (!dwc->dis_u2_susphy_quirk) { >> - reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); >> - reg |= DWC3_GUSB2PHYCFG_SUSPHY; >> - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); >> + for (i = 0; i < dwc->num_hsphy; i++) { >> + reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i)); >> + reg |= DWC3_GUSB2PHYCFG_SUSPHY; >> + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); >> + } >> } >> } >> >> @@ -1112,15 +1153,19 @@ static int dwc3_core_init(struct dwc3 *dwc) >> >> dwc3_set_incr_burst_type(dwc); >> >> - usb_phy_set_suspend(dwc->usb2_phy, 0); >> - usb_phy_set_suspend(dwc->usb3_phy, 0); >> - ret = phy_power_on(dwc->usb2_generic_phy); >> - if (ret < 0) >> - goto err2; >> + for (i = 0; i < dwc->num_hsphy; i++) { >> + usb_phy_set_suspend(dwc->usb2_phy[i], 0); >> + ret = phy_power_on(dwc->usb2_generic_phy[i]); >> + if (ret < 0) >> + goto err2; >> + } >> >> - ret = phy_power_on(dwc->usb3_generic_phy); >> - if (ret < 0) >> - goto err3; >> + for (i = 0; i < dwc->num_ssphy; i++) { >> + usb_phy_set_suspend(dwc->usb3_phy[i], 0); >> + ret = phy_power_on(dwc->usb3_generic_phy[i]); >> + if (ret < 0) >> + goto err3; >> + } >> >> ret = dwc3_event_buffers_setup(dwc); >> if (ret) { >> @@ -1228,20 +1273,29 @@ static int dwc3_core_init(struct dwc3 *dwc) >> return 0; >> >> err4: >> - phy_power_off(dwc->usb3_generic_phy); >> + for (i = 0; i < dwc->num_ssphy; i++) >> + phy_power_off(dwc->usb3_generic_phy[i]); >> >> err3: >> - phy_power_off(dwc->usb2_generic_phy); >> + for (i = 0; i < dwc->num_hsphy; i++) >> + phy_power_off(dwc->usb2_generic_phy[i]); >> >> err2: >> - usb_phy_set_suspend(dwc->usb2_phy, 1); >> - usb_phy_set_suspend(dwc->usb3_phy, 1); >> + for (i = 0; i < dwc->num_hsphy; i++) >> + usb_phy_set_suspend(dwc->usb2_phy[i], 1); >> + for (i = 0; i < dwc->num_ssphy; i++) >> + usb_phy_set_suspend(dwc->usb3_phy[i], 1); >> >> err1: >> - usb_phy_shutdown(dwc->usb2_phy); >> - usb_phy_shutdown(dwc->usb3_phy); >> - phy_exit(dwc->usb2_generic_phy); >> - phy_exit(dwc->usb3_generic_phy); >> + for (i = 0; i < dwc->num_hsphy; i++) { >> + usb_phy_shutdown(dwc->usb2_phy[i]); >> + phy_exit(dwc->usb2_generic_phy[i]); >> + } >> + >> + for (i = 0; i < dwc->num_ssphy; i++) { >> + usb_phy_shutdown(dwc->usb3_phy[i]); >> + phy_exit(dwc->usb3_generic_phy[i]); >> + } >> >> err0a: >> dwc3_ulpi_exit(dwc); >> @@ -1250,53 +1304,173 @@ static int dwc3_core_init(struct dwc3 *dwc) >> return ret; >> } >> >> -static int dwc3_core_get_phy(struct dwc3 *dwc) >> +static struct usb_phy *dwc3_core_get_phy_by_handle_with_node(struct device *dev, >> + const char *phandle, u8 index, struct device_node *lookup_node) >> +{ >> + struct device_node *node; >> + struct usb_phy *phy; >> + >> + node = of_parse_phandle(lookup_node, phandle, index); >> + if (!node) { >> + dev_err(dev, "failed to get %s phandle in %pOF node\n", phandle, >> + dev->of_node); >> + return ERR_PTR(-ENODEV); >> + } >> + phy = devm_usb_get_phy_by_node(dev, node, NULL); >> + of_node_put(node); >> + return phy; >> +} > Can you call it devm_of_usb_get_phy_by_phandle() and add it to USB PHY library > (include/linux/usb/phy.h and drivers/usb/phy/phy.c). A separate patch > ofcourse. Done. Please review the latest PS which is without RFC. > >> + >> +static int dwc3_count_phys(struct dwc3 *dwc, struct device_node *lookup_node) >> +{ >> + int count; >> + >> + count = of_count_phandle_with_args(lookup_node, "phys", NULL); >> + >> + if (count == -ENOENT) >> + count = of_count_phandle_with_args(lookup_node, "usb-phy", NULL); >> + >> + if (count == 1) { >> + dwc->num_hsphy++; >> + } else if (count == 2) { >> + dwc->num_hsphy++; >> + dwc->num_ssphy++; >> + } else { >> + return count; >> + } >> + return 0; >> +} >> + >> +static int dwc3_extract_num_phys(struct dwc3 *dwc) >> +{ >> + struct device_node *ports, *port; >> + int ret; >> + >> + /* Find if any "multiport" child is present inside DWC3*/ >> + for_each_available_child_of_node(dwc->dev->of_node, ports) { >> + if (!strcmp(ports->name, "multiports")) >> + break; >> + } >> + if (!ports) { >> + dwc->num_hsphy = 1; >> + dwc->num_ssphy = 1; >> + } else { >> + for_each_available_child_of_node(ports, port) { >> + ret = dwc3_count_phys(dwc, port); >> + if (ret) >> + return ret; >> + } >> + } >> + dev_info(dwc->dev, "Num of HS and SS PHY are %u %u\n", dwc->num_hsphy, dwc->num_ssphy); >> + >> + dwc->usb2_phy = devm_kzalloc(dwc->dev, >> + sizeof(*dwc->usb2_phy) * dwc->num_hsphy, GFP_KERNEL); >> + if (!dwc->usb2_phy) >> + return -ENOMEM; >> + >> + dwc->usb3_phy = devm_kzalloc(dwc->dev, >> + sizeof(*dwc->usb3_phy) * dwc->num_ssphy, GFP_KERNEL); >> + if (!dwc->usb3_phy) >> + return -ENOMEM; >> + >> + dwc->usb2_generic_phy = devm_kzalloc(dwc->dev, >> + sizeof(*dwc->usb2_generic_phy) * dwc->num_hsphy, GFP_KERNEL); >> + if (!dwc->usb2_generic_phy) >> + return -ENOMEM; >> + >> + dwc->usb3_generic_phy = devm_kzalloc(dwc->dev, >> + sizeof(*dwc->usb3_generic_phy) * dwc->num_ssphy, GFP_KERNEL); >> + if (!dwc->usb3_generic_phy) >> + return -ENOMEM; >> + >> + return 0; >> +} >> + > The parsing scheme looks good to me. > >> +static int dwc3_core_get_phy_by_node(struct dwc3 *dwc, >> + struct device_node *lookup_node, int i) >> { >> struct device *dev = dwc->dev; >> - struct device_node *node = dev->of_node; >> - int ret; >> + int ret; >> >> - if (node) { >> - dwc->usb2_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 0); >> - dwc->usb3_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 1); >> + if (lookup_node) { >> + dwc->usb2_phy[i] = dwc3_core_get_phy_by_handle_with_node(dev, >> + "usb-phy", 0, lookup_node); >> + dwc->usb3_phy[i] = dwc3_core_get_phy_by_handle_with_node(dev, >> + "usb-phy", 1, lookup_node); >> } else { >> - dwc->usb2_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); >> - dwc->usb3_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3); >> + dwc->usb2_phy[i] = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); >> + dwc->usb3_phy[i] = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3); >> } >> >> - if (IS_ERR(dwc->usb2_phy)) { >> - ret = PTR_ERR(dwc->usb2_phy); >> + if (IS_ERR(dwc->usb2_phy[i])) { >> + ret = PTR_ERR(dwc->usb2_phy[i]); >> if (ret == -ENXIO || ret == -ENODEV) >> - dwc->usb2_phy = NULL; >> + dwc->usb2_phy[i] = NULL; >> else >> return dev_err_probe(dev, ret, "no usb2 phy configured\n"); >> } >> >> - if (IS_ERR(dwc->usb3_phy)) { >> - ret = PTR_ERR(dwc->usb3_phy); >> + if (IS_ERR(dwc->usb3_phy[i])) { >> + ret = PTR_ERR(dwc->usb3_phy[i]); >> if (ret == -ENXIO || ret == -ENODEV) >> - dwc->usb3_phy = NULL; >> + dwc->usb3_phy[i] = NULL; >> else >> return dev_err_probe(dev, ret, "no usb3 phy configured\n"); >> } >> >> - dwc->usb2_generic_phy = devm_phy_get(dev, "usb2-phy"); >> - if (IS_ERR(dwc->usb2_generic_phy)) { >> - ret = PTR_ERR(dwc->usb2_generic_phy); >> - if (ret == -ENOSYS || ret == -ENODEV) >> - dwc->usb2_generic_phy = NULL; >> + dwc->usb2_generic_phy[i] = devm_of_phy_get(dev, lookup_node, "usb2-phy"); >> + if (IS_ERR(dwc->usb2_generic_phy[i])) { >> + ret = PTR_ERR(dwc->usb2_generic_phy[i]); >> + if (ret == -ENODEV) >> + dwc->usb2_generic_phy[i] = NULL; >> else >> return dev_err_probe(dev, ret, "no usb2 phy configured\n"); >> } >> >> - dwc->usb3_generic_phy = devm_phy_get(dev, "usb3-phy"); >> - if (IS_ERR(dwc->usb3_generic_phy)) { >> - ret = PTR_ERR(dwc->usb3_generic_phy); >> - if (ret == -ENOSYS || ret == -ENODEV) >> - dwc->usb3_generic_phy = NULL; >> + dwc->usb3_generic_phy[i] = devm_of_phy_get(dev, lookup_node, "usb3-phy"); >> + if (IS_ERR(dwc->usb3_generic_phy[i])) { >> + ret = PTR_ERR(dwc->usb3_generic_phy[i]); >> + if (ret == -ENODEV) >> + dwc->usb3_generic_phy[i] = NULL; >> else >> return dev_err_probe(dev, ret, "no usb3 phy configured\n"); >> } >> + return 0; >> +} >> + >> +static int dwc3_core_get_phy(struct dwc3 *dwc) >> +{ >> + struct device *dev = dwc->dev; >> + struct device_node *node = dev->of_node; >> + struct device_node *ports, *port; >> + >> + int ret, i = 0; > nit: remove the above empty line. Done > >> + >> + ret = dwc3_extract_num_phys(dwc); >> + if (ret) { >> + dev_err(dwc->dev, "Unable to extract number of PHYs\n"); >> + return ret; >> + } >> + >> + /* Find if any "multiport" child is present inside DWC3*/ >> + for_each_available_child_of_node(node, ports) { >> + if (!strcmp(ports->name, "multiport")) >> + break; >> + } >> + >> + if (!ports) { >> + ret = dwc3_core_get_phy_by_node(dwc, node, 0); >> + if (ret) >> + return ret; >> + } else { >> + for_each_available_child_of_node(ports, port) { >> + ret = dwc3_core_get_phy_by_node(dwc, port, i); >> + if (ret) >> + return ret; >> + i++; >> + } >> + } >> + pr_info("USB phy all good\n"); > Remove this debug code. or make it dev_dbg with information. Removed > > Thanks, > Pavan ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-06-05 18:31 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-05-26 10:13 [RFC v2 0/2] Add support for multiport controller Harsh Agarwal 2022-05-26 10:13 ` [RFC v2 1/2] dt-bindings: usb: dwc3: Add support for multiport related properties Harsh Agarwal 2022-05-26 12:40 ` Rob Herring 2022-05-27 11:00 ` Harsh Agarwal 2022-05-31 20:10 ` Rob Herring 2022-06-05 18:31 ` Harsh Agarwal 2022-05-26 10:13 ` [RFC v2 2/2] usb: dwc3: Refactor PHY logic to support Multiport Controller Harsh Agarwal 2022-05-27 2:31 ` Pavan Kondeti 2022-05-31 8:25 ` Harsh Agarwal
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.