Skip to contentSkip to conversation

(no subject)

U-Boot In review Jeremy Gebben 4 participants 15 messages Sep 18, 2018 – Oct 24, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Date: Tue, 18 Sep 2018 15:35:32 -0600
Subject: [PATCH 0/3] net: phy: aquantia: firmware loading

This patch series adds optional support for loading firmware for Aquantia phys via MDIO commands. Because I'm adding more Kconfig options for this driver, I've cleaned up the existing defconfigs that use it.

It has been tested on a NXP ls1046ardb board, and a very similar custom board that doesn't have dedicated storage for the phy firmware.

Jeremy Gebben (3):
configs: migrate CONFIG_PHY_AQUANTIA to Kconfig
net: phy: aquantia: add firmware loading support
net: phy: aquantia: autodetect if firmware needs to be loaded

 configs/T1023RDB_NAND_defconfig               |   2 +-
 configs/T1023RDB_SDCARD_defconfig             |   2 +-
 configs/T1023RDB_SECURE_BOOT_defconfig        |   2 +-
 configs/T1023RDB_SPIFLASH_defconfig           |   2 +-
 configs/T1023RDB_defconfig                    |   2 +-
 configs/T1024RDB_NAND_defconfig               |   2 +-
 configs/T1024RDB_SDCARD_defconfig             |   2 +-
 configs/T1024RDB_SECURE_BOOT_defconfig        |   2 +-
 configs/T1024RDB_SPIFLASH_defconfig           |   2 +-
 configs/T1024RDB_defconfig                    |   2 +-
 configs/T2080QDS_NAND_defconfig               |   2 +-
 configs/T2080QDS_SDCARD_defconfig             |   2 +-
 configs/T2080QDS_SECURE_BOOT_defconfig        |   2 +-
 configs/T2080QDS_SPIFLASH_defconfig           |   2 +-
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig     |   2 +-
 configs/T2080QDS_defconfig                    |   2 +-
 configs/T2080RDB_NAND_defconfig               |   2 +-
 configs/T2080RDB_SDCARD_defconfig             |   2 +-
 configs/T2080RDB_SECURE_BOOT_defconfig        |   2 +-
 configs/T2080RDB_SPIFLASH_defconfig           |   2 +-
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig     |   2 +-
 configs/T2080RDB_defconfig                    |   2 +-
 configs/T2081QDS_NAND_defconfig               |   2 +-
 configs/T2081QDS_SDCARD_defconfig             |   2 +-
 configs/T2081QDS_SPIFLASH_defconfig           |   2 +-
 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig     |   2 +-
 configs/T2081QDS_defconfig                    |   2 +-
 configs/ls1043ardb_defconfig                  |   2 +-
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig |   2 +-
 configs/ls1043ardb_nand_defconfig             |   2 +-
 configs/ls1043ardb_sdcard_defconfig           |   2 +-
 configs/ls1046ardb_emmc_defconfig             |   2 +-
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig |   2 +-
 configs/ls1046ardb_qspi_defconfig             |   2 +-
 .../ls1046ardb_sdcard_SECURE_BOOT_defconfig   |   2 +-
 configs/ls1046ardb_sdcard_defconfig           |   2 +-
 configs/ls1088ardb_qspi_SECURE_BOOT_defconfig |   1 +
 configs/ls1088ardb_qspi_defconfig             |   1 +
 ...1088ardb_sdcard_qspi_SECURE_BOOT_defconfig |   1 +
 configs/ls1088ardb_sdcard_qspi_defconfig      |   1 +
 configs/ls2080ardb_defconfig                  |   2 +-
 configs/ls2080ardb_nand_defconfig             |   2 +-
 drivers/net/phy/Kconfig                       |  26 +-
 drivers/net/phy/aquantia.c                    | 254 +++++++++++++++++-
 include/configs/T102xRDB.h                    |   2 -
 include/configs/T208xRDB.h                    |   2 -
 include/configs/ls1043ardb.h                  |   2 -
 include/configs/ls1046ardb.h                  |   2 -
 include/configs/ls1088ardb.h                  |   3 -
 include/configs/ls2080ardb.h                  |   3 -
 50 files changed, 316 insertions(+), 58 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/3 configs: migrate CONFIG_PHY_AQUANTIA to Kconfig

The aquantia driver requires both CONFIG_PHY_GIGE and CONFIG_PHYLIB_10G.

