From patchwork Wed Jan 21 05:50:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harvey Harrison X-Patchwork-Id: 19585 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.176.167]) by ozlabs.org (Postfix) with ESMTP id A63EEDDED4 for ; Wed, 21 Jan 2009 16:50:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752714AbZAUFu4 (ORCPT ); Wed, 21 Jan 2009 00:50:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752532AbZAUFu4 (ORCPT ); Wed, 21 Jan 2009 00:50:56 -0500 Received: from wf-out-1314.google.com ([209.85.200.172]:24781 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751886AbZAUFux (ORCPT ); Wed, 21 Jan 2009 00:50:53 -0500 Received: by wf-out-1314.google.com with SMTP id 27so4192261wfd.4 for ; Tue, 20 Jan 2009 21:50:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=MKobx1EHHotqq5oNWpfvJzxJJbn4pskxnCbb3fzpI7c=; b=KXbWvcT9ea6V3XShwOFIGG8vqywJBVeGNknVq5FrtWMz1GIJGPg9S/BI5nH62zNSfX A76RDMsgYzl5HaQYQ7AOBeNhrOC7b65ls90Z7PpbKOErWu8nFS1uSfibUThfNNAcWAgG QCL1xZHuZQNJGMzQDDJgM7rZ9wDm63HrWatOI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=LwaeKLVPCKeWjWNPh3aS9jmFFoHN8YVh55yfdx7dRIfkWBjuBfdDcNudSOEeJo54tY zR0JcW++SALgKUguP3mmRFJZS+QEnq5UlcPkZ+Cy8HPPZ9bFq2dtZ6dUrhMx8CqZjeQ8 gsuXZ2xwhCpbTpe/GafiPM5IDNBR8vGA5A5co= Received: by 10.142.210.8 with SMTP id i8mr2521101wfg.114.1232517052701; Tue, 20 Jan 2009 21:50:52 -0800 (PST) Received: from ?192.168.1.101? (216-19-190-48.dyn.novuscom.net [216.19.190.48]) by mx.google.com with ESMTPS id 24sm14384076wfc.22.2009.01.20.21.50.52 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 20 Jan 2009 21:50:52 -0800 (PST) Subject: [PATCH 2/9] bnx2x: annotate struct eth_tx_db_data From: Harvey Harrison To: Eilon Greenstein Cc: linux-netdev Date: Tue, 20 Jan 2009 21:50:47 -0800 Message-Id: <1232517047.9701.20.camel@brick> Mime-Version: 1.0 X-Mailer: Evolution 2.24.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Always treated as little-endian values, annotate as such, use the leXX_add_cpu helpers rather than opencoded byteswapping. Signed-off-by: Harvey Harrison --- drivers/net/bnx2x_hsi.h | 4 ++-- drivers/net/bnx2x_main.c | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x_hsi.h index efd7644..a3c1068 100644 --- a/drivers/net/bnx2x_hsi.h +++ b/drivers/net/bnx2x_hsi.h @@ -2355,8 +2355,8 @@ struct eth_spe { * doorbell data in host memory */ struct eth_tx_db_data { - u32 packets_prod; - u16 bds_prod; + __le32 packets_prod; + __le16 bds_prod; u16 reserved; }; diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 897f370..2f8d64c 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -8774,11 +8774,9 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up) wmb(); - fp->hw_tx_prods->bds_prod = - cpu_to_le16(le16_to_cpu(fp->hw_tx_prods->bds_prod) + 1); + le16_add_cpu(&fp->hw_tx_prods->bds_prod, 1); mb(); /* FW restriction: must not reorder writing nbd and packets */ - fp->hw_tx_prods->packets_prod = - cpu_to_le32(le32_to_cpu(fp->hw_tx_prods->packets_prod) + 1); + le32_add_cpu(&fp->hw_tx_prods->packets_prod, 1); DOORBELL(bp, fp->index, 0); mmiowb(); @@ -9774,11 +9772,9 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) */ wmb(); - fp->hw_tx_prods->bds_prod = - cpu_to_le16(le16_to_cpu(fp->hw_tx_prods->bds_prod) + nbd); + le16_add_cpu(&fp->hw_tx_prods->bds_prod, nbd); mb(); /* FW restriction: must not reorder writing nbd and packets */ - fp->hw_tx_prods->packets_prod = - cpu_to_le32(le32_to_cpu(fp->hw_tx_prods->packets_prod) + 1); + le32_add_cpu(&fp->hw_tx_prods->packets_prod, 1); DOORBELL(bp, fp->index, 0); mmiowb();