Patchwork netxen: avoid using reset_devices as it may become obsolete

login
register
mail settings
Submitter amit salecha
Date Nov. 23, 2010, 1:08 p.m.
Message ID <1290517707-8554-1-git-send-email-amit.salecha@qlogic.com>
Download mbox | patch
Permalink /patch/72651/
State Accepted
Delegated to: David Miller
Headers show

Comments

amit salecha - Nov. 23, 2010, 1:08 p.m.
From: Rajesh Borundia <rajesh.borundia@qlogic.com>

In kdump environment do not depend on reset_devices
parameter to reset the device as the parameter may become obsolete.
Instead use an adapter specific mechanism to determine if the device
needs a reset.

Driver maintains a count of number of pci functions probed
and decrements the count when remove handler of that pci function
is called. If the first probe, probe of function 0,
detects the count as non zero then reset the device.

Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
---
 drivers/net/netxen/netxen_nic_main.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
David Miller - Nov. 28, 2010, 6:48 p.m.
From: Amit Kumar Salecha <amit.salecha@qlogic.com>
Date: Tue, 23 Nov 2010 05:08:27 -0800

> From: Rajesh Borundia <rajesh.borundia@qlogic.com>
> 
> In kdump environment do not depend on reset_devices
> parameter to reset the device as the parameter may become obsolete.
> Instead use an adapter specific mechanism to determine if the device
> needs a reset.
> 
> Driver maintains a count of number of pci functions probed
> and decrements the count when remove handler of that pci function
> is called. If the first probe, probe of function 0,
> detects the count as non zero then reset the device.
> 
> Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
> Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index e1d30d7..ceeaac9 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1277,6 +1277,7 @@  netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	int i = 0, err;
 	int pci_func_id = PCI_FUNC(pdev->devfn);
 	uint8_t revision_id;
+	u32 val;
 
 	if (pdev->revision >= NX_P3_A0 && pdev->revision <= NX_P3_B1) {
 		pr_warning("%s: chip revisions between 0x%x-0x%x "
@@ -1352,8 +1353,9 @@  netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 		break;
 	}
 
-	if (reset_devices) {
-		if (adapter->portnum == 0) {
+	if (adapter->portnum == 0) {
+		val = NXRD32(adapter, NX_CRB_DEV_REF_COUNT);
+		if (val != 0xffffffff && val != 0) {
 			NXWR32(adapter, NX_CRB_DEV_REF_COUNT, 0);
 			adapter->need_fw_reset = 1;
 		}