Skip to content

Commit 11328c1

Browse files
frank-wfrank-w
committed
Merge tag 'v6.6.74' into 6.6-main
This is the 6.6.74 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmeSbI4ACgkQONu9yGCS # aT7dqxAAnLkp2YQsNxQF+L1DRPVpgteRH/SKC1aIx4e+UVFIDnpd7+5TKL3iFQvB # bfQNn6w73hTcrP2Rsxe2+Ldeb/EUJR+XeJS2iBMUGE9zUOKIPgknmwNcWre2J+av # Fi2I14wGPMBH+ceCgQgkRSkOhReSf1P/HjaddcD4habg6s16GfA1Wt/h2KbB92Ob # 8z8R+f/+VMfXL+c6DlWBS4N/NtM+HyxNdbZjGANoQCXxYQE+x5PF9KoZbOgxNYkO # 1GO6D5IHbdrhIvWKds6kde/O8dkVsDW+4NezmZPjiaBno6GZD6HYNtqCfrQK5NR6 # STXekHQTDx/RhWWC/Kn/9VrWDgrQblqGvfZBq2sGm5vL7OSWf/1lXmwwGcsijrkE # 0d4vv8EXu4Lzr5e7o/0EwJ2yEQjQ81iQ1exxAFQjIhFQkTvMzKCQyvtbUUWhUW8o # gPDYJiFwV9eGf5/Sdp4rVNtGOmBRj0OZMB63GwzV9eBjPcmBui/xE42abmN1AXNq # 1fEHncg+v+nSBDpl3O/4+HxrsYx1IFQGLrj29BgG+NzVsJAVChgL22lt8ec25SfD # JdWZc9Qb45SmU2ER3r6q8RwcguIKC9opDhXbN+s/mjsL5dGEOSukmoZky9Gbie1V # bF4D/5Pp/0OCgeFcrf1R/1IAWZSs7DApjlWXobn6VX1IZjkqydo= # =NlEa # -----END PGP SIGNATURE----- # gpg: Signature made Thu Jan 23 17:21:34 2025 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 795525b + 0372f43 commit 11328c1

File tree

90 files changed

+477
-313
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+477
-313
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 6
4-
SUBLEVEL = 73
4+
SUBLEVEL = 74
55
EXTRAVERSION =
66
NAME = Pinguïn Aangedreven
77

‎arch/x86/include/asm/special_insns.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ static inline int write_user_shstk_64(u64 __user *addr, u64 val)
217217

218218
#define nop() asm volatile ("nop")
219219

220-
static inline void serialize(void)
220+
static __always_inline void serialize(void)
221221
{
222222
/* Instruction opcode for SERIALIZE; supported in binutils >= 2.35. */
223223
asm volatile(".byte 0xf, 0x1, 0xe8" ::: "memory");

‎arch/x86/xen/xen-asm.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ SYM_CODE_END(xen_early_idt_handler_array)
221221
push %rax
222222
mov $__HYPERVISOR_iret, %eax
223223
syscall /* Do the IRET. */
224-
#ifdef CONFIG_MITIGATION_SLS
224+
#ifdef CONFIG_SLS
225225
int3
226226
#endif
227227
.endm

‎block/blk-sysfs.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -842,10 +842,8 @@ int blk_register_queue(struct gendisk *disk)
842842
* faster to shut down and is made fully functional here as
843843
* request_queues for non-existent devices never get registered.
844844
*/
845-
if (!blk_queue_init_done(q)) {
846-
blk_queue_flag_set(QUEUE_FLAG_INIT_DONE, q);
847-
percpu_ref_switch_to_percpu(&q->q_usage_counter);
848-
}
845+
blk_queue_flag_set(QUEUE_FLAG_INIT_DONE, q);
846+
percpu_ref_switch_to_percpu(&q->q_usage_counter);
849847

850848
return ret;
851849

‎block/genhd.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -710,13 +710,10 @@ void del_gendisk(struct gendisk *disk)
710710
* If the disk does not own the queue, allow using passthrough requests
711711
* again. Else leave the queue frozen to fail all I/O.
712712
*/
713-
if (!test_bit(GD_OWNS_QUEUE, &disk->state)) {
714-
blk_queue_flag_clear(QUEUE_FLAG_INIT_DONE, q);
713+
if (!test_bit(GD_OWNS_QUEUE, &disk->state))
715714
__blk_mq_unfreeze_queue(q, true);
716-
} else {
717-
if (queue_is_mq(q))
718-
blk_mq_exit_queue(q);
719-
}
715+
else if (queue_is_mq(q))
716+
blk_mq_exit_queue(q);
720717
}
721718
EXPORT_SYMBOL(del_gendisk);
722719

