diff mbox

[v3,net-next] mdio_bus: Issue GPIO RESET to PHYs.

Message ID f372db02-a919-55b4-9200-20726cd13482@ti.com
State New
Headers show

Commit Message

Roger Quadros April 20, 2017, 2:11 p.m. UTC
Some boards [1] leave the PHYs at an invalid state
during system power-up or reset thus causing unreliability
issues with the PHY which manifests as PHY not being detected
or link not functional. To fix this, these PHYs need to be RESET
via a GPIO connected to the PHY's RESET pin.

Some boards have a single GPIO controlling the PHY RESET pin of all
PHYs on the bus whereas some others have separate GPIOs controlling
individual PHY RESETs.

In both cases, the RESET de-assertion cannot be done in the PHY driver
as the PHY will not probe till its reset is de-asserted.
So do the RESET de-assertion in the MDIO bus driver.

[1] - am572x-idk, am571x-idk, a437x-idk

Signed-off-by: Roger Quadros <rogerq@ti.com>

---
v3:
- added more information in the DT binding document.

v2:
- add device tree binding document (mdio.txt)
- specify default reset delay in of_mdio.c instead of mdio_bus.c

 Documentation/devicetree/bindings/net/mdio.txt | 33 ++++++++++++++++++++++++++
 drivers/net/phy/mdio_bus.c                     | 22 +++++++++++++++++
 drivers/of/of_mdio.c                           |  7 ++++++
 include/linux/phy.h                            |  5 ++++
 4 files changed, 67 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/mdio.txt

-- 
2.7.4

Comments

Andrew Lunn April 21, 2017, 1:38 a.m. UTC | #1
> > +			gpiod_set_value_cansleep(gpiod, 1);

> > +			udelay(bus->reset_delay_us);

> > +			gpiod_set_value_cansleep(gpiod, 0);

> 

> Does that work even if the polarity of the reset line is active low?


Hi Florian

Yes, it does. The gpiod_ API takes care of that, if you set the flag
GPIO_ACTIVE_LOW in the device tree blob. This is one of the
improvements over the gpio_ API.

		Andrew
Roger Quadros April 21, 2017, 8:04 a.m. UTC | #2
Hi Florian,

On 21/04/17 04:23, Florian Fainelli wrote:
> Hi Roger,

> 

> On 04/20/2017 07:11 AM, Roger Quadros wrote:

>> Some boards [1] leave the PHYs at an invalid state

>> during system power-up or reset thus causing unreliability

>> issues with the PHY which manifests as PHY not being detected

>> or link not functional. To fix this, these PHYs need to be RESET

>> via a GPIO connected to the PHY's RESET pin.

>>

>> Some boards have a single GPIO controlling the PHY RESET pin of all

>> PHYs on the bus whereas some others have separate GPIOs controlling

>> individual PHY RESETs.

>>

>> In both cases, the RESET de-assertion cannot be done in the PHY driver

>> as the PHY will not probe till its reset is de-asserted.

>> So do the RESET de-assertion in the MDIO bus driver.

>>

>> [1] - am572x-idk, am571x-idk, a437x-idk

>>

>> Signed-off-by: Roger Quadros <rogerq@ti.com>

> 

> A few comments on the binding and the code, sorry for this late review.


No problem at all.
> 

>> +Example :

>> +This example shows these optional properties, plus other properties

>> +required for the TI Davinci MDIO driver.

>> +

>> +	davinci_mdio: ethernet@0x5c030000 {

>> +		compatible = "ti,davinci_mdio";

>> +		reg = <0x5c030000 0x1000>;

>> +		#address-cells = <1>;

>> +		#size-cells = <0>;

>> +

>> +		reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;

>> +		reset-delay-us = <2>;   /* PHY datasheet states 1uS min */

> 

> us is micro seconds, uS is micro siemens.


OK.

> 

>> +

>> +		ethphy0: ethernet-phy@1 {

>> +			reg = <1>;

>> +		};

>> +

>> +		ethphy1: ethernet-phy@3 {

>> +			reg = <3>;

>> +		};

>> +	};

> 

>>  

>> +	/* de-assert bus level PHY GPIO resets */

