[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <9FB481EF4C70734186A21A64437F637C02A10E5607@nxexch.unminc.com>
Date: Tue, 24 Feb 2009 00:13:26 -0800
From: Dhananjay Phadke <dhananjay@...xen.com>
To: Dhananjay Phadke <dhananjay@...xen.com>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
CC: "davem@...emloft.net" <davem@...emloft.net>
Subject: RE: [PATCH NEXT 1/5] netxen: fix physical port mapping
Dave,
Please hold off this 5 patch series. I have two critical bug fixes that take priority and will probably clash the pci probe re-factoring patch.
Thanks,
-Dhananjay
________________________________________
From: Dhananjay Phadke [dhananjay@...xen.com]
Sent: Sunday, February 22, 2009 11:42 PM
To: netdev@...r.kernel.org
Cc: davem@...emloft.net
Subject: [PATCH NEXT 1/5] netxen: fix physical port mapping
The PCI function to physical port mapping is valid only for
old firmware. New firmware (4.0.0+) abstracts this.
So driver should never try to access phy using invalid
mapping.
Signed-off-by: Dhananjay Phadke <dhananjay@...xen.com>
---
drivers/net/netxen/netxen_nic_main.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 7401779..f1811ca 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -796,9 +796,12 @@ skip_doorbell:
* See if the firmware gave us a virtual-physical port mapping.
*/
adapter->physical_port = adapter->portnum;
- i = adapter->pci_read_normalize(adapter, CRB_V2P(adapter->portnum));
- if (i != 0x55555555)
- adapter->physical_port = i;
+ if (adapter->fw_major < 4) {
+ i = adapter->pci_read_normalize(adapter,
+ CRB_V2P(adapter->portnum));
+ if (i != 0x55555555)
+ adapter->physical_port = i;
+ }
adapter->flags &= ~(NETXEN_NIC_MSI_ENABLED | NETXEN_NIC_MSIX_ENABLED);
--
1.6.0.2
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists