| Message ID | 20231007154806.605-4-quic_kriskura@quicinc.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add multiport support for DWC3 controllers | expand |
Hi, On Sat, Oct 07, 2023, Krishna Kurapati wrote: > From: Harsh Agarwal <quic_harshq@quicinc.com> > > Currently the DWC3 driver supports only single port controller > which requires at most one HS and one SS PHY. > > But the DWC3 USB controller can be connected to multiple ports and > each port can have their own PHYs. Each port of the multiport > controller can either be HS+SS capable or HS only capable > Proper quantification of them is required to modify GUSB2PHYCFG > and GUSB3PIPECTL registers appropriately. > > Add support for detecting, obtaining and configuring phy's supported > by a multiport controller and. Limit the max number of ports > supported to 4 as only SC8280 which is a quad port controller supports > Multiport currently. > > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://urldefense.com/v3/__https://lore.kernel.org/oe-kbuild-all/202309200156.CxQ3yaLY-lkp@intel.com/__;!!A4F2R9G_pg!fTcK8QrbE_IGWMo0AY7E6Wi_MSBhyN_Q1jt8aTsB4s0YTY7ltK3pVHyEc4JlBBL3NClZD1vhKmKCWxXabuaXaSQvka5emA$ > Co-developed-by: Harsh Agarwal <quic_harshq@quicinc.com> > Signed-off-by: Harsh Agarwal <quic_harshq@quicinc.com> > Co-developed-by:Krishna Kurapati <quic_kriskura@quicinc.com> > Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> > --- > Changes in v13: > Compiler issues found by kernel test robot have been fixed and tags added. > So removing maintainers reviewed-by tag as we have made a minor change > in the patch. > > drivers/usb/dwc3/core.c | 252 +++++++++++++++++++++++++++------------- > drivers/usb/dwc3/core.h | 11 +- > drivers/usb/dwc3/drd.c | 15 ++- > 3 files changed, 190 insertions(+), 88 deletions(-) > Please check and address checkpatch issues. You can ignore the ENOSYS warnings. WARNING:BAD_SIGN_OFF: Co-developed-by: should not be used to attribute nominal patch author 'Harsh Agarwal <quic_harshq@quicinc.com>' #41: Co-developed-by: Harsh Agarwal <quic_harshq@quicinc.com> WARNING:BAD_SIGN_OFF: Use a single space after Co-developed-by: #43: Co-developed-by:Krishna Kurapati <quic_kriskura@quicinc.com> WARNING:ENOSYS: ENOSYS means 'invalid syscall nr' and nothing else #368: FILE: drivers/usb/dwc3/core.c:1450: + if (ret == -ENOSYS || ret == -ENODEV) WARNING:ENOSYS: ENOSYS means 'invalid syscall nr' and nothing else #384: FILE: drivers/usb/dwc3/core.c:1465: + if (ret == -ENOSYS || ret == -ENODEV) CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around 'dwc->num_usb2_ports > DWC3_MAX_PORTS' #432: FILE: drivers/usb/dwc3/core.c:1980: + if ((dwc->num_usb2_ports > DWC3_MAX_PORTS) || + (dwc->num_usb3_ports > DWC3_MAX_PORTS)) CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around 'dwc->num_usb3_ports > DWC3_MAX_PORTS' #432: FILE: drivers/usb/dwc3/core.c:1980: + if ((dwc->num_usb2_ports > DWC3_MAX_PORTS) || + (dwc->num_usb3_ports > DWC3_MAX_PORTS)) CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #433: FILE: drivers/usb/dwc3/core.c:1981: + if ((dwc->num_usb2_ports > DWC3_MAX_PORTS) || + (dwc->num_usb3_ports > DWC3_MAX_PORTS)) WARNING:TABSTOP: Statements should start on a tabstop #490: FILE: drivers/usb/dwc3/core.c:2302: + for (i = 0; i < dwc->num_usb2_ports; i++) { total: 0 errors, 5 warnings, 3 checks, 492 lines checked NOTE: For some of the reported defects, checkpatch may be able to mechanically convert to the typical style using --fix or --fix-inplace. "[PATCH v13 03/10] usb: dwc3: core: Refactor PHY logic to support" has style problems, please review. BR, Thinh
On Sat, Oct 07, 2023 at 09:17:59PM +0530, Krishna Kurapati wrote: > From: Harsh Agarwal <quic_harshq@quicinc.com> > > Currently the DWC3 driver supports only single port controller > which requires at most one HS and one SS PHY. Should that not be "at least one HS PHY and at most one SS PHY"? > But the DWC3 USB controller can be connected to multiple ports and > each port can have their own PHYs. Each port of the multiport > controller can either be HS+SS capable or HS only capable > Proper quantification of them is required to modify GUSB2PHYCFG > and GUSB3PIPECTL registers appropriately. > > Add support for detecting, obtaining and configuring phy's supported "PHYs" for consistency, no apostrophe > by a multiport controller and. Limit the max number of ports "and." what? Looks like part of the sentence is missing? Or just drop " and"? > supported to 4 as only SC8280 which is a quad port controller supports s/4/four/ Just change this to Limit support to multiport controllers with up to four ports for now (e.g. as needed for SC8280XP). > Multiport currently. You use capitalised "Multiport" in several places it seems. Is this an established term for these controllers or should it just be "multiport" or "multiple ports"? > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202309200156.CxQ3yaLY-lkp@intel.com/ Drop these two lines, as people have already suggested. > Co-developed-by: Harsh Agarwal <quic_harshq@quicinc.com> > Signed-off-by: Harsh Agarwal <quic_harshq@quicinc.com> > Co-developed-by:Krishna Kurapati <quic_kriskura@quicinc.com> > Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> Thinh pointed out the problems with the above which were also reported by checkpatch.pl. > --- > Changes in v13: > Compiler issues found by kernel test robot have been fixed and tags added. > So removing maintainers reviewed-by tag as we have made a minor change > in the patch. In general this is the right thing to do when the change in question was non-trivial. I'm not sure that's the case here, but the robots tend to complain about smaller (but sometimes important) things. > @@ -748,23 +781,32 @@ static int dwc3_phy_setup(struct dwc3 *dwc) > static int dwc3_phy_init(struct dwc3 *dwc) > { > int ret; > + int i; > + int j; These could be declared on one line (same throughout). > usb_phy_init(dwc->usb2_phy); > usb_phy_init(dwc->usb3_phy); > > - ret = phy_init(dwc->usb2_generic_phy); > - if (ret < 0) > - goto err_shutdown_usb3_phy; > + for (i = 0; i < dwc->num_usb2_ports; i++) { > + ret = phy_init(dwc->usb2_generic_phy[i]); > + if (ret < 0) > + goto err_exit_phy; > > - ret = phy_init(dwc->usb3_generic_phy); > - if (ret < 0) > - goto err_exit_usb2_phy; > + ret = phy_init(dwc->usb3_generic_phy[i]); > + if (ret < 0) { > + phy_exit(dwc->usb2_generic_phy[i]); > + goto err_exit_phy; > + } > + } > > return 0; > > -err_exit_usb2_phy: > - phy_exit(dwc->usb2_generic_phy); > -err_shutdown_usb3_phy: > +err_exit_phy: > + for (j = i - 1; j >= 0; j--) { > + phy_exit(dwc->usb2_generic_phy[j]); > + phy_exit(dwc->usb3_generic_phy[j]); Try to always unwind in reverse order so in this case move phy_exit() for usb3 before usb2 here too. > + } > + > usb_phy_shutdown(dwc->usb3_phy); > usb_phy_shutdown(dwc->usb2_phy); > @@ -783,23 +829,32 @@ static void dwc3_phy_exit(struct dwc3 *dwc) > static int dwc3_phy_power_on(struct dwc3 *dwc) > { > int ret; > + int i; > + int j; > > 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 err_suspend_usb3_phy; > + for (i = 0; i < dwc->num_usb2_ports; i++) { > + ret = phy_power_on(dwc->usb2_generic_phy[i]); > + if (ret < 0) > + goto err_power_off_phy; > > - ret = phy_power_on(dwc->usb3_generic_phy); > - if (ret < 0) > - goto err_power_off_usb2_phy; > + ret = phy_power_on(dwc->usb3_generic_phy[i]); > + if (ret < 0) { > + phy_power_off(dwc->usb2_generic_phy[i]); > + goto err_power_off_phy; > + } > + } > > return 0; > > -err_power_off_usb2_phy: > - phy_power_off(dwc->usb2_generic_phy); > -err_suspend_usb3_phy: > +err_power_off_phy: > + for (j = i - 1; j >= 0; j--) { > + phy_power_off(dwc->usb2_generic_phy[j]); > + phy_power_off(dwc->usb3_generic_phy[j]); Same here. > + } > + > usb_phy_set_suspend(dwc->usb3_phy, 1); > usb_phy_set_suspend(dwc->usb2_phy, 1); > @@ -1346,7 +1410,9 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) > { > struct device *dev = dwc->dev; > struct device_node *node = dev->of_node; > + char phy_name[13]; > int ret; > + int i; > > if (node) { > dwc->usb2_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 0); > @@ -1372,22 +1438,36 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) > 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; > + for (i = 0; i < dwc->num_usb2_ports; i++) { > + if (dwc->num_usb2_ports == 1) > + sprintf(phy_name, "usb2-phy"); > else > - return dev_err_probe(dev, ret, "no usb2 phy configured\n"); > - } > + sprintf(phy_name, "usb2-port%d", i); > > - 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->usb2_generic_phy[i] = devm_phy_get(dev, phy_name); > + if (IS_ERR(dwc->usb2_generic_phy[i])) { > + ret = PTR_ERR(dwc->usb2_generic_phy[i]); > + if (ret == -ENOSYS || ret == -ENODEV) > + dwc->usb2_generic_phy[i] = NULL; > + else > + return dev_err_probe(dev, ret, > + "failed to lookup phy %s\n", phy_name); Continuation lines should be intented at least two tabs further. I generally suggest adding brackets around blocks with multiline statements to improve readability but if you move the string to the previous line and intend the continuation line (phy_name) one tab more I guess that's fine. > + } > + > + if (dwc->num_usb2_ports == 1) > + sprintf(phy_name, "usb3-phy"); > else > - return dev_err_probe(dev, ret, "no usb3 phy configured\n"); > + sprintf(phy_name, "usb3-port%d", i); > + > + dwc->usb3_generic_phy[i] = devm_phy_get(dev, phy_name); > + if (IS_ERR(dwc->usb3_generic_phy[i])) { > + ret = PTR_ERR(dwc->usb3_generic_phy[i]); > + if (ret == -ENOSYS || ret == -ENODEV) > + dwc->usb3_generic_phy[i] = NULL; > + else > + return dev_err_probe(dev, ret, > + "failed to lookup phy %s\n", phy_name); Same here. > + } > } > > return 0; > @@ -1892,9 +1975,12 @@ static int dwc3_read_port_info(struct dwc3 *dwc) > > dev_dbg(dwc->dev, "hs-ports: %u ss-ports: %u\n", > dwc->num_usb2_ports, dwc->num_usb3_ports); > - Drop this random change. > iounmap(base); > > + if ((dwc->num_usb2_ports > DWC3_MAX_PORTS) || > + (dwc->num_usb3_ports > DWC3_MAX_PORTS)) Again, continuation lines should be indented at least two tabs further. > + return -ENOMEM; > + > return 0; > } > diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h > index 2ea6df7e6571..fc5d15edab1c 100644 > --- a/drivers/usb/dwc3/core.h > +++ b/drivers/usb/dwc3/core.h > @@ -33,6 +33,9 @@ > > #include <linux/power_supply.h> > > +/* Number of ports supported by a multiport controller */ /* * Maximum number of ports currently supported for multiport * controllers. */ > +#define DWC3_MAX_PORTS 4 > + > #define DWC3_MSG_MAX 500 > > /* Global constants */ > @@ -1029,8 +1032,8 @@ struct dwc3_scratchpad_array { > * @usb_psy: pointer to power supply interface. > * @usb2_phy: pointer to USB2 PHY > * @usb3_phy: pointer to USB3 PHY > - * @usb2_generic_phy: pointer to USB2 PHY > - * @usb3_generic_phy: pointer to USB3 PHY > + * @usb2_generic_phy: pointer to array of USB2 PHY > + * @usb3_generic_phy: pointer to array of USB3 PHY s/PHY/PHYs/ > * @num_usb2_ports: number of USB2 ports > * @num_usb3_ports: number of USB3 ports > * @phys_ready: flag to indicate that PHYs are ready Johan
On 10/20/2023 3:27 PM, Johan Hovold wrote: > On Sat, Oct 07, 2023 at 09:17:59PM +0530, Krishna Kurapati wrote: >> From: Harsh Agarwal <quic_harshq@quicinc.com> >> >> Currently the DWC3 driver supports only single port controller >> which requires at most one HS and one SS PHY. > > Should that not be "at least one HS PHY and at most one SS PHY"? > >> But the DWC3 USB controller can be connected to multiple ports and >> each port can have their own PHYs. Each port of the multiport >> controller can either be HS+SS capable or HS only capable >> Proper quantification of them is required to modify GUSB2PHYCFG >> and GUSB3PIPECTL registers appropriately. >> >> Add support for detecting, obtaining and configuring phy's supported > > "PHYs" for consistency, no apostrophe > >> by a multiport controller and. Limit the max number of ports > > "and." what? Looks like part of the sentence is missing? Or just drop > " and"? > >> supported to 4 as only SC8280 which is a quad port controller supports > > s/4/four/ > > Just change this to > > Limit support to multiport controllers with up to four ports for > now (e.g. as needed for SC8280XP). > >> Multiport currently. > > You use capitalised "Multiport" in several places it seems. Is this an > established term for these controllers or should it just be "multiport" > or "multiple ports"? > >> Reported-by: kernel test robot <lkp@intel.com> >> Closes: https://lore.kernel.org/oe-kbuild-all/202309200156.CxQ3yaLY-lkp@intel.com/ > > Drop these two lines, as people have already suggested. > >> Co-developed-by: Harsh Agarwal <quic_harshq@quicinc.com> >> Signed-off-by: Harsh Agarwal <quic_harshq@quicinc.com> >> Co-developed-by:Krishna Kurapati <quic_kriskura@quicinc.com> >> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> > > Thinh pointed out the problems with the above which were also reported > by checkpatch.pl. > I see that removing Co-Developed by tag for Harsh is helping with one checkpatch issue. From what I know, although I made Harsh the Primary author for the patch, should we still mention his Co-Developed-by along with this Signed-Of by ? >> --- >> Changes in v13: >> Compiler issues found by kernel test robot have been fixed and tags added. >> So removing maintainers reviewed-by tag as we have made a minor change >> in the patch. > > In general this is the right thing to do when the change in question was > non-trivial. I'm not sure that's the case here, but the robots tend to > complain about smaller (but sometimes important) things. > I too had this uncertainity, but I see that we must not add maintainers reviewed by tag if we even make one letter of change. Wanted to adhere to these rules and so removed Thinh's tag and asked for re-review. >> @@ -748,23 +781,32 @@ static int dwc3_phy_setup(struct dwc3 *dwc) >> static int dwc3_phy_init(struct dwc3 *dwc) >> { >> int ret; >> + int i; >> + int j; > > These could be declared on one line (same throughout). > I did so in v7, but was asked to put them in separate lines: https://lore.kernel.org/all/20230502221100.ecska23anlzv3iwq@synopsys.com/ >> usb_phy_init(dwc->usb2_phy); >> usb_phy_init(dwc->usb3_phy); dwc->usb2_generic_phy[i] = NULL; >> + else >> + return dev_err_probe(dev, ret, >> + "failed to lookup phy %s\n", phy_name); > > Continuation lines should be intented at least two tabs further. > > I generally suggest adding brackets around blocks with multiline > statements to improve readability but if you move the string to the > previous line and intend the continuation line (phy_name) one tab more I > guess that's fine. > >> + } >> + >> + if (dwc->num_usb2_ports == 1) >> + sprintf(phy_name, "usb3-phy"); >> else >> - return dev_err_probe(dev, ret, "no usb3 phy configured\n"); >> + sprintf(phy_name, "usb3-port%d", i); >> + >> + dwc->usb3_generic_phy[i] = devm_phy_get(dev, phy_name); >> + if (IS_ERR(dwc->usb3_generic_phy[i])) { >> + ret = PTR_ERR(dwc->usb3_generic_phy[i]); >> + if (ret == -ENOSYS || ret == -ENODEV) >> + dwc->usb3_generic_phy[i] = NULL; >> + else >> + return dev_err_probe(dev, ret, >> + "failed to lookup phy %s\n", phy_name); > > Same here. > >> + } >> } >> >> return 0; > >> @@ -1892,9 +1975,12 @@ static int dwc3_read_port_info(struct dwc3 *dwc) >> >> dev_dbg(dwc->dev, "hs-ports: %u ss-ports: %u\n", >> dwc->num_usb2_ports, dwc->num_usb3_ports); >> - > > Drop this random change. The removal of extra line here done you mean ? > >> iounmap(base); >> >> + if ((dwc->num_usb2_ports > DWC3_MAX_PORTS) || >> + (dwc->num_usb3_ports > DWC3_MAX_PORTS)) > > Again, continuation lines should be indented at least two tabs further. > >> + return -ENOMEM; >> + >> return 0; >> } > >> diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h >> index 2ea6df7e6571..fc5d15edab1c 100644 >> --- a/drivers/usb/dwc3/core.h >> +++ b/drivers/usb/dwc3/core.h >> @@ -33,6 +33,9 @@ >> >> #include <linux/power_supply.h> >> >> +/* Number of ports supported by a multiport controller */ > > /* > * Maximum number of ports currently supported for multiport > * controllers. > */ > >> +#define DWC3_MAX_PORTS 4 >> + >> #define DWC3_MSG_MAX 500 >> >> /* Global constants */ >> @@ -1029,8 +1032,8 @@ struct dwc3_scratchpad_array { >> * @usb_psy: pointer to power supply interface. >> * @usb2_phy: pointer to USB2 PHY >> * @usb3_phy: pointer to USB3 PHY >> - * @usb2_generic_phy: pointer to USB2 PHY >> - * @usb3_generic_phy: pointer to USB3 PHY >> + * @usb2_generic_phy: pointer to array of USB2 PHY >> + * @usb3_generic_phy: pointer to array of USB3 PHY > > s/PHY/PHYs/ > >> * @num_usb2_ports: number of USB2 ports >> * @num_usb3_ports: number of USB3 ports >> * @phys_ready: flag to indicate that PHYs are ready > > Johan Thanks for the review. Will fix these nits in v14. Regards, Krishna,
On 10/20/2023 3:27 PM, Johan Hovold wrote: > On Sat, Oct 07, 2023 at 09:17:59PM +0530, Krishna Kurapati wrote: >> From: Harsh Agarwal <quic_harshq@quicinc.com> >> >> Currently the DWC3 driver supports only single port controller >> which requires at most one HS and one SS PHY. > > Should that not be "at least one HS PHY and at most one SS PHY"? > No, I think it would be appropriate to say "at least one phy (HS/SS)" as even one phy is sufficient to get things working. >> But the DWC3 USB controller can be connected to multiple ports and >> each port can have their own PHYs. Each port of the multiport >> controller can either be HS+SS capable or HS only capable >> Proper quantification of them is required to modify GUSB2PHYCFG >> and GUSB3PIPECTL registers appropriately. >> >> Add support for detecting, obtaining and configuring phy's supported > > "PHYs" for consistency, no apostrophe > >> by a multiport controller and. Limit the max number of ports > > "and." what? Looks like part of the sentence is missing? Or just drop > " and"? > >> supported to 4 as only SC8280 which is a quad port controller supports > > s/4/four/ > > Just change this to > > Limit support to multiport controllers with up to four ports for > now (e.g. as needed for SC8280XP). > >> Multiport currently. > > You use capitalised "Multiport" in several places it seems. Is this an > established term for these controllers or should it just be "multiport" > or "multiple ports"? > This is an established term AFAIK. So I've been using it here like this. >> Reported-by: kernel test robot <lkp@intel.com> >> Closes: https://lore.kernel.org/oe-kbuild-all/202309200156.CxQ3yaLY-lkp@intel.com/ > > Drop these two lines, as people have already suggested. > ACK. >> Co-developed-by: Harsh Agarwal <quic_harshq@quicinc.com> >> Signed-off-by: Harsh Agarwal <quic_harshq@quicinc.com> >> Co-developed-by:Krishna Kurapati <quic_kriskura@quicinc.com> >> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> > > Thinh pointed out the problems with the above which were also reported > by checkpatch.pl. > >> --- >> Changes in v13: >> Compiler issues found by kernel test robot have been fixed and tags added. >> So removing maintainers reviewed-by tag as we have made a minor change >> in the patch. > > In general this is the right thing to do when the change in question was > non-trivial. I'm not sure that's the case here, but the robots tend to > complain about smaller (but sometimes important) things. > Got it. Will be careful about such things next time. Regards, Krishna,
On Fri, Oct 20, 2023 at 05:11:46PM +0530, Krishna Kurapati PSSNV wrote: > On 10/20/2023 3:27 PM, Johan Hovold wrote: > > On Sat, Oct 07, 2023 at 09:17:59PM +0530, Krishna Kurapati wrote: > >> From: Harsh Agarwal <quic_harshq@quicinc.com> > >> Co-developed-by: Harsh Agarwal <quic_harshq@quicinc.com> > >> Signed-off-by: Harsh Agarwal <quic_harshq@quicinc.com> > >> Co-developed-by:Krishna Kurapati <quic_kriskura@quicinc.com> > >> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> > > > > Thinh pointed out the problems with the above which were also reported > > by checkpatch.pl. > > I see that removing Co-Developed by tag for Harsh is helping with one > checkpatch issue. From what I know, although I made Harsh the Primary > author for the patch, should we still mention his Co-Developed-by along > with this Signed-Of by ? This is all documented in the process document I pointed you at earlier. You don't need a Co-Developed-by tag for the primary author. > >> @@ -748,23 +781,32 @@ static int dwc3_phy_setup(struct dwc3 *dwc) > >> static int dwc3_phy_init(struct dwc3 *dwc) > >> { > >> int ret; > >> + int i; > >> + int j; > > > > These could be declared on one line (same throughout). > > > > I did so in v7, but was asked to put them in separate lines: > https://lore.kernel.org/all/20230502221100.ecska23anlzv3iwq@synopsys.com/ Ok, either is fine if Thinh prefers it this way. The problem is usually the other way round where people try to squeeze in too much (e.g. unrelated variables and declarations) on the same line. > >> @@ -1892,9 +1975,12 @@ static int dwc3_read_port_info(struct dwc3 *dwc) > >> > >> dev_dbg(dwc->dev, "hs-ports: %u ss-ports: %u\n", > >> dwc->num_usb2_ports, dwc->num_usb3_ports); > >> - > > > > Drop this random change. > > The removal of extra line here done you mean ? Yes. > > > >> iounmap(base); Johan
On Sun, Oct 22, 2023 at 11:33:52PM +0530, Krishna Kurapati PSSNV wrote: > On 10/20/2023 3:27 PM, Johan Hovold wrote: > > On Sat, Oct 07, 2023 at 09:17:59PM +0530, Krishna Kurapati wrote: > >> From: Harsh Agarwal <quic_harshq@quicinc.com> > >> > >> Currently the DWC3 driver supports only single port controller > >> which requires at most one HS and one SS PHY. > > > > Should that not be "at least one HS PHY and at most one SS PHY"? > > > > No, I think it would be appropriate to say "at least one phy (HS/SS)" as > even one phy is sufficient to get things working. No, that would be a violation if the binding (even if the driver may not currently enforce it for generic phys) as well as the USB spec. Also note that your implementation (i.e. this very patch) assumes that num_usb2_ports >= num_usb3_ports. > >> Add support for detecting, obtaining and configuring phy's supported > > > > "PHYs" for consistency, no apostrophe > > > >> by a multiport controller and. Limit the max number of ports > > > > "and." what? Looks like part of the sentence is missing? Or just drop > > " and"? > > > >> supported to 4 as only SC8280 which is a quad port controller supports > > > > s/4/four/ > > > > Just change this to > > > > Limit support to multiport controllers with up to four ports for > > now (e.g. as needed for SC8280XP). > > > >> Multiport currently. > > > > You use capitalised "Multiport" in several places it seems. Is this an > > established term for these controllers or should it just be "multiport" > > or "multiple ports"? > > > This is an established term AFAIK. So I've been using it here like this. Do you have a pointer? A google search seems to mostly come up with links to this patch series. Johan
On 10/23/2023 2:41 PM, Johan Hovold wrote: >>>> Multiport currently. >>> >>> You use capitalised "Multiport" in several places it seems. Is this an >>> established term for these controllers or should it just be "multiport" >>> or "multiple ports"? >>> >> This is an established term AFAIK. So I've been using it here like this. > > Do you have a pointer? A google search seems to mostly come up with > links to this patch series. Only pointer I had is the hardware programming guide internally. It mentioned "Multiport" as an established term. I think that is self explanatory in usb context. Isn't it ? Regards, Krishna,
On Mon, Oct 23, 2023 at 06:03:32PM +0530, Krishna Kurapati PSSNV wrote: > On 10/23/2023 2:41 PM, Johan Hovold wrote: > > >>>> Multiport currently. > >>> > >>> You use capitalised "Multiport" in several places it seems. Is this an > >>> established term for these controllers or should it just be "multiport" > >>> or "multiple ports"? > >>> > >> This is an established term AFAIK. So I've been using it here like this. > > > > Do you have a pointer? A google search seems to mostly come up with > > links to this patch series. > > Only pointer I had is the hardware programming guide internally. It > mentioned "Multiport" as an established term. I think that is self > explanatory in usb context. Isn't it ? Self-explanatory, yes, just not sure whether capitalising it as "Multiport" is warranted. But thanks for clarifying where this comes from. Johan
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 3e507e4cc542..f380cbf908a9 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -124,6 +124,7 @@ static void __dwc3_set_mode(struct work_struct *work) int ret; u32 reg; u32 desired_dr_role; + int i; mutex_lock(&dwc->mutex); spin_lock_irqsave(&dwc->lock, flags); @@ -201,8 +202,10 @@ static void __dwc3_set_mode(struct work_struct *work) } 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_usb2_ports; i++) { + phy_set_mode(dwc->usb2_generic_phy[i], PHY_MODE_USB_HOST); + 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; @@ -217,8 +220,8 @@ static void __dwc3_set_mode(struct work_struct *work) 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); + 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) @@ -589,22 +592,14 @@ static int dwc3_core_ulpi_init(struct dwc3 *dwc) return ret; } -/** - * dwc3_phy_setup - Configure USB PHY Interface of DWC3 Core - * @dwc: Pointer to our controller context structure - * - * Returns 0 on success. The USB PHY interfaces are configured but not - * initialized. The PHY interfaces and the PHYs get initialized together with - * the core in dwc3_core_init. - */ -static int dwc3_phy_setup(struct dwc3 *dwc) +static int dwc3_ss_phy_setup(struct dwc3 *dwc, int index) { unsigned int hw_mode; u32 reg; hw_mode = DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0); - reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)); + reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(index)); /* * Make sure UX_EXIT_PX is cleared as that causes issues with some @@ -659,9 +654,19 @@ 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); + dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(index), reg); - reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); + return 0; +} + +static int dwc3_hs_phy_setup(struct dwc3 *dwc, int index) +{ + unsigned int hw_mode; + u32 reg; + + hw_mode = DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0); + + reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(index)); /* Select the HS PHY interface */ switch (DWC3_GHWPARAMS3_HSPHY_IFC(dwc->hwparams.hwparams3)) { @@ -673,7 +678,7 @@ 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); + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(index), reg); } else { /* Relying on default value. */ if (!(reg & DWC3_GUSB2PHYCFG_ULPI_UTMI)) @@ -740,7 +745,35 @@ static int dwc3_phy_setup(struct dwc3 *dwc) if (dwc->ulpi_ext_vbus_drv) reg |= DWC3_GUSB2PHYCFG_ULPIEXTVBUSDRV; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(index), reg); + + return 0; +} + +/** + * dwc3_phy_setup - Configure USB PHY Interface of DWC3 Core + * @dwc: Pointer to our controller context structure + * + * Returns 0 on success. The USB PHY interfaces are configured but not + * initialized. The PHY interfaces and the PHYs get initialized together with + * the core in dwc3_core_init. + */ +static int dwc3_phy_setup(struct dwc3 *dwc) +{ + int i; + int ret; + + for (i = 0; i < dwc->num_usb3_ports; i++) { + ret = dwc3_ss_phy_setup(dwc, i); + if (ret) + return ret; + } + + for (i = 0; i < dwc->num_usb2_ports; i++) { + ret = dwc3_hs_phy_setup(dwc, i); + if (ret) + return ret; + } return 0; } @@ -748,23 +781,32 @@ static int dwc3_phy_setup(struct dwc3 *dwc) static int dwc3_phy_init(struct dwc3 *dwc) { int ret; + int i; + int j; usb_phy_init(dwc->usb2_phy); usb_phy_init(dwc->usb3_phy); - ret = phy_init(dwc->usb2_generic_phy); - if (ret < 0) - goto err_shutdown_usb3_phy; + for (i = 0; i < dwc->num_usb2_ports; i++) { + ret = phy_init(dwc->usb2_generic_phy[i]); + if (ret < 0) + goto err_exit_phy; - ret = phy_init(dwc->usb3_generic_phy); - if (ret < 0) - goto err_exit_usb2_phy; + ret = phy_init(dwc->usb3_generic_phy[i]); + if (ret < 0) { + phy_exit(dwc->usb2_generic_phy[i]); + goto err_exit_phy; + } + } return 0; -err_exit_usb2_phy: - phy_exit(dwc->usb2_generic_phy); -err_shutdown_usb3_phy: +err_exit_phy: + for (j = i - 1; j >= 0; j--) { + phy_exit(dwc->usb2_generic_phy[j]); + phy_exit(dwc->usb3_generic_phy[j]); + } + usb_phy_shutdown(dwc->usb3_phy); usb_phy_shutdown(dwc->usb2_phy); @@ -773,8 +815,12 @@ static int dwc3_phy_init(struct dwc3 *dwc) static void dwc3_phy_exit(struct dwc3 *dwc) { - phy_exit(dwc->usb3_generic_phy); - phy_exit(dwc->usb2_generic_phy); + int i; + + for (i = 0; i < dwc->num_usb2_ports; i++) { + phy_exit(dwc->usb3_generic_phy[i]); + phy_exit(dwc->usb2_generic_phy[i]); + } usb_phy_shutdown(dwc->usb3_phy); usb_phy_shutdown(dwc->usb2_phy); @@ -783,23 +829,32 @@ static void dwc3_phy_exit(struct dwc3 *dwc) static int dwc3_phy_power_on(struct dwc3 *dwc) { int ret; + int i; + int j; 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 err_suspend_usb3_phy; + for (i = 0; i < dwc->num_usb2_ports; i++) { + ret = phy_power_on(dwc->usb2_generic_phy[i]); + if (ret < 0) + goto err_power_off_phy; - ret = phy_power_on(dwc->usb3_generic_phy); - if (ret < 0) - goto err_power_off_usb2_phy; + ret = phy_power_on(dwc->usb3_generic_phy[i]); + if (ret < 0) { + phy_power_off(dwc->usb2_generic_phy[i]); + goto err_power_off_phy; + } + } return 0; -err_power_off_usb2_phy: - phy_power_off(dwc->usb2_generic_phy); -err_suspend_usb3_phy: +err_power_off_phy: + for (j = i - 1; j >= 0; j--) { + phy_power_off(dwc->usb2_generic_phy[j]); + phy_power_off(dwc->usb3_generic_phy[j]); + } + usb_phy_set_suspend(dwc->usb3_phy, 1); usb_phy_set_suspend(dwc->usb2_phy, 1); @@ -808,8 +863,12 @@ static int dwc3_phy_power_on(struct dwc3 *dwc) static void dwc3_phy_power_off(struct dwc3 *dwc) { - phy_power_off(dwc->usb3_generic_phy); - phy_power_off(dwc->usb2_generic_phy); + int i; + + for (i = 0; i < dwc->num_usb2_ports; i++) { + phy_power_off(dwc->usb3_generic_phy[i]); + phy_power_off(dwc->usb2_generic_phy[i]); + } usb_phy_set_suspend(dwc->usb3_phy, 1); usb_phy_set_suspend(dwc->usb2_phy, 1); @@ -1187,6 +1246,7 @@ static int dwc3_core_init(struct dwc3 *dwc) unsigned int hw_mode; u32 reg; int ret; + int i; hw_mode = DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0); @@ -1230,15 +1290,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_usb3_ports; 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_usb2_ports; i++) { + reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i)); + reg |= DWC3_GUSB2PHYCFG_SUSPHY; + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); + } } } @@ -1346,7 +1410,9 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) { struct device *dev = dwc->dev; struct device_node *node = dev->of_node; + char phy_name[13]; int ret; + int i; if (node) { dwc->usb2_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 0); @@ -1372,22 +1438,36 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) 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; + for (i = 0; i < dwc->num_usb2_ports; i++) { + if (dwc->num_usb2_ports == 1) + sprintf(phy_name, "usb2-phy"); else - return dev_err_probe(dev, ret, "no usb2 phy configured\n"); - } + sprintf(phy_name, "usb2-port%d", i); - 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->usb2_generic_phy[i] = devm_phy_get(dev, phy_name); + if (IS_ERR(dwc->usb2_generic_phy[i])) { + ret = PTR_ERR(dwc->usb2_generic_phy[i]); + if (ret == -ENOSYS || ret == -ENODEV) + dwc->usb2_generic_phy[i] = NULL; + else + return dev_err_probe(dev, ret, + "failed to lookup phy %s\n", phy_name); + } + + if (dwc->num_usb2_ports == 1) + sprintf(phy_name, "usb3-phy"); else - return dev_err_probe(dev, ret, "no usb3 phy configured\n"); + sprintf(phy_name, "usb3-port%d", i); + + dwc->usb3_generic_phy[i] = devm_phy_get(dev, phy_name); + if (IS_ERR(dwc->usb3_generic_phy[i])) { + ret = PTR_ERR(dwc->usb3_generic_phy[i]); + if (ret == -ENOSYS || ret == -ENODEV) + dwc->usb3_generic_phy[i] = NULL; + else + return dev_err_probe(dev, ret, + "failed to lookup phy %s\n", phy_name); + } } return 0; @@ -1397,6 +1477,7 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) { struct device *dev = dwc->dev; int ret; + int i; switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: @@ -1404,8 +1485,8 @@ static int dwc3_core_init_mode(struct dwc3 *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); + 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) @@ -1416,8 +1497,10 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) 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_usb2_ports; i++) { + phy_set_mode(dwc->usb2_generic_phy[i], PHY_MODE_USB_HOST); + phy_set_mode(dwc->usb3_generic_phy[i], PHY_MODE_USB_HOST); + } ret = dwc3_host_init(dwc); if (ret) @@ -1892,9 +1975,12 @@ static int dwc3_read_port_info(struct dwc3 *dwc) dev_dbg(dwc->dev, "hs-ports: %u ss-ports: %u\n", dwc->num_usb2_ports, dwc->num_usb3_ports); - iounmap(base); + if ((dwc->num_usb2_ports > DWC3_MAX_PORTS) || + (dwc->num_usb3_ports > DWC3_MAX_PORTS)) + return -ENOMEM; + return 0; } @@ -2130,6 +2216,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) { unsigned long flags; u32 reg; + int i; switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -2148,17 +2235,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); + for (i = 0; i < dwc->num_usb2_ports; 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_usb2_ports; i++) { + phy_pm_runtime_put_sync(dwc->usb2_generic_phy[i]); + phy_pm_runtime_put_sync(dwc->usb3_generic_phy[i]); + } break; case DWC3_GCTL_PRTCAP_OTG: /* do nothing during runtime_suspend */ @@ -2188,6 +2279,7 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) unsigned long flags; int ret; u32 reg; + int i; switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -2207,17 +2299,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_usb2_ports; 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_usb2_ports; i++) { + phy_pm_runtime_get_sync(dwc->usb2_generic_phy[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 2ea6df7e6571..fc5d15edab1c 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -33,6 +33,9 @@ #include <linux/power_supply.h> +/* Number of ports supported by a multiport controller */ +#define DWC3_MAX_PORTS 4 + #define DWC3_MSG_MAX 500 /* Global constants */ @@ -1029,8 +1032,8 @@ struct dwc3_scratchpad_array { * @usb_psy: pointer to power supply interface. * @usb2_phy: pointer to USB2 PHY * @usb3_phy: pointer to USB3 PHY - * @usb2_generic_phy: pointer to USB2 PHY - * @usb3_generic_phy: pointer to USB3 PHY + * @usb2_generic_phy: pointer to array of USB2 PHY + * @usb3_generic_phy: pointer to array of USB3 PHY * @num_usb2_ports: number of USB2 ports * @num_usb3_ports: number of USB3 ports * @phys_ready: flag to indicate that PHYs are ready @@ -1173,8 +1176,8 @@ struct dwc3 { struct usb_phy *usb2_phy; struct usb_phy *usb3_phy; - struct phy *usb2_generic_phy; - struct phy *usb3_generic_phy; + struct phy *usb2_generic_phy[DWC3_MAX_PORTS]; + struct phy *usb3_generic_phy[DWC3_MAX_PORTS]; u8 num_usb2_ports; u8 num_usb3_ports; diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c index 039bf241769a..9aec41f1ad43 100644 --- a/drivers/usb/dwc3/drd.c +++ b/drivers/usb/dwc3/drd.c @@ -331,6 +331,7 @@ void dwc3_otg_update(struct dwc3 *dwc, bool ignore_idstatus) u32 reg; int id; unsigned long flags; + int i; if (dwc->dr_mode != USB_DR_MODE_OTG) return; @@ -386,9 +387,12 @@ void dwc3_otg_update(struct dwc3 *dwc, bool ignore_idstatus) } 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, - PHY_MODE_USB_HOST); + for (i = 0; i < dwc->num_usb2_ports; i++) { + if (dwc->usb2_generic_phy[i]) { + phy_set_mode(dwc->usb2_generic_phy[i], + PHY_MODE_USB_HOST); + } + } } break; case DWC3_OTG_ROLE_DEVICE: @@ -400,9 +404,8 @@ void dwc3_otg_update(struct dwc3 *dwc, bool ignore_idstatus) if (dwc->usb2_phy) otg_set_vbus(dwc->usb2_phy->otg, false); - if (dwc->usb2_generic_phy) - phy_set_mode(dwc->usb2_generic_phy, - PHY_MODE_USB_DEVICE); + 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) dev_err(dwc->dev, "failed to initialize peripheral\n");