>> +	for (i = 0; i < bus->num_reset_gpios; i++) {

>> +		gpiod = devm_gpiod_get_index(&bus->dev, "reset", i,

>> +					     GPIOD_OUT_LOW);

>> +		if (IS_ERR(gpiod)) {

>> +			err = PTR_ERR(gpiod);

>> +			if (err != -ENOENT) {

>> +				pr_err("mii_bus %s couldn't get reset GPIO\n",

>> +				       bus->id);

> 

> Could we use dev_err(&bus->dev) here to better identify which MDIO bus

> is returning the problem?


Sure.
> 

>> +				return err;

> 

> Should we somehow "unwind" the reset lines we were able to successfully

> take out of reset and therefore put back into reset state? How about

> mdiobus_unregister()? Should we have similar code there, if not for

> correctness to be more power efficient?


Al right.

> 

>> +			}

>> +		} else {

>> +			gpiod_set_value_cansleep(gpiod, 1);

>> +			udelay(bus->reset_delay_us);

>> +			gpiod_set_value_cansleep(gpiod, 0);

> 

> Does that work even if the polarity of the reset line is active low?

> 


Yes. The polarity needs to be specified at DT as explained by Andrew already.

cheers,
-roger
Lars-Peter Clausen April 21, 2017, 1:31 p.m. UTC | #3
On 04/21/2017 03:15 PM, Roger Quadros wrote:
> diff --git a/Documentation/devicetree/bindings/net/mdio.txt b/Documentation/devicetree/bindings/net/mdio.txt

> new file mode 100644

> index 0000000..4ffbbac

> --- /dev/null

> +++ b/Documentation/devicetree/bindings/net/mdio.txt

> @@ -0,0 +1,33 @@

> +Common MDIO bus properties.

> +

> +These are generic properties that can apply to any MDIO bus.

> +

> +Optional properties:

> +- reset-gpios: List of one or more GPIOs that control the RESET lines

> +  of the PHYs on that MDIO bus.

> +- reset-delay-us: RESET pulse width in microseconds as per PHY datasheet.

> +

> +A list of child nodes, one per device on the bus is expected. These

> +should follow the generic phy.txt, or a device specific binding document.

> +

> +Example :

> +This example shows these optional properties, plus other properties

> +required for the TI Davinci MDIO driver.

> +

> +	davinci_mdio: ethernet@0x5c030000 {

> +		compatible = "ti,davinci_mdio";

> +		reg = <0x5c030000 0x1000>;

> +		#address-cells = <1>;

> +		#size-cells = <0>;

> +

> +		reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;

> +		reset-delay-us = <2>;   /* PHY datasheet states 1us min */


If this is the reset line of the PHY shouldn't it be a property of the PHY
node rather than of the MDIO controller node (which might have a reset on
its own)?

> +

> +		ethphy0: ethernet-phy@1 {

> +			reg = <1>;

> +		};

> +

> +		ethphy1: ethernet-phy@3 {

> +			reg = <3>;

> +		};
Florian Fainelli April 24, 2017, 4:32 p.m. UTC | #4
On 04/24/2017 02:04 AM, Roger Quadros wrote:
> On 24/04/17 02:35, Andrew Lunn wrote:

>> On Fri, Apr 21, 2017 at 03:31:09PM +0200, Lars-Peter Clausen wrote:

>>> On 04/21/2017 03:15 PM, Roger Quadros wrote:

>>>> diff --git a/Documentation/devicetree/bindings/net/mdio.txt b/Documentation/devicetree/bindings/net/mdio.txt

>>>> new file mode 100644

>>>> index 0000000..4ffbbac

>>>> --- /dev/null

>>>> +++ b/Documentation/devicetree/bindings/net/mdio.txt

>>>> @@ -0,0 +1,33 @@

>>>> +Common MDIO bus properties.

>>>> +

>>>> +These are generic properties that can apply to any MDIO bus.

>>>> +

>>>> +Optional properties:

>>>> +- reset-gpios: List of one or more GPIOs that control the RESET lines

>>>> +  of the PHYs on that MDIO bus.

>>>> +- reset-delay-us: RESET pulse width in microseconds as per PHY datasheet.

>>>> +

>>>> +A list of child nodes, one per device on the bus is expected. These

>>>> +should follow the generic phy.txt, or a device specific binding document.

>>>> +

>>>> +Example :

>>>> +This example shows these optional properties, plus other properties

>>>> +required for the TI Davinci MDIO driver.

>>>> +

>>>> +	davinci_mdio: ethernet@0x5c030000 {

>>>> +		compatible = "ti,davinci_mdio";

>>>> +		reg = <0x5c030000 0x1000>;

>>>> +		#address-cells = <1>;

>>>> +		#size-cells = <0>;

>>>> +

>>>> +		reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;

>>>> +		reset-delay-us = <2>;   /* PHY datasheet states 1us min */

>>>

>>> If this is the reset line of the PHY shouldn't it be a property of the PHY

>>> node rather than of the MDIO controller node (which might have a reset on

>>> its own)?

>>>> +

>>>> +		ethphy0: ethernet-phy@1 {

>>>> +			reg = <1>;

>>>> +		};

>>>> +

>>>> +		ethphy1: ethernet-phy@3 {

>>>> +			reg = <3>;

>>>> +		};

>>

>> Hi Lars-Peter

>>

>> We discussed this when the first proposal was made. There are two

>> cases, to consider.

>>

>> 1) Here, one GPIO line resets all PHYs on the same MDIO bus. In this

>> example, two PHYs.

>>

>> 2) There is one GPIO line per PHY. That is a separate case, and as you

>> say, the reset line should probably be considered a PHY property, not

>> an MDIO property. However, it can be messy, since in order to probe

>> the MDIO bus, you probably need to take the PHY out of reset.

>>

>> Anyway, this patch addresses the first case, so should be accepted. If

>> anybody wants to address the second case, they are free to do so.

> 

> Thanks for the explanation Andrew.

> 

> For the second case, even if the RESET GPIO property is specified

> in the PHY node, the RESET *will* have to be done by the MDIO bus driver

> else the PHY might not be probed at all.

> 

> Whether we need additional code to just to make the DT look prettier is

> questionable and if required can come as a separate patch.


Well, it's not about prettier vs. uglier, it's about correct vs.
incorrect. The binding document you propose here is correct for a single
reset line controlling all PHYs, and that's why such a reset line needs
to be placed at the MDIO controller level, because it's a property of
such a node.

If you need to support individual reset lines per-PHY, then there should
be some kind of amendment to the Ethernet PHY Device Tree binding
document which specifies optional reset-gpio properties for these nodes.

Until that happens, I think your v4 is good to go.
-- 
Florian
David Miller April 24, 2017, 4:40 p.m. UTC | #5
From: Roger Quadros <rogerq@ti.com>

Date: Fri, 21 Apr 2017 16:15:38 +0300

> Some boards [1] leave the PHYs at an invalid state

> during system power-up or reset thus causing unreliability

> issues with the PHY which manifests as PHY not being detected

> or link not functional. To fix this, these PHYs need to be RESET

> via a GPIO connected to the PHY's RESET pin.

> 

> Some boards have a single GPIO controlling the PHY RESET pin of all

> PHYs on the bus whereas some others have separate GPIOs controlling

> individual PHY RESETs.

> 

> In both cases, the RESET de-assertion cannot be done in the PHY driver

> as the PHY will not probe till its reset is de-asserted.

> So do the RESET de-assertion in the MDIO bus driver.

> 

> [1] - am572x-idk, am571x-idk, a437x-idk

> 

> Signed-off-by: Roger Quadros <rogerq@ti.com>


Applied, thanks.
Lars-Peter Clausen April 25, 2017, 4:22 p.m. UTC | #6
On 04/24/2017 11:04 AM, Roger Quadros wrote:
> On 24/04/17 02:35, Andrew Lunn wrote:

>> On Fri, Apr 21, 2017 at 03:31:09PM +0200, Lars-Peter Clausen wrote:

>>> On 04/21/2017 03:15 PM, Roger Quadros wrote:

>>>> diff --git a/Documentation/devicetree/bindings/net/mdio.txt b/Documentation/devicetree/bindings/net/mdio.txt

>>>> new file mode 100644

>>>> index 0000000..4ffbbac

>>>> --- /dev/null

>>>> +++ b/Documentation/devicetree/bindings/net/mdio.txt

>>>> @@ -0,0 +1,33 @@

>>>> +Common MDIO bus properties.

>>>> +

>>>> +These are generic properties that can apply to any MDIO bus.

>>>> +

>>>> +Optional properties:

>>>> +- reset-gpios: List of one or more GPIOs that control the RESET lines

>>>> +  of the PHYs on that MDIO bus.

>>>> +- reset-delay-us: RESET pulse width in microseconds as per PHY datasheet.

>>>> +

>>>> +A list of child nodes, one per device on the bus is expected. These

>>>> +should follow the generic phy.txt, or a device specific binding document.

>>>> +

>>>> +Example :

>>>> +This example shows these optional properties, plus other properties

>>>> +required for the TI Davinci MDIO driver.

>>>> +

>>>> +	davinci_mdio: ethernet@0x5c030000 {

>>>> +		compatible = "ti,davinci_mdio";

>>>> +		reg = <0x5c030000 0x1000>;

>>>> +		#address-cells = <1>;

>>>> +		#size-cells = <0>;

>>>> +

>>>> +		reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;

>>>> +		reset-delay-us = <2>;   /* PHY datasheet states 1us min */

>>>

>>> If this is the reset line of the PHY shouldn't it be a property of the PHY

>>> node rather than of the MDIO controller node (which might have a reset on

>>> its own)?

>>>> +

>>>> +		ethphy0: ethernet-phy@1 {

>>>> +			reg = <1>;

>>>> +		};

>>>> +

>>>> +		ethphy1: ethernet-phy@3 {

>>>> +			reg = <3>;

>>>> +		};

>>

>> Hi Lars-Peter

>>

>> We discussed this when the first proposal was made. There are two

>> cases, to consider.

>>

>> 1) Here, one GPIO line resets all PHYs on the same MDIO bus. In this

>> example, two PHYs.

>>

>> 2) There is one GPIO line per PHY. That is a separate case, and as you

>> say, the reset line should probably be considered a PHY property, not

>> an MDIO property. However, it can be messy, since in order to probe

>> the MDIO bus, you probably need to take the PHY out of reset.

>>


But the DT binding documentation says something else "List of one or more
GPIOs that control the RESET lines of the PHYs on that MDIO bus".

>> Anyway, this patch addresses the first case, so should be accepted. If

>> anybody wants to address the second case, they are free to do so.


I think we all know that that's not going to happen. Once there is a working
kludge there is no incentive to do a proper implementation anymore.


> Thanks for the explanation Andrew.

> 

> For the second case, even if the RESET GPIO property is specified

> in the PHY node, the RESET *will* have to be done by the MDIO bus driver

> else the PHY might not be probed at all.


I'm not arguing with that, just that the hardware description should be
truthful to the hardware topology and not to the software topology, i.e. the
implementation details of the Linux kernel in this case. Reset GPIOs are not
the only resource that is connected to the PHY that needs to be enabled
before they can be enumerated. E.g. clocks and regulators fall into the same
realm. And while you might argue that with a on-SoC phy controller node
there wont be any conflicts in regard to the reset-gpios property, this not
so very true for the clocks property.

And MDIO is not really special in this regard, other discoverable buses
(like USB, SDIO, ULPI) have the very same issue. Having a standardized
binding approach where the resources are declared as part as the child child
is preferable in my opinion.

> 

> Whether we need additional code to just to make the DT look prettier is

> questionable and if required can come as a separate patch.


Unfortunately not, once it is merged it can't be changed anymore.
Florian Fainelli April 25, 2017, 4:31 p.m. UTC | #7
On 04/25/2017 09:22 AM, Lars-Peter Clausen wrote:
> On 04/24/2017 11:04 AM, Roger Quadros wrote:

>> On 24/04/17 02:35, Andrew Lunn wrote:

>>> On Fri, Apr 21, 2017 at 03:31:09PM +0200, Lars-Peter Clausen wrote:

>>>> On 04/21/2017 03:15 PM, Roger Quadros wrote:

>>>>> diff --git a/Documentation/devicetree/bindings/net/mdio.txt b/Documentation/devicetree/bindings/net/mdio.txt

>>>>> new file mode 100644

>>>>> index 0000000..4ffbbac

>>>>> --- /dev/null

>>>>> +++ b/Documentation/devicetree/bindings/net/mdio.txt

>>>>> @@ -0,0 +1,33 @@

>>>>> +Common MDIO bus properties.

>>>>> +

>>>>> +These are generic properties that can apply to any MDIO bus.

>>>>> +

>>>>> +Optional properties:

>>>>> +- reset-gpios: List of one or more GPIOs that control the RESET lines

>>>>> +  of the PHYs on that MDIO bus.

>>>>> +- reset-delay-us: RESET pulse width in microseconds as per PHY datasheet.

>>>>> +

>>>>> +A list of child nodes, one per device on the bus is expected. These

>>>>> +should follow the generic phy.txt, or a device specific binding document.

>>>>> +

>>>>> +Example :

>>>>> +This example shows these optional properties, plus other properties

>>>>> +required for the TI Davinci MDIO driver.

>>>>> +

>>>>> +	davinci_mdio: ethernet@0x5c030000 {

>>>>> +		compatible = "ti,davinci_mdio";

>>>>> +		reg = <0x5c030000 0x1000>;

>>>>> +		#address-cells = <1>;

>>>>> +		#size-cells = <0>;

>>>>> +

>>>>> +		reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;

>>>>> +		reset-delay-us = <2>;   /* PHY datasheet states 1us min */

>>>>

>>>> If this is the reset line of the PHY shouldn't it be a property of the PHY

>>>> node rather than of the MDIO controller node (which might have a reset on

>>>> its own)?

>>>>> +

>>>>> +		ethphy0: ethernet-phy@1 {

>>>>> +			reg = <1>;

>>>>> +		};

>>>>> +

>>>>> +		ethphy1: ethernet-phy@3 {

>>>>> +			reg = <3>;

>>>>> +		};

>>>

>>> Hi Lars-Peter

>>>

>>> We discussed this when the first proposal was made. There are two

>>> cases, to consider.

>>>

>>> 1) Here, one GPIO line resets all PHYs on the same MDIO bus. In this

>>> example, two PHYs.

>>>

>>> 2) There is one GPIO line per PHY. That is a separate case, and as you

