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@xxxxxxxxxxx>
> ---
> 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
