[-next] dma: bcm-sba-raid: fix build errors and dependencies

Commit Message

Randy Dunlap May 17, 2017, 4:40 p.m. UTC

From: Randy Dunlap <[e-mail]>

Fix build errors when COMPILE_TEST is enabled but RAID6_PQ is not
enabled (seen on x86_64).

drivers/built-in.o: In function `sba_prep_dma_pq_req':
(.text+0x16132): undefined reference to `raid6_gflog'
drivers/built-in.o: In function `sba_prep_dma_pq_single_req':
(.text+0x162f4): undefined reference to `raid6_gflog'

This driver needs RAID6_PQ and MAILBOX (from inspection) independent of
ARM64 or COMPILE_TEST.

However, RAID6_PQ is not defined in any Kconfig file, although it is
used in several of them. :(

Signed-off-by: Randy Dunlap <[e-mail]>
Cc: Anup Patel <[e-mail]>
Cc: Vinod Koul <[e-mail]>
Cc: [e-mail]
---
 drivers/dma/Kconfig |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)



--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Bjorn Andersson May 17, 2017, 6:11 p.m. UTC | #1

On Wed, May 17, 2017 at 9:40 AM, Randy Dunlap <[e-mail]> wrote:
> From: Randy Dunlap <[e-mail]>
>
> Fix build errors when COMPILE_TEST is enabled but RAID6_PQ is not
> enabled (seen on x86_64).
>
> drivers/built-in.o: In function `sba_prep_dma_pq_req':
> (.text+0x16132): undefined reference to `raid6_gflog'
> drivers/built-in.o: In function `sba_prep_dma_pq_single_req':
> (.text+0x162f4): undefined reference to `raid6_gflog'
>
> This driver needs RAID6_PQ and MAILBOX (from inspection) independent of
> ARM64 or COMPILE_TEST.
>
> However, RAID6_PQ is not defined in any Kconfig file, although it is
> used in several of them. :(
>
> Signed-off-by: Randy Dunlap <[e-mail]>
> Cc: Anup Patel <[e-mail]>
> Cc: Vinod Koul <[e-mail]>
> Cc: [e-mail]

Hit this as well today.

Acked-by: Bjorn Andersson <[e-mail]>

Regards,
Bjorn
--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Vinod Koul May 19, 2017, 3:46 a.m. UTC | #2

On Wed, May 17, 2017 at 09:40:47AM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <[e-mail]>
> 
> Fix build errors when COMPILE_TEST is enabled but RAID6_PQ is not
> enabled (seen on x86_64).

Oops, I already applied one from Arnd and pushed that out.

> 
> drivers/built-in.o: In function `sba_prep_dma_pq_req':
> (.text+0x16132): undefined reference to `raid6_gflog'
> drivers/built-in.o: In function `sba_prep_dma_pq_single_req':
> (.text+0x162f4): undefined reference to `raid6_gflog'
> 
> This driver needs RAID6_PQ and MAILBOX (from inspection) independent of
> ARM64 or COMPILE_TEST.
> 
> However, RAID6_PQ is not defined in any Kconfig file, although it is
> used in several of them. :(
> 
> Signed-off-by: Randy Dunlap <[e-mail]>
> Cc: Anup Patel <[e-mail]>
> Cc: Vinod Koul <[e-mail]>
> Cc: [e-mail]
> ---
>  drivers/dma/Kconfig |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> --- linux-next-20170517.orig/drivers/dma/Kconfig
> +++ linux-next-20170517/drivers/dma/Kconfig
> @@ -101,7 +101,8 @@ config AXI_DMAC
>  
>  config BCM_SBA_RAID
>  	tristate "Broadcom SBA RAID engine support"
> -	depends on (ARM64 && MAILBOX && RAID6_PQ) || COMPILE_TEST
> +	depends on ARM64 || COMPILE_TEST
> +	depends on MAILBOX && RAID6_PQ
>  	select DMA_ENGINE
>  	select DMA_ENGINE_RAID
>  	select ASYNC_TX_DISABLE_XOR_VAL_DMA
> 
>

Patch

--- linux-next-20170517.orig/drivers/dma/Kconfig
+++ linux-next-20170517/drivers/dma/Kconfig
@@ -101,7 +101,8 @@  config AXI_DMAC
 
 config BCM_SBA_RAID
 	tristate "Broadcom SBA RAID engine support"
-	depends on (ARM64 && MAILBOX && RAID6_PQ) || COMPILE_TEST
+	depends on ARM64 || COMPILE_TEST
+	depends on MAILBOX && RAID6_PQ
 	select DMA_ENGINE
 	select DMA_ENGINE_RAID
 	select ASYNC_TX_DISABLE_XOR_VAL_DMA