>>> say, the reset line should probably be considered a PHY property, not

>>> an MDIO property. However, it can be messy, since in order to probe

>>> the MDIO bus, you probably need to take the PHY out of reset.

>>>

> 

> But the DT binding documentation says something else "List of one or more

> GPIOs that control the RESET lines of the PHYs on that MDIO bus".


I agree, it should be defined more strictly as:

"One GPIO that controls the reset line of *all* PHYs populated on that
MDIO bus"

If there are separate lines, these automatically become properties of
the PHY nodes.

> 

>>> Anyway, this patch addresses the first case, so should be accepted. If

>>> anybody wants to address the second case, they are free to do so.

> 

> I think we all know that that's not going to happen. Once there is a working

> kludge there is no incentive to do a proper implementation anymore.

> 

> 

>> Thanks for the explanation Andrew.

>>

>> For the second case, even if the RESET GPIO property is specified

>> in the PHY node, the RESET *will* have to be done by the MDIO bus driver

>> else the PHY might not be probed at all.

> 

> I'm not arguing with that, just that the hardware description should be

> truthful to the hardware topology and not to the software topology, i.e. the

> implementation details of the Linux kernel in this case. Reset GPIOs are not

> the only resource that is connected to the PHY that needs to be enabled

> before they can be enumerated. E.g. clocks and regulators fall into the same

