Skip to contentSkip to conversation

net: macb: Fix compilation on systems without COMMON_CLK, v2

PATCH In review Palmer Dabbelt 3 participants 6 messages Jun 25, 2019 – Jun 26, 2019

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

Our patch to add support for the FU540-C000 broke compilation on at least powerpc allyesconfig, which was found as part of the linux-next build regression tests. This must have somehow slipped through the cracks, as the patch has been reverted in linux-next for a while now. This patch applies on top of the offending commit, which is the only one I've even tried it on as I'm not sure how this subsystem makes it to Linus.

This patch set fixes the issue by adding a dependency of COMMON_CLK to the MACB Kconfig entry, which avoids the build failure by disabling MACB on systems where it wouldn't compile. All known users of MACB have COMMON_CLK, so this shouldn't cause any issues. This is a significantly simpler approach than disabling just the FU540-C000 support.

I've also included a second patch to indicate this is a driver for a Cadence device that was originally written by an engineer at Atmel. The only relation is that I stumbled across it when writing the first patch.

Changes since v1 <[email protected]>:

* Disable MACB on systems without COMMON_CLK, instead of just disabling the FU540-C000 support on these systems.
* Update the commit message to reflect the driver was written by Atmel.

#1 lore raw

PATCH v2 1/2 net: macb: Kconfig: Make MACB depend on COMMON_CLK

commit c218ad559020 ("macb: Add support for SiFive FU540-C000") added a dependency on the common clock framework to the macb driver, but didn't express that dependency in Kconfig. As a result macb now fails to compile on systems without COMMON_CLK, which specifically causes a build failure on powerpc allyesconfig.

This patch adds the dependency, which results in the macb driver no longer being selectable on systems without the common clock framework. All known systems that have this device already support the common clock framework, so this should not cause trouble for any uses. Supporting both the FU540-C000 and systems without COMMON_CLK is quite ugly.

I've build tested this on powerpc allyesconfig and RISC-V defconfig (which selects MACB), but I have not even booted the resulting kernels.

Fixes c218ad559020 ("macb: Add support for SiFive FU540-C000")
---
 drivers/net/ethernet/cadence/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/cadence/Kconfig +2 -2
index 1766697c9c5a..64d8d6ee7739 100644
@@ -21,7 +21,7 @@ if NET_VENDOR_CADENCE
 
 config MACB
 	tristate "Cadence MACB/GEM support"
-	depends on HAS_DMA
+	depends on HAS_DMA && COMMON_CLK
 	select PHYLIB
 	---help---
 	  The Cadence MACB ethernet interface is found on many Atmel AT32 and
@@ -42,7 +42,7 @@ config MACB_USE_HWSTAMP
 
 config MACB_PCI
 	tristate "Cadence PCI MACB/GEM support"
-	depends on MACB && PCI && COMMON_CLK
+	depends on MACB && PCI
 	---help---
 	  This is PCI wrapper for MACB driver.
 
Signature · 1 line
2.21.0
Acked-by on v2 1/2
#2 lore raw

Re: [PATCH v2 1/2] net: macb: Kconfig: Make MACB depend on COMMON_CLK

Quoted 12 lines · Palmer Dabbelt

commit c218ad559020 ("macb: Add support for SiFive FU540-C000") added a dependency on the common clock framework to the macb driver, but didn't express that dependency in Kconfig. As a result macb now fails to compile on systems without COMMON_CLK, which specifically causes a build failure on powerpc allyesconfig.

This patch adds the dependency, which results in the macb driver no longer being selectable on systems without the common clock framework. All known systems that have this device already support the common clock framework, so this should not cause trouble for any uses. Supporting both the FU540-C000 and systems without COMMON_CLK is quite ugly.

Quoted 5 lines

I've build tested this on powerpc allyesconfig and RISC-V defconfig (which selects MACB), but I have not even booted the resulting kernels.

Fixes c218ad559020 ("macb: Add support for SiFive FU540-C000")

Thanks!

Quoted 27 lines
---
  drivers/net/ethernet/cadence/Kconfig | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/cadence/Kconfig +2 -2
index 1766697c9c5a..64d8d6ee7739 100644
@@ -21,7 +21,7 @@ if NET_VENDOR_CADENCE
 
  config MACB
  	tristate "Cadence MACB/GEM support"
-	depends on HAS_DMA
+	depends on HAS_DMA && COMMON_CLK
  	select PHYLIB
  	---help---
  	  The Cadence MACB ethernet interface is found on many Atmel AT32 and
