diff options
| author | Tomáš Macholda | 2026-05-01 00:22:07 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2026-05-02 23:38:48 +0000 |
| commit | 2e9a1637ddf9347b391d56f26f63300fbb839240 (patch) | |
| tree | 1e1cbd4291e9520aabb2dc87cf79d8dec3195fc5 | |
| parent | 00da0d2bcee4c1706c6192e8d5b1e16ff05046ec (diff) | |
| download | openwrt-2e9a1637ddf9347b391d56f26f63300fbb839240.tar.gz | |
kernel: bump 6.6 to 6.6.136
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.136
Manually refreshed patches:
generic/backport-6.6/752-26-v6.10-net-ethernet-mtk_eth_soc-ppe-add-support-for-multipl.patch [1]
generic/hack-6.6/902-debloat_proc.patch [2]
All other patches autorefreshed.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.136&id=71ca90c26eef6fe84c5b08824f8aeb65bb9e3a04
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.136&id=002a73470b56848e4c81efeaaedd471e92d66d8d
Signed-off-by: Tomáš Macholda <tomas.macholda@nic.cz>
Link: https://github.com/openwrt/openwrt/pull/23170
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
29 files changed, 140 insertions, 141 deletions
diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 711b5fb571..45907cddfe 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .135 -LINUX_KERNEL_HASH-6.6.135 = d3d238ede7169dedb642898af0cb1777e9913171eb1c750eb4d9f82350a7132a +LINUX_VERSION-6.6 = .136 +LINUX_KERNEL_HASH-6.6.136 = 6fb2d21a98281d786ee5fc63760e6f2c33e567e178e83c605bf0359eabbcf471 diff --git a/target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch b/target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch index a2e5c599f7..775312c67d 100644 --- a/target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch @@ -312,7 +312,7 @@ SVN-Revision: 35130 case IPV6_2292HOPOPTS: --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c -@@ -988,7 +988,7 @@ static bool ipv6_hop_jumbo(struct sk_buf +@@ -992,7 +992,7 @@ static bool ipv6_hop_jumbo(struct sk_buf goto drop; } diff --git a/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch b/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch index d94dba6d12..a4d139130a 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch @@ -17583,7 +17583,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> * For devices with more than one control interface, we assume the --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -2297,6 +2297,8 @@ static const struct usb_audio_quirk_flag +@@ -2299,6 +2299,8 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_ALIGN_TRANSFER), DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */ QUIRK_FLAG_ALIGN_TRANSFER), diff --git a/target/linux/bcm27xx/patches-6.6/950-0169-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-6.6/950-0169-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch index 32958f6f51..da27b973e0 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0169-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0169-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch @@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -249,6 +249,9 @@ +@@ -252,6 +252,9 @@ #define USB_VENDOR_ID_BAANTO 0x2453 #define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100 @@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> #define USB_VENDOR_ID_BELKIN 0x050d #define USB_DEVICE_ID_FLIP_KVM 0x3201 -@@ -1463,6 +1466,9 @@ +@@ -1466,6 +1469,9 @@ #define USB_VENDOR_ID_XIAOMI 0x2717 #define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014 @@ -45,7 +45,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> #define USB_DEVICE_ID_THT_2P_ARCADE 0x75e1 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c -@@ -44,6 +44,7 @@ static const struct hid_device_id hid_qu +@@ -45,6 +45,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS682), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS692), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM), HID_QUIRK_NOGET }, @@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL }, -@@ -216,6 +217,7 @@ static const struct hid_device_id hid_qu +@@ -217,6 +218,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET }, diff --git a/target/linux/bcm27xx/patches-6.6/950-0578-drm-vc4-hdmi-Enable-the-audio-clock.patch b/target/linux/bcm27xx/patches-6.6/950-0578-drm-vc4-hdmi-Enable-the-audio-clock.patch index ab082c6a19..adf78de184 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0578-drm-vc4-hdmi-Enable-the-audio-clock.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0578-drm-vc4-hdmi-Enable-the-audio-clock.patch @@ -18,7 +18,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -3599,6 +3599,7 @@ static int vc4_hdmi_runtime_suspend(stru +@@ -3605,6 +3605,7 @@ static int vc4_hdmi_runtime_suspend(stru { struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev); @@ -26,7 +26,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> clk_disable_unprepare(vc4_hdmi->hsm_clock); return 0; -@@ -3631,6 +3632,10 @@ static int vc4_hdmi_runtime_resume(struc +@@ -3637,6 +3638,10 @@ static int vc4_hdmi_runtime_resume(struc goto err_disable_clk; } diff --git a/target/linux/bcm27xx/patches-6.6/950-0585-drm-vc4-Introduce-generation-number-enum.patch b/target/linux/bcm27xx/patches-6.6/950-0585-drm-vc4-Introduce-generation-number-enum.patch index f57aa6d1b7..7e30e970a3 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0585-drm-vc4-Introduce-generation-number-enum.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0585-drm-vc4-Introduce-generation-number-enum.patch @@ -137,7 +137,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return; /* Fast path: if the BO is still retained by someone, no need to test -@@ -783,7 +783,7 @@ int vc4_create_bo_ioctl(struct drm_devic +@@ -786,7 +786,7 @@ int vc4_create_bo_ioctl(struct drm_devic struct vc4_bo *bo = NULL; int ret; @@ -146,7 +146,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; ret = vc4_grab_bin_bo(vc4, vc4file); -@@ -813,7 +813,7 @@ int vc4_mmap_bo_ioctl(struct drm_device +@@ -816,7 +816,7 @@ int vc4_mmap_bo_ioctl(struct drm_device struct drm_vc4_mmap_bo *args = data; struct drm_gem_object *gem_obj; @@ -155,7 +155,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; gem_obj = drm_gem_object_lookup(file_priv, args->handle); -@@ -839,7 +839,7 @@ vc4_create_shader_bo_ioctl(struct drm_de +@@ -842,7 +842,7 @@ vc4_create_shader_bo_ioctl(struct drm_de struct vc4_bo *bo = NULL; int ret; @@ -164,7 +164,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (args->size == 0) -@@ -918,7 +918,7 @@ int vc4_set_tiling_ioctl(struct drm_devi +@@ -921,7 +921,7 @@ int vc4_set_tiling_ioctl(struct drm_devi struct vc4_bo *bo; bool t_format; @@ -173,7 +173,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (args->flags != 0) -@@ -964,7 +964,7 @@ int vc4_get_tiling_ioctl(struct drm_devi +@@ -967,7 +967,7 @@ int vc4_get_tiling_ioctl(struct drm_devi struct drm_gem_object *gem_obj; struct vc4_bo *bo; @@ -182,7 +182,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (args->flags != 0 || args->modifier != 0) -@@ -1007,7 +1007,7 @@ int vc4_bo_cache_init(struct drm_device +@@ -1010,7 +1010,7 @@ int vc4_bo_cache_init(struct drm_device int ret; int i; @@ -191,7 +191,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; /* Create the initial set of BO labels that the kernel will -@@ -1071,7 +1071,7 @@ int vc4_label_bo_ioctl(struct drm_device +@@ -1074,7 +1074,7 @@ int vc4_label_bo_ioctl(struct drm_device struct drm_gem_object *gem_obj; int ret = 0, label; @@ -360,7 +360,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c -@@ -76,7 +76,7 @@ vc4_get_hang_state_ioctl(struct drm_devi +@@ -77,7 +77,7 @@ vc4_get_hang_state_ioctl(struct drm_devi u32 i; int ret = 0; @@ -369,7 +369,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (!vc4->v3d) { -@@ -389,7 +389,7 @@ vc4_wait_for_seqno(struct drm_device *de +@@ -392,7 +392,7 @@ vc4_wait_for_seqno(struct drm_device *de unsigned long timeout_expire; DEFINE_WAIT(wait); @@ -378,7 +378,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (vc4->finished_seqno >= seqno) -@@ -474,7 +474,7 @@ vc4_submit_next_bin_job(struct drm_devic +@@ -477,7 +477,7 @@ vc4_submit_next_bin_job(struct drm_devic struct vc4_dev *vc4 = to_vc4_dev(dev); struct vc4_exec_info *exec; @@ -387,7 +387,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return; again: -@@ -522,7 +522,7 @@ vc4_submit_next_render_job(struct drm_de +@@ -525,7 +525,7 @@ vc4_submit_next_render_job(struct drm_de if (!exec) return; @@ -396,7 +396,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return; /* A previous RCL may have written to one of our textures, and -@@ -543,7 +543,7 @@ vc4_move_job_to_render(struct drm_device +@@ -546,7 +546,7 @@ vc4_move_job_to_render(struct drm_device struct vc4_dev *vc4 = to_vc4_dev(dev); bool was_empty = list_empty(&vc4->render_job_list); @@ -405,7 +405,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return; list_move_tail(&exec->head, &vc4->render_job_list); -@@ -970,7 +970,7 @@ vc4_job_handle_completed(struct vc4_dev +@@ -973,7 +973,7 @@ vc4_job_handle_completed(struct vc4_dev unsigned long irqflags; struct vc4_seqno_cb *cb, *cb_temp; @@ -414,7 +414,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return; spin_lock_irqsave(&vc4->job_lock, irqflags); -@@ -1009,7 +1009,7 @@ int vc4_queue_seqno_cb(struct drm_device +@@ -1012,7 +1012,7 @@ int vc4_queue_seqno_cb(struct drm_device struct vc4_dev *vc4 = to_vc4_dev(dev); unsigned long irqflags; @@ -423,7 +423,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; cb->func = func; -@@ -1065,7 +1065,7 @@ vc4_wait_seqno_ioctl(struct drm_device * +@@ -1068,7 +1068,7 @@ vc4_wait_seqno_ioctl(struct drm_device * struct vc4_dev *vc4 = to_vc4_dev(dev); struct drm_vc4_wait_seqno *args = data; @@ -432,7 +432,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; return vc4_wait_for_seqno_ioctl_helper(dev, args->seqno, -@@ -1082,7 +1082,7 @@ vc4_wait_bo_ioctl(struct drm_device *dev +@@ -1085,7 +1085,7 @@ vc4_wait_bo_ioctl(struct drm_device *dev struct drm_gem_object *gem_obj; struct vc4_bo *bo; @@ -441,7 +441,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (args->pad != 0) -@@ -1131,7 +1131,7 @@ vc4_submit_cl_ioctl(struct drm_device *d +@@ -1134,7 +1134,7 @@ vc4_submit_cl_ioctl(struct drm_device *d args->shader_rec_size, args->bo_handle_count); @@ -450,7 +450,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (!vc4->v3d) { -@@ -1268,7 +1268,7 @@ int vc4_gem_init(struct drm_device *dev) +@@ -1271,7 +1271,7 @@ int vc4_gem_init(struct drm_device *dev) struct vc4_dev *vc4 = to_vc4_dev(dev); int ret; @@ -459,7 +459,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; vc4->dma_fence_context = dma_fence_context_alloc(1); -@@ -1327,7 +1327,7 @@ int vc4_gem_madvise_ioctl(struct drm_dev +@@ -1330,7 +1330,7 @@ int vc4_gem_madvise_ioctl(struct drm_dev struct vc4_bo *bo; int ret; diff --git a/target/linux/bcm27xx/patches-6.6/950-0586-drm-vc4-Make-v3d-paths-unavailable-on-any-generation.patch b/target/linux/bcm27xx/patches-6.6/950-0586-drm-vc4-Make-v3d-paths-unavailable-on-any-generation.patch index 9ab0a6d152..26d8c859b2 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0586-drm-vc4-Make-v3d-paths-unavailable-on-any-generation.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0586-drm-vc4-Make-v3d-paths-unavailable-on-any-generation.patch @@ -87,7 +87,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return; /* Fast path: if the BO is still retained by someone, no need to test -@@ -783,7 +783,7 @@ int vc4_create_bo_ioctl(struct drm_devic +@@ -786,7 +786,7 @@ int vc4_create_bo_ioctl(struct drm_devic struct vc4_bo *bo = NULL; int ret; @@ -96,7 +96,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; ret = vc4_grab_bin_bo(vc4, vc4file); -@@ -813,7 +813,7 @@ int vc4_mmap_bo_ioctl(struct drm_device +@@ -816,7 +816,7 @@ int vc4_mmap_bo_ioctl(struct drm_device struct drm_vc4_mmap_bo *args = data; struct drm_gem_object *gem_obj; @@ -105,7 +105,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; gem_obj = drm_gem_object_lookup(file_priv, args->handle); -@@ -839,7 +839,7 @@ vc4_create_shader_bo_ioctl(struct drm_de +@@ -842,7 +842,7 @@ vc4_create_shader_bo_ioctl(struct drm_de struct vc4_bo *bo = NULL; int ret; @@ -114,7 +114,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (args->size == 0) -@@ -918,7 +918,7 @@ int vc4_set_tiling_ioctl(struct drm_devi +@@ -921,7 +921,7 @@ int vc4_set_tiling_ioctl(struct drm_devi struct vc4_bo *bo; bool t_format; @@ -123,7 +123,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (args->flags != 0) -@@ -964,7 +964,7 @@ int vc4_get_tiling_ioctl(struct drm_devi +@@ -967,7 +967,7 @@ int vc4_get_tiling_ioctl(struct drm_devi struct drm_gem_object *gem_obj; struct vc4_bo *bo; @@ -132,7 +132,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (args->flags != 0 || args->modifier != 0) -@@ -1007,7 +1007,7 @@ int vc4_bo_cache_init(struct drm_device +@@ -1010,7 +1010,7 @@ int vc4_bo_cache_init(struct drm_device int ret; int i; @@ -141,7 +141,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; /* Create the initial set of BO labels that the kernel will -@@ -1071,7 +1071,7 @@ int vc4_label_bo_ioctl(struct drm_device +@@ -1074,7 +1074,7 @@ int vc4_label_bo_ioctl(struct drm_device struct drm_gem_object *gem_obj; int ret = 0, label; @@ -210,7 +210,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> driver = &vc4_drm_driver; --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c -@@ -76,7 +76,7 @@ vc4_get_hang_state_ioctl(struct drm_devi +@@ -77,7 +77,7 @@ vc4_get_hang_state_ioctl(struct drm_devi u32 i; int ret = 0; @@ -219,7 +219,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (!vc4->v3d) { -@@ -389,7 +389,7 @@ vc4_wait_for_seqno(struct drm_device *de +@@ -392,7 +392,7 @@ vc4_wait_for_seqno(struct drm_device *de unsigned long timeout_expire; DEFINE_WAIT(wait); @@ -228,7 +228,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (vc4->finished_seqno >= seqno) -@@ -474,7 +474,7 @@ vc4_submit_next_bin_job(struct drm_devic +@@ -477,7 +477,7 @@ vc4_submit_next_bin_job(struct drm_devic struct vc4_dev *vc4 = to_vc4_dev(dev); struct vc4_exec_info *exec; @@ -237,7 +237,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return; again: -@@ -522,7 +522,7 @@ vc4_submit_next_render_job(struct drm_de +@@ -525,7 +525,7 @@ vc4_submit_next_render_job(struct drm_de if (!exec) return; @@ -246,7 +246,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return; /* A previous RCL may have written to one of our textures, and -@@ -543,7 +543,7 @@ vc4_move_job_to_render(struct drm_device +@@ -546,7 +546,7 @@ vc4_move_job_to_render(struct drm_device struct vc4_dev *vc4 = to_vc4_dev(dev); bool was_empty = list_empty(&vc4->render_job_list); @@ -255,7 +255,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return; list_move_tail(&exec->head, &vc4->render_job_list); -@@ -970,7 +970,7 @@ vc4_job_handle_completed(struct vc4_dev +@@ -973,7 +973,7 @@ vc4_job_handle_completed(struct vc4_dev unsigned long irqflags; struct vc4_seqno_cb *cb, *cb_temp; @@ -264,7 +264,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return; spin_lock_irqsave(&vc4->job_lock, irqflags); -@@ -1009,7 +1009,7 @@ int vc4_queue_seqno_cb(struct drm_device +@@ -1012,7 +1012,7 @@ int vc4_queue_seqno_cb(struct drm_device struct vc4_dev *vc4 = to_vc4_dev(dev); unsigned long irqflags; @@ -273,7 +273,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; cb->func = func; -@@ -1065,7 +1065,7 @@ vc4_wait_seqno_ioctl(struct drm_device * +@@ -1068,7 +1068,7 @@ vc4_wait_seqno_ioctl(struct drm_device * struct vc4_dev *vc4 = to_vc4_dev(dev); struct drm_vc4_wait_seqno *args = data; @@ -282,7 +282,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; return vc4_wait_for_seqno_ioctl_helper(dev, args->seqno, -@@ -1082,7 +1082,7 @@ vc4_wait_bo_ioctl(struct drm_device *dev +@@ -1085,7 +1085,7 @@ vc4_wait_bo_ioctl(struct drm_device *dev struct drm_gem_object *gem_obj; struct vc4_bo *bo; @@ -291,7 +291,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (args->pad != 0) -@@ -1131,7 +1131,7 @@ vc4_submit_cl_ioctl(struct drm_device *d +@@ -1134,7 +1134,7 @@ vc4_submit_cl_ioctl(struct drm_device *d args->shader_rec_size, args->bo_handle_count); @@ -300,7 +300,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; if (!vc4->v3d) { -@@ -1268,7 +1268,7 @@ int vc4_gem_init(struct drm_device *dev) +@@ -1271,7 +1271,7 @@ int vc4_gem_init(struct drm_device *dev) struct vc4_dev *vc4 = to_vc4_dev(dev); int ret; @@ -309,7 +309,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return -ENODEV; vc4->dma_fence_context = dma_fence_context_alloc(1); -@@ -1327,7 +1327,7 @@ int vc4_gem_madvise_ioctl(struct drm_dev +@@ -1330,7 +1330,7 @@ int vc4_gem_madvise_ioctl(struct drm_dev struct vc4_bo *bo; int ret; diff --git a/target/linux/bcm27xx/patches-6.6/950-0612-drm-vc4-hdmi-Add-support-for-BCM2712-HDMI-controller.patch b/target/linux/bcm27xx/patches-6.6/950-0612-drm-vc4-hdmi-Add-support-for-BCM2712-HDMI-controller.patch index 20b24b1c44..8a052299aa 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0612-drm-vc4-hdmi-Add-support-for-BCM2712-HDMI-controller.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0612-drm-vc4-hdmi-Add-support-for-BCM2712-HDMI-controller.patch @@ -74,7 +74,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> VC4_HD_VID_CTL_ENABLE | VC4_HD_VID_CTL_CLRRGB | VC4_HD_VID_CTL_UNDERFLOW_ENABLE | -@@ -3757,7 +3769,9 @@ static int vc4_hdmi_bind(struct device * +@@ -3763,7 +3775,9 @@ static int vc4_hdmi_bind(struct device * return ret; if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") || @@ -85,7 +85,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> HDMI_READ(HDMI_VID_CTL) & VC4_HD_VID_CTL_ENABLE) { clk_prepare_enable(vc4_hdmi->pixel_clock); clk_prepare_enable(vc4_hdmi->hsm_clock); -@@ -3891,10 +3905,66 @@ static const struct vc4_hdmi_variant bcm +@@ -3897,10 +3911,66 @@ static const struct vc4_hdmi_variant bcm .hp_detect = vc5_hdmi_hp_detect, }; diff --git a/target/linux/bcm27xx/patches-6.6/950-0713-drm-vc4-crtc-Support-odd-horizontal-timings-on-BCM27.patch b/target/linux/bcm27xx/patches-6.6/950-0713-drm-vc4-crtc-Support-odd-horizontal-timings-on-BCM27.patch index 26d2e50d03..c9333e0b9d 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0713-drm-vc4-crtc-Support-odd-horizontal-timings-on-BCM27.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0713-drm-vc4-crtc-Support-odd-horizontal-timings-on-BCM27.patch @@ -75,7 +75,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> }, --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -3918,7 +3918,7 @@ static const struct vc4_hdmi_variant bcm +@@ -3924,7 +3924,7 @@ static const struct vc4_hdmi_variant bcm PHY_LANE_2, PHY_LANE_CK, }, @@ -84,7 +84,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> .external_irq_controller = true, .init_resources = vc5_hdmi_init_resources, -@@ -3945,7 +3945,7 @@ static const struct vc4_hdmi_variant bcm +@@ -3951,7 +3951,7 @@ static const struct vc4_hdmi_variant bcm PHY_LANE_2, PHY_LANE_CK, }, diff --git a/target/linux/bcm27xx/patches-6.6/950-0930-vc4-Add-jack-detection-to-HDMI-audio-driver.patch b/target/linux/bcm27xx/patches-6.6/950-0930-vc4-Add-jack-detection-to-HDMI-audio-driver.patch index 325f0d6124..98b7375004 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0930-vc4-Add-jack-detection-to-HDMI-audio-driver.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0930-vc4-Add-jack-detection-to-HDMI-audio-driver.patch @@ -114,7 +114,7 @@ Signed-off-by: David Turner <david.turner@raspberrypi.com> card->dai_link = dai_link; card->num_links = 1; card->name = vc4_hdmi->variant->card_name; -@@ -3707,6 +3754,8 @@ static int vc4_hdmi_bind(struct device * +@@ -3713,6 +3760,8 @@ static int vc4_hdmi_bind(struct device * if (ret) return ret; @@ -123,7 +123,7 @@ Signed-off-by: David Turner <david.turner@raspberrypi.com> spin_lock_init(&vc4_hdmi->hw_lock); INIT_DELAYED_WORK(&vc4_hdmi->scrambling_work, vc4_hdmi_scrambling_wq); -@@ -3819,8 +3868,16 @@ err_put_runtime_pm: +@@ -3825,8 +3874,16 @@ err_put_runtime_pm: return ret; } diff --git a/target/linux/bcm27xx/patches-6.6/950-1141-fs-ntfs3-Fix-memory-corruption-when-page_size-change.patch b/target/linux/bcm27xx/patches-6.6/950-1141-fs-ntfs3-Fix-memory-corruption-when-page_size-change.patch index 4ea40ba421..820b0ea4a6 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1141-fs-ntfs3-Fix-memory-corruption-when-page_size-change.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1141-fs-ntfs3-Fix-memory-corruption-when-page_size-change.patch @@ -25,7 +25,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> --- a/fs/ntfs3/fslog.c +++ b/fs/ntfs3/fslog.c -@@ -3932,6 +3932,8 @@ check_restart_area: +@@ -3942,6 +3942,8 @@ check_restart_area: log->l_size = log->orig_file_size; log->page_size = norm_file_page(t32, &log->l_size, t32 == DefaultLogPageSize); diff --git a/target/linux/bcm27xx/patches-6.6/950-1199-drm-vc4-Disable-the-2pixel-clock-odd-timings-workaro.patch b/target/linux/bcm27xx/patches-6.6/950-1199-drm-vc4-Disable-the-2pixel-clock-odd-timings-workaro.patch index ea64afd5f9..fc8a308e79 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1199-drm-vc4-Disable-the-2pixel-clock-odd-timings-workaro.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1199-drm-vc4-Disable-the-2pixel-clock-odd-timings-workaro.patch @@ -157,7 +157,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> if (mode->flags & DRM_MODE_FLAG_DBLCLK) { /* Only try to fixup DBLCLK modes to get 480i and 576i * working. -@@ -3980,6 +3982,7 @@ static const struct vc4_hdmi_variant bcm +@@ -3986,6 +3988,7 @@ static const struct vc4_hdmi_variant bcm PHY_LANE_CK, }, .unsupported_odd_h_timings = true, @@ -165,7 +165,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> .external_irq_controller = true, .init_resources = vc5_hdmi_init_resources, -@@ -4009,6 +4012,7 @@ static const struct vc4_hdmi_variant bcm +@@ -4015,6 +4018,7 @@ static const struct vc4_hdmi_variant bcm PHY_LANE_2, }, .unsupported_odd_h_timings = true, @@ -173,7 +173,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> .external_irq_controller = true, .init_resources = vc5_hdmi_init_resources, -@@ -4038,6 +4042,7 @@ static const struct vc4_hdmi_variant bcm +@@ -4044,6 +4048,7 @@ static const struct vc4_hdmi_variant bcm PHY_LANE_CK, }, .unsupported_odd_h_timings = false, @@ -181,7 +181,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> .external_irq_controller = true, .init_resources = vc5_hdmi_init_resources, -@@ -4065,6 +4070,7 @@ static const struct vc4_hdmi_variant bcm +@@ -4071,6 +4076,7 @@ static const struct vc4_hdmi_variant bcm PHY_LANE_CK, }, .unsupported_odd_h_timings = false, diff --git a/target/linux/bcm27xx/patches-6.6/950-1323-drm-vc4-Remove-request-for-min-clocks-when-hdmi-outp.patch b/target/linux/bcm27xx/patches-6.6/950-1323-drm-vc4-Remove-request-for-min-clocks-when-hdmi-outp.patch index cde586b126..4af8c2d1a7 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1323-drm-vc4-Remove-request-for-min-clocks-when-hdmi-outp.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1323-drm-vc4-Remove-request-for-min-clocks-when-hdmi-outp.patch @@ -39,7 +39,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> clk_disable_unprepare(vc4_hdmi->pixel_bvb_clock); clk_disable_unprepare(vc4_hdmi->pixel_clock); -@@ -3724,6 +3726,8 @@ static int vc4_hdmi_runtime_suspend(stru +@@ -3730,6 +3732,8 @@ static int vc4_hdmi_runtime_suspend(stru struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev); clk_disable_unprepare(vc4_hdmi->audio_clock); diff --git a/target/linux/generic/backport-6.6/602-v6.10-net-Use-backlog-NAPI-to-clean-up-the-defer_list.patch b/target/linux/generic/backport-6.6/602-v6.10-net-Use-backlog-NAPI-to-clean-up-the-defer_list.patch index 56fbd130b3..0d55be3794 100644 --- a/target/linux/generic/backport-6.6/602-v6.10-net-Use-backlog-NAPI-to-clean-up-the-defer_list.patch +++ b/target/linux/generic/backport-6.6/602-v6.10-net-Use-backlog-NAPI-to-clean-up-the-defer_list.patch @@ -108,7 +108,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> #endif --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -6869,8 +6869,8 @@ nodefer: __kfree_skb(skb); +@@ -6866,8 +6866,8 @@ nodefer: __kfree_skb(skb); /* Make sure to trigger NET_RX_SOFTIRQ on the remote CPU * if we are unlucky enough (this seems very unlikely). */ diff --git a/target/linux/generic/backport-6.6/751-01-v6.8-net-ethernet-mediatek-split-tx-and-rx-fields-in-mtk_.patch b/target/linux/generic/backport-6.6/751-01-v6.8-net-ethernet-mediatek-split-tx-and-rx-fields-in-mtk_.patch index 3a4896a6a1..6f9ac34b02 100644 --- a/target/linux/generic/backport-6.6/751-01-v6.8-net-ethernet-mediatek-split-tx-and-rx-fields-in-mtk_.patch +++ b/target/linux/generic/backport-6.6/751-01-v6.8-net-ethernet-mediatek-split-tx-and-rx-fields-in-mtk_.patch @@ -323,7 +323,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> } #endif -@@ -3403,7 +3403,7 @@ static int mtk_open(struct net_device *d +@@ -3418,7 +3418,7 @@ static int mtk_open(struct net_device *d napi_enable(ð->tx_napi); napi_enable(ð->rx_napi); mtk_tx_irq_enable(eth, MTK_TX_DONE_INT); @@ -332,7 +332,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> refcount_set(ð->dma_refcnt, 1); } else -@@ -3487,7 +3487,7 @@ static int mtk_stop(struct net_device *d +@@ -3502,7 +3502,7 @@ static int mtk_stop(struct net_device *d mtk_gdm_config(eth, MTK_GDMA_DROP_ALL); mtk_tx_irq_disable(eth, MTK_TX_DONE_INT); @@ -341,7 +341,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> napi_disable(ð->tx_napi); napi_disable(ð->rx_napi); -@@ -3972,9 +3972,9 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -3987,9 +3987,9 @@ static int mtk_hw_init(struct mtk_eth *e /* FE int grouping */ mtk_w32(eth, MTK_TX_DONE_INT, reg_map->pdma.int_grp); @@ -353,7 +353,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP); if (mtk_is_netsys_v3_or_greater(eth)) { -@@ -5082,11 +5082,15 @@ static const struct mtk_soc_data mt2701_ +@@ -5102,11 +5102,15 @@ static const struct mtk_soc_data mt2701_ .required_clks = MT7623_CLKS_BITMAP, .required_pctl = true, .version = 1, @@ -374,7 +374,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5102,11 +5106,15 @@ static const struct mtk_soc_data mt7621_ +@@ -5122,11 +5126,15 @@ static const struct mtk_soc_data mt7621_ .offload_version = 1, .hash_offset = 2, .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE, @@ -395,7 +395,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5124,11 +5132,15 @@ static const struct mtk_soc_data mt7622_ +@@ -5144,11 +5152,15 @@ static const struct mtk_soc_data mt7622_ .hash_offset = 2, .has_accounting = true, .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE, @@ -416,7 +416,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5145,11 +5157,15 @@ static const struct mtk_soc_data mt7623_ +@@ -5165,11 +5177,15 @@ static const struct mtk_soc_data mt7623_ .hash_offset = 2, .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE, .disable_pll_modes = true, @@ -437,7 +437,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5164,11 +5180,15 @@ static const struct mtk_soc_data mt7629_ +@@ -5184,11 +5200,15 @@ static const struct mtk_soc_data mt7629_ .required_pctl = false, .has_accounting = true, .version = 1, @@ -458,7 +458,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5186,11 +5206,15 @@ static const struct mtk_soc_data mt7981_ +@@ -5206,11 +5226,15 @@ static const struct mtk_soc_data mt7981_ .hash_offset = 4, .has_accounting = true, .foe_entry_size = MTK_FOE_ENTRY_V2_SIZE, @@ -479,7 +479,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .dma_max_len = MTK_TX_DMA_BUF_LEN_V2, .dma_len_offset = 8, }, -@@ -5208,11 +5232,15 @@ static const struct mtk_soc_data mt7986_ +@@ -5228,11 +5252,15 @@ static const struct mtk_soc_data mt7986_ .hash_offset = 4, .has_accounting = true, .foe_entry_size = MTK_FOE_ENTRY_V2_SIZE, @@ -500,7 +500,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .dma_max_len = MTK_TX_DMA_BUF_LEN_V2, .dma_len_offset = 8, }, -@@ -5230,11 +5258,15 @@ static const struct mtk_soc_data mt7988_ +@@ -5250,11 +5278,15 @@ static const struct mtk_soc_data mt7988_ .hash_offset = 4, .has_accounting = true, .foe_entry_size = MTK_FOE_ENTRY_V3_SIZE, @@ -521,7 +521,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .dma_max_len = MTK_TX_DMA_BUF_LEN_V2, .dma_len_offset = 8, }, -@@ -5247,11 +5279,15 @@ static const struct mtk_soc_data rt5350_ +@@ -5267,11 +5299,15 @@ static const struct mtk_soc_data rt5350_ .required_clks = MT7628_CLKS_BITMAP, .required_pctl = false, .version = 1, diff --git a/target/linux/generic/backport-6.6/751-02-v6.8-net-ethernet-mediatek-use-QDMA-instead-of-ADMAv2-on-.patch b/target/linux/generic/backport-6.6/751-02-v6.8-net-ethernet-mediatek-use-QDMA-instead-of-ADMAv2-on-.patch index b70fe731f8..e7ca18a858 100644 --- a/target/linux/generic/backport-6.6/751-02-v6.8-net-ethernet-mediatek-use-QDMA-instead-of-ADMAv2-on-.patch +++ b/target/linux/generic/backport-6.6/751-02-v6.8-net-ethernet-mediatek-use-QDMA-instead-of-ADMAv2-on-.patch @@ -85,7 +85,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> rxd->rxd5 = 0; rxd->rxd6 = 0; rxd->rxd7 = 0; -@@ -3918,7 +3918,7 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -3933,7 +3933,7 @@ static int mtk_hw_init(struct mtk_eth *e else mtk_hw_reset(eth); @@ -94,7 +94,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> /* Set FE to PDMAv2 if necessary */ val = mtk_r32(eth, MTK_FE_GLO_MISC); mtk_w32(eth, val | BIT(4), MTK_FE_GLO_MISC); -@@ -5212,11 +5212,11 @@ static const struct mtk_soc_data mt7981_ +@@ -5232,11 +5232,11 @@ static const struct mtk_soc_data mt7981_ .dma_len_offset = 8, }, .rx = { @@ -110,7 +110,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> }, }; -@@ -5238,11 +5238,11 @@ static const struct mtk_soc_data mt7986_ +@@ -5258,11 +5258,11 @@ static const struct mtk_soc_data mt7986_ .dma_len_offset = 8, }, .rx = { diff --git a/target/linux/generic/backport-6.6/751-04-v6.4-net-ethernet-mediatek-fix-ppe-flow-accounting-for-L2.patch b/target/linux/generic/backport-6.6/751-04-v6.4-net-ethernet-mediatek-fix-ppe-flow-accounting-for-L2.patch index 598362d252..9803af44fa 100644 --- a/target/linux/generic/backport-6.6/751-04-v6.4-net-ethernet-mediatek-fix-ppe-flow-accounting-for-L2.patch +++ b/target/linux/generic/backport-6.6/751-04-v6.4-net-ethernet-mediatek-fix-ppe-flow-accounting-for-L2.patch @@ -276,7 +276,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> }; struct mtk_mib_entry { -@@ -348,6 +350,7 @@ void mtk_ppe_deinit(struct mtk_eth *eth) +@@ -349,6 +351,7 @@ void mtk_ppe_update_mtu(struct mtk_ppe * void mtk_ppe_start(struct mtk_ppe *ppe); int mtk_ppe_stop(struct mtk_ppe *ppe); int mtk_ppe_prepare_reset(struct mtk_ppe *ppe); @@ -284,7 +284,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> void __mtk_ppe_check_skb(struct mtk_ppe *ppe, struct sk_buff *skb, u16 hash); -@@ -396,9 +399,8 @@ int mtk_foe_entry_set_queue(struct mtk_e +@@ -397,9 +400,8 @@ int mtk_foe_entry_set_queue(struct mtk_e unsigned int queue); int mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_flow_entry *entry); void mtk_foe_entry_clear(struct mtk_ppe *ppe, struct mtk_flow_entry *entry); diff --git a/target/linux/generic/backport-6.6/752-16-v6.7-net-ethernet-mtk_wed-introduce-partial-AMSDU-offload.patch b/target/linux/generic/backport-6.6/752-16-v6.7-net-ethernet-mtk_wed-introduce-partial-AMSDU-offload.patch index fc4da123df..f2b972bc3f 100644 --- a/target/linux/generic/backport-6.6/752-16-v6.7-net-ethernet-mtk_wed-introduce-partial-AMSDU-offload.patch +++ b/target/linux/generic/backport-6.6/752-16-v6.7-net-ethernet-mtk_wed-introduce-partial-AMSDU-offload.patch @@ -65,7 +65,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> }; /* software-only entry type */ -@@ -394,7 +394,8 @@ int mtk_foe_entry_set_vlan(struct mtk_et +@@ -395,7 +395,8 @@ int mtk_foe_entry_set_vlan(struct mtk_et int mtk_foe_entry_set_pppoe(struct mtk_eth *eth, struct mtk_foe_entry *entry, int sid); int mtk_foe_entry_set_wdma(struct mtk_eth *eth, struct mtk_foe_entry *entry, diff --git a/target/linux/generic/backport-6.6/752-25-v6.10-net-ethernet-mtk_eth_soc-handle-dma-buffer-size-soc-.patch b/target/linux/generic/backport-6.6/752-25-v6.10-net-ethernet-mtk_eth_soc-handle-dma-buffer-size-soc-.patch index e962109716..cebe6aeea5 100644 --- a/target/linux/generic/backport-6.6/752-25-v6.10-net-ethernet-mtk_eth_soc-handle-dma-buffer-size-soc-.patch +++ b/target/linux/generic/backport-6.6/752-25-v6.10-net-ethernet-mtk_eth_soc-handle-dma-buffer-size-soc-.patch @@ -181,7 +181,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } static bool mtk_hw_reset_check(struct mtk_eth *eth) -@@ -5090,11 +5100,14 @@ static const struct mtk_soc_data mt2701_ +@@ -5110,11 +5120,14 @@ static const struct mtk_soc_data mt2701_ .desc_size = sizeof(struct mtk_tx_dma), .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, @@ -196,7 +196,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5114,11 +5127,14 @@ static const struct mtk_soc_data mt7621_ +@@ -5134,11 +5147,14 @@ static const struct mtk_soc_data mt7621_ .desc_size = sizeof(struct mtk_tx_dma), .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, @@ -211,7 +211,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5140,11 +5156,14 @@ static const struct mtk_soc_data mt7622_ +@@ -5160,11 +5176,14 @@ static const struct mtk_soc_data mt7622_ .desc_size = sizeof(struct mtk_tx_dma), .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, @@ -226,7 +226,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5165,11 +5184,14 @@ static const struct mtk_soc_data mt7623_ +@@ -5185,11 +5204,14 @@ static const struct mtk_soc_data mt7623_ .desc_size = sizeof(struct mtk_tx_dma), .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, @@ -241,7 +241,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5188,11 +5210,14 @@ static const struct mtk_soc_data mt7629_ +@@ -5208,11 +5230,14 @@ static const struct mtk_soc_data mt7629_ .desc_size = sizeof(struct mtk_tx_dma), .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, @@ -256,7 +256,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5214,6 +5239,8 @@ static const struct mtk_soc_data mt7981_ +@@ -5234,6 +5259,8 @@ static const struct mtk_soc_data mt7981_ .desc_size = sizeof(struct mtk_tx_dma_v2), .dma_max_len = MTK_TX_DMA_BUF_LEN_V2, .dma_len_offset = 8, @@ -265,7 +265,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, .rx = { .desc_size = sizeof(struct mtk_rx_dma), -@@ -5221,6 +5248,7 @@ static const struct mtk_soc_data mt7981_ +@@ -5241,6 +5268,7 @@ static const struct mtk_soc_data mt7981_ .dma_l4_valid = RX_DMA_L4_VALID_V2, .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, @@ -273,7 +273,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, }; -@@ -5240,6 +5268,8 @@ static const struct mtk_soc_data mt7986_ +@@ -5260,6 +5288,8 @@ static const struct mtk_soc_data mt7986_ .desc_size = sizeof(struct mtk_tx_dma_v2), .dma_max_len = MTK_TX_DMA_BUF_LEN_V2, .dma_len_offset = 8, @@ -282,7 +282,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, .rx = { .desc_size = sizeof(struct mtk_rx_dma), -@@ -5247,6 +5277,7 @@ static const struct mtk_soc_data mt7986_ +@@ -5267,6 +5297,7 @@ static const struct mtk_soc_data mt7986_ .dma_l4_valid = RX_DMA_L4_VALID_V2, .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, @@ -290,7 +290,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, }; -@@ -5266,6 +5297,8 @@ static const struct mtk_soc_data mt7988_ +@@ -5286,6 +5317,8 @@ static const struct mtk_soc_data mt7988_ .desc_size = sizeof(struct mtk_tx_dma_v2), .dma_max_len = MTK_TX_DMA_BUF_LEN_V2, .dma_len_offset = 8, @@ -299,7 +299,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, .rx = { .desc_size = sizeof(struct mtk_rx_dma_v2), -@@ -5273,6 +5306,7 @@ static const struct mtk_soc_data mt7988_ +@@ -5293,6 +5326,7 @@ static const struct mtk_soc_data mt7988_ .dma_l4_valid = RX_DMA_L4_VALID_V2, .dma_max_len = MTK_TX_DMA_BUF_LEN_V2, .dma_len_offset = 8, @@ -307,7 +307,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, }; -@@ -5287,6 +5321,7 @@ static const struct mtk_soc_data rt5350_ +@@ -5307,6 +5341,7 @@ static const struct mtk_soc_data rt5350_ .desc_size = sizeof(struct mtk_tx_dma), .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, @@ -315,7 +315,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, .rx = { .desc_size = sizeof(struct mtk_rx_dma), -@@ -5294,6 +5329,7 @@ static const struct mtk_soc_data rt5350_ +@@ -5314,6 +5349,7 @@ static const struct mtk_soc_data rt5350_ .dma_l4_valid = RX_DMA_L4_VALID_PDMA, .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, diff --git a/target/linux/generic/backport-6.6/752-26-v6.10-net-ethernet-mtk_eth_soc-ppe-add-support-for-multipl.patch b/target/linux/generic/backport-6.6/752-26-v6.10-net-ethernet-mtk_eth_soc-ppe-add-support-for-multipl.patch index efda018c8c..5875ccacfc 100644 --- a/target/linux/generic/backport-6.6/752-26-v6.10-net-ethernet-mtk_eth_soc-ppe-add-support-for-multipl.patch +++ b/target/linux/generic/backport-6.6/752-26-v6.10-net-ethernet-mtk_eth_soc-ppe-add-support-for-multipl.patch @@ -134,19 +134,17 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> } -@@ -3386,7 +3387,10 @@ static int mtk_open(struct net_device *d +@@ -3397,7 +3398,8 @@ static int mtk_open(struct net_device *d { struct mtk_mac *mac = netdev_priv(dev); struct mtk_eth *eth = mac->hw; -- int i, err; +- int i, err, mtu; + struct mtk_mac *target_mac; -+ int i, err, ppe_num; -+ -+ ppe_num = eth->soc->ppe_num; ++ int i, err, mtu, ppe_num; err = phylink_of_phy_connect(mac->phylink, mac->of_node, 0); if (err) { -@@ -3410,18 +3414,38 @@ static int mtk_open(struct net_device *d +@@ -3421,9 +3423,29 @@ static int mtk_open(struct net_device *d for (i = 0; i < ARRAY_SIZE(eth->ppe); i++) mtk_ppe_start(eth->ppe[i]); @@ -177,8 +175,9 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> + mtk_w32(eth, RST_GL_PSE, MTK_RST_GL); + mtk_w32(eth, 0, MTK_RST_GL); - napi_enable(ð->tx_napi); - napi_enable(ð->rx_napi); + mtu = mtk_max_gmac_mtu(eth); + for (i = 0; i < ARRAY_SIZE(eth->ppe); i++) +@@ -3434,9 +3456,9 @@ static int mtk_open(struct net_device *d mtk_tx_irq_enable(eth, MTK_TX_DONE_INT); mtk_rx_irq_enable(eth, soc->rx.irq_done_mask); refcount_set(ð->dma_refcnt, 1); @@ -190,7 +189,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> phylink_start(mac->phylink); netif_tx_start_all_queues(dev); -@@ -3498,7 +3522,8 @@ static int mtk_stop(struct net_device *d +@@ -3513,7 +3535,8 @@ static int mtk_stop(struct net_device *d if (!refcount_dec_and_test(ð->dma_refcnt)) return 0; @@ -200,7 +199,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> mtk_tx_irq_disable(eth, MTK_TX_DONE_INT); mtk_rx_irq_disable(eth, eth->soc->rx.irq_done_mask); -@@ -5002,23 +5027,24 @@ static int mtk_probe(struct platform_dev +@@ -5022,23 +5045,24 @@ static int mtk_probe(struct platform_dev } if (eth->soc->offload_version) { @@ -233,7 +232,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> } for (i = 0; i < MTK_MAX_DEVS; i++) { -@@ -5121,6 +5147,7 @@ static const struct mtk_soc_data mt7621_ +@@ -5141,6 +5165,7 @@ static const struct mtk_soc_data mt7621_ .required_pctl = false, .version = 1, .offload_version = 1, @@ -241,7 +240,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .hash_offset = 2, .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE, .tx = { -@@ -5149,6 +5176,7 @@ static const struct mtk_soc_data mt7622_ +@@ -5169,6 +5194,7 @@ static const struct mtk_soc_data mt7622_ .required_pctl = false, .version = 1, .offload_version = 2, @@ -249,7 +248,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .hash_offset = 2, .has_accounting = true, .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE, -@@ -5177,6 +5205,7 @@ static const struct mtk_soc_data mt7623_ +@@ -5197,6 +5223,7 @@ static const struct mtk_soc_data mt7623_ .required_pctl = true, .version = 1, .offload_version = 1, @@ -257,7 +256,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .hash_offset = 2, .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE, .disable_pll_modes = true, -@@ -5232,6 +5261,7 @@ static const struct mtk_soc_data mt7981_ +@@ -5252,6 +5279,7 @@ static const struct mtk_soc_data mt7981_ .required_pctl = false, .version = 2, .offload_version = 2, @@ -265,7 +264,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .hash_offset = 4, .has_accounting = true, .foe_entry_size = MTK_FOE_ENTRY_V2_SIZE, -@@ -5261,6 +5291,7 @@ static const struct mtk_soc_data mt7986_ +@@ -5281,6 +5309,7 @@ static const struct mtk_soc_data mt7986_ .required_pctl = false, .version = 2, .offload_version = 2, @@ -273,7 +272,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .hash_offset = 4, .has_accounting = true, .foe_entry_size = MTK_FOE_ENTRY_V2_SIZE, -@@ -5290,6 +5321,7 @@ static const struct mtk_soc_data mt7988_ +@@ -5310,6 +5339,7 @@ static const struct mtk_soc_data mt7988_ .required_pctl = false, .version = 3, .offload_version = 2, diff --git a/target/linux/generic/backport-6.6/752-28-v6.10-net-ethernet-mediatek-Allow-gaps-in-MAC-allocation.patch b/target/linux/generic/backport-6.6/752-28-v6.10-net-ethernet-mediatek-Allow-gaps-in-MAC-allocation.patch index e387b69f49..35c780aad6 100644 --- a/target/linux/generic/backport-6.6/752-28-v6.10-net-ethernet-mediatek-Allow-gaps-in-MAC-allocation.patch +++ b/target/linux/generic/backport-6.6/752-28-v6.10-net-ethernet-mediatek-Allow-gaps-in-MAC-allocation.patch @@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -3416,7 +3416,7 @@ static int mtk_open(struct net_device *d +@@ -3425,7 +3425,7 @@ static int mtk_open(struct net_device *d for (i = 0; i < MTK_MAX_DEVS; i++) { if (!eth->netdev[i]) diff --git a/target/linux/generic/backport-6.6/752-30-v6.10-net-ethernet-mtk_eth_soc-implement-.-get-set-_pausep.patch b/target/linux/generic/backport-6.6/752-30-v6.10-net-ethernet-mtk_eth_soc-implement-.-get-set-_pausep.patch index e6e3a2f7fe..778145e0f1 100644 --- a/target/linux/generic/backport-6.6/752-30-v6.10-net-ethernet-mtk_eth_soc-implement-.-get-set-_pausep.patch +++ b/target/linux/generic/backport-6.6/752-30-v6.10-net-ethernet-mtk_eth_soc-implement-.-get-set-_pausep.patch @@ -20,7 +20,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -4507,6 +4507,20 @@ static int mtk_set_rxnfc(struct net_devi +@@ -4525,6 +4525,20 @@ static int mtk_set_rxnfc(struct net_devi return ret; } @@ -41,7 +41,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> static u16 mtk_select_queue(struct net_device *dev, struct sk_buff *skb, struct net_device *sb_dev) { -@@ -4535,8 +4549,10 @@ static const struct ethtool_ops mtk_etht +@@ -4553,8 +4567,10 @@ static const struct ethtool_ops mtk_etht .get_strings = mtk_get_strings, .get_sset_count = mtk_get_sset_count, .get_ethtool_stats = mtk_get_ethtool_stats, diff --git a/target/linux/generic/hack-6.6/902-debloat_proc.patch b/target/linux/generic/hack-6.6/902-debloat_proc.patch index f76951687f..77b6856bda 100644 --- a/target/linux/generic/hack-6.6/902-debloat_proc.patch +++ b/target/linux/generic/hack-6.6/902-debloat_proc.patch @@ -286,7 +286,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> goto err; --- a/net/core/net-procfs.c +++ b/net/core/net-procfs.c -@@ -327,10 +327,12 @@ static int __net_init dev_proc_net_init( +@@ -344,10 +344,12 @@ static int __net_init dev_proc_net_init( if (!proc_create_net("dev", 0444, net->proc_net, &dev_seq_ops, sizeof(struct seq_net_private))) goto out; @@ -298,10 +298,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> - if (!proc_create_net("ptype", 0444, net->proc_net, &ptype_seq_ops, + if (!IS_ENABLED(CONFIG_PROC_STRIPPED) && + !proc_create_net("ptype", 0444, net->proc_net, &ptype_seq_ops, - sizeof(struct seq_net_private))) + sizeof(struct ptype_iter_state))) goto out_softnet; -@@ -340,9 +342,11 @@ static int __net_init dev_proc_net_init( +@@ -357,9 +359,11 @@ static int __net_init dev_proc_net_init( out: return rc; out_ptype: @@ -315,7 +315,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> out_dev: remove_proc_entry("dev", net->proc_net); goto out; -@@ -352,8 +356,10 @@ static void __net_exit dev_proc_net_exit +@@ -369,8 +373,10 @@ static void __net_exit dev_proc_net_exit { wext_proc_exit(net); diff --git a/target/linux/generic/pending-6.6/630-packet_socket_type.patch b/target/linux/generic/pending-6.6/630-packet_socket_type.patch index f5c15756c5..74acb54851 100644 --- a/target/linux/generic/pending-6.6/630-packet_socket_type.patch +++ b/target/linux/generic/pending-6.6/630-packet_socket_type.patch @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3437,6 +3439,7 @@ static int packet_create(struct net *net +@@ -3442,6 +3444,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -4104,6 +4107,16 @@ packet_setsockopt(struct socket *sock, i +@@ -4109,6 +4112,16 @@ packet_setsockopt(struct socket *sock, i packet_sock_flag_set(po, PACKET_SOCK_QDISC_BYPASS, val); return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> default: return -ENOPROTOOPT; } -@@ -4163,6 +4176,13 @@ static int packet_getsockopt(struct sock +@@ -4168,6 +4181,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR_SZ: val = READ_ONCE(po->vnet_hdr_sz); break; diff --git a/target/linux/generic/pending-6.6/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch b/target/linux/generic/pending-6.6/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch index 82eac4b6b1..354bd45e71 100644 --- a/target/linux/generic/pending-6.6/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch +++ b/target/linux/generic/pending-6.6/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -5081,6 +5081,8 @@ static int mtk_probe(struct platform_dev +@@ -5099,6 +5099,8 @@ static int mtk_probe(struct platform_dev * for NAPI to work */ init_dummy_netdev(ð->dummy_dev); diff --git a/target/linux/generic/pending-6.6/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch b/target/linux/generic/pending-6.6/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch index 7ea7f0ca88..eec7c67134 100644 --- a/target/linux/generic/pending-6.6/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch +++ b/target/linux/generic/pending-6.6/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch @@ -490,9 +490,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> .mac_finish = mtk_mac_finish, .mac_link_down = mtk_mac_link_down, .mac_link_up = mtk_mac_link_up, -@@ -3429,6 +3570,9 @@ static int mtk_open(struct net_device *d - - ppe_num = eth->soc->ppe_num; +@@ -3438,6 +3579,9 @@ static int mtk_open(struct net_device *d + struct mtk_mac *target_mac; + int i, err, mtu, ppe_num; + if (mac->pextp) + phy_power_on(mac->pextp); @@ -500,7 +500,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> err = phylink_of_phy_connect(mac->phylink, mac->of_node, 0); if (err) { netdev_err(dev, "%s: could not attach PHY: %d\n", __func__, -@@ -3579,6 +3723,9 @@ static int mtk_stop(struct net_device *d +@@ -3592,6 +3736,9 @@ static int mtk_stop(struct net_device *d for (i = 0; i < ARRAY_SIZE(eth->ppe); i++) mtk_ppe_stop(eth->ppe[i]); @@ -510,7 +510,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> return 0; } -@@ -4617,6 +4764,7 @@ static const struct net_device_ops mtk_n +@@ -4635,6 +4782,7 @@ static const struct net_device_ops mtk_n static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) { const __be32 *_id = of_get_property(np, "reg", NULL); @@ -518,7 +518,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> phy_interface_t phy_mode; struct phylink *phylink; struct mtk_mac *mac; -@@ -4653,16 +4801,41 @@ static int mtk_add_mac(struct mtk_eth *e +@@ -4671,16 +4819,41 @@ static int mtk_add_mac(struct mtk_eth *e mac->id = id; mac->hw = eth; mac->of_node = np; @@ -568,7 +568,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> } memset(mac->hwlro_ip, 0, sizeof(mac->hwlro_ip)); -@@ -4745,8 +4918,21 @@ static int mtk_add_mac(struct mtk_eth *e +@@ -4763,8 +4936,21 @@ static int mtk_add_mac(struct mtk_eth *e phy_interface_zero(mac->phylink_config.supported_interfaces); __set_bit(PHY_INTERFACE_MODE_INTERNAL, mac->phylink_config.supported_interfaces); @@ -590,7 +590,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> phylink = phylink_create(&mac->phylink_config, of_fwnode_handle(mac->of_node), phy_mode, &mtk_phylink_ops); -@@ -4797,6 +4983,26 @@ free_netdev: +@@ -4815,6 +5001,26 @@ free_netdev: return err; } @@ -617,7 +617,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> void mtk_eth_set_dma_device(struct mtk_eth *eth, struct device *dma_dev) { struct net_device *dev, *tmp; -@@ -4943,7 +5149,8 @@ static int mtk_probe(struct platform_dev +@@ -4961,7 +5167,8 @@ static int mtk_probe(struct platform_dev regmap_write(cci, 0, 3); } @@ -627,7 +627,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> err = mtk_sgmii_init(eth); if (err) -@@ -5054,6 +5261,24 @@ static int mtk_probe(struct platform_dev +@@ -5072,6 +5279,24 @@ static int mtk_probe(struct platform_dev } } @@ -652,7 +652,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> if (MTK_HAS_CAPS(eth->soc->caps, MTK_SHARED_INT)) { err = devm_request_irq(eth->dev, eth->irq[0], mtk_handle_irq, 0, -@@ -5157,6 +5382,11 @@ static int mtk_remove(struct platform_de +@@ -5175,6 +5400,11 @@ static int mtk_remove(struct platform_de mtk_stop(eth->netdev[i]); mac = netdev_priv(eth->netdev[i]); phylink_disconnect_phy(mac->phylink); diff --git a/target/linux/generic/pending-6.6/738-01-net-ethernet-mtk_eth_soc-reduce-rx-ring-size-for-older.patch b/target/linux/generic/pending-6.6/738-01-net-ethernet-mtk_eth_soc-reduce-rx-ring-size-for-older.patch index 1684672e76..0b8c6ef2a7 100644 --- a/target/linux/generic/pending-6.6/738-01-net-ethernet-mtk_eth_soc-reduce-rx-ring-size-for-older.patch +++ b/target/linux/generic/pending-6.6/738-01-net-ethernet-mtk_eth_soc-reduce-rx-ring-size-for-older.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -5418,7 +5418,7 @@ static const struct mtk_soc_data mt2701_ +@@ -5436,7 +5436,7 @@ static const struct mtk_soc_data mt2701_ .desc_size = sizeof(struct mtk_rx_dma), .irq_done_mask = MTK_RX_DONE_INT, .dma_l4_valid = RX_DMA_L4_VALID, @@ -39,7 +39,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5446,7 +5446,7 @@ static const struct mtk_soc_data mt7621_ +@@ -5464,7 +5464,7 @@ static const struct mtk_soc_data mt7621_ .desc_size = sizeof(struct mtk_rx_dma), .irq_done_mask = MTK_RX_DONE_INT, .dma_l4_valid = RX_DMA_L4_VALID, @@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5476,7 +5476,7 @@ static const struct mtk_soc_data mt7622_ +@@ -5494,7 +5494,7 @@ static const struct mtk_soc_data mt7622_ .desc_size = sizeof(struct mtk_rx_dma), .irq_done_mask = MTK_RX_DONE_INT, .dma_l4_valid = RX_DMA_L4_VALID, @@ -57,7 +57,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5505,7 +5505,7 @@ static const struct mtk_soc_data mt7623_ +@@ -5523,7 +5523,7 @@ static const struct mtk_soc_data mt7623_ .desc_size = sizeof(struct mtk_rx_dma), .irq_done_mask = MTK_RX_DONE_INT, .dma_l4_valid = RX_DMA_L4_VALID, @@ -66,7 +66,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5531,7 +5531,7 @@ static const struct mtk_soc_data mt7629_ +@@ -5549,7 +5549,7 @@ static const struct mtk_soc_data mt7629_ .desc_size = sizeof(struct mtk_rx_dma), .irq_done_mask = MTK_RX_DONE_INT, .dma_l4_valid = RX_DMA_L4_VALID, @@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, }, -@@ -5563,7 +5563,7 @@ static const struct mtk_soc_data mt7981_ +@@ -5581,7 +5581,7 @@ static const struct mtk_soc_data mt7981_ .dma_l4_valid = RX_DMA_L4_VALID_V2, .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, @@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> }, }; -@@ -5593,7 +5593,7 @@ static const struct mtk_soc_data mt7986_ +@@ -5611,7 +5611,7 @@ static const struct mtk_soc_data mt7986_ .dma_l4_valid = RX_DMA_L4_VALID_V2, .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, @@ -93,7 +93,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> }, }; -@@ -5646,7 +5646,7 @@ static const struct mtk_soc_data rt5350_ +@@ -5664,7 +5664,7 @@ static const struct mtk_soc_data rt5350_ .dma_l4_valid = RX_DMA_L4_VALID_PDMA, .dma_max_len = MTK_TX_DMA_BUF_LEN, .dma_len_offset = 16, diff --git a/target/linux/generic/pending-6.6/738-02-net-ethernet-mtk_eth_soc-do-not-enable-page-pool-sta.patch b/target/linux/generic/pending-6.6/738-02-net-ethernet-mtk_eth_soc-do-not-enable-page-pool-sta.patch index 7519e7b830..32db13c9bb 100644 --- a/target/linux/generic/pending-6.6/738-02-net-ethernet-mtk_eth_soc-do-not-enable-page-pool-sta.patch +++ b/target/linux/generic/pending-6.6/738-02-net-ethernet-mtk_eth_soc-do-not-enable-page-pool-sta.patch @@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> help --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -4589,6 +4589,7 @@ static int mtk_get_sset_count(struct net +@@ -4607,6 +4607,7 @@ static int mtk_get_sset_count(struct net static void mtk_ethtool_pp_stats(struct mtk_eth *eth, u64 *data) { @@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> struct page_pool_stats stats = {}; int i; -@@ -4601,6 +4602,7 @@ static void mtk_ethtool_pp_stats(struct +@@ -4619,6 +4620,7 @@ static void mtk_ethtool_pp_stats(struct page_pool_get_stats(ring->page_pool, &stats); } page_pool_ethtool_stats_get(data, &stats); diff --git a/target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch b/target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch index fb37368fd0..01c2aa0de2 100644 --- a/target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch +++ b/target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch @@ -136,7 +136,7 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> #include <net/dst.h> #include <net/sock.h> #include <net/checksum.h> -@@ -4829,6 +4833,9 @@ static const u8 skb_ext_type_len[] = { +@@ -4826,6 +4830,9 @@ static const u8 skb_ext_type_len[] = { #if IS_ENABLED(CONFIG_MCTP_FLOWS) [SKB_EXT_MCTP] = SKB_EXT_CHUNKSIZEOF(struct mctp_flow), #endif |