Skip to content

Commit 7922ebd

Browse files
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: toolchain/gcc: GCC12 sync upstream (coolsnowwolf#10080) ath11k-firmware: WCN6855: fix firmware link (coolsnowwolf#10078) kernel: fixes build error and refresh 5.15 patches (coolsnowwolf#10074)
2 parents e771413 + 985cc94 commit 7922ebd

File tree

53 files changed

+242
-246
lines changed

Some content is hidden

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

53 files changed

+242
-246
lines changed

package/firmware/ath11k-firmware/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ define Package/ath11k-firmware-wcn6855/install
103103
$(INSTALL_DATA) \
104104
$(PKG_BUILD_DIR)/WCN6855/hw2.0/regdb.bin \
105105
$(1)/lib/firmware/ath11k/WCN6855/hw2.0/regdb.bin
106-
$(LN) $(1)/lib/firmware/ath11k/WCN6855/hw2.0 $(1)/lib/firmware/ath11k/WCN6855/hw2.1
106+
$(LN) ./hw2.0 $(1)/lib/firmware/ath11k/WCN6855/hw2.1
107107
endef
108108

109109
$(eval $(call BuildPackage,ath11k-firmware-ipq6018))

target/linux/ath79/patches-5.15/408-mtd-redboot_partition_scan.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/mtd/parsers/redboot.c
22
+++ b/drivers/mtd/parsers/redboot.c
3-
@@ -90,12 +90,18 @@ static int parse_redboot_partitions(stru
3+
@@ -91,12 +91,18 @@ static int parse_redboot_partitions(stru
44

55
parse_redboot_of(master);
66

@@ -19,7 +19,7 @@
1919
return -EIO;
2020
}
2121
offset -= master->erasesize;
22-
@@ -108,10 +114,6 @@ nogood:
22+
@@ -109,10 +115,6 @@ nogood:
2323
goto nogood;
2424
}
2525
}
@@ -30,7 +30,7 @@
3030

3131
pr_notice("Searching for RedBoot partition table in %s at offset 0x%lx\n",
3232
master->name, offset);
33-
@@ -183,6 +185,12 @@ nogood:
33+
@@ -184,6 +186,12 @@ nogood:
3434
}
3535
if (i == numslots) {
3636
/* Didn't find it */

target/linux/generic/backport-5.15/850-v5.17-0007-PCI-aardvark-Mask-all-interrupts-when-unbinding-driv.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <[email protected]>
1818

1919
--- a/drivers/pci/controller/pci-aardvark.c
2020
+++ b/drivers/pci/controller/pci-aardvark.c
21-
@@ -1874,6 +1874,27 @@ static int advk_pcie_remove(struct platf
21+
@@ -1889,6 +1889,27 @@ static int advk_pcie_remove(struct platf
2222
advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_REG);
2323
advk_writel(pcie, PCIE_IRQ_ALL_MASK, HOST_CTRL_INT_STATUS_REG);
2424

target/linux/generic/backport-5.15/850-v5.17-0008-PCI-aardvark-Fix-memory-leak-in-driver-unbind.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Signed-off-by: Lorenzo Pieralisi <[email protected]>
2121

2222
--- a/drivers/pci/controller/pci-aardvark.c
2323
+++ b/drivers/pci/controller/pci-aardvark.c
24-
@@ -1912,6 +1912,9 @@ static int advk_pcie_remove(struct platf
24+
@@ -1927,6 +1927,9 @@ static int advk_pcie_remove(struct platf
2525
val &= ~LINK_TRAINING_EN;
2626
advk_writel(pcie, val, PCIE_CORE_CTRL0_REG);
2727

target/linux/generic/backport-5.15/850-v5.17-0009-PCI-aardvark-Assert-PERST-when-unbinding-driver.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <[email protected]>
2020

2121
--- a/drivers/pci/controller/pci-aardvark.c
2222
+++ b/drivers/pci/controller/pci-aardvark.c
23-
@@ -1915,6 +1915,10 @@ static int advk_pcie_remove(struct platf
23+
@@ -1930,6 +1930,10 @@ static int advk_pcie_remove(struct platf
2424
/* Free config space for emulated root bridge */
2525
pci_bridge_emul_cleanup(&pcie->bridge);
2626

target/linux/generic/backport-5.15/850-v5.17-0010-PCI-aardvark-Disable-link-training-when-unbinding-dr.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <[email protected]>
2020

2121
--- a/drivers/pci/controller/pci-aardvark.c
2222
+++ b/drivers/pci/controller/pci-aardvark.c
23-
@@ -1919,6 +1919,11 @@ static int advk_pcie_remove(struct platf
23+
@@ -1934,6 +1934,11 @@ static int advk_pcie_remove(struct platf
2424
if (pcie->reset_gpio)
2525
gpiod_set_value_cansleep(pcie->reset_gpio, 1);
2626

target/linux/generic/backport-5.15/850-v5.17-0011-PCI-aardvark-Disable-common-PHY-when-unbinding-drive.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <[email protected]>
1818

1919
--- a/drivers/pci/controller/pci-aardvark.c
2020
+++ b/drivers/pci/controller/pci-aardvark.c
21-
@@ -1634,6 +1634,9 @@ static int advk_pcie_enable_phy(struct a
21+
@@ -1649,6 +1649,9 @@ static int advk_pcie_enable_phy(struct a
2222
return ret;
2323
}
2424

target/linux/generic/hack-5.15/710-net-dsa-mv88e6xxx-default-VID-1.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
--- a/drivers/net/dsa/mv88e6xxx/chip.c
22
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
3-
@@ -2321,6 +2321,7 @@ static int mv88e6xxx_port_fdb_add(struct
3+
@@ -2320,6 +2320,7 @@ static int mv88e6xxx_port_fdb_add(struct
44
struct mv88e6xxx_chip *chip = ds->priv;
55
int err;
66

77
+ vid = vid ? : 1;
88
mv88e6xxx_reg_lock(chip);
99
err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid,
1010
MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC);
11-
@@ -2335,6 +2336,7 @@ static int mv88e6xxx_port_fdb_del(struct
11+
@@ -2334,6 +2335,7 @@ static int mv88e6xxx_port_fdb_del(struct
1212
struct mv88e6xxx_chip *chip = ds->priv;
1313
int err;
1414

target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/net/dsa/mv88e6xxx/chip.c
22
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
3-
@@ -2980,6 +2980,9 @@ static int mv88e6xxx_setup_port(struct m
3+
@@ -2982,6 +2982,9 @@ static int mv88e6xxx_setup_port(struct m
44
else
55
reg = 1 << port;
66

target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
+ int (*fast_recv)(struct sk_buff *skb);
132132
+#endif
133133
+
134-
net_timestamp_check(!netdev_tstamp_prequeue, skb);
134+
net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
135135

136136
trace_netif_receive_skb(skb);
137137
@@ -5299,6 +5316,15 @@ another_round:

0 commit comments

Comments
 (0)