---
 configs/T1023RDB_NAND_defconfig                      | 2 +-
 configs/T1023RDB_SDCARD_defconfig                    | 2 +-
 configs/T1023RDB_SECURE_BOOT_defconfig               | 2 +-
 configs/T1023RDB_SPIFLASH_defconfig                  | 2 +-
 configs/T1023RDB_defconfig                           | 2 +-
 configs/T1024RDB_NAND_defconfig                      | 2 +-
 configs/T1024RDB_SDCARD_defconfig                    | 2 +-
 configs/T1024RDB_SECURE_BOOT_defconfig               | 2 +-
 configs/T1024RDB_SPIFLASH_defconfig                  | 2 +-
 configs/T1024RDB_defconfig                           | 2 +-
 configs/T2080QDS_NAND_defconfig                      | 2 +-
 configs/T2080QDS_SDCARD_defconfig                    | 2 +-
 configs/T2080QDS_SECURE_BOOT_defconfig               | 2 +-
 configs/T2080QDS_SPIFLASH_defconfig                  | 2 +-
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig            | 2 +-
 configs/T2080QDS_defconfig                           | 2 +-
 configs/T2080RDB_NAND_defconfig                      | 2 +-
 configs/T2080RDB_SDCARD_defconfig                    | 2 +-
 configs/T2080RDB_SECURE_BOOT_defconfig               | 2 +-
 configs/T2080RDB_SPIFLASH_defconfig                  | 2 +-
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig            | 2 +-
 configs/T2080RDB_defconfig                           | 2 +-
 configs/T2081QDS_NAND_defconfig                      | 2 +-
 configs/T2081QDS_SDCARD_defconfig                    | 2 +-
 configs/T2081QDS_SPIFLASH_defconfig                  | 2 +-
 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig            | 2 +-
 configs/T2081QDS_defconfig                           | 2 +-
 configs/ls1043ardb_defconfig                         | 2 +-
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig        | 2 +-
 configs/ls1043ardb_nand_defconfig                    | 2 +-
 configs/ls1043ardb_sdcard_defconfig                  | 2 +-
 configs/ls1046ardb_emmc_defconfig                    | 2 +-
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig        | 2 +-
 configs/ls1046ardb_qspi_defconfig                    | 2 +-
 configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig      | 2 +-
 configs/ls1046ardb_sdcard_defconfig                  | 2 +-
 configs/ls1088ardb_qspi_SECURE_BOOT_defconfig        | 1 +
 configs/ls1088ardb_qspi_defconfig                    | 1 +
 configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 +
 configs/ls1088ardb_sdcard_qspi_defconfig             | 1 +
 configs/ls2080ardb_defconfig                         | 2 +-
 configs/ls2080ardb_nand_defconfig                    | 2 +-
 drivers/net/phy/Kconfig                              | 2 ++
 drivers/net/phy/aquantia.c                           | 4 ----
 include/configs/T102xRDB.h                           | 2 --
 include/configs/T208xRDB.h                           | 2 --
 include/configs/ls1043ardb.h                         | 2 --
 include/configs/ls1046ardb.h                         | 2 --
 include/configs/ls1088ardb.h                         | 3 ---
 include/configs/ls2080ardb.h                         | 3 ---
 50 files changed, 44 insertions(+), 56 deletions(-)
