Skip to content

Commit bb6a4b9

Browse files
frank-wfrank-w
committed
Merge tag 'v6.6.104' into 6.6-main
This is the 6.6.104 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmi5lHkACgkQONu9yGCS # aT5omhAAxHNFmUqavxq01DnWQR4534GwoCyWAoDAiwCdgfIZYjtqEN9/4DyGx3qo # f50rkvug16iNpn77Jpfx5KkOoIJvZnBU9BJl/uUjXIX7zVTm8cHRX914REr8lBwt # GiGTHOK1ik4KP54aa6NCoYZy+iRK84V23I/1t9AfJ73f7+ZhjkBVEr+gSB2vzSaA # g/VDTTEGdusP18uPExKebdNdxOfVAUDR4nCKW8G1FWymvE1zPo+KiESA9FAI7iX7 # qgAobNYwEfpjPN+ZSYy2FhIr1OnagKZwVtLDwHwvptEh3mfzpROOh/s/dBkitMfR # XM82igfq/iommNGjf2V/rNy4Yjz5o08oQremuUz2aJy2XDkOBF1PPLXObpWVJIn5 # P0vBqGp3FtxE3r4qSLH1PdmOjty/8rLY59qe60r5LhctNQzskuDSGG2lzXGx9wOK # t8+aI9IsDS1M6cd/v1uRw5XwkQ+a7YziSIGn27Jl4MLRNOkVJLEd7kiprQofU65D # copLDjyGem4LWESWA2CE7JddQF63qLC37Jah1k1+pssXAyLgJ7oJpdXyrSSKmK9W # YVJ062ecVb0ipFQ13XleGacu+cs81ZF5E1oHGvx+PtErN6uT57qWhlp0yO775D67 # 4ln4vit5L5FeZNEnpmSCHDprKB/lzij6vgTo3ky8XQUZuhDLIlg= # =6jHg # -----END PGP SIGNATURE----- # gpg: Signature made Thu Sep 4 15:30:33 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents d3b8e9d + 355bd0b commit bb6a4b9

82 files changed

Lines changed: 890 additions & 553 deletions

Some content is hidden

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

‎Documentation/devicetree/bindings/display/msm/qcom,mdp5.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ properties:
5959
- const: bus
6060
- const: core
6161
- const: vsync
62-
- const: lut
6362
- const: tbu
6463
- const: tbu_rt
6564
# MSM8996 has additional iommu clock

‎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 = 103
4+
SUBLEVEL = 104
55
EXTRAVERSION =
66
NAME = Pinguïn Aangedreven
77

‎arch/mips/boot/dts/lantiq/danube_easy50712.dts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,16 @@
8282
};
8383
};
8484

85-
etop@e180000 {
85+
ethernet@e180000 {
8686
compatible = "lantiq,etop-xway";
8787
reg = <0xe180000 0x40000>;
8888
interrupt-parent = <&icu0>;
8989
interrupts = <73 78>;
90+
interrupt-names = "tx", "rx";
9091
phy-mode = "rmii";
9192
mac-address = [ 00 11 22 33 44 55 ];
93+
lantiq,rx-burst-length = <4>;
94+
lantiq,tx-burst-length = <4>;
9295
};
9396

9497
stp0: stp@e100bb0 {

‎arch/mips/lantiq/xway/sysctrl.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ void __init ltq_soc_init(void)
478478
ifccr = CGU_IFCCR_VR9;
479479
pcicr = CGU_PCICR_VR9;
480480
} else {
481-
clkdev_add_pmu("1e180000.etop", NULL, 1, 0, PMU_PPE);
481+
clkdev_add_pmu("1e180000.ethernet", NULL, 1, 0, PMU_PPE);
482482
}
483483

484484
if (!of_machine_is_compatible("lantiq,ase"))
@@ -512,9 +512,9 @@ void __init ltq_soc_init(void)
512512
CLOCK_133M, CLOCK_133M);
513513
clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0);
514514
clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 0, PMU_USB0_P);
515-
clkdev_add_pmu("1e180000.etop", "ppe", 1, 0, PMU_PPE);
516-
clkdev_add_cgu("1e180000.etop", "ephycgu", CGU_EPHY);
517-
clkdev_add_pmu("1e180000.etop", "ephy", 1, 0, PMU_EPHY);
515+
clkdev_add_pmu("1e180000.ethernet", "ppe", 1, 0, PMU_PPE);
516+
clkdev_add_cgu("1e180000.ethernet", "ephycgu", CGU_EPHY);
517+
clkdev_add_pmu("1e180000.ethernet", "ephy", 1, 0, PMU_EPHY);
518518
clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_ASE_SDIO);
519519
clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);
520520
} else if (of_machine_is_compatible("lantiq,grx390")) {
@@ -573,7 +573,7 @@ void __init ltq_soc_init(void)
573573
clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0 | PMU_AHBM);
574574
clkdev_add_pmu("1f203034.usb2-phy", "phy", 1, 0, PMU_USB1_P);
575575
clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1 | PMU_AHBM);
576-
clkdev_add_pmu("1e180000.etop", "switch", 1, 0, PMU_SWITCH);
576+
clkdev_add_pmu("1e180000.ethernet", "switch", 1, 0, PMU_SWITCH);
577577
clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO);
578578
clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);
579579
clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);

‎arch/powerpc/kernel/kvm.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -632,28 +632,28 @@ static void __init kvm_check_ins(u32 *inst, u32 features)
632632
#endif
633633
}
634634

