Skip to contentSkip to conversation

drivers/net/stmmac/: add HAS_IOMEM dependency

PATCH Applied [email protected] 3 participants 4 messages Oct 1, 2010 – Oct 5, 2010

Subsystems (3)
Networking Network drivers Arm STM32
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 2/2 drivers/net/stmmac/: add HAS_IOMEM dependency

From: Martin Schwidefsky <[email protected]>

The stmmac driver does not compile on s390:

drivers/net/stmmac/stmmac_main.c: In function 'stmmac_adjust_link':
drivers/net/stmmac/stmmac_main.c:210: error: implicit declaration of function 'readl' drivers/net/stmmac/stmmac_main.c:263: error: implicit declaration of function 'writel' drivers/net/stmmac/stmmac_main.c: In function 'stmmac_dvr_probe':
drivers/net/stmmac/stmmac_main.c:1674: error: implicit declaration of function 'ioremap' drivers/net/stmmac/stmmac_main.c:1674: warning: assignment makes pointer from integer without a cast drivers/net/stmmac/stmmac_main.c:1761: error: implicit declaration of function 'iounmap' make[3]: *** [drivers/net/stmmac/stmmac_main.o] Error 1

Signed-off-by Martin Schwidefsky <[email protected]>
Cc Giuseppe CAVALLARO <[email protected]>
Cc David S. Miller <[email protected]>
Cc Heiko Carstens <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/net/stmmac/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/stmmac/Kconfig renamed from drivers/net/stmmac/Kconfig~drivers-net-stmmac-add-has_iomem-dependency +1 -1
diff -puN drivers/net/stmmac/Kconfig~drivers-net-stmmac-add-has_iomem-dependency drivers/net/stmmac/Kconfig
@@ -3,7 +3,7 @@ config STMMAC_ETH
 	select MII
 	select PHYLIB
 	select CRC32
-	depends on NETDEVICES
+	depends on NETDEVICES && HAS_IOMEM
 	help
 	  This is the driver for the Ethernet IPs are built around a
 	  Synopsys IP Core and only tested on the STMicroelectronics

_

maintainer
#1 lore raw

From: [email protected]
Date: Fri, 01 Oct 2010 14:17:13 -0700

Quoted 13 lines

From: Martin Schwidefsky <[email protected]>

The stmmac driver does not compile on s390:

drivers/net/stmmac/stmmac_main.c: In function 'stmmac_adjust_link':
drivers/net/stmmac/stmmac_main.c:210: error: implicit declaration of function 'readl' drivers/net/stmmac/stmmac_main.c:263: error: implicit declaration of function 'writel' drivers/net/stmmac/stmmac_main.c: In function 'stmmac_dvr_probe':
drivers/net/stmmac/stmmac_main.c:1674: error: implicit declaration of function 'ioremap' drivers/net/stmmac/stmmac_main.c:1674: warning: assignment makes pointer from integer without a cast drivers/net/stmmac/stmmac_main.c:1761: error: implicit declaration of function 'iounmap' make[3]: *** [drivers/net/stmmac/stmmac_main.o] Error 1

Quoted 5 lines
Signed-off-by Martin Schwidefsky <[email protected]>
Cc Giuseppe CAVALLARO <[email protected]>
Cc David S. Miller <[email protected]>
Cc Heiko Carstens <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

This got fixed by adding a dependency on CPU_SUBTYPE_ST40.

#2 lore raw

Hello

Quoted 21 lines · David Miller

From: [email protected]
Date: Fri, 01 Oct 2010 14:17:13 -0700

Quoted 6 lines

From: Martin Schwidefsky <[email protected]>

The stmmac driver does not compile on s390:

drivers/net/stmmac/stmmac_main.c: In function 'stmmac_adjust_link':
drivers/net/stmmac/stmmac_main.c:210: error: implicit declaration of function

'readl'

Quoted 1 line

drivers/net/stmmac/stmmac_main.c:263: error: implicit declaration of function

'writel'

Quoted 2 lines

drivers/net/stmmac/stmmac_main.c: In function 'stmmac_dvr_probe':
drivers/net/stmmac/stmmac_main.c:1674: error: implicit declaration of

function 'ioremap'

Quoted 1 line

drivers/net/stmmac/stmmac_main.c:1674: warning: assignment makes pointer from

integer without a cast

Quoted 1 line

drivers/net/stmmac/stmmac_main.c:1761: error: implicit declaration of

function 'iounmap'

Quoted 2 lines

make[3]: *** [drivers/net/stmmac/stmmac_main.o] Error 1

Quoted 7 lines
Quoted 5 lines
Signed-off-by Martin Schwidefsky <[email protected]>
Cc Giuseppe CAVALLARO <[email protected]>
Cc David S. Miller <[email protected]>
Cc Heiko Carstens <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

This got fixed by adding a dependency on CPU_SUBTYPE_ST40.

This dependency was removed in driver included in net-next Git (because the CPU_SUBTYPE_ST40 is a dead option).

I've seen that other drivers depend on HAS_IOMEM that is always defined for STM and ARM targets (where the I know the stmmac is used); No problem for me to add this new dependency to in HAS_IOMEM the stmmac's Kconfig if actually needed.

Regards
Peppe

maintainer
#3 lore raw

From: Peppe CAVALLARO <[email protected]>
Date: Tue, 5 Oct 2010 12:46:49 +0200

Quoted 2 lines

This dependency was removed in driver included in net-next Git (because the CPU_SUBTYPE_ST40 is a dead option).

Oh yes, I missed that. Thanks for noticing.

Quoted 4 lines

I've seen that other drivers depend on HAS_IOMEM that is always defined for STM and ARM targets (where the I know the stmmac is used); No problem for me to add this new dependency to in HAS_IOMEM the stmmac's Kconfig if actually needed.

I'll add the patch Andrew posted, it is needed now.

Thanks again.