configs/T1023RDB_NAND_defconfig +1 -1
index dc3dcb9989..03016158fc 100644
@@ -48,7 +48,7 @@ CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T1023RDB_SDCARD_defconfig +1 -1
index bf9e699545..74c1fd10bb 100644
@@ -47,7 +47,7 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T1023RDB_SECURE_BOOT_defconfig +1 -1
index 9820d34212..0b9fb82e25 100644
@@ -37,7 +37,7 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T1023RDB_SPIFLASH_defconfig +1 -1
index a1e37a6f38..b8d1b4c5d8 100644
@@ -48,7 +48,7 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T1023RDB_defconfig +1 -1
index 07220b9d56..eb71da11fc 100644
@@ -36,7 +36,7 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T1024RDB_NAND_defconfig +1 -1
index fc9e407783..13afd7d4dd 100644
@@ -50,7 +50,7 @@ CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T1024RDB_SDCARD_defconfig +1 -1
index 9c3d9c6316..e56e220f75 100644
@@ -49,7 +49,7 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T1024RDB_SECURE_BOOT_defconfig +1 -1
index 10810c0c4f..a95ed6bbdf 100644
@@ -39,7 +39,7 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T1024RDB_SPIFLASH_defconfig +1 -1
index 5718ed3945..dd557a86df 100644
@@ -50,7 +50,7 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T1024RDB_defconfig +1 -1
index ab40d599d1..c0e2dc9a49 100644
@@ -38,7 +38,7 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2080QDS_NAND_defconfig +1 -1
index 6b5de4d009..c5eb4b6e2b 100644
@@ -46,7 +46,7 @@ CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2080QDS_SDCARD_defconfig +1 -1
index a203582cb5..2d545120ab 100644
@@ -45,7 +45,7 @@ CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2080QDS_SECURE_BOOT_defconfig +1 -1
index 29873cefe6..f9a970a1bd 100644
@@ -35,7 +35,7 @@ CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2080QDS_SPIFLASH_defconfig +1 -1
index 6528eea389..9a9e60d871 100644
@@ -46,7 +46,7 @@ CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +1 -1
index 38216b84f9..9c9a436d81 100644
@@ -30,7 +30,7 @@ CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2080QDS_defconfig +1 -1
index 4a5cbb26ad..16feb6a234 100644
@@ -34,7 +34,7 @@ CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2080RDB_NAND_defconfig +1 -1
index fa30d2917b..b6d503d719 100644
@@ -46,7 +46,7 @@ CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2080RDB_SDCARD_defconfig +1 -1
index 30fe40e506..37e3b2c82e 100644
@@ -45,7 +45,7 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2080RDB_SECURE_BOOT_defconfig +1 -1
index 1e8bea5b7a..33746fa63f 100644
@@ -35,7 +35,7 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2080RDB_SPIFLASH_defconfig +1 -1
index 8a96ff8752..3530b5443d 100644
@@ -46,7 +46,7 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2080RDB_SRIO_PCIE_BOOT_defconfig +1 -1
index 947f8eceda..297c31f3c5 100644
@@ -30,7 +30,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2080RDB_defconfig +1 -1
index 969e7d730e..edcda82e46 100644
@@ -34,7 +34,7 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2081QDS_NAND_defconfig +1 -1
index bba3457248..deb2ce81a6 100644
@@ -46,7 +46,7 @@ CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2081QDS_SDCARD_defconfig +1 -1
index a64be133e3..3d709a7994 100644
@@ -45,7 +45,7 @@ CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2081QDS_SPIFLASH_defconfig +1 -1
index 40812b7aed..d0dd1f59f5 100644
@@ -46,7 +46,7 @@ CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2081QDS_SRIO_PCIE_BOOT_defconfig +1 -1
index 88102aecff..43fe470320 100644
@@ -30,7 +30,7 @@ CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/T2081QDS_defconfig +1 -1
index 85d8b89aa8..23aacd7af5 100644
@@ -34,7 +34,7 @@ CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/ls1043ardb_defconfig +1 -1
index c72231b307..7b46c3b1dd 100644
@@ -29,7 +29,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
configs/ls1043ardb_nand_SECURE_BOOT_defconfig +1 -1
index 64e41ecfd2..a64650f68d 100644
@@ -46,7 +46,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
configs/ls1043ardb_nand_defconfig +1 -1
index a3d1ee84b4..72957d5a06 100644
@@ -46,7 +46,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
configs/ls1043ardb_sdcard_defconfig +1 -1
index b44c35d1ec..5e4e74f8f2 100644
@@ -44,7 +44,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
configs/ls1046ardb_emmc_defconfig +1 -1
index e0f07b702d..8fa395c202 100644
@@ -45,7 +45,7 @@ CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +1 -1
index 6495447b83..fbb3669012 100644
@@ -30,7 +30,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
configs/ls1046ardb_qspi_defconfig +1 -1
index 5204bb51a1..25548d1a3c 100644
@@ -31,7 +31,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +1 -1
index 9f04424c7a..24a08b6e01 100644
@@ -45,7 +45,7 @@ CONFIG_SPL_DM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
configs/ls1046ardb_sdcard_defconfig +1 -1
index 07eebbf50f..1e280d5553 100644
@@ -44,7 +44,7 @@ CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +1 -0
index 859ff11a1d..0b5a7eba6c 100644
@@ -35,6 +35,7 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
configs/ls1088ardb_qspi_defconfig +1 -0
index a42158c862..400f98ea2b 100644
@@ -35,6 +35,7 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +1 -0
index f7ec11fe05..f584dd3c59 100644
@@ -48,6 +48,7 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
configs/ls1088ardb_sdcard_qspi_defconfig +1 -0
index bc53bba1e6..ace8f77317 100644
@@ -45,6 +45,7 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
configs/ls2080ardb_defconfig +1 -1
index a62e09bdf7..a060ec1b3c 100644
@@ -36,7 +36,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
configs/ls2080ardb_nand_defconfig +1 -1
index 4801f51bcc..7d8ffb50fd 100644
@@ -43,7 +43,7 @@ CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_PCI=y
drivers/net/phy/Kconfig +2 -0
index f5821dfed9..28f3ee35f1 100644
@@ -66,6 +66,8 @@ config PHYLIB_10G
 
 config PHY_AQUANTIA
 	bool "Aquantia Ethernet PHYs support"
