Skip to content

Commit 28bb6f7

Browse files
GoetzGoerischhauke
GoetzGoerisch
authored and
hauke
committed
kernel: bump 6.6 to 6.6.109
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.109 Removed upstreamed patch: lantiq/patches-6.6/0736-v6.11-net-dsa-lantiq_gswip-do-also-enable-or-disable-cpu-p.patch [1] All other patches autorefreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.109&id=a7a2b29c1ee44b8d379ab> Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com> Link: openwrt/openwrt#20277 (cherry picked from commit bb1779c) Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com> Link: openwrt/openwrt#20299 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
1 parent 10363b5 commit 28bb6f7

15 files changed

+34
-107
lines changed

‎include/kernel-6.6‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.6 = .108
2-
LINUX_KERNEL_HASH-6.6.108 = 601cd332aa695d16607b353feff369b4a0b36d111be077e8af54bdd41e1968a6
1+
LINUX_VERSION-6.6 = .109
2+
LINUX_KERNEL_HASH-6.6.109 = 7731cd99778cfdeedd63aa1b5aa8379511b97ec7df8c9eca44baed4e401730f4

‎target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17583,7 +17583,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
1758317583
* For devices with more than one control interface, we assume the
1758417584
--- a/sound/usb/quirks.c
1758517585
+++ b/sound/usb/quirks.c
17586-
@@ -2260,6 +2260,8 @@ static const struct usb_audio_quirk_flag
17586+
@@ -2278,6 +2278,8 @@ static const struct usb_audio_quirk_flag
1758717587
QUIRK_FLAG_ALIGN_TRANSFER),
1758817588
DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */
1758917589
QUIRK_FLAG_ALIGN_TRANSFER),

‎target/linux/bcm27xx/patches-6.6/950-0441-Bluetooth-hci_sync-Add-fallback-bd-address-prop.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
2020

