linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -next] dmaengine: hisilicon: Fix build error without PCI_MSI
@ 2020-03-28 11:41 YueHaibing
  2020-03-30  2:39 ` Zhou Wang
  2020-04-15 15:49 ` Vinod Koul
  0 siblings, 2 replies; 4+ messages in thread
From: YueHaibing @ 2020-03-28 11:41 UTC (permalink / raw)
  To: dan.j.williams, vkoul, wangzhou1, qiuzhenfa
  Cc: dmaengine, linux-kernel, YueHaibing

If PCI_MSI is not set, building fais:

drivers/dma/hisi_dma.c: In function ‘hisi_dma_free_irq_vectors’:
drivers/dma/hisi_dma.c:138:2: error: implicit declaration of function ‘pci_free_irq_vectors’;
 did you mean ‘pci_alloc_irq_vectors’? [-Werror=implicit-function-declaration]
  pci_free_irq_vectors(data);
  ^~~~~~~~~~~~~~~~~~~~

Make HISI_DMA depends on PCI_MSI to fix this.

Fixes: e9f08b65250d ("dmaengine: hisilicon: Add Kunpeng DMA engine support")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/dma/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 092483644315..023db6883d05 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -241,7 +241,8 @@ config FSL_RAID
 
 config HISI_DMA
 	tristate "HiSilicon DMA Engine support"
-	depends on ARM64 || (COMPILE_TEST && PCI_MSI)
+	depends on ARM64 || COMPILE_TEST
+	depends on PCI_MSI
 	select DMA_ENGINE
 	select DMA_VIRTUAL_CHANNELS
 	help
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH -next] dmaengine: hisilicon: Fix build error without PCI_MSI
  2020-03-28 11:41 [PATCH -next] dmaengine: hisilicon: Fix build error without PCI_MSI YueHaibing
@ 2020-03-30  2:39 ` Zhou Wang
  2020-03-30  6:59   ` Yuehaibing
  2020-04-15 15:49 ` Vinod Koul
  1 sibling, 1 reply; 4+ messages in thread
From: Zhou Wang @ 2020-03-30  2:39 UTC (permalink / raw)
  To: YueHaibing, dan.j.williams, vkoul, qiuzhenfa; +Cc: dmaengine, linux-kernel

On 2020/3/28 19:41, YueHaibing wrote:
> If PCI_MSI is not set, building fais:
> 
> drivers/dma/hisi_dma.c: In function ‘hisi_dma_free_irq_vectors’:
> drivers/dma/hisi_dma.c:138:2: error: implicit declaration of function ‘pci_free_irq_vectors’;
>  did you mean ‘pci_alloc_irq_vectors’? [-Werror=implicit-function-declaration]
>   pci_free_irq_vectors(data);
>   ^~~~~~~~~~~~~~~~~~~~
>
> Make HISI_DMA depends on PCI_MSI to fix this.

In ARM64, it will appear this compile error if PCI disables.
How about adding depends on PCI && PCI_MSI here?

Best,
Zhou

> 
> Fixes: e9f08b65250d ("dmaengine: hisilicon: Add Kunpeng DMA engine support")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>  drivers/dma/Kconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
> index 092483644315..023db6883d05 100644
> --- a/drivers/dma/Kconfig
> +++ b/drivers/dma/Kconfig
> @@ -241,7 +241,8 @@ config FSL_RAID
>  
>  config HISI_DMA
>  	tristate "HiSilicon DMA Engine support"
> -	depends on ARM64 || (COMPILE_TEST && PCI_MSI)
> +	depends on ARM64 || COMPILE_TEST
> +	depends on PCI_MSI
>  	select DMA_ENGINE
>  	select DMA_VIRTUAL_CHANNELS
>  	help
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH -next] dmaengine: hisilicon: Fix build error without PCI_MSI
  2020-03-30  2:39 ` Zhou Wang
@ 2020-03-30  6:59   ` Yuehaibing
  0 siblings, 0 replies; 4+ messages in thread
From: Yuehaibing @ 2020-03-30  6:59 UTC (permalink / raw)
  To: Zhou Wang, dan.j.williams, vkoul, qiuzhenfa; +Cc: dmaengine, linux-kernel

On 2020/3/30 10:39, Zhou Wang wrote:
> On 2020/3/28 19:41, YueHaibing wrote:
>> If PCI_MSI is not set, building fais:
>>
>> drivers/dma/hisi_dma.c: In function ‘hisi_dma_free_irq_vectors’:
>> drivers/dma/hisi_dma.c:138:2: error: implicit declaration of function ‘pci_free_irq_vectors’;
>>  did you mean ‘pci_alloc_irq_vectors’? [-Werror=implicit-function-declaration]
>>   pci_free_irq_vectors(data);
>>   ^~~~~~~~~~~~~~~~~~~~
>>
>> Make HISI_DMA depends on PCI_MSI to fix this.
> 
> In ARM64, it will appear this compile error if PCI disables.
> How about adding depends on PCI && PCI_MSI here?

PCI_MSI depends on PCI, while PCI is not set, PCI_MSI will never be set

so depends on PCI_MSI is enough.

> 
> Best,
> Zhou
> 
>>
>> Fixes: e9f08b65250d ("dmaengine: hisilicon: Add Kunpeng DMA engine support")
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> ---
>>  drivers/dma/Kconfig | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
>> index 092483644315..023db6883d05 100644
>> --- a/drivers/dma/Kconfig
>> +++ b/drivers/dma/Kconfig
>> @@ -241,7 +241,8 @@ config FSL_RAID
>>  
>>  config HISI_DMA
>>  	tristate "HiSilicon DMA Engine support"
>> -	depends on ARM64 || (COMPILE_TEST && PCI_MSI)
>> +	depends on ARM64 || COMPILE_TEST
>> +	depends on PCI_MSI
>>  	select DMA_ENGINE
>>  	select DMA_VIRTUAL_CHANNELS
>>  	help
>>
> 
> 
> .
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH -next] dmaengine: hisilicon: Fix build error without PCI_MSI
  2020-03-28 11:41 [PATCH -next] dmaengine: hisilicon: Fix build error without PCI_MSI YueHaibing
  2020-03-30  2:39 ` Zhou Wang
@ 2020-04-15 15:49 ` Vinod Koul
  1 sibling, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2020-04-15 15:49 UTC (permalink / raw)
  To: YueHaibing; +Cc: dan.j.williams, wangzhou1, qiuzhenfa, dmaengine, linux-kernel

On 28-03-20, 19:41, YueHaibing wrote:
> If PCI_MSI is not set, building fais:
> 
> drivers/dma/hisi_dma.c: In function ‘hisi_dma_free_irq_vectors’:
> drivers/dma/hisi_dma.c:138:2: error: implicit declaration of function ‘pci_free_irq_vectors’;
>  did you mean ‘pci_alloc_irq_vectors’? [-Werror=implicit-function-declaration]
>   pci_free_irq_vectors(data);
>   ^~~~~~~~~~~~~~~~~~~~
> 
> Make HISI_DMA depends on PCI_MSI to fix this.

Applied, thanks

-- 
~Vinod

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-04-15 15:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-28 11:41 [PATCH -next] dmaengine: hisilicon: Fix build error without PCI_MSI YueHaibing
2020-03-30  2:39 ` Zhou Wang
2020-03-30  6:59   ` Yuehaibing
2020-04-15 15:49 ` Vinod Koul

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).