From patchwork Sat Mar 3 15:47:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: santosh nayak X-Patchwork-Id: 144433 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 57E681007D4 for ; Sun, 4 Mar 2012 02:49:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752867Ab2CCPsq (ORCPT ); Sat, 3 Mar 2012 10:48:46 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:34242 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750968Ab2CCPso (ORCPT ); Sat, 3 Mar 2012 10:48:44 -0500 Received: by pbcun15 with SMTP id un15so1207942pbc.19 for ; Sat, 03 Mar 2012 07:48:44 -0800 (PST) Received-SPF: pass (google.com: domain of santoshprasadnayak@gmail.com designates 10.68.225.194 as permitted sender) client-ip=10.68.225.194; Authentication-Results: mr.google.com; spf=pass (google.com: domain of santoshprasadnayak@gmail.com designates 10.68.225.194 as permitted sender) smtp.mail=santoshprasadnayak@gmail.com; dkim=pass header.i=santoshprasadnayak@gmail.com Received: from mr.google.com ([10.68.225.194]) by 10.68.225.194 with SMTP id rm2mr28451832pbc.95.1330789724049 (num_hops = 1); Sat, 03 Mar 2012 07:48:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=hWGMCauHblesZt7k72tDZfTXMnpVncMIsQaX+RaKvR8=; b=Ww4z5+JwOmXLAPL5qkb4PH7mLNujbVDij+dmO+jdo6kRPhalWytz7c27LjJv1VrXUR CULksFDyyuJKfD8XMb7RTYBy6A15LedScXPWS20BRmweN3KC2cyqNpNlYh6p4uOK57id svdtCBXDqedE1cyH84MiRrZCK0vNtLkZDf9oKl2jQtBuktzqEx3YGTqxTTH4Ko9wN7q/ ZHEyQQwRYf8lKerIaT1OwOg3FOOHXeHUmVYetinTS9zlF/VHp5cDT+f+cqaRl2jNkjbo yEp3X6bumnwRhB3km1pH1Ouf+T5GV5OZPjya/s3T90Utj14YOBPFUDrtXVNlRHFneL1s FfcQ== Received: by 10.68.225.194 with SMTP id rm2mr24053799pbc.95.1330789723877; Sat, 03 Mar 2012 07:48:43 -0800 (PST) Received: from localhost.localdomain ([115.118.150.172]) by mx.google.com with ESMTPS id ko12sm8068795pbb.52.2012.03.03.07.48.40 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 03 Mar 2012 07:48:43 -0800 (PST) From: santosh nayak To: sony.chacko@qlogic.com Cc: rajesh.borundia@qlogic.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Santosh Nayak Subject: [PATCH 3/3] netxen: qlogic ethernet : Fix Endian Bug. Date: Sat, 3 Mar 2012 21:17:43 +0530 Message-Id: <1330789663-30481-1-git-send-email-santoshprasadnayak@gmail.com> X-Mailer: git-send-email 1.7.4.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Santosh Nayak Fix endian bug. Signed-off-by: Santosh Nayak --- drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 4 ++-- drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 12 +++++++----- .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h index 2eeac32..b5de8a7 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h @@ -954,7 +954,7 @@ typedef struct nx_mac_list_s { struct nx_vlan_ip_list { struct list_head list; - u32 ip_addr; + __be32 ip_addr; }; /* @@ -1780,7 +1780,7 @@ int netxen_process_rcv_ring(struct nx_host_sds_ring *sds_ring, int max); void netxen_p3_free_mac_list(struct netxen_adapter *adapter); int netxen_config_intr_coalesce(struct netxen_adapter *adapter); int netxen_config_rss(struct netxen_adapter *adapter, int enable); -int netxen_config_ipaddr(struct netxen_adapter *adapter, u32 ip, int cmd); +int netxen_config_ipaddr(struct netxen_adapter *adapter, __be32 ip, int cmd); int netxen_linkevent_request(struct netxen_adapter *adapter, int enable); void netxen_advert_link_change(struct netxen_adapter *adapter, int linkup); void netxen_pci_camqm_read_2M(struct netxen_adapter *, u64, u64 *); diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c index 6f37470..0f81287 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c @@ -909,10 +909,11 @@ int netxen_config_rss(struct netxen_adapter *adapter, int enable) return rv; } -int netxen_config_ipaddr(struct netxen_adapter *adapter, u32 ip, int cmd) +int netxen_config_ipaddr(struct netxen_adapter *adapter, __be32 ip, int cmd) { nx_nic_req_t req; u64 word; + u64 ip_addr; int rv; memset(&req, 0, sizeof(nx_nic_req_t)); @@ -922,7 +923,8 @@ int netxen_config_ipaddr(struct netxen_adapter *adapter, u32 ip, int cmd) req.req_hdr = cpu_to_le64(word); req.words[0] = cpu_to_le64(cmd); - req.words[1] = cpu_to_le64(ip); + ip_addr = be32_to_cpu(ip); + *(__be64 *)&req.words[1] = cpu_to_be64(ip_addr); rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); if (rv != 0) { @@ -1050,7 +1052,7 @@ int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 *mac) if (netxen_get_flash_block(adapter, offset, sizeof(u64), pmac) == -1) return -1; - if (*mac == cpu_to_le64(~0ULL)) { + if (*mac == ~0ULL) { offset = NX_OLD_MAC_ADDR_OFFSET + (adapter->portnum * sizeof(u64)); @@ -1059,7 +1061,7 @@ int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 *mac) offset, sizeof(u64), pmac) == -1) return -1; - if (*mac == cpu_to_le64(~0ULL)) + if (*mac == ~0ULL) return -1; } return 0; @@ -2178,7 +2180,7 @@ lock_try: NX_WR_DUMP_REG(FLASH_ROM_WINDOW, adapter->ahw.pci_base0, waddr); raddr = FLASH_ROM_DATA + (fl_addr & 0x0000FFFF); NX_RD_DUMP_REG(raddr, adapter->ahw.pci_base0, &val); - *data_buff++ = cpu_to_le32(val); + *data_buff++ = val; fl_addr += sizeof(val); } readl((void __iomem *)(adapter->ahw.pci_base0 + NX_FLASH_SEM2_ULK)); diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 8dc4a134..70783b4 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c @@ -818,7 +818,7 @@ netxen_check_options(struct netxen_adapter *adapter) adapter->driver_mismatch = 1; return; } - ptr32[i] = cpu_to_le32(val); + ptr32[i] = val; offset += sizeof(u32); }