Skip to contentSkip to conversation

net: ethernet: stmmac: remove select QCOM_SOCINFO and make it optional

PATCH Applied Christian Marangi 3 participants 3 messages Jun 16, 2022 – Jun 19, 2022

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

PATCH 1/1 net: ethernet: stmmac: remove select QCOM_SOCINFO and make it optional

QCOM_SOCINFO depends on QCOM_SMEM but is not selected, this cause some problems with QCOM_SOCINFO getting selected with the dependency of QCOM_SMEM not met.
To fix this remove the select in Kconfig and add additional info in the DWMAC_IPQ806X config description.

Fixes 9ec092d2feb6 ("net: ethernet: stmmac: add missing sgmii configure for ipq806x")
---
 drivers/net/ethernet/stmicro/stmmac/Kconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/Kconfig +3 -1
index c4bca16dae57..31ff35174034 100644
@@ -83,7 +83,6 @@ config DWMAC_IPQ806X
 	default ARCH_QCOM
 	depends on OF && (ARCH_QCOM || COMPILE_TEST)
 	select MFD_SYSCON
-	select QCOM_SOCINFO
 	help
 	  Support for QCA IPQ806X DWMAC Ethernet.
 
@@ -92,6 +91,9 @@ config DWMAC_IPQ806X
 	  acceleration features available on this SoC. Network devices
 	  will behave like standard non-accelerated ethernet interfaces.
 
+	  Select the QCOM_SOCINFO config flag to enable specific dwmac
+	  fixup based on the ipq806x SoC revision.
+
 config DWMAC_LPC18XX
 	tristate "NXP LPC18xx/43xx DWMAC support"
 	default ARCH_LPC18XX
Signature · 1 line
2.36.1
#1 lore raw
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:

Quoted 11 lines · On Fri, 17 Jun 2022 00:15:54 +0200 you wrote:

QCOM_SOCINFO depends on QCOM_SMEM but is not selected, this cause some problems with QCOM_SOCINFO getting selected with the dependency of QCOM_SMEM not met.
To fix this remove the select in Kconfig and add additional info in the DWMAC_IPQ806X config description.

Fixes 9ec092d2feb6 ("net: ethernet: stmmac: add missing sgmii configure for ipq806x")

[...]

Here is the summary with links:
- [net-next] net: ethernet: stmmac: remove select QCOM_SOCINFO and make it optional

    https://git.kernel.org/netdev/net-next/c/c205035e3adb

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
#2 lore raw
In reply to Christian Marangi
Quoted 27 lines · Christian Marangi

QCOM_SOCINFO depends on QCOM_SMEM but is not selected, this cause some problems with QCOM_SOCINFO getting selected with the dependency of QCOM_SMEM not met.
To fix this remove the select in Kconfig and add additional info in the DWMAC_IPQ806X config description.

Fixes 9ec092d2feb6 ("net: ethernet: stmmac: add missing sgmii configure for ipq806x")
---
 drivers/net/ethernet/stmicro/stmmac/Kconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/Kconfig +0 -1
index c4bca16dae57..31ff35174034 100644
@@ -83,7 +83,6 @@ config DWMAC_IPQ806X
        default ARCH_QCOM
        depends on OF && (ARCH_QCOM || COMPILE_TEST)
        select MFD_SYSCON
-       select QCOM_SOCINFO
        help
          Support for QCA IPQ806X DWMAC Ethernet.
 

drivers/net/ethernet/stmicro/stmmac/Kconfig config DWMAC_IPQ806X · line 95

Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/Kconfig +2 -0
@@ -92,6 +91,9 @@ config DWMAC_IPQ806X
          acceleration features available on this SoC. Network devices
          will behave like standard non-accelerated ethernet interfaces.
 
+         Select the QCOM_SOCINFO config flag to enable specific dwmac
+         fixup based on the ipq806x SoC revision.

I think the correct way would have been to use

     depends on QCOM_SOCINFO || COMPILE_TEST

here.

Arnd