+	select PHY_GIGE
+	select PHYLIB_10G
 
 config PHY_ATHEROS
 	bool "Atheros Ethernet PHYs support"
drivers/net/phy/aquantia.c +0 -4
index fe81217432..a44fba0f1a 100644
@@ -9,10 +9,6 @@
 #include <dm.h>
 #include <phy.h>
 
-#ifndef CONFIG_PHYLIB_10G
-#error The Aquantia PHY needs 10G support
-#endif
-
 #define AQUNTIA_10G_CTL		0x20
 #define AQUNTIA_VENDOR_P1	0xc400
 
include/configs/T102xRDB.h +0 -2
index f7a54f7a97..42e6671d58 100644
@@ -719,9 +719,7 @@ unsigned long get_board_ddr_clk(void);
 
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define CONFIG_FMAN_ENET
-#define CONFIG_PHYLIB_10G
 #define CONFIG_PHY_REALTEK
-#define CONFIG_PHY_AQUANTIA
 #if defined(CONFIG_TARGET_T1024RDB)
 #define RGMII_PHY1_ADDR		0x2
 #define RGMII_PHY2_ADDR		0x6
include/configs/T208xRDB.h +0 -2
index ebee9083ed..51505d2d52 100644
@@ -591,8 +591,6 @@ unsigned long get_board_ddr_clk(void);
 
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define CONFIG_FMAN_ENET
-#define CONFIG_PHYLIB_10G
-#define CONFIG_PHY_AQUANTIA
 #define CONFIG_PHY_CORTINA
 #define CONFIG_PHY_REALTEK
 #define CONFIG_CORTINA_FW_LENGTH	0x40000
include/configs/ls1043ardb.h +0 -2
index bc639e586f..5484569ee0 100644
@@ -251,8 +251,6 @@
 
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define CONFIG_FMAN_ENET
-#define CONFIG_PHYLIB_10G
-#define CONFIG_PHY_AQUANTIA
 
 #define RGMII_PHY1_ADDR			0x1
 #define RGMII_PHY2_ADDR			0x2
include/configs/ls1046ardb.h +0 -2
index ffca410b1a..dcb5854046 100644
@@ -180,8 +180,6 @@
 
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define CONFIG_FMAN_ENET
-#define CONFIG_PHY_AQUANTIA
-#define CONFIG_PHYLIB_10G
 #define RGMII_PHY1_ADDR			0x1
 #define RGMII_PHY2_ADDR			0x2
 
include/configs/ls1088ardb.h +0 -3
index eb220bf6e9..e8d5ebf14a 100644
@@ -423,12 +423,9 @@
 
 /* MAC/PHY configuration */
 #ifdef CONFIG_FSL_MC_ENET
-#define CONFIG_PHYLIB_10G
-#define CONFIG_PHY_GIGE
 #define CONFIG_PHYLIB
 
 #define CONFIG_PHY_VITESSE
-#define CONFIG_PHY_AQUANTIA
 #define AQ_PHY_ADDR1			0x00
 #define AQR105_IRQ_MASK			0x00000004
 
include/configs/ls2080ardb.h +0 -3
index 3d53a69e8a..57160e7b40 100644
@@ -456,8 +456,6 @@ unsigned long get_board_sys_clk(void);
 
 /* MAC/PHY configuration */
 #ifdef CONFIG_FSL_MC_ENET
-#define CONFIG_PHYLIB_10G
-#define CONFIG_PHY_AQUANTIA
 #define CONFIG_PHY_CORTINA
 #define	CONFIG_SYS_CORTINA_FW_IN_NOR
 #ifdef CONFIG_QSPI_BOOT
@@ -478,7 +476,6 @@ unsigned long get_board_sys_clk(void);
 #define AQR405_IRQ_MASK		0x36
 
 #define CONFIG_ETHPRIME		"DPMAC1 at xgmii"
-#define CONFIG_PHY_AQUANTIA
 #endif
 
 #include <asm/fsl_secure_boot.h>
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/3 configs: migrate CONFIG_PHY_AQUANTIA to Kconfig

Quoted 61 lines · Jeremy Gebben

The aquantia driver requires both CONFIG_PHY_GIGE and CONFIG_PHYLIB_10G.

