From patchwork Mon Jun 10 23:09:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 250404 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DD9792C03D0 for ; Tue, 11 Jun 2013 09:09:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753369Ab3FJXJq (ORCPT ); Mon, 10 Jun 2013 19:09:46 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:41433 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752148Ab3FJXJp (ORCPT ); Mon, 10 Jun 2013 19:09:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Date:Sender:Message-Id:Subject:Cc:To:From:References:In-Reply-To; bh=aqhcn4XPO2cqXJgy5rTlcFKD/BWKHeSL5PgkR5nwU28=; b=hzoPUALdt8/AOz9O97BQDHTqEL/skLvpnJp4UU118vikDLmrtk+5Tgowz/IwovxnPThgdkj4CYhW67dFnL1VOBep8+2NkEoS4p2a72FZiaKeKouSZ5cy/vwvKvvCElRxTY8+aXv2E49iYneuB4dCYMah9mPo+kx8b0E5RGtdzZ4=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd]:33117 helo=rmk-PC.arm.linux.org.uk) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1UmBDa-0007eZ-Sw; Tue, 11 Jun 2013 00:09:42 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1UmBDa-0006Jt-CE; Tue, 11 Jun 2013 00:09:42 +0100 In-Reply-To: <20130610230849.GF18614@n2100.arm.linux.org.uk> References: <20130610230849.GF18614@n2100.arm.linux.org.uk> From: Russell King To: netdev@vger.kernel.org Cc: Rasesh Mody Subject: [PATCH 1/7] NET: brocade/bna/bnad.c: fix 32-bit DMA mask handling Message-Id: Date: Tue, 11 Jun 2013 00:09:42 +0100 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The fallback to 32-bit DMA mask is rather odd: if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) && !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) { *using_dac = true; } else { err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); if (err) { err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); if (err) goto release_regions; } This means we only try and set the coherent DMA mask if we failed to set a 32-bit DMA mask, and only if both fail do we fail the driver. Adjust this so that if either setting fails, we fail the driver - and thereby end up properly setting both the DMA mask and the coherent DMA mask in the fallback case. Signed-off-by: Russell King --- drivers/net/ethernet/brocade/bna/bnad.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index 07f7ef0..15feb8b 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c @@ -3302,12 +3302,11 @@ bnad_pci_init(struct bnad *bnad, *using_dac = true; } else { err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); - if (err) { + if (!err) err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); - if (err) - goto release_regions; - } + if (err) + goto release_regions; *using_dac = false; } pci_set_master(pdev);