diff mbox

net: via: VIA_RHINE and VIA_VELOCITY should depend on HAS_DMA

Message ID 1435320502-4951-1-git-send-email-geert@linux-m68k.org
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Geert Uytterhoeven June 26, 2015, 12:08 p.m. UTC
If NO_DMA=y:

    ERROR: "dma_sync_single_for_cpu" [drivers/net/ethernet/via/via-rhine.ko] undefined!
    ERROR: "dma_set_mask" [drivers/net/ethernet/via/via-rhine.ko] undefined!
    ERROR: "dma_mapping_error" [drivers/net/ethernet/via/via-rhine.ko] undefined!
    ERROR: "dma_map_single" [drivers/net/ethernet/via/via-rhine.ko] undefined!
    ERROR: "dma_alloc_coherent" [drivers/net/ethernet/via/via-rhine.ko] undefined!
    ERROR: "dma_free_coherent" [drivers/net/ethernet/via/via-rhine.ko] undefined!
    ERROR: "dma_unmap_single" [drivers/net/ethernet/via/via-rhine.ko] undefined!
    ERROR: "dma_map_page" [drivers/net/ethernet/via/via-velocity.ko] undefined!
    ERROR: "dma_sync_single_for_cpu" [drivers/net/ethernet/via/via-velocity.ko] undefined!
    ERROR: "dma_free_coherent" [drivers/net/ethernet/via/via-velocity.ko] undefined!
    ERROR: "dma_unmap_single" [drivers/net/ethernet/via/via-velocity.ko] undefined!
    ERROR: "dma_map_single" [drivers/net/ethernet/via/via-velocity.ko] undefined!
    ERROR: "dma_alloc_coherent" [drivers/net/ethernet/via/via-velocity.ko] undefined!

Before, the symbols depended implicitly on HAS_DMA through PCI or
USE_OF.  Add explicit dependencies on HAS_DMA to fix this.

Fixes: commit b7d3282a245f4428 ("net: via/Kconfig: replace USE_OF with OF_???")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 drivers/net/ethernet/via/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

Comments

Sergei Shtylyov June 26, 2015, 1:21 p.m. UTC | #1
Hello.

On 6/26/2015 3:08 PM, Geert Uytterhoeven wrote:

> If NO_DMA=y:

>      ERROR: "dma_sync_single_for_cpu" [drivers/net/ethernet/via/via-rhine.ko] undefined!
>      ERROR: "dma_set_mask" [drivers/net/ethernet/via/via-rhine.ko] undefined!
>      ERROR: "dma_mapping_error" [drivers/net/ethernet/via/via-rhine.ko] undefined!
>      ERROR: "dma_map_single" [drivers/net/ethernet/via/via-rhine.ko] undefined!
>      ERROR: "dma_alloc_coherent" [drivers/net/ethernet/via/via-rhine.ko] undefined!
>      ERROR: "dma_free_coherent" [drivers/net/ethernet/via/via-rhine.ko] undefined!
>      ERROR: "dma_unmap_single" [drivers/net/ethernet/via/via-rhine.ko] undefined!
>      ERROR: "dma_map_page" [drivers/net/ethernet/via/via-velocity.ko] undefined!
>      ERROR: "dma_sync_single_for_cpu" [drivers/net/ethernet/via/via-velocity.ko] undefined!
>      ERROR: "dma_free_coherent" [drivers/net/ethernet/via/via-velocity.ko] undefined!
>      ERROR: "dma_unmap_single" [drivers/net/ethernet/via/via-velocity.ko] undefined!
>      ERROR: "dma_map_single" [drivers/net/ethernet/via/via-velocity.ko] undefined!
>      ERROR: "dma_alloc_coherent" [drivers/net/ethernet/via/via-velocity.ko] undefined!

> Before, the symbols depended implicitly on HAS_DMA through PCI or
> USE_OF.  Add explicit dependencies on HAS_DMA to fix this.

> Fixes: commit b7d3282a245f4428 ("net: via/Kconfig: replace USE_OF with OF_???")