---
 configs/T1023RDB_NAND_defconfig                      | 2 +-
 configs/T1023RDB_SDCARD_defconfig                    | 2 +-
 configs/T1023RDB_SECURE_BOOT_defconfig               | 2 +-
 configs/T1023RDB_SPIFLASH_defconfig                  | 2 +-
 configs/T1023RDB_defconfig                           | 2 +-
 configs/T1024RDB_NAND_defconfig                      | 2 +-
 configs/T1024RDB_SDCARD_defconfig                    | 2 +-
 configs/T1024RDB_SECURE_BOOT_defconfig               | 2 +-
 configs/T1024RDB_SPIFLASH_defconfig                  | 2 +-
 configs/T1024RDB_defconfig                           | 2 +-
 configs/T2080QDS_NAND_defconfig                      | 2 +-
 configs/T2080QDS_SDCARD_defconfig                    | 2 +-
 configs/T2080QDS_SECURE_BOOT_defconfig               | 2 +-
 configs/T2080QDS_SPIFLASH_defconfig                  | 2 +-
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig            | 2 +-
 configs/T2080QDS_defconfig                           | 2 +-
 configs/T2080RDB_NAND_defconfig                      | 2 +-
 configs/T2080RDB_SDCARD_defconfig                    | 2 +-
 configs/T2080RDB_SECURE_BOOT_defconfig               | 2 +-
 configs/T2080RDB_SPIFLASH_defconfig                  | 2 +-
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig            | 2 +-
 configs/T2080RDB_defconfig                           | 2 +-
 configs/T2081QDS_NAND_defconfig                      | 2 +-
 configs/T2081QDS_SDCARD_defconfig                    | 2 +-
 configs/T2081QDS_SPIFLASH_defconfig                  | 2 +-
 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig            | 2 +-
 configs/T2081QDS_defconfig                           | 2 +-
 configs/ls1043ardb_defconfig                         | 2 +-
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig        | 2 +-
 configs/ls1043ardb_nand_defconfig                    | 2 +-
 configs/ls1043ardb_sdcard_defconfig                  | 2 +-
 configs/ls1046ardb_emmc_defconfig                    | 2 +-
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig        | 2 +-
 configs/ls1046ardb_qspi_defconfig                    | 2 +-
 configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig      | 2 +-
 configs/ls1046ardb_sdcard_defconfig                  | 2 +-
 configs/ls1088ardb_qspi_SECURE_BOOT_defconfig        | 1 +
 configs/ls1088ardb_qspi_defconfig                    | 1 +
 configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 +
 configs/ls1088ardb_sdcard_qspi_defconfig             | 1 +
 configs/ls2080ardb_defconfig                         | 2 +-
 configs/ls2080ardb_nand_defconfig                    | 2 +-
 drivers/net/phy/Kconfig                              | 2 ++
 drivers/net/phy/aquantia.c                           | 4 ----
 include/configs/T102xRDB.h                           | 2 --
 include/configs/T208xRDB.h                           | 2 --
 include/configs/ls1043ardb.h                         | 2 --
 include/configs/ls1046ardb.h                         | 2 --
 include/configs/ls1088ardb.h                         | 3 ---
 include/configs/ls2080ardb.h                         | 3 ---
 50 files changed, 44 insertions(+), 56 deletions(-)
configs/T1023RDB_NAND_defconfig +0 -0
index dc3dcb9989..03016158fc 100644

configs/T1023RDB_NAND_defconfig CONFIG_NAND=y · line 54

Quoted 8 lines
configs/T1023RDB_NAND_defconfig +1 -1
@@ -48,7 +48,7 @@ CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y

Shouldn't this patch be put after your 2nd patch?

York

#3 lore raw

PATCH 1/3 configs: migrate CONFIG_PHY_AQUANTIA to Kconfig

Quoted 58 lines · York Sun
Quoted 56 lines · Jeremy Gebben

The aquantia driver requires both CONFIG_PHY_GIGE and CONFIG_PHYLIB_10G.

