From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5CEEC43334 for ; Wed, 1 Jun 2022 20:46:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229962AbiFAUq0 (ORCPT ); Wed, 1 Jun 2022 16:46:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230114AbiFAUpp (ORCPT ); Wed, 1 Jun 2022 16:45:45 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 353AB125790 for ; Wed, 1 Jun 2022 13:35:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654115701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=4wV0fFoeA1Q8A1rJZtSN81IbnPKErGtYfdTxh0O0DBY=; b=H/NS4gCzIyqT23N629eNuLIB+ma+efASEL6/AgSzj3g/gJsyG5+aRKhPzvI0Nf7YxbRu3G l0I4bFICGX4BDYyVZYkPazuXRpw6BcfJBkhk6gUCN0X/cu7gIfG1OYbklI9v3phrUo2zaK 5ox4cGKAUt93Ab4PejctEmPdSkuClGo= Received: from mail-oa1-f71.google.com (mail-oa1-f71.google.com [209.85.160.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-643-Z8_hNZWaMdaWYOEIIs21_g-1; Wed, 01 Jun 2022 15:53:16 -0400 X-MC-Unique: Z8_hNZWaMdaWYOEIIs21_g-1 Received: by mail-oa1-f71.google.com with SMTP id 586e51a60fabf-f2c8798f4eso1797940fac.0 for ; Wed, 01 Jun 2022 12:53:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=4wV0fFoeA1Q8A1rJZtSN81IbnPKErGtYfdTxh0O0DBY=; b=RCNc6oCr8EhhQUObFb0yvdnzIjdCdOFQiF3F+6E651xW+Ht4ftAR29v9wYSDfvA4Co b+837Y7b/NfAfqtEf48AT4sbV7LAiUBOc62/x/+FQhP7gr88iwxvgySH1LPFmPAq2sZA XsxDMXz6xHzXygjGCqSv8i2PzfKo3+9XtAKktSuaDUkOShWtl8iO5HcJn7xoRQeNLY43 3m/B+KQOFFKcoORhcXTSvVkj3AkLXWpN7BOgWaEfyfuko3uKBpLodUrUOG93+FhJwOvT 5E6rsxYF8cirFBnMJU8Sd735VLVLHtPS/K5NA7E3CjdGC3mDKU/N2Ro/6U8ZPJ8fuaoJ HBjA== X-Gm-Message-State: AOAM53187g8/urZWGQ0A/A8SLADK8z/WyrmrQ90RsGMgEXFWgQNoacc0 pkaxHiDUT8274W/urjIpyPHI19PWa8mHP7YPJLeBLJElCAHMPZSXZtEekVDPLDYFOnmVbOTKJEX rbUAhilmFL1Q5w2q5bRp4kR4p X-Received: by 2002:a05:6808:2025:b0:32b:737c:c7e1 with SMTP id q37-20020a056808202500b0032b737cc7e1mr16598251oiw.245.1654113194608; Wed, 01 Jun 2022 12:53:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFLxRXzoecCl3d0BpxRM7TRRJTDbUZta98EJay3TZEDv6HQg4xF2ItS7KCd4JCOlW//i1CoQ== X-Received: by 2002:a05:6808:2025:b0:32b:737c:c7e1 with SMTP id q37-20020a056808202500b0032b737cc7e1mr16598231oiw.245.1654113194159; Wed, 01 Jun 2022 12:53:14 -0700 (PDT) Received: from halaneylaptop ([2600:1700:1ff0:d0e0::2e]) by smtp.gmail.com with ESMTPSA id i24-20020a9d6258000000b0060ae8586befsm1201592otk.53.2022.06.01.12.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 12:53:13 -0700 (PDT) Date: Wed, 1 Jun 2022 14:53:11 -0500 From: Andrew Halaney To: Harsh Agarwal Cc: Greg Kroah-Hartman , Rob Herring , Philipp Zabel , Krzysztof Kozlowski , Felipe Balbi , Bjorn Andersson , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, quic_pkondeti@quicinc.com, quic_ppratap@quicinc.com, quic_jackp@quicinc.com Subject: Re: [PATCH 3/3] usb: dwc3: Refactor PHY logic to support Multiport Controller Message-ID: <20220601195311.xvyqzez247djomcr@halaneylaptop> References: <1653985217-20953-1-git-send-email-quic_harshq@quicinc.com> <1653985217-20953-4-git-send-email-quic_harshq@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1653985217-20953-4-git-send-email-quic_harshq@quicinc.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 31, 2022 at 01:50:17PM +0530, Harsh Agarwal wrote: > Currently the DWC3 driver supports only single port controller > which requires at most 2 PHYs ie HS and SS PHYs. > > But some SOCs have a "multiport" USB DWC3 controller where a > single controller supports multiple ports and each port have > their own PHYs. Refactor PHY logic to support the same. > > Signed-off-by: Harsh Agarwal > --- > drivers/usb/dwc3/core.c | 400 +++++++++++++++++++++++++++++++++------------- > drivers/usb/dwc3/core.h | 12 +- > drivers/usb/dwc3/drd.c | 16 +- > drivers/usb/dwc3/gadget.c | 4 +- > 4 files changed, 305 insertions(+), 127 deletions(-) > > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > index 5734219..5cc799e 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_usb2_phy; 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_usb3_phy; 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) > @@ -656,6 +659,7 @@ 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; > > @@ -716,7 +720,8 @@ 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_usb3_phy; i++) > + dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(i), reg); > > reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); > > @@ -730,7 +735,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_usb2_phy; i++) > + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); > } else { > /* Relying on default value. */ > if (!(reg & DWC3_GUSB2PHYCFG_ULPI_UTMI)) > @@ -787,7 +793,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_usb2_phy; i++) > + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); > > return 0; > } > @@ -826,17 +833,23 @@ 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_usb2_phy; i++) { > + usb_phy_shutdown(dwc->usb2_phy[i]); > + usb_phy_set_suspend(dwc->usb2_phy[i], 1); > + phy_exit(dwc->usb2_generic_phy[i]); > + phy_power_off(dwc->usb2_generic_phy[i]); > + } > + > + for (i = 0; i < dwc->num_usb3_phy; i++) { > + usb_phy_shutdown(dwc->usb3_phy[i]); > + usb_phy_set_suspend(dwc->usb3_phy[i], 1); > + phy_exit(dwc->usb3_generic_phy[i]); > + 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); > } > @@ -1039,7 +1052,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); > > @@ -1067,16 +1080,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_usb2_phy; i++) > + usb_phy_init(dwc->usb2_phy[i]); > + for (i = 0; i < dwc->num_usb3_phy; 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_usb2_phy; i++) { > + ret = phy_init(dwc->usb2_generic_phy[i]); > + if (ret < 0) > + goto err0a; Should we clean up the prior phys that did not fail? There's a couple loops where that question stands in this patch. > + } > + > + for (i = 0; i < dwc->num_usb3_phy; i++) { > + ret = phy_init(dwc->usb3_generic_phy[i]); > + if (ret < 0) { > + for (i = 0; i < dwc->num_usb2_phy; i++) > + phy_exit(dwc->usb2_generic_phy[i]); > + goto err0a; > + } > } > > ret = dwc3_core_soft_reset(dwc); > @@ -1086,15 +1107,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_phy; 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_phy; i++) { > + reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i)); > + reg |= DWC3_GUSB2PHYCFG_SUSPHY; > + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); > + } > } > } > > @@ -1113,15 +1138,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_usb2_phy; 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_usb3_phy; 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) { > @@ -1229,20 +1258,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_usb3_phy; i++) > + phy_power_off(dwc->usb3_generic_phy[i]); > > err3: > - phy_power_off(dwc->usb2_generic_phy); > + for (i = 0; i < dwc->num_usb2_phy; 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_usb2_phy; i++) > + usb_phy_set_suspend(dwc->usb2_phy[i], 1); > + for (i = 0; i < dwc->num_usb3_phy; 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_usb2_phy; i++) { > + usb_phy_shutdown(dwc->usb2_phy[i]); > + phy_exit(dwc->usb2_generic_phy[i]); > + } > + > + for (i = 0; i < dwc->num_usb3_phy; i++) { > + usb_phy_shutdown(dwc->usb3_phy[i]); > + phy_exit(dwc->usb3_generic_phy[i]); > + } > > err0a: > dwc3_ulpi_exit(dwc); > @@ -1251,53 +1289,172 @@ 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_usb2_phy++; > + } else if (count == 2) { > + dwc->num_usb2_phy++; > + dwc->num_usb3_phy++; > + } 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*/ Nit, space after DWC3 > + for_each_available_child_of_node(dwc->dev->of_node, ports) { > + if (!strcmp(ports->name, "multiport")) > + break; > + } > + if (!ports) { > + dwc->num_usb2_phy = 1; > + dwc->num_usb3_phy = 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_usb2_phy, > + dwc->num_usb3_phy); > + > + dwc->usb2_phy = devm_kzalloc(dwc->dev, > + sizeof(*dwc->usb2_phy) * dwc->num_usb2_phy, GFP_KERNEL); > + if (!dwc->usb2_phy) > + return -ENOMEM; > + > + dwc->usb3_phy = devm_kzalloc(dwc->dev, > + sizeof(*dwc->usb3_phy) * dwc->num_usb3_phy, GFP_KERNEL); > + if (!dwc->usb3_phy) > + return -ENOMEM; > + > + dwc->usb2_generic_phy = devm_kzalloc(dwc->dev, > + sizeof(*dwc->usb2_generic_phy) * dwc->num_usb2_phy, GFP_KERNEL); > + if (!dwc->usb2_generic_phy) > + return -ENOMEM; > + > + dwc->usb3_generic_phy = devm_kzalloc(dwc->dev, > + sizeof(*dwc->usb3_generic_phy) * dwc->num_usb3_phy, 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] = devm_of_usb_get_phy_by_phandle(dev, > + "usb-phy", 0, lookup_node); > + dwc->usb3_phy[i] = devm_of_usb_get_phy_by_phandle(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) I think this can be -ENOSYS if !CONFIG_GENERIC_PHY > + 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*/ Nit, space after 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++; > + } > + } > > return 0; > } > @@ -1305,16 +1462,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) > @@ -1323,10 +1480,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_usb3_phy; 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_usb3_phy; i++) > + phy_set_mode(dwc->usb3_generic_phy[i], PHY_MODE_USB_HOST); > > ret = dwc3_host_init(dwc); > if (ret) > @@ -1674,7 +1836,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; > > @@ -1839,15 +2001,18 @@ 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); > - > - 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_usb2_phy; i++) { > + usb_phy_shutdown(dwc->usb2_phy[i]); > + usb_phy_set_suspend(dwc->usb2_phy[i], 1); > + phy_exit(dwc->usb2_generic_phy[i]); > + phy_power_off(dwc->usb2_generic_phy[i]); > + } > + for (i = 0; i < dwc->num_usb3_phy; i++) { > + usb_phy_shutdown(dwc->usb3_phy[i]); > + usb_phy_set_suspend(dwc->usb3_phy[i], 1); > + phy_exit(dwc->usb3_generic_phy[i]); > + phy_power_off(dwc->usb3_generic_phy[i]); > + } > > dwc3_ulpi_exit(dwc); > > @@ -1929,6 +2094,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; > > @@ -1951,17 +2117,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_usb2_phy; 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_phy; i++) > + phy_pm_runtime_put_sync(dwc->usb2_generic_phy[i]); > + for (i = 0; i < dwc->num_usb3_phy; i++) > + phy_pm_runtime_put_sync(dwc->usb3_generic_phy[i]); > break; > case DWC3_GCTL_PRTCAP_OTG: > /* do nothing during runtime_suspend */ > @@ -1989,7 +2159,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) { > @@ -2012,17 +2182,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_phy; 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_phy; i++) > + phy_pm_runtime_get_sync(dwc->usb2_generic_phy[i]); > + for (i = 0; i < dwc->num_usb3_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 81c486b..c169bf1 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_usb2_phy: Number of HS ports controlled by the core > + * @num_dsphy: Number of SS ports controlled by the core s/num_dsphy/num_usb3_phy/ > * @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_usb2_phy; > + u32 num_usb3_phy; > > - 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 00427d1..e3b2a17 100644 > --- a/drivers/usb/dwc3/gadget.c > +++ b/drivers/usb/dwc3/gadget.c > @@ -2872,8 +2872,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 >