diff options
| author | Goetz Goerisch | 2026-03-04 20:25:11 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2026-04-03 15:14:57 +0000 |
| commit | ea7c6f03ac1991bd2e8b1f54dc6d5133d32f4724 (patch) | |
| tree | 31cf0450cc1f05ffdfa7b12b01c914d0a4202d47 | |
| parent | 2120db27b569d5242ba9d1baef645d578678dc25 (diff) | |
| download | openwrt-ea7c6f03ac1991bd2e8b1f54dc6d5133d32f4724.tar.gz | |
kernel: bump 6.6 to 6.6.128
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.128
Add new KConfig symbols:
MFD_TN48M_CPLD [7]
MFD_SPACEMIT_P1 [8]
Removes upstreamed patches:
bcm27xx/patches-6.6/950-0291-media-i2c-ov5647-Correct-pixel-array-offset.patch [1]
bcm27xx/patches-6.6/950-0292-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch [2]
bcm27xx/patches-6.6/950-0310-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch [3]
Manually rebase patches:
bcm27xx/patches-6.6/950-0331-mfd-simple-mfd-i2c-Add-configuration-for-RPi-POE-HAT.patch [4]
bcm27xx/patches-6.6/950-1275-drivers-mfd-sensehat-Add-Raspberry-Pi-Sense-HAT-to-s.patch [4]
bcm27xx/patches-6.6/950-1330-media-i2c-ov5647-Add-V4L2_CID_LINK_FREQUENCY-control.patch [5]
lantiq/patches-6.6/0101-find_active_root.patch [6]
All other patches autorefeshed.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.128&id=1f413dac763a8caed44d8591aa064e4ab8061f52
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.128&id=e5f4aad2627dd9e5da46ad1325795ec12046facb
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.128&id=c146483bad46e4abb7ab9c706adc51cd54f1a81e
[4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.128&id=b07aa526d05378bd6d2d61294424e411f4a14fe0
[5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.128&id=089625cccd7eb8d65a381e81f1e3e1db064334df
[6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.128&id=9fbbd62436cec79b6a08c03f5711fcbef89a208d
[7] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.128&id=29040d42d641892cbd7c5d91306063ceb2cac103
[8] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.128&id=d9e5d3e1924abe95babc0762c8f5c67382bf389a
Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22348
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
88 files changed, 195 insertions, 295 deletions
diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 55a5b8c57c..91e7350dda 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .127 -LINUX_KERNEL_HASH-6.6.127 = a7cd9c97b4f0b31cc030bcdc60abe5434fffb2556e293f7438ce7909dff8c9fe +LINUX_VERSION-6.6 = .128 +LINUX_KERNEL_HASH-6.6.128 = 669633bb8480021f15c38883fb2f6fe2087cc8b69a582f26f6b7d4ae6b348e48 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 8c5824bcee..f4a2110f8c 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 -@@ -982,7 +982,7 @@ static bool ipv6_hop_jumbo(struct sk_buf +@@ -988,7 +988,7 @@ static bool ipv6_hop_jumbo(struct sk_buf goto drop; } diff --git a/target/linux/ath79/patches-6.6/910-mikrotik-rb4xx.patch b/target/linux/ath79/patches-6.6/910-mikrotik-rb4xx.patch index 674cc2fe66..845dde9304 100644 --- a/target/linux/ath79/patches-6.6/910-mikrotik-rb4xx.patch +++ b/target/linux/ath79/patches-6.6/910-mikrotik-rb4xx.patch @@ -45,7 +45,7 @@ Submitted-by: Christopher Hill <ch6574@gmail.com> --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig -@@ -2261,6 +2261,14 @@ config RAVE_SP_CORE +@@ -2285,6 +2285,14 @@ config RAVE_SP_CORE Select this to get support for the Supervisory Processor device found on several devices in RAVE line of hardware. diff --git a/target/linux/bcm27xx/patches-6.6/950-0081-lan78xx-Enable-LEDs-and-auto-negotiation.patch b/target/linux/bcm27xx/patches-6.6/950-0081-lan78xx-Enable-LEDs-and-auto-negotiation.patch index 3c06a9783e..f17aa18d82 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0081-lan78xx-Enable-LEDs-and-auto-negotiation.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0081-lan78xx-Enable-LEDs-and-auto-negotiation.patch @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2902,6 +2902,11 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2900,6 +2900,11 @@ static int lan78xx_reset(struct lan78xx_ int ret; u32 buf; u8 sig; @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ret = lan78xx_read_reg(dev, HW_CFG, &buf); if (ret < 0) -@@ -2968,6 +2973,10 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2966,6 +2971,10 @@ static int lan78xx_reset(struct lan78xx_ buf |= HW_CFG_MEF_; @@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ret = lan78xx_write_reg(dev, HW_CFG, buf); if (ret < 0) return ret; -@@ -3067,6 +3076,9 @@ static int lan78xx_reset(struct lan78xx_ +@@ -3065,6 +3074,9 @@ static int lan78xx_reset(struct lan78xx_ buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_; } } 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 c60d515e4f..283ffaf104 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 -@@ -2293,6 +2293,8 @@ static const struct usb_audio_quirk_flag +@@ -2295,6 +2295,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-0120-lan78xx-Read-initial-EEE-status-from-DT.patch b/target/linux/bcm27xx/patches-6.6/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch index 36d8bb9d4f..6d49f050c5 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -3132,6 +3132,22 @@ static int lan78xx_open(struct net_devic +@@ -3130,6 +3130,22 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/bcm27xx/patches-6.6/950-0125-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/bcm27xx/patches-6.6/950-0125-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch index 555d7f9471..1cfd5f0072 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0125-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0125-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch @@ -38,7 +38,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf; -@@ -3492,8 +3501,14 @@ static int lan78xx_bind(struct lan78xx_n +@@ -3490,8 +3499,14 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_RX_CSUM_ENABLE) dev->net->features |= NETIF_F_RXCSUM; diff --git a/target/linux/bcm27xx/patches-6.6/950-0127-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/target/linux/bcm27xx/patches-6.6/950-0127-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch index 7cccfd5986..3ad6369241 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0127-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0127-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2438,6 +2438,22 @@ static int lan78xx_phy_init(struct lan78 +@@ -2436,6 +2436,22 @@ static int lan78xx_phy_init(struct lan78 mii_adv_to_linkmode_adv_t(fc, mii_adv); linkmode_or(phydev->advertising, fc, phydev->advertising); @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> if (phydev->mdio.dev.of_node) { u32 reg; int len; -@@ -3141,22 +3157,6 @@ static int lan78xx_open(struct net_devic +@@ -3139,22 +3155,6 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/bcm27xx/patches-6.6/950-0133-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/bcm27xx/patches-6.6/950-0133-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch index e0cdc65652..ecc8f40bdb 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0133-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0133-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch @@ -29,7 +29,7 @@ See: https://github.com/raspberrypi/linux/issues/2447 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf; -@@ -4476,7 +4481,13 @@ static int lan78xx_probe(struct usb_inte +@@ -4474,7 +4479,13 @@ static int lan78xx_probe(struct usb_inte if (ret < 0) goto out4; diff --git a/target/linux/bcm27xx/patches-6.6/950-0134-lan78xx-EEE-support-is-now-a-PHY-property.patch b/target/linux/bcm27xx/patches-6.6/950-0134-lan78xx-EEE-support-is-now-a-PHY-property.patch index e1cdc17b90..70a267f165 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0134-lan78xx-EEE-support-is-now-a-PHY-property.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0134-lan78xx-EEE-support-is-now-a-PHY-property.patch @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2443,7 +2443,7 @@ static int lan78xx_phy_init(struct lan78 +@@ -2441,7 +2441,7 @@ static int lan78xx_phy_init(struct lan78 mii_adv_to_linkmode_adv_t(fc, mii_adv); linkmode_or(phydev->advertising, fc, phydev->advertising); diff --git a/target/linux/bcm27xx/patches-6.6/950-0138-media-adv7180-Default-to-the-first-valid-input.patch b/target/linux/bcm27xx/patches-6.6/950-0138-media-adv7180-Default-to-the-first-valid-input.patch index 7669317e60..2224f7ada5 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0138-media-adv7180-Default-to-the-first-valid-input.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0138-media-adv7180-Default-to-the-first-valid-input.patch @@ -16,7 +16,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c -@@ -1340,6 +1340,7 @@ static const struct adv7180_chip_info ad +@@ -1347,6 +1347,7 @@ static const struct adv7180_chip_info ad static int init_device(struct adv7180_state *state) { int ret; @@ -24,7 +24,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> mutex_lock(&state->mutex); -@@ -1387,6 +1388,18 @@ static int init_device(struct adv7180_st +@@ -1394,6 +1395,18 @@ static int init_device(struct adv7180_st goto out_unlock; } diff --git a/target/linux/bcm27xx/patches-6.6/950-0139-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch b/target/linux/bcm27xx/patches-6.6/950-0139-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch index faaf79f2ae..bd195f362b 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0139-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0139-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch @@ -14,7 +14,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c -@@ -1329,6 +1329,7 @@ static const struct adv7180_chip_info ad +@@ -1336,6 +1336,7 @@ static const struct adv7180_chip_info ad BIT(ADV7182_INPUT_SVIDEO_AIN1_AIN2) | BIT(ADV7182_INPUT_SVIDEO_AIN3_AIN4) | BIT(ADV7182_INPUT_SVIDEO_AIN7_AIN8) | diff --git a/target/linux/bcm27xx/patches-6.6/950-0167-drm-v3d-Clock-V3D-down-when-not-in-use.patch b/target/linux/bcm27xx/patches-6.6/950-0167-drm-v3d-Clock-V3D-down-when-not-in-use.patch index 099cf75a81..890fe7ea0d 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0167-drm-v3d-Clock-V3D-down-when-not-in-use.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0167-drm-v3d-Clock-V3D-down-when-not-in-use.patch @@ -25,7 +25,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c -@@ -266,6 +266,21 @@ static int v3d_platform_drm_probe(struct +@@ -268,6 +268,21 @@ static int v3d_platform_drm_probe(struct } } @@ -47,7 +47,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> if (v3d->ver < 41) { ret = map_regs(v3d, &v3d->gca_regs, "gca"); if (ret) -@@ -292,6 +307,9 @@ static int v3d_platform_drm_probe(struct +@@ -294,6 +309,9 @@ static int v3d_platform_drm_probe(struct if (ret) goto irq_disable; 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 2c2445b932..ab28803718 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 @@ -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 -@@ -1458,6 +1461,9 @@ +@@ -1462,6 +1465,9 @@ #define USB_VENDOR_ID_XIAOMI 0x2717 #define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014 diff --git a/target/linux/bcm27xx/patches-6.6/950-0187-v3d_drv-Handle-missing-clock-more-gracefully.patch b/target/linux/bcm27xx/patches-6.6/950-0187-v3d_drv-Handle-missing-clock-more-gracefully.patch index dc601a6697..e0c38917e3 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0187-v3d_drv-Handle-missing-clock-more-gracefully.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0187-v3d_drv-Handle-missing-clock-more-gracefully.patch @@ -10,7 +10,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com> --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c -@@ -267,10 +267,10 @@ static int v3d_platform_drm_probe(struct +@@ -269,10 +269,10 @@ static int v3d_platform_drm_probe(struct } v3d->clk = devm_clk_get(dev, NULL); diff --git a/target/linux/bcm27xx/patches-6.6/950-0284-media-i2c-ov5647-Parse-and-register-properties.patch b/target/linux/bcm27xx/patches-6.6/950-0284-media-i2c-ov5647-Parse-and-register-properties.patch index 38aa0081f5..6d718c2d2b 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0284-media-i2c-ov5647-Parse-and-register-properties.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0284-media-i2c-ov5647-Parse-and-register-properties.patch @@ -26,7 +26,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> v4l2_ctrl_handler_init(&sensor->ctrls, 9); -@@ -1357,6 +1358,11 @@ static int ov5647_init_controls(struct o +@@ -1359,6 +1360,11 @@ static int ov5647_init_controls(struct o ARRAY_SIZE(ov5647_test_pattern_menu) - 1, 0, 0, ov5647_test_pattern_menu); @@ -38,9 +38,9 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> if (sensor->ctrls.error) goto handler_free; -@@ -1443,7 +1449,7 @@ static int ov5647_probe(struct i2c_clien - - sensor->mode = OV5647_DEFAULT_MODE; +@@ -1450,7 +1456,7 @@ static int ov5647_probe(struct i2c_clien + sd->internal_ops = &ov5647_subdev_internal_ops; + sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS; - ret = ov5647_init_controls(sensor); + ret = ov5647_init_controls(sensor, dev); diff --git a/target/linux/bcm27xx/patches-6.6/950-0291-media-i2c-ov5647-Correct-pixel-array-offset.patch b/target/linux/bcm27xx/patches-6.6/950-0291-media-i2c-ov5647-Correct-pixel-array-offset.patch deleted file mode 100644 index 3c9742f71c..0000000000 --- a/target/linux/bcm27xx/patches-6.6/950-0291-media-i2c-ov5647-Correct-pixel-array-offset.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 97261088e3951c7c02d3ff68109c981ee1ab158b Mon Sep 17 00:00:00 2001 -From: David Plowman <david.plowman@raspberrypi.com> -Date: Tue, 11 May 2021 12:52:26 +0100 -Subject: [PATCH 0291/1085] media: i2c: ov5647: Correct pixel array offset - -The top offset in the pixel array is actually 6 (see page 3-1 of the -OV5647 data sheet). - -Fixes: f2f7ad5ce5e52 ("media: i2c: ov5647: Selection compliance fixes") -Signed-off-by: David Plowman <david.plowman@raspberrypi.com> ---- - drivers/media/i2c/ov5647.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/media/i2c/ov5647.c -+++ b/drivers/media/i2c/ov5647.c -@@ -69,7 +69,7 @@ - #define OV5647_NATIVE_HEIGHT 1956U - - #define OV5647_PIXEL_ARRAY_LEFT 16U --#define OV5647_PIXEL_ARRAY_TOP 16U -+#define OV5647_PIXEL_ARRAY_TOP 6U - #define OV5647_PIXEL_ARRAY_WIDTH 2592U - #define OV5647_PIXEL_ARRAY_HEIGHT 1944U - diff --git a/target/linux/bcm27xx/patches-6.6/950-0292-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch b/target/linux/bcm27xx/patches-6.6/950-0292-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch deleted file mode 100644 index 58ce5d5d2e..0000000000 --- a/target/linux/bcm27xx/patches-6.6/950-0292-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3ffb4613612fd82874da3a4dfb4cfc5698990100 Mon Sep 17 00:00:00 2001 -From: David Plowman <david.plowman@raspberrypi.com> -Date: Tue, 11 May 2021 12:57:22 +0100 -Subject: [PATCH 0292/1085] media: i2c: ov5647: Correct minimum VBLANK value - -Trial and error reveals that the minimum vblank value appears to be 24 -(the OV5647 data sheet does not give any clues). This fixes streaming -lock-ups in full resolution mode. - -Fixes: 9b5a5ebedc303 ("media: i2c: ov5647: Add support for V4L2_CID_VBLANK") -Signed-off-by: David Plowman <david.plowman@raspberrypi.com> ---- - drivers/media/i2c/ov5647.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/media/i2c/ov5647.c -+++ b/drivers/media/i2c/ov5647.c -@@ -73,7 +73,7 @@ - #define OV5647_PIXEL_ARRAY_WIDTH 2592U - #define OV5647_PIXEL_ARRAY_HEIGHT 1944U - --#define OV5647_VBLANK_MIN 4 -+#define OV5647_VBLANK_MIN 24 - #define OV5647_VTS_MAX 32767 - - #define OV5647_EXPOSURE_MIN 4 diff --git a/target/linux/bcm27xx/patches-6.6/950-0310-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch b/target/linux/bcm27xx/patches-6.6/950-0310-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch deleted file mode 100644 index 5b4feb4de4..0000000000 --- a/target/linux/bcm27xx/patches-6.6/950-0310-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3256e2e3adfca28ec586794f96e0fe323b0282ef Mon Sep 17 00:00:00 2001 -From: David Plowman <david.plowman@raspberrypi.com> -Date: Thu, 21 Oct 2021 14:47:00 +0100 -Subject: [PATCH 0310/1085] media: i2c: ov5647: Sensor should report RAW color - space - -Tested on Raspberry Pi running libcamera. - -Signed-off-by: David Plowman <david.plowman@raspberrypi.com> ---- - drivers/media/i2c/ov5647.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/drivers/media/i2c/ov5647.c -+++ b/drivers/media/i2c/ov5647.c -@@ -509,7 +509,7 @@ static const struct ov5647_mode ov5647_m - { - .format = { - .code = MEDIA_BUS_FMT_SBGGR10_1X10, -- .colorspace = V4L2_COLORSPACE_SRGB, -+ .colorspace = V4L2_COLORSPACE_RAW, - .field = V4L2_FIELD_NONE, - .width = 2592, - .height = 1944 -@@ -530,7 +530,7 @@ static const struct ov5647_mode ov5647_m - { - .format = { - .code = MEDIA_BUS_FMT_SBGGR10_1X10, -- .colorspace = V4L2_COLORSPACE_SRGB, -+ .colorspace = V4L2_COLORSPACE_RAW, - .field = V4L2_FIELD_NONE, - .width = 1920, - .height = 1080 -@@ -551,7 +551,7 @@ static const struct ov5647_mode ov5647_m - { - .format = { - .code = MEDIA_BUS_FMT_SBGGR10_1X10, -- .colorspace = V4L2_COLORSPACE_SRGB, -+ .colorspace = V4L2_COLORSPACE_RAW, - .field = V4L2_FIELD_NONE, - .width = 1296, - .height = 972 -@@ -572,7 +572,7 @@ static const struct ov5647_mode ov5647_m - { - .format = { - .code = MEDIA_BUS_FMT_SBGGR10_1X10, -- .colorspace = V4L2_COLORSPACE_SRGB, -+ .colorspace = V4L2_COLORSPACE_RAW, - .field = V4L2_FIELD_NONE, - .width = 640, - .height = 480 diff --git a/target/linux/bcm27xx/patches-6.6/950-0317-media-i2c-ov5647-Support-HFLIP-and-VFLIP.patch b/target/linux/bcm27xx/patches-6.6/950-0317-media-i2c-ov5647-Support-HFLIP-and-VFLIP.patch index 994804e867..fb9d4a71b6 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0317-media-i2c-ov5647-Support-HFLIP-and-VFLIP.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0317-media-i2c-ov5647-Support-HFLIP-and-VFLIP.patch @@ -170,7 +170,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com> default: dev_info(&client->dev, "Control (id:0x%x, val:0x%x) not supported\n", -@@ -1360,6 +1414,16 @@ static int ov5647_init_controls(struct o +@@ -1362,6 +1416,16 @@ static int ov5647_init_controls(struct o ARRAY_SIZE(ov5647_test_pattern_menu) - 1, 0, 0, ov5647_test_pattern_menu); diff --git a/target/linux/bcm27xx/patches-6.6/950-0326-media-i2c-ov5647-Add-support-for-regulator-control.patch b/target/linux/bcm27xx/patches-6.6/950-0326-media-i2c-ov5647-Add-support-for-regulator-control.patch index cbddf0cde0..a0d2cf8883 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0326-media-i2c-ov5647-Add-support-for-regulator-control.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0326-media-i2c-ov5647-Add-support-for-regulator-control.patch @@ -96,7 +96,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> static int ov5647_init_controls(struct ov5647 *sensor, struct device *dev) { struct i2c_client *client = v4l2_get_subdevdata(&sensor->sd); -@@ -1511,6 +1542,12 @@ static int ov5647_probe(struct i2c_clien +@@ -1513,6 +1544,12 @@ static int ov5647_probe(struct i2c_clien return -EINVAL; } diff --git a/target/linux/bcm27xx/patches-6.6/950-0331-mfd-simple-mfd-i2c-Add-configuration-for-RPi-POE-HAT.patch b/target/linux/bcm27xx/patches-6.6/950-0331-mfd-simple-mfd-i2c-Add-configuration-for-RPi-POE-HAT.patch index af2cb51cdb..f0b001fac4 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0331-mfd-simple-mfd-i2c-Add-configuration-for-RPi-POE-HAT.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0331-mfd-simple-mfd-i2c-Add-configuration-for-RPi-POE-HAT.patch @@ -18,7 +18,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig -@@ -1170,6 +1170,16 @@ config MFD_SY7636A +@@ -1194,6 +1194,16 @@ config MFD_SY7636A To enable support for building sub-devices as modules, choose M here. @@ -53,11 +53,11 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> static int simple_mfd_i2c_probe(struct i2c_client *i2c) { const struct simple_mfd_data *simple_mfd_data; -@@ -88,6 +97,7 @@ static const struct of_device_id simple_ - { .compatible = "silergy,sy7636a", .data = &silergy_sy7636a}, +@@ -117,6 +126,7 @@ static const struct of_device_id simple_ { .compatible = "maxim,max5970", .data = &maxim_max5970}, { .compatible = "maxim,max5978", .data = &maxim_max5970}, + { .compatible = "maxim,max77705-battery", .data = &maxim_mon_max77705}, + { .compatible = "raspberrypi,poe-core", &rpi_poe_core }, + { .compatible = "silergy,sy7636a", .data = &silergy_sy7636a}, + { .compatible = "spacemit,p1", .data = &spacemit_p1, }, {} - }; - MODULE_DEVICE_TABLE(of, simple_mfd_i2c_of_match); diff --git a/target/linux/bcm27xx/patches-6.6/950-0356-media-i2c-ov5647-Use-v4l2_async_register_subdev_sens.patch b/target/linux/bcm27xx/patches-6.6/950-0356-media-i2c-ov5647-Use-v4l2_async_register_subdev_sens.patch index 0f82946b98..4acbfb3df3 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0356-media-i2c-ov5647-Use-v4l2_async_register_subdev_sens.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0356-media-i2c-ov5647-Use-v4l2_async_register_subdev_sens.patch @@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c -@@ -1575,7 +1575,7 @@ static int ov5647_probe(struct i2c_clien +@@ -1577,7 +1577,7 @@ static int ov5647_probe(struct i2c_clien if (ret < 0) goto power_off; diff --git a/target/linux/bcm27xx/patches-6.6/950-0375-random-do-not-use-jump-labels-before-they-are-initia.patch b/target/linux/bcm27xx/patches-6.6/950-0375-random-do-not-use-jump-labels-before-they-are-initia.patch index fed292fc51..fbaeb70a1f 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0375-random-do-not-use-jump-labels-before-they-are-initia.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0375-random-do-not-use-jump-labels-before-they-are-initia.patch @@ -69,7 +69,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> --- a/drivers/char/random.c +++ b/drivers/char/random.c -@@ -843,6 +843,14 @@ void __init random_init_early(const char +@@ -833,6 +833,14 @@ void __init random_init_early(const char unsigned long entropy[BLAKE2S_BLOCK_SIZE / sizeof(long)]; size_t i, longs, arch_bits; diff --git a/target/linux/bcm27xx/patches-6.6/950-0376-drm-v3d-Switch-clock-setting-to-new-api.patch b/target/linux/bcm27xx/patches-6.6/950-0376-drm-v3d-Switch-clock-setting-to-new-api.patch index aa613e73dd..965516e18b 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0376-drm-v3d-Switch-clock-setting-to-new-api.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0376-drm-v3d-Switch-clock-setting-to-new-api.patch @@ -34,7 +34,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> struct drm_device *drm; struct v3d_dev *v3d; int ret; -@@ -272,7 +277,20 @@ static int v3d_platform_drm_probe(struct +@@ -274,7 +279,20 @@ static int v3d_platform_drm_probe(struct dev_err(dev, "Failed to get clock (%ld)\n", PTR_ERR(v3d->clk)); return PTR_ERR(v3d->clk); } @@ -56,7 +56,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> /* For downclocking, drop it to the minimum frequency we can get from * the CPRMAN clock generator dividing off our parent. The divider is * 4 bits, but ask for just higher than that so that rounding doesn't -@@ -307,7 +325,7 @@ static int v3d_platform_drm_probe(struct +@@ -309,7 +327,7 @@ static int v3d_platform_drm_probe(struct if (ret) goto irq_disable; diff --git a/target/linux/bcm27xx/patches-6.6/950-0395-media-adv7180-Nasty-hack-to-allow-input-selection.patch b/target/linux/bcm27xx/patches-6.6/950-0395-media-adv7180-Nasty-hack-to-allow-input-selection.patch index 7dc86ae220..a64f083e2e 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0395-media-adv7180-Nasty-hack-to-allow-input-selection.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0395-media-adv7180-Nasty-hack-to-allow-input-selection.patch @@ -79,7 +79,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> *norm = state->curr_norm; return 0; -@@ -881,6 +905,8 @@ static int adv7180_s_stream(struct v4l2_ +@@ -888,6 +912,8 @@ static int adv7180_s_stream(struct v4l2_ return 0; } diff --git a/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch b/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch index 86e528ba3e..ddaeb30ccd 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch @@ -191,7 +191,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> static void macb_init_buffers(struct macb *bp) { struct macb_queue *queue; -@@ -976,6 +992,7 @@ static int macb_mii_init(struct macb *bp +@@ -974,6 +990,7 @@ static int macb_mii_init(struct macb *bp bp->mii_bus->write = &macb_mdio_write_c22; bp->mii_bus->read_c45 = &macb_mdio_read_c45; bp->mii_bus->write_c45 = &macb_mdio_write_c45; @@ -199,7 +199,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x", bp->pdev->name, bp->pdev->id); bp->mii_bus->priv = bp; -@@ -1641,6 +1658,11 @@ static int macb_rx(struct macb_queue *qu +@@ -1639,6 +1656,11 @@ static int macb_rx(struct macb_queue *qu macb_init_rx_ring(queue); queue_writel(queue, RBQP, queue->rx_ring_dma); @@ -211,7 +211,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> macb_writel(bp, NCR, ctrl | MACB_BIT(RE)); -@@ -1943,8 +1965,9 @@ static irqreturn_t macb_interrupt(int ir +@@ -1941,8 +1963,9 @@ static irqreturn_t macb_interrupt(int ir queue_writel(queue, ISR, MACB_BIT(TCOMP) | MACB_BIT(TXUBR)); @@ -222,7 +222,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> wmb(); // ensure softirq can see update } -@@ -2400,6 +2423,11 @@ static netdev_tx_t macb_start_xmit(struc +@@ -2398,6 +2421,11 @@ static netdev_tx_t macb_start_xmit(struc skb_tx_timestamp(skb); spin_lock(&bp->lock); @@ -234,7 +234,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART)); spin_unlock(&bp->lock); -@@ -2774,6 +2802,37 @@ static void macb_configure_dma(struct ma +@@ -2772,6 +2800,37 @@ static void macb_configure_dma(struct ma } } @@ -272,7 +272,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> static void macb_init_hw(struct macb *bp) { u32 config; -@@ -2802,6 +2861,11 @@ static void macb_init_hw(struct macb *bp +@@ -2800,6 +2859,11 @@ static void macb_init_hw(struct macb *bp if (bp->caps & MACB_CAPS_JUMBO) bp->rx_frm_len_mask = MACB_RX_JFRMLEN_MASK; @@ -284,7 +284,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> macb_configure_dma(bp); /* Enable RX partial store and forward and set watermark */ -@@ -3168,6 +3232,52 @@ static void gem_get_ethtool_strings(stru +@@ -3167,6 +3231,52 @@ static void gem_get_ethtool_strings(stru } } @@ -337,7 +337,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> static struct net_device_stats *macb_get_stats(struct net_device *dev) { struct macb *bp = netdev_priv(dev); -@@ -3762,6 +3872,8 @@ static const struct ethtool_ops macb_eth +@@ -3761,6 +3871,8 @@ static const struct ethtool_ops macb_eth }; static const struct ethtool_ops gem_ethtool_ops = { @@ -346,7 +346,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> .get_regs_len = macb_get_regs_len, .get_regs = macb_get_regs, .get_wol = macb_get_wol, -@@ -3771,6 +3883,8 @@ static const struct ethtool_ops gem_etht +@@ -3770,6 +3882,8 @@ static const struct ethtool_ops gem_etht .get_ethtool_stats = gem_get_ethtool_stats, .get_strings = gem_get_ethtool_strings, .get_sset_count = gem_get_sset_count, @@ -355,7 +355,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> .get_link_ksettings = macb_get_link_ksettings, .set_link_ksettings = macb_set_link_ksettings, .get_ringparam = macb_get_ringparam, -@@ -5067,6 +5181,11 @@ static int macb_probe(struct platform_de +@@ -5066,6 +5180,11 @@ static int macb_probe(struct platform_de } } } @@ -367,7 +367,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> spin_lock_init(&bp->lock); spin_lock_init(&bp->stats_lock); -@@ -5127,6 +5246,21 @@ static int macb_probe(struct platform_de +@@ -5126,6 +5245,21 @@ static int macb_probe(struct platform_de else bp->phy_interface = interface; @@ -389,7 +389,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> /* IP specific init */ err = init(pdev); if (err) -@@ -5203,6 +5337,19 @@ static int macb_remove(struct platform_d +@@ -5202,6 +5336,19 @@ static int macb_remove(struct platform_d return 0; } @@ -409,7 +409,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> static int __maybe_unused macb_suspend(struct device *dev) { struct net_device *netdev = dev_get_drvdata(dev); -@@ -5417,6 +5564,7 @@ static const struct dev_pm_ops macb_pm_o +@@ -5416,6 +5563,7 @@ static const struct dev_pm_ops macb_pm_o static struct platform_driver macb_driver = { .probe = macb_probe, .remove = macb_remove, diff --git a/target/linux/bcm27xx/patches-6.6/950-0526-mfd-Add-rp1-driver.patch b/target/linux/bcm27xx/patches-6.6/950-0526-mfd-Add-rp1-driver.patch index b900c1edae..0f3f0c3379 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0526-mfd-Add-rp1-driver.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0526-mfd-Add-rp1-driver.patch @@ -19,7 +19,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig -@@ -2323,6 +2323,17 @@ config MFD_INTEL_M10_BMC_PMCI +@@ -2347,6 +2347,17 @@ config MFD_INTEL_M10_BMC_PMCI additional drivers must be enabled in order to use the functionality of the device. diff --git a/target/linux/bcm27xx/patches-6.6/950-0813-media-i2c-adv7180-Use-MEDIA_BUS_FMT_UYVY8_1X16-for-C.patch b/target/linux/bcm27xx/patches-6.6/950-0813-media-i2c-adv7180-Use-MEDIA_BUS_FMT_UYVY8_1X16-for-C.patch index 10c014b3bf..5a952999c8 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0813-media-i2c-adv7180-Use-MEDIA_BUS_FMT_UYVY8_1X16-for-C.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0813-media-i2c-adv7180-Use-MEDIA_BUS_FMT_UYVY8_1X16-for-C.patch @@ -17,7 +17,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c -@@ -723,10 +723,15 @@ static int adv7180_enum_mbus_code(struct +@@ -730,10 +730,15 @@ static int adv7180_enum_mbus_code(struct struct v4l2_subdev_state *sd_state, struct v4l2_subdev_mbus_code_enum *code) { @@ -34,7 +34,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return 0; } -@@ -736,7 +741,10 @@ static int adv7180_mbus_fmt(struct v4l2_ +@@ -743,7 +748,10 @@ static int adv7180_mbus_fmt(struct v4l2_ { struct adv7180_state *state = to_state(sd); diff --git a/target/linux/bcm27xx/patches-6.6/950-0814-media-i2c-adv7180-Add-support-for-V4L2_CID_LINK_FREQ.patch b/target/linux/bcm27xx/patches-6.6/950-0814-media-i2c-adv7180-Add-support-for-V4L2_CID_LINK_FREQ.patch index 72f19418f0..99249156ff 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0814-media-i2c-adv7180-Add-support-for-V4L2_CID_LINK_FREQ.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0814-media-i2c-adv7180-Add-support-for-V4L2_CID_LINK_FREQ.patch @@ -36,7 +36,7 @@ This reverts commit 00ecb85c58501f8f7ae75fcb069bbbad5542e853. }; #define to_adv7180_sd(_ctrl) (&container_of(_ctrl->handler, \ struct adv7180_state, \ -@@ -616,6 +627,9 @@ static int adv7180_s_ctrl(struct v4l2_ct +@@ -623,6 +634,9 @@ static int adv7180_s_ctrl(struct v4l2_ct if (ret) return ret; @@ -46,7 +46,7 @@ This reverts commit 00ecb85c58501f8f7ae75fcb069bbbad5542e853. val = ctrl->val; switch (ctrl->id) { case V4L2_CID_BRIGHTNESS: -@@ -657,6 +671,7 @@ static int adv7180_s_ctrl(struct v4l2_ct +@@ -664,6 +678,7 @@ static int adv7180_s_ctrl(struct v4l2_ct ret = -EINVAL; } @@ -54,7 +54,7 @@ This reverts commit 00ecb85c58501f8f7ae75fcb069bbbad5542e853. mutex_unlock(&state->mutex); return ret; } -@@ -677,7 +692,7 @@ static const struct v4l2_ctrl_config adv +@@ -684,7 +699,7 @@ static const struct v4l2_ctrl_config adv static int adv7180_init_controls(struct adv7180_state *state) { @@ -63,7 +63,7 @@ This reverts commit 00ecb85c58501f8f7ae75fcb069bbbad5542e853. v4l2_ctrl_new_std(&state->ctrl_hdl, &adv7180_ctrl_ops, V4L2_CID_BRIGHTNESS, ADV7180_BRI_MIN, -@@ -703,6 +718,17 @@ static int adv7180_init_controls(struct +@@ -710,6 +725,17 @@ static int adv7180_init_controls(struct test_pattern_menu); } @@ -81,7 +81,7 @@ This reverts commit 00ecb85c58501f8f7ae75fcb069bbbad5542e853. state->sd.ctrl_handler = &state->ctrl_hdl; if (state->ctrl_hdl.error) { int err = state->ctrl_hdl.error; -@@ -830,7 +856,16 @@ static int adv7180_set_pad_format(struct +@@ -837,7 +863,16 @@ static int adv7180_set_pad_format(struct ret = adv7180_mbus_fmt(sd, &format->format); if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) { diff --git a/target/linux/bcm27xx/patches-6.6/950-0853-drivers-usb-dwc3-add-FS-LS-bus-instance-parkmode-dis.patch b/target/linux/bcm27xx/patches-6.6/950-0853-drivers-usb-dwc3-add-FS-LS-bus-instance-parkmode-dis.patch index 2661bebb27..c8953dfb77 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0853-drivers-usb-dwc3-add-FS-LS-bus-instance-parkmode-dis.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0853-drivers-usb-dwc3-add-FS-LS-bus-instance-parkmode-dis.patch @@ -45,7 +45,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> #define DWC3_GUCTL1_RESUME_OPMODE_HS_HOST BIT(10) /* Global Status Register */ -@@ -1118,10 +1119,12 @@ struct dwc3_scratchpad_array { +@@ -1120,10 +1121,12 @@ struct dwc3_scratchpad_array { * generation after resume from suspend. * @ulpi_ext_vbus_drv: Set to confiure the upli chip to drives CPEN pin * VBUS with an external supply. @@ -62,7 +62,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> * @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk * @tx_de_emphasis: Tx de-emphasis value * 0 - -6dB de-emphasis -@@ -1348,6 +1351,7 @@ struct dwc3 { +@@ -1352,6 +1355,7 @@ struct dwc3 { unsigned ulpi_ext_vbus_drv:1; unsigned parkmode_disable_ss_quirk:1; unsigned parkmode_disable_hs_quirk:1; 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 3049223910..4ea40ba421 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 -@@ -3929,6 +3929,8 @@ check_restart_area: +@@ -3932,6 +3932,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-1256-media-i2c-ov5647-Add-control-of-V4L2_CID_HBLANK.patch b/target/linux/bcm27xx/patches-6.6/950-1256-media-i2c-ov5647-Add-control-of-V4L2_CID_HBLANK.patch index 89c690ca5b..6ac6cc6fe8 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1256-media-i2c-ov5647-Add-control-of-V4L2_CID_HBLANK.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1256-media-i2c-ov5647-Add-control-of-V4L2_CID_HBLANK.patch @@ -102,7 +102,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> /* Read-only, but we adjust it based on mode. */ break; -@@ -1427,10 +1427,11 @@ static int ov5647_init_controls(struct o +@@ -1429,10 +1429,11 @@ static int ov5647_init_controls(struct o sensor->mode->pixel_rate, 1, sensor->mode->pixel_rate); @@ -116,7 +116,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> hblank); sensor->vblank = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops, -@@ -1464,7 +1465,6 @@ static int ov5647_init_controls(struct o +@@ -1466,7 +1467,6 @@ static int ov5647_init_controls(struct o goto handler_free; sensor->pixel_rate->flags |= V4L2_CTRL_FLAG_READ_ONLY; diff --git a/target/linux/bcm27xx/patches-6.6/950-1275-drivers-mfd-sensehat-Add-Raspberry-Pi-Sense-HAT-to-s.patch b/target/linux/bcm27xx/patches-6.6/950-1275-drivers-mfd-sensehat-Add-Raspberry-Pi-Sense-HAT-to-s.patch index f89dfa8ffd..e6b05dbfc6 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1275-drivers-mfd-sensehat-Add-Raspberry-Pi-Sense-HAT-to-s.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1275-drivers-mfd-sensehat-Add-Raspberry-Pi-Sense-HAT-to-s.patch @@ -19,11 +19,11 @@ Signed-off-by: Charles Mirabile <cmirabil@redhat.com> --- a/drivers/mfd/simple-mfd-i2c.c +++ b/drivers/mfd/simple-mfd-i2c.c -@@ -98,6 +98,7 @@ static const struct of_device_id simple_ - { .compatible = "maxim,max5970", .data = &maxim_max5970}, +@@ -127,6 +127,7 @@ static const struct of_device_id simple_ { .compatible = "maxim,max5978", .data = &maxim_max5970}, + { .compatible = "maxim,max77705-battery", .data = &maxim_mon_max77705}, { .compatible = "raspberrypi,poe-core", &rpi_poe_core }, + { .compatible = "raspberrypi,sensehat" }, + { .compatible = "silergy,sy7636a", .data = &silergy_sy7636a}, + { .compatible = "spacemit,p1", .data = &spacemit_p1, }, {} - }; - MODULE_DEVICE_TABLE(of, simple_mfd_i2c_of_match); diff --git a/target/linux/bcm27xx/patches-6.6/950-1330-media-i2c-ov5647-Add-V4L2_CID_LINK_FREQUENCY-control.patch b/target/linux/bcm27xx/patches-6.6/950-1330-media-i2c-ov5647-Add-V4L2_CID_LINK_FREQUENCY-control.patch index efe47592d7..ce8c79425e 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1330-media-i2c-ov5647-Add-V4L2_CID_LINK_FREQUENCY-control.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1330-media-i2c-ov5647-Add-V4L2_CID_LINK_FREQUENCY-control.patch @@ -71,7 +71,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> @@ -440,6 +452,7 @@ static const struct ov5647_mode ov5647_m .height = 1920, }, - .pixel_rate = 55000000, + .pixel_rate = 58333000, + .link_freq_index = FREQ_INDEX_VGA, .hts = 1852, .vts = 0x1f8, @@ -92,9 +92,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> - v4l2_ctrl_handler_init(&sensor->ctrls, 9); + v4l2_ctrl_handler_init(&sensor->ctrls, 10); - v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops, - V4L2_CID_AUTOGAIN, 0, 1, 1, 0); -@@ -1308,6 +1323,14 @@ static int ov5647_init_controls(struct o + sensor->ctrls.lock = &sensor->lock; + +@@ -1310,6 +1325,14 @@ static int ov5647_init_controls(struct o if (sensor->vflip) sensor->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT; diff --git a/target/linux/bcm27xx/patches-6.6/950-1359-usb-dwc3-core-add-support-for-setting-NAK-enhancemen.patch b/target/linux/bcm27xx/patches-6.6/950-1359-usb-dwc3-core-add-support-for-setting-NAK-enhancemen.patch index 1757ca7adb..473962dc5f 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1359-usb-dwc3-core-add-support-for-setting-NAK-enhancemen.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1359-usb-dwc3-core-add-support-for-setting-NAK-enhancemen.patch @@ -57,7 +57,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> #define DWC3_GUCTL1_PARKMODE_DISABLE_SS BIT(17) #define DWC3_GUCTL1_PARKMODE_DISABLE_HS BIT(16) #define DWC3_GUCTL1_PARKMODE_DISABLE_FSLS BIT(15) -@@ -1119,6 +1121,8 @@ struct dwc3_scratchpad_array { +@@ -1121,6 +1123,8 @@ struct dwc3_scratchpad_array { * generation after resume from suspend. * @ulpi_ext_vbus_drv: Set to confiure the upli chip to drives CPEN pin * VBUS with an external supply. @@ -66,7 +66,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> * @parkmode_disable_ss_quirk: If set, disable park mode feature for all * Superspeed instances. * @parkmode_disable_hs_quirk: If set, disable park mode feature for all -@@ -1349,6 +1353,8 @@ struct dwc3 { +@@ -1353,6 +1357,8 @@ struct dwc3 { unsigned dis_tx_ipgap_linecheck_quirk:1; unsigned resume_hs_terminations:1; unsigned ulpi_ext_vbus_drv:1; diff --git a/target/linux/bcm27xx/patches-6.6/950-1423-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch b/target/linux/bcm27xx/patches-6.6/950-1423-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch index 1d91eb6b4b..14220b754e 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1423-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1423-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch @@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c -@@ -5028,6 +5028,17 @@ static const struct macb_config versal_c +@@ -5027,6 +5027,17 @@ static const struct macb_config versal_c .usrio = &macb_default_usrio, }; @@ -33,7 +33,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> static const struct of_device_id macb_dt_ids[] = { { .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config }, { .compatible = "cdns,macb" }, -@@ -5048,6 +5059,7 @@ static const struct of_device_id macb_dt +@@ -5047,6 +5058,7 @@ static const struct of_device_id macb_dt { .compatible = "microchip,mpfs-macb", .data = &mpfs_config }, { .compatible = "microchip,sama7g5-gem", .data = &sama7g5_gem_config }, { .compatible = "microchip,sama7g5-emac", .data = &sama7g5_emac_config }, diff --git a/target/linux/bcm27xx/patches-6.6/950-1452-Revert-PCI-Warn-if-no-host-bridge-NUMA-node-info.patch b/target/linux/bcm27xx/patches-6.6/950-1452-Revert-PCI-Warn-if-no-host-bridge-NUMA-node-info.patch index e8b5670613..8471b4af68 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1452-Revert-PCI-Warn-if-no-host-bridge-NUMA-node-info.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1452-Revert-PCI-Warn-if-no-host-bridge-NUMA-node-info.patch @@ -17,7 +17,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c -@@ -969,9 +969,6 @@ static int pci_register_host_bridge(stru +@@ -985,9 +985,6 @@ static int pci_register_host_bridge(stru else pr_info("PCI host bridge to bus %s\n", name); diff --git a/target/linux/bcm27xx/patches-6.6/950-1539-Reapply-usb-dwc3-Set-DMA-and-coherent-masks-early.patch b/target/linux/bcm27xx/patches-6.6/950-1539-Reapply-usb-dwc3-Set-DMA-and-coherent-masks-early.patch index 29be3f2fd3..315db1310c 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1539-Reapply-usb-dwc3-Set-DMA-and-coherent-masks-early.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1539-Reapply-usb-dwc3-Set-DMA-and-coherent-masks-early.patch @@ -267,7 +267,7 @@ This reverts commit 09dfdf6129532e19b2cfd4992d1d09e7119ccd48. dwc->tx_fifo_resize_max_num = tx_fifo_resize_max_num; } -@@ -1981,6 +2028,12 @@ static int dwc3_probe(struct platform_de +@@ -1996,6 +2043,12 @@ static int dwc3_probe(struct platform_de if (IS_ERR(dwc->usb_psy)) return dev_err_probe(dev, PTR_ERR(dwc->usb_psy), "couldn't get usb power supply\n"); @@ -292,7 +292,7 @@ This reverts commit 09dfdf6129532e19b2cfd4992d1d09e7119ccd48. /* Global Debug LSP MUX Select */ #define DWC3_GDBGLSPMUX_ENDBC BIT(15) /* Host only */ #define DWC3_GDBGLSPMUX_HOSTSELECT(n) ((n) & 0x3fff) -@@ -1070,6 +1073,7 @@ struct dwc3_scratchpad_array { +@@ -1072,6 +1075,7 @@ struct dwc3_scratchpad_array { * @tx_max_burst_prd: max periodic ESS transmit burst size * @tx_fifo_resize_max_num: max number of fifos allocated during txfifo resize * @clear_stall_protocol: endpoint number that requires a delayed status phase @@ -300,7 +300,7 @@ This reverts commit 09dfdf6129532e19b2cfd4992d1d09e7119ccd48. * @hsphy_interface: "utmi" or "ulpi" * @connected: true when we're connected to a host, false otherwise * @softconnect: true when gadget connect is called, false when disconnect runs -@@ -1312,6 +1316,7 @@ struct dwc3 { +@@ -1316,6 +1320,7 @@ struct dwc3 { u8 tx_max_burst_prd; u8 tx_fifo_resize_max_num; u8 clear_stall_protocol; diff --git a/target/linux/bcm27xx/patches-6.6/950-1553-drm-v3d-Associate-a-V3D-tech-revision-to-all-support.patch b/target/linux/bcm27xx/patches-6.6/950-1553-drm-v3d-Associate-a-V3D-tech-revision-to-all-support.patch index 0b3f80704b..bef7ceb96a 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1553-drm-v3d-Associate-a-V3D-tech-revision-to-all-support.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1553-drm-v3d-Associate-a-V3D-tech-revision-to-all-support.patch @@ -252,7 +252,7 @@ Signed-off-by: Maíra Canal <mcanal@igalia.com> ret = map_regs(v3d, &v3d->hub_regs, "hub"); if (ret) return ret; -@@ -253,6 +258,11 @@ static int v3d_platform_drm_probe(struct +@@ -255,6 +260,11 @@ static int v3d_platform_drm_probe(struct ident1 = V3D_READ(V3D_HUB_IDENT1); v3d->ver = (V3D_GET_FIELD(ident1, V3D_HUB_IDENT1_TVER) * 10 + V3D_GET_FIELD(ident1, V3D_HUB_IDENT1_REV)); @@ -264,7 +264,7 @@ Signed-off-by: Maíra Canal <mcanal@igalia.com> v3d->cores = V3D_GET_FIELD(ident1, V3D_HUB_IDENT1_NCORES); WARN_ON(v3d->cores > 1); /* multicore not yet implemented */ -@@ -300,7 +310,7 @@ static int v3d_platform_drm_probe(struct +@@ -302,7 +312,7 @@ static int v3d_platform_drm_probe(struct v3d->clk_down_rate = (clk_get_rate(clk_get_parent(v3d->clk)) / (1 << 4)) + 10000; diff --git a/target/linux/bcm27xx/patches-6.6/950-1555-drm-v3d-Use-V3D_SMS-registers-for-power-on-off-and-r.patch b/target/linux/bcm27xx/patches-6.6/950-1555-drm-v3d-Use-V3D_SMS-registers-for-power-on-off-and-r.patch index b405938cef..a8e4ea681f 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1555-drm-v3d-Use-V3D_SMS-registers-for-power-on-off-and-r.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1555-drm-v3d-Use-V3D_SMS-registers-for-power-on-off-and-r.patch @@ -87,7 +87,7 @@ Signed-off-by: Maíra Canal <mcanal@igalia.com> mmu_debug = V3D_READ(V3D_MMU_DEBUG_INFO); mask = DMA_BIT_MASK(30 + V3D_GET_FIELD(mmu_debug, V3D_MMU_PA_WIDTH)); ret = dma_set_mask_and_coherent(dev, mask); -@@ -364,6 +402,8 @@ static void v3d_platform_drm_remove(stru +@@ -366,6 +404,8 @@ static void v3d_platform_drm_remove(stru dma_free_wc(v3d->drm.dev, 4096, v3d->mmu_scratch, v3d->mmu_scratch_paddr); diff --git a/target/linux/generic/backport-6.6/600-v6.10-net-Remove-conditional-threaded-NAPI-wakeup-based-on.patch b/target/linux/generic/backport-6.6/600-v6.10-net-Remove-conditional-threaded-NAPI-wakeup-based-on.patch index 745e6bbc15..d74d8c7c08 100644 --- a/target/linux/generic/backport-6.6/600-v6.10-net-Remove-conditional-threaded-NAPI-wakeup-based-on.patch +++ b/target/linux/generic/backport-6.6/600-v6.10-net-Remove-conditional-threaded-NAPI-wakeup-based-on.patch @@ -32,7 +32,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4539,13 +4539,7 @@ static inline void ____napi_schedule(str +@@ -4552,13 +4552,7 @@ static inline void ____napi_schedule(str */ thread = READ_ONCE(napi->thread); if (thread) { @@ -47,7 +47,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> wake_up_process(thread); return; } -@@ -6701,8 +6695,6 @@ static int napi_poll(struct napi_struct +@@ -6714,8 +6708,6 @@ static int napi_poll(struct napi_struct static int napi_thread_wait(struct napi_struct *napi) { @@ -56,7 +56,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> set_current_state(TASK_INTERRUPTIBLE); while (!kthread_should_stop()) { -@@ -6711,15 +6703,13 @@ static int napi_thread_wait(struct napi_ +@@ -6724,15 +6716,13 @@ static int napi_thread_wait(struct napi_ * Testing SCHED bit is not enough because SCHED bit might be * set by some other busy poll thread or by napi_disable(). */ diff --git a/target/linux/generic/backport-6.6/601-v6.10-net-Allow-to-use-SMP-threads-for-backlog-NAPI.patch b/target/linux/generic/backport-6.6/601-v6.10-net-Allow-to-use-SMP-threads-for-backlog-NAPI.patch index 070cdcd539..03e9debe5e 100644 --- a/target/linux/generic/backport-6.6/601-v6.10-net-Allow-to-use-SMP-threads-for-backlog-NAPI.patch +++ b/target/linux/generic/backport-6.6/601-v6.10-net-Allow-to-use-SMP-threads-for-backlog-NAPI.patch @@ -108,7 +108,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> static inline void rps_lock_irqsave(struct softnet_data *sd, unsigned long *flags) { -@@ -4507,6 +4533,7 @@ EXPORT_SYMBOL(__dev_direct_xmit); +@@ -4520,6 +4546,7 @@ EXPORT_SYMBOL(__dev_direct_xmit); /************************************************************************* * Receiver routines *************************************************************************/ @@ -116,7 +116,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> int netdev_max_backlog __read_mostly = 1000; EXPORT_SYMBOL(netdev_max_backlog); -@@ -4539,12 +4566,16 @@ static inline void ____napi_schedule(str +@@ -4552,12 +4579,16 @@ static inline void ____napi_schedule(str */ thread = READ_ONCE(napi->thread); if (thread) { @@ -133,7 +133,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> list_add_tail(&napi->poll_list, &sd->poll_list); WRITE_ONCE(napi->list_owner, smp_processor_id()); /* If not called from net_rx_action() -@@ -4790,6 +4821,11 @@ static void napi_schedule_rps(struct sof +@@ -4803,6 +4834,11 @@ static void napi_schedule_rps(struct sof #ifdef CONFIG_RPS if (sd != mysd) { @@ -145,7 +145,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> sd->rps_ipi_next = mysd->rps_ipi_list; mysd->rps_ipi_list = sd; -@@ -6013,7 +6049,7 @@ static void net_rps_action_and_irq_enabl +@@ -6026,7 +6062,7 @@ static void net_rps_action_and_irq_enabl #ifdef CONFIG_RPS struct softnet_data *remsd = sd->rps_ipi_list; @@ -154,7 +154,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> sd->rps_ipi_list = NULL; local_irq_enable(); -@@ -6028,7 +6064,7 @@ static void net_rps_action_and_irq_enabl +@@ -6041,7 +6077,7 @@ static void net_rps_action_and_irq_enabl static bool sd_has_rps_ipi_waiting(struct softnet_data *sd) { #ifdef CONFIG_RPS @@ -163,7 +163,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> #else return false; #endif -@@ -6072,7 +6108,7 @@ static int process_backlog(struct napi_s +@@ -6085,7 +6121,7 @@ static int process_backlog(struct napi_s * We can use a plain write instead of clear_bit(), * and we dont need an smp_mb() memory barrier. */ @@ -172,7 +172,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> again = false; } else { skb_queue_splice_tail_init(&sd->input_pkt_queue, -@@ -6738,43 +6774,48 @@ static void skb_defer_free_flush(struct +@@ -6751,43 +6787,48 @@ static void skb_defer_free_flush(struct } } @@ -250,7 +250,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> return 0; } -@@ -11359,7 +11400,7 @@ static int dev_cpu_dead(unsigned int old +@@ -11372,7 +11413,7 @@ static int dev_cpu_dead(unsigned int old list_del_init(&napi->poll_list); if (napi->poll == process_backlog) @@ -259,7 +259,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> else ____napi_schedule(sd, napi); } -@@ -11367,12 +11408,14 @@ static int dev_cpu_dead(unsigned int old +@@ -11380,12 +11421,14 @@ static int dev_cpu_dead(unsigned int old raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_enable(); @@ -278,7 +278,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> /* Process offline CPU's input_pkt_queue */ while ((skb = __skb_dequeue(&oldsd->process_queue))) { -@@ -11635,6 +11678,38 @@ static struct pernet_operations __net_in +@@ -11648,6 +11691,38 @@ static struct pernet_operations __net_in * */ @@ -317,7 +317,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> /* * This is called single threaded during boot, so no need * to take the rtnl semaphore. -@@ -11685,7 +11760,10 @@ static int __init net_dev_init(void) +@@ -11698,7 +11773,10 @@ static int __init net_dev_init(void) init_gro_hash(&sd->backlog); sd->backlog.poll = process_backlog; sd->backlog.weight = weight_p; 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 58d3f27fbe..869499f228 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 @@ -82,7 +82,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> spin_unlock_irq(&sd->input_pkt_queue.lock); else if (!IS_ENABLED(CONFIG_PREEMPT_RT)) local_irq_enable(); -@@ -4840,6 +4840,23 @@ static void napi_schedule_rps(struct sof +@@ -4853,6 +4853,23 @@ static void napi_schedule_rps(struct sof __napi_schedule_irqoff(&mysd->backlog); } diff --git a/target/linux/generic/backport-6.6/603-v6.10-net-Rename-rps_lock-to-backlog_lock.patch b/target/linux/generic/backport-6.6/603-v6.10-net-Rename-rps_lock-to-backlog_lock.patch index 021ebc3fa0..b32db220f6 100644 --- a/target/linux/generic/backport-6.6/603-v6.10-net-Rename-rps_lock-to-backlog_lock.patch +++ b/target/linux/generic/backport-6.6/603-v6.10-net-Rename-rps_lock-to-backlog_lock.patch @@ -67,7 +67,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> { if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads()) spin_unlock_irq(&sd->input_pkt_queue.lock); -@@ -4845,12 +4845,12 @@ void kick_defer_list_purge(struct softne +@@ -4858,12 +4858,12 @@ void kick_defer_list_purge(struct softne unsigned long flags; if (use_backlog_threads()) { @@ -82,7 +82,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> } else if (!cmpxchg(&sd->defer_ipi_scheduled, 0, 1)) { smp_call_function_single_async(cpu, &sd->defer_csd); -@@ -4912,7 +4912,7 @@ static int enqueue_to_backlog(struct sk_ +@@ -4925,7 +4925,7 @@ static int enqueue_to_backlog(struct sk_ reason = SKB_DROP_REASON_NOT_SPECIFIED; sd = &per_cpu(softnet_data, cpu); @@ -91,7 +91,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> if (!netif_running(skb->dev)) goto drop; qlen = skb_queue_len(&sd->input_pkt_queue); -@@ -4921,7 +4921,7 @@ static int enqueue_to_backlog(struct sk_ +@@ -4934,7 +4934,7 @@ static int enqueue_to_backlog(struct sk_ enqueue: __skb_queue_tail(&sd->input_pkt_queue, skb); input_queue_tail_incr_save(sd, qtail); @@ -100,7 +100,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> return NET_RX_SUCCESS; } -@@ -4936,7 +4936,7 @@ enqueue: +@@ -4949,7 +4949,7 @@ enqueue: drop: sd->dropped++; @@ -109,7 +109,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> dev_core_stats_rx_dropped_inc(skb->dev); kfree_skb_reason(skb, reason); -@@ -5967,7 +5967,7 @@ static void flush_backlog(struct work_st +@@ -5980,7 +5980,7 @@ static void flush_backlog(struct work_st local_bh_disable(); sd = this_cpu_ptr(&softnet_data); @@ -118,7 +118,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) { if (skb->dev->reg_state == NETREG_UNREGISTERING) { __skb_unlink(skb, &sd->input_pkt_queue); -@@ -5975,7 +5975,7 @@ static void flush_backlog(struct work_st +@@ -5988,7 +5988,7 @@ static void flush_backlog(struct work_st input_queue_head_incr(sd); } } @@ -127,7 +127,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> skb_queue_walk_safe(&sd->process_queue, skb, tmp) { if (skb->dev->reg_state == NETREG_UNREGISTERING) { -@@ -5993,14 +5993,14 @@ static bool flush_required(int cpu) +@@ -6006,14 +6006,14 @@ static bool flush_required(int cpu) struct softnet_data *sd = &per_cpu(softnet_data, cpu); bool do_flush; @@ -144,7 +144,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> return do_flush; #endif -@@ -6115,7 +6115,7 @@ static int process_backlog(struct napi_s +@@ -6128,7 +6128,7 @@ static int process_backlog(struct napi_s } @@ -153,7 +153,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> if (skb_queue_empty(&sd->input_pkt_queue)) { /* * Inline a custom version of __napi_complete(). -@@ -6131,7 +6131,7 @@ static int process_backlog(struct napi_s +@@ -6144,7 +6144,7 @@ static int process_backlog(struct napi_s skb_queue_splice_tail_init(&sd->input_pkt_queue, &sd->process_queue); } diff --git a/target/linux/generic/backport-6.6/611-02-v6.11-net-Make-USO-depend-on-CSUM-offload.patch b/target/linux/generic/backport-6.6/611-02-v6.11-net-Make-USO-depend-on-CSUM-offload.patch index 2d3f9b1deb..c556a071ac 100644 --- a/target/linux/generic/backport-6.6/611-02-v6.11-net-Make-USO-depend-on-CSUM-offload.patch +++ b/target/linux/generic/backport-6.6/611-02-v6.11-net-Make-USO-depend-on-CSUM-offload.patch @@ -20,7 +20,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -9821,6 +9821,15 @@ static void netdev_sync_lower_features(s +@@ -9834,6 +9834,15 @@ static void netdev_sync_lower_features(s } } @@ -36,7 +36,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> static netdev_features_t netdev_fix_features(struct net_device *dev, netdev_features_t features) { -@@ -9902,15 +9911,9 @@ static netdev_features_t netdev_fix_feat +@@ -9915,15 +9924,9 @@ static netdev_features_t netdev_fix_feat features &= ~NETIF_F_LRO; } @@ -55,7 +55,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> } if ((features & NETIF_F_HW_TLS_RX) && !(features & NETIF_F_RXCSUM)) { -@@ -9918,6 +9921,11 @@ static netdev_features_t netdev_fix_feat +@@ -9931,6 +9934,11 @@ static netdev_features_t netdev_fix_feat features &= ~NETIF_F_HW_TLS_RX; } diff --git a/target/linux/generic/backport-6.6/612-v6.9-net-get-stats64-if-device-if-driver-is-configured.patch b/target/linux/generic/backport-6.6/612-v6.9-net-get-stats64-if-device-if-driver-is-configured.patch index 753253f220..cd569627c3 100644 --- a/target/linux/generic/backport-6.6/612-v6.9-net-get-stats64-if-device-if-driver-is-configured.patch +++ b/target/linux/generic/backport-6.6/612-v6.9-net-get-stats64-if-device-if-driver-is-configured.patch @@ -18,7 +18,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -10728,6 +10728,8 @@ struct rtnl_link_stats64 *dev_get_stats( +@@ -10741,6 +10741,8 @@ struct rtnl_link_stats64 *dev_get_stats( ops->ndo_get_stats64(dev, storage); } else if (ops->ndo_get_stats) { netdev_stats_to_stats64(storage, ops->ndo_get_stats(dev)); diff --git a/target/linux/generic/backport-6.6/700-v6.10-net-create-a-dummy-net_device-allocator.patch b/target/linux/generic/backport-6.6/700-v6.10-net-create-a-dummy-net_device-allocator.patch index a9954193a4..9c89d1ddb1 100644 --- a/target/linux/generic/backport-6.6/700-v6.10-net-create-a-dummy-net_device-allocator.patch +++ b/target/linux/generic/backport-6.6/700-v6.10-net-create-a-dummy-net_device-allocator.patch @@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> unsigned char name_assign_type, --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -10415,25 +10415,12 @@ err_free_name: +@@ -10428,25 +10428,12 @@ err_free_name: } EXPORT_SYMBOL(register_netdevice); @@ -79,7 +79,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* make sure we BUG if trying to hit standard * register/unregister code path */ -@@ -10453,12 +10440,32 @@ int init_dummy_netdev(struct net_device +@@ -10466,12 +10453,32 @@ int init_dummy_netdev(struct net_device * because users of this 'device' dont need to change * its refcount. */ @@ -113,7 +113,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /** * register_netdev - register a network device * @dev: device to register -@@ -11052,6 +11059,19 @@ void free_netdev(struct net_device *dev) +@@ -11065,6 +11072,19 @@ void free_netdev(struct net_device *dev) EXPORT_SYMBOL(free_netdev); /** diff --git a/target/linux/generic/backport-6.6/704-v6.12-ipv6-Add-ipv6_addr_-cpu_to_be32-be32_to_cpu-helpers.patch b/target/linux/generic/backport-6.6/704-v6.12-ipv6-Add-ipv6_addr_-cpu_to_be32-be32_to_cpu-helpers.patch index 2f4eec6953..938979e500 100644 --- a/target/linux/generic/backport-6.6/704-v6.12-ipv6-Add-ipv6_addr_-cpu_to_be32-be32_to_cpu-helpers.patch +++ b/target/linux/generic/backport-6.6/704-v6.12-ipv6-Add-ipv6_addr_-cpu_to_be32-be32_to_cpu-helpers.patch @@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/include/net/ipv6.h +++ b/include/net/ipv6.h -@@ -1382,4 +1382,16 @@ static inline void ip6_sock_set_recvpkti +@@ -1385,4 +1385,16 @@ static inline void ip6_sock_set_recvpkti release_sock(sk); } diff --git a/target/linux/generic/backport-6.6/770-v6.7-net-introduce-napi_is_scheduled-helper.patch b/target/linux/generic/backport-6.6/770-v6.7-net-introduce-napi_is_scheduled-helper.patch index 954fc2b097..0378f02ced 100644 --- a/target/linux/generic/backport-6.6/770-v6.7-net-introduce-napi_is_scheduled-helper.patch +++ b/target/linux/generic/backport-6.6/770-v6.7-net-introduce-napi_is_scheduled-helper.patch @@ -85,7 +85,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> /** --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -6668,7 +6668,7 @@ static int __napi_poll(struct napi_struc +@@ -6681,7 +6681,7 @@ static int __napi_poll(struct napi_struc * accidentally calling ->poll() when NAPI is not scheduled. */ work = 0; diff --git a/target/linux/generic/backport-6.6/795-v6.7-16-r8152-use-napi_gro_frags.patch b/target/linux/generic/backport-6.6/795-v6.7-16-r8152-use-napi_gro_frags.patch index 73adadc435..c2bd30a191 100644 --- a/target/linux/generic/backport-6.6/795-v6.7-16-r8152-use-napi_gro_frags.patch +++ b/target/linux/generic/backport-6.6/795-v6.7-16-r8152-use-napi_gro_frags.patch @@ -15,7 +15,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c -@@ -2585,8 +2585,9 @@ static int rx_bottom(struct r8152 *tp, i +@@ -2587,8 +2587,9 @@ static int rx_bottom(struct r8152 *tp, i while (urb->actual_length > len_used) { struct net_device *netdev = tp->netdev; struct net_device_stats *stats = &netdev->stats; @@ -26,7 +26,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> WARN_ON_ONCE(skb_queue_len(&tp->rx_queue) >= 1000); -@@ -2599,45 +2600,77 @@ static int rx_bottom(struct r8152 *tp, i +@@ -2601,45 +2602,77 @@ static int rx_bottom(struct r8152 *tp, i break; pkt_len -= ETH_FCS_LEN; diff --git a/target/linux/generic/backport-6.6/816-v6.7-0004-Revert-nvmem-add-new-config-option.patch b/target/linux/generic/backport-6.6/816-v6.7-0004-Revert-nvmem-add-new-config-option.patch index 4f8d837ef1..dc4fbe6bfb 100644 --- a/target/linux/generic/backport-6.6/816-v6.7-0004-Revert-nvmem-add-new-config-option.patch +++ b/target/linux/generic/backport-6.6/816-v6.7-0004-Revert-nvmem-add-new-config-option.patch @@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> mtd->nvmem = nvmem_register(&config); --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c -@@ -932,7 +932,7 @@ struct nvmem_device *nvmem_register(cons +@@ -933,7 +933,7 @@ struct nvmem_device *nvmem_register(cons nvmem->nkeepout = config->nkeepout; if (config->of_node) nvmem->dev.of_node = config->of_node; diff --git a/target/linux/generic/backport-6.6/819-v6.8-0001-nvmem-Move-of_nvmem_layout_get_container-in-another-.patch b/target/linux/generic/backport-6.6/819-v6.8-0001-nvmem-Move-of_nvmem_layout_get_container-in-another-.patch index f80e8756b1..5ac18215bf 100644 --- a/target/linux/generic/backport-6.6/819-v6.8-0001-nvmem-Move-of_nvmem_layout_get_container-in-another-.patch +++ b/target/linux/generic/backport-6.6/819-v6.8-0001-nvmem-Move-of_nvmem_layout_get_container-in-another-.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c -@@ -837,14 +837,6 @@ static int nvmem_add_cells_from_layout(s +@@ -838,14 +838,6 @@ static int nvmem_add_cells_from_layout(s } #if IS_ENABLED(CONFIG_OF) diff --git a/target/linux/generic/backport-6.6/819-v6.8-0005-nvmem-core-Rework-layouts-to-become-regular-devices.patch b/target/linux/generic/backport-6.6/819-v6.8-0005-nvmem-core-Rework-layouts-to-become-regular-devices.patch index 1747587c7c..6286f6b01c 100644 --- a/target/linux/generic/backport-6.6/819-v6.8-0005-nvmem-core-Rework-layouts-to-become-regular-devices.patch +++ b/target/linux/generic/backport-6.6/819-v6.8-0005-nvmem-core-Rework-layouts-to-become-regular-devices.patch @@ -84,7 +84,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> static int __nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset, void *val, size_t bytes) { -@@ -753,97 +750,22 @@ static int nvmem_add_cells_from_fixed_la +@@ -754,97 +751,22 @@ static int nvmem_add_cells_from_fixed_la return err; } @@ -189,7 +189,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem, struct nvmem_layout *layout) { -@@ -851,7 +773,7 @@ const void *nvmem_layout_get_match_data( +@@ -852,7 +774,7 @@ const void *nvmem_layout_get_match_data( const struct of_device_id *match; layout_np = of_nvmem_layout_get_container(nvmem); @@ -198,7 +198,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> return match ? match->data : NULL; } -@@ -963,19 +885,6 @@ struct nvmem_device *nvmem_register(cons +@@ -964,19 +886,6 @@ struct nvmem_device *nvmem_register(cons goto err_put_device; } @@ -218,7 +218,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> if (config->cells) { rval = nvmem_add_cells(nvmem, config->cells, config->ncells); if (rval) -@@ -996,24 +905,24 @@ struct nvmem_device *nvmem_register(cons +@@ -997,24 +906,24 @@ struct nvmem_device *nvmem_register(cons if (rval) goto err_remove_cells; @@ -249,7 +249,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> if (config->compat) nvmem_sysfs_remove_compat(nvmem, config); err_put_device: -@@ -1035,7 +944,7 @@ static void nvmem_device_release(struct +@@ -1036,7 +945,7 @@ static void nvmem_device_release(struct device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); nvmem_device_remove_all_cells(nvmem); @@ -258,7 +258,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> device_unregister(&nvmem->dev); } -@@ -1337,6 +1246,12 @@ nvmem_cell_get_from_lookup(struct device +@@ -1338,6 +1247,12 @@ nvmem_cell_get_from_lookup(struct device return cell; } @@ -271,7 +271,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> #if IS_ENABLED(CONFIG_OF) static struct nvmem_cell_entry * nvmem_find_cell_entry_by_node(struct nvmem_device *nvmem, struct device_node *np) -@@ -1355,6 +1270,18 @@ nvmem_find_cell_entry_by_node(struct nvm +@@ -1356,6 +1271,18 @@ nvmem_find_cell_entry_by_node(struct nvm return cell; } @@ -290,7 +290,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> /** * of_nvmem_cell_get() - Get a nvmem cell from given device node and cell id * -@@ -1417,16 +1344,29 @@ struct nvmem_cell *of_nvmem_cell_get(str +@@ -1418,16 +1345,29 @@ struct nvmem_cell *of_nvmem_cell_get(str return ERR_CAST(nvmem); } @@ -322,7 +322,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> return cell; } -@@ -1540,6 +1480,7 @@ void nvmem_cell_put(struct nvmem_cell *c +@@ -1541,6 +1481,7 @@ void nvmem_cell_put(struct nvmem_cell *c kfree(cell); __nvmem_device_put(nvmem); @@ -330,7 +330,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> } EXPORT_SYMBOL_GPL(nvmem_cell_put); -@@ -2132,11 +2073,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_size); +@@ -2133,11 +2074,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_size); static int __init nvmem_init(void) { diff --git a/target/linux/generic/backport-6.6/819-v6.8-0006-nvmem-core-Expose-cells-through-sysfs.patch b/target/linux/generic/backport-6.6/819-v6.8-0006-nvmem-core-Expose-cells-through-sysfs.patch index 478efdba05..45eb390cc5 100644 --- a/target/linux/generic/backport-6.6/819-v6.8-0006-nvmem-core-Expose-cells-through-sysfs.patch +++ b/target/linux/generic/backport-6.6/819-v6.8-0006-nvmem-core-Expose-cells-through-sysfs.patch @@ -180,7 +180,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> #else /* CONFIG_NVMEM_SYSFS */ static int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem, -@@ -752,11 +861,25 @@ static int nvmem_add_cells_from_fixed_la +@@ -753,11 +862,25 @@ static int nvmem_add_cells_from_fixed_la int nvmem_layout_register(struct nvmem_layout *layout) { @@ -207,7 +207,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> } EXPORT_SYMBOL_GPL(nvmem_layout_register); -@@ -915,10 +1038,20 @@ struct nvmem_device *nvmem_register(cons +@@ -916,10 +1039,20 @@ struct nvmem_device *nvmem_register(cons if (rval) goto err_remove_dev; diff --git a/target/linux/generic/backport-6.6/819-v6.8-0008-nvmem-layouts-refactor-.add_cells-callback-arguments.patch b/target/linux/generic/backport-6.6/819-v6.8-0008-nvmem-layouts-refactor-.add_cells-callback-arguments.patch index 536d10edfd..2df42183bc 100644 --- a/target/linux/generic/backport-6.6/819-v6.8-0008-nvmem-layouts-refactor-.add_cells-callback-arguments.patch +++ b/target/linux/generic/backport-6.6/819-v6.8-0008-nvmem-layouts-refactor-.add_cells-callback-arguments.patch @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c -@@ -867,7 +867,7 @@ int nvmem_layout_register(struct nvmem_l +@@ -868,7 +868,7 @@ int nvmem_layout_register(struct nvmem_l return -EINVAL; /* Populate the cells */ diff --git a/target/linux/generic/backport-6.6/819-v6.8-0009-nvmem-drop-nvmem_layout_get_match_data.patch b/target/linux/generic/backport-6.6/819-v6.8-0009-nvmem-drop-nvmem_layout_get_match_data.patch index b55696e424..2a7909c571 100644 --- a/target/linux/generic/backport-6.6/819-v6.8-0009-nvmem-drop-nvmem_layout_get_match_data.patch +++ b/target/linux/generic/backport-6.6/819-v6.8-0009-nvmem-drop-nvmem_layout_get_match_data.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c -@@ -889,19 +889,6 @@ void nvmem_layout_unregister(struct nvme +@@ -890,19 +890,6 @@ void nvmem_layout_unregister(struct nvme } EXPORT_SYMBOL_GPL(nvmem_layout_unregister); diff --git a/target/linux/generic/backport-6.6/900-v6.11-net-free_netdev-exit-earlier-if-dummy.patch b/target/linux/generic/backport-6.6/900-v6.11-net-free_netdev-exit-earlier-if-dummy.patch index 17d4a909b1..15bcd688bc 100644 --- a/target/linux/generic/backport-6.6/900-v6.11-net-free_netdev-exit-earlier-if-dummy.patch +++ b/target/linux/generic/backport-6.6/900-v6.11-net-free_netdev-exit-earlier-if-dummy.patch @@ -23,7 +23,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -11045,7 +11045,8 @@ void free_netdev(struct net_device *dev) +@@ -11058,7 +11058,8 @@ void free_netdev(struct net_device *dev) dev->xdp_bulkq = NULL; /* Compatibility with error handling in drivers */ diff --git a/target/linux/generic/config-6.6 b/target/linux/generic/config-6.6 index e31cca45cc..7fd27a80cd 100644 --- a/target/linux/generic/config-6.6 +++ b/target/linux/generic/config-6.6 @@ -3447,12 +3447,14 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_SL28CPLD is not set # CONFIG_MFD_SM501 is not set # CONFIG_MFD_SMPRO is not set +# CONFIG_MFD_SPACEMIT_P1 is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_STPMIC1 is not set # CONFIG_MFD_SY7636A is not set # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set +# CONFIG_MFD_TN48M_CPLD is not set # CONFIG_MFD_TIMBERDALE is not set # CONFIG_MFD_TI_AM335X_TSCADC is not set # CONFIG_MFD_TI_LMU is not set diff --git a/target/linux/generic/hack-6.6/200-tools_portability.patch b/target/linux/generic/hack-6.6/200-tools_portability.patch index f016e641c6..b8fd3b73af 100644 --- a/target/linux/generic/hack-6.6/200-tools_portability.patch +++ b/target/linux/generic/hack-6.6/200-tools_portability.patch @@ -203,7 +203,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> +#endif --- a/tools/objtool/Makefile +++ b/tools/objtool/Makefile -@@ -39,6 +39,8 @@ OBJTOOL_LDFLAGS := $(LIBELF_LIBS) $(LIBS +@@ -41,6 +41,8 @@ OBJTOOL_LDFLAGS := $(LIBELF_LIBS) $(LIBS elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(HOSTCC) $(OBJTOOL_CFLAGS) -x c -E - | grep elf_getshdr) OBJTOOL_CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED) diff --git a/target/linux/generic/hack-6.6/204-module_strip.patch b/target/linux/generic/hack-6.6/204-module_strip.patch index 9402ecb147..317daa191b 100644 --- a/target/linux/generic/hack-6.6/204-module_strip.patch +++ b/target/linux/generic/hack-6.6/204-module_strip.patch @@ -141,7 +141,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (err) --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -1666,7 +1666,9 @@ static void read_symbols(const char *mod +@@ -1670,7 +1670,9 @@ static void read_symbols(const char *mod symname = remove_dot(info.strtab + sym->st_name); handle_symbol(mod, &info, sym, symname); @@ -151,7 +151,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } check_sec_ref(mod, &info); -@@ -1839,8 +1841,10 @@ static void add_header(struct buffer *b, +@@ -1843,8 +1845,10 @@ static void add_header(struct buffer *b, buf_printf(b, "BUILD_SALT;\n"); buf_printf(b, "BUILD_LTO_INFO;\n"); buf_printf(b, "\n"); @@ -162,7 +162,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> buf_printf(b, "\n"); buf_printf(b, "__visible struct module __this_module\n"); buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n"); -@@ -1854,8 +1858,10 @@ static void add_header(struct buffer *b, +@@ -1858,8 +1862,10 @@ static void add_header(struct buffer *b, buf_printf(b, "\t.arch = MODULE_ARCH_INIT,\n"); buf_printf(b, "};\n"); @@ -173,7 +173,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> buf_printf(b, "\n" -@@ -1863,8 +1869,10 @@ static void add_header(struct buffer *b, +@@ -1867,8 +1873,10 @@ static void add_header(struct buffer *b, "MODULE_INFO(retpoline, \"Y\");\n" "#endif\n"); @@ -184,7 +184,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (strstarts(mod->name, "tools/testing")) buf_printf(b, "\nMODULE_INFO(test, \"Y\");\n"); -@@ -1974,11 +1982,13 @@ static void add_depends(struct buffer *b +@@ -1978,11 +1986,13 @@ static void add_depends(struct buffer *b static void add_srcversion(struct buffer *b, struct module *mod) { @@ -198,7 +198,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } static void write_buf(struct buffer *b, const char *fname) -@@ -2061,7 +2071,9 @@ static void write_mod_c_file(struct modu +@@ -2065,7 +2075,9 @@ static void write_mod_c_file(struct modu add_exported_symbols(&buf, mod); add_versions(&buf, mod); add_depends(&buf, mod); diff --git a/target/linux/generic/hack-6.6/721-net-add-packet-mangeling.patch b/target/linux/generic/hack-6.6/721-net-add-packet-mangeling.patch index 41ab852aa1..b1944ce1d1 100644 --- a/target/linux/generic/hack-6.6/721-net-add-packet-mangeling.patch +++ b/target/linux/generic/hack-6.6/721-net-add-packet-mangeling.patch @@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -3121,6 +3121,10 @@ static inline int pskb_trim(struct sk_bu +@@ -3153,6 +3153,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -3286,16 +3290,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -3318,16 +3322,6 @@ static inline struct sk_buff *dev_alloc_ } diff --git a/target/linux/generic/hack-6.6/760-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/generic/hack-6.6/760-net-usb-r8152-add-LED-configuration-from-OF.patch index 680440b310..4ef76be0e5 100644 --- a/target/linux/generic/hack-6.6/760-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/generic/hack-6.6/760-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> #include <linux/crc32.h> #include <linux/if_vlan.h> #include <linux/uaccess.h> -@@ -7045,6 +7046,22 @@ static void rtl_tally_reset(struct r8152 +@@ -7047,6 +7048,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -7086,6 +7103,8 @@ static void r8152b_init(struct r8152 *tp +@@ -7088,6 +7105,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> } static void r8153_init(struct r8152 *tp) -@@ -7226,6 +7245,8 @@ static void r8153_init(struct r8152 *tp) +@@ -7228,6 +7247,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> } static void r8153b_init(struct r8152 *tp) -@@ -7308,6 +7329,8 @@ static void r8153b_init(struct r8152 *tp +@@ -7310,6 +7331,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ diff --git a/target/linux/generic/pending-6.6/655-increase_skb_pad.patch b/target/linux/generic/pending-6.6/655-increase_skb_pad.patch index 8fbc915881..2c4399bb4d 100644 --- a/target/linux/generic/pending-6.6/655-increase_skb_pad.patch +++ b/target/linux/generic/pending-6.6/655-increase_skb_pad.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -3088,7 +3088,7 @@ static inline int pskb_network_may_pull( +@@ -3120,7 +3120,7 @@ static inline int pskb_network_may_pull( * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD diff --git a/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch b/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch index 418a903846..642afec742 100644 --- a/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch +++ b/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -8527,7 +8527,7 @@ static int nft_register_flowtable_net_ho +@@ -8528,7 +8528,7 @@ static int nft_register_flowtable_net_ho err = flowtable->data.type->setup(&flowtable->data, hook->ops.dev, FLOW_BLOCK_BIND); diff --git a/target/linux/generic/pending-6.6/834-ledtrig-libata.patch b/target/linux/generic/pending-6.6/834-ledtrig-libata.patch index 24d5f5873c..3ff16fff4b 100644 --- a/target/linux/generic/pending-6.6/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-6.6/834-ledtrig-libata.patch @@ -63,7 +63,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @qc: Metadata associated with the taskfile to build -@@ -4801,6 +4812,9 @@ void __ata_qc_complete(struct ata_queued +@@ -4819,6 +4830,9 @@ void __ata_qc_complete(struct ata_queued link->active_tag = ATA_TAG_POISON; ap->nr_active_links--; } @@ -73,7 +73,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> /* clear exclusive status */ if (unlikely(qc->flags & ATA_QCFLAG_CLEAR_EXCL && -@@ -5532,6 +5546,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -5556,6 +5570,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -83,7 +83,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> ata_sff_port_init(ap); return ap; -@@ -5545,6 +5562,12 @@ void ata_port_free(struct ata_port *ap) +@@ -5569,6 +5586,12 @@ void ata_port_free(struct ata_port *ap) kfree(ap->pmp_link); kfree(ap->slave_link); kfree(ap->ncq_sense_buf); @@ -96,7 +96,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> kfree(ap); } EXPORT_SYMBOL_GPL(ata_port_free); -@@ -5967,7 +5990,23 @@ int ata_host_register(struct ata_host *h +@@ -5991,7 +6014,23 @@ int ata_host_register(struct ata_host *h host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } 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 5b9bfa589b..fb37368fd0 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 @@ -93,7 +93,7 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> +#endif --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -4724,6 +4724,9 @@ enum skb_ext_id { +@@ -4756,6 +4756,9 @@ enum skb_ext_id { #if IS_ENABLED(CONFIG_MCTP_FLOWS) SKB_EXT_MCTP, #endif diff --git a/target/linux/ixp4xx/patches-6.6/0002-net-ixp4xx_eth-Support-changing-the-MTU.patch b/target/linux/ixp4xx/patches-6.6/0002-net-ixp4xx_eth-Support-changing-the-MTU.patch index 4abc6cdbe4..e99c6b1104 100644 --- a/target/linux/ixp4xx/patches-6.6/0002-net-ixp4xx_eth-Support-changing-the-MTU.patch +++ b/target/linux/ixp4xx/patches-6.6/0002-net-ixp4xx_eth-Support-changing-the-MTU.patch @@ -48,7 +48,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> #define RX_BUFF_SIZE ALIGN((NET_IP_ALIGN) + MAX_MRU, 4) #define NAPI_WEIGHT 16 -@@ -1182,6 +1191,54 @@ static void destroy_queues(struct port * +@@ -1174,6 +1183,54 @@ static void destroy_queues(struct port * } } @@ -103,7 +103,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> static int eth_open(struct net_device *dev) { struct port *port = netdev_priv(dev); -@@ -1232,6 +1289,8 @@ static int eth_open(struct net_device *d +@@ -1224,6 +1281,8 @@ static int eth_open(struct net_device *d if (npe_send_recv_message(port->npe, &msg, "ETH_SET_FIREWALL_MODE")) return -EIO; @@ -112,15 +112,15 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> if ((err = request_queues(port)) != 0) return err; -@@ -1374,6 +1433,7 @@ static int eth_close(struct net_device * +@@ -1366,6 +1425,7 @@ static int eth_close(struct net_device * static const struct net_device_ops ixp4xx_netdev_ops = { .ndo_open = eth_open, .ndo_stop = eth_close, + .ndo_change_mtu = ixp4xx_eth_change_mtu, .ndo_start_xmit = eth_xmit, .ndo_set_rx_mode = eth_set_mcast_list, - .ndo_eth_ioctl = eth_ioctl, -@@ -1488,6 +1548,9 @@ static int ixp4xx_eth_probe(struct platf + .ndo_eth_ioctl = phy_do_ioctl_running, +@@ -1482,6 +1542,9 @@ static int ixp4xx_eth_probe(struct platf ndev->dev.dma_mask = dev->dma_mask; ndev->dev.coherent_dma_mask = dev->coherent_dma_mask; diff --git a/target/linux/kirkwood/patches-6.6/202-linksys-find-active-root.patch b/target/linux/kirkwood/patches-6.6/202-linksys-find-active-root.patch index 5029b1791c..872863ff1d 100644 --- a/target/linux/kirkwood/patches-6.6/202-linksys-find-active-root.patch +++ b/target/linux/kirkwood/patches-6.6/202-linksys-find-active-root.patch @@ -22,7 +22,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> const char *partname; struct device_node *pp; int nr_parts, i, ret = 0; -@@ -152,9 +155,15 @@ static int parse_fixed_partitions(struct +@@ -159,9 +162,15 @@ static int parse_fixed_partitions(struct parts[i].size = of_read_number(reg + a_cells, s_cells); parts[i].of_node = pp; @@ -41,7 +41,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> parts[i].name = partname; if (of_get_property(pp, "read-only", &len)) -@@ -271,6 +280,18 @@ static int __init ofpart_parser_init(voi +@@ -283,6 +292,18 @@ static int __init ofpart_parser_init(voi return 0; } diff --git a/target/linux/lantiq/patches-6.6/0101-find_active_root.patch b/target/linux/lantiq/patches-6.6/0101-find_active_root.patch index b5fefbae09..e07e653267 100644 --- a/target/linux/lantiq/patches-6.6/0101-find_active_root.patch +++ b/target/linux/lantiq/patches-6.6/0101-find_active_root.patch @@ -58,9 +58,9 @@ Signed-off-by: Mathias Kresin <openwrt@kresin.me> /* Pull of_node from the master device node */ mtd_node = mtd_get_of_node(master); -@@ -98,6 +132,14 @@ static int parse_fixed_partitions(struct - if (!parts) +@@ -105,6 +139,14 @@ static int parse_fixed_partitions(struct return -ENOMEM; + } + part_nodes = kcalloc(nr_parts, sizeof(*part_nodes), GFP_KERNEL); + if (!part_nodes) { @@ -73,7 +73,7 @@ Signed-off-by: Mathias Kresin <openwrt@kresin.me> i = 0; for_each_child_of_node(ofpart_node, pp) { const __be32 *reg; -@@ -166,6 +208,11 @@ static int parse_fixed_partitions(struct +@@ -173,6 +215,11 @@ static int parse_fixed_partitions(struct if (of_property_read_bool(pp, "slc-mode")) parts[i].add_flags |= MTD_SLC_ON_MLC_EMULATION; @@ -85,9 +85,9 @@ Signed-off-by: Mathias Kresin <openwrt@kresin.me> i++; } -@@ -175,6 +222,11 @@ static int parse_fixed_partitions(struct - if (quirks && quirks->post_parse) - quirks->post_parse(master, parts, nr_parts); +@@ -185,6 +232,11 @@ static int parse_fixed_partitions(struct + if (dedicated) + of_node_put(ofpart_node); + if (proot_id) + brnboot_set_active_root_part(parts, part_nodes, nr_parts, proot_id); @@ -97,8 +97,8 @@ Signed-off-by: Mathias Kresin <openwrt@kresin.me> *pparts = parts; return nr_parts; -@@ -185,6 +237,7 @@ ofpart_fail: - ofpart_none: +@@ -197,6 +249,7 @@ ofpart_none: + of_node_put(ofpart_node); of_node_put(pp); kfree(parts); + kfree(part_nodes); diff --git a/target/linux/mediatek/patches-6.6/433-drivers-spi-mem-Add-spi-calibration-hook.patch b/target/linux/mediatek/patches-6.6/433-drivers-spi-mem-Add-spi-calibration-hook.patch index c0b51d84ad..c78a98cbb9 100644 --- a/target/linux/mediatek/patches-6.6/433-drivers-spi-mem-Add-spi-calibration-hook.patch +++ b/target/linux/mediatek/patches-6.6/433-drivers-spi-mem-Add-spi-calibration-hook.patch @@ -11,7 +11,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com> --- a/drivers/spi/spi-mem.c +++ b/drivers/spi/spi-mem.c -@@ -439,6 +439,14 @@ int spi_mem_exec_op(struct spi_mem *mem, +@@ -450,6 +450,14 @@ int spi_mem_exec_op(struct spi_mem *mem, } EXPORT_SYMBOL_GPL(spi_mem_exec_op); diff --git a/target/linux/mediatek/patches-6.6/601-PCI-mediatek-Assert-PERST-for-100ms-for-power-and-cl.patch b/target/linux/mediatek/patches-6.6/601-PCI-mediatek-Assert-PERST-for-100ms-for-power-and-cl.patch index 983fde707f..11e98314f8 100644 --- a/target/linux/mediatek/patches-6.6/601-PCI-mediatek-Assert-PERST-for-100ms-for-power-and-cl.patch +++ b/target/linux/mediatek/patches-6.6/601-PCI-mediatek-Assert-PERST-for-100ms-for-power-and-cl.patch @@ -18,7 +18,7 @@ Acked-by: Pali Rohár <pali@kernel.org> --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c -@@ -708,6 +708,13 @@ static int mtk_pcie_startup_port_v2(stru +@@ -710,6 +710,13 @@ static int mtk_pcie_startup_port_v2(stru */ msleep(100); diff --git a/target/linux/mediatek/patches-6.6/610-pcie-mediatek-fix-clearing-interrupt-status.patch b/target/linux/mediatek/patches-6.6/610-pcie-mediatek-fix-clearing-interrupt-status.patch index 2a49b2275c..0d9f273167 100644 --- a/target/linux/mediatek/patches-6.6/610-pcie-mediatek-fix-clearing-interrupt-status.patch +++ b/target/linux/mediatek/patches-6.6/610-pcie-mediatek-fix-clearing-interrupt-status.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c -@@ -607,9 +607,9 @@ static void mtk_pcie_intr_handler(struct +@@ -609,9 +609,9 @@ static void mtk_pcie_intr_handler(struct if (status & INTX_MASK) { for_each_set_bit_from(bit, &status, PCI_NUM_INTX + INTX_SHIFT) { /* Clear the INTx */ diff --git a/target/linux/mediatek/patches-6.6/710-pci-pcie-mediatek-add-support-for-coherent-DMA.patch b/target/linux/mediatek/patches-6.6/710-pci-pcie-mediatek-add-support-for-coherent-DMA.patch index 917a458d30..d77f1e9564 100644 --- a/target/linux/mediatek/patches-6.6/710-pci-pcie-mediatek-add-support-for-coherent-DMA.patch +++ b/target/linux/mediatek/patches-6.6/710-pci-pcie-mediatek-add-support-for-coherent-DMA.patch @@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> struct mtk_pcie_port; /** -@@ -1060,6 +1066,27 @@ static int mtk_pcie_setup(struct mtk_pci +@@ -1062,6 +1068,27 @@ static int mtk_pcie_setup(struct mtk_pci struct mtk_pcie_port *port, *tmp; int err, slot; diff --git a/target/linux/mvebu/patches-6.6/400-find_active_root.patch b/target/linux/mvebu/patches-6.6/400-find_active_root.patch index 90164adcd4..039f401905 100644 --- a/target/linux/mvebu/patches-6.6/400-find_active_root.patch +++ b/target/linux/mvebu/patches-6.6/400-find_active_root.patch @@ -22,7 +22,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> struct device_node *pp; int nr_parts, i, ret = 0; bool dedicated = true; -@@ -152,9 +155,13 @@ static int parse_fixed_partitions(struct +@@ -159,9 +162,13 @@ static int parse_fixed_partitions(struct parts[i].size = of_read_number(reg + a_cells, s_cells); parts[i].of_node = pp; @@ -39,7 +39,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> parts[i].name = partname; if (of_get_property(pp, "read-only", &len)) -@@ -271,6 +278,18 @@ static int __init ofpart_parser_init(voi +@@ -283,6 +290,18 @@ static int __init ofpart_parser_init(voi return 0; } diff --git a/target/linux/mvebu/patches-6.6/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch b/target/linux/mvebu/patches-6.6/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch index 2aac515eb1..a255567c6b 100644 --- a/target/linux/mvebu/patches-6.6/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch +++ b/target/linux/mvebu/patches-6.6/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch @@ -26,7 +26,7 @@ Cc: Robert Marko <robert.marko@sartura.hr> --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig -@@ -2274,6 +2274,15 @@ config SGI_MFD_IOC3 +@@ -2298,6 +2298,15 @@ config SGI_MFD_IOC3 If you have an SGI Origin, Octane, or a PCI IOC3 card, then say Y. Otherwise say N. diff --git a/target/linux/pistachio/patches-6.6/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-6.6/401-mtd-nor-support-mtd-name-from-device-tree.patch index 3e2a7abff5..ea1d9e2580 100644 --- a/target/linux/pistachio/patches-6.6/401-mtd-nor-support-mtd-name-from-device-tree.patch +++ b/target/linux/pistachio/patches-6.6/401-mtd-nor-support-mtd-name-from-device-tree.patch @@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com> --- a/drivers/spi/spi-mem.c +++ b/drivers/spi/spi-mem.c -@@ -883,7 +883,9 @@ static int spi_mem_probe(struct spi_devi +@@ -903,7 +903,9 @@ static int spi_mem_probe(struct spi_devi { struct spi_mem_driver *memdrv = to_spi_mem_drv(spi->dev.driver); struct spi_controller *ctlr = spi->controller; @@ -20,7 +20,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com> mem = devm_kzalloc(&spi->dev, sizeof(*mem), GFP_KERNEL); if (!mem) -@@ -891,10 +893,15 @@ static int spi_mem_probe(struct spi_devi +@@ -911,10 +913,15 @@ static int spi_mem_probe(struct spi_devi mem->spi = spi; diff --git a/target/linux/qualcommax/patches-6.6/0025-v6.7-cpufreq-qcom-nvmem-add-support-for-IPQ6018.patch b/target/linux/qualcommax/patches-6.6/0025-v6.7-cpufreq-qcom-nvmem-add-support-for-IPQ6018.patch index a470d3f817..31805bf009 100644 --- a/target/linux/qualcommax/patches-6.6/0025-v6.7-cpufreq-qcom-nvmem-add-support-for-IPQ6018.patch +++ b/target/linux/qualcommax/patches-6.6/0025-v6.7-cpufreq-qcom-nvmem-add-support-for-IPQ6018.patch @@ -25,7 +25,7 @@ Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c -@@ -179,6 +179,7 @@ static const struct of_device_id blockli +@@ -182,6 +182,7 @@ static const struct of_device_id blockli { .compatible = "ti,am625", }, { .compatible = "ti,am62a7", }, diff --git a/target/linux/qualcommax/patches-6.6/0026-v6.7-cpufreq-qcom-nvmem-add-support-for-IPQ8074.patch b/target/linux/qualcommax/patches-6.6/0026-v6.7-cpufreq-qcom-nvmem-add-support-for-IPQ8074.patch index 382467a8d1..a92f6470bd 100644 --- a/target/linux/qualcommax/patches-6.6/0026-v6.7-cpufreq-qcom-nvmem-add-support-for-IPQ8074.patch +++ b/target/linux/qualcommax/patches-6.6/0026-v6.7-cpufreq-qcom-nvmem-add-support-for-IPQ8074.patch @@ -25,7 +25,7 @@ Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c -@@ -181,6 +181,7 @@ static const struct of_device_id blockli +@@ -184,6 +184,7 @@ static const struct of_device_id blockli { .compatible = "qcom,ipq6018", }, { .compatible = "qcom,ipq8064", }, diff --git a/target/linux/ramips/patches-6.6/001-v6.13-clocksource-drivers-ralink-Add-Ralink-System-Tick-Co.patch b/target/linux/ramips/patches-6.6/001-v6.13-clocksource-drivers-ralink-Add-Ralink-System-Tick-Co.patch index de3438427d..f24088cbb5 100644 --- a/target/linux/ramips/patches-6.6/001-v6.13-clocksource-drivers-ralink-Add-Ralink-System-Tick-Co.patch +++ b/target/linux/ramips/patches-6.6/001-v6.13-clocksource-drivers-ralink-Add-Ralink-System-Tick-Co.patch @@ -208,7 +208,7 @@ Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> -TIMER_OF_DECLARE(systick, "ralink,cevt-systick", ralink_systick_init); --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig -@@ -733,4 +733,13 @@ config GOLDFISH_TIMER +@@ -734,4 +734,13 @@ config GOLDFISH_TIMER help Support for the timer/counter of goldfish-rtc diff --git a/target/linux/ramips/patches-6.6/311-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch b/target/linux/ramips/patches-6.6/311-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch index 3162d669e1..a9d3ca4d7f 100644 --- a/target/linux/ramips/patches-6.6/311-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch +++ b/target/linux/ramips/patches-6.6/311-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch @@ -96,7 +96,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> } --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig -@@ -732,10 +732,15 @@ config GOLDFISH_TIMER +@@ -733,10 +733,15 @@ config GOLDFISH_TIMER depends on RTC_DRV_GOLDFISH help Support for the timer/counter of goldfish-rtc diff --git a/target/linux/ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch index 1a68ba4430..06505f3ea1 100644 --- a/target/linux/ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch +++ b/target/linux/ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch @@ -214,7 +214,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> /* Mark the buffer as done if the EOF marker is set. */ if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) { uvc_dbg(stream->dev, FRAME, "Frame complete (EOF found)\n"); -@@ -1914,6 +2059,8 @@ static int uvc_init_video_isoc(struct uv +@@ -1915,6 +2060,8 @@ static int uvc_init_video_isoc(struct uv if (npackets == 0) return -ENOMEM; diff --git a/target/linux/realtek/patches-6.6/802-mfd-Add-RTL8231-core-device.patch b/target/linux/realtek/patches-6.6/802-mfd-Add-RTL8231-core-device.patch index df4d4aa143..52b55e582b 100644 --- a/target/linux/realtek/patches-6.6/802-mfd-Add-RTL8231-core-device.patch +++ b/target/linux/realtek/patches-6.6/802-mfd-Add-RTL8231-core-device.patch @@ -32,7 +32,7 @@ Signed-off-by: Sander Vanheule <sander@svanheule.net> --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig -@@ -1171,6 +1171,15 @@ config MFD_RDC321X +@@ -1195,6 +1195,15 @@ config MFD_RDC321X southbridge which provides access to GPIOs and Watchdog using the southbridge PCI device configuration space. diff --git a/target/linux/rockchip/patches-6.6/034-v6.7-usb-dwc3-add-optional-PHY-interface-clocks.patch b/target/linux/rockchip/patches-6.6/034-v6.7-usb-dwc3-add-optional-PHY-interface-clocks.patch index 32af6713c5..b159993e86 100644 --- a/target/linux/rockchip/patches-6.6/034-v6.7-usb-dwc3-add-optional-PHY-interface-clocks.patch +++ b/target/linux/rockchip/patches-6.6/034-v6.7-usb-dwc3-add-optional-PHY-interface-clocks.patch @@ -80,7 +80,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> * @reset: reset control * @regs: base address for our registers * @regs_size: address space size -@@ -1175,6 +1177,8 @@ struct dwc3 { +@@ -1177,6 +1179,8 @@ struct dwc3 { struct clk *bus_clk; struct clk *ref_clk; struct clk *susp_clk; diff --git a/target/linux/starfive/patches-6.6/0003-clocksource-Add-JH7110-timer-driver.patch b/target/linux/starfive/patches-6.6/0003-clocksource-Add-JH7110-timer-driver.patch index b4398ef146..0c6ce5c554 100644 --- a/target/linux/starfive/patches-6.6/0003-clocksource-Add-JH7110-timer-driver.patch +++ b/target/linux/starfive/patches-6.6/0003-clocksource-Add-JH7110-timer-driver.patch @@ -15,7 +15,7 @@ Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com> --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig -@@ -642,6 +642,17 @@ config RISCV_TIMER +@@ -643,6 +643,17 @@ config RISCV_TIMER is accessed via both the SBI and the rdcycle instruction. This is required for all RISC-V systems. diff --git a/target/linux/starfive/patches-6.6/0033-PCI-Add-PCIE_RESET_CONFIG_DEVICE_WAIT_MS-waiting-tim.patch b/target/linux/starfive/patches-6.6/0033-PCI-Add-PCIE_RESET_CONFIG_DEVICE_WAIT_MS-waiting-tim.patch index ff08960468..0b3089b2e7 100644 --- a/target/linux/starfive/patches-6.6/0033-PCI-Add-PCIE_RESET_CONFIG_DEVICE_WAIT_MS-waiting-tim.patch +++ b/target/linux/starfive/patches-6.6/0033-PCI-Add-PCIE_RESET_CONFIG_DEVICE_WAIT_MS-waiting-tim.patch @@ -30,9 +30,9 @@ Acked-by: Bjorn Helgaas <bhelgaas@google.com> --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h -@@ -22,6 +22,22 @@ - */ - #define PCIE_PME_TO_L2_TIMEOUT_US 10000 +@@ -47,6 +47,22 @@ + #define PCI_EXP_AER_FLAGS (PCI_EXP_DEVCTL_CERE | PCI_EXP_DEVCTL_NFERE | \ + PCI_EXP_DEVCTL_FERE | PCI_EXP_DEVCTL_URRE) +/* + * As described in PCI base specification r6.0, section 6.6.1 <Conventional diff --git a/target/linux/starfive/patches-6.6/0068-uart-8250-add-reset-operation-in-runtime-PM.patch b/target/linux/starfive/patches-6.6/0068-uart-8250-add-reset-operation-in-runtime-PM.patch index 8f27dba5aa..1612c47dcd 100644 --- a/target/linux/starfive/patches-6.6/0068-uart-8250-add-reset-operation-in-runtime-PM.patch +++ b/target/linux/starfive/patches-6.6/0068-uart-8250-add-reset-operation-in-runtime-PM.patch @@ -21,9 +21,9 @@ Signed-off-by: William Qiu <william.qiu@starfivetech.com> clk_disable_unprepare(data->clk); clk_disable_unprepare(data->pclk); -@@ -762,6 +764,8 @@ static int dw8250_runtime_resume(struct - - clk_prepare_enable(data->clk); +@@ -769,6 +771,8 @@ static int dw8250_runtime_resume(struct + return ret; + } + reset_control_deassert(data->rst); + diff --git a/target/linux/starfive/patches-6.6/1000-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch b/target/linux/starfive/patches-6.6/1000-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch index eec64fb6fe..8372da35c4 100644 --- a/target/linux/starfive/patches-6.6/1000-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch +++ b/target/linux/starfive/patches-6.6/1000-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch @@ -15,7 +15,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk> --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c -@@ -805,6 +805,7 @@ static const struct of_device_id dw8250_ +@@ -812,6 +812,7 @@ static const struct of_device_id dw8250_ { .compatible = "marvell,armada-38x-uart", .data = &dw8250_armada_38x_data }, { .compatible = "renesas,rzn1-uart", .data = &dw8250_renesas_rzn1_data }, { .compatible = "sophgo,sg2044-uart", .data = &dw8250_skip_set_rate_data }, |