forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf 
 kernel/drivers/net/ethernet/broadcom/tg3.c
....@@ -224,6 +224,7 @@
224224 MODULE_DESCRIPTION("Broadcom Tigon3 ethernet driver");
225225 MODULE_LICENSE("GPL");
226226 MODULE_FIRMWARE(FIRMWARE_TG3);
227
+MODULE_FIRMWARE(FIRMWARE_TG357766);
227228 MODULE_FIRMWARE(FIRMWARE_TG3TSO);
228229 MODULE_FIRMWARE(FIRMWARE_TG3TSO5);
229230 
....@@ -11185,7 +11186,7 @@
1118511186 	rtnl_lock();
1118611187 	tg3_full_lock(tp, 0);
1118711188 
11188
-	if (!netif_running(tp->dev)) {
11189
+	if (tp->pcierr_recovery || !netif_running(tp->dev)) {
1118911190 		tg3_flag_clear(tp, RESET_TASK_PENDING);
1119011191 		tg3_full_unlock(tp);
1119111192 		rtnl_unlock();
....@@ -18179,6 +18180,9 @@
1817918180 
1818018181 	netdev_info(netdev, "PCI I/O error detected\n");
1818118182 
18183
+	/* Want to make sure that the reset task doesn't run */
18184
+	tg3_reset_task_cancel(tp);
18185
+
1818218186 	rtnl_lock();
1818318187 
1818418188 	/* Could be second call or maybe we don't have netdev yet */
....@@ -18194,9 +18198,6 @@
1819418198 	tg3_netif_stop(tp);
1819518199 
1819618200 	tg3_timer_stop(tp);
18197
-
18198
-	/* Want to make sure that the reset task doesn't run */
18199
-	tg3_reset_task_cancel(tp);
1820018201 
1820118202 	netif_device_detach(netdev);
1820218203