diff mbox series

[net-next] net: dsa: felix: the switch does not support DMA

Message ID 20210109203415.2120142-1-olteanv@gmail.com (mailing list archive)
State Accepted
Delegated to: Netdev Maintainers
Headers show
Series [net-next] net: dsa: felix: the switch does not support DMA | expand

Checks

Context Check Description
netdev/cover_letter success Link
netdev/fixes_present success Link
netdev/patch_count success Link
netdev/tree_selection success Clearly marked for net-next
netdev/subject_prefix success Link
netdev/cc_maintainers warning 4 maintainers not CCed: alexandre.belloni@bootlin.com vladimir.oltean@nxp.com claudiu.manoil@nxp.com UNGLinuxDriver@microchip.com
netdev/source_inline success Was 0 now: 0
netdev/verify_signedoff success Link
netdev/module_param success Was 0 now: 0
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/verify_fixes success Link
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 27 lines checked
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/header_inline success Link
netdev/stable success Stable not CCed

Commit Message

Vladimir Oltean Jan. 9, 2021, 8:34 p.m. UTC 
From: Vladimir Oltean <vladimir.oltean@nxp.com>

The code that sets the DMA mask to 64 bits is bogus, it is taken from
the enetc driver together with the rest of the PCI probing boilerplate.

Since this patch is touching the error path to delete err_dma, let's
also change the err_alloc_felix label which was incorrect. The kzalloc
failure does not need a kfree, but it doesn't hurt either, since kfree
works with NULL pointers.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/dsa/ocelot/felix_vsc9959.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

Comments

Florian Fainelli Jan. 10, 2021, 1:24 a.m. UTC | #1 
On 1/9/2021 12:34 PM, Vladimir Oltean wrote:
> From: Vladimir Oltean <vladimir.oltean@nxp.com>
> 
> The code that sets the DMA mask to 64 bits is bogus, it is taken from
> the enetc driver together with the rest of the PCI probing boilerplate.
> 
> Since this patch is touching the error path to delete err_dma, let's
> also change the err_alloc_felix label which was incorrect. The kzalloc
> failure does not need a kfree, but it doesn't hurt either, since kfree
> works with NULL pointers.
> 
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Jakub Kicinski Jan. 12, 2021, 12:17 a.m. UTC | #2 
On Sat, 9 Jan 2021 17:24:39 -0800 Florian Fainelli wrote:
> On 1/9/2021 12:34 PM, Vladimir Oltean wrote:
> > From: Vladimir Oltean <vladimir.oltean@nxp.com>
> > 
> > The code that sets the DMA mask to 64 bits is bogus, it is taken from
> > the enetc driver together with the rest of the PCI probing boilerplate.
> > 
> > Since this patch is touching the error path to delete err_dma, let's
> > also change the err_alloc_felix label which was incorrect. The kzalloc
> > failure does not need a kfree, but it doesn't hurt either, since kfree
> > works with NULL pointers.
> > 
> > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>  
> 
> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

Applied, thanks!
diff mbox series

Patch

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 2e5bbdca5ea4..a87597eef8cf 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -1408,17 +1408,6 @@  static int felix_pci_probe(struct pci_dev *pdev,
 		goto err_pci_enable;
 	}
 
-	/* set up for high or low dma */
-	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
-	if (err) {
-		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
-		if (err) {
-			dev_err(&pdev->dev,
-				"DMA configuration failed: 0x%x\n", err);
-			goto err_dma;
-		}
-	}
-
 	felix = kzalloc(sizeof(struct felix), GFP_KERNEL);
 	if (!felix) {
 		err = -ENOMEM;
@@ -1474,9 +1463,8 @@  static int felix_pci_probe(struct pci_dev *pdev,
 	kfree(ds);
 err_alloc_ds:
 err_alloc_irq:
-err_alloc_felix:
 	kfree(felix);
-err_dma:
+err_alloc_felix:
 	pci_disable_device(pdev);
 err_pci_enable:
 	return err;