1 |
commit: 7b35ba9085df50794079a74308e8240ed54bc4fb |
2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 11 22:49:26 2020 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 11 22:49:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=7b35ba90 |
7 |
|
8 |
Linux patch 5.4.40 |
9 |
|
10 |
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> |
11 |
|
12 |
0000_README | 4 + |
13 |
1039_linux-5.4.40.patch | 1493 +++++++++++++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 1497 insertions(+) |
15 |
|
16 |
diff --git a/0000_README b/0000_README |
17 |
index ea8edd3..ed1776e 100644 |
18 |
--- a/0000_README |
19 |
+++ b/0000_README |
20 |
@@ -199,6 +199,10 @@ Patch: 1038_linux-5.4.39.patch |
21 |
From: http://www.kernel.org |
22 |
Desc: Linux 5.4.39 |
23 |
|
24 |
+Patch: 1039_linux-5.4.40.patch |
25 |
+From: http://www.kernel.org |
26 |
+Desc: Linux 5.4.40 |
27 |
+ |
28 |
Patch: 1500_XATTR_USER_PREFIX.patch |
29 |
From: https://bugs.gentoo.org/show_bug.cgi?id=470644 |
30 |
Desc: Support for namespace user.pax.* on tmpfs. |
31 |
|
32 |
diff --git a/1039_linux-5.4.40.patch b/1039_linux-5.4.40.patch |
33 |
new file mode 100644 |
34 |
index 0000000..63f8fbd |
35 |
--- /dev/null |
36 |
+++ b/1039_linux-5.4.40.patch |
37 |
@@ -0,0 +1,1493 @@ |
38 |
+diff --git a/Makefile b/Makefile |
39 |
+index ff2b90ddc9bc..6d4fca82529a 100644 |
40 |
+--- a/Makefile |
41 |
++++ b/Makefile |
42 |
+@@ -1,7 +1,7 @@ |
43 |
+ # SPDX-License-Identifier: GPL-2.0 |
44 |
+ VERSION = 5 |
45 |
+ PATCHLEVEL = 4 |
46 |
+-SUBLEVEL = 39 |
47 |
++SUBLEVEL = 40 |
48 |
+ EXTRAVERSION = |
49 |
+ NAME = Kleptomaniac Octopus |
50 |
+ |
51 |
+diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.h |
52 |
+index ba1a444d55b3..68a68147504d 100644 |
53 |
+--- a/arch/hexagon/include/asm/io.h |
54 |
++++ b/arch/hexagon/include/asm/io.h |
55 |
+@@ -171,16 +171,10 @@ static inline void writel(u32 data, volatile void __iomem *addr) |
56 |
+ #define writew_relaxed __raw_writew |
57 |
+ #define writel_relaxed __raw_writel |
58 |
+ |
59 |
+-/* |
60 |
+- * Need an mtype somewhere in here, for cache type deals? |
61 |
+- * This is probably too long for an inline. |
62 |
+- */ |
63 |
+-void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size); |
64 |
++void __iomem *ioremap(unsigned long phys_addr, unsigned long size); |
65 |
++#define ioremap_nocache ioremap |
66 |
++#define ioremap_uc(X, Y) ioremap((X), (Y)) |
67 |
+ |
68 |
+-static inline void __iomem *ioremap(unsigned long phys_addr, unsigned long size) |
69 |
+-{ |
70 |
+- return ioremap_nocache(phys_addr, size); |
71 |
+-} |
72 |
+ |
73 |
+ static inline void iounmap(volatile void __iomem *addr) |
74 |
+ { |
75 |
+diff --git a/arch/hexagon/kernel/hexagon_ksyms.c b/arch/hexagon/kernel/hexagon_ksyms.c |
76 |
+index cf8974beb500..b3dbb472572e 100644 |
77 |
+--- a/arch/hexagon/kernel/hexagon_ksyms.c |
78 |
++++ b/arch/hexagon/kernel/hexagon_ksyms.c |
79 |
+@@ -20,7 +20,7 @@ EXPORT_SYMBOL(__vmgetie); |
80 |
+ EXPORT_SYMBOL(__vmsetie); |
81 |
+ EXPORT_SYMBOL(__vmyield); |
82 |
+ EXPORT_SYMBOL(empty_zero_page); |
83 |
+-EXPORT_SYMBOL(ioremap_nocache); |
84 |
++EXPORT_SYMBOL(ioremap); |
85 |
+ EXPORT_SYMBOL(memcpy); |
86 |
+ EXPORT_SYMBOL(memset); |
87 |
+ |
88 |
+diff --git a/arch/hexagon/mm/ioremap.c b/arch/hexagon/mm/ioremap.c |
89 |
+index 77d8e1e69e9b..b103d83b5fbb 100644 |
90 |
+--- a/arch/hexagon/mm/ioremap.c |
91 |
++++ b/arch/hexagon/mm/ioremap.c |
92 |
+@@ -9,7 +9,7 @@ |
93 |
+ #include <linux/vmalloc.h> |
94 |
+ #include <linux/mm.h> |
95 |
+ |
96 |
+-void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size) |
97 |
++void __iomem *ioremap(unsigned long phys_addr, unsigned long size) |
98 |
+ { |
99 |
+ unsigned long last_addr, addr; |
100 |
+ unsigned long offset = phys_addr & ~PAGE_MASK; |
101 |
+diff --git a/arch/x86/kvm/vmx/ops.h b/arch/x86/kvm/vmx/ops.h |
102 |
+index 09b0937d56b1..19717d0a1100 100644 |
103 |
+--- a/arch/x86/kvm/vmx/ops.h |
104 |
++++ b/arch/x86/kvm/vmx/ops.h |
105 |
+@@ -12,6 +12,7 @@ |
106 |
+ |
107 |
+ #define __ex(x) __kvm_handle_fault_on_reboot(x) |
108 |
+ |
109 |
++asmlinkage void vmread_error(unsigned long field, bool fault); |
110 |
+ __attribute__((regparm(0))) void vmread_error_trampoline(unsigned long field, |
111 |
+ bool fault); |
112 |
+ void vmwrite_error(unsigned long field, unsigned long value); |
113 |
+diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c |
114 |
+index ce1d9048a36d..edad89e58c58 100644 |
115 |
+--- a/drivers/acpi/sleep.c |
116 |
++++ b/drivers/acpi/sleep.c |
117 |
+@@ -979,10 +979,7 @@ static int acpi_s2idle_prepare_late(void) |
118 |
+ |
119 |
+ static void acpi_s2idle_sync(void) |
120 |
+ { |
121 |
+- /* |
122 |
+- * The EC driver uses the system workqueue and an additional special |
123 |
+- * one, so those need to be flushed too. |
124 |
+- */ |
125 |
++ /* The EC driver uses special workqueues that need to be flushed. */ |
126 |
+ acpi_ec_flush_work(); |
127 |
+ acpi_os_wait_events_complete(); /* synchronize Notify handling */ |
128 |
+ } |
129 |
+diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c |
130 |
+index d5b4905e2adb..77cc138d138c 100644 |
131 |
+--- a/drivers/base/swnode.c |
132 |
++++ b/drivers/base/swnode.c |
133 |
+@@ -679,6 +679,13 @@ static void software_node_release(struct kobject *kobj) |
134 |
+ { |
135 |
+ struct swnode *swnode = kobj_to_swnode(kobj); |
136 |
+ |
137 |
++ if (swnode->parent) { |
138 |
++ ida_simple_remove(&swnode->parent->child_ids, swnode->id); |
139 |
++ list_del(&swnode->entry); |
140 |
++ } else { |
141 |
++ ida_simple_remove(&swnode_root_ids, swnode->id); |
142 |
++ } |
143 |
++ |
144 |
+ if (swnode->allocated) { |
145 |
+ property_entries_free(swnode->node->properties); |
146 |
+ kfree(swnode->node); |
147 |
+@@ -844,13 +851,6 @@ void fwnode_remove_software_node(struct fwnode_handle *fwnode) |
148 |
+ if (!swnode) |
149 |
+ return; |
150 |
+ |
151 |
+- if (swnode->parent) { |
152 |
+- ida_simple_remove(&swnode->parent->child_ids, swnode->id); |
153 |
+- list_del(&swnode->entry); |
154 |
+- } else { |
155 |
+- ida_simple_remove(&swnode_root_ids, swnode->id); |
156 |
+- } |
157 |
+- |
158 |
+ kobject_put(&swnode->kobj); |
159 |
+ } |
160 |
+ EXPORT_SYMBOL_GPL(fwnode_remove_software_node); |
161 |
+diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c |
162 |
+index ff81b7cdab71..dce45f7a497d 100644 |
163 |
+--- a/drivers/devfreq/devfreq.c |
164 |
++++ b/drivers/devfreq/devfreq.c |
165 |
+@@ -902,7 +902,9 @@ int devfreq_suspend_device(struct devfreq *devfreq) |
166 |
+ } |
167 |
+ |
168 |
+ if (devfreq->suspend_freq) { |
169 |
++ mutex_lock(&devfreq->lock); |
170 |
+ ret = devfreq_set_target(devfreq, devfreq->suspend_freq, 0); |
171 |
++ mutex_unlock(&devfreq->lock); |
172 |
+ if (ret) |
173 |
+ return ret; |
174 |
+ } |
175 |
+@@ -930,7 +932,9 @@ int devfreq_resume_device(struct devfreq *devfreq) |
176 |
+ return 0; |
177 |
+ |
178 |
+ if (devfreq->resume_freq) { |
179 |
++ mutex_lock(&devfreq->lock); |
180 |
+ ret = devfreq_set_target(devfreq, devfreq->resume_freq, 0); |
181 |
++ mutex_unlock(&devfreq->lock); |
182 |
+ if (ret) |
183 |
+ return ret; |
184 |
+ } |
185 |
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c |
186 |
+index 03930313c263..51263b8d94b1 100644 |
187 |
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c |
188 |
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c |
189 |
+@@ -90,7 +90,8 @@ void amdgpu_pm_acpi_event_handler(struct amdgpu_device *adev) |
190 |
+ adev->pm.ac_power = true; |
191 |
+ else |
192 |
+ adev->pm.ac_power = false; |
193 |
+- if (adev->powerplay.pp_funcs->enable_bapm) |
194 |
++ if (adev->powerplay.pp_funcs && |
195 |
++ adev->powerplay.pp_funcs->enable_bapm) |
196 |
+ amdgpu_dpm_enable_bapm(adev, adev->pm.ac_power); |
197 |
+ mutex_unlock(&adev->pm.mutex); |
198 |
+ } |
199 |
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c |
200 |
+index 3aedc724241e..5bf12a446e95 100644 |
201 |
+--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c |
202 |
++++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c |
203 |
+@@ -2768,15 +2768,6 @@ void core_link_enable_stream( |
204 |
+ CONTROLLER_DP_TEST_PATTERN_VIDEOMODE, |
205 |
+ COLOR_DEPTH_UNDEFINED); |
206 |
+ |
207 |
+- /* This second call is needed to reconfigure the DIG |
208 |
+- * as a workaround for the incorrect value being applied |
209 |
+- * from transmitter control. |
210 |
+- */ |
211 |
+- if (!dc_is_virtual_signal(pipe_ctx->stream->signal)) |
212 |
+- stream->link->link_enc->funcs->setup( |
213 |
+- stream->link->link_enc, |
214 |
+- pipe_ctx->stream->signal); |
215 |
+- |
216 |
+ #ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT |
217 |
+ if (pipe_ctx->stream->timing.flags.DSC) { |
218 |
+ if (dc_is_dp_signal(pipe_ctx->stream->signal) || |
219 |
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c |
220 |
+index 77c14671866c..719597c5d27d 100644 |
221 |
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c |
222 |
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c |
223 |
+@@ -984,6 +984,32 @@ static int init_thermal_controller( |
224 |
+ struct pp_hwmgr *hwmgr, |
225 |
+ const ATOM_PPLIB_POWERPLAYTABLE *powerplay_table) |
226 |
+ { |
227 |
++ hwmgr->thermal_controller.ucType = |
228 |
++ powerplay_table->sThermalController.ucType; |
229 |
++ hwmgr->thermal_controller.ucI2cLine = |
230 |
++ powerplay_table->sThermalController.ucI2cLine; |
231 |
++ hwmgr->thermal_controller.ucI2cAddress = |
232 |
++ powerplay_table->sThermalController.ucI2cAddress; |
233 |
++ |
234 |
++ hwmgr->thermal_controller.fanInfo.bNoFan = |
235 |
++ (0 != (powerplay_table->sThermalController.ucFanParameters & |
236 |
++ ATOM_PP_FANPARAMETERS_NOFAN)); |
237 |
++ |
238 |
++ hwmgr->thermal_controller.fanInfo.ucTachometerPulsesPerRevolution = |
239 |
++ powerplay_table->sThermalController.ucFanParameters & |
240 |
++ ATOM_PP_FANPARAMETERS_TACHOMETER_PULSES_PER_REVOLUTION_MASK; |
241 |
++ |
242 |
++ hwmgr->thermal_controller.fanInfo.ulMinRPM |
243 |
++ = powerplay_table->sThermalController.ucFanMinRPM * 100UL; |
244 |
++ hwmgr->thermal_controller.fanInfo.ulMaxRPM |
245 |
++ = powerplay_table->sThermalController.ucFanMaxRPM * 100UL; |
246 |
++ |
247 |
++ set_hw_cap(hwmgr, |
248 |
++ ATOM_PP_THERMALCONTROLLER_NONE != hwmgr->thermal_controller.ucType, |
249 |
++ PHM_PlatformCaps_ThermalController); |
250 |
++ |
251 |
++ hwmgr->thermal_controller.use_hw_fan_control = 1; |
252 |
++ |
253 |
+ return 0; |
254 |
+ } |
255 |
+ |
256 |
+diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |
257 |
+index 22885dceaa17..1f26890a8da6 100644 |
258 |
+--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |
259 |
++++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |
260 |
+@@ -1635,8 +1635,7 @@ static ssize_t analogix_dpaux_transfer(struct drm_dp_aux *aux, |
261 |
+ } |
262 |
+ |
263 |
+ struct analogix_dp_device * |
264 |
+-analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, |
265 |
+- struct analogix_dp_plat_data *plat_data) |
266 |
++analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data) |
267 |
+ { |
268 |
+ struct platform_device *pdev = to_platform_device(dev); |
269 |
+ struct analogix_dp_device *dp; |
270 |
+@@ -1739,22 +1738,30 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, |
271 |
+ irq_flags, "analogix-dp", dp); |
272 |
+ if (ret) { |
273 |
+ dev_err(&pdev->dev, "failed to request irq\n"); |
274 |
+- goto err_disable_pm_runtime; |
275 |
++ return ERR_PTR(ret); |
276 |
+ } |
277 |
+ disable_irq(dp->irq); |
278 |
+ |
279 |
++ return dp; |
280 |
++} |
281 |
++EXPORT_SYMBOL_GPL(analogix_dp_probe); |
282 |
++ |
283 |
++int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev) |
284 |
++{ |
285 |
++ int ret; |
286 |
++ |
287 |
+ dp->drm_dev = drm_dev; |
288 |
+ dp->encoder = dp->plat_data->encoder; |
289 |
+ |
290 |
+ dp->aux.name = "DP-AUX"; |
291 |
+ dp->aux.transfer = analogix_dpaux_transfer; |
292 |
+- dp->aux.dev = &pdev->dev; |
293 |
++ dp->aux.dev = dp->dev; |
294 |
+ |
295 |
+ ret = drm_dp_aux_register(&dp->aux); |
296 |
+ if (ret) |
297 |
+- return ERR_PTR(ret); |
298 |
++ return ret; |
299 |
+ |
300 |
+- pm_runtime_enable(dev); |
301 |
++ pm_runtime_enable(dp->dev); |
302 |
+ |
303 |
+ ret = analogix_dp_create_bridge(drm_dev, dp); |
304 |
+ if (ret) { |
305 |
+@@ -1762,13 +1769,12 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, |
306 |
+ goto err_disable_pm_runtime; |
307 |
+ } |
308 |
+ |
309 |
+- return dp; |
310 |
++ return 0; |
311 |
+ |
312 |
+ err_disable_pm_runtime: |
313 |
++ pm_runtime_disable(dp->dev); |
314 |
+ |
315 |
+- pm_runtime_disable(dev); |
316 |
+- |
317 |
+- return ERR_PTR(ret); |
318 |
++ return ret; |
319 |
+ } |
320 |
+ EXPORT_SYMBOL_GPL(analogix_dp_bind); |
321 |
+ |
322 |
+@@ -1785,10 +1791,15 @@ void analogix_dp_unbind(struct analogix_dp_device *dp) |
323 |
+ |
324 |
+ drm_dp_aux_unregister(&dp->aux); |
325 |
+ pm_runtime_disable(dp->dev); |
326 |
+- clk_disable_unprepare(dp->clock); |
327 |
+ } |
328 |
+ EXPORT_SYMBOL_GPL(analogix_dp_unbind); |
329 |
+ |
330 |
++void analogix_dp_remove(struct analogix_dp_device *dp) |
331 |
++{ |
332 |
++ clk_disable_unprepare(dp->clock); |
333 |
++} |
334 |
++EXPORT_SYMBOL_GPL(analogix_dp_remove); |
335 |
++ |
336 |
+ #ifdef CONFIG_PM |
337 |
+ int analogix_dp_suspend(struct analogix_dp_device *dp) |
338 |
+ { |
339 |
+diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c |
340 |
+index 3a0f0ba8c63a..e0cfae744afc 100644 |
341 |
+--- a/drivers/gpu/drm/exynos/exynos_dp.c |
342 |
++++ b/drivers/gpu/drm/exynos/exynos_dp.c |
343 |
+@@ -158,15 +158,8 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data) |
344 |
+ struct drm_device *drm_dev = data; |
345 |
+ int ret; |
346 |
+ |
347 |
+- dp->dev = dev; |
348 |
+ dp->drm_dev = drm_dev; |
349 |
+ |
350 |
+- dp->plat_data.dev_type = EXYNOS_DP; |
351 |
+- dp->plat_data.power_on_start = exynos_dp_poweron; |
352 |
+- dp->plat_data.power_off = exynos_dp_poweroff; |
353 |
+- dp->plat_data.attach = exynos_dp_bridge_attach; |
354 |
+- dp->plat_data.get_modes = exynos_dp_get_modes; |
355 |
+- |
356 |
+ if (!dp->plat_data.panel && !dp->ptn_bridge) { |
357 |
+ ret = exynos_dp_dt_parse_panel(dp); |
358 |
+ if (ret) |
359 |
+@@ -184,13 +177,11 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data) |
360 |
+ |
361 |
+ dp->plat_data.encoder = encoder; |
362 |
+ |
363 |
+- dp->adp = analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data); |
364 |
+- if (IS_ERR(dp->adp)) { |
365 |
++ ret = analogix_dp_bind(dp->adp, dp->drm_dev); |
366 |
++ if (ret) |
367 |
+ dp->encoder.funcs->destroy(&dp->encoder); |
368 |
+- return PTR_ERR(dp->adp); |
369 |
+- } |
370 |
+ |
371 |
+- return 0; |
372 |
++ return ret; |
373 |
+ } |
374 |
+ |
375 |
+ static void exynos_dp_unbind(struct device *dev, struct device *master, |
376 |
+@@ -221,6 +212,7 @@ static int exynos_dp_probe(struct platform_device *pdev) |
377 |
+ if (!dp) |
378 |
+ return -ENOMEM; |
379 |
+ |
380 |
++ dp->dev = dev; |
381 |
+ /* |
382 |
+ * We just use the drvdata until driver run into component |
383 |
+ * add function, and then we would set drvdata to null, so |
384 |
+@@ -246,16 +238,29 @@ static int exynos_dp_probe(struct platform_device *pdev) |
385 |
+ |
386 |
+ /* The remote port can be either a panel or a bridge */ |
387 |
+ dp->plat_data.panel = panel; |
388 |
++ dp->plat_data.dev_type = EXYNOS_DP; |
389 |
++ dp->plat_data.power_on_start = exynos_dp_poweron; |
390 |
++ dp->plat_data.power_off = exynos_dp_poweroff; |
391 |
++ dp->plat_data.attach = exynos_dp_bridge_attach; |
392 |
++ dp->plat_data.get_modes = exynos_dp_get_modes; |
393 |
+ dp->plat_data.skip_connector = !!bridge; |
394 |
++ |
395 |
+ dp->ptn_bridge = bridge; |
396 |
+ |
397 |
+ out: |
398 |
++ dp->adp = analogix_dp_probe(dev, &dp->plat_data); |
399 |
++ if (IS_ERR(dp->adp)) |
400 |
++ return PTR_ERR(dp->adp); |
401 |
++ |
402 |
+ return component_add(&pdev->dev, &exynos_dp_ops); |
403 |
+ } |
404 |
+ |
405 |
+ static int exynos_dp_remove(struct platform_device *pdev) |
406 |
+ { |
407 |
++ struct exynos_dp_device *dp = platform_get_drvdata(pdev); |
408 |
++ |
409 |
+ component_del(&pdev->dev, &exynos_dp_ops); |
410 |
++ analogix_dp_remove(dp->adp); |
411 |
+ |
412 |
+ return 0; |
413 |
+ } |
414 |
+diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c |
415 |
+index 272503615378..ae31836aa4ee 100644 |
416 |
+--- a/drivers/gpu/drm/i915/display/intel_display.c |
417 |
++++ b/drivers/gpu/drm/i915/display/intel_display.c |
418 |
+@@ -16860,8 +16860,11 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv) |
419 |
+ |
420 |
+ static void intel_early_display_was(struct drm_i915_private *dev_priv) |
421 |
+ { |
422 |
+- /* Display WA #1185 WaDisableDARBFClkGating:cnl,glk */ |
423 |
+- if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)) |
424 |
++ /* |
425 |
++ * Display WA #1185 WaDisableDARBFClkGating:cnl,glk,icl,ehl,tgl |
426 |
++ * Also known as Wa_14010480278. |
427 |
++ */ |
428 |
++ if (IS_GEN_RANGE(dev_priv, 10, 12) || IS_GEMINILAKE(dev_priv)) |
429 |
+ I915_WRITE(GEN9_CLKGATE_DIS_0, I915_READ(GEN9_CLKGATE_DIS_0) | |
430 |
+ DARBF_GATING_DIS); |
431 |
+ |
432 |
+diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c |
433 |
+index f38f5e113c6b..ce98c08aa8b4 100644 |
434 |
+--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c |
435 |
++++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c |
436 |
+@@ -325,15 +325,9 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, |
437 |
+ void *data) |
438 |
+ { |
439 |
+ struct rockchip_dp_device *dp = dev_get_drvdata(dev); |
440 |
+- const struct rockchip_dp_chip_data *dp_data; |
441 |
+ struct drm_device *drm_dev = data; |
442 |
+ int ret; |
443 |
+ |
444 |
+- dp_data = of_device_get_match_data(dev); |
445 |
+- if (!dp_data) |
446 |
+- return -ENODEV; |
447 |
+- |
448 |
+- dp->data = dp_data; |
449 |
+ dp->drm_dev = drm_dev; |
450 |
+ |
451 |
+ ret = rockchip_dp_drm_create_encoder(dp); |
452 |
+@@ -344,16 +338,9 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, |
453 |
+ |
454 |
+ dp->plat_data.encoder = &dp->encoder; |
455 |
+ |
456 |
+- dp->plat_data.dev_type = dp->data->chip_type; |
457 |
+- dp->plat_data.power_on_start = rockchip_dp_poweron_start; |
458 |
+- dp->plat_data.power_off = rockchip_dp_powerdown; |
459 |
+- dp->plat_data.get_modes = rockchip_dp_get_modes; |
460 |
+- |
461 |
+- dp->adp = analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data); |
462 |
+- if (IS_ERR(dp->adp)) { |
463 |
+- ret = PTR_ERR(dp->adp); |
464 |
++ ret = analogix_dp_bind(dp->adp, drm_dev); |
465 |
++ if (ret) |
466 |
+ goto err_cleanup_encoder; |
467 |
+- } |
468 |
+ |
469 |
+ return 0; |
470 |
+ err_cleanup_encoder: |
471 |
+@@ -368,8 +355,6 @@ static void rockchip_dp_unbind(struct device *dev, struct device *master, |
472 |
+ |
473 |
+ analogix_dp_unbind(dp->adp); |
474 |
+ dp->encoder.funcs->destroy(&dp->encoder); |
475 |
+- |
476 |
+- dp->adp = ERR_PTR(-ENODEV); |
477 |
+ } |
478 |
+ |
479 |
+ static const struct component_ops rockchip_dp_component_ops = { |
480 |
+@@ -380,10 +365,15 @@ static const struct component_ops rockchip_dp_component_ops = { |
481 |
+ static int rockchip_dp_probe(struct platform_device *pdev) |
482 |
+ { |
483 |
+ struct device *dev = &pdev->dev; |
484 |
++ const struct rockchip_dp_chip_data *dp_data; |
485 |
+ struct drm_panel *panel = NULL; |
486 |
+ struct rockchip_dp_device *dp; |
487 |
+ int ret; |
488 |
+ |
489 |
++ dp_data = of_device_get_match_data(dev); |
490 |
++ if (!dp_data) |
491 |
++ return -ENODEV; |
492 |
++ |
493 |
+ ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &panel, NULL); |
494 |
+ if (ret < 0) |
495 |
+ return ret; |
496 |
+@@ -394,7 +384,12 @@ static int rockchip_dp_probe(struct platform_device *pdev) |
497 |
+ |
498 |
+ dp->dev = dev; |
499 |
+ dp->adp = ERR_PTR(-ENODEV); |
500 |
++ dp->data = dp_data; |
501 |
+ dp->plat_data.panel = panel; |
502 |
++ dp->plat_data.dev_type = dp->data->chip_type; |
503 |
++ dp->plat_data.power_on_start = rockchip_dp_poweron_start; |
504 |
++ dp->plat_data.power_off = rockchip_dp_powerdown; |
505 |
++ dp->plat_data.get_modes = rockchip_dp_get_modes; |
506 |
+ |
507 |
+ ret = rockchip_dp_of_probe(dp); |
508 |
+ if (ret < 0) |
509 |
+@@ -402,12 +397,19 @@ static int rockchip_dp_probe(struct platform_device *pdev) |
510 |
+ |
511 |
+ platform_set_drvdata(pdev, dp); |
512 |
+ |
513 |
++ dp->adp = analogix_dp_probe(dev, &dp->plat_data); |
514 |
++ if (IS_ERR(dp->adp)) |
515 |
++ return PTR_ERR(dp->adp); |
516 |
++ |
517 |
+ return component_add(dev, &rockchip_dp_component_ops); |
518 |
+ } |
519 |
+ |
520 |
+ static int rockchip_dp_remove(struct platform_device *pdev) |
521 |
+ { |
522 |
++ struct rockchip_dp_device *dp = platform_get_drvdata(pdev); |
523 |
++ |
524 |
+ component_del(&pdev->dev, &rockchip_dp_component_ops); |
525 |
++ analogix_dp_remove(dp->adp); |
526 |
+ |
527 |
+ return 0; |
528 |
+ } |
529 |
+diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c |
530 |
+index bfe4ff337581..b0f0781a6b9c 100644 |
531 |
+--- a/drivers/mfd/intel-lpss.c |
532 |
++++ b/drivers/mfd/intel-lpss.c |
533 |
+@@ -384,7 +384,7 @@ int intel_lpss_probe(struct device *dev, |
534 |
+ if (!lpss) |
535 |
+ return -ENOMEM; |
536 |
+ |
537 |
+- lpss->priv = devm_ioremap(dev, info->mem->start + LPSS_PRIV_OFFSET, |
538 |
++ lpss->priv = devm_ioremap_uc(dev, info->mem->start + LPSS_PRIV_OFFSET, |
539 |
+ LPSS_PRIV_SIZE); |
540 |
+ if (!lpss->priv) |
541 |
+ return -ENOMEM; |
542 |
+diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c |
543 |
+index ad86a186ddc5..4dfdb5a58025 100644 |
544 |
+--- a/drivers/net/ethernet/broadcom/bcmsysport.c |
545 |
++++ b/drivers/net/ethernet/broadcom/bcmsysport.c |
546 |
+@@ -666,7 +666,8 @@ static struct sk_buff *bcm_sysport_rx_refill(struct bcm_sysport_priv *priv, |
547 |
+ dma_addr_t mapping; |
548 |
+ |
549 |
+ /* Allocate a new SKB for a new packet */ |
550 |
+- skb = netdev_alloc_skb(priv->netdev, RX_BUF_LENGTH); |
551 |
++ skb = __netdev_alloc_skb(priv->netdev, RX_BUF_LENGTH, |
552 |
++ GFP_ATOMIC | __GFP_NOWARN); |
553 |
+ if (!skb) { |
554 |
+ priv->mib.alloc_rx_buff_failed++; |
555 |
+ netif_err(priv, rx_err, ndev, "SKB alloc failed\n"); |
556 |
+diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c |
557 |
+index ff09ee777b2b..6f01f4e03cef 100644 |
558 |
+--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c |
559 |
++++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c |
560 |
+@@ -1697,7 +1697,8 @@ static struct sk_buff *bcmgenet_rx_refill(struct bcmgenet_priv *priv, |
561 |
+ dma_addr_t mapping; |
562 |
+ |
563 |
+ /* Allocate a new Rx skb */ |
564 |
+- skb = netdev_alloc_skb(priv->dev, priv->rx_buf_len + SKB_ALIGNMENT); |
565 |
++ skb = __netdev_alloc_skb(priv->dev, priv->rx_buf_len + SKB_ALIGNMENT, |
566 |
++ GFP_ATOMIC | __GFP_NOWARN); |
567 |
+ if (!skb) { |
568 |
+ priv->mib.alloc_rx_buff_failed++; |
569 |
+ netif_err(priv, rx_err, priv->dev, |
570 |
+diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c |
571 |
+index fa32cd5b418e..70d41783329d 100644 |
572 |
+--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c |
573 |
++++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c |
574 |
+@@ -291,16 +291,19 @@ static int socfpga_gen5_set_phy_mode(struct socfpga_dwmac *dwmac) |
575 |
+ phymode == PHY_INTERFACE_MODE_MII || |
576 |
+ phymode == PHY_INTERFACE_MODE_GMII || |
577 |
+ phymode == PHY_INTERFACE_MODE_SGMII) { |
578 |
+- ctrl |= SYSMGR_EMACGRP_CTRL_PTP_REF_CLK_MASK << (reg_shift / 2); |
579 |
+ regmap_read(sys_mgr_base_addr, SYSMGR_FPGAGRP_MODULE_REG, |
580 |
+ &module); |
581 |
+ module |= (SYSMGR_FPGAGRP_MODULE_EMAC << (reg_shift / 2)); |
582 |
+ regmap_write(sys_mgr_base_addr, SYSMGR_FPGAGRP_MODULE_REG, |
583 |
+ module); |
584 |
+- } else { |
585 |
+- ctrl &= ~(SYSMGR_EMACGRP_CTRL_PTP_REF_CLK_MASK << (reg_shift / 2)); |
586 |
+ } |
587 |
+ |
588 |
++ if (dwmac->f2h_ptp_ref_clk) |
589 |
++ ctrl |= SYSMGR_EMACGRP_CTRL_PTP_REF_CLK_MASK << (reg_shift / 2); |
590 |
++ else |
591 |
++ ctrl &= ~(SYSMGR_EMACGRP_CTRL_PTP_REF_CLK_MASK << |
592 |
++ (reg_shift / 2)); |
593 |
++ |
594 |
+ regmap_write(sys_mgr_base_addr, reg_offset, ctrl); |
595 |
+ |
596 |
+ /* Deassert reset for the phy configuration to be sampled by |
597 |
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c |
598 |
+index 020159622559..e5d9007c8090 100644 |
599 |
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c |
600 |
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c |
601 |
+@@ -26,12 +26,16 @@ static void config_sub_second_increment(void __iomem *ioaddr, |
602 |
+ unsigned long data; |
603 |
+ u32 reg_value; |
604 |
+ |
605 |
+- /* For GMAC3.x, 4.x versions, convert the ptp_clock to nano second |
606 |
+- * formula = (1/ptp_clock) * 1000000000 |
607 |
+- * where ptp_clock is 50MHz if fine method is used to update system |
608 |
++ /* For GMAC3.x, 4.x versions, in "fine adjustement mode" set sub-second |
609 |
++ * increment to twice the number of nanoseconds of a clock cycle. |
610 |
++ * The calculation of the default_addend value by the caller will set it |
611 |
++ * to mid-range = 2^31 when the remainder of this division is zero, |
612 |
++ * which will make the accumulator overflow once every 2 ptp_clock |
613 |
++ * cycles, adding twice the number of nanoseconds of a clock cycle : |
614 |
++ * 2000000000ULL / ptp_clock. |
615 |
+ */ |
616 |
+ if (value & PTP_TCR_TSCFUPDT) |
617 |
+- data = (1000000000ULL / 50000000); |
618 |
++ data = (2000000000ULL / ptp_clock); |
619 |
+ else |
620 |
+ data = (1000000000ULL / ptp_clock); |
621 |
+ |
622 |
+diff --git a/drivers/net/wimax/i2400m/usb-fw.c b/drivers/net/wimax/i2400m/usb-fw.c |
623 |
+index 529ebca1e9e1..1f7709d24f35 100644 |
624 |
+--- a/drivers/net/wimax/i2400m/usb-fw.c |
625 |
++++ b/drivers/net/wimax/i2400m/usb-fw.c |
626 |
+@@ -354,6 +354,7 @@ out: |
627 |
+ usb_autopm_put_interface(i2400mu->usb_iface); |
628 |
+ d_fnend(8, dev, "(i2400m %p ack %p size %zu) = %ld\n", |
629 |
+ i2400m, ack, ack_size, (long) result); |
630 |
++ usb_put_urb(¬if_urb); |
631 |
+ return result; |
632 |
+ |
633 |
+ error_exceeded: |
634 |
+diff --git a/drivers/platform/x86/gpd-pocket-fan.c b/drivers/platform/x86/gpd-pocket-fan.c |
635 |
+index b471b86c28fe..5b516e4c2bfb 100644 |
636 |
+--- a/drivers/platform/x86/gpd-pocket-fan.c |
637 |
++++ b/drivers/platform/x86/gpd-pocket-fan.c |
638 |
+@@ -128,7 +128,7 @@ static int gpd_pocket_fan_probe(struct platform_device *pdev) |
639 |
+ |
640 |
+ for (i = 0; i < ARRAY_SIZE(temp_limits); i++) { |
641 |
+ if (temp_limits[i] < 20000 || temp_limits[i] > 90000) { |
642 |
+- dev_err(&pdev->dev, "Invalid temp-limit %d (must be between 40000 and 70000)\n", |
643 |
++ dev_err(&pdev->dev, "Invalid temp-limit %d (must be between 20000 and 90000)\n", |
644 |
+ temp_limits[i]); |
645 |
+ temp_limits[0] = TEMP_LIMIT0_DEFAULT; |
646 |
+ temp_limits[1] = TEMP_LIMIT1_DEFAULT; |
647 |
+diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c |
648 |
+index 783d00131a2a..6ba065d5c4d9 100644 |
649 |
+--- a/drivers/remoteproc/qcom_q6v5_mss.c |
650 |
++++ b/drivers/remoteproc/qcom_q6v5_mss.c |
651 |
+@@ -1440,7 +1440,7 @@ static int q6v5_probe(struct platform_device *pdev) |
652 |
+ ret = of_property_read_string_index(pdev->dev.of_node, "firmware-name", |
653 |
+ 1, &qproc->hexagon_mdt_image); |
654 |
+ if (ret < 0 && ret != -EINVAL) |
655 |
+- return ret; |
656 |
++ goto free_rproc; |
657 |
+ |
658 |
+ platform_set_drvdata(pdev, qproc); |
659 |
+ |
660 |
+diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h |
661 |
+index 3ecc69c5b150..ce4acbf7fef9 100644 |
662 |
+--- a/drivers/usb/dwc3/core.h |
663 |
++++ b/drivers/usb/dwc3/core.h |
664 |
+@@ -310,6 +310,10 @@ |
665 |
+ #define DWC3_GTXFIFOSIZ_TXFDEF(n) ((n) & 0xffff) |
666 |
+ #define DWC3_GTXFIFOSIZ_TXFSTADDR(n) ((n) & 0xffff0000) |
667 |
+ |
668 |
++/* Global RX Fifo Size Register */ |
669 |
++#define DWC31_GRXFIFOSIZ_RXFDEP(n) ((n) & 0x7fff) /* DWC_usb31 only */ |
670 |
++#define DWC3_GRXFIFOSIZ_RXFDEP(n) ((n) & 0xffff) |
671 |
++ |
672 |
+ /* Global Event Size Registers */ |
673 |
+ #define DWC3_GEVNTSIZ_INTMASK BIT(31) |
674 |
+ #define DWC3_GEVNTSIZ_SIZE(n) ((n) & 0xffff) |
675 |
+diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c |
676 |
+index 379f978db13d..3d30dec42c81 100644 |
677 |
+--- a/drivers/usb/dwc3/gadget.c |
678 |
++++ b/drivers/usb/dwc3/gadget.c |
679 |
+@@ -2220,7 +2220,6 @@ static int dwc3_gadget_init_in_endpoint(struct dwc3_ep *dep) |
680 |
+ { |
681 |
+ struct dwc3 *dwc = dep->dwc; |
682 |
+ int mdwidth; |
683 |
+- int kbytes; |
684 |
+ int size; |
685 |
+ |
686 |
+ mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0); |
687 |
+@@ -2236,17 +2235,17 @@ static int dwc3_gadget_init_in_endpoint(struct dwc3_ep *dep) |
688 |
+ /* FIFO Depth is in MDWDITH bytes. Multiply */ |
689 |
+ size *= mdwidth; |
690 |
+ |
691 |
+- kbytes = size / 1024; |
692 |
+- if (kbytes == 0) |
693 |
+- kbytes = 1; |
694 |
+- |
695 |
+ /* |
696 |
+- * FIFO sizes account an extra MDWIDTH * (kbytes + 1) bytes for |
697 |
+- * internal overhead. We don't really know how these are used, |
698 |
+- * but documentation say it exists. |
699 |
++ * To meet performance requirement, a minimum TxFIFO size of 3x |
700 |
++ * MaxPacketSize is recommended for endpoints that support burst and a |
701 |
++ * minimum TxFIFO size of 2x MaxPacketSize for endpoints that don't |
702 |
++ * support burst. Use those numbers and we can calculate the max packet |
703 |
++ * limit as below. |
704 |
+ */ |
705 |
+- size -= mdwidth * (kbytes + 1); |
706 |
+- size /= kbytes; |
707 |
++ if (dwc->maximum_speed >= USB_SPEED_SUPER) |
708 |
++ size /= 3; |
709 |
++ else |
710 |
++ size /= 2; |
711 |
+ |
712 |
+ usb_ep_set_maxpacket_limit(&dep->endpoint, size); |
713 |
+ |
714 |
+@@ -2264,8 +2263,39 @@ static int dwc3_gadget_init_in_endpoint(struct dwc3_ep *dep) |
715 |
+ static int dwc3_gadget_init_out_endpoint(struct dwc3_ep *dep) |
716 |
+ { |
717 |
+ struct dwc3 *dwc = dep->dwc; |
718 |
++ int mdwidth; |
719 |
++ int size; |
720 |
++ |
721 |
++ mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0); |
722 |
++ |
723 |
++ /* MDWIDTH is represented in bits, convert to bytes */ |
724 |
++ mdwidth /= 8; |
725 |
+ |
726 |
+- usb_ep_set_maxpacket_limit(&dep->endpoint, 1024); |
727 |
++ /* All OUT endpoints share a single RxFIFO space */ |
728 |
++ size = dwc3_readl(dwc->regs, DWC3_GRXFIFOSIZ(0)); |
729 |
++ if (dwc3_is_usb31(dwc)) |
730 |
++ size = DWC31_GRXFIFOSIZ_RXFDEP(size); |
731 |
++ else |
732 |
++ size = DWC3_GRXFIFOSIZ_RXFDEP(size); |
733 |
++ |
734 |
++ /* FIFO depth is in MDWDITH bytes */ |
735 |
++ size *= mdwidth; |
736 |
++ |
737 |
++ /* |
738 |
++ * To meet performance requirement, a minimum recommended RxFIFO size |
739 |
++ * is defined as follow: |
740 |
++ * RxFIFO size >= (3 x MaxPacketSize) + |
741 |
++ * (3 x 8 bytes setup packets size) + (16 bytes clock crossing margin) |
742 |
++ * |
743 |
++ * Then calculate the max packet limit as below. |
744 |
++ */ |
745 |
++ size -= (3 * 8) + 16; |
746 |
++ if (size < 0) |
747 |
++ size = 0; |
748 |
++ else |
749 |
++ size /= 3; |
750 |
++ |
751 |
++ usb_ep_set_maxpacket_limit(&dep->endpoint, size); |
752 |
+ dep->endpoint.max_streams = 15; |
753 |
+ dep->endpoint.ops = &dwc3_gadget_ep_ops; |
754 |
+ list_add_tail(&dep->endpoint.ep_list, |
755 |
+diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c |
756 |
+index 88a5aa6624b4..6c089f655707 100644 |
757 |
+--- a/drivers/vhost/vsock.c |
758 |
++++ b/drivers/vhost/vsock.c |
759 |
+@@ -500,6 +500,11 @@ static int vhost_vsock_start(struct vhost_vsock *vsock) |
760 |
+ mutex_unlock(&vq->mutex); |
761 |
+ } |
762 |
+ |
763 |
++ /* Some packets may have been queued before the device was started, |
764 |
++ * let's kick the send worker to send them. |
765 |
++ */ |
766 |
++ vhost_work_queue(&vsock->dev, &vsock->send_pkt_work); |
767 |
++ |
768 |
+ mutex_unlock(&vsock->dev.mutex); |
769 |
+ return 0; |
770 |
+ |
771 |
+diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c |
772 |
+index bcda48c03882..721b2560caa7 100644 |
773 |
+--- a/fs/cifs/connect.c |
774 |
++++ b/fs/cifs/connect.c |
775 |
+@@ -371,8 +371,10 @@ static int reconn_set_ipaddr(struct TCP_Server_Info *server) |
776 |
+ return rc; |
777 |
+ } |
778 |
+ |
779 |
++ spin_lock(&cifs_tcp_ses_lock); |
780 |
+ rc = cifs_convert_address((struct sockaddr *)&server->dstaddr, ipaddr, |
781 |
+ strlen(ipaddr)); |
782 |
++ spin_unlock(&cifs_tcp_ses_lock); |
783 |
+ kfree(ipaddr); |
784 |
+ |
785 |
+ return !rc ? -1 : 0; |
786 |
+@@ -3360,6 +3362,10 @@ cifs_find_tcon(struct cifs_ses *ses, struct smb_vol *volume_info) |
787 |
+ spin_lock(&cifs_tcp_ses_lock); |
788 |
+ list_for_each(tmp, &ses->tcon_list) { |
789 |
+ tcon = list_entry(tmp, struct cifs_tcon, tcon_list); |
790 |
++#ifdef CONFIG_CIFS_DFS_UPCALL |
791 |
++ if (tcon->dfs_path) |
792 |
++ continue; |
793 |
++#endif |
794 |
+ if (!match_tcon(tcon, volume_info)) |
795 |
+ continue; |
796 |
+ ++tcon->tc_count; |
797 |
+diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h |
798 |
+index 7aa2f93da49c..b0dcc07334a1 100644 |
799 |
+--- a/include/drm/bridge/analogix_dp.h |
800 |
++++ b/include/drm/bridge/analogix_dp.h |
801 |
+@@ -42,9 +42,10 @@ int analogix_dp_resume(struct analogix_dp_device *dp); |
802 |
+ int analogix_dp_suspend(struct analogix_dp_device *dp); |
803 |
+ |
804 |
+ struct analogix_dp_device * |
805 |
+-analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, |
806 |
+- struct analogix_dp_plat_data *plat_data); |
807 |
++analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data); |
808 |
++int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev); |
809 |
+ void analogix_dp_unbind(struct analogix_dp_device *dp); |
810 |
++void analogix_dp_remove(struct analogix_dp_device *dp); |
811 |
+ |
812 |
+ int analogix_dp_start_crc(struct drm_connector *connector); |
813 |
+ int analogix_dp_stop_crc(struct drm_connector *connector); |
814 |
+diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h |
815 |
+index 73c66a3a33ae..7f3486e32e5d 100644 |
816 |
+--- a/include/linux/ieee80211.h |
817 |
++++ b/include/linux/ieee80211.h |
818 |
+@@ -619,6 +619,15 @@ static inline bool ieee80211_is_qos_nullfunc(__le16 fc) |
819 |
+ cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_NULLFUNC); |
820 |
+ } |
821 |
+ |
822 |
++/** |
823 |
++ * ieee80211_is_any_nullfunc - check if frame is regular or QoS nullfunc frame |
824 |
++ * @fc: frame control bytes in little-endian byteorder |
825 |
++ */ |
826 |
++static inline bool ieee80211_is_any_nullfunc(__le16 fc) |
827 |
++{ |
828 |
++ return (ieee80211_is_nullfunc(fc) || ieee80211_is_qos_nullfunc(fc)); |
829 |
++} |
830 |
++ |
831 |
+ /** |
832 |
+ * ieee80211_is_bufferable_mmpdu - check if frame is bufferable MMPDU |
833 |
+ * @fc: frame control field in little-endian byteorder |
834 |
+diff --git a/include/linux/io.h b/include/linux/io.h |
835 |
+index accac822336a..a59834bc0a11 100644 |
836 |
+--- a/include/linux/io.h |
837 |
++++ b/include/linux/io.h |
838 |
+@@ -64,6 +64,8 @@ static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr) |
839 |
+ |
840 |
+ void __iomem *devm_ioremap(struct device *dev, resource_size_t offset, |
841 |
+ resource_size_t size); |
842 |
++void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset, |
843 |
++ resource_size_t size); |
844 |
+ void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset, |
845 |
+ resource_size_t size); |
846 |
+ void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset, |
847 |
+diff --git a/include/net/udp.h b/include/net/udp.h |
848 |
+index 8f163d674f07..fabf507bce5d 100644 |
849 |
+--- a/include/net/udp.h |
850 |
++++ b/include/net/udp.h |
851 |
+@@ -476,6 +476,13 @@ static inline struct sk_buff *udp_rcv_segment(struct sock *sk, |
852 |
+ if (!inet_get_convert_csum(sk)) |
853 |
+ features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; |
854 |
+ |
855 |
++ /* UDP segmentation expects packets of type CHECKSUM_PARTIAL or |
856 |
++ * CHECKSUM_NONE in __udp_gso_segment. UDP GRO indeed builds partial |
857 |
++ * packets in udp_gro_complete_segment. As does UDP GSO, verified by |
858 |
++ * udp_send_skb. But when those packets are looped in dev_loopback_xmit |
859 |
++ * their ip_summed is set to CHECKSUM_UNNECESSARY. Reset in this |
860 |
++ * specific case, where PARTIAL is both correct and required. |
861 |
++ */ |
862 |
+ if (skb->pkt_type == PACKET_LOOPBACK) |
863 |
+ skb->ip_summed = CHECKSUM_PARTIAL; |
864 |
+ |
865 |
+diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c |
866 |
+index 6495800fb92a..8107574e8af9 100644 |
867 |
+--- a/kernel/trace/trace_events_hist.c |
868 |
++++ b/kernel/trace/trace_events_hist.c |
869 |
+@@ -2466,6 +2466,9 @@ static void __destroy_hist_field(struct hist_field *hist_field) |
870 |
+ kfree(hist_field->name); |
871 |
+ kfree(hist_field->type); |
872 |
+ |
873 |
++ kfree(hist_field->system); |
874 |
++ kfree(hist_field->event_name); |
875 |
++ |
876 |
+ kfree(hist_field); |
877 |
+ } |
878 |
+ |
879 |
+@@ -3528,6 +3531,7 @@ static struct hist_field *create_var(struct hist_trigger_data *hist_data, |
880 |
+ goto out; |
881 |
+ } |
882 |
+ |
883 |
++ var->ref = 1; |
884 |
+ var->flags = HIST_FIELD_FL_VAR; |
885 |
+ var->var.idx = idx; |
886 |
+ var->var.hist_data = var->hist_data = hist_data; |
887 |
+@@ -4157,6 +4161,9 @@ static void destroy_field_vars(struct hist_trigger_data *hist_data) |
888 |
+ |
889 |
+ for (i = 0; i < hist_data->n_field_vars; i++) |
890 |
+ destroy_field_var(hist_data->field_vars[i]); |
891 |
++ |
892 |
++ for (i = 0; i < hist_data->n_save_vars; i++) |
893 |
++ destroy_field_var(hist_data->save_vars[i]); |
894 |
+ } |
895 |
+ |
896 |
+ static void save_field_var(struct hist_trigger_data *hist_data, |
897 |
+diff --git a/lib/devres.c b/lib/devres.c |
898 |
+index 6a0e9bd6524a..17624d35e82d 100644 |
899 |
+--- a/lib/devres.c |
900 |
++++ b/lib/devres.c |
901 |
+@@ -9,6 +9,7 @@ |
902 |
+ enum devm_ioremap_type { |
903 |
+ DEVM_IOREMAP = 0, |
904 |
+ DEVM_IOREMAP_NC, |
905 |
++ DEVM_IOREMAP_UC, |
906 |
+ DEVM_IOREMAP_WC, |
907 |
+ }; |
908 |
+ |
909 |
+@@ -39,6 +40,9 @@ static void __iomem *__devm_ioremap(struct device *dev, resource_size_t offset, |
910 |
+ case DEVM_IOREMAP_NC: |
911 |
+ addr = ioremap_nocache(offset, size); |
912 |
+ break; |
913 |
++ case DEVM_IOREMAP_UC: |
914 |
++ addr = ioremap_uc(offset, size); |
915 |
++ break; |
916 |
+ case DEVM_IOREMAP_WC: |
917 |
+ addr = ioremap_wc(offset, size); |
918 |
+ break; |
919 |
+@@ -68,6 +72,21 @@ void __iomem *devm_ioremap(struct device *dev, resource_size_t offset, |
920 |
+ } |
921 |
+ EXPORT_SYMBOL(devm_ioremap); |
922 |
+ |
923 |
++/** |
924 |
++ * devm_ioremap_uc - Managed ioremap_uc() |
925 |
++ * @dev: Generic device to remap IO address for |
926 |
++ * @offset: Resource address to map |
927 |
++ * @size: Size of map |
928 |
++ * |
929 |
++ * Managed ioremap_uc(). Map is automatically unmapped on driver detach. |
930 |
++ */ |
931 |
++void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset, |
932 |
++ resource_size_t size) |
933 |
++{ |
934 |
++ return __devm_ioremap(dev, offset, size, DEVM_IOREMAP_UC); |
935 |
++} |
936 |
++EXPORT_SYMBOL_GPL(devm_ioremap_uc); |
937 |
++ |
938 |
+ /** |
939 |
+ * devm_ioremap_nocache - Managed ioremap_nocache() |
940 |
+ * @dev: Generic device to remap IO address for |
941 |
+diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h |
942 |
+index 2dceaca27489..891e1c3549c4 100644 |
943 |
+--- a/lib/mpi/longlong.h |
944 |
++++ b/lib/mpi/longlong.h |
945 |
+@@ -722,22 +722,22 @@ do { \ |
946 |
+ do { \ |
947 |
+ if (__builtin_constant_p(bh) && (bh) == 0) \ |
948 |
+ __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{aze|addze} %0,%2" \ |
949 |
+- : "=r" ((USItype)(sh)), \ |
950 |
+- "=&r" ((USItype)(sl)) \ |
951 |
++ : "=r" (sh), \ |
952 |
++ "=&r" (sl) \ |
953 |
+ : "%r" ((USItype)(ah)), \ |
954 |
+ "%r" ((USItype)(al)), \ |
955 |
+ "rI" ((USItype)(bl))); \ |
956 |
+ else if (__builtin_constant_p(bh) && (bh) == ~(USItype) 0) \ |
957 |
+ __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{ame|addme} %0,%2" \ |
958 |
+- : "=r" ((USItype)(sh)), \ |
959 |
+- "=&r" ((USItype)(sl)) \ |
960 |
++ : "=r" (sh), \ |
961 |
++ "=&r" (sl) \ |
962 |
+ : "%r" ((USItype)(ah)), \ |
963 |
+ "%r" ((USItype)(al)), \ |
964 |
+ "rI" ((USItype)(bl))); \ |
965 |
+ else \ |
966 |
+ __asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %0,%2,%3" \ |
967 |
+- : "=r" ((USItype)(sh)), \ |
968 |
+- "=&r" ((USItype)(sl)) \ |
969 |
++ : "=r" (sh), \ |
970 |
++ "=&r" (sl) \ |
971 |
+ : "%r" ((USItype)(ah)), \ |
972 |
+ "r" ((USItype)(bh)), \ |
973 |
+ "%r" ((USItype)(al)), \ |
974 |
+@@ -747,36 +747,36 @@ do { \ |
975 |
+ do { \ |
976 |
+ if (__builtin_constant_p(ah) && (ah) == 0) \ |
977 |
+ __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfze|subfze} %0,%2" \ |
978 |
+- : "=r" ((USItype)(sh)), \ |
979 |
+- "=&r" ((USItype)(sl)) \ |
980 |
++ : "=r" (sh), \ |
981 |
++ "=&r" (sl) \ |
982 |
+ : "r" ((USItype)(bh)), \ |
983 |
+ "rI" ((USItype)(al)), \ |
984 |
+ "r" ((USItype)(bl))); \ |
985 |
+ else if (__builtin_constant_p(ah) && (ah) == ~(USItype) 0) \ |
986 |
+ __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfme|subfme} %0,%2" \ |
987 |
+- : "=r" ((USItype)(sh)), \ |
988 |
+- "=&r" ((USItype)(sl)) \ |
989 |
++ : "=r" (sh), \ |
990 |
++ "=&r" (sl) \ |
991 |
+ : "r" ((USItype)(bh)), \ |
992 |
+ "rI" ((USItype)(al)), \ |
993 |
+ "r" ((USItype)(bl))); \ |
994 |
+ else if (__builtin_constant_p(bh) && (bh) == 0) \ |
995 |
+ __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{ame|addme} %0,%2" \ |
996 |
+- : "=r" ((USItype)(sh)), \ |
997 |
+- "=&r" ((USItype)(sl)) \ |
998 |
++ : "=r" (sh), \ |
999 |
++ "=&r" (sl) \ |
1000 |
+ : "r" ((USItype)(ah)), \ |
1001 |
+ "rI" ((USItype)(al)), \ |
1002 |
+ "r" ((USItype)(bl))); \ |
1003 |
+ else if (__builtin_constant_p(bh) && (bh) == ~(USItype) 0) \ |
1004 |
+ __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{aze|addze} %0,%2" \ |
1005 |
+- : "=r" ((USItype)(sh)), \ |
1006 |
+- "=&r" ((USItype)(sl)) \ |
1007 |
++ : "=r" (sh), \ |
1008 |
++ "=&r" (sl) \ |
1009 |
+ : "r" ((USItype)(ah)), \ |
1010 |
+ "rI" ((USItype)(al)), \ |
1011 |
+ "r" ((USItype)(bl))); \ |
1012 |
+ else \ |
1013 |
+ __asm__ ("{sf%I4|subf%I4c} %1,%5,%4\n\t{sfe|subfe} %0,%3,%2" \ |
1014 |
+- : "=r" ((USItype)(sh)), \ |
1015 |
+- "=&r" ((USItype)(sl)) \ |
1016 |
++ : "=r" (sh), \ |
1017 |
++ "=&r" (sl) \ |
1018 |
+ : "r" ((USItype)(ah)), \ |
1019 |
+ "r" ((USItype)(bh)), \ |
1020 |
+ "rI" ((USItype)(al)), \ |
1021 |
+@@ -787,7 +787,7 @@ do { \ |
1022 |
+ do { \ |
1023 |
+ USItype __m0 = (m0), __m1 = (m1); \ |
1024 |
+ __asm__ ("mulhwu %0,%1,%2" \ |
1025 |
+- : "=r" ((USItype) ph) \ |
1026 |
++ : "=r" (ph) \ |
1027 |
+ : "%r" (__m0), \ |
1028 |
+ "r" (__m1)); \ |
1029 |
+ (pl) = __m0 * __m1; \ |
1030 |
+diff --git a/mm/mremap.c b/mm/mremap.c |
1031 |
+index 1d98281f7204..245bf9c555b2 100644 |
1032 |
+--- a/mm/mremap.c |
1033 |
++++ b/mm/mremap.c |
1034 |
+@@ -606,6 +606,16 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, |
1035 |
+ LIST_HEAD(uf_unmap_early); |
1036 |
+ LIST_HEAD(uf_unmap); |
1037 |
+ |
1038 |
++ /* |
1039 |
++ * There is a deliberate asymmetry here: we strip the pointer tag |
1040 |
++ * from the old address but leave the new address alone. This is |
1041 |
++ * for consistency with mmap(), where we prevent the creation of |
1042 |
++ * aliasing mappings in userspace by leaving the tag bits of the |
1043 |
++ * mapping address intact. A non-zero tag will cause the subsequent |
1044 |
++ * range checks to reject the address as invalid. |
1045 |
++ * |
1046 |
++ * See Documentation/arm64/tagged-address-abi.rst for more information. |
1047 |
++ */ |
1048 |
+ addr = untagged_addr(addr); |
1049 |
+ |
1050 |
+ if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE)) |
1051 |
+diff --git a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c |
1052 |
+index b4c87fe31be2..41b24cd31562 100644 |
1053 |
+--- a/net/core/netclassid_cgroup.c |
1054 |
++++ b/net/core/netclassid_cgroup.c |
1055 |
+@@ -127,10 +127,8 @@ static int write_classid(struct cgroup_subsys_state *css, struct cftype *cft, |
1056 |
+ cs->classid = (u32)value; |
1057 |
+ |
1058 |
+ css_task_iter_start(css, 0, &it); |
1059 |
+- while ((p = css_task_iter_next(&it))) { |
1060 |
++ while ((p = css_task_iter_next(&it))) |
1061 |
+ update_classid_task(p, cs->classid); |
1062 |
+- cond_resched(); |
1063 |
+- } |
1064 |
+ css_task_iter_end(&it); |
1065 |
+ |
1066 |
+ return 0; |
1067 |
+diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c |
1068 |
+index c7d8044ff0fa..17a3a1c938be 100644 |
1069 |
+--- a/net/mac80211/mlme.c |
1070 |
++++ b/net/mac80211/mlme.c |
1071 |
+@@ -2460,7 +2460,7 @@ void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata, |
1072 |
+ if (!ieee80211_is_data(hdr->frame_control)) |
1073 |
+ return; |
1074 |
+ |
1075 |
+- if (ieee80211_is_nullfunc(hdr->frame_control) && |
1076 |
++ if (ieee80211_is_any_nullfunc(hdr->frame_control) && |
1077 |
+ sdata->u.mgd.probe_send_count > 0) { |
1078 |
+ if (ack) |
1079 |
+ ieee80211_sta_reset_conn_monitor(sdata); |
1080 |
+diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c |
1081 |
+index 0ba98ad9bc85..69429c8df7b3 100644 |
1082 |
+--- a/net/mac80211/rx.c |
1083 |
++++ b/net/mac80211/rx.c |
1084 |
+@@ -1450,8 +1450,7 @@ ieee80211_rx_h_check_dup(struct ieee80211_rx_data *rx) |
1085 |
+ return RX_CONTINUE; |
1086 |
+ |
1087 |
+ if (ieee80211_is_ctl(hdr->frame_control) || |
1088 |
+- ieee80211_is_nullfunc(hdr->frame_control) || |
1089 |
+- ieee80211_is_qos_nullfunc(hdr->frame_control) || |
1090 |
++ ieee80211_is_any_nullfunc(hdr->frame_control) || |
1091 |
+ is_multicast_ether_addr(hdr->addr1)) |
1092 |
+ return RX_CONTINUE; |
1093 |
+ |
1094 |
+@@ -1838,8 +1837,7 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) |
1095 |
+ * Drop (qos-)data::nullfunc frames silently, since they |
1096 |
+ * are used only to control station power saving mode. |
1097 |
+ */ |
1098 |
+- if (ieee80211_is_nullfunc(hdr->frame_control) || |
1099 |
+- ieee80211_is_qos_nullfunc(hdr->frame_control)) { |
1100 |
++ if (ieee80211_is_any_nullfunc(hdr->frame_control)) { |
1101 |
+ I802_DEBUG_INC(rx->local->rx_handlers_drop_nullfunc); |
1102 |
+ |
1103 |
+ /* |
1104 |
+@@ -2319,7 +2317,7 @@ static int ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc) |
1105 |
+ |
1106 |
+ /* Drop unencrypted frames if key is set. */ |
1107 |
+ if (unlikely(!ieee80211_has_protected(fc) && |
1108 |
+- !ieee80211_is_nullfunc(fc) && |
1109 |
++ !ieee80211_is_any_nullfunc(fc) && |
1110 |
+ ieee80211_is_data(fc) && rx->key)) |
1111 |
+ return -EACCES; |
1112 |
+ |
1113 |
+diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c |
1114 |
+index 21b1422b1b1c..b1669f024470 100644 |
1115 |
+--- a/net/mac80211/sta_info.c |
1116 |
++++ b/net/mac80211/sta_info.c |
1117 |
+@@ -217,7 +217,8 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata, |
1118 |
+ struct sta_info *sta; |
1119 |
+ int i = 0; |
1120 |
+ |
1121 |
+- list_for_each_entry_rcu(sta, &local->sta_list, list) { |
1122 |
++ list_for_each_entry_rcu(sta, &local->sta_list, list, |
1123 |
++ lockdep_is_held(&local->sta_mtx)) { |
1124 |
+ if (sdata != sta->sdata) |
1125 |
+ continue; |
1126 |
+ if (i < idx) { |
1127 |
+diff --git a/net/mac80211/status.c b/net/mac80211/status.c |
1128 |
+index 5a3d645fe1bc..c56831797655 100644 |
1129 |
+--- a/net/mac80211/status.c |
1130 |
++++ b/net/mac80211/status.c |
1131 |
+@@ -643,8 +643,7 @@ static void ieee80211_report_ack_skb(struct ieee80211_local *local, |
1132 |
+ rcu_read_lock(); |
1133 |
+ sdata = ieee80211_sdata_from_skb(local, skb); |
1134 |
+ if (sdata) { |
1135 |
+- if (ieee80211_is_nullfunc(hdr->frame_control) || |
1136 |
+- ieee80211_is_qos_nullfunc(hdr->frame_control)) |
1137 |
++ if (ieee80211_is_any_nullfunc(hdr->frame_control)) |
1138 |
+ cfg80211_probe_status(sdata->dev, hdr->addr1, |
1139 |
+ cookie, acked, |
1140 |
+ info->status.ack_signal, |
1141 |
+@@ -1030,7 +1029,7 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw, |
1142 |
+ I802_DEBUG_INC(local->dot11FailedCount); |
1143 |
+ } |
1144 |
+ |
1145 |
+- if ((ieee80211_is_nullfunc(fc) || ieee80211_is_qos_nullfunc(fc)) && |
1146 |
++ if (ieee80211_is_any_nullfunc(fc) && |
1147 |
+ ieee80211_has_pm(fc) && |
1148 |
+ ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS) && |
1149 |
+ !(info->flags & IEEE80211_TX_CTL_INJECTED) && |
1150 |
+diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c |
1151 |
+index 41da41cb5c40..30201aeb426c 100644 |
1152 |
+--- a/net/mac80211/tx.c |
1153 |
++++ b/net/mac80211/tx.c |
1154 |
+@@ -297,7 +297,7 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx) |
1155 |
+ if (unlikely(test_bit(SCAN_SW_SCANNING, &tx->local->scanning)) && |
1156 |
+ test_bit(SDATA_STATE_OFFCHANNEL, &tx->sdata->state) && |
1157 |
+ !ieee80211_is_probe_req(hdr->frame_control) && |
1158 |
+- !ieee80211_is_nullfunc(hdr->frame_control)) |
1159 |
++ !ieee80211_is_any_nullfunc(hdr->frame_control)) |
1160 |
+ /* |
1161 |
+ * When software scanning only nullfunc frames (to notify |
1162 |
+ * the sleep state to the AP) and probe requests (for the |
1163 |
+diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c |
1164 |
+index 48d63956a68c..d5eda966a706 100644 |
1165 |
+--- a/net/sctp/sm_make_chunk.c |
1166 |
++++ b/net/sctp/sm_make_chunk.c |
1167 |
+@@ -858,7 +858,11 @@ struct sctp_chunk *sctp_make_shutdown(const struct sctp_association *asoc, |
1168 |
+ struct sctp_chunk *retval; |
1169 |
+ __u32 ctsn; |
1170 |
+ |
1171 |
+- ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map); |
1172 |
++ if (chunk && chunk->asoc) |
1173 |
++ ctsn = sctp_tsnmap_get_ctsn(&chunk->asoc->peer.tsn_map); |
1174 |
++ else |
1175 |
++ ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map); |
1176 |
++ |
1177 |
+ shut.cum_tsn_ack = htonl(ctsn); |
1178 |
+ |
1179 |
+ retval = sctp_make_control(asoc, SCTP_CID_SHUTDOWN, 0, |
1180 |
+diff --git a/scripts/config b/scripts/config |
1181 |
+index e0e39826dae9..eee5b7f3a092 100755 |
1182 |
+--- a/scripts/config |
1183 |
++++ b/scripts/config |
1184 |
+@@ -7,6 +7,9 @@ myname=${0##*/} |
1185 |
+ # If no prefix forced, use the default CONFIG_ |
1186 |
+ CONFIG_="${CONFIG_-CONFIG_}" |
1187 |
+ |
1188 |
++# We use an uncommon delimiter for sed substitutions |
1189 |
++SED_DELIM=$(echo -en "\001") |
1190 |
++ |
1191 |
+ usage() { |
1192 |
+ cat >&2 <<EOL |
1193 |
+ Manipulate options in a .config file from the command line. |
1194 |
+@@ -83,7 +86,7 @@ txt_subst() { |
1195 |
+ local infile="$3" |
1196 |
+ local tmpfile="$infile.swp" |
1197 |
+ |
1198 |
+- sed -e "s:$before:$after:" "$infile" >"$tmpfile" |
1199 |
++ sed -e "s$SED_DELIM$before$SED_DELIM$after$SED_DELIM" "$infile" >"$tmpfile" |
1200 |
+ # replace original file with the edited one |
1201 |
+ mv "$tmpfile" "$infile" |
1202 |
+ } |
1203 |
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c |
1204 |
+index 1673479b4eef..612441508e80 100644 |
1205 |
+--- a/sound/pci/hda/hda_intel.c |
1206 |
++++ b/sound/pci/hda/hda_intel.c |
1207 |
+@@ -2023,9 +2023,10 @@ static void pcm_mmap_prepare(struct snd_pcm_substream *substream, |
1208 |
+ * some HD-audio PCI entries are exposed without any codecs, and such devices |
1209 |
+ * should be ignored from the beginning. |
1210 |
+ */ |
1211 |
+-static const struct snd_pci_quirk driver_blacklist[] = { |
1212 |
+- SND_PCI_QUIRK(0x1462, 0xcb59, "MSI TRX40 Creator", 0), |
1213 |
+- SND_PCI_QUIRK(0x1462, 0xcb60, "MSI TRX40", 0), |
1214 |
++static const struct pci_device_id driver_blacklist[] = { |
1215 |
++ { PCI_DEVICE_SUB(0x1022, 0x1487, 0x1043, 0x874f) }, /* ASUS ROG Zenith II / Strix */ |
1216 |
++ { PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb59) }, /* MSI TRX40 Creator */ |
1217 |
++ { PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb60) }, /* MSI TRX40 */ |
1218 |
+ {} |
1219 |
+ }; |
1220 |
+ |
1221 |
+@@ -2064,7 +2065,7 @@ static int azx_probe(struct pci_dev *pci, |
1222 |
+ bool schedule_probe; |
1223 |
+ int err; |
1224 |
+ |
1225 |
+- if (snd_pci_quirk_lookup(pci, driver_blacklist)) { |
1226 |
++ if (pci_match_id(driver_blacklist, pci)) { |
1227 |
+ dev_info(&pci->dev, "Skipping the blacklisted device\n"); |
1228 |
+ return -ENODEV; |
1229 |
+ } |
1230 |
+diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c |
1231 |
+index 18c173e6a13b..78d5b4d31bb6 100644 |
1232 |
+--- a/sound/soc/codecs/hdac_hdmi.c |
1233 |
++++ b/sound/soc/codecs/hdac_hdmi.c |
1234 |
+@@ -150,14 +150,14 @@ static struct hdac_hdmi_pcm * |
1235 |
+ hdac_hdmi_get_pcm_from_cvt(struct hdac_hdmi_priv *hdmi, |
1236 |
+ struct hdac_hdmi_cvt *cvt) |
1237 |
+ { |
1238 |
+- struct hdac_hdmi_pcm *pcm = NULL; |
1239 |
++ struct hdac_hdmi_pcm *pcm; |
1240 |
+ |
1241 |
+ list_for_each_entry(pcm, &hdmi->pcm_list, head) { |
1242 |
+ if (pcm->cvt == cvt) |
1243 |
+- break; |
1244 |
++ return pcm; |
1245 |
+ } |
1246 |
+ |
1247 |
+- return pcm; |
1248 |
++ return NULL; |
1249 |
+ } |
1250 |
+ |
1251 |
+ static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm, |
1252 |
+diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c |
1253 |
+index e949b372cead..f5b59305c957 100644 |
1254 |
+--- a/sound/soc/codecs/sgtl5000.c |
1255 |
++++ b/sound/soc/codecs/sgtl5000.c |
1256 |
+@@ -1645,6 +1645,40 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, |
1257 |
+ dev_err(&client->dev, |
1258 |
+ "Error %d initializing CHIP_CLK_CTRL\n", ret); |
1259 |
+ |
1260 |
++ /* Mute everything to avoid pop from the following power-up */ |
1261 |
++ ret = regmap_write(sgtl5000->regmap, SGTL5000_CHIP_ANA_CTRL, |
1262 |
++ SGTL5000_CHIP_ANA_CTRL_DEFAULT); |
1263 |
++ if (ret) { |
1264 |
++ dev_err(&client->dev, |
1265 |
++ "Error %d muting outputs via CHIP_ANA_CTRL\n", ret); |
1266 |
++ goto disable_clk; |
1267 |
++ } |
1268 |
++ |
1269 |
++ /* |
1270 |
++ * If VAG is powered-on (e.g. from previous boot), it would be disabled |
1271 |
++ * by the write to ANA_POWER in later steps of the probe code. This |
1272 |
++ * may create a loud pop even with all outputs muted. The proper way |
1273 |
++ * to circumvent this is disabling the bit first and waiting the proper |
1274 |
++ * cool-down time. |
1275 |
++ */ |
1276 |
++ ret = regmap_read(sgtl5000->regmap, SGTL5000_CHIP_ANA_POWER, &value); |
1277 |
++ if (ret) { |
1278 |
++ dev_err(&client->dev, "Failed to read ANA_POWER: %d\n", ret); |
1279 |
++ goto disable_clk; |
1280 |
++ } |
1281 |
++ if (value & SGTL5000_VAG_POWERUP) { |
1282 |
++ ret = regmap_update_bits(sgtl5000->regmap, |
1283 |
++ SGTL5000_CHIP_ANA_POWER, |
1284 |
++ SGTL5000_VAG_POWERUP, |
1285 |
++ 0); |
1286 |
++ if (ret) { |
1287 |
++ dev_err(&client->dev, "Error %d disabling VAG\n", ret); |
1288 |
++ goto disable_clk; |
1289 |
++ } |
1290 |
++ |
1291 |
++ msleep(SGTL5000_VAG_POWERDOWN_DELAY); |
1292 |
++ } |
1293 |
++ |
1294 |
+ /* Follow section 2.2.1.1 of AN3663 */ |
1295 |
+ ana_pwr = SGTL5000_ANA_POWER_DEFAULT; |
1296 |
+ if (sgtl5000->num_supplies <= VDDD) { |
1297 |
+diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h |
1298 |
+index a4bf4bca95bf..56ec5863f250 100644 |
1299 |
+--- a/sound/soc/codecs/sgtl5000.h |
1300 |
++++ b/sound/soc/codecs/sgtl5000.h |
1301 |
+@@ -233,6 +233,7 @@ |
1302 |
+ /* |
1303 |
+ * SGTL5000_CHIP_ANA_CTRL |
1304 |
+ */ |
1305 |
++#define SGTL5000_CHIP_ANA_CTRL_DEFAULT 0x0133 |
1306 |
+ #define SGTL5000_LINE_OUT_MUTE 0x0100 |
1307 |
+ #define SGTL5000_HP_SEL_MASK 0x0040 |
1308 |
+ #define SGTL5000_HP_SEL_SHIFT 6 |
1309 |
+diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c |
1310 |
+index fc5d089868df..4a7d3413917f 100644 |
1311 |
+--- a/sound/soc/sh/rcar/ssi.c |
1312 |
++++ b/sound/soc/sh/rcar/ssi.c |
1313 |
+@@ -594,10 +594,16 @@ static int rsnd_ssi_stop(struct rsnd_mod *mod, |
1314 |
+ * Capture: It might not receave data. Do nothing |
1315 |
+ */ |
1316 |
+ if (rsnd_io_is_play(io)) { |
1317 |
+- rsnd_mod_write(mod, SSICR, cr | EN); |
1318 |
++ rsnd_mod_write(mod, SSICR, cr | ssi->cr_en); |
1319 |
+ rsnd_ssi_status_check(mod, DIRQ); |
1320 |
+ } |
1321 |
+ |
1322 |
++ /* In multi-SSI mode, stop is performed by setting ssi0129 in |
1323 |
++ * SSI_CONTROL to 0 (in rsnd_ssio_stop_gen2). Do nothing here. |
1324 |
++ */ |
1325 |
++ if (rsnd_ssi_multi_slaves_runtime(io)) |
1326 |
++ return 0; |
1327 |
++ |
1328 |
+ /* |
1329 |
+ * disable SSI, |
1330 |
+ * and, wait idle state |
1331 |
+@@ -737,6 +743,9 @@ static void rsnd_ssi_parent_attach(struct rsnd_mod *mod, |
1332 |
+ if (!rsnd_rdai_is_clk_master(rdai)) |
1333 |
+ return; |
1334 |
+ |
1335 |
++ if (rsnd_ssi_is_multi_slave(mod, io)) |
1336 |
++ return; |
1337 |
++ |
1338 |
+ switch (rsnd_mod_id(mod)) { |
1339 |
+ case 1: |
1340 |
+ case 2: |
1341 |
+diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c |
1342 |
+index f35d88211887..9c7c3e7539c9 100644 |
1343 |
+--- a/sound/soc/sh/rcar/ssiu.c |
1344 |
++++ b/sound/soc/sh/rcar/ssiu.c |
1345 |
+@@ -221,7 +221,7 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod, |
1346 |
+ i; |
1347 |
+ |
1348 |
+ for_each_rsnd_mod_array(i, pos, io, rsnd_ssi_array) { |
1349 |
+- shift = (i * 4) + 16; |
1350 |
++ shift = (i * 4) + 20; |
1351 |
+ val = (val & ~(0xF << shift)) | |
1352 |
+ rsnd_mod_id(pos) << shift; |
1353 |
+ } |
1354 |
+diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c |
1355 |
+index 17556a47f727..65c91abb9462 100644 |
1356 |
+--- a/sound/soc/soc-topology.c |
1357 |
++++ b/sound/soc/soc-topology.c |
1358 |
+@@ -893,7 +893,13 @@ static int soc_tplg_dmixer_create(struct soc_tplg *tplg, unsigned int count, |
1359 |
+ } |
1360 |
+ |
1361 |
+ /* create any TLV data */ |
1362 |
+- soc_tplg_create_tlv(tplg, &kc, &mc->hdr); |
1363 |
++ err = soc_tplg_create_tlv(tplg, &kc, &mc->hdr); |
1364 |
++ if (err < 0) { |
1365 |
++ dev_err(tplg->dev, "ASoC: failed to create TLV %s\n", |
1366 |
++ mc->hdr.name); |
1367 |
++ kfree(sm); |
1368 |
++ continue; |
1369 |
++ } |
1370 |
+ |
1371 |
+ /* pass control to driver for optional further init */ |
1372 |
+ err = soc_tplg_init_kcontrol(tplg, &kc, |
1373 |
+@@ -1117,6 +1123,7 @@ static int soc_tplg_kcontrol_elems_load(struct soc_tplg *tplg, |
1374 |
+ struct snd_soc_tplg_hdr *hdr) |
1375 |
+ { |
1376 |
+ struct snd_soc_tplg_ctl_hdr *control_hdr; |
1377 |
++ int ret; |
1378 |
+ int i; |
1379 |
+ |
1380 |
+ if (tplg->pass != SOC_TPLG_PASS_MIXER) { |
1381 |
+@@ -1145,25 +1152,30 @@ static int soc_tplg_kcontrol_elems_load(struct soc_tplg *tplg, |
1382 |
+ case SND_SOC_TPLG_CTL_RANGE: |
1383 |
+ case SND_SOC_TPLG_DAPM_CTL_VOLSW: |
1384 |
+ case SND_SOC_TPLG_DAPM_CTL_PIN: |
1385 |
+- soc_tplg_dmixer_create(tplg, 1, |
1386 |
+- le32_to_cpu(hdr->payload_size)); |
1387 |
++ ret = soc_tplg_dmixer_create(tplg, 1, |
1388 |
++ le32_to_cpu(hdr->payload_size)); |
1389 |
+ break; |
1390 |
+ case SND_SOC_TPLG_CTL_ENUM: |
1391 |
+ case SND_SOC_TPLG_CTL_ENUM_VALUE: |
1392 |
+ case SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE: |
1393 |
+ case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT: |
1394 |
+ case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE: |
1395 |
+- soc_tplg_denum_create(tplg, 1, |
1396 |
+- le32_to_cpu(hdr->payload_size)); |
1397 |
++ ret = soc_tplg_denum_create(tplg, 1, |
1398 |
++ le32_to_cpu(hdr->payload_size)); |
1399 |
+ break; |
1400 |
+ case SND_SOC_TPLG_CTL_BYTES: |
1401 |
+- soc_tplg_dbytes_create(tplg, 1, |
1402 |
+- le32_to_cpu(hdr->payload_size)); |
1403 |
++ ret = soc_tplg_dbytes_create(tplg, 1, |
1404 |
++ le32_to_cpu(hdr->payload_size)); |
1405 |
+ break; |
1406 |
+ default: |
1407 |
+ soc_bind_err(tplg, control_hdr, i); |
1408 |
+ return -EINVAL; |
1409 |
+ } |
1410 |
++ if (ret < 0) { |
1411 |
++ dev_err(tplg->dev, "ASoC: invalid control\n"); |
1412 |
++ return ret; |
1413 |
++ } |
1414 |
++ |
1415 |
+ } |
1416 |
+ |
1417 |
+ return 0; |
1418 |
+@@ -1271,7 +1283,9 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg, |
1419 |
+ routes[i]->dobj.index = tplg->index; |
1420 |
+ list_add(&routes[i]->dobj.list, &tplg->comp->dobj_list); |
1421 |
+ |
1422 |
+- soc_tplg_add_route(tplg, routes[i]); |
1423 |
++ ret = soc_tplg_add_route(tplg, routes[i]); |
1424 |
++ if (ret < 0) |
1425 |
++ break; |
1426 |
+ |
1427 |
+ /* add route, but keep going if some fail */ |
1428 |
+ snd_soc_dapm_add_routes(dapm, routes[i], 1); |
1429 |
+@@ -1354,7 +1368,13 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dmixer_create( |
1430 |
+ } |
1431 |
+ |
1432 |
+ /* create any TLV data */ |
1433 |
+- soc_tplg_create_tlv(tplg, &kc[i], &mc->hdr); |
1434 |
++ err = soc_tplg_create_tlv(tplg, &kc[i], &mc->hdr); |
1435 |
++ if (err < 0) { |
1436 |
++ dev_err(tplg->dev, "ASoC: failed to create TLV %s\n", |
1437 |
++ mc->hdr.name); |
1438 |
++ kfree(sm); |
1439 |
++ continue; |
1440 |
++ } |
1441 |
+ |
1442 |
+ /* pass control to driver for optional further init */ |
1443 |
+ err = soc_tplg_init_kcontrol(tplg, &kc[i], |
1444 |
+@@ -2072,7 +2092,9 @@ static int soc_tplg_pcm_elems_load(struct soc_tplg *tplg, |
1445 |
+ _pcm = pcm; |
1446 |
+ } else { |
1447 |
+ abi_match = false; |
1448 |
+- pcm_new_ver(tplg, pcm, &_pcm); |
1449 |
++ ret = pcm_new_ver(tplg, pcm, &_pcm); |
1450 |
++ if (ret < 0) |
1451 |
++ return ret; |
1452 |
+ } |
1453 |
+ |
1454 |
+ /* create the FE DAIs and DAI links */ |
1455 |
+@@ -2409,7 +2431,7 @@ static int soc_tplg_dai_elems_load(struct soc_tplg *tplg, |
1456 |
+ { |
1457 |
+ struct snd_soc_tplg_dai *dai; |
1458 |
+ int count; |
1459 |
+- int i; |
1460 |
++ int i, ret; |
1461 |
+ |
1462 |
+ count = le32_to_cpu(hdr->count); |
1463 |
+ |
1464 |
+@@ -2424,7 +2446,12 @@ static int soc_tplg_dai_elems_load(struct soc_tplg *tplg, |
1465 |
+ return -EINVAL; |
1466 |
+ } |
1467 |
+ |
1468 |
+- soc_tplg_dai_config(tplg, dai); |
1469 |
++ ret = soc_tplg_dai_config(tplg, dai); |
1470 |
++ if (ret < 0) { |
1471 |
++ dev_err(tplg->dev, "ASoC: failed to configure DAI\n"); |
1472 |
++ return ret; |
1473 |
++ } |
1474 |
++ |
1475 |
+ tplg->pos += (sizeof(*dai) + le32_to_cpu(dai->priv.size)); |
1476 |
+ } |
1477 |
+ |
1478 |
+@@ -2532,7 +2559,7 @@ static int soc_valid_header(struct soc_tplg *tplg, |
1479 |
+ } |
1480 |
+ |
1481 |
+ /* big endian firmware objects not supported atm */ |
1482 |
+- if (hdr->magic == SOC_TPLG_MAGIC_BIG_ENDIAN) { |
1483 |
++ if (le32_to_cpu(hdr->magic) == SOC_TPLG_MAGIC_BIG_ENDIAN) { |
1484 |
+ dev_err(tplg->dev, |
1485 |
+ "ASoC: pass %d big endian not supported header got %x at offset 0x%lx size 0x%zx.\n", |
1486 |
+ tplg->pass, hdr->magic, |
1487 |
+diff --git a/tools/arch/arm64/include/uapi/asm/unistd.h b/tools/arch/arm64/include/uapi/asm/unistd.h |
1488 |
+index 4703d218663a..f83a70e07df8 100644 |
1489 |
+--- a/tools/arch/arm64/include/uapi/asm/unistd.h |
1490 |
++++ b/tools/arch/arm64/include/uapi/asm/unistd.h |
1491 |
+@@ -19,5 +19,6 @@ |
1492 |
+ #define __ARCH_WANT_NEW_STAT |
1493 |
+ #define __ARCH_WANT_SET_GET_RLIMIT |
1494 |
+ #define __ARCH_WANT_TIME32_SYSCALLS |
1495 |
++#define __ARCH_WANT_SYS_CLONE3 |
1496 |
+ |
1497 |
+ #include <asm-generic/unistd.h> |
1498 |
+diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile |
1499 |
+index 122321d54922..d045707e7c9a 100644 |
1500 |
+--- a/tools/lib/bpf/Makefile |
1501 |
++++ b/tools/lib/bpf/Makefile |
1502 |
+@@ -145,6 +145,7 @@ PC_FILE := $(addprefix $(OUTPUT),$(PC_FILE)) |
1503 |
+ |
1504 |
+ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ |
1505 |
+ cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ |
1506 |
++ sed 's/\[.*\]//' | \ |
1507 |
+ awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ |
1508 |
+ sort -u | wc -l) |
1509 |
+ VERSIONED_SYM_COUNT = $(shell readelf -s --wide $(OUTPUT)libbpf.so | \ |
1510 |
+@@ -217,6 +218,7 @@ check_abi: $(OUTPUT)libbpf.so |
1511 |
+ "versioned in $(VERSION_SCRIPT)." >&2; \ |
1512 |
+ readelf -s --wide $(BPF_IN_SHARED) | \ |
1513 |
+ cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ |
1514 |
++ sed 's/\[.*\]//' | \ |
1515 |
+ awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ |
1516 |
+ sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ |
1517 |
+ readelf -s --wide $(OUTPUT)libbpf.so | \ |
1518 |
+diff --git a/tools/testing/selftests/ipc/msgque.c b/tools/testing/selftests/ipc/msgque.c |
1519 |
+index 4c156aeab6b8..5ec4d9e18806 100644 |
1520 |
+--- a/tools/testing/selftests/ipc/msgque.c |
1521 |
++++ b/tools/testing/selftests/ipc/msgque.c |
1522 |
+@@ -137,7 +137,7 @@ int dump_queue(struct msgque_data *msgque) |
1523 |
+ for (kern_id = 0; kern_id < 256; kern_id++) { |
1524 |
+ ret = msgctl(kern_id, MSG_STAT, &ds); |
1525 |
+ if (ret < 0) { |
1526 |
+- if (errno == -EINVAL) |
1527 |
++ if (errno == EINVAL) |
1528 |
+ continue; |
1529 |
+ printf("Failed to get stats for IPC queue with id %d\n", |
1530 |
+ kern_id); |