---
 configs/T1023RDB_NAND_defconfig                      | 2 +-
 configs/T1023RDB_SDCARD_defconfig                    | 2 +-
 configs/T1023RDB_SECURE_BOOT_defconfig               | 2 +-
 configs/T1023RDB_SPIFLASH_defconfig                  | 2 +-
 configs/T1023RDB_defconfig                           | 2 +-
 configs/T1024RDB_NAND_defconfig                      | 2 +-
 configs/T1024RDB_SDCARD_defconfig                    | 2 +-
 configs/T1024RDB_SECURE_BOOT_defconfig               | 2 +-
 configs/T1024RDB_SPIFLASH_defconfig                  | 2 +-
 configs/T1024RDB_defconfig                           | 2 +-
 configs/T2080QDS_NAND_defconfig                      | 2 +-
 configs/T2080QDS_SDCARD_defconfig                    | 2 +-
 configs/T2080QDS_SECURE_BOOT_defconfig               | 2 +-
 configs/T2080QDS_SPIFLASH_defconfig                  | 2 +-
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig            | 2 +-
 configs/T2080QDS_defconfig                           | 2 +-
 configs/T2080RDB_NAND_defconfig                      | 2 +-
 configs/T2080RDB_SDCARD_defconfig                    | 2 +-
 configs/T2080RDB_SECURE_BOOT_defconfig               | 2 +-
 configs/T2080RDB_SPIFLASH_defconfig                  | 2 +-
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig            | 2 +-
 configs/T2080RDB_defconfig                           | 2 +-
 configs/T2081QDS_NAND_defconfig                      | 2 +-
 configs/T2081QDS_SDCARD_defconfig                    | 2 +-
 configs/T2081QDS_SPIFLASH_defconfig                  | 2 +-
 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig            | 2 +-
 configs/T2081QDS_defconfig                           | 2 +-
 configs/ls1043ardb_defconfig                         | 2 +-
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig        | 2 +-
 configs/ls1043ardb_nand_defconfig                    | 2 +-
 configs/ls1043ardb_sdcard_defconfig                  | 2 +-
 configs/ls1046ardb_emmc_defconfig                    | 2 +-
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig        | 2 +-
 configs/ls1046ardb_qspi_defconfig                    | 2 +-
 configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig      | 2 +-
 configs/ls1046ardb_sdcard_defconfig                  | 2 +-
 configs/ls1088ardb_qspi_SECURE_BOOT_defconfig        | 1 +
 configs/ls1088ardb_qspi_defconfig                    | 1 +
 configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 +
 configs/ls1088ardb_sdcard_qspi_defconfig             | 1 +
 configs/ls2080ardb_defconfig                         | 2 +-
 configs/ls2080ardb_nand_defconfig                    | 2 +-
 drivers/net/phy/Kconfig                              | 2 ++
 drivers/net/phy/aquantia.c                           | 4 ----
 include/configs/T102xRDB.h                           | 2 --
 include/configs/T208xRDB.h                           | 2 --
 include/configs/ls1043ardb.h                         | 2 --
 include/configs/ls1046ardb.h                         | 2 --
 include/configs/ls1088ardb.h                         | 3 ---
 include/configs/ls2080ardb.h                         | 3 ---
 50 files changed, 44 insertions(+), 56 deletions(-)
Quoted 15 lines

configs/T1023RDB_NAND_defconfig CONFIG_NAND=y · line 54

Quoted 13 lines
configs/T1023RDB_NAND_defconfig +1 -1
index dc3dcb9989..03016158fc 100644
@@ -48,7 +48,7 @@ CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y

Shouldn't this patch be put after your 2nd patch?

If you prefer, but it should work either way. CONFIG_PHY_AQUANTIA already existed in Kconfig, but it was being set in header files instead of defconfigs.

Thanks for reviewing,

Jeremy

Quoted 2 lines

York

#4 lore raw

PATCH 1/3 configs: migrate CONFIG_PHY_AQUANTIA to Kconfig

Quoted 75 lines · Jeremy Gebben
Quoted 58 lines · York Sun
Quoted 56 lines · Jeremy Gebben

The aquantia driver requires both CONFIG_PHY_GIGE and CONFIG_PHYLIB_10G.

