audio ok

hc

2023-12-11 223293205a7265c8b02882461ba8996650048ade

 kernel/drivers/net/ethernet/intel/e1000e/80003es2lan.c
..
..
@@ -680,7 +680,7 @@
680
680
 	ew32(TCTL, E1000_TCTL_PSP);
681
681
 	e1e_flush();
682
682
 
683
-	usleep_range(10000, 20000);
683
+	usleep_range(10000, 11000);
684
684
 
685
685
 	ctrl = er32(CTRL);
686
686
 
..
..
@@ -696,11 +696,16 @@
696
696
 	ret_val =
697
697
 	    e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
698
698
 					    &kum_reg_data);
699
-	if (ret_val)
700
-		return ret_val;
701
-	kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
702
-	e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
703
-					 kum_reg_data);
699
+	if (!ret_val) {
700
+		kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
701
+		ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
702
+						 E1000_KMRNCTRLSTA_INBAND_PARAM,
703
+						 kum_reg_data);
704
+		if (ret_val)
705
+			e_dbg("Error disabling far-end loopback\n");
706
+	} else {
707
+		e_dbg("Error disabling far-end loopback\n");
708
+	}
704
709
 
705
710
 	ret_val = e1000e_get_auto_rd_done(hw);
706
711
 	if (ret_val)
..
..
@@ -754,11 +759,19 @@
754
759
 		return ret_val;
755
760
 
756
761
 	/* Disable IBIST slave mode (far-end loopback) */
757
-	e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
758
-					&kum_reg_data);
759
-	kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
760
-	e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
761
-					 kum_reg_data);
762
+	ret_val =
763
+	    e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
764
+					    &kum_reg_data);
765
+	if (!ret_val) {
766
+		kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
767
+		ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
768
+						 E1000_KMRNCTRLSTA_INBAND_PARAM,
769
+						 kum_reg_data);
770
+		if (ret_val)
771
+			e_dbg("Error disabling far-end loopback\n");
772
+	} else {
773
+		e_dbg("Error disabling far-end loopback\n");
774
+	}
762
775
 
763
776
 	/* Set the transmit descriptor write-back policy */
764
777
 	reg_data = er32(TXDCTL(0));
..
..
@@ -1059,7 +1072,6 @@
1059
1072
 /**
1060
1073
  *  e1000_cfg_on_link_up_80003es2lan - es2 link configuration after link-up
1061
1074
  *  @hw: pointer to the HW structure
1062
- *  @duplex: current duplex setting
1063
1075
  *
1064
1076
  *  Configure the KMRN interface by applying last minute quirks for
1065
1077
  *  10/100 operation.