635-
switch (inst_no_rt & ~KVM_MASK_RB) {
636635
#ifdef CONFIG_PPC_BOOK3S_32
636+
switch (inst_no_rt & ~KVM_MASK_RB) {
637637
case KVM_INST_MTSRIN:
638638
if (features & KVM_MAGIC_FEAT_SR) {
639639
u32 inst_rb = _inst & KVM_MASK_RB;
640640
kvm_patch_ins_mtsrin(inst, inst_rt, inst_rb);
641641
}
642642
break;
643-
#endif
644643
}
644+
#endif
645645

646-
switch (_inst) {
647646
#ifdef CONFIG_BOOKE
647+
switch (_inst) {
648648
case KVM_INST_WRTEEI_0:
649649
kvm_patch_ins_wrteei_0(inst);
650650
break;
651651

652652
case KVM_INST_WRTEEI_1:
653653
kvm_patch_ins_wrtee(inst, 0, 1);
654654
break;
655-
#endif
656655
}
656+
#endif
657657
}
658658

659659
extern u32 kvm_template_start[];

‎arch/x86/kernel/cpu/microcode/amd.c‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,28 @@ static int cmp_id(const void *key, const void *elem)
161161
return 1;
162162
}
163163

164+
static u32 cpuid_to_ucode_rev(unsigned int val)
165+
{
166+
union zen_patch_rev p = {};
167+
union cpuid_1_eax c;
168+
169+
c.full = val;
170+
171+
p.stepping = c.stepping;
172+
p.model = c.model;
173+
p.ext_model = c.ext_model;
174+
p.ext_fam = c.ext_fam;
175+
176+
return p.ucode_rev;
177+
}
178+
164179
static bool need_sha_check(u32 cur_rev)
165180
{
181+
if (!cur_rev) {
182+
cur_rev = cpuid_to_ucode_rev(bsp_cpuid_1_eax);
183+
pr_info_once("No current revision, generating the lowest one: 0x%x\n", cur_rev);
184+
}
185+
166186
switch (cur_rev >> 8) {
167187
case 0x80012: return cur_rev <= 0x800126f; break;
168188
case 0x80082: return cur_rev <= 0x800820f; break;
@@ -744,8 +764,6 @@ static struct ucode_patch *cache_find_patch(struct ucode_cpu_info *uci, u16 equi
744764
n.equiv_cpu = equiv_cpu;
745765
n.patch_id = uci->cpu_sig.rev;
746766

747-
WARN_ON_ONCE(!n.patch_id);
748-
749767
list_for_each_entry(p, &microcode_cache, plist)
750768
if (patch_cpus_equivalent(p, &n, false))
751769
return p;

‎arch/x86/kvm/lapic.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -847,6 +847,8 @@ static int __pv_send_ipi(unsigned long *ipi_bitmap, struct kvm_apic_map *map,
847847
if (min > map->max_apic_id)
848848
return 0;
849849

850+
min = array_index_nospec(min, map->max_apic_id + 1);
851+
850852
for_each_set_bit(i, ipi_bitmap,
851853
min((u32)BITS_PER_LONG, (map->max_apic_id - min + 1))) {
852854
if (map->phys_map[min + i]) {

‎arch/x86/kvm/x86.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9802,8 +9802,11 @@ static void kvm_sched_yield(struct kvm_vcpu *vcpu, unsigned long dest_id)
98029802
rcu_read_lock();
98039803
map = rcu_dereference(vcpu->kvm->arch.apic_map);
98049804

9805-
if (likely(map) && dest_id <= map->max_apic_id && map->phys_map[dest_id])
9806-
target = map->phys_map[dest_id]->vcpu;
9805+
if (likely(map) && dest_id <= map->max_apic_id) {
9806+
dest_id = array_index_nospec(dest_id, map->max_apic_id + 1);
9807+
if (map->phys_map[dest_id])
9808+
target = map->phys_map[dest_id]->vcpu;
9809+
}
98079810

98089811
rcu_read_unlock();
98099812

‎drivers/acpi/ec.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2329,6 +2329,12 @@ static const struct dmi_system_id acpi_ec_no_wakeup[] = {
23292329
DMI_MATCH(DMI_PRODUCT_NAME, "83Q3"),
23302330
}
23312331
},
2332+
{
2333+
// TUXEDO InfinityBook Pro AMD Gen9
2334+
.matches = {
2335+
DMI_MATCH(DMI_BOARD_NAME, "GXxHRXx"),
2336+
},
2337+
},
23322338
{ },
23332339
};
23342340

‎drivers/atm/atmtcp.c‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,19 @@ static struct atm_vcc *find_vcc(struct atm_dev *dev, short vpi, int vci)
279279
return NULL;
280280
}
281281

282+
static int atmtcp_c_pre_send(struct atm_vcc *vcc, struct sk_buff *skb)
283+
{
284+
struct atmtcp_hdr *hdr;
285+
286+
if (skb->len < sizeof(struct atmtcp_hdr))
287+
return -EINVAL;
288+
289+
hdr = (struct atmtcp_hdr *)skb->data;
290+
if (hdr->length == ATMTCP_HDR_MAGIC)
291+
return -EINVAL;
292+
293+
return 0;
294+
}
282295

283296
static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
284297
{
@@ -288,9 +301,6 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
288301
struct sk_buff *new_skb;
289302
int result = 0;
290303

291-
if (skb->len < sizeof(struct atmtcp_hdr))
292-
goto done;
293-
294304
dev = vcc->dev_data;
295305
hdr = (struct atmtcp_hdr *) skb->data;
296306
if (hdr->length == ATMTCP_HDR_MAGIC) {
@@ -347,6 +357,7 @@ static const struct atmdev_ops atmtcp_v_dev_ops = {
347357

348358
static const struct atmdev_ops atmtcp_c_dev_ops = {
349359
.close = atmtcp_c_close,
360+
.pre_send = atmtcp_c_pre_send,
350361
.send = atmtcp_c_send
351362
};
352363

0 commit comments

Comments
 (0)