update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
..
..
@@ -71,6 +71,8 @@
71
71
 static void hclge_sync_mac_table(struct hclge_dev *hdev);
72
72
 static void hclge_restore_hw_table(struct hclge_dev *hdev);
73
73
 static void hclge_sync_promisc_mode(struct hclge_dev *hdev);
74
+static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret,
75
+				      int wait_cnt);
74
76
 
75
77
 static struct hnae3_ae_algo ae_algo;
76
78
 
..
..
@@ -3123,8 +3125,13 @@
3123
3125
 static void hclge_clear_event_cause(struct hclge_dev *hdev, u32 event_type,
3124
3126
 				    u32 regclr)
3125
3127
 {
3128
+#define HCLGE_IMP_RESET_DELAY		5
3129
+
3126
3130
 	switch (event_type) {
3127
3131
 	case HCLGE_VECTOR0_EVENT_RST:
3132
+		if (regclr == BIT(HCLGE_VECTOR0_IMPRESET_INT_B))
3133
+			mdelay(HCLGE_IMP_RESET_DELAY);
3134
+
3128
3135
 		hclge_write_dev(&hdev->hw, HCLGE_MISC_RESET_STS_REG, regclr);
3129
3136
 		break;
3130
3137
 	case HCLGE_VECTOR0_EVENT_MBX:
..
..
@@ -6558,6 +6565,8 @@
6558
6565
 
6559
6566
 static void hclge_cfg_mac_mode(struct hclge_dev *hdev, bool enable)
6560
6567
 {
6568
+#define HCLGE_LINK_STATUS_WAIT_CNT  3
6569
+
6561
6570
 	struct hclge_desc desc;
6562
6571
 	struct hclge_config_mac_mode_cmd *req =
6563
6572
 		(struct hclge_config_mac_mode_cmd *)desc.data;
..
..
@@ -6582,9 +6591,15 @@
6582
6591
 	req->txrx_pad_fcs_loop_en = cpu_to_le32(loop_en);
6583
6592
 
6584
6593
 	ret = hclge_cmd_send(&hdev->hw, &desc, 1);
6585
-	if (ret)
6594
+	if (ret) {
6586
6595
 		dev_err(&hdev->pdev->dev,
6587
6596
 			"mac enable fail, ret =%d.\n", ret);
6597
+		return;
6598
+	}
6599
+
6600
+	if (!enable)
6601
+		hclge_mac_link_status_wait(hdev, HCLGE_LINK_STATUS_DOWN,
6602
+					   HCLGE_LINK_STATUS_WAIT_CNT);
6588
6603
 }
6589
6604
 
6590
6605
 static int hclge_config_switch_param(struct hclge_dev *hdev, int vfid,
..
..
@@ -6647,10 +6662,9 @@
6647
6662
 	} while (++i < HCLGE_PHY_LINK_STATUS_NUM);
6648
6663
 }
6649
6664
 
6650
-static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret)
6665
+static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret,
6666
+				      int wait_cnt)
6651
6667
 {
6652
-#define HCLGE_MAC_LINK_STATUS_NUM  100
6653
-
6654
6668
 	int link_status;
6655
6669
 	int i = 0;
6656
6670
 	int ret;
..
..
@@ -6663,13 +6677,15 @@
6663
6677
 			return 0;
6664
6678
 
6665
6679
 		msleep(HCLGE_LINK_STATUS_MS);
6666
-	} while (++i < HCLGE_MAC_LINK_STATUS_NUM);
6680
+	} while (++i < wait_cnt);
6667
6681
 	return -EBUSY;
6668
6682
 }
6669
6683
 
6670
6684
 static int hclge_mac_phy_link_status_wait(struct hclge_dev *hdev, bool en,
6671
6685
 					  bool is_phy)
6672
6686
 {
6687
+#define HCLGE_MAC_LINK_STATUS_NUM  100
6688
+
6673
6689
 	int link_ret;
6674
6690
 
6675
6691
 	link_ret = en ? HCLGE_LINK_STATUS_UP : HCLGE_LINK_STATUS_DOWN;
..
..
@@ -6677,7 +6693,8 @@
6677
6693
 	if (is_phy)
6678
6694
 		hclge_phy_link_status_wait(hdev, link_ret);
6679
6695
 
6680
-	return hclge_mac_link_status_wait(hdev, link_ret);
6696
+	return hclge_mac_link_status_wait(hdev, link_ret,
6697
+					  HCLGE_MAC_LINK_STATUS_NUM);
6681
6698
 }
6682
6699
 
6683
6700
 static int hclge_set_app_loopback(struct hclge_dev *hdev, bool en)
..
..
@@ -7023,12 +7040,15 @@
7023
7040
 	/* If it is not PF reset or FLR, the firmware will disable the MAC,
7024
7041
 	 * so it only need to stop phy here.
7025
7042
 	 */
7026
-	if (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state) &&
7027
-	    hdev->reset_type != HNAE3_FUNC_RESET &&
7028
-	    hdev->reset_type != HNAE3_FLR_RESET) {
7029
-		hclge_mac_stop_phy(hdev);
7030
-		hclge_update_link_status(hdev);
7031
-		return;
7043
+	if (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state)) {
7044
+		hclge_pfc_pause_en_cfg(hdev, HCLGE_PFC_TX_RX_DISABLE,
7045
+				       HCLGE_PFC_DISABLE);
7046
+		if (hdev->reset_type != HNAE3_FUNC_RESET &&
7047
+		    hdev->reset_type != HNAE3_FLR_RESET) {
7048
+			hclge_mac_stop_phy(hdev);
7049
+			hclge_update_link_status(hdev);
7050
+			return;
7051
+		}
7032
7052
 	}
7033
7053
 
7034
7054
 	for (i = 0; i < handle->kinfo.num_tqps; i++)
..
..
@@ -7835,7 +7855,7 @@
7835
7855
 	if (mac_type == HCLGE_MAC_ADDR_UC) {
7836
7856
 		if (is_all_added)
7837
7857
 			vport->overflow_promisc_flags &= ~HNAE3_OVERFLOW_UPE;
7838
-		else
7858
+		else if (hclge_is_umv_space_full(vport, true))
7839
7859
 			vport->overflow_promisc_flags |= HNAE3_OVERFLOW_UPE;
7840
7860
 	} else {
7841
7861
 		if (is_all_added)