| Message ID | 1586939108-10075-3-git-send-email-nkristam@nvidia.com |
|---|---|
| State | Deferred |
| Headers | show |
| Series | Tegra XUSB charger detect support | expand |
On Wed, Apr 15, 2020 at 01:55:02PM +0530, Nagarjuna Kristam wrote: > Register vbus_draw to gadget ops and update corresponding vbus > draw current to usb_phy. > > Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com> > --- > V2: > - Patch re-based. > --- > drivers/usb/gadget/udc/tegra-xudc.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c > index 52a6add..9d3c109 100644 > --- a/drivers/usb/gadget/udc/tegra-xudc.c > +++ b/drivers/usb/gadget/udc/tegra-xudc.c > @@ -492,6 +492,7 @@ struct tegra_xudc { > bool powergated; > > struct usb_phy **usbphy; > + struct usb_phy *curr_usbphy; > struct notifier_block vbus_nb; > > struct completion disconnect_complete; > @@ -719,6 +720,7 @@ static int tegra_xudc_vbus_notify(struct notifier_block *nb, > if (!xudc->suspended && phy_index != -1) { > xudc->curr_utmi_phy = xudc->utmi_phy[phy_index]; > xudc->curr_usb3_phy = xudc->usb3_phy[phy_index]; > + xudc->curr_usbphy = usbphy; > schedule_work(&xudc->usb_role_sw_work); > } > > @@ -2042,6 +2044,19 @@ static int tegra_xudc_gadget_stop(struct usb_gadget *gadget) > return 0; > } > > +static int tegra_xudc_gadget_vbus_draw(struct usb_gadget *gadget, > + unsigned int m_a) > +{ > + struct tegra_xudc *xudc = to_xudc(gadget); > + > + dev_dbg(xudc->dev, "%s: %u mA\n", __func__, m_a); > + > + if (xudc->curr_usbphy->chg_type == SDP_TYPE) > + usb_phy_set_power(xudc->curr_usbphy, m_a); Do we need to propagate the error code here in case the USB PHY for some reason doesn't support the given current? Or is it guaranteed that we always do support whatever is passed in here? Regardless of whether we support it or not, it might still be useful to add proper handling, if for nothing else but to set a good example. Thierry
On 28-04-2020 15:29, Thierry Reding wrote: >> @@ -2042,6 +2044,19 @@ static int tegra_xudc_gadget_stop(struct usb_gadget *gadget) >> return 0; >> } >> >> +static int tegra_xudc_gadget_vbus_draw(struct usb_gadget *gadget, >> + unsigned int m_a) >> +{ >> + struct tegra_xudc *xudc = to_xudc(gadget); >> + >> + dev_dbg(xudc->dev, "%s: %u mA\n", __func__, m_a); >> + >> + if (xudc->curr_usbphy->chg_type == SDP_TYPE) >> + usb_phy_set_power(xudc->curr_usbphy, m_a); > Do we need to propagate the error code here in case the USB PHY for some > reason doesn't support the given current? Or is it guaranteed that we > always do support whatever is passed in here? > > Regardless of whether we support it or not, it might still be useful to > add proper handling, if for nothing else but to set a good example. > > Thierry Will update accordingly, propagate the return the code to caller.
diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c index 52a6add..9d3c109 100644 --- a/drivers/usb/gadget/udc/tegra-xudc.c +++ b/drivers/usb/gadget/udc/tegra-xudc.c @@ -492,6 +492,7 @@ struct tegra_xudc { bool powergated; struct usb_phy **usbphy; + struct usb_phy *curr_usbphy; struct notifier_block vbus_nb; struct completion disconnect_complete; @@ -719,6 +720,7 @@ static int tegra_xudc_vbus_notify(struct notifier_block *nb, if (!xudc->suspended && phy_index != -1) { xudc->curr_utmi_phy = xudc->utmi_phy[phy_index]; xudc->curr_usb3_phy = xudc->usb3_phy[phy_index]; + xudc->curr_usbphy = usbphy; schedule_work(&xudc->usb_role_sw_work); } @@ -2042,6 +2044,19 @@ static int tegra_xudc_gadget_stop(struct usb_gadget *gadget) return 0; } +static int tegra_xudc_gadget_vbus_draw(struct usb_gadget *gadget, + unsigned int m_a) +{ + struct tegra_xudc *xudc = to_xudc(gadget); + + dev_dbg(xudc->dev, "%s: %u mA\n", __func__, m_a); + + if (xudc->curr_usbphy->chg_type == SDP_TYPE) + usb_phy_set_power(xudc->curr_usbphy, m_a); + + return 0; +} + static int tegra_xudc_set_selfpowered(struct usb_gadget *gadget, int is_on) { struct tegra_xudc *xudc = to_xudc(gadget); @@ -2058,6 +2073,7 @@ static struct usb_gadget_ops tegra_xudc_gadget_ops = { .pullup = tegra_xudc_gadget_pullup, .udc_start = tegra_xudc_gadget_start, .udc_stop = tegra_xudc_gadget_stop, + .vbus_draw = tegra_xudc_gadget_vbus_draw, .set_selfpowered = tegra_xudc_set_selfpowered, };
Register vbus_draw to gadget ops and update corresponding vbus draw current to usb_phy. Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com> --- V2: - Patch re-based. --- drivers/usb/gadget/udc/tegra-xudc.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)