2121
--- a/net/bluetooth/hci_sync.c
2222
+++ b/net/bluetooth/hci_sync.c
23-
@@ -4927,6 +4927,7 @@ static const struct {
23+
@@ -4934,6 +4934,7 @@ static const struct {
2424
*/
2525
static int hci_dev_setup_sync(struct hci_dev *hdev)
2626
{
2727
+ struct fwnode_handle *fwnode = dev_fwnode(hdev->dev.parent);
2828
int ret = 0;
2929
bool invalid_bdaddr;
3030
size_t i;
31-
@@ -4955,7 +4956,8 @@ static int hci_dev_setup_sync(struct hci
31+
@@ -4962,7 +4963,8 @@ static int hci_dev_setup_sync(struct hci
3232
test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
3333
if (!ret) {
3434
if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&

‎target/linux/bcm27xx/patches-6.6/950-1218-Bluetooth-hci_sync-Fix-crash-on-NULL-parent.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
1515

1616
--- a/net/bluetooth/hci_sync.c
1717
+++ b/net/bluetooth/hci_sync.c
18-
@@ -4927,7 +4927,8 @@ static const struct {
18+
@@ -4934,7 +4934,8 @@ static const struct {
1919
*/
2020
static int hci_dev_setup_sync(struct hci_dev *hdev)
2121
{

‎target/linux/generic/pending-6.6/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
2020
#endif /* __KERNEL__ */
2121

2222
/**
23-
@@ -250,6 +252,4 @@ static inline void *offset_to_ptr(const
23+
@@ -259,6 +261,4 @@ static inline void *offset_to_ptr(const
2424
*/
2525
#define prevent_tail_call_optimization() mb()
2626

‎target/linux/lantiq/patches-6.6/0732-v6.11-net-dsa-lantiq_gswip-Only-allow-phy-mode-internal-on-the-CPU-port.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2020

2121
--- a/drivers/net/dsa/lantiq_gswip.c
2222
+++ b/drivers/net/dsa/lantiq_gswip.c
23-
@@ -1509,6 +1509,7 @@ static void gswip_xrx200_phylink_get_cap
23+
@@ -1511,6 +1511,7 @@ static void gswip_xrx200_phylink_get_cap
2424
case 2:
2525
case 3:
2626
case 4:
2727
+ case 6:
2828
__set_bit(PHY_INTERFACE_MODE_INTERNAL,
2929
config->supported_interfaces);
3030
break;
31-
@@ -1540,6 +1541,7 @@ static void gswip_xrx300_phylink_get_cap
31+
@@ -1542,6 +1543,7 @@ static void gswip_xrx300_phylink_get_cap
3232
case 2:
3333
case 3:
3434
case 4:

‎target/linux/lantiq/patches-6.6/0733-v6.11-net-dsa-lantiq_gswip-add-terminating-n-where-missing.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1717

1818
--- a/drivers/net/dsa/lantiq_gswip.c
1919
+++ b/drivers/net/dsa/lantiq_gswip.c
20-
@@ -829,7 +829,7 @@ static int gswip_setup(struct dsa_switch
20+
@@ -830,7 +830,7 @@ static int gswip_setup(struct dsa_switch
2121

2222
err = gswip_pce_load_microcode(priv);
2323
if (err) {
@@ -26,7 +26,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2626
return err;
2727
}
2828

29-
@@ -1780,7 +1780,7 @@ static u32 gswip_bcm_ram_entry_read(stru
29+
@@ -1782,7 +1782,7 @@ static u32 gswip_bcm_ram_entry_read(stru
3030
err = gswip_switch_r_timeout(priv, GSWIP_BM_RAM_CTRL,
3131
GSWIP_BM_RAM_CTRL_BAS);
3232
if (err) {
@@ -35,7 +35,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
3535
table, index);
3636
return 0;
3737
}
38-
@@ -2009,7 +2009,7 @@ static void gswip_gphy_fw_remove(struct
38+
@@ -2012,7 +2012,7 @@ static void gswip_gphy_fw_remove(struct
3939

4040
ret = regmap_write(priv->rcu_regmap, gphy_fw->fw_addr_offset, 0);
4141
if (ret)
@@ -44,7 +44,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
4444

4545
clk_disable_unprepare(gphy_fw->clk_gate);
4646

47-
@@ -2038,7 +2038,7 @@ static int gswip_gphy_fw_list(struct gsw
47+
@@ -2041,7 +2041,7 @@ static int gswip_gphy_fw_list(struct gsw
4848
priv->gphy_fw_name_cfg = &xrx200a2x_gphy_data;
4949
break;
5050
default:
@@ -53,7 +53,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
5353
return -ENOENT;
5454
}
5555
}
56-
@@ -2048,7 +2048,7 @@ static int gswip_gphy_fw_list(struct gsw
56+
@@ -2051,7 +2051,7 @@ static int gswip_gphy_fw_list(struct gsw
5757
priv->gphy_fw_name_cfg = match->data;
5858

5959
if (!priv->gphy_fw_name_cfg) {
@@ -62,7 +62,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
6262
return -ENOENT;
6363
}
6464

65-
@@ -2150,7 +2150,7 @@ static int gswip_probe(struct platform_d
65+
@@ -2153,7 +2153,7 @@ static int gswip_probe(struct platform_d
6666
return -EINVAL;
6767
break;
6868
default:
@@ -71,7 +71,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
7171
return -ENOENT;
7272
}
7373

74-
@@ -2181,7 +2181,7 @@ static int gswip_probe(struct platform_d
74+
@@ -2184,7 +2184,7 @@ static int gswip_probe(struct platform_d
7575
goto mdio_bus;
7676
}
7777
if (!dsa_is_cpu_port(priv->ds, priv->hw_info->cpu_port)) {

‎target/linux/lantiq/patches-6.6/0734-v6.11-net-dsa-lantiq_gswip-Use-dev_err_probe-where-appropr.patch‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2121

2222
--- a/drivers/net/dsa/lantiq_gswip.c
2323
+++ b/drivers/net/dsa/lantiq_gswip.c
24-
@@ -1919,11 +1919,9 @@ static int gswip_gphy_fw_load(struct gsw
24+
@@ -1922,11 +1922,9 @@ static int gswip_gphy_fw_load(struct gsw
2525
msleep(200);
2626

2727
ret = request_firmware(&fw, gphy_fw->fw_name, dev);
@@ -36,7 +36,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
3636

3737
/* GPHY cores need the firmware code in a persistent and contiguous
3838
* memory area with a 16 kB boundary aligned start address.
39-
@@ -1936,9 +1934,9 @@ static int gswip_gphy_fw_load(struct gsw
39+
@@ -1939,9 +1937,9 @@ static int gswip_gphy_fw_load(struct gsw
4040
dev_addr = ALIGN(dma_addr, XRX200_GPHY_FW_ALIGN);
4141
memcpy(fw_addr, fw->data, fw->size);
4242
} else {
@@ -48,7 +48,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
4848
}
4949

5050
release_firmware(fw);
51-
@@ -1965,8 +1963,8 @@ static int gswip_gphy_fw_probe(struct gs
51+
@@ -1968,8 +1966,8 @@ static int gswip_gphy_fw_probe(struct gs
5252

5353
gphy_fw->clk_gate = devm_clk_get(dev, gphyname);
5454
if (IS_ERR(gphy_fw->clk_gate)) {
@@ -59,7 +59,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
5959
}
6060

6161
ret = of_property_read_u32(gphy_fw_np, "reg", &gphy_fw->fw_addr_offset);
62-
@@ -1986,8 +1984,8 @@ static int gswip_gphy_fw_probe(struct gs
62+
@@ -1989,8 +1987,8 @@ static int gswip_gphy_fw_probe(struct gs
6363
gphy_fw->fw_name = priv->gphy_fw_name_cfg->ge_firmware_name;
6464
break;
6565
default:
@@ -70,7 +70,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
7070
}
7171

7272
gphy_fw->reset = of_reset_control_array_get_exclusive(gphy_fw_np);
73-
@@ -2038,8 +2036,9 @@ static int gswip_gphy_fw_list(struct gsw
73+
@@ -2041,8 +2039,9 @@ static int gswip_gphy_fw_list(struct gsw
7474
priv->gphy_fw_name_cfg = &xrx200a2x_gphy_data;
7575
break;
7676
default:
@@ -82,7 +82,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
8282
}
8383
}
8484

85-
@@ -2047,10 +2046,9 @@ static int gswip_gphy_fw_list(struct gsw
85+
@@ -2050,10 +2049,9 @@ static int gswip_gphy_fw_list(struct gsw
8686
if (match && match->data)
8787
priv->gphy_fw_name_cfg = match->data;
8888

@@ -96,7 +96,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
9696

9797
priv->num_gphy_fw = of_get_available_child_count(gphy_fw_list_np);
9898
if (!priv->num_gphy_fw)
99-
@@ -2150,8 +2148,8 @@ static int gswip_probe(struct platform_d
99+
@@ -2153,8 +2151,8 @@ static int gswip_probe(struct platform_d
100100
return -EINVAL;
101101
break;
102102
default:
@@ -107,7 +107,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
107107
}
108108

109109
/* bring up the mdio bus */
110-
@@ -2159,10 +2157,9 @@ static int gswip_probe(struct platform_d
110+
@@ -2162,10 +2160,9 @@ static int gswip_probe(struct platform_d
111111
if (gphy_fw_np) {
112112
err = gswip_gphy_fw_list(priv, gphy_fw_np, version);
113113
of_node_put(gphy_fw_np);
@@ -121,7 +121,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
121121
}
122122

123123
/* bring up the mdio bus */
124-
@@ -2170,20 +2167,20 @@ static int gswip_probe(struct platform_d
124+
@@ -2173,20 +2170,20 @@ static int gswip_probe(struct platform_d
125125
if (mdio_np) {
126126
err = gswip_mdio(priv, mdio_np);
127127
if (err) {

‎target/linux/lantiq/patches-6.6/0735-v6.11-net-dsa-lantiq_gswip-Don-t-manually-call-gswip_port_.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1818

1919
--- a/drivers/net/dsa/lantiq_gswip.c
2020
+++ b/drivers/net/dsa/lantiq_gswip.c
21-
@@ -891,8 +891,6 @@ static int gswip_setup(struct dsa_switch
21+
@@ -892,8 +892,6 @@ static int gswip_setup(struct dsa_switch
2222

2323
ds->mtu_enforcement_ingress = true;
2424

‎target/linux/lantiq/patches-6.6/0736-v6.11-net-dsa-lantiq_gswip-do-also-enable-or-disable-cpu-p.patch‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)