kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
..
..
@@ -306,7 +306,7 @@
306
306
 		hw->phy.phy_semaphore_mask = IXGBE_GSSR_SHARED_I2C_SM;
307
307
 		ixgbe_setup_mux_ctl(hw);
308
308
 		ixgbe_check_cs4227(hw);
309
-		/* Fallthrough */
309
+		fallthrough;
310
310
 	case IXGBE_DEV_ID_X550EM_A_SFP_N:
311
311
 		return ixgbe_identify_module_generic(hw);
312
312
 	case IXGBE_DEV_ID_X550EM_X_KX4:
..
..
@@ -325,7 +325,7 @@
325
325
 			hw->phy.phy_semaphore_mask = IXGBE_GSSR_PHY1_SM;
326
326
 		else
327
327
 			hw->phy.phy_semaphore_mask = IXGBE_GSSR_PHY0_SM;
328
-		/* Fallthrough */
328
+		fallthrough;
329
329
 	case IXGBE_DEV_ID_X550EM_X_10G_T:
330
330
 		return ixgbe_identify_phy_generic(hw);
331
331
 	case IXGBE_DEV_ID_X550EM_X_1G_T:
..
..
@@ -1245,6 +1245,20 @@
1245
1245
 	hw->mac.ops.set_lan_id(hw);
1246
1246
 
1247
1247
 	return 0;
1248
+}
1249
+
1250
+/**
1251
+ * ixgbe_fw_recovery_mode - Check FW NVM recovery mode
1252
+ * @hw: pointer t hardware structure
1253
+ *
1254
+ * Returns true if in FW NVM recovery mode.
1255
+ */
1256
+static bool ixgbe_fw_recovery_mode_X550(struct ixgbe_hw *hw)
1257
+{
1258
+	u32 fwsm;
1259
+
1260
+	fwsm = IXGBE_READ_REG(hw, IXGBE_FWSM(hw));
1261
+	return !!(fwsm & IXGBE_FWSM_FW_NVM_RECOVERY_MODE);
1248
1262
 }
1249
1263
 
1250
1264
 /** ixgbe_disable_rx_x550 - Disable RX unit
..
..
@@ -2289,7 +2303,7 @@
2289
2303
 					break;
2290
2304
 				}
2291
2305
 			}
2292
-			/* fall through */
2306
+			fallthrough;
2293
2307
 		default:
2294
2308
 			*speed = IXGBE_LINK_SPEED_10GB_FULL |
2295
2309
 				 IXGBE_LINK_SPEED_1GB_FULL;
..
..
@@ -2871,7 +2885,7 @@
2871
2885
 		 * through to the fc_full statement.  Later, we will
2872
2886
 		 * disable the adapter's ability to send PAUSE frames.
2873
2887
 		 */
2874
-		/* Fallthrough */
2888
+		fallthrough;
2875
2889
 	case ixgbe_fc_full:
2876
2890
 		pause = true;
2877
2891
 		asm_dir = true;
..
..
@@ -3270,7 +3284,7 @@
3270
3284
 	case IXGBE_DEV_ID_X550EM_A_SGMII:
3271
3285
 	case IXGBE_DEV_ID_X550EM_A_SGMII_L:
3272
3286
 		hw->phy.type = ixgbe_phy_sgmii;
3273
-		/* Fallthrough */
3287
+		fallthrough;
3274
3288
 	case IXGBE_DEV_ID_X550EM_X_KR:
3275
3289
 	case IXGBE_DEV_ID_X550EM_X_KX4:
3276
3290
 	case IXGBE_DEV_ID_X550EM_X_XFI:
..
..
@@ -3821,6 +3835,7 @@
3821
3835
 	.enable_rx_buff			= &ixgbe_enable_rx_buff_generic, \
3822
3836
 	.get_thermal_sensor_data	= NULL, \
3823
3837
 	.init_thermal_sensor_thresh	= NULL, \
3838
+	.fw_recovery_mode		= &ixgbe_fw_recovery_mode_X550, \
3824
3839
 	.enable_rx			= &ixgbe_enable_rx_generic, \
3825
3840
 	.disable_rx			= &ixgbe_disable_rx_x550, \
3826
3841