> realm. And while you might argue that with a on-SoC phy controller node

> there wont be any conflicts in regard to the reset-gpios property, this not

> so very true for the clocks property.


Agreed, but with the exception of the unfortunate choice of words here
(single vs. multiple) there is not a really a divergence in how the
shared reset line is represented compared to other similar control
busses, is there?

> 

> And MDIO is not really special in this regard, other discoverable buses

> (like USB, SDIO, ULPI) have the very same issue. Having a standardized

> binding approach where the resources are declared as part as the child child

> is preferable in my opinion.

> 

>>

>> Whether we need additional code to just to make the DT look prettier is

>> questionable and if required can come as a separate patch.

> 

> Unfortunately not, once it is merged it can't be changed anymore.


There are no in tree users yet, so let's get the different things fixed
right now.
-- 
Florian
Roger Quadros April 26, 2017, 10:46 a.m. UTC | #8
On 25/04/17 19:31, Florian Fainelli wrote:
> On 04/25/2017 09:22 AM, Lars-Peter Clausen wrote:

>> On 04/24/2017 11:04 AM, Roger Quadros wrote:

>>> On 24/04/17 02:35, Andrew Lunn wrote:

>>>> On Fri, Apr 21, 2017 at 03:31:09PM +0200, Lars-Peter Clausen wrote:

