All of lore.kernel.org
 help / color / mirror / Atom feed
From: Robin Murphy <robin.murphy@arm.com>
To: Amelie Delaunay <amelie.delaunay@st.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Tony Prisk <linux@prisktech.co.nz>,
	Alan Stern <stern@rowland.harvard.edu>,
	Roger Quadros <rogerq@ti.com>,
	Felipe Balbi <felipe.balbi@linux.intel.com>
Cc: devicetree@vger.kernel.org, linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v3] usb: host: ehci-platform: add support for optional external vbus supply
Date: Wed, 28 Feb 2018 13:33:48 +0000	[thread overview]
Message-ID: <dc412433-5a96-ea86-6d97-13877fe4806c@arm.com> (raw)
In-Reply-To: <1519393611-31367-1-git-send-email-amelie.delaunay@st.com>

Hi Amelie,

Just a couple of drive-by coding style comments...

On 23/02/18 13:46, Amelie Delaunay wrote:
> On some boards, especially when vbus supply requires large current,
> and the charge pump on the PHY isn't enough, an external vbus power switch
> may be used.
> Add support for optional external vbus supply per port in ehci-platform.
> 
> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
> 
> ---
> Changes in v3:
>   * Address Felipe Balbi comments: reduce indentation in
>     ehci_platform_port_power.
>   * Address Roger Quadros and Alan Stern comments: platforms can have one
>     external vbus supply per port, so add support to get as many optional
>     regulator as implemented ports on the host controller.
> 
> Changes in v2:
>   * Address Roger Quadros comments: move regulator_enable/disable from
>     ehci_platform_power_on/off to ehci_platform_port_power.
> ---
>   Documentation/devicetree/bindings/usb/usb-ehci.txt |  1 +
>   drivers/usb/host/ehci-platform.c                   | 52 +++++++++++++++++++++-
>   2 files changed, 52 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt
> index 3efde12..cd576db 100644
> --- a/Documentation/devicetree/bindings/usb/usb-ehci.txt
> +++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt
> @@ -19,6 +19,7 @@ Optional properties:
>    - phys : phandle + phy specifier pair
>    - phy-names : "usb"
>    - resets : phandle + reset specifier pair
> + - portN_vbus-supply : phandle of regulator supplying vbus for port N
>   
>   Example (Sequoia 440EPx):
>       ehci@e0000300 {
> diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
> index b065a96..8e9f201 100644
> --- a/drivers/usb/host/ehci-platform.c
> +++ b/drivers/usb/host/ehci-platform.c
> @@ -29,6 +29,7 @@
>   #include <linux/of.h>
>   #include <linux/phy/phy.h>
>   #include <linux/platform_device.h>
> +#include <linux/regulator/consumer.h>
>   #include <linux/reset.h>
>   #include <linux/usb.h>
>   #include <linux/usb/hcd.h>
> @@ -46,6 +47,7 @@ struct ehci_platform_priv {
>   	struct reset_control *rsts;
>   	struct phy **phys;
>   	int num_phys;
> +	struct regulator **vbus_supplies;
>   	bool reset_on_resume;
>   };
>   
> @@ -56,7 +58,8 @@ static int ehci_platform_reset(struct usb_hcd *hcd)
>   	struct platform_device *pdev = to_platform_device(hcd->self.controller);
>   	struct usb_ehci_pdata *pdata = dev_get_platdata(&pdev->dev);
>   	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
> -	int retval;
> +	struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);
> +	int portnum, n_ports, retval;
>   
>   	ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
>   
> @@ -71,11 +74,57 @@ static int ehci_platform_reset(struct usb_hcd *hcd)
>   	if (retval)
>   		return retval;
>   
> +	n_ports = HCS_N_PORTS(ehci->hcs_params);
> +	priv->vbus_supplies = devm_kcalloc(&pdev->dev, n_ports,
> +					   sizeof(struct regulator *),

Using "sizeof(*priv->vbus_supplies)" here will prevent people sending 
annoying cleanup patches later.

> +					   GFP_KERNEL);
> +	if (!priv->vbus_supplies)
> +		return -ENOMEM;
> +
> +	for (portnum = 0; portnum < n_ports; portnum++) {
> +		struct regulator *vbus_supply;
> +		char id[20];
> +
> +		sprintf(id, "port%d_vbus", portnum);
> +
> +		vbus_supply = devm_regulator_get_optional(&pdev->dev, id);
> +		if (IS_ERR(vbus_supply)) {
> +			retval = PTR_ERR(vbus_supply);
> +			if (retval == -ENODEV)
> +				priv->vbus_supplies[portnum] = NULL;

The array element here hasn't yet been assigned to since kcalloc() 
initially zeroed it, so this is entirely redundant - you can simply make 
the comparison a "!=" and remove the "else" case.

Robin.

> +			else
> +				return retval;
> +		} else {
> +			priv->vbus_supplies[portnum] = vbus_supply;
> +		}
> +	}
> +
>   	if (pdata->no_io_watchdog)
>   		ehci->need_io_watchdog = 0;
>   	return 0;
>   }
>   
> +static int ehci_platform_port_power(struct usb_hcd *hcd, int portnum,
> +				    bool enable)
> +{
> +	struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);
> +	int ret;
> +
> +	if (!priv->vbus_supplies[portnum])
> +		return 0;
> +
> +	if (enable)
> +		ret = regulator_enable(priv->vbus_supplies[portnum]);
> +	else
> +		ret = regulator_disable(priv->vbus_supplies[portnum]);
> +	if (ret)
> +		dev_err(hcd->self.controller,
> +			"failed to %s vbus supply for port %d: %d\n",
> +			enable ? "enable" : "disable", portnum, ret);
> +
> +	return ret;
> +}
> +
>   static int ehci_platform_power_on(struct platform_device *dev)
>   {
>   	struct usb_hcd *hcd = platform_get_drvdata(dev);
> @@ -134,6 +183,7 @@ static struct hc_driver __read_mostly ehci_platform_hc_driver;
>   static const struct ehci_driver_overrides platform_overrides __initconst = {
>   	.reset =		ehci_platform_reset,
>   	.extra_priv_size =	sizeof(struct ehci_platform_priv),
> +	.port_power =		ehci_platform_port_power,
>   };
>   
>   static struct usb_ehci_pdata ehci_platform_defaults = {
> 

WARNING: multiple messages have this Message-ID
From: Robin Murphy <robin.murphy@arm.com>
To: Amelie Delaunay <amelie.delaunay@st.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Tony Prisk <linux@prisktech.co.nz>,
	Alan Stern <stern@rowland.harvard.edu>,
	Roger Quadros <rogerq@ti.com>,
	Felipe Balbi <felipe.balbi@linux.intel.com>
Cc: devicetree@vger.kernel.org, linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [v3] usb: host: ehci-platform: add support for optional external vbus supply
Date: Wed, 28 Feb 2018 13:33:48 +0000	[thread overview]
Message-ID: <dc412433-5a96-ea86-6d97-13877fe4806c@arm.com> (raw)

Hi Amelie,

Just a couple of drive-by coding style comments...

On 23/02/18 13:46, Amelie Delaunay wrote:
> On some boards, especially when vbus supply requires large current,
> and the charge pump on the PHY isn't enough, an external vbus power switch
> may be used.
> Add support for optional external vbus supply per port in ehci-platform.
> 
> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
> 
> ---
> Changes in v3:
>   * Address Felipe Balbi comments: reduce indentation in
>     ehci_platform_port_power.
>   * Address Roger Quadros and Alan Stern comments: platforms can have one
>     external vbus supply per port, so add support to get as many optional
>     regulator as implemented ports on the host controller.
> 
> Changes in v2:
>   * Address Roger Quadros comments: move regulator_enable/disable from
>     ehci_platform_power_on/off to ehci_platform_port_power.
> ---
>   Documentation/devicetree/bindings/usb/usb-ehci.txt |  1 +
>   drivers/usb/host/ehci-platform.c                   | 52 +++++++++++++++++++++-
>   2 files changed, 52 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt
> index 3efde12..cd576db 100644
> --- a/Documentation/devicetree/bindings/usb/usb-ehci.txt
> +++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt
> @@ -19,6 +19,7 @@ Optional properties:
>    - phys : phandle + phy specifier pair
>    - phy-names : "usb"
>    - resets : phandle + reset specifier pair
> + - portN_vbus-supply : phandle of regulator supplying vbus for port N
>   
>   Example (Sequoia 440EPx):
>       ehci@e0000300 {
> diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
> index b065a96..8e9f201 100644
> --- a/drivers/usb/host/ehci-platform.c
> +++ b/drivers/usb/host/ehci-platform.c
> @@ -29,6 +29,7 @@
>   #include <linux/of.h>
>   #include <linux/phy/phy.h>
>   #include <linux/platform_device.h>
> +#include <linux/regulator/consumer.h>
>   #include <linux/reset.h>
>   #include <linux/usb.h>
>   #include <linux/usb/hcd.h>
> @@ -46,6 +47,7 @@ struct ehci_platform_priv {
>   	struct reset_control *rsts;
>   	struct phy **phys;
>   	int num_phys;
> +	struct regulator **vbus_supplies;
>   	bool reset_on_resume;
>   };
>   
> @@ -56,7 +58,8 @@ static int ehci_platform_reset(struct usb_hcd *hcd)
>   	struct platform_device *pdev = to_platform_device(hcd->self.controller);
>   	struct usb_ehci_pdata *pdata = dev_get_platdata(&pdev->dev);
>   	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
> -	int retval;
> +	struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);
> +	int portnum, n_ports, retval;
>   
>   	ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
>   
> @@ -71,11 +74,57 @@ static int ehci_platform_reset(struct usb_hcd *hcd)
>   	if (retval)
>   		return retval;
>   
> +	n_ports = HCS_N_PORTS(ehci->hcs_params);
> +	priv->vbus_supplies = devm_kcalloc(&pdev->dev, n_ports,
> +					   sizeof(struct regulator *),

Using "sizeof(*priv->vbus_supplies)" here will prevent people sending 
annoying cleanup patches later.

> +					   GFP_KERNEL);
> +	if (!priv->vbus_supplies)
> +		return -ENOMEM;
> +
> +	for (portnum = 0; portnum < n_ports; portnum++) {
> +		struct regulator *vbus_supply;
> +		char id[20];
> +
> +		sprintf(id, "port%d_vbus", portnum);
> +
> +		vbus_supply = devm_regulator_get_optional(&pdev->dev, id);
> +		if (IS_ERR(vbus_supply)) {
> +			retval = PTR_ERR(vbus_supply);
> +			if (retval == -ENODEV)
> +				priv->vbus_supplies[portnum] = NULL;

The array element here hasn't yet been assigned to since kcalloc() 
initially zeroed it, so this is entirely redundant - you can simply make 
the comparison a "!=" and remove the "else" case.

Robin.

> +			else
> +				return retval;
> +		} else {
> +			priv->vbus_supplies[portnum] = vbus_supply;
> +		}
> +	}
> +
>   	if (pdata->no_io_watchdog)
>   		ehci->need_io_watchdog = 0;
>   	return 0;
>   }
>   
> +static int ehci_platform_port_power(struct usb_hcd *hcd, int portnum,
> +				    bool enable)
> +{
> +	struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);
> +	int ret;
> +
> +	if (!priv->vbus_supplies[portnum])
> +		return 0;
> +
> +	if (enable)
> +		ret = regulator_enable(priv->vbus_supplies[portnum]);
> +	else
> +		ret = regulator_disable(priv->vbus_supplies[portnum]);
> +	if (ret)
> +		dev_err(hcd->self.controller,
> +			"failed to %s vbus supply for port %d: %d\n",
> +			enable ? "enable" : "disable", portnum, ret);
> +
> +	return ret;
> +}
> +
>   static int ehci_platform_power_on(struct platform_device *dev)
>   {
>   	struct usb_hcd *hcd = platform_get_drvdata(dev);
> @@ -134,6 +183,7 @@ static struct hc_driver __read_mostly ehci_platform_hc_driver;
>   static const struct ehci_driver_overrides platform_overrides __initconst = {
>   	.reset =		ehci_platform_reset,
>   	.extra_priv_size =	sizeof(struct ehci_platform_priv),
> +	.port_power =		ehci_platform_port_power,
>   };
>   
>   static struct usb_ehci_pdata ehci_platform_defaults = {
>
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

WARNING: multiple messages have this Message-ID
From: robin.murphy@arm.com (Robin Murphy)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3] usb: host: ehci-platform: add support for optional external vbus supply
Date: Wed, 28 Feb 2018 13:33:48 +0000	[thread overview]
Message-ID: <dc412433-5a96-ea86-6d97-13877fe4806c@arm.com> (raw)
In-Reply-To: <1519393611-31367-1-git-send-email-amelie.delaunay@st.com>

Hi Amelie,

Just a couple of drive-by coding style comments...

On 23/02/18 13:46, Amelie Delaunay wrote:
> On some boards, especially when vbus supply requires large current,
> and the charge pump on the PHY isn't enough, an external vbus power switch
> may be used.
> Add support for optional external vbus supply per port in ehci-platform.
> 
> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
> 
> ---
> Changes in v3:
>   * Address Felipe Balbi comments: reduce indentation in
>     ehci_platform_port_power.
>   * Address Roger Quadros and Alan Stern comments: platforms can have one
>     external vbus supply per port, so add support to get as many optional
>     regulator as implemented ports on the host controller.
> 
> Changes in v2:
>   * Address Roger Quadros comments: move regulator_enable/disable from
>     ehci_platform_power_on/off to ehci_platform_port_power.
> ---
>   Documentation/devicetree/bindings/usb/usb-ehci.txt |  1 +
>   drivers/usb/host/ehci-platform.c                   | 52 +++++++++++++++++++++-
>   2 files changed, 52 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt
> index 3efde12..cd576db 100644
> --- a/Documentation/devicetree/bindings/usb/usb-ehci.txt
> +++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt
> @@ -19,6 +19,7 @@ Optional properties:
>    - phys : phandle + phy specifier pair
>    - phy-names : "usb"
>    - resets : phandle + reset specifier pair
> + - portN_vbus-supply : phandle of regulator supplying vbus for port N
>   
>   Example (Sequoia 440EPx):
>       ehci at e0000300 {
> diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
> index b065a96..8e9f201 100644
> --- a/drivers/usb/host/ehci-platform.c
> +++ b/drivers/usb/host/ehci-platform.c
> @@ -29,6 +29,7 @@
>   #include <linux/of.h>
>   #include <linux/phy/phy.h>
>   #include <linux/platform_device.h>
> +#include <linux/regulator/consumer.h>
>   #include <linux/reset.h>
>   #include <linux/usb.h>
>   #include <linux/usb/hcd.h>
> @@ -46,6 +47,7 @@ struct ehci_platform_priv {
>   	struct reset_control *rsts;
>   	struct phy **phys;
>   	int num_phys;
> +	struct regulator **vbus_supplies;
>   	bool reset_on_resume;
>   };
>   
> @@ -56,7 +58,8 @@ static int ehci_platform_reset(struct usb_hcd *hcd)
>   	struct platform_device *pdev = to_platform_device(hcd->self.controller);
>   	struct usb_ehci_pdata *pdata = dev_get_platdata(&pdev->dev);
>   	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
> -	int retval;
> +	struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);
> +	int portnum, n_ports, retval;
>   
>   	ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
>   
> @@ -71,11 +74,57 @@ static int ehci_platform_reset(struct usb_hcd *hcd)
>   	if (retval)
>   		return retval;
>   
> +	n_ports = HCS_N_PORTS(ehci->hcs_params);
> +	priv->vbus_supplies = devm_kcalloc(&pdev->dev, n_ports,
> +					   sizeof(struct regulator *),

Using "sizeof(*priv->vbus_supplies)" here will prevent people sending 
annoying cleanup patches later.

> +					   GFP_KERNEL);
> +	if (!priv->vbus_supplies)
> +		return -ENOMEM;
> +
> +	for (portnum = 0; portnum < n_ports; portnum++) {
> +		struct regulator *vbus_supply;
> +		char id[20];
> +
> +		sprintf(id, "port%d_vbus", portnum);
> +
> +		vbus_supply = devm_regulator_get_optional(&pdev->dev, id);
> +		if (IS_ERR(vbus_supply)) {
> +			retval = PTR_ERR(vbus_supply);
> +			if (retval == -ENODEV)
> +				priv->vbus_supplies[portnum] = NULL;

The array element here hasn't yet been assigned to since kcalloc() 
initially zeroed it, so this is entirely redundant - you can simply make 
the comparison a "!=" and remove the "else" case.

Robin.

> +			else
> +				return retval;
> +		} else {
> +			priv->vbus_supplies[portnum] = vbus_supply;
> +		}
> +	}
> +
>   	if (pdata->no_io_watchdog)
>   		ehci->need_io_watchdog = 0;
>   	return 0;
>   }
>   
> +static int ehci_platform_port_power(struct usb_hcd *hcd, int portnum,
> +				    bool enable)
> +{
> +	struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);
> +	int ret;
> +
> +	if (!priv->vbus_supplies[portnum])
> +		return 0;
> +
> +	if (enable)
> +		ret = regulator_enable(priv->vbus_supplies[portnum]);
> +	else
> +		ret = regulator_disable(priv->vbus_supplies[portnum]);
> +	if (ret)
> +		dev_err(hcd->self.controller,
> +			"failed to %s vbus supply for port %d: %d\n",
> +			enable ? "enable" : "disable", portnum, ret);
> +
> +	return ret;
> +}
> +
>   static int ehci_platform_power_on(struct platform_device *dev)
>   {
>   	struct usb_hcd *hcd = platform_get_drvdata(dev);
> @@ -134,6 +183,7 @@ static struct hc_driver __read_mostly ehci_platform_hc_driver;
>   static const struct ehci_driver_overrides platform_overrides __initconst = {
>   	.reset =		ehci_platform_reset,
>   	.extra_priv_size =	sizeof(struct ehci_platform_priv),
> +	.port_power =		ehci_platform_port_power,
>   };
>   
>   static struct usb_ehci_pdata ehci_platform_defaults = {
> 

  parent reply	other threads:[~2018-02-28 13:33 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-23 13:46 [PATCH v3] usb: host: ehci-platform: add support for optional external vbus supply Amelie Delaunay
2018-02-23 13:46 ` Amelie Delaunay
2018-02-23 13:46 ` [v3] " Amelie Delaunay
2018-02-23 13:46 ` [PATCH v3] " Amelie Delaunay
2018-02-28 11:01 ` Roger Quadros
2018-02-28 11:01   ` Roger Quadros
2018-02-28 11:01   ` [v3] " Roger Quadros
2018-02-28 11:01   ` [PATCH v3] " Roger Quadros
2018-03-01  8:47   ` Amelie DELAUNAY
2018-03-01  8:47     ` Amelie DELAUNAY
2018-03-01  8:47     ` [v3] " Amelie Delaunay
2018-02-28 13:33 ` Robin Murphy [this message]
2018-02-28 13:33   ` [PATCH v3] " Robin Murphy
2018-02-28 13:33   ` [v3] " Robin Murphy
2018-03-01  8:49   ` [PATCH v3] " Amelie DELAUNAY
2018-03-01  8:49     ` Amelie DELAUNAY
2018-03-01  8:49     ` [v3] " Amelie Delaunay

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=dc412433-5a96-ea86-6d97-13877fe4806c@arm.com \
    --to=robin.murphy@arm.com \
    --cc=amelie.delaunay@st.com \
    --cc=devicetree@vger.kernel.org \
    --cc=felipe.balbi@linux.intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=linux@prisktech.co.nz \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=rogerq@ti.com \
    --cc=stern@rowland.harvard.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.