---
 configs/T1023RDB_NAND_defconfig                      | 2 +-
 configs/T1023RDB_SDCARD_defconfig                    | 2 +-
 configs/T1023RDB_SECURE_BOOT_defconfig               | 2 +-
 configs/T1023RDB_SPIFLASH_defconfig                  | 2 +-
 configs/T1023RDB_defconfig                           | 2 +-
 configs/T1024RDB_NAND_defconfig                      | 2 +-
 configs/T1024RDB_SDCARD_defconfig                    | 2 +-
 configs/T1024RDB_SECURE_BOOT_defconfig               | 2 +-
 configs/T1024RDB_SPIFLASH_defconfig                  | 2 +-
 configs/T1024RDB_defconfig                           | 2 +-
 configs/T2080QDS_NAND_defconfig                      | 2 +-
 configs/T2080QDS_SDCARD_defconfig                    | 2 +-
 configs/T2080QDS_SECURE_BOOT_defconfig               | 2 +-
 configs/T2080QDS_SPIFLASH_defconfig                  | 2 +-
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig            | 2 +-
 configs/T2080QDS_defconfig                           | 2 +-
 configs/T2080RDB_NAND_defconfig                      | 2 +-
 configs/T2080RDB_SDCARD_defconfig                    | 2 +-
 configs/T2080RDB_SECURE_BOOT_defconfig               | 2 +-
 configs/T2080RDB_SPIFLASH_defconfig                  | 2 +-
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig            | 2 +-
 configs/T2080RDB_defconfig                           | 2 +-
 configs/T2081QDS_NAND_defconfig                      | 2 +-
 configs/T2081QDS_SDCARD_defconfig                    | 2 +-
 configs/T2081QDS_SPIFLASH_defconfig                  | 2 +-
 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig            | 2 +-
 configs/T2081QDS_defconfig                           | 2 +-
 configs/ls1043ardb_defconfig                         | 2 +-
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig        | 2 +-
 configs/ls1043ardb_nand_defconfig                    | 2 +-
 configs/ls1043ardb_sdcard_defconfig                  | 2 +-
 configs/ls1046ardb_emmc_defconfig                    | 2 +-
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig        | 2 +-
 configs/ls1046ardb_qspi_defconfig                    | 2 +-
 configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig      | 2 +-
 configs/ls1046ardb_sdcard_defconfig                  | 2 +-
 configs/ls1088ardb_qspi_SECURE_BOOT_defconfig        | 1 +
 configs/ls1088ardb_qspi_defconfig                    | 1 +
 configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 +
 configs/ls1088ardb_sdcard_qspi_defconfig             | 1 +
 configs/ls2080ardb_defconfig                         | 2 +-
 configs/ls2080ardb_nand_defconfig                    | 2 +-
 drivers/net/phy/Kconfig                              | 2 ++
 drivers/net/phy/aquantia.c                           | 4 ----
 include/configs/T102xRDB.h                           | 2 --
 include/configs/T208xRDB.h                           | 2 --
 include/configs/ls1043ardb.h                         | 2 --
 include/configs/ls1046ardb.h                         | 2 --
 include/configs/ls1088ardb.h                         | 3 ---
 include/configs/ls2080ardb.h                         | 3 ---
 50 files changed, 44 insertions(+), 56 deletions(-)
Quoted 15 lines

configs/T1023RDB_NAND_defconfig CONFIG_NAND=y · line 54

Quoted 13 lines
configs/T1023RDB_NAND_defconfig +1 -1
index dc3dcb9989..03016158fc 100644
@@ -48,7 +48,7 @@ CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
-CONFIG_PHY_GIGE=y
+CONFIG_PHY_AQUANTIA=y
 CONFIG_E1000=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y

Shouldn't this patch be put after your 2nd patch?

Quoted 4 lines

If you prefer, but it should work either way. CONFIG_PHY_AQUANTIA already existed in Kconfig, but it was being set in header files instead of defconfigs.

I didn't realize PHY_AQUANTIA already exists in Kconfig. PHY_GIGE is selected so it doesn't need to be set in defconfig. Your patch is OK.

York

#7 lore raw

PATCH 2/3 net: phy: aquantia: add firmware loading support

In reply to Jeremy Gebben

Aquantia phys have firmware that can be loaded automatically from storage directly attached to the phy or via MDIO commands. Add support for loading firmware from either a file or a raw location on an MMC device.

---
 drivers/net/phy/Kconfig    |  24 +++-
 drivers/net/phy/aquantia.c | 234 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 256 insertions(+), 2 deletions(-)
drivers/net/phy/Kconfig +23 -1
index 28f3ee35f1..3dc0822d9c 100644
@@ -64,11 +64,33 @@ endif # MV88E61XX_SWITCH
 config PHYLIB_10G
 	bool "Generic 10G PHY support"
 
-config PHY_AQUANTIA
+menuconfig PHY_AQUANTIA
 	bool "Aquantia Ethernet PHYs support"
 	select PHY_GIGE
 	select PHYLIB_10G
 
+config PHY_AQUANTIA_UPLOAD_FW
+	bool "Aquantia firmware loading support"
+	default n
+	depends on PHY_AQUANTIA
+	help
+		Aquantia PHYs use firmware which can be either loaded automatically
+		from storage directly attached to the phy or loaded by the boot loader
+		via MDIO commands.  The firmware is loaded from a file, specified by
+		the PHY_AQUANTIA_FW_PART and PHY_AQUANTIA_FW_NAME options.
+
+config PHY_AQUANTIA_FW_PART
+	string "Aquantia firmware partition"
+	depends on PHY_AQUANTIA_UPLOAD_FW
+	help
+		Partition containing the firmware file.
+
+config PHY_AQUANTIA_FW_NAME
+	string "Aquantia firmware filename"
+	depends on PHY_AQUANTIA_UPLOAD_FW
+	help
+		Firmware filename.
+
 config PHY_ATHEROS
 	bool "Atheros Ethernet PHYs support"
 
drivers/net/phy/aquantia.c +233 -1

248 lines not on this page · raw message