‎drivers/acpi/resource.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -680,11 +680,11 @@ static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity,
680680
for (i = 0; i < ARRAY_SIZE(override_table); i++) {
681681
const struct irq_override_cmp *entry = &override_table[i];
682682

683-
if (dmi_check_system(entry->system) &&
684-
entry->irq == gsi &&
683+
if (entry->irq == gsi &&
685684
entry->triggering == triggering &&
686685
entry->polarity == polarity &&
687-
entry->shareable == shareable)
686+
entry->shareable == shareable &&
687+
dmi_check_system(entry->system))
688688
return entry->override;
689689
}
690690

‎drivers/block/zram/zram_drv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,6 +1262,7 @@ static bool zram_meta_alloc(struct zram *zram, u64 disksize)
12621262
zram->mem_pool = zs_create_pool(zram->disk->disk_name);
12631263
if (!zram->mem_pool) {
12641264
vfree(zram->table);
1265+
zram->table = NULL;
12651266
return false;
12661267
}
12671268

‎drivers/gpio/gpio-xilinx.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct xgpio_instance {
6666
DECLARE_BITMAP(state, 64);
6767
DECLARE_BITMAP(last_irq_read, 64);
6868
DECLARE_BITMAP(dir, 64);
69-
spinlock_t gpio_lock; /* For serializing operations */
69+
raw_spinlock_t gpio_lock; /* For serializing operations */
7070
int irq;
7171
DECLARE_BITMAP(enable, 64);
7272
DECLARE_BITMAP(rising_edge, 64);
@@ -180,14 +180,14 @@ static void xgpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
180180
struct xgpio_instance *chip = gpiochip_get_data(gc);
181181
int bit = xgpio_to_bit(chip, gpio);
182182

183-
spin_lock_irqsave(&chip->gpio_lock, flags);
183+
raw_spin_lock_irqsave(&chip->gpio_lock, flags);
184184

185185
/* Write to GPIO signal and set its direction to output */
186186
__assign_bit(bit, chip->state, val);
187187

188188
xgpio_write_ch(chip, XGPIO_DATA_OFFSET, bit, chip->state);
189189

190-
spin_unlock_irqrestore(&chip->gpio_lock, flags);
190+
raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);
191191
}
192192

193193
/**
@@ -211,15 +211,15 @@ static void xgpio_set_multiple(struct gpio_chip *gc, unsigned long *mask,
211211
bitmap_remap(hw_mask, mask, chip->sw_map, chip->hw_map, 64);
212212
bitmap_remap(hw_bits, bits, chip->sw_map, chip->hw_map, 64);
213213

214-
spin_lock_irqsave(&chip->gpio_lock, flags);
214+
raw_spin_lock_irqsave(&chip->gpio_lock, flags);
215215

216216
bitmap_replace(state, chip->state, hw_bits, hw_mask, 64);
217217

218218
xgpio_write_ch_all(chip, XGPIO_DATA_OFFSET, state);
219219

220220
bitmap_copy(chip->state, state, 64);
221221

222-
spin_unlock_irqrestore(&chip->gpio_lock, flags);
222+
raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);
223223
}
224224

225225
/**
@@ -237,13 +237,13 @@ static int xgpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
237237
struct xgpio_instance *chip = gpiochip_get_data(gc);
238238
int bit = xgpio_to_bit(chip, gpio);
239239

240-
spin_lock_irqsave(&chip->gpio_lock, flags);
240+
raw_spin_lock_irqsave(&chip->gpio_lock, flags);
241241

242242
/* Set the GPIO bit in shadow register and set direction as input */
243243
__set_bit(bit, chip->dir);
244244
xgpio_write_ch(chip, XGPIO_TRI_OFFSET, bit, chip->dir);
245245

