Re: [PATCH v3 1/4] USB: Fix of_usb_get_dr_mode_by_phy with a shared phy block

Started by Bin Liu on Jun 9, 2016 · 2 messages from 2 authors · Last reply Jun 10, 2016

open the first message on its own page

Message details and related content
Hi,

On Thu, Jun 09, 2016 at 04:51:45PM +0200, Hans de Goede wrote:
Hi,

On 09-06-16 16:30, Bin Liu wrote:
quoted
Hi,

On Sun, Jun 05, 2016 at 04:59:33PM +0200, Hans de Goede wrote:
quoted
Some SoCs have a single phy-hw-block with multiple phys, this is
modelled by a single phy dts node, so we end up with multiple
controller nodes with a phys property pointing to the phy-node
of the otg-phy.

Only one of these controllers typically is an otg controller, yet we
were checking the first controller who uses a phy from the block and
then end up looking for a dr_mode property in e.g. the ehci controller.

This commit fixes this by adding an arg0 parameter to
of_usb_get_dr_mode_by_phy and make of_usb_get_dr_mode_by_phy
check that this matches the phandle args[0] value when looking for
the otg controller.

Signed-off-by: Hans de Goede <redacted>
---
Changes in v2:
-Add a args0 parameter instead of looking for nodes with a dr_mode property
Changes in v3:
-No changes
---
drivers/usb/common/common.c  | 31 ++++++++++++++++++-------------
drivers/usb/phy/phy-am335x.c |  2 +-
include/linux/usb/of.h       |  4 ++--
3 files changed, 21 insertions(+), 16 deletions(-)
This breaks am335x.

[   17.433166] /ocp/usb@47400000/usb@47401000: could not get #phy-cells
for /ocp/usb@47400000/usb-phy@47401300
[   17.443627] /ocp/usb@47400000/usb@47401800: could not get #phy-cells
for /ocp/usb@47400000/usb-phy@47401b00
[   17.454005] am335x-phy-driver 47401300.usb-phy: dr_mode 0
[   17.460518] 47401300.usb-phy supply vcc not found, using dummy

16 more quoted lines

am335x phy does not use phy framework, so those phy core api is not
called.
All my patch does is make the way of_usb_get_dr_mode_by_phy parses
phy-handles be identical to how phy-core.c does it.

I see that the usb0_phy node in arch/arm/boot/dts/am33xx.dtsi
indeed lacks a "#phy-cells = <0>;" line.

Quoting: Documentation/devicetree/bindings/phy/phy-bindings.txt

PHY device node
===============

Required Properties:
#phy-cells:     Number of cells in a PHY specifier;  The meaning of all those
                cells is defined by the binding for the phy node. The PHY
                provider can use the values in cells to find the appropriate
                PHY.

So not having #phy-cells defined for a phy-node clearly is a bug.
am335x phy does not follow the bindings in phy/, but usb/phy/.
quoted hunk
A patch like the following should fix this:
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 52be48b..c4ff788d 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -557,6 +557,7 @@
 			};

 			usb0_phy: usb-phy@47401300 {
+				#phy-cells = <0>;
This seems to be ok, but this patch would break the dt backward compatible.
 				compatible = "ti,am335x-usb-phy";
 				reg = <0x47401300 0x100>;
 				reg-names = "phy";

Regards,

Hans
Regards,
-Bin.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Message details and related content
Hi,

On 09-06-16 21:49, Bin Liu wrote:
Hi,

On Thu, Jun 09, 2016 at 04:51:45PM +0200, Hans de Goede wrote:
quoted
Hi,

On 09-06-16 16:30, Bin Liu wrote:
quoted
Hi,

On Sun, Jun 05, 2016 at 04:59:33PM +0200, Hans de Goede wrote:
quoted
Some SoCs have a single phy-hw-block with multiple phys, this is
modelled by a single phy dts node, so we end up with multiple
controller nodes with a phys property pointing to the phy-node
of the otg-phy.

Only one of these controllers typically is an otg controller, yet we
were checking the first controller who uses a phy from the block and
then end up looking for a dr_mode property in e.g. the ehci controller.

This commit fixes this by adding an arg0 parameter to
of_usb_get_dr_mode_by_phy and make of_usb_get_dr_mode_by_phy
check that this matches the phandle args[0] value when looking for
the otg controller.

Signed-off-by: Hans de Goede <redacted>
---
Changes in v2:
-Add a args0 parameter instead of looking for nodes with a dr_mode property
Changes in v3:
-No changes
---
drivers/usb/common/common.c  | 31 ++++++++++++++++++-------------
drivers/usb/phy/phy-am335x.c |  2 +-
include/linux/usb/of.h       |  4 ++--
3 files changed, 21 insertions(+), 16 deletions(-)
This breaks am335x.

[   17.433166] /ocp/usb@47400000/usb@47401000: could not get #phy-cells
for /ocp/usb@47400000/usb-phy@47401300
[   17.443627] /ocp/usb@47400000/usb@47401800: could not get #phy-cells

44 more quoted lines

Ah, I did not know about those, that explains. I will send a v4 of
the patch which will keep compatibility with the usb/phy/ bindings
when the passed in arg0 == -1.

Note I will not be resending patch 2-4, please merge these as they
are (no changes are needed).
quoted
A patch like the following should fix this:
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 52be48b..c4ff788d 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -557,6 +557,7 @@
 			};

 			usb0_phy: usb-phy@47401300 {
+				#phy-cells = <0>;
This seems to be ok, but this patch would break the dt backward compatible.
I understand, as said above I'll do a new version of the patch preserving
compatibility.
quoted
 				compatible = "ti,am335x-usb-phy";
 				reg = <0x47401300 0x100>;
 				reg-names = "phy";
Regards,

Hans
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help