From patchwork Mon Mar 5 11:43:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Borundia X-Patchwork-Id: 144665 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 CC08AB6F62 for ; Mon, 5 Mar 2012 22:45:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756758Ab2CELoj (ORCPT ); Mon, 5 Mar 2012 06:44:39 -0500 Received: from ch1ehsobe006.messaging.microsoft.com ([216.32.181.186]:45114 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756594Ab2CELoh convert rfc822-to-8bit (ORCPT ); Mon, 5 Mar 2012 06:44:37 -0500 Received: from mail110-ch1-R.bigfish.com (10.43.68.245) by CH1EHSOBE007.bigfish.com (10.43.70.57) with Microsoft SMTP Server id 14.1.225.23; Mon, 5 Mar 2012 11:44:36 +0000 Received: from mail110-ch1 (localhost [127.0.0.1]) by mail110-ch1-R.bigfish.com (Postfix) with ESMTP id C8FCD2C00A7; Mon, 5 Mar 2012 11:44:36 +0000 (UTC) X-SpamScore: -1 X-BigFish: VPS-1(zz9371Izz1202hzz8275bhz2fh2a8h668h839h944h) X-Forefront-Antispam-Report: CIP:198.70.193.61; KIP:(null); UIP:(null); IPV:NLI; H:avexcashub1.qlogic.com; RD:avexcashub1.qlogic.com; EFVD:NLI Received-SPF: pass (mail110-ch1: domain of qlogic.com designates 198.70.193.61 as permitted sender) client-ip=198.70.193.61; envelope-from=rajesh.borundia@qlogic.com; helo=avexcashub1.qlogic.com ; 1.qlogic.com ; Received: from mail110-ch1 (localhost.localdomain [127.0.0.1]) by mail110-ch1 (MessageSwitch) id 1330947873838419_25265; Mon, 5 Mar 2012 11:44:33 +0000 (UTC) Received: from CH1EHSMHS022.bigfish.com (snatpool3.int.messaging.microsoft.com [10.43.68.228]) by mail110-ch1.bigfish.com (Postfix) with ESMTP id BEB7940045; Mon, 5 Mar 2012 11:44:33 +0000 (UTC) Received: from avexcashub1.qlogic.com (198.70.193.61) by CH1EHSMHS022.bigfish.com (10.43.70.22) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 5 Mar 2012 11:44:29 +0000 Received: from MNEXCASHUB1.qlogic.org (10.33.2.103) by avexcashub1.qlogic.org (10.1.4.161) with Microsoft SMTP Server (TLS) id 8.3.192.1; Mon, 5 Mar 2012 03:44:28 -0800 Received: from MNEXMB1.qlogic.org ([fe80::8516:7839:9549:6996]) by MNEXCASHUB1.qlogic.org ([::1]) with mapi; Mon, 5 Mar 2012 05:44:25 -0600 From: Rajesh Borundia To: santosh nayak , Sony Chacko CC: netdev , linux-kernel , "kernel-janitors@vger.kernel.org" Date: Mon, 5 Mar 2012 05:43:56 -0600 Subject: RE: [PATCH 3/3] netxen: qlogic ethernet : Fix Endian Bug. Thread-Topic: [PATCH 3/3] netxen: qlogic ethernet : Fix Endian Bug. Thread-Index: Acz5VSHJmvk0oJ1XRgSEUi8uNyxIcgBcB2mf Message-ID: <13A253B3F9BEFE43B93C09CF75F63CAA81A886ED40@MNEXMB1.qlogic.org> References: <1330789663-30481-1-git-send-email-santoshprasadnayak@gmail.com> In-Reply-To: <1330789663-30481-1-git-send-email-santoshprasadnayak@gmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-OriginatorOrg: qlogic.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org I will review this and get back to you. Rajesh 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); }