update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/mmc/host/sdhci-of-esdhc.c
..
..
@@ -126,6 +126,7 @@
126
126
 			return ret;
127
127
 		}
128
128
 	}
129
+
129
130
 	/*
130
131
 	 * The DAT[3:0] line signal levels and the CMD line signal level are
131
132
 	 * not compatible with standard SDHC register. The line signal levels
..
..
@@ -137,6 +138,16 @@
137
138
 		ret = value & 0x000fffff;
138
139
 		ret |= (value >> 4) & SDHCI_DATA_LVL_MASK;
139
140
 		ret |= (value << 1) & SDHCI_CMD_LVL;
141
+
142
+		/*
143
+		 * Some controllers have unreliable Data Line Active
144
+		 * bit for commands with busy signal. This affects
145
+		 * Command Inhibit (data) bit. Just ignore it since
146
+		 * MMC core driver has already polled card status
147
+		 * with CMD13 after any command with busy siganl.
148
+		 */
149
+		if (esdhc->quirk_ignore_data_inhibit)
150
+			ret &= ~SDHCI_DATA_INHIBIT;
140
151
 		return ret;
141
152
 	}
142
153
 
..
..
@@ -148,19 +159,6 @@
148
159
 	if (spec_reg == SDHCI_CAPABILITIES_1) {
149
160
 		ret = value & ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_SDR104 |
150
161
 				SDHCI_SUPPORT_DDR50);
151
-		return ret;
152
-	}
153
-
154
-	/*
155
-	 * Some controllers have unreliable Data Line Active
156
-	 * bit for commands with busy signal. This affects
157
-	 * Command Inhibit (data) bit. Just ignore it since
158
-	 * MMC core driver has already polled card status
159
-	 * with CMD13 after any command with busy siganl.
160
-	 */
161
-	if ((spec_reg == SDHCI_PRESENT_STATE) &&
162
-	(esdhc->quirk_ignore_data_inhibit == true)) {
163
-		ret = value & ~SDHCI_DATA_INHIBIT;
164
162
 		return ret;
165
163
 	}
166
164