Skip to content

Commit db9616b

Browse files
graysky2hauke
authored andcommitted
kernel: bump 6.18 to 6.18.55
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.18.55 Removed upstreamed: linux/generic/backport-6.18/707-v7.3-net-phylink-record-the-PHY-only-once-bringup-cannot-.patch[1] All other patches automatically rebased via update_kernel.sh 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.18.55&id=4e7a4af364c2048bafb213bf0ef4a89dcbe1bfd4 Build system: x86/64 Build-tested: x86/64-glibc Run-tested: x86/64-glibc Signed-off-by: John Audia <therealgraysky@proton.me> Link: openwrt/openwrt#25551 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
1 parent fc4c9e6 commit db9616b

51 files changed

Lines changed: 139 additions & 222 deletions

File tree

Some content is hidden

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

‎target/linux/airoha/patches-6.18/102-02-v6.19-net-airoha-npu-Add-airoha_npu_soc_data-struct.patch‎

Lines changed: 3 additions & 3 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/ethernet/airoha/airoha_npu.c
1919
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
20-
@@ -103,6 +103,16 @@ enum {
20+
@@ -104,6 +104,16 @@ enum {
2121
QDMA_WAN_PON_XDSL,
2222
};
2323

@@ -34,7 +34,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
3434
#define MBOX_MSG_FUNC_ID GENMASK(14, 11)
3535
#define MBOX_MSG_STATIC_BUF BIT(5)
3636
#define MBOX_MSG_STATUS GENMASK(4, 2)
37-
@@ -182,49 +192,53 @@ static int airoha_npu_send_msg(struct ai
37+
@@ -183,49 +193,53 @@ static int airoha_npu_send_msg(struct ai
3838
return ret;
3939
}
4040

@@ -113,7 +113,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
113113
}
114114

115115
static irqreturn_t airoha_npu_mbox_handler(int irq, void *npu_instance)
116-
@@ -597,8 +611,19 @@ void airoha_npu_put(struct airoha_npu *n
116+
@@ -598,8 +612,19 @@ void airoha_npu_put(struct airoha_npu *n
117117
}
118118
EXPORT_SYMBOL_GPL(airoha_npu_put);
119119

‎target/linux/airoha/patches-6.18/102-03-v6.19-net-airoha-npu-Add-7583-SoC-support.patch‎

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

1616
--- a/drivers/net/ethernet/airoha/airoha_npu.c
1717
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
18-
@@ -16,6 +16,8 @@
18+
@@ -17,6 +17,8 @@
1919

2020
#define NPU_EN7581_FIRMWARE_DATA "airoha/en7581_npu_data.bin"
2121
#define NPU_EN7581_FIRMWARE_RV32 "airoha/en7581_npu_rv32.bin"
@@ -24,7 +24,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2424
#define NPU_EN7581_FIRMWARE_RV32_MAX_SIZE 0x200000
2525
#define NPU_EN7581_FIRMWARE_DATA_MAX_SIZE 0x10000
2626
#define NPU_DUMP_SIZE 512
27-
@@ -622,8 +624,20 @@ static const struct airoha_npu_soc_data
27+
@@ -623,8 +625,20 @@ static const struct airoha_npu_soc_data
2828
},
2929
};
3030

@@ -45,7 +45,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
4545
{ /* sentinel */ }
4646
};
4747
MODULE_DEVICE_TABLE(of, of_airoha_npu_match);
48-
@@ -762,6 +776,8 @@ module_platform_driver(airoha_npu_driver
48+
@@ -756,6 +770,8 @@ module_platform_driver(airoha_npu_driver
4949

5050
MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_DATA);
5151
MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_RV32);

‎target/linux/airoha/patches-6.18/118-v7.0-net-airoha-npu-Dump-fw-version-during-probe.patch‎

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