246-
spin_unlock_irqrestore(&chip->gpio_lock, flags);
246+
raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);
247247

248248
return 0;
249249
}
@@ -266,7 +266,7 @@ static int xgpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
266266
struct xgpio_instance *chip = gpiochip_get_data(gc);
267267
int bit = xgpio_to_bit(chip, gpio);
268268

269-
spin_lock_irqsave(&chip->gpio_lock, flags);
269+
raw_spin_lock_irqsave(&chip->gpio_lock, flags);
270270

271271
/* Write state of GPIO signal */
272272
__assign_bit(bit, chip->state, val);
@@ -276,7 +276,7 @@ static int xgpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
276276
__clear_bit(bit, chip->dir);
277277
xgpio_write_ch(chip, XGPIO_TRI_OFFSET, bit, chip->dir);
278278

279-
spin_unlock_irqrestore(&chip->gpio_lock, flags);
279+
raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);
280280

281281
return 0;
282282
}
@@ -404,7 +404,7 @@ static void xgpio_irq_mask(struct irq_data *irq_data)
404404
int bit = xgpio_to_bit(chip, irq_offset);
405405
u32 mask = BIT(bit / 32), temp;
406406

407-
spin_lock_irqsave(&chip->gpio_lock, flags);
407+
raw_spin_lock_irqsave(&chip->gpio_lock, flags);
408408

409409
__clear_bit(bit, chip->enable);
410410

@@ -414,7 +414,7 @@ static void xgpio_irq_mask(struct irq_data *irq_data)
414414
temp &= ~mask;
415415
xgpio_writereg(chip->regs + XGPIO_IPIER_OFFSET, temp);
416416
}
417-
spin_unlock_irqrestore(&chip->gpio_lock, flags);
417+
raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);
418418

419419
gpiochip_disable_irq(&chip->gc, irq_offset);
420420
}
@@ -434,7 +434,7 @@ static void xgpio_irq_unmask(struct irq_data *irq_data)
434434

435435
gpiochip_enable_irq(&chip->gc, irq_offset);
436436

437-
spin_lock_irqsave(&chip->gpio_lock, flags);
437+
raw_spin_lock_irqsave(&chip->gpio_lock, flags);
438438

439439
__set_bit(bit, chip->enable);
440440

@@ -453,7 +453,7 @@ static void xgpio_irq_unmask(struct irq_data *irq_data)
453453
xgpio_writereg(chip->regs + XGPIO_IPIER_OFFSET, val);
454454
}
455455

456-
spin_unlock_irqrestore(&chip->gpio_lock, flags);
456+
raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);
457457
}
458458