@@ -42,7 +42,7 @@ config MACB_USE_HWSTAMP
 
  config MACB_PCI
  	tristate "Cadence PCI MACB/GEM support"
-	depends on MACB && PCI && COMMON_CLK
+	depends on MACB && PCI
  	---help---
  	  This is PCI wrapper for MACB driver.
 
Signature · 1 line
Nicolas Ferre
#3 lore raw

PATCH v2 2/2 net: macb: Kconfig: Rename Atmel to Cadence

In reply to Palmer Dabbelt

The help text makes it look like NET_VENDOR_CADENCE enables support for Atmel devices, when in reality it's a driver written by Atmel that supports Cadence devices. This may confuse users that have this device on a non-Atmel SoC.

The fix is just s/Atmel/Cadence/, but I did go and re-wrap the Kconfig help text as that change caused it to go over 80 characters.

---
 drivers/net/ethernet/cadence/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/cadence/Kconfig +3 -3
index 64d8d6ee7739..f4b3bd85dfe3 100644
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
-# Atmel device configuration
+# Cadence device configuration
 #
 
 config NET_VENDOR_CADENCE
@@ -13,8 +13,8 @@ config NET_VENDOR_CADENCE
 	  If unsure, say Y.
 
 	  Note that the answer to this question doesn't directly affect the
-	  kernel: saying N will just cause the configurator to skip all
-	  the remaining Atmel network card questions. If you say Y, you will be
+	  kernel: saying N will just cause the configurator to skip all the
+	  remaining Cadence network card questions. If you say Y, you will be
 	  asked for your specific card in the following questions.
 
 if NET_VENDOR_CADENCE
Signature · 1 line
2.21.0
Acked-by on v2 2/2
#4 lore raw

Re: [PATCH v2 2/2] net: macb: Kconfig: Rename Atmel to Cadence

Quoted 9 lines · Palmer Dabbelt

The help text makes it look like NET_VENDOR_CADENCE enables support for Atmel devices, when in reality it's a driver written by Atmel that supports Cadence devices. This may confuse users that have this device on a non-Atmel SoC.

The fix is just s/Atmel/Cadence/, but I did go and re-wrap the Kconfig help text as that change caused it to go over 80 characters.

Quoted 28 lines
---
  drivers/net/ethernet/cadence/Kconfig | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/cadence/Kconfig +3 -3
index 64d8d6ee7739..f4b3bd85dfe3 100644
@@ -1,6 +1,6 @@
  # SPDX-License-Identifier: GPL-2.0-only
  #
-# Atmel device configuration
+# Cadence device configuration
  #
 
  config NET_VENDOR_CADENCE
@@ -13,8 +13,8 @@ config NET_VENDOR_CADENCE
  	  If unsure, say Y.
 
  	  Note that the answer to this question doesn't directly affect the
-	  kernel: saying N will just cause the configurator to skip all
-	  the remaining Atmel network card questions. If you say Y, you will be
+	  kernel: saying N will just cause the configurator to skip all the
+	  remaining Cadence network card questions. If you say Y, you will be
  	  asked for your specific card in the following questions.
 
  if NET_VENDOR_CADENCE
Signature · 1 line
Nicolas Ferre
maintainer
#5 lore raw
In reply to Palmer Dabbelt

From: Palmer Dabbelt <[email protected]>
Date: Tue, 25 Jun 2019 01:48:26 -0700

Quoted 18 lines

Our patch to add support for the FU540-C000 broke compilation on at least powerpc allyesconfig, which was found as part of the linux-next build regression tests. This must have somehow slipped through the cracks, as the patch has been reverted in linux-next for a while now. This patch applies on top of the offending commit, which is the only one I've even tried it on as I'm not sure how this subsystem makes it to Linus.

This patch set fixes the issue by adding a dependency of COMMON_CLK to the MACB Kconfig entry, which avoids the build failure by disabling MACB on systems where it wouldn't compile. All known users of MACB have COMMON_CLK, so this shouldn't cause any issues. This is a significantly simpler approach than disabling just the FU540-C000 support.

I've also included a second patch to indicate this is a driver for a Cadence device that was originally written by an engineer at Atmel. The only relation is that I stumbled across it when writing the first patch.

Quoted 5 lines

Changes since v1 <[email protected]>:

* Disable MACB on systems without COMMON_CLK, instead of just disabling the FU540-C000 support on these systems.
* Update the commit message to reflect the driver was written by Atmel.

Series applied, thanks.