netdev - Re: [PATCH net-next 3/7] net: bcmgenet: simplify bcmgenet_init

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 26 Mar 2015 11:34:50 +0900
From:	Jaedon Shin <jaedon.shin@...il.com>
To:	Petri Gynther <pgynther@...gle.com>
Cc:	netdev@...r.kernel.org, davem@...emloft.net, f.fainelli@...il.com
Subject: Re: [PATCH net-next 3/7] net: bcmgenet: simplify bcmgenet_init_dma()


> On Mar 26, 2015, at 4:35 AM, Petri Gynther <pgynther@...gle.com> wrote:
> 
> Do the two kcalloc() calls first, before proceeding into Rx/Tx DMA init.
> Makes the error case handling much simpler.
> 
> Signed-off-by: Petri Gynther <pgynther@...gle.com>
> ---
> drivers/net/ethernet/broadcom/genet/bcmgenet.c | 33 +++++++++++++-------------
> 1 file changed, 17 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> index 550bf98..1c9f9b4 100644
> --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> @@ -2050,9 +2050,6 @@ static int bcmgenet_init_dma(struct bcmgenet_priv *priv)
> 
> 	netif_dbg(priv, hw, priv->dev, "%s\n", __func__);
> 
> -	/* Init rDma */
> -	bcmgenet_rdma_writel(priv, DMA_MAX_BURST_LENGTH, DMA_SCB_BURST_SIZE);
> -
> 	/* Initialize common Rx ring structures */
> 	priv->rx_bds = priv->base + priv->hw_params->rdma_offset;
> 	priv->num_rx_bds = TOTAL_DESC;
> @@ -2066,25 +2063,13 @@ static int bcmgenet_init_dma(struct bcmgenet_priv *priv)
> 		cb->bd_addr = priv->rx_bds + i * DMA_DESC_SIZE;
> 	}
> 
> -	/* Initialize Rx queues */
> -	ret = bcmgenet_init_rx_queues(priv->dev);
> -	if (ret) {
> -		netdev_err(priv->dev, "failed to initialize Rx queues\n");
> -		bcmgenet_free_rx_buffers(priv);
> -		kfree(priv->rx_cbs);
> -		return ret;
> -	}
> -
> -	/* Init tDma */
> -	bcmgenet_tdma_writel(priv, DMA_MAX_BURST_LENGTH, DMA_SCB_BURST_SIZE);
> -
> 	/* Initialize common TX ring structures */
> 	priv->tx_bds = priv->base + priv->hw_params->tdma_offset;
> 	priv->num_tx_bds = TOTAL_DESC;
> 	priv->tx_cbs = kcalloc(priv->num_tx_bds, sizeof(struct enet_cb),
> 			       GFP_KERNEL);
> 	if (!priv->tx_cbs) {
> -		__bcmgenet_fini_dma(priv);

__bcmgenet_fini_dma that may be integrated with bcmgenet_fini_dma not used in bcmgenet_init_dma.

Reviewed-by: Jaedon Shin <jaedon.shin@...il.com>

> +		kfree(priv->rx_cbs);
> 		return -ENOMEM;
> 	}
> 
> @@ -2093,6 +2078,22 @@ static int bcmgenet_init_dma(struct bcmgenet_priv *priv)
> 		cb->bd_addr = priv->tx_bds + i * DMA_DESC_SIZE;
> 	}
> 
> +	/* Init rDma */
> +	bcmgenet_rdma_writel(priv, DMA_MAX_BURST_LENGTH, DMA_SCB_BURST_SIZE);
> +
> +	/* Initialize Rx queues */
> +	ret = bcmgenet_init_rx_queues(priv->dev);
> +	if (ret) {
> +		netdev_err(priv->dev, "failed to initialize Rx queues\n");
> +		bcmgenet_free_rx_buffers(priv);
> +		kfree(priv->rx_cbs);
> +		kfree(priv->tx_cbs);
> +		return ret;
> +	}
> +
> +	/* Init tDma */
> +	bcmgenet_tdma_writel(priv, DMA_MAX_BURST_LENGTH, DMA_SCB_BURST_SIZE);
> +
> 	/* Initialize Tx queues */
> 	bcmgenet_init_tx_queues(priv->dev);
> 
> -- 
> 2.2.0.rc0.207.ga3a616c
> 

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html