459459
/**
@@ -518,7 +518,7 @@ static void xgpio_irqhandler(struct irq_desc *desc)
518518

519519
chained_irq_enter(irqchip, desc);
520520

521-
spin_lock(&chip->gpio_lock);
521+
raw_spin_lock(&chip->gpio_lock);
522522

523523
xgpio_read_ch_all(chip, XGPIO_DATA_OFFSET, all);
524524

@@ -535,7 +535,7 @@ static void xgpio_irqhandler(struct irq_desc *desc)
535535
bitmap_copy(chip->last_irq_read, all, 64);
536536
bitmap_or(all, rising, falling, 64);
537537

538-
spin_unlock(&chip->gpio_lock);
538+
raw_spin_unlock(&chip->gpio_lock);
539539

540540
dev_dbg(gc->parent, "IRQ rising %*pb falling %*pb\n", 64, rising, 64, falling);
541541

@@ -626,7 +626,7 @@ static int xgpio_probe(struct platform_device *pdev)
626626
bitmap_set(chip->hw_map, 0, width[0]);
627627
bitmap_set(chip->hw_map, 32, width[1]);
628628

629-
spin_lock_init(&chip->gpio_lock);
629+
raw_spin_lock_init(&chip->gpio_lock);
630630

631631
chip->gc.base = -1;
632632
chip->gc.ngpio = bitmap_weight(chip->hw_map, 64);

‎drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3172,7 +3172,7 @@ static int amdgpu_device_ip_resume_phase1(struct amdgpu_device *adev)
31723172
*
31733173
* @adev: amdgpu_device pointer
31743174
*
3175-
* Second resume function for hardware IPs. The list of all the hardware
3175+
* First resume function for hardware IPs. The list of all the hardware
31763176
* IPs that make up the asic is walked and the resume callbacks are run for
31773177
* all blocks except COMMON, GMC, and IH. resume puts the hardware into a
31783178
* functional state after a suspend and updates the software state as
@@ -3190,7 +3190,6 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev)
31903190
if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON ||
31913191
adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC ||
31923192
adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH ||
3193-
adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_DCE ||
31943193
adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP)
31953194
continue;
31963195
r = adev->ip_blocks[i].version->funcs->resume(adev);
@@ -3205,36 +3204,6 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev)
32053204
return 0;
32063205
}
32073206

3208-
/**
3209-
* amdgpu_device_ip_resume_phase3 - run resume for hardware IPs
3210-
*
3211-
* @adev: amdgpu_device pointer
3212-
*
3213-
* Third resume function for hardware IPs. The list of all the hardware
3214-
* IPs that make up the asic is walked and the resume callbacks are run for
3215-
* all DCE. resume puts the hardware into a functional state after a suspend
3216-
* and updates the software state as necessary. This function is also used
3217-
* for restoring the GPU after a GPU reset.
3218-
*
3219-
* Returns 0 on success, negative error code on failure.
3220-
*/
3221-
static int amdgpu_device_ip_resume_phase3(struct amdgpu_device *adev)
3222-
{
3223-
int i, r;
3224-
3225-
for (i = 0; i < adev->num_ip_blocks; i++) {
3226-
if (!adev->ip_blocks[i].status.valid || adev->ip_blocks[i].status.hw)
3227-
continue;
3228-
if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_DCE) {
3229-
r = adev->ip_blocks[i].version->funcs->resume(adev);
3230-
if (r)
3231-
return r;
3232-
}
3233-
}
3234-
3235-
return 0;
3236-
}
3237-
32383207
/**
32393208
* amdgpu_device_ip_resume - run resume for hardware IPs
32403209
*
@@ -3261,13 +3230,6 @@ static int amdgpu_device_ip_resume(struct amdgpu_device *adev)
32613230

32623231
r = amdgpu_device_ip_resume_phase2(adev);
32633232

3264-
if (r)
3265-
return r;
3266-
3267-
amdgpu_fence_driver_hw_init(adev);
3268-
3269-
r = amdgpu_device_ip_resume_phase3(adev);
3270-
32713233
return r;
32723234
}
32733235

@@ -4267,6 +4229,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon)
42674229
dev_err(adev->dev, "amdgpu_device_ip_resume failed (%d).\n", r);
42684230
goto exit;
42694231
}
4232+
amdgpu_fence_driver_hw_init(adev);
42704233

42714234
r = amdgpu_device_ip_late_init(adev);
42724235
if (r)
@@ -5036,10 +4999,6 @@ int amdgpu_do_asic_reset(struct list_head *device_list_handle,
50364999
if (r)
50375000
goto out;
50385001

5039-
r = amdgpu_device_ip_resume_phase3(tmp_adev);
5040-
if (r)
5041-
goto out;
5042-
50435002
if (vram_lost)
50445003
amdgpu_device_fill_reset_magic(tmp_adev);
50455004

‎drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned int num_ibs,
193193
need_ctx_switch = ring->current_ctx != fence_ctx;
194194
if (ring->funcs->emit_pipeline_sync && job &&
195195
((tmp = amdgpu_sync_get_fence(&job->explicit_sync)) ||
196-
(amdgpu_sriov_vf(adev) && need_ctx_switch) ||
197-
amdgpu_vm_need_pipeline_sync(ring, job))) {
196+
need_ctx_switch || amdgpu_vm_need_pipeline_sync(ring, job))) {
197+
198198
need_pipe_sync = true;
199199

200200
if (tmp)

0 commit comments

Comments
 (0)