>>>>> On 04/21/2017 03:15 PM, Roger Quadros wrote:

>>>>>> diff --git a/Documentation/devicetree/bindings/net/mdio.txt b/Documentation/devicetree/bindings/net/mdio.txt

>>>>>> new file mode 100644

>>>>>> index 0000000..4ffbbac

>>>>>> --- /dev/null

>>>>>> +++ b/Documentation/devicetree/bindings/net/mdio.txt

>>>>>> @@ -0,0 +1,33 @@

>>>>>> +Common MDIO bus properties.

>>>>>> +

>>>>>> +These are generic properties that can apply to any MDIO bus.

>>>>>> +

>>>>>> +Optional properties:

>>>>>> +- reset-gpios: List of one or more GPIOs that control the RESET lines

>>>>>> +  of the PHYs on that MDIO bus.

>>>>>> +- reset-delay-us: RESET pulse width in microseconds as per PHY datasheet.

>>>>>> +

>>>>>> +A list of child nodes, one per device on the bus is expected. These

>>>>>> +should follow the generic phy.txt, or a device specific binding document.

>>>>>> +

>>>>>> +Example :

>>>>>> +This example shows these optional properties, plus other properties

>>>>>> +required for the TI Davinci MDIO driver.

>>>>>> +

>>>>>> +	davinci_mdio: ethernet@0x5c030000 {

>>>>>> +		compatible = "ti,davinci_mdio";

>>>>>> +		reg = <0x5c030000 0x1000>;

>>>>>> +		#address-cells = <1>;

>>>>>> +		#size-cells = <0>;

>>>>>> +

>>>>>> +		reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;

>>>>>> +		reset-delay-us = <2>;   /* PHY datasheet states 1us min */

>>>>>

>>>>> If this is the reset line of the PHY shouldn't it be a property of the PHY

>>>>> node rather than of the MDIO controller node (which might have a reset on

>>>>> its own)?

>>>>>> +

>>>>>> +		ethphy0: ethernet-phy@1 {

>>>>>> +			reg = <1>;

>>>>>> +		};

>>>>>> +

>>>>>> +		ethphy1: ethernet-phy@3 {

>>>>>> +			reg = <3>;

>>>>>> +		};

>>>>

>>>> Hi Lars-Peter

>>>>

>>>> We discussed this when the first proposal was made. There are two

>>>> cases, to consider.

>>>>

>>>> 1) Here, one GPIO line resets all PHYs on the same MDIO bus. In this

