* [PATCH] net: altera: Handle dma_set_coherent_mask error codes
@ 2022-07-14 13:23 Denis Kirjanov
2022-07-15 23:44 ` Jakub Kicinski
0 siblings, 1 reply; 2+ messages in thread
From: Denis Kirjanov @ 2022-07-14 13:23 UTC (permalink / raw)
To: netdev
handle the error in the case that DMA mask is not supportyed
Fixes: bbd2190ce96d ("Altera TSE: Add main and header file for Altera Ethernet Driver")
Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
---
drivers/net/ethernet/altera/altera_tse_main.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
index 8c5828582c21..7773d978321a 100644
--- a/drivers/net/ethernet/altera/altera_tse_main.c
+++ b/drivers/net/ethernet/altera/altera_tse_main.c
@@ -1439,10 +1439,14 @@ static int altera_tse_probe(struct platform_device *pdev)
}
if (!dma_set_mask(priv->device, DMA_BIT_MASK(priv->dmaops->dmamask))) {
- dma_set_coherent_mask(priv->device,
+ ret = dma_set_coherent_mask(priv->device,
DMA_BIT_MASK(priv->dmaops->dmamask));
+ if (ret)
+ goto err_free_netdev;
} else if (!dma_set_mask(priv->device, DMA_BIT_MASK(32))) {
- dma_set_coherent_mask(priv->device, DMA_BIT_MASK(32));
+ ret = dma_set_coherent_mask(priv->device, DMA_BIT_MASK(32));
+ if (ret)
+ goto err_free_netdev;
} else {
ret = -EIO;
goto err_free_netdev;
--
2.16.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] net: altera: Handle dma_set_coherent_mask error codes
2022-07-14 13:23 [PATCH] net: altera: Handle dma_set_coherent_mask error codes Denis Kirjanov
@ 2022-07-15 23:44 ` Jakub Kicinski
0 siblings, 0 replies; 2+ messages in thread
From: Jakub Kicinski @ 2022-07-15 23:44 UTC (permalink / raw)
To: Denis Kirjanov; +Cc: netdev
On Thu, 14 Jul 2022 16:23:42 +0300 Denis Kirjanov wrote:
> handle the error in the case that DMA mask is not supportyed
>
> Fixes: bbd2190ce96d ("Altera TSE: Add main and header file for Altera Ethernet Driver")
> Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
> ---
> drivers/net/ethernet/altera/altera_tse_main.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
> index 8c5828582c21..7773d978321a 100644
> --- a/drivers/net/ethernet/altera/altera_tse_main.c
> +++ b/drivers/net/ethernet/altera/altera_tse_main.c
> @@ -1439,10 +1439,14 @@ static int altera_tse_probe(struct platform_device *pdev)
> }
>
> if (!dma_set_mask(priv->device, DMA_BIT_MASK(priv->dmaops->dmamask))) {
> - dma_set_coherent_mask(priv->device,
> + ret = dma_set_coherent_mask(priv->device,
> DMA_BIT_MASK(priv->dmaops->dmamask));
> + if (ret)
> + goto err_free_netdev;
> } else if (!dma_set_mask(priv->device, DMA_BIT_MASK(32))) {
> - dma_set_coherent_mask(priv->device, DMA_BIT_MASK(32));
> + ret = dma_set_coherent_mask(priv->device, DMA_BIT_MASK(32));
> + if (ret)
> + goto err_free_netdev;
> } else {
> ret = -EIO;
> goto err_free_netdev;
Practically speaking this can't fail, see Christophe's patches like
b6f2f0352c0302
If you want to be on the safe side just replace the dma_set_mask()
with dma_set_mask_and_coherent() and let the else branch handle the
failure.
Please CC maintainers when reposting.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-15 23:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-14 13:23 [PATCH] net: altera: Handle dma_set_coherent_mask error codes Denis Kirjanov
2022-07-15 23:44 ` Jakub Kicinski
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).