Skip to contentSkip to conversation

sunxi: Fix PHY regression on A20-OLinuXino-Lime2 and A20-Olimex-SOM-EVB

PATCH New Tom Rini 2 participants 4 messages Apr 24, 2020 – Apr 29, 2020 Arm/Allwinner sunXi SoC support

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 sunxi: Fix PHY regression on A20-OLinuXino-Lime2 and A20-Olimex-SOM-EVB

When moving the PHYLIB PHY drivers around in Kconfig we did not at the same time perform a careful migration of the related drivers and sub-options. This lead to the case where previously Kconfig-enabled driver choices were now disabled on some platforms. Correct this by enabling both the PHY driver and sub-option on the above referenced platforms.

Fixes af2cbfd6b982 ("drivers: net: Provide Kconfig menu for PHYLIB")
Fixes 8728c97eff5b ("configs: Re-sync")

---
After checking back on the original commit I can see that these are the only two platforms to have been broken in the change.

---
 configs/A20-OLinuXino-Lime2_defconfig | 2 ++
 configs/A20-Olimex-SOM-EVB_defconfig  | 2 ++
 2 files changed, 4 insertions(+)
configs/A20-OLinuXino-Lime2_defconfig +2 -0
index 2b082cab595d..28b558cbeb6d 100644
@@ -18,6 +18,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
 CONFIG_SCSI_AHCI=y
 CONFIG_DFU_RAM=y
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_PHY_REALTEK=y
+CONFIG_RTL8211X_PHY_FORCE_MASTER=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_MII=y
configs/A20-Olimex-SOM-EVB_defconfig +2 -0
index 5b5ed3bb0a97..56f6ad82755b 100644
@@ -15,6 +15,8 @@ CONFIG_AHCI=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som-evb"
 CONFIG_SCSI_AHCI=y
+CONFIG_PHY_REALTEK=y
+CONFIG_RTL8211X_PHY_FORCE_MASTER=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_MII=y
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 sunxi: Fix PHY regression on A20-OLinuXino-Lime2 and A20-Olimex-SOM-EVB

Quoted 7 lines · On Fri, 24 Apr 2020 12:34:05 -0400 Tom Rini trini at konsulko.com wrote:

When moving the PHYLIB PHY drivers around in Kconfig we did not at the same time perform a careful migration of the related drivers and sub-options. This lead to the case where previously Kconfig-enabled driver choices were now disabled on some platforms. Correct this by enabling both the PHY driver and sub-option on the above referenced platforms.

Quoted 7 lines
Fixes af2cbfd6b982 ("drivers: net: Provide Kconfig menu for PHYLIB")
Fixes 8728c97eff5b ("configs: Re-sync")

---
After checking back on the original commit I can see that these are the only two platforms to have been broken in the change.

configs/A20-OLinuXino-Lime2-eMMC_defconfig might need similar change.

We get many build warnings like:
include/configs/sunxi-common.h:276:0: warning: "CONFIG_PHY_REALTEK" redefined

Could you include following change to fix it?

include/configs/sunxi-common.h +2 -0
index 0ef289fd64..f4bbce8443 100644
@@ -273,8 +273,10 @@ extern int soft_i2c_gpio_scl;
 /* Ethernet support */
 
 #ifdef CONFIG_SUN7I_GMAC
+#ifndef CONFIG_PHY_REALTEK
 #define CONFIG_PHY_REALTEK
 #endif
+#endif
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_OHCI_NEW

Thanks!
Anatolij

author
#2 lore raw

PATCH 1/1 sunxi: Fix PHY regression on A20-OLinuXino-Lime2 and A20-Olimex-SOM-EVB

Quoted 30 lines · Anatolij Gustschin
Quoted 7 lines · On Fri, 24 Apr 2020 12:34:05 -0400 Tom Rini trini at konsulko.com wrote:

When moving the PHYLIB PHY drivers around in Kconfig we did not at the same time perform a careful migration of the related drivers and sub-options. This lead to the case where previously Kconfig-enabled driver choices were now disabled on some platforms. Correct this by enabling both the PHY driver and sub-option on the above referenced platforms.

Quoted 7 lines
Fixes af2cbfd6b982 ("drivers: net: Provide Kconfig menu for PHYLIB")
Fixes 8728c97eff5b ("configs: Re-sync")

---
After checking back on the original commit I can see that these are the only two platforms to have been broken in the change.

configs/A20-OLinuXino-Lime2-eMMC_defconfig might need similar change.

We get many build warnings like:
include/configs/sunxi-common.h:276:0: warning: "CONFIG_PHY_REALTEK" redefined

Could you include following change to fix it?

include/configs/sunxi-common.h +0 -0
index 0ef289fd64..f4bbce8443 100644

include/configs/sunxi-common.h extern int soft_i2c_gpio_scl; · line 282

Quoted 10 lines
include/configs/sunxi-common.h +2 -0
@@ -273,8 +273,10 @@ extern int soft_i2c_gpio_scl;
 /* Ethernet support */
 
 #ifdef CONFIG_SUN7I_GMAC
+#ifndef CONFIG_PHY_REALTEK
 #define CONFIG_PHY_REALTEK
 #endif
+#endif
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_OHCI_NEW

The problem with that is that it's showing that this symbol, and a whole host of others from af2cbfd6b982 need to be migrated over to defconfigs.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200424/977fcada/attachment.sig>
author
#3 lore raw

PATCH 1/1 sunxi: Fix PHY regression on A20-OLinuXino-Lime2 and A20-Olimex-SOM-EVB

In reply to Tom Rini
Quoted 11 lines · Tom Rini

When moving the PHYLIB PHY drivers around in Kconfig we did not at the same time perform a careful migration of the related drivers and sub-options. This lead to the case where previously Kconfig-enabled driver choices were now disabled on some platforms. Correct this by enabling both the PHY driver and sub-option on the above referenced platforms.

Fixes af2cbfd6b982 ("drivers: net: Provide Kconfig menu for PHYLIB")
Fixes 8728c97eff5b ("configs: Re-sync")

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200429/fffb5fee/attachment.sig>