Skip to contentSkip to conversation

board: amlogic: vim3: fix phy-names property setup

PATCH In review Artem Lapkin 2 participants 3 messages Jul 13, 2021 – Jul 27, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 board: amlogic: vim3: fix phy-names property setup

phy-names was improperly implemented resulting in an inoperable USB-OTG port.

- phy-names = "usb2-phy0\0\0usb2-phy1\0";
+ phy-names = "usb2-phy0\0usb2-phy1";

---
 board/amlogic/vim3/vim3.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
board/amlogic/vim3/vim3.c +2 -2
index c8ebd676..6a67a39c 100644
@@ -109,8 +109,8 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd)
 		}
 
 		/* Update PHY names (mandatory to disable USB3.0) */
-		len = strlcpy(data, "usb2-phy0", 32) + 1;
-		len += strlcpy(&data[len], "usb2-phy1", 32 - len) + 1;
+		len = strlcpy(data, "usb2-phy0", 32);
+		len += strlcpy(&data[len], "usb2-phy1", 32 - len);
 		ret = fdt_setprop(blob, node, "phy-names", data, len);
 		if (ret < 0) {
 			printf("vim3: failed to update usb phy names property (%d)\n", ret);
Signature · 1 line
2.25.1
Acked-by on v1 1/1
#1 lore raw
Quoted 17 lines · Artem Lapkin

phy-names was improperly implemented resulting in an inoperable USB-OTG port.

- phy-names = "usb2-phy0\0\0usb2-phy1\0";
+ phy-names = "usb2-phy0\0usb2-phy1";

---
 board/amlogic/vim3/vim3.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
board/amlogic/vim3/vim3.c +0 -0
index c8ebd676..6a67a39c 100644

board/amlogic/vim3/vim3.c int meson_ft_board_setup(void *blob, struct bd_info *bd) · line 116

Quoted 10 lines
board/amlogic/vim3/vim3.c +2 -2
@@ -109,8 +109,8 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd)
 		}
 
 		/* Update PHY names (mandatory to disable USB3.0) */
-		len = strlcpy(data, "usb2-phy0", 32) + 1;
-		len += strlcpy(&data[len], "usb2-phy1", 32 - len) + 1;
+		len = strlcpy(data, "usb2-phy0", 32);
+		len += strlcpy(&data[len], "usb2-phy1", 32 - len);
 		ret = fdt_setprop(blob, node, "phy-names", data, len);
 		if (ret < 0) {
 			printf("vim3: failed to update usb phy names property (%d)\n", ret);

Good catch,

Neil

#2 lore raw
In reply to Artem Lapkin
Quoted 17 lines · Artem Lapkin

phy-names was improperly implemented resulting in an inoperable USB-OTG port.

- phy-names = "usb2-phy0\0\0usb2-phy1\0";
+ phy-names = "usb2-phy0\0usb2-phy1";

---
 board/amlogic/vim3/vim3.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
board/amlogic/vim3/vim3.c +0 -0
index c8ebd676..6a67a39c 100644

board/amlogic/vim3/vim3.c int meson_ft_board_setup(void *blob, struct bd_info *bd) · line 116

Quoted 10 lines
board/amlogic/vim3/vim3.c +2 -2
@@ -109,8 +109,8 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd)
 		}
 
 		/* Update PHY names (mandatory to disable USB3.0) */
-		len = strlcpy(data, "usb2-phy0", 32) + 1;
-		len += strlcpy(&data[len], "usb2-phy1", 32 - len) + 1;
+		len = strlcpy(data, "usb2-phy0", 32);
+		len += strlcpy(&data[len], "usb2-phy1", 32 - len);
 		ret = fdt_setprop(blob, node, "phy-names", data, len);
 		if (ret < 0) {
 			printf("vim3: failed to update usb phy names property (%d)\n", ret);

Applied to u-boot-amlogic,

Thanks,
Neil