Signature · 1 line
2.17.1
#9 lore raw

PATCH 2/3 net: phy: aquantia: add firmware loading support

In reply to Jeremy Gebben
Quoted 11 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Jeremy Gebben
Sent: Wednesday, September 19, 2018 3:20 AM
To: u-boot at lists.denx.de
Cc: Joe Hershberger <[email protected]>; Shaohui Xie <[email protected]>; York Sun <[email protected]>
Subject: [U-Boot] [PATCH 2/3] net: phy: aquantia: add firmware loading support

Quoted 5 lines

Aquantia phys have firmware that can be loaded automatically from storage directly attached to the phy or via MDIO commands.
Add support for loading firmware from either a file or a raw location on an MMC device.

  We have integrated your patch series. Now we have one AQR FW:  AQR-G3_v4.2.C-AQR.cld
How to flash this FW on Aquantia card ?
When my u-boot will boot, does Firmware programming process will trigger by itself or do we need to execute some command on u-boot prompt ?

--pk

#10 lore raw

PATCH 2/3 net: phy: aquantia: add firmware loading support

Quoted 12 lines · Prabhakar Kushwaha
Quoted 12 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Jeremy Gebben
Sent: Wednesday, September 19, 2018 3:20 AM
To: u-boot at lists.denx.de
Cc: Joe Hershberger <[email protected]>; Shaohui Xie <[email protected]>; York Sun <[email protected]>
Subject: [U-Boot] [PATCH 2/3] net: phy: aquantia: add firmware loading support

Quoted 7 lines
Quoted 5 lines

Aquantia phys have firmware that can be loaded automatically from storage directly attached to the phy or via MDIO commands.
Add support for loading firmware from either a file or a raw location on an MMC device.

We have integrated your patch series. Now we have one AQR FW: AQR-G3_v4.2.C-AQR.cld
How to flash this FW on Aquantia card ?

Not sure what you are asking here.

My patches don't provide support for programming the persistent storage attached to the aquantia phy on NXP's development boards.

To program the firmware, put the AQR-G3_v4.2.C-AQR.cld file in a directory on a partition that uboot can read. Then set PHY_AQUANTIA_FW_PART to the parition code (for example "0:2") and PHY_AQUANTIA_FW_NAME to the full path to the firmware file (for example "/boot/AQR-G3_v4.2.C-AQR.cld")

If you #define DEBUG in aquantia.c, you should get some output as the code loads the file and verifies checksums.

Quoted 1 line

When my u-boot will boot, does Firmware programming process will trigger by itself or do we need to execute some command on u-boot prompt ?

Firmware programming should happen automatically when the phy is configured.

Does that help?

Jeremy

Quoted 2 lines

--pk

#12 lore raw

PATCH 3/3 net: phy: aquantia: autodetect if firmware needs to be loaded

In reply to Jeremy Gebben

If the phy reports a valid firmware version and doesn't indicate a fault, skip loading the firmware. This allows the same image to be used on boards that have firmware storage and those that do not.

---
 drivers/net/phy/aquantia.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)
drivers/net/phy/aquantia.c +22 -6
index cbd70120d1..37749e0185 100644
@@ -236,18 +236,34 @@ done:
 #else
 static int aquantia_upload_firmware(struct phy_device *phydev)
 {
-	return 0;
+	printf("ERROR %s firmware loading disabled.\n", phydev->dev->name);
+	return -1;
 }
 #endif
 
 int aquantia_config(struct phy_device *phydev)
 {
-	u32 val;
-	int ret;
+	u32 val, id, rstatus, fault;
 
-	ret = aquantia_upload_firmware(phydev);
-	if (ret != 0)
-		return ret;
+	id = phy_read(phydev, MDIO_MMD_VEND1, GLOBAL_FIRMWARE_ID);
+	rstatus = phy_read(phydev, MDIO_MMD_VEND1, GLOBAL_RSTATUS_1);
+	fault = phy_read(phydev, MDIO_MMD_VEND1, GLOBAL_FAULT);
+
+	if (id != 0)
+		printf("%s running firmware version %X.%X.%X\n",
+		       phydev->dev->name, (id >> 8), id & 0xff,
+		       (rstatus >> 4) & 0xf);
+
+	if (fault != 0)
+		printf("%s fault 0x%04x detected\n", phydev->dev->name, fault);
+
+	if (id == 0 || fault != 0) {
+		int ret;
+
+		ret = aquantia_upload_firmware(phydev);
+		if (ret != 0)
+			return ret;
+	}
 
 	val = phy_read(phydev, MDIO_MMD_PMAPMD, MII_BMCR);
 
Signature · 1 line
2.17.1