>>>> example, two PHYs.

>>>>

>>>> 2) There is one GPIO line per PHY. That is a separate case, and as you

>>>> say, the reset line should probably be considered a PHY property, not

>>>> an MDIO property. However, it can be messy, since in order to probe

>>>> the MDIO bus, you probably need to take the PHY out of reset.

>>>>

>>

>> But the DT binding documentation says something else "List of one or more

>> GPIOs that control the RESET lines of the PHYs on that MDIO bus".

> 

> I agree, it should be defined more strictly as:

> 

> "One GPIO that controls the reset line of *all* PHYs populated on that

> MDIO bus"


Patch is already in net-next. How can we get this fixed? Should I send a v5?

> 

> If there are separate lines, these automatically become properties of

> the PHY nodes.

> 

>>

>>>> Anyway, this patch addresses the first case, so should be accepted. If

>>>> anybody wants to address the second case, they are free to do so.

>>

>> I think we all know that that's not going to happen. Once there is a working

>> kludge there is no incentive to do a proper implementation anymore.

>>

>>

>>> Thanks for the explanation Andrew.

>>>

>>> For the second case, even if the RESET GPIO property is specified

>>> in the PHY node, the RESET *will* have to be done by the MDIO bus driver

>>> else the PHY might not be probed at all.

>>

>> I'm not arguing with that, just that the hardware description should be

>> truthful to the hardware topology and not to the software topology, i.e. the

>> implementation details of the Linux kernel in this case. Reset GPIOs are not

>> the only resource that is connected to the PHY that needs to be enabled

>> before they can be enumerated. E.g. clocks and regulators fall into the same

>> realm. And while you might argue that with a on-SoC phy controller node

>> there wont be any conflicts in regard to the reset-gpios property, this not

>> so very true for the clocks property.

> 

> Agreed, but with the exception of the unfortunate choice of words here

> (single vs. multiple) there is not a really a divergence in how the

> shared reset line is represented compared to other similar control

> busses, is there?

> 

>>

>> And MDIO is not really special in this regard, other discoverable buses

>> (like USB, SDIO, ULPI) have the very same issue. Having a standardized

>> binding approach where the resources are declared as part as the child child

