1 |
commit: f745b9507cb522a1a06e93f2dcd1f04d9d0ec998 |
2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 9 21:30:06 2021 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 9 21:30:06 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=f745b950 |
7 |
|
8 |
Linux patch 5.14.11 |
9 |
|
10 |
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> |
11 |
|
12 |
0000_README | 4 + |
13 |
1010_linux-5.14.11.patch | 1738 ++++++++++++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 1742 insertions(+) |
15 |
|
16 |
diff --git a/0000_README b/0000_README |
17 |
index 11074a3..6096d94 100644 |
18 |
--- a/0000_README |
19 |
+++ b/0000_README |
20 |
@@ -87,6 +87,10 @@ Patch: 1009_linux-5.14.10.patch |
21 |
From: http://www.kernel.org |
22 |
Desc: Linux 5.14.10 |
23 |
|
24 |
+Patch: 1010_linux-5.14.11.patch |
25 |
+From: http://www.kernel.org |
26 |
+Desc: Linux 5.14.11 |
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/1010_linux-5.14.11.patch b/1010_linux-5.14.11.patch |
33 |
new file mode 100644 |
34 |
index 0000000..ce6e1f2 |
35 |
--- /dev/null |
36 |
+++ b/1010_linux-5.14.11.patch |
37 |
@@ -0,0 +1,1738 @@ |
38 |
+diff --git a/Makefile b/Makefile |
39 |
+index 9f99a61d2589b..ca6c4472775cb 100644 |
40 |
+--- a/Makefile |
41 |
++++ b/Makefile |
42 |
+@@ -1,7 +1,7 @@ |
43 |
+ # SPDX-License-Identifier: GPL-2.0 |
44 |
+ VERSION = 5 |
45 |
+ PATCHLEVEL = 14 |
46 |
+-SUBLEVEL = 10 |
47 |
++SUBLEVEL = 11 |
48 |
+ EXTRAVERSION = |
49 |
+ NAME = Opossums on Parade |
50 |
+ |
51 |
+diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c |
52 |
+index 11dcc369ec14a..c9d7c29d95e1e 100644 |
53 |
+--- a/arch/arm/mach-imx/mach-imx6q.c |
54 |
++++ b/arch/arm/mach-imx/mach-imx6q.c |
55 |
+@@ -172,6 +172,9 @@ static void __init imx6q_init_machine(void) |
56 |
+ imx_get_soc_revision()); |
57 |
+ |
58 |
+ imx6q_enet_phy_init(); |
59 |
++ |
60 |
++ of_platform_default_populate(NULL, NULL, NULL); |
61 |
++ |
62 |
+ imx_anatop_init(); |
63 |
+ cpu_is_imx6q() ? imx6q_pm_init() : imx6dl_pm_init(); |
64 |
+ imx6q_1588_init(); |
65 |
+diff --git a/arch/sparc/lib/iomap.c b/arch/sparc/lib/iomap.c |
66 |
+index c9da9f139694d..f3a8cd491ce0d 100644 |
67 |
+--- a/arch/sparc/lib/iomap.c |
68 |
++++ b/arch/sparc/lib/iomap.c |
69 |
+@@ -19,8 +19,10 @@ void ioport_unmap(void __iomem *addr) |
70 |
+ EXPORT_SYMBOL(ioport_map); |
71 |
+ EXPORT_SYMBOL(ioport_unmap); |
72 |
+ |
73 |
++#ifdef CONFIG_PCI |
74 |
+ void pci_iounmap(struct pci_dev *dev, void __iomem * addr) |
75 |
+ { |
76 |
+ /* nothing to do */ |
77 |
+ } |
78 |
+ EXPORT_SYMBOL(pci_iounmap); |
79 |
++#endif |
80 |
+diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c |
81 |
+index 3092fbf9dbe4c..98729ce899175 100644 |
82 |
+--- a/arch/x86/events/core.c |
83 |
++++ b/arch/x86/events/core.c |
84 |
+@@ -2467,6 +2467,7 @@ static int x86_pmu_event_init(struct perf_event *event) |
85 |
+ if (err) { |
86 |
+ if (event->destroy) |
87 |
+ event->destroy(event); |
88 |
++ event->destroy = NULL; |
89 |
+ } |
90 |
+ |
91 |
+ if (READ_ONCE(x86_pmu.attr_rdpmc) && |
92 |
+diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c |
93 |
+index 69639f9624f56..19d6ffdd3f736 100644 |
94 |
+--- a/arch/x86/kvm/svm/svm.c |
95 |
++++ b/arch/x86/kvm/svm/svm.c |
96 |
+@@ -1601,6 +1601,8 @@ static void svm_clear_vintr(struct vcpu_svm *svm) |
97 |
+ |
98 |
+ svm->vmcb->control.int_ctl |= svm->nested.ctl.int_ctl & |
99 |
+ V_IRQ_INJECTION_BITS_MASK; |
100 |
++ |
101 |
++ svm->vmcb->control.int_vector = svm->nested.ctl.int_vector; |
102 |
+ } |
103 |
+ |
104 |
+ vmcb_mark_dirty(svm->vmcb, VMCB_INTR); |
105 |
+diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c |
106 |
+index 6d5d6e93f5c41..4b0e866e9f086 100644 |
107 |
+--- a/arch/x86/kvm/x86.c |
108 |
++++ b/arch/x86/kvm/x86.c |
109 |
+@@ -1327,6 +1327,13 @@ static const u32 msrs_to_save_all[] = { |
110 |
+ MSR_ARCH_PERFMON_EVENTSEL0 + 12, MSR_ARCH_PERFMON_EVENTSEL0 + 13, |
111 |
+ MSR_ARCH_PERFMON_EVENTSEL0 + 14, MSR_ARCH_PERFMON_EVENTSEL0 + 15, |
112 |
+ MSR_ARCH_PERFMON_EVENTSEL0 + 16, MSR_ARCH_PERFMON_EVENTSEL0 + 17, |
113 |
++ |
114 |
++ MSR_K7_EVNTSEL0, MSR_K7_EVNTSEL1, MSR_K7_EVNTSEL2, MSR_K7_EVNTSEL3, |
115 |
++ MSR_K7_PERFCTR0, MSR_K7_PERFCTR1, MSR_K7_PERFCTR2, MSR_K7_PERFCTR3, |
116 |
++ MSR_F15H_PERF_CTL0, MSR_F15H_PERF_CTL1, MSR_F15H_PERF_CTL2, |
117 |
++ MSR_F15H_PERF_CTL3, MSR_F15H_PERF_CTL4, MSR_F15H_PERF_CTL5, |
118 |
++ MSR_F15H_PERF_CTR0, MSR_F15H_PERF_CTR1, MSR_F15H_PERF_CTR2, |
119 |
++ MSR_F15H_PERF_CTR3, MSR_F15H_PERF_CTR4, MSR_F15H_PERF_CTR5, |
120 |
+ }; |
121 |
+ |
122 |
+ static u32 msrs_to_save[ARRAY_SIZE(msrs_to_save_all)]; |
123 |
+@@ -7659,6 +7666,13 @@ static void kvm_smm_changed(struct kvm_vcpu *vcpu, bool entering_smm) |
124 |
+ |
125 |
+ /* Process a latched INIT or SMI, if any. */ |
126 |
+ kvm_make_request(KVM_REQ_EVENT, vcpu); |
127 |
++ |
128 |
++ /* |
129 |
++ * Even if KVM_SET_SREGS2 loaded PDPTRs out of band, |
130 |
++ * on SMM exit we still need to reload them from |
131 |
++ * guest memory |
132 |
++ */ |
133 |
++ vcpu->arch.pdptrs_from_userspace = false; |
134 |
+ } |
135 |
+ |
136 |
+ kvm_mmu_reset_context(vcpu); |
137 |
+diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c |
138 |
+index 058f19b20465f..c565def611e24 100644 |
139 |
+--- a/arch/x86/lib/insn.c |
140 |
++++ b/arch/x86/lib/insn.c |
141 |
+@@ -37,10 +37,10 @@ |
142 |
+ ((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr) |
143 |
+ |
144 |
+ #define __get_next(t, insn) \ |
145 |
+- ({ t r = *(t*)insn->next_byte; insn->next_byte += sizeof(t); leXX_to_cpu(t, r); }) |
146 |
++ ({ t r; memcpy(&r, insn->next_byte, sizeof(t)); insn->next_byte += sizeof(t); leXX_to_cpu(t, r); }) |
147 |
+ |
148 |
+ #define __peek_nbyte_next(t, insn, n) \ |
149 |
+- ({ t r = *(t*)((insn)->next_byte + n); leXX_to_cpu(t, r); }) |
150 |
++ ({ t r; memcpy(&r, (insn)->next_byte + n, sizeof(t)); leXX_to_cpu(t, r); }) |
151 |
+ |
152 |
+ #define get_next(t, insn) \ |
153 |
+ ({ if (unlikely(!validate_next(t, insn, 0))) goto err_out; __get_next(t, insn); }) |
154 |
+diff --git a/block/bio.c b/block/bio.c |
155 |
+index d95e3456ba0c5..52548c4878836 100644 |
156 |
+--- a/block/bio.c |
157 |
++++ b/block/bio.c |
158 |
+@@ -1396,7 +1396,7 @@ again: |
159 |
+ if (!bio_integrity_endio(bio)) |
160 |
+ return; |
161 |
+ |
162 |
+- if (bio->bi_bdev) |
163 |
++ if (bio->bi_bdev && bio_flagged(bio, BIO_TRACKED)) |
164 |
+ rq_qos_done_bio(bio->bi_bdev->bd_disk->queue, bio); |
165 |
+ |
166 |
+ if (bio->bi_bdev && bio_flagged(bio, BIO_TRACE_COMPLETION)) { |
167 |
+diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c |
168 |
+index 0e6e73b8023fc..8916163d508e0 100644 |
169 |
+--- a/drivers/ata/libata-core.c |
170 |
++++ b/drivers/ata/libata-core.c |
171 |
+@@ -2199,6 +2199,25 @@ static void ata_dev_config_ncq_prio(struct ata_device *dev) |
172 |
+ |
173 |
+ } |
174 |
+ |
175 |
++static bool ata_dev_check_adapter(struct ata_device *dev, |
176 |
++ unsigned short vendor_id) |
177 |
++{ |
178 |
++ struct pci_dev *pcidev = NULL; |
179 |
++ struct device *parent_dev = NULL; |
180 |
++ |
181 |
++ for (parent_dev = dev->tdev.parent; parent_dev != NULL; |
182 |
++ parent_dev = parent_dev->parent) { |
183 |
++ if (dev_is_pci(parent_dev)) { |
184 |
++ pcidev = to_pci_dev(parent_dev); |
185 |
++ if (pcidev->vendor == vendor_id) |
186 |
++ return true; |
187 |
++ break; |
188 |
++ } |
189 |
++ } |
190 |
++ |
191 |
++ return false; |
192 |
++} |
193 |
++ |
194 |
+ static int ata_dev_config_ncq(struct ata_device *dev, |
195 |
+ char *desc, size_t desc_sz) |
196 |
+ { |
197 |
+@@ -2217,6 +2236,13 @@ static int ata_dev_config_ncq(struct ata_device *dev, |
198 |
+ snprintf(desc, desc_sz, "NCQ (not used)"); |
199 |
+ return 0; |
200 |
+ } |
201 |
++ |
202 |
++ if (dev->horkage & ATA_HORKAGE_NO_NCQ_ON_ATI && |
203 |
++ ata_dev_check_adapter(dev, PCI_VENDOR_ID_ATI)) { |
204 |
++ snprintf(desc, desc_sz, "NCQ (not used)"); |
205 |
++ return 0; |
206 |
++ } |
207 |
++ |
208 |
+ if (ap->flags & ATA_FLAG_NCQ) { |
209 |
+ hdepth = min(ap->scsi_host->can_queue, ATA_MAX_QUEUE); |
210 |
+ dev->flags |= ATA_DFLAG_NCQ; |
211 |
+@@ -3951,9 +3977,11 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { |
212 |
+ { "Samsung SSD 850*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | |
213 |
+ ATA_HORKAGE_ZERO_AFTER_TRIM, }, |
214 |
+ { "Samsung SSD 860*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | |
215 |
+- ATA_HORKAGE_ZERO_AFTER_TRIM, }, |
216 |
++ ATA_HORKAGE_ZERO_AFTER_TRIM | |
217 |
++ ATA_HORKAGE_NO_NCQ_ON_ATI, }, |
218 |
+ { "Samsung SSD 870*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | |
219 |
+- ATA_HORKAGE_ZERO_AFTER_TRIM, }, |
220 |
++ ATA_HORKAGE_ZERO_AFTER_TRIM | |
221 |
++ ATA_HORKAGE_NO_NCQ_ON_ATI, }, |
222 |
+ { "FCCT*M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | |
223 |
+ ATA_HORKAGE_ZERO_AFTER_TRIM, }, |
224 |
+ |
225 |
+@@ -6108,6 +6136,8 @@ static int __init ata_parse_force_one(char **cur, |
226 |
+ { "ncq", .horkage_off = ATA_HORKAGE_NONCQ }, |
227 |
+ { "noncqtrim", .horkage_on = ATA_HORKAGE_NO_NCQ_TRIM }, |
228 |
+ { "ncqtrim", .horkage_off = ATA_HORKAGE_NO_NCQ_TRIM }, |
229 |
++ { "noncqati", .horkage_on = ATA_HORKAGE_NO_NCQ_ON_ATI }, |
230 |
++ { "ncqati", .horkage_off = ATA_HORKAGE_NO_NCQ_ON_ATI }, |
231 |
+ { "dump_id", .horkage_on = ATA_HORKAGE_DUMP_ID }, |
232 |
+ { "pio0", .xfer_mask = 1 << (ATA_SHIFT_PIO + 0) }, |
233 |
+ { "pio1", .xfer_mask = 1 << (ATA_SHIFT_PIO + 1) }, |
234 |
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c |
235 |
+index 5a872adcfdb98..5ba8a4f353440 100644 |
236 |
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c |
237 |
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c |
238 |
+@@ -922,7 +922,6 @@ out: |
239 |
+ void kgd2kfd_device_exit(struct kfd_dev *kfd) |
240 |
+ { |
241 |
+ if (kfd->init_complete) { |
242 |
+- svm_migrate_fini((struct amdgpu_device *)kfd->kgd); |
243 |
+ device_queue_manager_uninit(kfd->dqm); |
244 |
+ kfd_interrupt_exit(kfd); |
245 |
+ kfd_topology_remove_device(kfd); |
246 |
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c |
247 |
+index dab290a4d19d1..4a16e3c257b92 100644 |
248 |
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c |
249 |
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c |
250 |
+@@ -891,9 +891,16 @@ int svm_migrate_init(struct amdgpu_device *adev) |
251 |
+ pgmap->ops = &svm_migrate_pgmap_ops; |
252 |
+ pgmap->owner = SVM_ADEV_PGMAP_OWNER(adev); |
253 |
+ pgmap->flags = MIGRATE_VMA_SELECT_DEVICE_PRIVATE; |
254 |
++ |
255 |
++ /* Device manager releases device-specific resources, memory region and |
256 |
++ * pgmap when driver disconnects from device. |
257 |
++ */ |
258 |
+ r = devm_memremap_pages(adev->dev, pgmap); |
259 |
+ if (IS_ERR(r)) { |
260 |
+ pr_err("failed to register HMM device memory\n"); |
261 |
++ |
262 |
++ /* Disable SVM support capability */ |
263 |
++ pgmap->type = 0; |
264 |
+ devm_release_mem_region(adev->dev, res->start, |
265 |
+ res->end - res->start + 1); |
266 |
+ return PTR_ERR(r); |
267 |
+@@ -908,12 +915,3 @@ int svm_migrate_init(struct amdgpu_device *adev) |
268 |
+ |
269 |
+ return 0; |
270 |
+ } |
271 |
+- |
272 |
+-void svm_migrate_fini(struct amdgpu_device *adev) |
273 |
+-{ |
274 |
+- struct dev_pagemap *pgmap = &adev->kfd.dev->pgmap; |
275 |
+- |
276 |
+- devm_memunmap_pages(adev->dev, pgmap); |
277 |
+- devm_release_mem_region(adev->dev, pgmap->range.start, |
278 |
+- pgmap->range.end - pgmap->range.start + 1); |
279 |
+-} |
280 |
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.h b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.h |
281 |
+index 0de76b5d49739..2f5b3394c9ed9 100644 |
282 |
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.h |
283 |
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.h |
284 |
+@@ -47,7 +47,6 @@ unsigned long |
285 |
+ svm_migrate_addr_to_pfn(struct amdgpu_device *adev, unsigned long addr); |
286 |
+ |
287 |
+ int svm_migrate_init(struct amdgpu_device *adev); |
288 |
+-void svm_migrate_fini(struct amdgpu_device *adev); |
289 |
+ |
290 |
+ #else |
291 |
+ |
292 |
+@@ -55,10 +54,6 @@ static inline int svm_migrate_init(struct amdgpu_device *adev) |
293 |
+ { |
294 |
+ return 0; |
295 |
+ } |
296 |
+-static inline void svm_migrate_fini(struct amdgpu_device *adev) |
297 |
+-{ |
298 |
+- /* empty */ |
299 |
+-} |
300 |
+ |
301 |
+ #endif /* IS_ENABLED(CONFIG_HSA_AMD_SVM) */ |
302 |
+ |
303 |
+diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c |
304 |
+index d329ec3d64d81..5f22c9d65e578 100644 |
305 |
+--- a/drivers/irqchip/irq-gic.c |
306 |
++++ b/drivers/irqchip/irq-gic.c |
307 |
+@@ -107,6 +107,8 @@ static DEFINE_RAW_SPINLOCK(cpu_map_lock); |
308 |
+ |
309 |
+ #endif |
310 |
+ |
311 |
++static DEFINE_STATIC_KEY_FALSE(needs_rmw_access); |
312 |
++ |
313 |
+ /* |
314 |
+ * The GIC mapping of CPU interfaces does not necessarily match |
315 |
+ * the logical CPU numbering. Let's use a mapping as returned |
316 |
+@@ -774,6 +776,25 @@ static int gic_pm_init(struct gic_chip_data *gic) |
317 |
+ #endif |
318 |
+ |
319 |
+ #ifdef CONFIG_SMP |
320 |
++static void rmw_writeb(u8 bval, void __iomem *addr) |
321 |
++{ |
322 |
++ static DEFINE_RAW_SPINLOCK(rmw_lock); |
323 |
++ unsigned long offset = (unsigned long)addr & 3UL; |
324 |
++ unsigned long shift = offset * 8; |
325 |
++ unsigned long flags; |
326 |
++ u32 val; |
327 |
++ |
328 |
++ raw_spin_lock_irqsave(&rmw_lock, flags); |
329 |
++ |
330 |
++ addr -= offset; |
331 |
++ val = readl_relaxed(addr); |
332 |
++ val &= ~GENMASK(shift + 7, shift); |
333 |
++ val |= bval << shift; |
334 |
++ writel_relaxed(val, addr); |
335 |
++ |
336 |
++ raw_spin_unlock_irqrestore(&rmw_lock, flags); |
337 |
++} |
338 |
++ |
339 |
+ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, |
340 |
+ bool force) |
341 |
+ { |
342 |
+@@ -788,7 +809,10 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, |
343 |
+ if (cpu >= NR_GIC_CPU_IF || cpu >= nr_cpu_ids) |
344 |
+ return -EINVAL; |
345 |
+ |
346 |
+- writeb_relaxed(gic_cpu_map[cpu], reg); |
347 |
++ if (static_branch_unlikely(&needs_rmw_access)) |
348 |
++ rmw_writeb(gic_cpu_map[cpu], reg); |
349 |
++ else |
350 |
++ writeb_relaxed(gic_cpu_map[cpu], reg); |
351 |
+ irq_data_update_effective_affinity(d, cpumask_of(cpu)); |
352 |
+ |
353 |
+ return IRQ_SET_MASK_OK_DONE; |
354 |
+@@ -1375,6 +1399,30 @@ static bool gic_check_eoimode(struct device_node *node, void __iomem **base) |
355 |
+ return true; |
356 |
+ } |
357 |
+ |
358 |
++static bool gic_enable_rmw_access(void *data) |
359 |
++{ |
360 |
++ /* |
361 |
++ * The EMEV2 class of machines has a broken interconnect, and |
362 |
++ * locks up on accesses that are less than 32bit. So far, only |
363 |
++ * the affinity setting requires it. |
364 |
++ */ |
365 |
++ if (of_machine_is_compatible("renesas,emev2")) { |
366 |
++ static_branch_enable(&needs_rmw_access); |
367 |
++ return true; |
368 |
++ } |
369 |
++ |
370 |
++ return false; |
371 |
++} |
372 |
++ |
373 |
++static const struct gic_quirk gic_quirks[] = { |
374 |
++ { |
375 |
++ .desc = "broken byte access", |
376 |
++ .compatible = "arm,pl390", |
377 |
++ .init = gic_enable_rmw_access, |
378 |
++ }, |
379 |
++ { }, |
380 |
++}; |
381 |
++ |
382 |
+ static int gic_of_setup(struct gic_chip_data *gic, struct device_node *node) |
383 |
+ { |
384 |
+ if (!gic || !node) |
385 |
+@@ -1391,6 +1439,8 @@ static int gic_of_setup(struct gic_chip_data *gic, struct device_node *node) |
386 |
+ if (of_property_read_u32(node, "cpu-offset", &gic->percpu_offset)) |
387 |
+ gic->percpu_offset = 0; |
388 |
+ |
389 |
++ gic_enable_of_quirks(node, gic_quirks, gic); |
390 |
++ |
391 |
+ return 0; |
392 |
+ |
393 |
+ error: |
394 |
+diff --git a/drivers/misc/habanalabs/common/command_submission.c b/drivers/misc/habanalabs/common/command_submission.c |
395 |
+index 80c60fb41bbca..d249101106dea 100644 |
396 |
+--- a/drivers/misc/habanalabs/common/command_submission.c |
397 |
++++ b/drivers/misc/habanalabs/common/command_submission.c |
398 |
+@@ -1727,6 +1727,15 @@ static int cs_ioctl_signal_wait(struct hl_fpriv *hpriv, enum hl_cs_type cs_type, |
399 |
+ goto free_cs_chunk_array; |
400 |
+ } |
401 |
+ |
402 |
++ if (!hdev->nic_ports_mask) { |
403 |
++ atomic64_inc(&ctx->cs_counters.validation_drop_cnt); |
404 |
++ atomic64_inc(&cntr->validation_drop_cnt); |
405 |
++ dev_err(hdev->dev, |
406 |
++ "Collective operations not supported when NIC ports are disabled"); |
407 |
++ rc = -EINVAL; |
408 |
++ goto free_cs_chunk_array; |
409 |
++ } |
410 |
++ |
411 |
+ collective_engine_id = chunk->collective_engine_id; |
412 |
+ } |
413 |
+ |
414 |
+diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c |
415 |
+index 409f05c962f24..8a9c4f0f37f96 100644 |
416 |
+--- a/drivers/misc/habanalabs/gaudi/gaudi.c |
417 |
++++ b/drivers/misc/habanalabs/gaudi/gaudi.c |
418 |
+@@ -5620,6 +5620,7 @@ static void gaudi_add_end_of_cb_packets(struct hl_device *hdev, |
419 |
+ { |
420 |
+ struct gaudi_device *gaudi = hdev->asic_specific; |
421 |
+ struct packet_msg_prot *cq_pkt; |
422 |
++ u64 msi_addr; |
423 |
+ u32 tmp; |
424 |
+ |
425 |
+ cq_pkt = kernel_address + len - (sizeof(struct packet_msg_prot) * 2); |
426 |
+@@ -5641,10 +5642,12 @@ static void gaudi_add_end_of_cb_packets(struct hl_device *hdev, |
427 |
+ cq_pkt->ctl = cpu_to_le32(tmp); |
428 |
+ cq_pkt->value = cpu_to_le32(1); |
429 |
+ |
430 |
+- if (!gaudi->multi_msi_mode) |
431 |
+- msi_vec = 0; |
432 |
++ if (gaudi->multi_msi_mode) |
433 |
++ msi_addr = mmPCIE_MSI_INTR_0 + msi_vec * 4; |
434 |
++ else |
435 |
++ msi_addr = mmPCIE_CORE_MSI_REQ; |
436 |
+ |
437 |
+- cq_pkt->addr = cpu_to_le64(CFG_BASE + mmPCIE_MSI_INTR_0 + msi_vec * 4); |
438 |
++ cq_pkt->addr = cpu_to_le64(CFG_BASE + msi_addr); |
439 |
+ } |
440 |
+ |
441 |
+ static void gaudi_update_eq_ci(struct hl_device *hdev, u32 val) |
442 |
+diff --git a/drivers/misc/habanalabs/gaudi/gaudi_security.c b/drivers/misc/habanalabs/gaudi/gaudi_security.c |
443 |
+index 0d3240f1f7d76..2b8bafda41bcc 100644 |
444 |
+--- a/drivers/misc/habanalabs/gaudi/gaudi_security.c |
445 |
++++ b/drivers/misc/habanalabs/gaudi/gaudi_security.c |
446 |
+@@ -8,16 +8,21 @@ |
447 |
+ #include "gaudiP.h" |
448 |
+ #include "../include/gaudi/asic_reg/gaudi_regs.h" |
449 |
+ |
450 |
+-#define GAUDI_NUMBER_OF_RR_REGS 24 |
451 |
+-#define GAUDI_NUMBER_OF_LBW_RANGES 12 |
452 |
++#define GAUDI_NUMBER_OF_LBW_RR_REGS 28 |
453 |
++#define GAUDI_NUMBER_OF_HBW_RR_REGS 24 |
454 |
++#define GAUDI_NUMBER_OF_LBW_RANGES 10 |
455 |
+ |
456 |
+-static u64 gaudi_rr_lbw_hit_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
457 |
++static u64 gaudi_rr_lbw_hit_aw_regs[GAUDI_NUMBER_OF_LBW_RR_REGS] = { |
458 |
++ mmDMA_IF_W_S_SOB_HIT_WPROT, |
459 |
+ mmDMA_IF_W_S_DMA0_HIT_WPROT, |
460 |
+ mmDMA_IF_W_S_DMA1_HIT_WPROT, |
461 |
++ mmDMA_IF_E_S_SOB_HIT_WPROT, |
462 |
+ mmDMA_IF_E_S_DMA0_HIT_WPROT, |
463 |
+ mmDMA_IF_E_S_DMA1_HIT_WPROT, |
464 |
++ mmDMA_IF_W_N_SOB_HIT_WPROT, |
465 |
+ mmDMA_IF_W_N_DMA0_HIT_WPROT, |
466 |
+ mmDMA_IF_W_N_DMA1_HIT_WPROT, |
467 |
++ mmDMA_IF_E_N_SOB_HIT_WPROT, |
468 |
+ mmDMA_IF_E_N_DMA0_HIT_WPROT, |
469 |
+ mmDMA_IF_E_N_DMA1_HIT_WPROT, |
470 |
+ mmSIF_RTR_0_LBW_RANGE_PROT_HIT_AW, |
471 |
+@@ -38,13 +43,17 @@ static u64 gaudi_rr_lbw_hit_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
472 |
+ mmNIF_RTR_7_LBW_RANGE_PROT_HIT_AW, |
473 |
+ }; |
474 |
+ |
475 |
+-static u64 gaudi_rr_lbw_hit_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
476 |
++static u64 gaudi_rr_lbw_hit_ar_regs[GAUDI_NUMBER_OF_LBW_RR_REGS] = { |
477 |
++ mmDMA_IF_W_S_SOB_HIT_RPROT, |
478 |
+ mmDMA_IF_W_S_DMA0_HIT_RPROT, |
479 |
+ mmDMA_IF_W_S_DMA1_HIT_RPROT, |
480 |
++ mmDMA_IF_E_S_SOB_HIT_RPROT, |
481 |
+ mmDMA_IF_E_S_DMA0_HIT_RPROT, |
482 |
+ mmDMA_IF_E_S_DMA1_HIT_RPROT, |
483 |
++ mmDMA_IF_W_N_SOB_HIT_RPROT, |
484 |
+ mmDMA_IF_W_N_DMA0_HIT_RPROT, |
485 |
+ mmDMA_IF_W_N_DMA1_HIT_RPROT, |
486 |
++ mmDMA_IF_E_N_SOB_HIT_RPROT, |
487 |
+ mmDMA_IF_E_N_DMA0_HIT_RPROT, |
488 |
+ mmDMA_IF_E_N_DMA1_HIT_RPROT, |
489 |
+ mmSIF_RTR_0_LBW_RANGE_PROT_HIT_AR, |
490 |
+@@ -65,13 +74,17 @@ static u64 gaudi_rr_lbw_hit_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
491 |
+ mmNIF_RTR_7_LBW_RANGE_PROT_HIT_AR, |
492 |
+ }; |
493 |
+ |
494 |
+-static u64 gaudi_rr_lbw_min_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
495 |
++static u64 gaudi_rr_lbw_min_aw_regs[GAUDI_NUMBER_OF_LBW_RR_REGS] = { |
496 |
++ mmDMA_IF_W_S_SOB_MIN_WPROT_0, |
497 |
+ mmDMA_IF_W_S_DMA0_MIN_WPROT_0, |
498 |
+ mmDMA_IF_W_S_DMA1_MIN_WPROT_0, |
499 |
++ mmDMA_IF_E_S_SOB_MIN_WPROT_0, |
500 |
+ mmDMA_IF_E_S_DMA0_MIN_WPROT_0, |
501 |
+ mmDMA_IF_E_S_DMA1_MIN_WPROT_0, |
502 |
++ mmDMA_IF_W_N_SOB_MIN_WPROT_0, |
503 |
+ mmDMA_IF_W_N_DMA0_MIN_WPROT_0, |
504 |
+ mmDMA_IF_W_N_DMA1_MIN_WPROT_0, |
505 |
++ mmDMA_IF_E_N_SOB_MIN_WPROT_0, |
506 |
+ mmDMA_IF_E_N_DMA0_MIN_WPROT_0, |
507 |
+ mmDMA_IF_E_N_DMA1_MIN_WPROT_0, |
508 |
+ mmSIF_RTR_0_LBW_RANGE_PROT_MIN_AW_0, |
509 |
+@@ -92,13 +105,17 @@ static u64 gaudi_rr_lbw_min_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
510 |
+ mmNIF_RTR_7_LBW_RANGE_PROT_MIN_AW_0, |
511 |
+ }; |
512 |
+ |
513 |
+-static u64 gaudi_rr_lbw_max_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
514 |
++static u64 gaudi_rr_lbw_max_aw_regs[GAUDI_NUMBER_OF_LBW_RR_REGS] = { |
515 |
++ mmDMA_IF_W_S_SOB_MAX_WPROT_0, |
516 |
+ mmDMA_IF_W_S_DMA0_MAX_WPROT_0, |
517 |
+ mmDMA_IF_W_S_DMA1_MAX_WPROT_0, |
518 |
++ mmDMA_IF_E_S_SOB_MAX_WPROT_0, |
519 |
+ mmDMA_IF_E_S_DMA0_MAX_WPROT_0, |
520 |
+ mmDMA_IF_E_S_DMA1_MAX_WPROT_0, |
521 |
++ mmDMA_IF_W_N_SOB_MAX_WPROT_0, |
522 |
+ mmDMA_IF_W_N_DMA0_MAX_WPROT_0, |
523 |
+ mmDMA_IF_W_N_DMA1_MAX_WPROT_0, |
524 |
++ mmDMA_IF_E_N_SOB_MAX_WPROT_0, |
525 |
+ mmDMA_IF_E_N_DMA0_MAX_WPROT_0, |
526 |
+ mmDMA_IF_E_N_DMA1_MAX_WPROT_0, |
527 |
+ mmSIF_RTR_0_LBW_RANGE_PROT_MAX_AW_0, |
528 |
+@@ -119,13 +136,17 @@ static u64 gaudi_rr_lbw_max_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
529 |
+ mmNIF_RTR_7_LBW_RANGE_PROT_MAX_AW_0, |
530 |
+ }; |
531 |
+ |
532 |
+-static u64 gaudi_rr_lbw_min_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
533 |
++static u64 gaudi_rr_lbw_min_ar_regs[GAUDI_NUMBER_OF_LBW_RR_REGS] = { |
534 |
++ mmDMA_IF_W_S_SOB_MIN_RPROT_0, |
535 |
+ mmDMA_IF_W_S_DMA0_MIN_RPROT_0, |
536 |
+ mmDMA_IF_W_S_DMA1_MIN_RPROT_0, |
537 |
++ mmDMA_IF_E_S_SOB_MIN_RPROT_0, |
538 |
+ mmDMA_IF_E_S_DMA0_MIN_RPROT_0, |
539 |
+ mmDMA_IF_E_S_DMA1_MIN_RPROT_0, |
540 |
++ mmDMA_IF_W_N_SOB_MIN_RPROT_0, |
541 |
+ mmDMA_IF_W_N_DMA0_MIN_RPROT_0, |
542 |
+ mmDMA_IF_W_N_DMA1_MIN_RPROT_0, |
543 |
++ mmDMA_IF_E_N_SOB_MIN_RPROT_0, |
544 |
+ mmDMA_IF_E_N_DMA0_MIN_RPROT_0, |
545 |
+ mmDMA_IF_E_N_DMA1_MIN_RPROT_0, |
546 |
+ mmSIF_RTR_0_LBW_RANGE_PROT_MIN_AR_0, |
547 |
+@@ -146,13 +167,17 @@ static u64 gaudi_rr_lbw_min_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
548 |
+ mmNIF_RTR_7_LBW_RANGE_PROT_MIN_AR_0, |
549 |
+ }; |
550 |
+ |
551 |
+-static u64 gaudi_rr_lbw_max_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
552 |
++static u64 gaudi_rr_lbw_max_ar_regs[GAUDI_NUMBER_OF_LBW_RR_REGS] = { |
553 |
++ mmDMA_IF_W_S_SOB_MAX_RPROT_0, |
554 |
+ mmDMA_IF_W_S_DMA0_MAX_RPROT_0, |
555 |
+ mmDMA_IF_W_S_DMA1_MAX_RPROT_0, |
556 |
++ mmDMA_IF_E_S_SOB_MAX_RPROT_0, |
557 |
+ mmDMA_IF_E_S_DMA0_MAX_RPROT_0, |
558 |
+ mmDMA_IF_E_S_DMA1_MAX_RPROT_0, |
559 |
++ mmDMA_IF_W_N_SOB_MAX_RPROT_0, |
560 |
+ mmDMA_IF_W_N_DMA0_MAX_RPROT_0, |
561 |
+ mmDMA_IF_W_N_DMA1_MAX_RPROT_0, |
562 |
++ mmDMA_IF_E_N_SOB_MAX_RPROT_0, |
563 |
+ mmDMA_IF_E_N_DMA0_MAX_RPROT_0, |
564 |
+ mmDMA_IF_E_N_DMA1_MAX_RPROT_0, |
565 |
+ mmSIF_RTR_0_LBW_RANGE_PROT_MAX_AR_0, |
566 |
+@@ -173,7 +198,7 @@ static u64 gaudi_rr_lbw_max_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
567 |
+ mmNIF_RTR_7_LBW_RANGE_PROT_MAX_AR_0, |
568 |
+ }; |
569 |
+ |
570 |
+-static u64 gaudi_rr_hbw_hit_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
571 |
++static u64 gaudi_rr_hbw_hit_aw_regs[GAUDI_NUMBER_OF_HBW_RR_REGS] = { |
572 |
+ mmDMA_IF_W_S_DOWN_CH0_RANGE_SEC_HIT_AW, |
573 |
+ mmDMA_IF_W_S_DOWN_CH1_RANGE_SEC_HIT_AW, |
574 |
+ mmDMA_IF_E_S_DOWN_CH0_RANGE_SEC_HIT_AW, |
575 |
+@@ -200,7 +225,7 @@ static u64 gaudi_rr_hbw_hit_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
576 |
+ mmNIF_RTR_CTRL_7_RANGE_SEC_HIT_AW |
577 |
+ }; |
578 |
+ |
579 |
+-static u64 gaudi_rr_hbw_hit_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
580 |
++static u64 gaudi_rr_hbw_hit_ar_regs[GAUDI_NUMBER_OF_HBW_RR_REGS] = { |
581 |
+ mmDMA_IF_W_S_DOWN_CH0_RANGE_SEC_HIT_AR, |
582 |
+ mmDMA_IF_W_S_DOWN_CH1_RANGE_SEC_HIT_AR, |
583 |
+ mmDMA_IF_E_S_DOWN_CH0_RANGE_SEC_HIT_AR, |
584 |
+@@ -227,7 +252,7 @@ static u64 gaudi_rr_hbw_hit_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
585 |
+ mmNIF_RTR_CTRL_7_RANGE_SEC_HIT_AR |
586 |
+ }; |
587 |
+ |
588 |
+-static u64 gaudi_rr_hbw_base_low_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
589 |
++static u64 gaudi_rr_hbw_base_low_aw_regs[GAUDI_NUMBER_OF_HBW_RR_REGS] = { |
590 |
+ mmDMA_IF_W_S_DOWN_CH0_RANGE_SEC_BASE_LOW_AW_0, |
591 |
+ mmDMA_IF_W_S_DOWN_CH1_RANGE_SEC_BASE_LOW_AW_0, |
592 |
+ mmDMA_IF_E_S_DOWN_CH0_RANGE_SEC_BASE_LOW_AW_0, |
593 |
+@@ -254,7 +279,7 @@ static u64 gaudi_rr_hbw_base_low_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
594 |
+ mmNIF_RTR_CTRL_7_RANGE_SEC_BASE_LOW_AW_0 |
595 |
+ }; |
596 |
+ |
597 |
+-static u64 gaudi_rr_hbw_base_high_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
598 |
++static u64 gaudi_rr_hbw_base_high_aw_regs[GAUDI_NUMBER_OF_HBW_RR_REGS] = { |
599 |
+ mmDMA_IF_W_S_DOWN_CH0_RANGE_SEC_BASE_HIGH_AW_0, |
600 |
+ mmDMA_IF_W_S_DOWN_CH1_RANGE_SEC_BASE_HIGH_AW_0, |
601 |
+ mmDMA_IF_E_S_DOWN_CH0_RANGE_SEC_BASE_HIGH_AW_0, |
602 |
+@@ -281,7 +306,7 @@ static u64 gaudi_rr_hbw_base_high_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
603 |
+ mmNIF_RTR_CTRL_7_RANGE_SEC_BASE_HIGH_AW_0 |
604 |
+ }; |
605 |
+ |
606 |
+-static u64 gaudi_rr_hbw_mask_low_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
607 |
++static u64 gaudi_rr_hbw_mask_low_aw_regs[GAUDI_NUMBER_OF_HBW_RR_REGS] = { |
608 |
+ mmDMA_IF_W_S_DOWN_CH0_RANGE_SEC_MASK_LOW_AW_0, |
609 |
+ mmDMA_IF_W_S_DOWN_CH1_RANGE_SEC_MASK_LOW_AW_0, |
610 |
+ mmDMA_IF_E_S_DOWN_CH0_RANGE_SEC_MASK_LOW_AW_0, |
611 |
+@@ -308,7 +333,7 @@ static u64 gaudi_rr_hbw_mask_low_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
612 |
+ mmNIF_RTR_CTRL_7_RANGE_SEC_MASK_LOW_AW_0 |
613 |
+ }; |
614 |
+ |
615 |
+-static u64 gaudi_rr_hbw_mask_high_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
616 |
++static u64 gaudi_rr_hbw_mask_high_aw_regs[GAUDI_NUMBER_OF_HBW_RR_REGS] = { |
617 |
+ mmDMA_IF_W_S_DOWN_CH0_RANGE_SEC_MASK_HIGH_AW_0, |
618 |
+ mmDMA_IF_W_S_DOWN_CH1_RANGE_SEC_MASK_HIGH_AW_0, |
619 |
+ mmDMA_IF_E_S_DOWN_CH0_RANGE_SEC_MASK_HIGH_AW_0, |
620 |
+@@ -335,7 +360,7 @@ static u64 gaudi_rr_hbw_mask_high_aw_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
621 |
+ mmNIF_RTR_CTRL_7_RANGE_SEC_MASK_HIGH_AW_0 |
622 |
+ }; |
623 |
+ |
624 |
+-static u64 gaudi_rr_hbw_base_low_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
625 |
++static u64 gaudi_rr_hbw_base_low_ar_regs[GAUDI_NUMBER_OF_HBW_RR_REGS] = { |
626 |
+ mmDMA_IF_W_S_DOWN_CH0_RANGE_SEC_BASE_LOW_AR_0, |
627 |
+ mmDMA_IF_W_S_DOWN_CH1_RANGE_SEC_BASE_LOW_AR_0, |
628 |
+ mmDMA_IF_E_S_DOWN_CH0_RANGE_SEC_BASE_LOW_AR_0, |
629 |
+@@ -362,7 +387,7 @@ static u64 gaudi_rr_hbw_base_low_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
630 |
+ mmNIF_RTR_CTRL_7_RANGE_SEC_BASE_LOW_AR_0 |
631 |
+ }; |
632 |
+ |
633 |
+-static u64 gaudi_rr_hbw_base_high_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
634 |
++static u64 gaudi_rr_hbw_base_high_ar_regs[GAUDI_NUMBER_OF_HBW_RR_REGS] = { |
635 |
+ mmDMA_IF_W_S_DOWN_CH0_RANGE_SEC_BASE_HIGH_AR_0, |
636 |
+ mmDMA_IF_W_S_DOWN_CH1_RANGE_SEC_BASE_HIGH_AR_0, |
637 |
+ mmDMA_IF_E_S_DOWN_CH0_RANGE_SEC_BASE_HIGH_AR_0, |
638 |
+@@ -389,7 +414,7 @@ static u64 gaudi_rr_hbw_base_high_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
639 |
+ mmNIF_RTR_CTRL_7_RANGE_SEC_BASE_HIGH_AR_0 |
640 |
+ }; |
641 |
+ |
642 |
+-static u64 gaudi_rr_hbw_mask_low_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
643 |
++static u64 gaudi_rr_hbw_mask_low_ar_regs[GAUDI_NUMBER_OF_HBW_RR_REGS] = { |
644 |
+ mmDMA_IF_W_S_DOWN_CH0_RANGE_SEC_MASK_LOW_AR_0, |
645 |
+ mmDMA_IF_W_S_DOWN_CH1_RANGE_SEC_MASK_LOW_AR_0, |
646 |
+ mmDMA_IF_E_S_DOWN_CH0_RANGE_SEC_MASK_LOW_AR_0, |
647 |
+@@ -416,7 +441,7 @@ static u64 gaudi_rr_hbw_mask_low_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
648 |
+ mmNIF_RTR_CTRL_7_RANGE_SEC_MASK_LOW_AR_0 |
649 |
+ }; |
650 |
+ |
651 |
+-static u64 gaudi_rr_hbw_mask_high_ar_regs[GAUDI_NUMBER_OF_RR_REGS] = { |
652 |
++static u64 gaudi_rr_hbw_mask_high_ar_regs[GAUDI_NUMBER_OF_HBW_RR_REGS] = { |
653 |
+ mmDMA_IF_W_S_DOWN_CH0_RANGE_SEC_MASK_HIGH_AR_0, |
654 |
+ mmDMA_IF_W_S_DOWN_CH1_RANGE_SEC_MASK_HIGH_AR_0, |
655 |
+ mmDMA_IF_E_S_DOWN_CH0_RANGE_SEC_MASK_HIGH_AR_0, |
656 |
+@@ -12841,50 +12866,44 @@ static void gaudi_init_range_registers_lbw(struct hl_device *hdev) |
657 |
+ u32 lbw_rng_end[GAUDI_NUMBER_OF_LBW_RANGES]; |
658 |
+ int i, j; |
659 |
+ |
660 |
+- lbw_rng_start[0] = (0xFBFE0000 & 0x3FFFFFF) - 1; |
661 |
+- lbw_rng_end[0] = (0xFBFFF000 & 0x3FFFFFF) + 1; |
662 |
++ lbw_rng_start[0] = (0xFC0E8000 & 0x3FFFFFF) - 1; /* 0x000E7FFF */ |
663 |
++ lbw_rng_end[0] = (0xFC11FFFF & 0x3FFFFFF) + 1; /* 0x00120000 */ |
664 |
+ |
665 |
+- lbw_rng_start[1] = (0xFC0E8000 & 0x3FFFFFF) - 1; |
666 |
+- lbw_rng_end[1] = (0xFC120000 & 0x3FFFFFF) + 1; |
667 |
++ lbw_rng_start[1] = (0xFC1E8000 & 0x3FFFFFF) - 1; /* 0x001E7FFF */ |
668 |
++ lbw_rng_end[1] = (0xFC48FFFF & 0x3FFFFFF) + 1; /* 0x00490000 */ |
669 |
+ |
670 |
+- lbw_rng_start[2] = (0xFC1E8000 & 0x3FFFFFF) - 1; |
671 |
+- lbw_rng_end[2] = (0xFC48FFFF & 0x3FFFFFF) + 1; |
672 |
++ lbw_rng_start[2] = (0xFC600000 & 0x3FFFFFF) - 1; /* 0x005FFFFF */ |
673 |
++ lbw_rng_end[2] = (0xFCC48FFF & 0x3FFFFFF) + 1; /* 0x00C49000 */ |
674 |
+ |
675 |
+- lbw_rng_start[3] = (0xFC600000 & 0x3FFFFFF) - 1; |
676 |
+- lbw_rng_end[3] = (0xFCC48FFF & 0x3FFFFFF) + 1; |
677 |
++ lbw_rng_start[3] = (0xFCC4A000 & 0x3FFFFFF) - 1; /* 0x00C49FFF */ |
678 |
++ lbw_rng_end[3] = (0xFCCDFFFF & 0x3FFFFFF) + 1; /* 0x00CE0000 */ |
679 |
+ |
680 |
+- lbw_rng_start[4] = (0xFCC4A000 & 0x3FFFFFF) - 1; |
681 |
+- lbw_rng_end[4] = (0xFCCDFFFF & 0x3FFFFFF) + 1; |
682 |
++ lbw_rng_start[4] = (0xFCCE4000 & 0x3FFFFFF) - 1; /* 0x00CE3FFF */ |
683 |
++ lbw_rng_end[4] = (0xFCD1FFFF & 0x3FFFFFF) + 1; /* 0x00D20000 */ |
684 |
+ |
685 |
+- lbw_rng_start[5] = (0xFCCE4000 & 0x3FFFFFF) - 1; |
686 |
+- lbw_rng_end[5] = (0xFCD1FFFF & 0x3FFFFFF) + 1; |
687 |
++ lbw_rng_start[5] = (0xFCD24000 & 0x3FFFFFF) - 1; /* 0x00D23FFF */ |
688 |
++ lbw_rng_end[5] = (0xFCD5FFFF & 0x3FFFFFF) + 1; /* 0x00D60000 */ |
689 |
+ |
690 |
+- lbw_rng_start[6] = (0xFCD24000 & 0x3FFFFFF) - 1; |
691 |
+- lbw_rng_end[6] = (0xFCD5FFFF & 0x3FFFFFF) + 1; |
692 |
++ lbw_rng_start[6] = (0xFCD64000 & 0x3FFFFFF) - 1; /* 0x00D63FFF */ |
693 |
++ lbw_rng_end[6] = (0xFCD9FFFF & 0x3FFFFFF) + 1; /* 0x00DA0000 */ |
694 |
+ |
695 |
+- lbw_rng_start[7] = (0xFCD64000 & 0x3FFFFFF) - 1; |
696 |
+- lbw_rng_end[7] = (0xFCD9FFFF & 0x3FFFFFF) + 1; |
697 |
++ lbw_rng_start[7] = (0xFCDA4000 & 0x3FFFFFF) - 1; /* 0x00DA3FFF */ |
698 |
++ lbw_rng_end[7] = (0xFCDDFFFF & 0x3FFFFFF) + 1; /* 0x00DE0000 */ |
699 |
+ |
700 |
+- lbw_rng_start[8] = (0xFCDA4000 & 0x3FFFFFF) - 1; |
701 |
+- lbw_rng_end[8] = (0xFCDDFFFF & 0x3FFFFFF) + 1; |
702 |
++ lbw_rng_start[8] = (0xFCDE4000 & 0x3FFFFFF) - 1; /* 0x00DE3FFF */ |
703 |
++ lbw_rng_end[8] = (0xFCE05FFF & 0x3FFFFFF) + 1; /* 0x00E06000 */ |
704 |
+ |
705 |
+- lbw_rng_start[9] = (0xFCDE4000 & 0x3FFFFFF) - 1; |
706 |
+- lbw_rng_end[9] = (0xFCE05FFF & 0x3FFFFFF) + 1; |
707 |
++ lbw_rng_start[9] = (0xFCFC9000 & 0x3FFFFFF) - 1; /* 0x00FC8FFF */ |
708 |
++ lbw_rng_end[9] = (0xFFFFFFFE & 0x3FFFFFF) + 1; /* 0x03FFFFFF */ |
709 |
+ |
710 |
+- lbw_rng_start[10] = (0xFEC43000 & 0x3FFFFFF) - 1; |
711 |
+- lbw_rng_end[10] = (0xFEC43FFF & 0x3FFFFFF) + 1; |
712 |
+- |
713 |
+- lbw_rng_start[11] = (0xFE484000 & 0x3FFFFFF) - 1; |
714 |
+- lbw_rng_end[11] = (0xFE484FFF & 0x3FFFFFF) + 1; |
715 |
+- |
716 |
+- for (i = 0 ; i < GAUDI_NUMBER_OF_RR_REGS ; i++) { |
717 |
++ for (i = 0 ; i < GAUDI_NUMBER_OF_LBW_RR_REGS ; i++) { |
718 |
+ WREG32(gaudi_rr_lbw_hit_aw_regs[i], |
719 |
+ (1 << GAUDI_NUMBER_OF_LBW_RANGES) - 1); |
720 |
+ WREG32(gaudi_rr_lbw_hit_ar_regs[i], |
721 |
+ (1 << GAUDI_NUMBER_OF_LBW_RANGES) - 1); |
722 |
+ } |
723 |
+ |
724 |
+- for (i = 0 ; i < GAUDI_NUMBER_OF_RR_REGS ; i++) |
725 |
++ for (i = 0 ; i < GAUDI_NUMBER_OF_LBW_RR_REGS ; i++) |
726 |
+ for (j = 0 ; j < GAUDI_NUMBER_OF_LBW_RANGES ; j++) { |
727 |
+ WREG32(gaudi_rr_lbw_min_aw_regs[i] + (j << 2), |
728 |
+ lbw_rng_start[j]); |
729 |
+@@ -12931,12 +12950,12 @@ static void gaudi_init_range_registers_hbw(struct hl_device *hdev) |
730 |
+ * 6th range is the host |
731 |
+ */ |
732 |
+ |
733 |
+- for (i = 0 ; i < GAUDI_NUMBER_OF_RR_REGS ; i++) { |
734 |
++ for (i = 0 ; i < GAUDI_NUMBER_OF_HBW_RR_REGS ; i++) { |
735 |
+ WREG32(gaudi_rr_hbw_hit_aw_regs[i], 0x1F); |
736 |
+ WREG32(gaudi_rr_hbw_hit_ar_regs[i], 0x1D); |
737 |
+ } |
738 |
+ |
739 |
+- for (i = 0 ; i < GAUDI_NUMBER_OF_RR_REGS ; i++) { |
740 |
++ for (i = 0 ; i < GAUDI_NUMBER_OF_HBW_RR_REGS ; i++) { |
741 |
+ WREG32(gaudi_rr_hbw_base_low_aw_regs[i], dram_addr_lo); |
742 |
+ WREG32(gaudi_rr_hbw_base_low_ar_regs[i], dram_addr_lo); |
743 |
+ |
744 |
+diff --git a/drivers/misc/habanalabs/include/gaudi/asic_reg/gaudi_regs.h b/drivers/misc/habanalabs/include/gaudi/asic_reg/gaudi_regs.h |
745 |
+index 5bb54b34a8aeb..907644202b0c3 100644 |
746 |
+--- a/drivers/misc/habanalabs/include/gaudi/asic_reg/gaudi_regs.h |
747 |
++++ b/drivers/misc/habanalabs/include/gaudi/asic_reg/gaudi_regs.h |
748 |
+@@ -305,6 +305,8 @@ |
749 |
+ #define mmPCIE_AUX_FLR_CTRL 0xC07394 |
750 |
+ #define mmPCIE_AUX_DBI 0xC07490 |
751 |
+ |
752 |
++#define mmPCIE_CORE_MSI_REQ 0xC04100 |
753 |
++ |
754 |
+ #define mmPSOC_PCI_PLL_NR 0xC72100 |
755 |
+ #define mmSRAM_W_PLL_NR 0x4C8100 |
756 |
+ #define mmPSOC_HBM_PLL_NR 0xC74100 |
757 |
+diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c |
758 |
+index c94cb5382dc92..250742ffdfd91 100644 |
759 |
+--- a/drivers/net/phy/mdio_device.c |
760 |
++++ b/drivers/net/phy/mdio_device.c |
761 |
+@@ -179,6 +179,16 @@ static int mdio_remove(struct device *dev) |
762 |
+ return 0; |
763 |
+ } |
764 |
+ |
765 |
++static void mdio_shutdown(struct device *dev) |
766 |
++{ |
767 |
++ struct mdio_device *mdiodev = to_mdio_device(dev); |
768 |
++ struct device_driver *drv = mdiodev->dev.driver; |
769 |
++ struct mdio_driver *mdiodrv = to_mdio_driver(drv); |
770 |
++ |
771 |
++ if (mdiodrv->shutdown) |
772 |
++ mdiodrv->shutdown(mdiodev); |
773 |
++} |
774 |
++ |
775 |
+ /** |
776 |
+ * mdio_driver_register - register an mdio_driver with the MDIO layer |
777 |
+ * @drv: new mdio_driver to register |
778 |
+@@ -193,6 +203,7 @@ int mdio_driver_register(struct mdio_driver *drv) |
779 |
+ mdiodrv->driver.bus = &mdio_bus_type; |
780 |
+ mdiodrv->driver.probe = mdio_probe; |
781 |
+ mdiodrv->driver.remove = mdio_remove; |
782 |
++ mdiodrv->driver.shutdown = mdio_shutdown; |
783 |
+ |
784 |
+ retval = driver_register(&mdiodrv->driver); |
785 |
+ if (retval) { |
786 |
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c |
787 |
+index cedba56fc448e..ef925895739f0 100644 |
788 |
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c |
789 |
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c |
790 |
+@@ -7455,23 +7455,18 @@ static s32 brcmf_translate_country_code(struct brcmf_pub *drvr, char alpha2[2], |
791 |
+ s32 found_index; |
792 |
+ int i; |
793 |
+ |
794 |
++ country_codes = drvr->settings->country_codes; |
795 |
++ if (!country_codes) { |
796 |
++ brcmf_dbg(TRACE, "No country codes configured for device\n"); |
797 |
++ return -EINVAL; |
798 |
++ } |
799 |
++ |
800 |
+ if ((alpha2[0] == ccreq->country_abbrev[0]) && |
801 |
+ (alpha2[1] == ccreq->country_abbrev[1])) { |
802 |
+ brcmf_dbg(TRACE, "Country code already set\n"); |
803 |
+ return -EAGAIN; |
804 |
+ } |
805 |
+ |
806 |
+- country_codes = drvr->settings->country_codes; |
807 |
+- if (!country_codes) { |
808 |
+- brcmf_dbg(TRACE, "No country codes configured for device, using ISO3166 code and 0 rev\n"); |
809 |
+- memset(ccreq, 0, sizeof(*ccreq)); |
810 |
+- ccreq->country_abbrev[0] = alpha2[0]; |
811 |
+- ccreq->country_abbrev[1] = alpha2[1]; |
812 |
+- ccreq->ccode[0] = alpha2[0]; |
813 |
+- ccreq->ccode[1] = alpha2[1]; |
814 |
+- return 0; |
815 |
+- } |
816 |
+- |
817 |
+ found_index = -1; |
818 |
+ for (i = 0; i < country_codes->table_size; i++) { |
819 |
+ cc = &country_codes->table[i]; |
820 |
+diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c |
821 |
+index 39a01c2a3058d..32d5bc4919d8c 100644 |
822 |
+--- a/drivers/net/xen-netback/netback.c |
823 |
++++ b/drivers/net/xen-netback/netback.c |
824 |
+@@ -499,7 +499,7 @@ check_frags: |
825 |
+ * the header's copy failed, and they are |
826 |
+ * sharing a slot, send an error |
827 |
+ */ |
828 |
+- if (i == 0 && sharedslot) |
829 |
++ if (i == 0 && !first_shinfo && sharedslot) |
830 |
+ xenvif_idx_release(queue, pending_idx, |
831 |
+ XEN_NETIF_RSP_ERROR); |
832 |
+ else |
833 |
+diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c |
834 |
+index b08a61ca283f2..6ebe68396712c 100644 |
835 |
+--- a/drivers/nvme/host/fc.c |
836 |
++++ b/drivers/nvme/host/fc.c |
837 |
+@@ -2487,6 +2487,7 @@ __nvme_fc_abort_outstanding_ios(struct nvme_fc_ctrl *ctrl, bool start_queues) |
838 |
+ */ |
839 |
+ if (ctrl->ctrl.queue_count > 1) { |
840 |
+ nvme_stop_queues(&ctrl->ctrl); |
841 |
++ nvme_sync_io_queues(&ctrl->ctrl); |
842 |
+ blk_mq_tagset_busy_iter(&ctrl->tag_set, |
843 |
+ nvme_fc_terminate_exchange, &ctrl->ctrl); |
844 |
+ blk_mq_tagset_wait_completed_request(&ctrl->tag_set); |
845 |
+@@ -2510,6 +2511,7 @@ __nvme_fc_abort_outstanding_ios(struct nvme_fc_ctrl *ctrl, bool start_queues) |
846 |
+ * clean up the admin queue. Same thing as above. |
847 |
+ */ |
848 |
+ blk_mq_quiesce_queue(ctrl->ctrl.admin_q); |
849 |
++ blk_sync_queue(ctrl->ctrl.admin_q); |
850 |
+ blk_mq_tagset_busy_iter(&ctrl->admin_tag_set, |
851 |
+ nvme_fc_terminate_exchange, &ctrl->ctrl); |
852 |
+ blk_mq_tagset_wait_completed_request(&ctrl->admin_tag_set); |
853 |
+@@ -2951,14 +2953,6 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl) |
854 |
+ if (ctrl->ctrl.queue_count == 1) |
855 |
+ return 0; |
856 |
+ |
857 |
+- ret = nvme_fc_create_hw_io_queues(ctrl, ctrl->ctrl.sqsize + 1); |
858 |
+- if (ret) |
859 |
+- goto out_free_io_queues; |
860 |
+- |
861 |
+- ret = nvme_fc_connect_io_queues(ctrl, ctrl->ctrl.sqsize + 1); |
862 |
+- if (ret) |
863 |
+- goto out_delete_hw_queues; |
864 |
+- |
865 |
+ if (prior_ioq_cnt != nr_io_queues) { |
866 |
+ dev_info(ctrl->ctrl.device, |
867 |
+ "reconnect: revising io queue count from %d to %d\n", |
868 |
+@@ -2968,6 +2962,14 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl) |
869 |
+ nvme_unfreeze(&ctrl->ctrl); |
870 |
+ } |
871 |
+ |
872 |
++ ret = nvme_fc_create_hw_io_queues(ctrl, ctrl->ctrl.sqsize + 1); |
873 |
++ if (ret) |
874 |
++ goto out_free_io_queues; |
875 |
++ |
876 |
++ ret = nvme_fc_connect_io_queues(ctrl, ctrl->ctrl.sqsize + 1); |
877 |
++ if (ret) |
878 |
++ goto out_delete_hw_queues; |
879 |
++ |
880 |
+ return 0; |
881 |
+ |
882 |
+ out_delete_hw_queues: |
883 |
+diff --git a/drivers/platform/x86/gigabyte-wmi.c b/drivers/platform/x86/gigabyte-wmi.c |
884 |
+index 7f3a03f937f66..d53634c8a6e09 100644 |
885 |
+--- a/drivers/platform/x86/gigabyte-wmi.c |
886 |
++++ b/drivers/platform/x86/gigabyte-wmi.c |
887 |
+@@ -144,6 +144,7 @@ static const struct dmi_system_id gigabyte_wmi_known_working_platforms[] = { |
888 |
+ DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550 AORUS ELITE"), |
889 |
+ DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550 AORUS ELITE V2"), |
890 |
+ DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550 GAMING X V2"), |
891 |
++ DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550I AORUS PRO AX"), |
892 |
+ DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550M AORUS PRO-P"), |
893 |
+ DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550M DS3H"), |
894 |
+ DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("Z390 I AORUS PRO WIFI-CF"), |
895 |
+diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c |
896 |
+index 0e1451b1d9c6c..033f797861d8a 100644 |
897 |
+--- a/drivers/platform/x86/touchscreen_dmi.c |
898 |
++++ b/drivers/platform/x86/touchscreen_dmi.c |
899 |
+@@ -100,10 +100,10 @@ static const struct ts_dmi_data chuwi_hi10_air_data = { |
900 |
+ }; |
901 |
+ |
902 |
+ static const struct property_entry chuwi_hi10_plus_props[] = { |
903 |
+- PROPERTY_ENTRY_U32("touchscreen-min-x", 0), |
904 |
+- PROPERTY_ENTRY_U32("touchscreen-min-y", 5), |
905 |
+- PROPERTY_ENTRY_U32("touchscreen-size-x", 1914), |
906 |
+- PROPERTY_ENTRY_U32("touchscreen-size-y", 1283), |
907 |
++ PROPERTY_ENTRY_U32("touchscreen-min-x", 12), |
908 |
++ PROPERTY_ENTRY_U32("touchscreen-min-y", 10), |
909 |
++ PROPERTY_ENTRY_U32("touchscreen-size-x", 1908), |
910 |
++ PROPERTY_ENTRY_U32("touchscreen-size-y", 1270), |
911 |
+ PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-chuwi-hi10plus.fw"), |
912 |
+ PROPERTY_ENTRY_U32("silead,max-fingers", 10), |
913 |
+ PROPERTY_ENTRY_BOOL("silead,home-button"), |
914 |
+@@ -111,6 +111,15 @@ static const struct property_entry chuwi_hi10_plus_props[] = { |
915 |
+ }; |
916 |
+ |
917 |
+ static const struct ts_dmi_data chuwi_hi10_plus_data = { |
918 |
++ .embedded_fw = { |
919 |
++ .name = "silead/gsl1680-chuwi-hi10plus.fw", |
920 |
++ .prefix = { 0xf0, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 }, |
921 |
++ .length = 34056, |
922 |
++ .sha256 = { 0xfd, 0x0a, 0x08, 0x08, 0x3c, 0xa6, 0x34, 0x4e, |
923 |
++ 0x2c, 0x49, 0x9c, 0xcd, 0x7d, 0x44, 0x9d, 0x38, |
924 |
++ 0x10, 0x68, 0xb5, 0xbd, 0xb7, 0x2a, 0x63, 0xb5, |
925 |
++ 0x67, 0x0b, 0x96, 0xbd, 0x89, 0x67, 0x85, 0x09 }, |
926 |
++ }, |
927 |
+ .acpi_name = "MSSL0017:00", |
928 |
+ .properties = chuwi_hi10_plus_props, |
929 |
+ }; |
930 |
+@@ -141,6 +150,33 @@ static const struct ts_dmi_data chuwi_hi10_pro_data = { |
931 |
+ .properties = chuwi_hi10_pro_props, |
932 |
+ }; |
933 |
+ |
934 |
++static const struct property_entry chuwi_hibook_props[] = { |
935 |
++ PROPERTY_ENTRY_U32("touchscreen-min-x", 30), |
936 |
++ PROPERTY_ENTRY_U32("touchscreen-min-y", 4), |
937 |
++ PROPERTY_ENTRY_U32("touchscreen-size-x", 1892), |
938 |
++ PROPERTY_ENTRY_U32("touchscreen-size-y", 1276), |
939 |
++ PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"), |
940 |
++ PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"), |
941 |
++ PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-chuwi-hibook.fw"), |
942 |
++ PROPERTY_ENTRY_U32("silead,max-fingers", 10), |
943 |
++ PROPERTY_ENTRY_BOOL("silead,home-button"), |
944 |
++ { } |
945 |
++}; |
946 |
++ |
947 |
++static const struct ts_dmi_data chuwi_hibook_data = { |
948 |
++ .embedded_fw = { |
949 |
++ .name = "silead/gsl1680-chuwi-hibook.fw", |
950 |
++ .prefix = { 0xf0, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 }, |
951 |
++ .length = 40392, |
952 |
++ .sha256 = { 0xf7, 0xc0, 0xe8, 0x5a, 0x6c, 0xf2, 0xeb, 0x8d, |
953 |
++ 0x12, 0xc4, 0x45, 0xbf, 0x55, 0x13, 0x4c, 0x1a, |
954 |
++ 0x13, 0x04, 0x31, 0x08, 0x65, 0x73, 0xf7, 0xa8, |
955 |
++ 0x1b, 0x7d, 0x59, 0xc9, 0xe6, 0x97, 0xf7, 0x38 }, |
956 |
++ }, |
957 |
++ .acpi_name = "MSSL0017:00", |
958 |
++ .properties = chuwi_hibook_props, |
959 |
++}; |
960 |
++ |
961 |
+ static const struct property_entry chuwi_vi8_props[] = { |
962 |
+ PROPERTY_ENTRY_U32("touchscreen-min-x", 4), |
963 |
+ PROPERTY_ENTRY_U32("touchscreen-min-y", 6), |
964 |
+@@ -979,6 +1015,16 @@ const struct dmi_system_id touchscreen_dmi_table[] = { |
965 |
+ DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), |
966 |
+ }, |
967 |
+ }, |
968 |
++ { |
969 |
++ /* Chuwi HiBook (CWI514) */ |
970 |
++ .driver_data = (void *)&chuwi_hibook_data, |
971 |
++ .matches = { |
972 |
++ DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"), |
973 |
++ DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), |
974 |
++ /* Above matches are too generic, add bios-date match */ |
975 |
++ DMI_MATCH(DMI_BIOS_DATE, "05/07/2016"), |
976 |
++ }, |
977 |
++ }, |
978 |
+ { |
979 |
+ /* Chuwi Vi8 (CWI506) */ |
980 |
+ .driver_data = (void *)&chuwi_vi8_data, |
981 |
+diff --git a/drivers/scsi/elx/efct/efct_lio.c b/drivers/scsi/elx/efct/efct_lio.c |
982 |
+index e0d798d6baee3..f1d6fcfe12f0d 100644 |
983 |
+--- a/drivers/scsi/elx/efct/efct_lio.c |
984 |
++++ b/drivers/scsi/elx/efct/efct_lio.c |
985 |
+@@ -880,11 +880,11 @@ efct_lio_npiv_drop_nport(struct se_wwn *wwn) |
986 |
+ struct efct *efct = lio_vport->efct; |
987 |
+ unsigned long flags = 0; |
988 |
+ |
989 |
+- spin_lock_irqsave(&efct->tgt_efct.efct_lio_lock, flags); |
990 |
+- |
991 |
+ if (lio_vport->fc_vport) |
992 |
+ fc_vport_terminate(lio_vport->fc_vport); |
993 |
+ |
994 |
++ spin_lock_irqsave(&efct->tgt_efct.efct_lio_lock, flags); |
995 |
++ |
996 |
+ list_for_each_entry_safe(vport, next_vport, &efct->tgt_efct.vport_list, |
997 |
+ list_entry) { |
998 |
+ if (vport->lio_vport == lio_vport) { |
999 |
+diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c |
1000 |
+index b8d55af763f92..134c7a8145efa 100644 |
1001 |
+--- a/drivers/scsi/sd.c |
1002 |
++++ b/drivers/scsi/sd.c |
1003 |
+@@ -3441,15 +3441,16 @@ static int sd_probe(struct device *dev) |
1004 |
+ } |
1005 |
+ |
1006 |
+ device_initialize(&sdkp->dev); |
1007 |
+- sdkp->dev.parent = dev; |
1008 |
++ sdkp->dev.parent = get_device(dev); |
1009 |
+ sdkp->dev.class = &sd_disk_class; |
1010 |
+ dev_set_name(&sdkp->dev, "%s", dev_name(dev)); |
1011 |
+ |
1012 |
+ error = device_add(&sdkp->dev); |
1013 |
+- if (error) |
1014 |
+- goto out_free_index; |
1015 |
++ if (error) { |
1016 |
++ put_device(&sdkp->dev); |
1017 |
++ goto out; |
1018 |
++ } |
1019 |
+ |
1020 |
+- get_device(dev); |
1021 |
+ dev_set_drvdata(dev, sdkp); |
1022 |
+ |
1023 |
+ gd->major = sd_major((index & 0xf0) >> 4); |
1024 |
+diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c |
1025 |
+index c2afba2a5414d..43e682297fd5f 100644 |
1026 |
+--- a/drivers/scsi/ses.c |
1027 |
++++ b/drivers/scsi/ses.c |
1028 |
+@@ -87,9 +87,16 @@ static int ses_recv_diag(struct scsi_device *sdev, int page_code, |
1029 |
+ 0 |
1030 |
+ }; |
1031 |
+ unsigned char recv_page_code; |
1032 |
++ unsigned int retries = SES_RETRIES; |
1033 |
++ struct scsi_sense_hdr sshdr; |
1034 |
++ |
1035 |
++ do { |
1036 |
++ ret = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, bufflen, |
1037 |
++ &sshdr, SES_TIMEOUT, 1, NULL); |
1038 |
++ } while (ret > 0 && --retries && scsi_sense_valid(&sshdr) && |
1039 |
++ (sshdr.sense_key == NOT_READY || |
1040 |
++ (sshdr.sense_key == UNIT_ATTENTION && sshdr.asc == 0x29))); |
1041 |
+ |
1042 |
+- ret = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, bufflen, |
1043 |
+- NULL, SES_TIMEOUT, SES_RETRIES, NULL); |
1044 |
+ if (unlikely(ret)) |
1045 |
+ return ret; |
1046 |
+ |
1047 |
+@@ -121,9 +128,16 @@ static int ses_send_diag(struct scsi_device *sdev, int page_code, |
1048 |
+ bufflen & 0xff, |
1049 |
+ 0 |
1050 |
+ }; |
1051 |
++ struct scsi_sense_hdr sshdr; |
1052 |
++ unsigned int retries = SES_RETRIES; |
1053 |
++ |
1054 |
++ do { |
1055 |
++ result = scsi_execute_req(sdev, cmd, DMA_TO_DEVICE, buf, bufflen, |
1056 |
++ &sshdr, SES_TIMEOUT, 1, NULL); |
1057 |
++ } while (result > 0 && --retries && scsi_sense_valid(&sshdr) && |
1058 |
++ (sshdr.sense_key == NOT_READY || |
1059 |
++ (sshdr.sense_key == UNIT_ATTENTION && sshdr.asc == 0x29))); |
1060 |
+ |
1061 |
+- result = scsi_execute_req(sdev, cmd, DMA_TO_DEVICE, buf, bufflen, |
1062 |
+- NULL, SES_TIMEOUT, SES_RETRIES, NULL); |
1063 |
+ if (result) |
1064 |
+ sdev_printk(KERN_ERR, sdev, "SEND DIAGNOSTIC result: %8x\n", |
1065 |
+ result); |
1066 |
+diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c |
1067 |
+index 540861ca2ba37..553b6b9d02222 100644 |
1068 |
+--- a/drivers/spi/spi-rockchip.c |
1069 |
++++ b/drivers/spi/spi-rockchip.c |
1070 |
+@@ -600,6 +600,12 @@ static int rockchip_spi_transfer_one( |
1071 |
+ int ret; |
1072 |
+ bool use_dma; |
1073 |
+ |
1074 |
++ /* Zero length transfers won't trigger an interrupt on completion */ |
1075 |
++ if (!xfer->len) { |
1076 |
++ spi_finalize_current_transfer(ctlr); |
1077 |
++ return 1; |
1078 |
++ } |
1079 |
++ |
1080 |
+ WARN_ON(readl_relaxed(rs->regs + ROCKCHIP_SPI_SSIENR) && |
1081 |
+ (readl_relaxed(rs->regs + ROCKCHIP_SPI_SR) & SR_BUSY)); |
1082 |
+ |
1083 |
+diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c |
1084 |
+index 4c7ebd1d3f9c9..b1162e566a707 100644 |
1085 |
+--- a/drivers/thermal/qcom/tsens.c |
1086 |
++++ b/drivers/thermal/qcom/tsens.c |
1087 |
+@@ -417,7 +417,7 @@ static irqreturn_t tsens_critical_irq_thread(int irq, void *data) |
1088 |
+ const struct tsens_sensor *s = &priv->sensor[i]; |
1089 |
+ u32 hw_id = s->hw_id; |
1090 |
+ |
1091 |
+- if (IS_ERR(s->tzd)) |
1092 |
++ if (!s->tzd) |
1093 |
+ continue; |
1094 |
+ if (!tsens_threshold_violated(priv, hw_id, &d)) |
1095 |
+ continue; |
1096 |
+@@ -467,7 +467,7 @@ static irqreturn_t tsens_irq_thread(int irq, void *data) |
1097 |
+ const struct tsens_sensor *s = &priv->sensor[i]; |
1098 |
+ u32 hw_id = s->hw_id; |
1099 |
+ |
1100 |
+- if (IS_ERR(s->tzd)) |
1101 |
++ if (!s->tzd) |
1102 |
+ continue; |
1103 |
+ if (!tsens_threshold_violated(priv, hw_id, &d)) |
1104 |
+ continue; |
1105 |
+diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c |
1106 |
+index 2a7828971d056..a215ec9e172e6 100644 |
1107 |
+--- a/drivers/usb/dwc2/hcd.c |
1108 |
++++ b/drivers/usb/dwc2/hcd.c |
1109 |
+@@ -5191,6 +5191,10 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg) |
1110 |
+ hcd->has_tt = 1; |
1111 |
+ |
1112 |
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
1113 |
++ if (!res) { |
1114 |
++ retval = -EINVAL; |
1115 |
++ goto error1; |
1116 |
++ } |
1117 |
+ hcd->rsrc_start = res->start; |
1118 |
+ hcd->rsrc_len = resource_size(res); |
1119 |
+ |
1120 |
+diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c |
1121 |
+index a3e7be96527d7..23fd09a9bbaf1 100644 |
1122 |
+--- a/drivers/xen/gntdev.c |
1123 |
++++ b/drivers/xen/gntdev.c |
1124 |
+@@ -396,6 +396,14 @@ static int __unmap_grant_pages(struct gntdev_grant_map *map, int offset, |
1125 |
+ map->unmap_ops[offset+i].handle, |
1126 |
+ map->unmap_ops[offset+i].status); |
1127 |
+ map->unmap_ops[offset+i].handle = INVALID_GRANT_HANDLE; |
1128 |
++ if (use_ptemod) { |
1129 |
++ if (map->kunmap_ops[offset+i].status) |
1130 |
++ err = -EINVAL; |
1131 |
++ pr_debug("kunmap handle=%u st=%d\n", |
1132 |
++ map->kunmap_ops[offset+i].handle, |
1133 |
++ map->kunmap_ops[offset+i].status); |
1134 |
++ map->kunmap_ops[offset+i].handle = INVALID_GRANT_HANDLE; |
1135 |
++ } |
1136 |
+ } |
1137 |
+ return err; |
1138 |
+ } |
1139 |
+diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c |
1140 |
+index dbb18dc956f34..de4f55154d498 100644 |
1141 |
+--- a/drivers/xen/swiotlb-xen.c |
1142 |
++++ b/drivers/xen/swiotlb-xen.c |
1143 |
+@@ -232,10 +232,11 @@ retry: |
1144 |
+ /* |
1145 |
+ * Get IO TLB memory from any location. |
1146 |
+ */ |
1147 |
+- start = memblock_alloc(PAGE_ALIGN(bytes), PAGE_SIZE); |
1148 |
++ start = memblock_alloc(PAGE_ALIGN(bytes), |
1149 |
++ IO_TLB_SEGSIZE << IO_TLB_SHIFT); |
1150 |
+ if (!start) |
1151 |
+- panic("%s: Failed to allocate %lu bytes align=0x%lx\n", |
1152 |
+- __func__, PAGE_ALIGN(bytes), PAGE_SIZE); |
1153 |
++ panic("%s: Failed to allocate %lu bytes\n", |
1154 |
++ __func__, PAGE_ALIGN(bytes)); |
1155 |
+ |
1156 |
+ /* |
1157 |
+ * And replace that memory with pages under 4GB. |
1158 |
+diff --git a/fs/afs/dir.c b/fs/afs/dir.c |
1159 |
+index 54ee54ae36bc8..4579bbda46346 100644 |
1160 |
+--- a/fs/afs/dir.c |
1161 |
++++ b/fs/afs/dir.c |
1162 |
+@@ -1760,6 +1760,10 @@ static int afs_link(struct dentry *from, struct inode *dir, |
1163 |
+ goto error; |
1164 |
+ } |
1165 |
+ |
1166 |
++ ret = afs_validate(vnode, op->key); |
1167 |
++ if (ret < 0) |
1168 |
++ goto error_op; |
1169 |
++ |
1170 |
+ afs_op_set_vnode(op, 0, dvnode); |
1171 |
+ afs_op_set_vnode(op, 1, vnode); |
1172 |
+ op->file[0].dv_delta = 1; |
1173 |
+@@ -1773,6 +1777,8 @@ static int afs_link(struct dentry *from, struct inode *dir, |
1174 |
+ op->create.reason = afs_edit_dir_for_link; |
1175 |
+ return afs_do_sync_operation(op); |
1176 |
+ |
1177 |
++error_op: |
1178 |
++ afs_put_operation(op); |
1179 |
+ error: |
1180 |
+ d_drop(dentry); |
1181 |
+ _leave(" = %d", ret); |
1182 |
+@@ -1957,6 +1963,11 @@ static int afs_rename(struct user_namespace *mnt_userns, struct inode *old_dir, |
1183 |
+ if (IS_ERR(op)) |
1184 |
+ return PTR_ERR(op); |
1185 |
+ |
1186 |
++ ret = afs_validate(vnode, op->key); |
1187 |
++ op->error = ret; |
1188 |
++ if (ret < 0) |
1189 |
++ goto error; |
1190 |
++ |
1191 |
+ afs_op_set_vnode(op, 0, orig_dvnode); |
1192 |
+ afs_op_set_vnode(op, 1, new_dvnode); /* May be same as orig_dvnode */ |
1193 |
+ op->file[0].dv_delta = 1; |
1194 |
+diff --git a/fs/afs/file.c b/fs/afs/file.c |
1195 |
+index db035ae2a1345..5efa1cf2a20a4 100644 |
1196 |
+--- a/fs/afs/file.c |
1197 |
++++ b/fs/afs/file.c |
1198 |
+@@ -24,12 +24,13 @@ static void afs_invalidatepage(struct page *page, unsigned int offset, |
1199 |
+ static int afs_releasepage(struct page *page, gfp_t gfp_flags); |
1200 |
+ |
1201 |
+ static void afs_readahead(struct readahead_control *ractl); |
1202 |
++static ssize_t afs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter); |
1203 |
+ |
1204 |
+ const struct file_operations afs_file_operations = { |
1205 |
+ .open = afs_open, |
1206 |
+ .release = afs_release, |
1207 |
+ .llseek = generic_file_llseek, |
1208 |
+- .read_iter = generic_file_read_iter, |
1209 |
++ .read_iter = afs_file_read_iter, |
1210 |
+ .write_iter = afs_file_write, |
1211 |
+ .mmap = afs_file_mmap, |
1212 |
+ .splice_read = generic_file_splice_read, |
1213 |
+@@ -502,3 +503,16 @@ static int afs_file_mmap(struct file *file, struct vm_area_struct *vma) |
1214 |
+ vma->vm_ops = &afs_vm_ops; |
1215 |
+ return ret; |
1216 |
+ } |
1217 |
++ |
1218 |
++static ssize_t afs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) |
1219 |
++{ |
1220 |
++ struct afs_vnode *vnode = AFS_FS_I(file_inode(iocb->ki_filp)); |
1221 |
++ struct afs_file *af = iocb->ki_filp->private_data; |
1222 |
++ int ret; |
1223 |
++ |
1224 |
++ ret = afs_validate(vnode, af->key); |
1225 |
++ if (ret < 0) |
1226 |
++ return ret; |
1227 |
++ |
1228 |
++ return generic_file_read_iter(iocb, iter); |
1229 |
++} |
1230 |
+diff --git a/fs/afs/write.c b/fs/afs/write.c |
1231 |
+index e86f5a245514d..2dfe3b3a53d69 100644 |
1232 |
+--- a/fs/afs/write.c |
1233 |
++++ b/fs/afs/write.c |
1234 |
+@@ -807,6 +807,7 @@ int afs_writepages(struct address_space *mapping, |
1235 |
+ ssize_t afs_file_write(struct kiocb *iocb, struct iov_iter *from) |
1236 |
+ { |
1237 |
+ struct afs_vnode *vnode = AFS_FS_I(file_inode(iocb->ki_filp)); |
1238 |
++ struct afs_file *af = iocb->ki_filp->private_data; |
1239 |
+ ssize_t result; |
1240 |
+ size_t count = iov_iter_count(from); |
1241 |
+ |
1242 |
+@@ -822,6 +823,10 @@ ssize_t afs_file_write(struct kiocb *iocb, struct iov_iter *from) |
1243 |
+ if (!count) |
1244 |
+ return 0; |
1245 |
+ |
1246 |
++ result = afs_validate(vnode, af->key); |
1247 |
++ if (result < 0) |
1248 |
++ return result; |
1249 |
++ |
1250 |
+ result = generic_file_write_iter(iocb, from); |
1251 |
+ |
1252 |
+ _leave(" = %zd", result); |
1253 |
+@@ -835,13 +840,18 @@ ssize_t afs_file_write(struct kiocb *iocb, struct iov_iter *from) |
1254 |
+ */ |
1255 |
+ int afs_fsync(struct file *file, loff_t start, loff_t end, int datasync) |
1256 |
+ { |
1257 |
+- struct inode *inode = file_inode(file); |
1258 |
+- struct afs_vnode *vnode = AFS_FS_I(inode); |
1259 |
++ struct afs_vnode *vnode = AFS_FS_I(file_inode(file)); |
1260 |
++ struct afs_file *af = file->private_data; |
1261 |
++ int ret; |
1262 |
+ |
1263 |
+ _enter("{%llx:%llu},{n=%pD},%d", |
1264 |
+ vnode->fid.vid, vnode->fid.vnode, file, |
1265 |
+ datasync); |
1266 |
+ |
1267 |
++ ret = afs_validate(vnode, af->key); |
1268 |
++ if (ret < 0) |
1269 |
++ return ret; |
1270 |
++ |
1271 |
+ return file_write_and_wait_range(file, start, end); |
1272 |
+ } |
1273 |
+ |
1274 |
+@@ -855,11 +865,14 @@ vm_fault_t afs_page_mkwrite(struct vm_fault *vmf) |
1275 |
+ struct file *file = vmf->vma->vm_file; |
1276 |
+ struct inode *inode = file_inode(file); |
1277 |
+ struct afs_vnode *vnode = AFS_FS_I(inode); |
1278 |
++ struct afs_file *af = file->private_data; |
1279 |
+ unsigned long priv; |
1280 |
+ vm_fault_t ret = VM_FAULT_RETRY; |
1281 |
+ |
1282 |
+ _enter("{{%llx:%llu}},{%lx}", vnode->fid.vid, vnode->fid.vnode, page->index); |
1283 |
+ |
1284 |
++ afs_validate(vnode, af->key); |
1285 |
++ |
1286 |
+ sb_start_pagefault(inode->i_sb); |
1287 |
+ |
1288 |
+ /* Wait for the page to be written to the cache before we allow it to |
1289 |
+diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c |
1290 |
+index df6631eefc652..5e8a56113b23d 100644 |
1291 |
+--- a/fs/btrfs/file-item.c |
1292 |
++++ b/fs/btrfs/file-item.c |
1293 |
+@@ -666,7 +666,18 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_inode *inode, struct bio *bio, |
1294 |
+ |
1295 |
+ if (!ordered) { |
1296 |
+ ordered = btrfs_lookup_ordered_extent(inode, offset); |
1297 |
+- BUG_ON(!ordered); /* Logic error */ |
1298 |
++ /* |
1299 |
++ * The bio range is not covered by any ordered extent, |
1300 |
++ * must be a code logic error. |
1301 |
++ */ |
1302 |
++ if (unlikely(!ordered)) { |
1303 |
++ WARN(1, KERN_WARNING |
1304 |
++ "no ordered extent for root %llu ino %llu offset %llu\n", |
1305 |
++ inode->root->root_key.objectid, |
1306 |
++ btrfs_ino(inode), offset); |
1307 |
++ kvfree(sums); |
1308 |
++ return BLK_STS_IOERR; |
1309 |
++ } |
1310 |
+ } |
1311 |
+ |
1312 |
+ nr_sectors = BTRFS_BYTES_TO_BLKS(fs_info, |
1313 |
+diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c |
1314 |
+index 682416d4edefa..19c780242e127 100644 |
1315 |
+--- a/fs/btrfs/volumes.c |
1316 |
++++ b/fs/btrfs/volumes.c |
1317 |
+@@ -1149,6 +1149,19 @@ static void btrfs_close_one_device(struct btrfs_device *device) |
1318 |
+ atomic_set(&device->dev_stats_ccnt, 0); |
1319 |
+ extent_io_tree_release(&device->alloc_state); |
1320 |
+ |
1321 |
++ /* |
1322 |
++ * Reset the flush error record. We might have a transient flush error |
1323 |
++ * in this mount, and if so we aborted the current transaction and set |
1324 |
++ * the fs to an error state, guaranteeing no super blocks can be further |
1325 |
++ * committed. However that error might be transient and if we unmount the |
1326 |
++ * filesystem and mount it again, we should allow the mount to succeed |
1327 |
++ * (btrfs_check_rw_degradable() should not fail) - if after mounting the |
1328 |
++ * filesystem again we still get flush errors, then we will again abort |
1329 |
++ * any transaction and set the error state, guaranteeing no commits of |
1330 |
++ * unsafe super blocks. |
1331 |
++ */ |
1332 |
++ device->last_flush_error = 0; |
1333 |
++ |
1334 |
+ /* Verify the device is back in a pristine state */ |
1335 |
+ ASSERT(!test_bit(BTRFS_DEV_STATE_FLUSH_SENT, &device->dev_state)); |
1336 |
+ ASSERT(!test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state)); |
1337 |
+diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c |
1338 |
+index b6d2e35919278..e1739d0135b44 100644 |
1339 |
+--- a/fs/cifs/smb2pdu.c |
1340 |
++++ b/fs/cifs/smb2pdu.c |
1341 |
+@@ -2398,7 +2398,7 @@ create_sd_buf(umode_t mode, bool set_owner, unsigned int *len) |
1342 |
+ buf->sd.OffsetDacl = cpu_to_le32(ptr - (__u8 *)&buf->sd); |
1343 |
+ /* Ship the ACL for now. we will copy it into buf later. */ |
1344 |
+ aclptr = ptr; |
1345 |
+- ptr += sizeof(struct cifs_acl); |
1346 |
++ ptr += sizeof(struct smb3_acl); |
1347 |
+ |
1348 |
+ /* create one ACE to hold the mode embedded in reserved special SID */ |
1349 |
+ acelen = setup_special_mode_ACE((struct cifs_ace *)ptr, (__u64)mode); |
1350 |
+@@ -2423,7 +2423,7 @@ create_sd_buf(umode_t mode, bool set_owner, unsigned int *len) |
1351 |
+ acl.AclRevision = ACL_REVISION; /* See 2.4.4.1 of MS-DTYP */ |
1352 |
+ acl.AclSize = cpu_to_le16(acl_size); |
1353 |
+ acl.AceCount = cpu_to_le16(ace_count); |
1354 |
+- memcpy(aclptr, &acl, sizeof(struct cifs_acl)); |
1355 |
++ memcpy(aclptr, &acl, sizeof(struct smb3_acl)); |
1356 |
+ |
1357 |
+ buf->ccontext.DataLength = cpu_to_le32(ptr - (__u8 *)&buf->sd); |
1358 |
+ *len = roundup(ptr - (__u8 *)buf, 8); |
1359 |
+diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c |
1360 |
+index 1f3f4326bf3ce..c17ccc19b938e 100644 |
1361 |
+--- a/fs/ext2/balloc.c |
1362 |
++++ b/fs/ext2/balloc.c |
1363 |
+@@ -48,10 +48,9 @@ struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb, |
1364 |
+ struct ext2_sb_info *sbi = EXT2_SB(sb); |
1365 |
+ |
1366 |
+ if (block_group >= sbi->s_groups_count) { |
1367 |
+- ext2_error (sb, "ext2_get_group_desc", |
1368 |
+- "block_group >= groups_count - " |
1369 |
+- "block_group = %d, groups_count = %lu", |
1370 |
+- block_group, sbi->s_groups_count); |
1371 |
++ WARN(1, "block_group >= groups_count - " |
1372 |
++ "block_group = %d, groups_count = %lu", |
1373 |
++ block_group, sbi->s_groups_count); |
1374 |
+ |
1375 |
+ return NULL; |
1376 |
+ } |
1377 |
+@@ -59,10 +58,9 @@ struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb, |
1378 |
+ group_desc = block_group >> EXT2_DESC_PER_BLOCK_BITS(sb); |
1379 |
+ offset = block_group & (EXT2_DESC_PER_BLOCK(sb) - 1); |
1380 |
+ if (!sbi->s_group_desc[group_desc]) { |
1381 |
+- ext2_error (sb, "ext2_get_group_desc", |
1382 |
+- "Group descriptor not loaded - " |
1383 |
+- "block_group = %d, group_desc = %lu, desc = %lu", |
1384 |
+- block_group, group_desc, offset); |
1385 |
++ WARN(1, "Group descriptor not loaded - " |
1386 |
++ "block_group = %d, group_desc = %lu, desc = %lu", |
1387 |
++ block_group, group_desc, offset); |
1388 |
+ return NULL; |
1389 |
+ } |
1390 |
+ |
1391 |
+diff --git a/fs/io_uring.c b/fs/io_uring.c |
1392 |
+index 699a08d724c24..675216f7022da 100644 |
1393 |
+--- a/fs/io_uring.c |
1394 |
++++ b/fs/io_uring.c |
1395 |
+@@ -8648,8 +8648,10 @@ static void io_destroy_buffers(struct io_ring_ctx *ctx) |
1396 |
+ struct io_buffer *buf; |
1397 |
+ unsigned long index; |
1398 |
+ |
1399 |
+- xa_for_each(&ctx->io_buffers, index, buf) |
1400 |
++ xa_for_each(&ctx->io_buffers, index, buf) { |
1401 |
+ __io_remove_buffers(ctx, buf, index, -1U); |
1402 |
++ cond_resched(); |
1403 |
++ } |
1404 |
+ } |
1405 |
+ |
1406 |
+ static void io_req_cache_free(struct list_head *list, struct task_struct *tsk) |
1407 |
+@@ -9145,8 +9147,10 @@ static void io_uring_clean_tctx(struct io_uring_task *tctx) |
1408 |
+ struct io_tctx_node *node; |
1409 |
+ unsigned long index; |
1410 |
+ |
1411 |
+- xa_for_each(&tctx->xa, index, node) |
1412 |
++ xa_for_each(&tctx->xa, index, node) { |
1413 |
+ io_uring_del_tctx_node(index); |
1414 |
++ cond_resched(); |
1415 |
++ } |
1416 |
+ if (wq) { |
1417 |
+ /* |
1418 |
+ * Must be after io_uring_del_task_file() (removes nodes under |
1419 |
+diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c |
1420 |
+index 3d805f5b1f5d2..1c33a52558930 100644 |
1421 |
+--- a/fs/nfsd/nfs4state.c |
1422 |
++++ b/fs/nfsd/nfs4state.c |
1423 |
+@@ -3570,7 +3570,7 @@ static struct nfsd4_conn *__nfsd4_find_conn(struct svc_xprt *xpt, struct nfsd4_s |
1424 |
+ } |
1425 |
+ |
1426 |
+ static __be32 nfsd4_match_existing_connection(struct svc_rqst *rqst, |
1427 |
+- struct nfsd4_session *session, u32 req) |
1428 |
++ struct nfsd4_session *session, u32 req, struct nfsd4_conn **conn) |
1429 |
+ { |
1430 |
+ struct nfs4_client *clp = session->se_client; |
1431 |
+ struct svc_xprt *xpt = rqst->rq_xprt; |
1432 |
+@@ -3593,6 +3593,8 @@ static __be32 nfsd4_match_existing_connection(struct svc_rqst *rqst, |
1433 |
+ else |
1434 |
+ status = nfserr_inval; |
1435 |
+ spin_unlock(&clp->cl_lock); |
1436 |
++ if (status == nfs_ok && conn) |
1437 |
++ *conn = c; |
1438 |
+ return status; |
1439 |
+ } |
1440 |
+ |
1441 |
+@@ -3617,8 +3619,16 @@ __be32 nfsd4_bind_conn_to_session(struct svc_rqst *rqstp, |
1442 |
+ status = nfserr_wrong_cred; |
1443 |
+ if (!nfsd4_mach_creds_match(session->se_client, rqstp)) |
1444 |
+ goto out; |
1445 |
+- status = nfsd4_match_existing_connection(rqstp, session, bcts->dir); |
1446 |
+- if (status == nfs_ok || status == nfserr_inval) |
1447 |
++ status = nfsd4_match_existing_connection(rqstp, session, |
1448 |
++ bcts->dir, &conn); |
1449 |
++ if (status == nfs_ok) { |
1450 |
++ if (bcts->dir == NFS4_CDFC4_FORE_OR_BOTH || |
1451 |
++ bcts->dir == NFS4_CDFC4_BACK) |
1452 |
++ conn->cn_flags |= NFS4_CDFC4_BACK; |
1453 |
++ nfsd4_probe_callback(session->se_client); |
1454 |
++ goto out; |
1455 |
++ } |
1456 |
++ if (status == nfserr_inval) |
1457 |
+ goto out; |
1458 |
+ status = nfsd4_map_bcts_dir(&bcts->dir); |
1459 |
+ if (status) |
1460 |
+diff --git a/include/linux/libata.h b/include/linux/libata.h |
1461 |
+index 3fcd24236793e..cb95d3f3337d5 100644 |
1462 |
+--- a/include/linux/libata.h |
1463 |
++++ b/include/linux/libata.h |
1464 |
+@@ -422,6 +422,7 @@ enum { |
1465 |
+ ATA_HORKAGE_NOTRIM = (1 << 24), /* don't use TRIM */ |
1466 |
+ ATA_HORKAGE_MAX_SEC_1024 = (1 << 25), /* Limit max sects to 1024 */ |
1467 |
+ ATA_HORKAGE_MAX_TRIM_128M = (1 << 26), /* Limit max trim size to 128M */ |
1468 |
++ ATA_HORKAGE_NO_NCQ_ON_ATI = (1 << 27), /* Disable NCQ on ATI chipset */ |
1469 |
+ |
1470 |
+ /* DMA mask for user DMA control: User visible values; DO NOT |
1471 |
+ renumber */ |
1472 |
+diff --git a/include/linux/mdio.h b/include/linux/mdio.h |
1473 |
+index ffb787d5ebde3..5e6dc38f418e4 100644 |
1474 |
+--- a/include/linux/mdio.h |
1475 |
++++ b/include/linux/mdio.h |
1476 |
+@@ -80,6 +80,9 @@ struct mdio_driver { |
1477 |
+ |
1478 |
+ /* Clears up any memory if needed */ |
1479 |
+ void (*remove)(struct mdio_device *mdiodev); |
1480 |
++ |
1481 |
++ /* Quiesces the device on system shutdown, turns off interrupts etc */ |
1482 |
++ void (*shutdown)(struct mdio_device *mdiodev); |
1483 |
+ }; |
1484 |
+ |
1485 |
+ static inline struct mdio_driver * |
1486 |
+diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan |
1487 |
+index 801c415bac59d..b9e94c5e70970 100644 |
1488 |
+--- a/scripts/Makefile.kasan |
1489 |
++++ b/scripts/Makefile.kasan |
1490 |
+@@ -33,10 +33,11 @@ else |
1491 |
+ CFLAGS_KASAN := $(CFLAGS_KASAN_SHADOW) \ |
1492 |
+ $(call cc-param,asan-globals=1) \ |
1493 |
+ $(call cc-param,asan-instrumentation-with-call-threshold=$(call_threshold)) \ |
1494 |
+- $(call cc-param,asan-stack=$(stack_enable)) \ |
1495 |
+ $(call cc-param,asan-instrument-allocas=1) |
1496 |
+ endif |
1497 |
+ |
1498 |
++CFLAGS_KASAN += $(call cc-param,asan-stack=$(stack_enable)) |
1499 |
++ |
1500 |
+ endif # CONFIG_KASAN_GENERIC |
1501 |
+ |
1502 |
+ ifdef CONFIG_KASAN_SW_TAGS |
1503 |
+diff --git a/tools/arch/x86/lib/insn.c b/tools/arch/x86/lib/insn.c |
1504 |
+index c41f95815480d..797699462cd8e 100644 |
1505 |
+--- a/tools/arch/x86/lib/insn.c |
1506 |
++++ b/tools/arch/x86/lib/insn.c |
1507 |
+@@ -37,10 +37,10 @@ |
1508 |
+ ((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr) |
1509 |
+ |
1510 |
+ #define __get_next(t, insn) \ |
1511 |
+- ({ t r = *(t*)insn->next_byte; insn->next_byte += sizeof(t); leXX_to_cpu(t, r); }) |
1512 |
++ ({ t r; memcpy(&r, insn->next_byte, sizeof(t)); insn->next_byte += sizeof(t); leXX_to_cpu(t, r); }) |
1513 |
+ |
1514 |
+ #define __peek_nbyte_next(t, insn, n) \ |
1515 |
+- ({ t r = *(t*)((insn)->next_byte + n); leXX_to_cpu(t, r); }) |
1516 |
++ ({ t r; memcpy(&r, (insn)->next_byte + n, sizeof(t)); leXX_to_cpu(t, r); }) |
1517 |
+ |
1518 |
+ #define get_next(t, insn) \ |
1519 |
+ ({ if (unlikely(!validate_next(t, insn, 0))) goto err_out; __get_next(t, insn); }) |
1520 |
+diff --git a/tools/testing/selftests/kvm/include/test_util.h b/tools/testing/selftests/kvm/include/test_util.h |
1521 |
+index d79be15dd3d20..451fed5ce8e72 100644 |
1522 |
+--- a/tools/testing/selftests/kvm/include/test_util.h |
1523 |
++++ b/tools/testing/selftests/kvm/include/test_util.h |
1524 |
+@@ -95,6 +95,8 @@ struct vm_mem_backing_src_alias { |
1525 |
+ uint32_t flag; |
1526 |
+ }; |
1527 |
+ |
1528 |
++#define MIN_RUN_DELAY_NS 200000UL |
1529 |
++ |
1530 |
+ bool thp_configured(void); |
1531 |
+ size_t get_trans_hugepagesz(void); |
1532 |
+ size_t get_def_hugetlb_pagesz(void); |
1533 |
+@@ -102,6 +104,7 @@ const struct vm_mem_backing_src_alias *vm_mem_backing_src_alias(uint32_t i); |
1534 |
+ size_t get_backing_src_pagesz(uint32_t i); |
1535 |
+ void backing_src_help(void); |
1536 |
+ enum vm_mem_backing_src_type parse_backing_src_type(const char *type_name); |
1537 |
++long get_run_delay(void); |
1538 |
+ |
1539 |
+ /* |
1540 |
+ * Whether or not the given source type is shared memory (as opposed to |
1541 |
+diff --git a/tools/testing/selftests/kvm/lib/test_util.c b/tools/testing/selftests/kvm/lib/test_util.c |
1542 |
+index af1031fed97f7..a9107bfae4021 100644 |
1543 |
+--- a/tools/testing/selftests/kvm/lib/test_util.c |
1544 |
++++ b/tools/testing/selftests/kvm/lib/test_util.c |
1545 |
+@@ -11,6 +11,7 @@ |
1546 |
+ #include <stdlib.h> |
1547 |
+ #include <time.h> |
1548 |
+ #include <sys/stat.h> |
1549 |
++#include <sys/syscall.h> |
1550 |
+ #include <linux/mman.h> |
1551 |
+ #include "linux/kernel.h" |
1552 |
+ |
1553 |
+@@ -129,13 +130,16 @@ size_t get_trans_hugepagesz(void) |
1554 |
+ { |
1555 |
+ size_t size; |
1556 |
+ FILE *f; |
1557 |
++ int ret; |
1558 |
+ |
1559 |
+ TEST_ASSERT(thp_configured(), "THP is not configured in host kernel"); |
1560 |
+ |
1561 |
+ f = fopen("/sys/kernel/mm/transparent_hugepage/hpage_pmd_size", "r"); |
1562 |
+ TEST_ASSERT(f != NULL, "Error in opening transparent_hugepage/hpage_pmd_size"); |
1563 |
+ |
1564 |
+- fscanf(f, "%ld", &size); |
1565 |
++ ret = fscanf(f, "%ld", &size); |
1566 |
++ ret = fscanf(f, "%ld", &size); |
1567 |
++ TEST_ASSERT(ret < 1, "Error reading transparent_hugepage/hpage_pmd_size"); |
1568 |
+ fclose(f); |
1569 |
+ |
1570 |
+ return size; |
1571 |
+@@ -300,3 +304,19 @@ enum vm_mem_backing_src_type parse_backing_src_type(const char *type_name) |
1572 |
+ TEST_FAIL("Unknown backing src type: %s", type_name); |
1573 |
+ return -1; |
1574 |
+ } |
1575 |
++ |
1576 |
++long get_run_delay(void) |
1577 |
++{ |
1578 |
++ char path[64]; |
1579 |
++ long val[2]; |
1580 |
++ FILE *fp; |
1581 |
++ |
1582 |
++ sprintf(path, "/proc/%ld/schedstat", syscall(SYS_gettid)); |
1583 |
++ fp = fopen(path, "r"); |
1584 |
++ /* Return MIN_RUN_DELAY_NS upon failure just to be safe */ |
1585 |
++ if (fscanf(fp, "%ld %ld ", &val[0], &val[1]) < 2) |
1586 |
++ val[1] = MIN_RUN_DELAY_NS; |
1587 |
++ fclose(fp); |
1588 |
++ |
1589 |
++ return val[1]; |
1590 |
++} |
1591 |
+diff --git a/tools/testing/selftests/kvm/steal_time.c b/tools/testing/selftests/kvm/steal_time.c |
1592 |
+index ecec30865a74f..62f2eb9ee3d56 100644 |
1593 |
+--- a/tools/testing/selftests/kvm/steal_time.c |
1594 |
++++ b/tools/testing/selftests/kvm/steal_time.c |
1595 |
+@@ -10,7 +10,6 @@ |
1596 |
+ #include <sched.h> |
1597 |
+ #include <pthread.h> |
1598 |
+ #include <linux/kernel.h> |
1599 |
+-#include <sys/syscall.h> |
1600 |
+ #include <asm/kvm.h> |
1601 |
+ #include <asm/kvm_para.h> |
1602 |
+ |
1603 |
+@@ -20,7 +19,6 @@ |
1604 |
+ |
1605 |
+ #define NR_VCPUS 4 |
1606 |
+ #define ST_GPA_BASE (1 << 30) |
1607 |
+-#define MIN_RUN_DELAY_NS 200000UL |
1608 |
+ |
1609 |
+ static void *st_gva[NR_VCPUS]; |
1610 |
+ static uint64_t guest_stolen_time[NR_VCPUS]; |
1611 |
+@@ -118,12 +116,12 @@ struct st_time { |
1612 |
+ uint64_t st_time; |
1613 |
+ }; |
1614 |
+ |
1615 |
+-static int64_t smccc(uint32_t func, uint32_t arg) |
1616 |
++static int64_t smccc(uint32_t func, uint64_t arg) |
1617 |
+ { |
1618 |
+ unsigned long ret; |
1619 |
+ |
1620 |
+ asm volatile( |
1621 |
+- "mov x0, %1\n" |
1622 |
++ "mov w0, %w1\n" |
1623 |
+ "mov x1, %2\n" |
1624 |
+ "hvc #0\n" |
1625 |
+ "mov %0, x0\n" |
1626 |
+@@ -217,20 +215,6 @@ static void steal_time_dump(struct kvm_vm *vm, uint32_t vcpuid) |
1627 |
+ |
1628 |
+ #endif |
1629 |
+ |
1630 |
+-static long get_run_delay(void) |
1631 |
+-{ |
1632 |
+- char path[64]; |
1633 |
+- long val[2]; |
1634 |
+- FILE *fp; |
1635 |
+- |
1636 |
+- sprintf(path, "/proc/%ld/schedstat", syscall(SYS_gettid)); |
1637 |
+- fp = fopen(path, "r"); |
1638 |
+- fscanf(fp, "%ld %ld ", &val[0], &val[1]); |
1639 |
+- fclose(fp); |
1640 |
+- |
1641 |
+- return val[1]; |
1642 |
+-} |
1643 |
+- |
1644 |
+ static void *do_steal_time(void *arg) |
1645 |
+ { |
1646 |
+ struct timespec ts, stop; |
1647 |
+diff --git a/tools/testing/selftests/kvm/x86_64/mmio_warning_test.c b/tools/testing/selftests/kvm/x86_64/mmio_warning_test.c |
1648 |
+index e6480fd5c4bdc..8039e1eff9388 100644 |
1649 |
+--- a/tools/testing/selftests/kvm/x86_64/mmio_warning_test.c |
1650 |
++++ b/tools/testing/selftests/kvm/x86_64/mmio_warning_test.c |
1651 |
+@@ -82,7 +82,8 @@ int get_warnings_count(void) |
1652 |
+ FILE *f; |
1653 |
+ |
1654 |
+ f = popen("dmesg | grep \"WARNING:\" | wc -l", "r"); |
1655 |
+- fscanf(f, "%d", &warnings); |
1656 |
++ if (fscanf(f, "%d", &warnings) < 1) |
1657 |
++ warnings = 0; |
1658 |
+ fclose(f); |
1659 |
+ |
1660 |
+ return warnings; |
1661 |
+diff --git a/tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c b/tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c |
1662 |
+index 117bf49a3d795..eda0d2a51224b 100644 |
1663 |
+--- a/tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c |
1664 |
++++ b/tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c |
1665 |
+@@ -14,7 +14,6 @@ |
1666 |
+ #include <stdint.h> |
1667 |
+ #include <time.h> |
1668 |
+ #include <sched.h> |
1669 |
+-#include <sys/syscall.h> |
1670 |
+ |
1671 |
+ #define VCPU_ID 5 |
1672 |
+ |
1673 |
+@@ -98,20 +97,6 @@ static void guest_code(void) |
1674 |
+ GUEST_DONE(); |
1675 |
+ } |
1676 |
+ |
1677 |
+-static long get_run_delay(void) |
1678 |
+-{ |
1679 |
+- char path[64]; |
1680 |
+- long val[2]; |
1681 |
+- FILE *fp; |
1682 |
+- |
1683 |
+- sprintf(path, "/proc/%ld/schedstat", syscall(SYS_gettid)); |
1684 |
+- fp = fopen(path, "r"); |
1685 |
+- fscanf(fp, "%ld %ld ", &val[0], &val[1]); |
1686 |
+- fclose(fp); |
1687 |
+- |
1688 |
+- return val[1]; |
1689 |
+-} |
1690 |
+- |
1691 |
+ static int cmp_timespec(struct timespec *a, struct timespec *b) |
1692 |
+ { |
1693 |
+ if (a->tv_sec > b->tv_sec) |
1694 |
+diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk |
1695 |
+index fa2ac0e56b43c..fe7ee2b0f29c2 100644 |
1696 |
+--- a/tools/testing/selftests/lib.mk |
1697 |
++++ b/tools/testing/selftests/lib.mk |
1698 |
+@@ -48,6 +48,7 @@ ARCH ?= $(SUBARCH) |
1699 |
+ # When local build is done, headers are installed in the default |
1700 |
+ # INSTALL_HDR_PATH usr/include. |
1701 |
+ .PHONY: khdr |
1702 |
++.NOTPARALLEL: |
1703 |
+ khdr: |
1704 |
+ ifndef KSFT_KHDR_INSTALL_DONE |
1705 |
+ ifeq (1,$(DEFAULT_INSTALL_HDR_PATH)) |
1706 |
+diff --git a/tools/usb/testusb.c b/tools/usb/testusb.c |
1707 |
+index ee8208b2f9460..69c3ead25313d 100644 |
1708 |
+--- a/tools/usb/testusb.c |
1709 |
++++ b/tools/usb/testusb.c |
1710 |
+@@ -265,12 +265,6 @@ nomem: |
1711 |
+ } |
1712 |
+ |
1713 |
+ entry->ifnum = ifnum; |
1714 |
+- |
1715 |
+- /* FIXME update USBDEVFS_CONNECTINFO so it tells about high speed etc */ |
1716 |
+- |
1717 |
+- fprintf(stderr, "%s speed\t%s\t%u\n", |
1718 |
+- speed(entry->speed), entry->name, entry->ifnum); |
1719 |
+- |
1720 |
+ entry->next = testdevs; |
1721 |
+ testdevs = entry; |
1722 |
+ return 0; |
1723 |
+@@ -299,6 +293,14 @@ static void *handle_testdev (void *arg) |
1724 |
+ return 0; |
1725 |
+ } |
1726 |
+ |
1727 |
++ status = ioctl(fd, USBDEVFS_GET_SPEED, NULL); |
1728 |
++ if (status < 0) |
1729 |
++ fprintf(stderr, "USBDEVFS_GET_SPEED failed %d\n", status); |
1730 |
++ else |
1731 |
++ dev->speed = status; |
1732 |
++ fprintf(stderr, "%s speed\t%s\t%u\n", |
1733 |
++ speed(dev->speed), dev->name, dev->ifnum); |
1734 |
++ |
1735 |
+ restart: |
1736 |
+ for (i = 0; i < TEST_CASES; i++) { |
1737 |
+ if (dev->test != -1 && dev->test != i) |
1738 |
+diff --git a/tools/vm/page-types.c b/tools/vm/page-types.c |
1739 |
+index 0517c744b04e8..f62f10c988db1 100644 |
1740 |
+--- a/tools/vm/page-types.c |
1741 |
++++ b/tools/vm/page-types.c |
1742 |
+@@ -1331,7 +1331,7 @@ int main(int argc, char *argv[]) |
1743 |
+ if (opt_list && opt_list_mapcnt) |
1744 |
+ kpagecount_fd = checked_open(PROC_KPAGECOUNT, O_RDONLY); |
1745 |
+ |
1746 |
+- if (opt_mark_idle && opt_file) |
1747 |
++ if (opt_mark_idle) |
1748 |
+ page_idle_fd = checked_open(SYS_KERNEL_MM_PAGE_IDLE, O_RDWR); |
1749 |
+ |
1750 |
+ if (opt_list && opt_pid) |
1751 |
+diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c |
1752 |
+index b50dbe269f4bf..1a11dcb670a39 100644 |
1753 |
+--- a/virt/kvm/kvm_main.c |
1754 |
++++ b/virt/kvm/kvm_main.c |
1755 |
+@@ -3053,15 +3053,19 @@ out: |
1756 |
+ |
1757 |
+ static void shrink_halt_poll_ns(struct kvm_vcpu *vcpu) |
1758 |
+ { |
1759 |
+- unsigned int old, val, shrink; |
1760 |
++ unsigned int old, val, shrink, grow_start; |
1761 |
+ |
1762 |
+ old = val = vcpu->halt_poll_ns; |
1763 |
+ shrink = READ_ONCE(halt_poll_ns_shrink); |
1764 |
++ grow_start = READ_ONCE(halt_poll_ns_grow_start); |
1765 |
+ if (shrink == 0) |
1766 |
+ val = 0; |
1767 |
+ else |
1768 |
+ val /= shrink; |
1769 |
+ |
1770 |
++ if (val < grow_start) |
1771 |
++ val = 0; |
1772 |
++ |
1773 |
+ vcpu->halt_poll_ns = val; |
1774 |
+ trace_kvm_halt_poll_ns_shrink(vcpu->vcpu_id, val, old); |
1775 |
+ } |