Subject: Re: [net-next 08/13] i40e/i40evf: fix error checking path

From: Sergei Shtylyov <[email-masked]>
Date: Tue, 01 Apr 2014 16:14:36 +0400

Hello.

On 01-04-2014 3:34, Jeff Kirsher wrote:

> From: Jean Sacren <[email-masked]>

> The commit 6494294f277fd ("i40e/i40evf: Use
> dma_set_mask_and_coherent") uses dma_set_mask_and_coherent() to
> replace dma_set_coherent_mask() for the benefit of return error.
> The conversion brings some confusion in error checking as whether
> against DMA_BIT_MASK(64) or DMA_BIT_MASK(32). For one, if error is
> zero, the check will be against DMA_BIT_MASK(64) twice.

    So what?

> Fix this
> error checking by binding the check to the pertinent one.

    There's nothing wrong with the current code. I don't know what you're 
fixing here.

> Cc: Mitch Williams <[email-masked]>
> Signed-off-by: Jean Sacren <[email-masked]>
> Tested-by: Kavindya Deegala <[email-masked]>
> Signed-off-by: Jeff Kirsher <[email-masked]>
> ---
>   drivers/net/ethernet/intel/i40e/i40e_main.c     | 11 ++++++-----
>   drivers/net/ethernet/intel/i40evf/i40evf_main.c | 11 ++++++-----
>   2 files changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index a1ec793..861b722 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -8091,12 +8091,13 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>
>   	/* 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;
> +		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;
> +		}
>   	}
>
>   	/* set up pci connections */
> diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
> index 51c84c1..e35e66f 100644
> --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
> +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
> @@ -2191,12 +2191,13 @@ static int i40evf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>   		return err;
>
>   	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;
> +		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;
> +		}
>   	}
>
>   	err = pci_request_regions(pdev, i40evf_driver_name);
>

WBR, Sergei