Skip to contentSkip to conversation

net: altera: Handle dma_set_coherent_mask error codes

PATCH In review Denis Kirjanov 2 participants 2 messages Jul 14, 2022 – Jul 15, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: altera: Handle dma_set_coherent_mask error codes

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")
---
 drivers/net/ethernet/altera/altera_tse_main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/altera/altera_tse_main.c +6 -2
index 8c5828582c21..7773d978321a 100644
@@ -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;
Signature · 1 line
2.16.4
maintainer
#1 lore raw
Quoted 19 lines · 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")
---
 drivers/net/ethernet/altera/altera_tse_main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/altera/altera_tse_main.c +1 -1
index 8c5828582c21..7773d978321a 100644
@@ -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));

drivers/net/ethernet/altera/altera_tse_main.c static int altera_tse_probe(struct platform_device *pdev) · line 1452

Quoted 10 lines
drivers/net/ethernet/altera/altera_tse_main.c +5 -1
+		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.