Module Name:    src
Committed By:   msaitoh
Date:           Wed Jan 23 09:01:25 UTC 2019

Modified Files:
        src/sys/dev/pci/ixgbe: ixgbe.c

Log Message:
 Call ixgbe_init_swfw_semaphore(hw) before calling ixgbe_check_wol_support()
because ixgbe_check_wol_support()->ixgbe_check_wol_support()->
ixgbe_get_device_caps() accesses semaphore.


To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/sys/dev/pci/ixgbe/ixgbe.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.171 src/sys/dev/pci/ixgbe/ixgbe.c:1.172
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.171	Wed Jan 23 06:56:19 2019
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Wed Jan 23 09:01:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.171 2019/01/23 06:56:19 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.172 2019/01/23 09:01:24 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -876,6 +876,9 @@ ixgbe_attach(device_t parent, device_t d
 	} else
 		adapter->num_segs = IXGBE_82598_SCATTER;
 
+	/* Ensure SW/FW semaphore is free */
+	ixgbe_init_swfw_semaphore(hw);
+
 	hw->mac.ops.set_lan_id(hw);
 	ixgbe_init_device_features(adapter);
 
@@ -902,9 +905,6 @@ ixgbe_attach(device_t parent, device_t d
 		ixgbe_check_fan_failure(adapter, esdp, FALSE);
 	}
 
-	/* Ensure SW/FW semaphore is free */
-	ixgbe_init_swfw_semaphore(hw);
-
 	/* Enable EEE power saving */
 	if (adapter->feat_en & IXGBE_FEATURE_EEE)
 		hw->mac.ops.setup_eee(hw, TRUE);

Reply via email to