1515
--- a/drivers/net/ethernet/airoha/airoha_npu.c
1616
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
17-
@@ -657,6 +657,7 @@ static int airoha_npu_probe(struct platf
17+
@@ -658,6 +658,7 @@ static int airoha_npu_probe(struct platf
1818
struct resource res;
1919
void __iomem *base;
2020
int i, irq, err;
2121
+ u32 val;
2222

2323
base = devm_platform_ioremap_resource(pdev, 0);
2424
if (IS_ERR(base))
25-
@@ -750,6 +751,11 @@ static int airoha_npu_probe(struct platf
25+
@@ -754,6 +755,11 @@ static int airoha_npu_probe(struct platf
2626
regmap_write(npu->regmap, REG_CR_BOOT_TRIGGER, 0x1);
2727
msleep(100);
2828

‎target/linux/airoha/patches-6.18/121-v7.0-net-airoha-npu-Init-BA-memory-region-if-provided-via.patch‎

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

1616
--- a/drivers/net/ethernet/airoha/airoha_npu.c
1717
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
18-
@@ -519,6 +519,14 @@ static int airoha_npu_wlan_init_memory(s
18+
@@ -520,6 +520,14 @@ static int airoha_npu_wlan_init_memory(s
1919
if (err)
2020
return err;
2121

‎target/linux/airoha/patches-6.18/123-v7.0-net-airoha-npu-Add-the-capability-to-read-firmware-n.patch‎

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

2323
--- a/drivers/net/ethernet/airoha/airoha_npu.c
2424
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
25-
@@ -16,6 +16,8 @@
25+
@@ -17,6 +17,8 @@
2626

2727
#define NPU_EN7581_FIRMWARE_DATA "airoha/en7581_npu_data.bin"
2828
#define NPU_EN7581_FIRMWARE_RV32 "airoha/en7581_npu_rv32.bin"
@@ -31,7 +31,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
3131
#define NPU_AN7583_FIRMWARE_DATA "airoha/an7583_npu_data.bin"
3232
#define NPU_AN7583_FIRMWARE_RV32 "airoha/an7583_npu_rv32.bin"
3333
#define NPU_EN7581_FIRMWARE_RV32_MAX_SIZE 0x200000
34-
@@ -195,18 +197,18 @@ static int airoha_npu_send_msg(struct ai
34+
@@ -196,18 +198,18 @@ static int airoha_npu_send_msg(struct ai
3535
}
3636

3737
static int airoha_npu_load_firmware(struct device *dev, void __iomem *addr,
@@ -54,7 +54,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
5454
ret = -E2BIG;
5555
goto out;
5656
}
57-
@@ -218,6 +220,28 @@ out:
57+
@@ -219,6 +221,28 @@ out:
5858
return ret;
5959
}
6060

@@ -83,7 +83,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
8383
static int airoha_npu_run_firmware(struct device *dev, void __iomem *base,
8484
struct resource *res)
8585
{
86-
@@ -233,14 +257,22 @@ static int airoha_npu_run_firmware(struc
86+
@@ -234,14 +258,22 @@ static int airoha_npu_run_firmware(struc
8787
if (IS_ERR(addr))
8888
return PTR_ERR(addr);
8989

@@ -108,7 +108,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
108108
}
109109

110110
static irqreturn_t airoha_npu_mbox_handler(int irq, void *npu_instance)
111-
@@ -790,6 +822,8 @@ module_platform_driver(airoha_npu_driver
111+
@@ -784,6 +816,8 @@ module_platform_driver(airoha_npu_driver
112112

113113
MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_DATA);
114114
MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_RV32);

‎target/linux/airoha/patches-6.18/181-v7.3-net-airoha-npu-load-the-firmware-without-the-sysfs-fall.patch‎

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

7171
--- a/drivers/net/ethernet/airoha/airoha_npu.c
7272
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
73-
@@ -202,9 +202,10 @@ static int airoha_npu_load_firmware(stru
73+
@@ -203,9 +203,10 @@ static int airoha_npu_load_firmware(stru
7474
const struct firmware *fw;
7575
int ret;
7676

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

8484
if (fw->size > fw_max_size) {
8585
dev_err(dev, "%s: fw size too overlimit (%zu)\n",
86-
@@ -230,7 +231,8 @@ airoha_npu_load_firmware_from_dts(struct
86+
@@ -231,7 +232,8 @@ airoha_npu_load_firmware_from_dts(struct
8787
ret = of_property_read_string_array(dev->of_node, "firmware-name",
8888
fw_names, ARRAY_SIZE(fw_names));
8989
if (ret != ARRAY_SIZE(fw_names))
@@ -93,7 +93,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
9393

9494
ret = airoha_npu_load_firmware(dev, addr, fw_names[0],
9595
NPU_EN7581_FIRMWARE_RV32_MAX_SIZE);
96-
@@ -772,7 +774,7 @@ static int airoha_npu_probe(struct platf
96+
@@ -776,7 +778,7 @@ static int airoha_npu_probe(struct platf
9797

9898
err = airoha_npu_run_firmware(dev, base, &res);
9999
if (err)

‎target/linux/airoha/patches-6.18/924-net-airoha-npu-use-coherent-mailbox-dma.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Signed-off-by: Daniel Pawlik <pawlik.dan@gmail.com>
3535
---
3636
--- a/drivers/net/ethernet/airoha/airoha_npu.c
3737
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
38-
@@ -23,6 +23,12 @@
38+
@@ -24,6 +24,12 @@
3939
#define NPU_EN7581_FIRMWARE_RV32_MAX_SIZE 0x200000
4040
#define NPU_EN7581_FIRMWARE_DATA_MAX_SIZE 0x10000
4141
#define NPU_DUMP_SIZE 512
@@ -48,7 +48,7 @@ Signed-off-by: Daniel Pawlik <pawlik.dan@gmail.com>
4848

4949
#define REG_NPU_LOCAL_SRAM 0x0
5050

51-
@@ -160,23 +166,34 @@ struct wlan_mbox_data {
51+
@@ -161,23 +167,34 @@ struct wlan_mbox_data {
5252
DECLARE_FLEX_ARRAY(u8, d);
5353
};
5454

@@ -95,7 +95,7 @@ Signed-off-by: Daniel Pawlik <pawlik.dan@gmail.com>
9595
regmap_read(npu->regmap, REG_CR_MBQ0_CTRL(2) + offset, &val);
9696
regmap_write(npu->regmap, REG_CR_MBQ0_CTRL(2) + offset, val + 1);
9797
val = FIELD_PREP(MBOX_MSG_FUNC_ID, func_id) | MBOX_MSG_WAIT_RSP;
98-
@@ -189,13 +206,21 @@ static int airoha_npu_send_msg(struct ai
98+
@@ -190,13 +207,21 @@ static int airoha_npu_send_msg(struct ai
9999
if (!ret && FIELD_GET(MBOX_MSG_STATUS, val) != NPU_MBOX_SUCCESS)
100100
ret = -EINVAL;
101101

@@ -119,7 +119,7 @@ Signed-off-by: Daniel Pawlik <pawlik.dan@gmail.com>
119119
static int airoha_npu_load_firmware(struct device *dev, void __iomem *addr,
120120
const char *fw_name, int fw_max_size)
121121
{
122-
@@ -499,9 +524,8 @@ static int airoha_npu_wlan_msg_get(struc
122+
@@ -500,9 +525,8 @@ static int airoha_npu_wlan_msg_get(struc
123123
wlan_data->func_type = NPU_OP_GET;
124124
wlan_data->func_id = func_id;
125125

@@ -131,7 +131,7 @@ Signed-off-by: Daniel Pawlik <pawlik.dan@gmail.com>
131131
kfree(wlan_data);
132132

133133
return err;
134-
@@ -772,6 +796,15 @@ static int airoha_npu_probe(struct platf
134+
@@ -776,6 +800,15 @@ static int airoha_npu_probe(struct platf
135135
if (err)
136136
return err;
137137

‎target/linux/bcm27xx/patches-6.18/0110-bcmgenet-Better-coalescing-parameter-defaults.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
1818

1919
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
2020
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
21-
@@ -2730,7 +2730,7 @@ static void bcmgenet_init_tx_ring(struct
21+
@@ -2733,7 +2733,7 @@ static void bcmgenet_init_tx_ring(struct
2222

2323
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX);
2424
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX);
@@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
2727
/* Disable rate control for now */
2828
bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
2929
TDMA_FLOW_PERIOD);
30-
@@ -4136,8 +4136,10 @@ static int bcmgenet_probe(struct platfor
30+
@@ -4143,8 +4143,10 @@ static int bcmgenet_probe(struct platfor
3131
netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
3232

3333
/* Set default coalescing parameters */
@@ -38,4 +38,4 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
3838
+ }
3939

4040
/* Initialize u64 stats seq counter for 32bit machines */
41-
for (i = 0; i <= priv->hw_params->rx_queues; i++)
41+
for (i = 0; i <= GENET_MAX_MQ_CNT; i++) {

‎target/linux/bcm27xx/patches-6.18/0120-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
3232
#define USB_VENDOR_ID_BELKIN 0x050d
3333
#define USB_DEVICE_ID_FLIP_KVM 0x3201
3434

35-
@@ -1502,6 +1505,9 @@
35+
@@ -1505,6 +1508,9 @@
3636
#define USB_VENDOR_ID_XIAOMI 0x2717
3737
#define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014
3838

@@ -52,7 +52,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
5252
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },
5353
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
5454
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },
55-
@@ -218,6 +219,7 @@ static const struct hid_device_id hid_qu
55+
@@ -219,6 +220,7 @@ static const struct hid_device_id hid_qu
5656
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
5757
{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
5858
{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET },

‎target/linux/bcm27xx/patches-6.18/0121-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch‎

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

3838
static inline void bcmgenet_writel(u32 value, void __iomem *offset)
3939
{
40-
@@ -2568,6 +2571,11 @@ static void reset_umac(struct bcmgenet_p
40+
@@ -2571,6 +2574,11 @@ static void reset_umac(struct bcmgenet_p
4141
bcmgenet_rbuf_ctrl_set(priv, 0);
4242
udelay(10);
4343

0 commit comments

Comments
 (0)