>> is preferable in my opinion.

>>

>>>

>>> Whether we need additional code to just to make the DT look prettier is

>>> questionable and if required can come as a separate patch.

>>

>> Unfortunately not, once it is merged it can't be changed anymore.

> 

> There are no in tree users yet, so let's get the different things fixed

> right now.

> 


-- 
cheers,
-roger
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/net/mdio.txt b/Documentation/devicetree/bindings/net/mdio.txt
new file mode 100644
index 0000000..3517369
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/mdio.txt
@@ -0,0 +1,33 @@ 
+Common MDIO bus properties.
+
+These are generic properties that can apply to any MDIO bus.
+
+Optional properties:
+- reset-gpios: List of one or more GPIOs that control the RESET lines
+  of the PHYs on that MDIO bus.
+- reset-delay-us: RESET pulse width in microseconds as per PHY datasheet.
+
+A list of child nodes, one per device on the bus is expected. These
+should follow the generic phy.txt, or a device specific binding document.
+
+Example :
+This example shows these optional properties, plus other properties
+required for the TI Davinci MDIO driver.
+
+	davinci_mdio: ethernet@0x5c030000 {
+		compatible = "ti,davinci_mdio";
+		reg = <0x5c030000 0x1000>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
+		reset-delay-us = <2>;   /* PHY datasheet states 1uS min */
+
+		ethphy0: ethernet-phy@1 {
+			reg = <1>;
+		};
+
+		ethphy1: ethernet-phy@3 {
+			reg = <3>;
+		};
+	};
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index fa7d51f..b353d99 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -22,8 +22,11 @@ 
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/of_device.h>
 #include <linux/of_mdio.h>
+#include <linux/of_gpio.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
@@ -307,6 +310,7 @@  int __mdiobus_register(struct mii_bus *bus, struct module *owner)
 {
 	struct mdio_device *mdiodev;
 	int i, err;
+	struct gpio_desc *gpiod;
 
 	if (NULL == bus || NULL == bus->name ||
 	    NULL == bus->read || NULL == bus->write)
@@ -333,6 +337,24 @@  int __mdiobus_register(struct mii_bus *bus, struct module *owner)
 	if (bus->reset)
 		bus->reset(bus);
 
+	/* de-assert bus level PHY GPIO resets */
+	for (i = 0; i < bus->num_reset_gpios; i++) {
+		gpiod = devm_gpiod_get_index(&bus->dev, "reset", i,
+					     GPIOD_OUT_LOW);
+		if (IS_ERR(gpiod)) {
+			err = PTR_ERR(gpiod);
+			if (err != -ENOENT) {
+				pr_err("mii_bus %s couldn't get reset GPIO\n",
+				       bus->id);
+				return err;
+			}
+		} else {
+			gpiod_set_value_cansleep(gpiod, 1);
+			udelay(bus->reset_delay_us);
+			gpiod_set_value_cansleep(gpiod, 0);
+		}
+	}
+
 	for (i = 0; i < PHY_MAX_ADDR; i++) {
 		if ((bus->phy_mask & (1 << i)) == 0) {
 			struct phy_device *phydev;
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 0b29798..7e4c80f 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -22,6 +22,8 @@ 
 #include <linux/of_net.h>
 #include <linux/module.h>
 
+#define DEFAULT_GPIO_RESET_DELAY	10	/* in microseconds */
+
 MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");
 MODULE_LICENSE("GPL");
 
@@ -221,6 +223,11 @@  int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
 
 	mdio->dev.of_node = np;
 
+	/* Get bus level PHY reset GPIO details */
+	mdio->reset_delay_us = DEFAULT_GPIO_RESET_DELAY;
+	of_property_read_u32(np, "reset-delay-us", &mdio->reset_delay_us);
+	mdio->num_reset_gpios = of_gpio_named_count(np, "reset-gpios");
+
 	/* Register the MDIO bus */
 	rc = mdiobus_register(mdio);
 	if (rc)
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 43a7748..80a6574 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -217,6 +217,11 @@  struct mii_bus {
 	 * matching its address
 	 */
 	int irq[PHY_MAX_ADDR];
+
+	/* GPIO reset pulse width in uS */
+	int reset_delay_us;
+	/* Number of reset GPIOs */
+	int num_reset_gpios;
 };
 #define to_mii_bus(d) container_of(d, struct mii_bus, dev)