Fixes: b7d3282a245f ("net: via/Kconfig: replace USE_OF with OF_???")

> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Antonio Borneo June 27, 2015, 6:38 a.m. UTC | #2
On Fri, Jun 26, 2015 at 9:21 PM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> Hello.
>
> On 6/26/2015 3:08 PM, Geert Uytterhoeven wrote:
>
>> If NO_DMA=y:
>
>
>>      ERROR: "dma_sync_single_for_cpu"
>> [drivers/net/ethernet/via/via-rhine.ko] undefined!
>>      ERROR: "dma_set_mask" [drivers/net/ethernet/via/via-rhine.ko]
>> undefined!
>>      ERROR: "dma_mapping_error" [drivers/net/ethernet/via/via-rhine.ko]
>> undefined!
>>      ERROR: "dma_map_single" [drivers/net/ethernet/via/via-rhine.ko]
>> undefined!
>>      ERROR: "dma_alloc_coherent" [drivers/net/ethernet/via/via-rhine.ko]
>> undefined!
>>      ERROR: "dma_free_coherent" [drivers/net/ethernet/via/via-rhine.ko]
>> undefined!
>>      ERROR: "dma_unmap_single" [drivers/net/ethernet/via/via-rhine.ko]
>> undefined!
>>      ERROR: "dma_map_page" [drivers/net/ethernet/via/via-velocity.ko]
>> undefined!
>>      ERROR: "dma_sync_single_for_cpu"
>> [drivers/net/ethernet/via/via-velocity.ko] undefined!
>>      ERROR: "dma_free_coherent" [drivers/net/ethernet/via/via-velocity.ko]
>> undefined!
>>      ERROR: "dma_unmap_single" [drivers/net/ethernet/via/via-velocity.ko]
>> undefined!
>>      ERROR: "dma_map_single" [drivers/net/ethernet/via/via-velocity.ko]
>> undefined!
>>      ERROR: "dma_alloc_coherent"
>> [drivers/net/ethernet/via/via-velocity.ko] undefined!
>
>
>> Before, the symbols depended implicitly on HAS_DMA through PCI or
>> USE_OF.  Add explicit dependencies on HAS_DMA to fix this.
>
>
>> Fixes: commit b7d3282a245f4428 ("net: via/Kconfig: replace USE_OF with
>> OF_???")
>
>
> Fixes: b7d3282a245f ("net: via/Kconfig: replace USE_OF with OF_???")
>
>> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
>
>
> WBR, Sergei
>

Yes, I can confirm it.
If HAS_DMA is not defined the build is broken.
Your patch fixes the issue.

Thanks,
Antonio
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller June 29, 2015, 3:21 a.m. UTC | #3
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Fri, 26 Jun 2015 14:08:22 +0200

> If NO_DMA=y:
 ...
> Before, the symbols depended implicitly on HAS_DMA through PCI or
> USE_OF.  Add explicit dependencies on HAS_DMA to fix this.
> 
> Fixes: commit b7d3282a245f4428 ("net: via/Kconfig: replace USE_OF with OF_???")
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Applied, thanks Geert.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/via/Kconfig b/drivers/net/ethernet/via/Kconfig
index 8b0b1d6aca72c4a3..2f1264b882b9555f 100644
--- a/drivers/net/ethernet/via/Kconfig
+++ b/drivers/net/ethernet/via/Kconfig
@@ -18,6 +18,7 @@  if NET_VENDOR_VIA
 config VIA_RHINE
 	tristate "VIA Rhine support"
 	depends on (PCI || OF_IRQ)
+	depends on HAS_DMA
 	select CRC32
 	select MII
 	---help---
@@ -42,6 +43,7 @@  config VIA_RHINE_MMIO
 config VIA_VELOCITY
 	tristate "VIA Velocity support"
 	depends on (PCI || (OF_ADDRESS && OF_IRQ))
+	depends on HAS_DMA
 	select CRC32
 	select CRC_CCITT
 	select MII