diff options
| author | Martin Schiller | 2025-12-08 07:16:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2026-02-07 17:15:49 +0000 |
| commit | b13a7deab2551989b7b04cbc0dc4812767642078 (patch) | |
| tree | 9627ebca909e6c02fd3b21b96d2a3583666a432b | |
| parent | 8166bba3fea58a08505dae1aefbb66a108729000 (diff) | |
| download | openwrt-b13a7deab2551989b7b04cbc0dc4812767642078.tar.gz | |
kernel: bump 5.15 to 5.15.197
Removed because they are upstream:
bcm27xx/patches-5.15/950-0030-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=4475bac8224ce1e43603a94411ab3d781f006326
bcm27xx/patches-5.15/950-0031-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=4475bac8224ce1e43603a94411ab3d781f006326
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Link: https://github.com/openwrt/openwrt/pull/21040
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
42 files changed, 123 insertions, 211 deletions
diff --git a/include/kernel-5.15 b/include/kernel-5.15 index c32d036773..9c8f79fe7b 100644 --- a/include/kernel-5.15 +++ b/include/kernel-5.15 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.15 = .196 -LINUX_KERNEL_HASH-5.15.196 = 83157953598b026fb721c906c60dfdfd8e986f25ecb9910f3504f690e2770e05 +LINUX_VERSION-5.15 = .197 +LINUX_KERNEL_HASH-5.15.197 = fd218df8e2107a4443b6c29fef7f95aad167031e0fbdbc7a858ae8471360668a diff --git a/target/linux/at91/patches-5.15/100-clk-at91-re-factor-clocks-suspend-resume.patch b/target/linux/at91/patches-5.15/100-clk-at91-re-factor-clocks-suspend-resume.patch index 7f8fe0b314..aad826c7a4 100644 --- a/target/linux/at91/patches-5.15/100-clk-at91-re-factor-clocks-suspend-resume.patch +++ b/target/linux/at91/patches-5.15/100-clk-at91-re-factor-clocks-suspend-resume.patch @@ -508,7 +508,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org> }; static struct clk_hw * __init -@@ -539,20 +682,21 @@ static int clk_sama7g5_master_set_parent +@@ -542,20 +685,21 @@ static int clk_sama7g5_master_set_parent return 0; } @@ -534,7 +534,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org> (master->div << MASTER_DIV_SHIFT) | PMC_MCR_CMD | PMC_MCR_ID(master->id)); -@@ -563,6 +707,13 @@ static int clk_sama7g5_master_enable(str +@@ -566,6 +710,13 @@ static int clk_sama7g5_master_enable(str cpu_relax(); spin_unlock_irqrestore(master->lock, flags); @@ -548,7 +548,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org> return 0; } -@@ -620,6 +771,23 @@ static int clk_sama7g5_master_set_rate(s +@@ -623,6 +774,23 @@ static int clk_sama7g5_master_set_rate(s return 0; } @@ -572,7 +572,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org> static const struct clk_ops sama7g5_master_ops = { .enable = clk_sama7g5_master_enable, .disable = clk_sama7g5_master_disable, -@@ -629,6 +797,8 @@ static const struct clk_ops sama7g5_mast +@@ -632,6 +800,8 @@ static const struct clk_ops sama7g5_mast .set_rate = clk_sama7g5_master_set_rate, .get_parent = clk_sama7g5_master_get_parent, .set_parent = clk_sama7g5_master_set_parent, diff --git a/target/linux/at91/patches-5.15/102-clk-at91-clk-master-add-register-definition-for-sama.patch b/target/linux/at91/patches-5.15/102-clk-at91-clk-master-add-register-definition-for-sama.patch index 726d9b33e4..999e08c722 100644 --- a/target/linux/at91/patches-5.15/102-clk-at91-clk-master-add-register-definition-for-sama.patch +++ b/target/linux/at91/patches-5.15/102-clk-at91-clk-master-add-register-definition-for-sama.patch @@ -43,7 +43,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org> #define MASTER_MAX_ID 4 -@@ -687,20 +679,22 @@ static void clk_sama7g5_master_set(struc +@@ -690,20 +682,22 @@ static void clk_sama7g5_master_set(struc { unsigned long flags; unsigned int val, cparent; @@ -74,7 +74,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org> /* Wait here only if parent is being changed. */ while ((cparent != master->parent) && !clk_master_ready(master)) -@@ -725,10 +719,12 @@ static void clk_sama7g5_master_disable(s +@@ -728,10 +722,12 @@ static void clk_sama7g5_master_disable(s spin_lock_irqsave(master->lock, flags); @@ -91,7 +91,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org> spin_unlock_irqrestore(master->lock, flags); } -@@ -741,12 +737,12 @@ static int clk_sama7g5_master_is_enabled +@@ -744,12 +740,12 @@ static int clk_sama7g5_master_is_enabled spin_lock_irqsave(master->lock, flags); @@ -107,7 +107,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org> } static int clk_sama7g5_master_set_rate(struct clk_hw *hw, unsigned long rate, -@@ -842,10 +838,10 @@ at91_clk_sama7g5_register_master(struct +@@ -845,10 +841,10 @@ at91_clk_sama7g5_register_master(struct master->mux_table = mux_table; spin_lock_irqsave(master->lock, flags); diff --git a/target/linux/at91/patches-5.15/103-clk-at91-clk-master-improve-readability-by-using-loc.patch b/target/linux/at91/patches-5.15/103-clk-at91-clk-master-improve-readability-by-using-loc.patch index a5b57a67ad..05f42bb4c0 100644 --- a/target/linux/at91/patches-5.15/103-clk-at91-clk-master-improve-readability-by-using-loc.patch +++ b/target/linux/at91/patches-5.15/103-clk-at91-clk-master-improve-readability-by-using-loc.patch @@ -18,7 +18,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org> --- a/drivers/clk/at91/clk-master.c +++ b/drivers/clk/at91/clk-master.c -@@ -680,6 +680,8 @@ static void clk_sama7g5_master_set(struc +@@ -683,6 +683,8 @@ static void clk_sama7g5_master_set(struc unsigned long flags; unsigned int val, cparent; unsigned int enable = status ? AT91_PMC_MCR_V2_EN : 0; @@ -27,7 +27,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org> spin_lock_irqsave(master->lock, flags); -@@ -689,9 +691,7 @@ static void clk_sama7g5_master_set(struc +@@ -692,9 +694,7 @@ static void clk_sama7g5_master_set(struc regmap_update_bits(master->regmap, AT91_PMC_MCR_V2, enable | AT91_PMC_MCR_V2_CSS | AT91_PMC_MCR_V2_DIV | AT91_PMC_MCR_V2_CMD | AT91_PMC_MCR_V2_ID_MSK, diff --git a/target/linux/bcm27xx/patches-5.15/950-0030-Revert-Bluetooth-Always-request-for-user-confirmatio.patch b/target/linux/bcm27xx/patches-5.15/950-0030-Revert-Bluetooth-Always-request-for-user-confirmatio.patch deleted file mode 100644 index c6b78b64f8..0000000000 --- a/target/linux/bcm27xx/patches-5.15/950-0030-Revert-Bluetooth-Always-request-for-user-confirmatio.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b99d91f044ff9360ac03ce7d27eb6aead6cd2d42 Mon Sep 17 00:00:00 2001 -From: Phil Elwell <phil@raspberrypi.com> -Date: Mon, 1 Mar 2021 09:12:44 +0000 -Subject: [PATCH] Revert "Bluetooth: Always request for user - confirmation for Just Works (LE SC)" - -This reverts commit ffee202a78c2980688bc5d2f7d56480e69a5e0c9. - -The commit "Bluetooth: Always request for user confirmation for Just -Works" prevents BLE devices pairing in (at least) the Raspberry Pi OS -GUI. After reverting it, pairing works again. Although this companion -commit ("... (LE SC)") has not been demonstrated to be problematic, -it follows the same logic and therefore could affect some use cases. - -If another solution to the problem is found then this reversion will -be removed. - -See: https://github.com/raspberrypi/linux/issues/4139 - -Signed-off-by: Phil Elwell <phil@raspberrypi.com> ---- - net/bluetooth/smp.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - ---- a/net/bluetooth/smp.c -+++ b/net/bluetooth/smp.c -@@ -2208,7 +2208,7 @@ mackey_and_ltk: - if (err) - return SMP_UNSPECIFIED; - -- if (smp->method == REQ_OOB) { -+ if (smp->method == JUST_WORKS || smp->method == REQ_OOB) { - if (test_bit(SMP_FLAG_INITIATOR, &smp->flags)) { - sc_dhkey_check(smp); - SMP_ALLOW_CMD(smp, SMP_CMD_DHKEY_CHECK); -@@ -2223,9 +2223,6 @@ mackey_and_ltk: - confirm_hint = 0; - - confirm: -- if (smp->method == JUST_WORKS) -- confirm_hint = 1; -- - err = mgmt_user_confirm_request(hcon->hdev, &hcon->dst, hcon->type, - hcon->dst_type, passkey, confirm_hint); - if (err) diff --git a/target/linux/bcm27xx/patches-5.15/950-0031-Revert-Bluetooth-Always-request-for-user-confirmatio.patch b/target/linux/bcm27xx/patches-5.15/950-0031-Revert-Bluetooth-Always-request-for-user-confirmatio.patch deleted file mode 100644 index cfa67bb337..0000000000 --- a/target/linux/bcm27xx/patches-5.15/950-0031-Revert-Bluetooth-Always-request-for-user-confirmatio.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0d96dec62add659cc6189c629b465a903a1ff235 Mon Sep 17 00:00:00 2001 -From: Phil Elwell <phil@raspberrypi.com> -Date: Mon, 1 Mar 2021 09:14:35 +0000 -Subject: [PATCH] Revert "Bluetooth: Always request for user - confirmation for Just Works" - -This reverts commit 92516cd97fd4d8ad5b1421a0d51771044f453a5f. - -Thi commit "Bluetooth: Always request for user confirmation for Just -Works" prevents BLE devices pairing in (at least) the Raspberry Pi OS -GUI. After reverting it, pairing works again. - -If another solution to the problem is found then this reversion will -be removed. - -See: https://github.com/raspberrypi/linux/issues/4139 - -Signed-off-by: Phil Elwell <phil@raspberrypi.com> ---- - net/bluetooth/smp.c | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - ---- a/net/bluetooth/smp.c -+++ b/net/bluetooth/smp.c -@@ -883,16 +883,9 @@ static int tk_request(struct l2cap_conn - hcon->io_capability == HCI_IO_NO_INPUT_OUTPUT) - smp->method = JUST_WORKS; - -- /* If Just Works, Continue with Zero TK and ask user-space for -- * confirmation */ -+ /* If Just Works, Continue with Zero TK */ - if (smp->method == JUST_WORKS) { -- ret = mgmt_user_confirm_request(hcon->hdev, &hcon->dst, -- hcon->type, -- hcon->dst_type, -- passkey, 1); -- if (ret) -- return ret; -- set_bit(SMP_FLAG_WAIT_USER, &smp->flags); -+ set_bit(SMP_FLAG_TK_VALID, &smp->flags); - return 0; - } - diff --git a/target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch index 6b8f04561f..ae995b4ef5 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0163-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 -@@ -1346,6 +1349,9 @@ +@@ -1349,6 +1352,9 @@ #define USB_VENDOR_ID_XAT 0x2505 #define USB_DEVICE_ID_XAT_CSR 0x0220 @@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL }, -@@ -202,6 +203,7 @@ static const struct hid_device_id hid_qu +@@ -203,6 +204,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET }, diff --git a/target/linux/bcm27xx/patches-5.15/950-0208-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch b/target/linux/bcm27xx/patches-5.15/950-0208-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch index a97cdf83b1..c14e264a81 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0208-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0208-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch @@ -32,7 +32,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -3503,6 +3503,7 @@ static int __spi_validate_bits_per_word( +@@ -3513,6 +3513,7 @@ static int __spi_validate_bits_per_word( */ int spi_setup(struct spi_device *spi) { @@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> unsigned bad_bits, ugly_bits; int status; -@@ -3524,6 +3525,14 @@ int spi_setup(struct spi_device *spi) +@@ -3534,6 +3535,14 @@ int spi_setup(struct spi_device *spi) (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL | SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL))) return -EINVAL; diff --git a/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch b/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch index 30c66afbfe..c4472321cd 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch @@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -17542,6 +17542,14 @@ T: git git://linuxtv.org/media_tree.git +@@ -17543,6 +17543,14 @@ T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml F: drivers/media/i2c/imx412.c diff --git a/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch b/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch index 63ca3ef39b..2b176be478 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch @@ -132,7 +132,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com> +... --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -17556,6 +17556,7 @@ M: Raspberry Pi Kernel Maintenance <kern +@@ -17557,6 +17557,7 @@ M: Raspberry Pi Kernel Maintenance <kern L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git diff --git a/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch b/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch index 3b35746fd0..19aef04e36 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch @@ -132,7 +132,7 @@ Signed-off-by: Lee Jackson <info@arducam.com> +... --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -17560,6 +17560,14 @@ F: Documentation/devicetree/bindings/med +@@ -17561,6 +17561,14 @@ F: Documentation/devicetree/bindings/med F: Documentation/devicetree/bindings/media/i2c/imx477.yaml F: drivers/media/i2c/imx477.c diff --git a/target/linux/generic/backport-5.15/346-v5.18-02-Revert-usb-host-xhci-mvebu-make-USB-3.0-PHY-optional.patch b/target/linux/generic/backport-5.15/346-v5.18-02-Revert-usb-host-xhci-mvebu-make-USB-3.0-PHY-optional.patch index 0c28221460..31358491ef 100644 --- a/target/linux/generic/backport-5.15/346-v5.18-02-Revert-usb-host-xhci-mvebu-make-USB-3.0-PHY-optional.patch +++ b/target/linux/generic/backport-5.15/346-v5.18-02-Revert-usb-host-xhci-mvebu-make-USB-3.0-PHY-optional.patch @@ -138,7 +138,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org> .init_quirk = xhci_mvebu_a3700_init_quirk, }; -@@ -344,14 +333,7 @@ static int xhci_plat_probe(struct platfo +@@ -345,14 +334,7 @@ static int xhci_plat_probe(struct platfo hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node); xhci->shared_hcd->tpl_support = hcd->tpl_support; diff --git a/target/linux/generic/backport-5.15/600-v5.18-page_pool-Add-allocation-stats.patch b/target/linux/generic/backport-5.15/600-v5.18-page_pool-Add-allocation-stats.patch index dca1062be9..a783be598e 100644 --- a/target/linux/generic/backport-5.15/600-v5.18-page_pool-Add-allocation-stats.patch +++ b/target/linux/generic/backport-5.15/600-v5.18-page_pool-Add-allocation-stats.patch @@ -101,7 +101,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static int page_pool_init(struct page_pool *pool, const struct page_pool_params *params) { -@@ -140,8 +147,10 @@ static struct page *page_pool_refill_all +@@ -136,8 +143,10 @@ static struct page *page_pool_refill_all int pref_nid; /* preferred NUMA node */ /* Quicker fallback, avoid locks when ring is empty */ @@ -113,7 +113,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* Softirq guarantee CPU and thus NUMA node is stable. This, * assumes CPU refilling driver RX-ring will also run RX-NAPI. -@@ -171,14 +180,17 @@ static struct page *page_pool_refill_all +@@ -167,14 +176,17 @@ static struct page *page_pool_refill_all * This limit stress on page buddy alloactor. */ page_pool_return_page(pool, page); @@ -132,7 +132,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> spin_unlock(&r->consumer_lock); return page; -@@ -193,6 +205,7 @@ static struct page *__page_pool_get_cach +@@ -189,6 +201,7 @@ static struct page *__page_pool_get_cach if (likely(pool->alloc.count)) { /* Fast-path */ page = pool->alloc.cache[--pool->alloc.count]; @@ -140,7 +140,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } else { page = page_pool_refill_alloc_cache(pool); } -@@ -264,6 +277,7 @@ static struct page *__page_pool_alloc_pa +@@ -260,6 +273,7 @@ static struct page *__page_pool_alloc_pa return NULL; } @@ -148,7 +148,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> page_pool_set_pp_info(pool, page); /* Track how many pages are held 'in-flight' */ -@@ -318,10 +332,12 @@ static struct page *__page_pool_alloc_pa +@@ -320,10 +334,12 @@ static struct page *__page_pool_alloc_pa } /* Return last page */ diff --git a/target/linux/generic/backport-5.15/601-v5.18-page_pool-Add-recycle-stats.patch b/target/linux/generic/backport-5.15/601-v5.18-page_pool-Add-recycle-stats.patch index b425b78c75..cfcdc6e5eb 100644 --- a/target/linux/generic/backport-5.15/601-v5.18-page_pool-Add-recycle-stats.patch +++ b/target/linux/generic/backport-5.15/601-v5.18-page_pool-Add-recycle-stats.patch @@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #endif static int page_pool_init(struct page_pool *pool, -@@ -103,6 +110,12 @@ static int page_pool_init(struct page_po +@@ -99,6 +106,12 @@ static int page_pool_init(struct page_po pool->p.flags & PP_FLAG_PAGE_FRAG) return -EINVAL; @@ -82,7 +82,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> if (ptr_ring_init(&pool->ring, ring_qsize, GFP_KERNEL) < 0) return -ENOMEM; -@@ -435,7 +448,12 @@ static bool page_pool_recycle_in_ring(st +@@ -437,7 +450,12 @@ static bool page_pool_recycle_in_ring(st else ret = ptr_ring_produce_bh(&pool->ring, page); @@ -96,7 +96,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } /* Only allow direct recycling in special circumstances, into the -@@ -446,11 +464,14 @@ static bool page_pool_recycle_in_ring(st +@@ -448,11 +466,14 @@ static bool page_pool_recycle_in_ring(st static bool page_pool_recycle_in_cache(struct page *page, struct page_pool *pool) { @@ -112,7 +112,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> return true; } -@@ -505,6 +526,7 @@ __page_pool_put_page(struct page_pool *p +@@ -507,6 +528,7 @@ __page_pool_put_page(struct page_pool *p * doing refcnt based recycle tricks, meaning another process * will be invoking put_page. */ @@ -120,7 +120,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* Do not replace this with page_pool_return_page() */ page_pool_release_page(pool, page); put_page(page); -@@ -518,6 +540,7 @@ void page_pool_put_page(struct page_pool +@@ -520,6 +542,7 @@ void page_pool_put_page(struct page_pool page = __page_pool_put_page(pool, page, dma_sync_size, allow_direct); if (page && !page_pool_recycle_in_ring(pool, page)) { /* Cache full, fallback to free pages */ @@ -128,7 +128,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> page_pool_return_page(pool, page); } } -@@ -665,6 +688,9 @@ static void page_pool_free(struct page_p +@@ -667,6 +690,9 @@ static void page_pool_free(struct page_p if (pool->p.flags & PP_FLAG_DMA_MAP) put_device(pool->p.dev); diff --git a/target/linux/generic/backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch b/target/linux/generic/backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch index f438ef3a59..69d4246f92 100644 --- a/target/linux/generic/backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch +++ b/target/linux/generic/backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch @@ -37,7 +37,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com> #endif static int page_pool_init(struct page_pool *pool, -@@ -593,9 +600,13 @@ void page_pool_put_page_bulk(struct page +@@ -595,9 +602,13 @@ void page_pool_put_page_bulk(struct page /* Bulk producer into ptr_ring page_pool cache */ in_softirq = page_pool_producer_lock(pool); for (i = 0; i < bulk_len; i++) { diff --git a/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch b/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch index 89c1f4c69b..011e6ef77c 100644 --- a/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch +++ b/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch @@ -289,7 +289,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c -@@ -1390,10 +1390,8 @@ void b53_phylink_validate(struct dsa_swi +@@ -1399,10 +1399,8 @@ void b53_phylink_validate(struct dsa_swi phylink_set(mask, 100baseT_Full); } @@ -507,7 +507,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } --- a/drivers/net/dsa/sja1105/sja1105_main.c +++ b/drivers/net/dsa/sja1105/sja1105_main.c -@@ -1360,7 +1360,7 @@ static void sja1105_phylink_validate(str +@@ -1356,7 +1356,7 @@ static void sja1105_phylink_validate(str */ if (state->interface != PHY_INTERFACE_MODE_NA && sja1105_phy_mode_mismatch(priv, port, state->interface)) { @@ -516,7 +516,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> return; } -@@ -1380,9 +1380,8 @@ static void sja1105_phylink_validate(str +@@ -1376,9 +1376,8 @@ static void sja1105_phylink_validate(str phylink_set(mask, 2500baseX_Full); } diff --git a/target/linux/generic/backport-5.15/743-v5.16-0001-net-dsa-b53-Include-all-ports-in-enabled_ports.patch b/target/linux/generic/backport-5.15/743-v5.16-0001-net-dsa-b53-Include-all-ports-in-enabled_ports.patch index 238f3bd372..afc4d88f73 100644 --- a/target/linux/generic/backport-5.15/743-v5.16-0001-net-dsa-b53-Include-all-ports-in-enabled_ports.patch +++ b/target/linux/generic/backport-5.15/743-v5.16-0001-net-dsa-b53-Include-all-ports-in-enabled_ports.patch @@ -22,7 +22,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c -@@ -2365,7 +2365,7 @@ static const struct b53_chip_data b53_sw +@@ -2374,7 +2374,7 @@ static const struct b53_chip_data b53_sw .chip_id = BCM5325_DEVICE_ID, .dev_name = "BCM5325", .vlans = 16, @@ -31,7 +31,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .arl_bins = 2, .arl_buckets = 1024, .imp_port = 5, -@@ -2376,7 +2376,7 @@ static const struct b53_chip_data b53_sw +@@ -2385,7 +2385,7 @@ static const struct b53_chip_data b53_sw .chip_id = BCM5365_DEVICE_ID, .dev_name = "BCM5365", .vlans = 256, @@ -40,7 +40,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .arl_bins = 2, .arl_buckets = 1024, .imp_port = 5, -@@ -2387,7 +2387,7 @@ static const struct b53_chip_data b53_sw +@@ -2396,7 +2396,7 @@ static const struct b53_chip_data b53_sw .chip_id = BCM5389_DEVICE_ID, .dev_name = "BCM5389", .vlans = 4096, @@ -49,7 +49,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, -@@ -2401,7 +2401,7 @@ static const struct b53_chip_data b53_sw +@@ -2410,7 +2410,7 @@ static const struct b53_chip_data b53_sw .chip_id = BCM5395_DEVICE_ID, .dev_name = "BCM5395", .vlans = 4096, @@ -58,7 +58,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, -@@ -2415,7 +2415,7 @@ static const struct b53_chip_data b53_sw +@@ -2424,7 +2424,7 @@ static const struct b53_chip_data b53_sw .chip_id = BCM5397_DEVICE_ID, .dev_name = "BCM5397", .vlans = 4096, @@ -67,7 +67,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, -@@ -2429,7 +2429,7 @@ static const struct b53_chip_data b53_sw +@@ -2438,7 +2438,7 @@ static const struct b53_chip_data b53_sw .chip_id = BCM5398_DEVICE_ID, .dev_name = "BCM5398", .vlans = 4096, @@ -76,7 +76,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, -@@ -2443,7 +2443,7 @@ static const struct b53_chip_data b53_sw +@@ -2452,7 +2452,7 @@ static const struct b53_chip_data b53_sw .chip_id = BCM53115_DEVICE_ID, .dev_name = "BCM53115", .vlans = 4096, @@ -85,7 +85,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .arl_bins = 4, .arl_buckets = 1024, .vta_regs = B53_VTA_REGS, -@@ -2457,7 +2457,7 @@ static const struct b53_chip_data b53_sw +@@ -2466,7 +2466,7 @@ static const struct b53_chip_data b53_sw .chip_id = BCM53125_DEVICE_ID, .dev_name = "BCM53125", .vlans = 4096, @@ -94,7 +94,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, -@@ -2499,7 +2499,7 @@ static const struct b53_chip_data b53_sw +@@ -2508,7 +2508,7 @@ static const struct b53_chip_data b53_sw .chip_id = BCM53010_DEVICE_ID, .dev_name = "BCM53010", .vlans = 4096, @@ -103,7 +103,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, -@@ -2541,7 +2541,7 @@ static const struct b53_chip_data b53_sw +@@ -2550,7 +2550,7 @@ static const struct b53_chip_data b53_sw .chip_id = BCM53018_DEVICE_ID, .dev_name = "BCM53018", .vlans = 4096, @@ -112,7 +112,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, -@@ -2555,7 +2555,7 @@ static const struct b53_chip_data b53_sw +@@ -2564,7 +2564,7 @@ static const struct b53_chip_data b53_sw .chip_id = BCM53019_DEVICE_ID, .dev_name = "BCM53019", .vlans = 4096, @@ -121,7 +121,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, -@@ -2697,7 +2697,6 @@ static int b53_switch_init(struct b53_de +@@ -2706,7 +2706,6 @@ static int b53_switch_init(struct b53_de dev->cpu_port = 5; } diff --git a/target/linux/generic/backport-5.15/743-v5.16-0002-net-dsa-b53-Drop-BCM5301x-workaround-for-a-wrong-CPU.patch b/target/linux/generic/backport-5.15/743-v5.16-0002-net-dsa-b53-Drop-BCM5301x-workaround-for-a-wrong-CPU.patch index 2e1b1dc2bb..c370c97226 100644 --- a/target/linux/generic/backport-5.15/743-v5.16-0002-net-dsa-b53-Drop-BCM5301x-workaround-for-a-wrong-CPU.patch +++ b/target/linux/generic/backport-5.15/743-v5.16-0002-net-dsa-b53-Drop-BCM5301x-workaround-for-a-wrong-CPU.patch @@ -27,7 +27,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c -@@ -1332,12 +1332,6 @@ static void b53_adjust_link(struct dsa_s +@@ -1341,12 +1341,6 @@ static void b53_adjust_link(struct dsa_s return; } } diff --git a/target/linux/generic/backport-5.15/743-v5.16-0003-net-dsa-b53-Improve-flow-control-setup-on-BCM5301x.patch b/target/linux/generic/backport-5.15/743-v5.16-0003-net-dsa-b53-Improve-flow-control-setup-on-BCM5301x.patch index 2c4e6c8fcc..a91501d347 100644 --- a/target/linux/generic/backport-5.15/743-v5.16-0003-net-dsa-b53-Improve-flow-control-setup-on-BCM5301x.patch +++ b/target/linux/generic/backport-5.15/743-v5.16-0003-net-dsa-b53-Improve-flow-control-setup-on-BCM5301x.patch @@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c -@@ -1263,7 +1263,7 @@ static void b53_adjust_link(struct dsa_s +@@ -1272,7 +1272,7 @@ static void b53_adjust_link(struct dsa_s return; /* Enable flow control on BCM5301x's CPU port */ diff --git a/target/linux/generic/backport-5.15/743-v5.16-0004-net-dsa-b53-Drop-unused-cpu_port-field.patch b/target/linux/generic/backport-5.15/743-v5.16-0004-net-dsa-b53-Drop-unused-cpu_port-field.patch index 0c53e09388..ff89ada250 100644 --- a/target/linux/generic/backport-5.15/743-v5.16-0004-net-dsa-b53-Drop-unused-cpu_port-field.patch +++ b/target/linux/generic/backport-5.15/743-v5.16-0004-net-dsa-b53-Drop-unused-cpu_port-field.patch @@ -19,7 +19,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c -@@ -2363,7 +2363,6 @@ static const struct b53_chip_data b53_sw +@@ -2372,7 +2372,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 2, .arl_buckets = 1024, .imp_port = 5, @@ -27,7 +27,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .duplex_reg = B53_DUPLEX_STAT_FE, }, { -@@ -2374,7 +2373,6 @@ static const struct b53_chip_data b53_sw +@@ -2383,7 +2382,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 2, .arl_buckets = 1024, .imp_port = 5, @@ -35,7 +35,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .duplex_reg = B53_DUPLEX_STAT_FE, }, { -@@ -2385,7 +2383,6 @@ static const struct b53_chip_data b53_sw +@@ -2394,7 +2392,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -43,7 +43,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2399,7 +2396,6 @@ static const struct b53_chip_data b53_sw +@@ -2408,7 +2405,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -51,7 +51,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2413,7 +2409,6 @@ static const struct b53_chip_data b53_sw +@@ -2422,7 +2418,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -59,7 +59,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS_9798, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2427,7 +2422,6 @@ static const struct b53_chip_data b53_sw +@@ -2436,7 +2431,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -67,7 +67,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS_9798, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2442,7 +2436,6 @@ static const struct b53_chip_data b53_sw +@@ -2451,7 +2445,6 @@ static const struct b53_chip_data b53_sw .arl_buckets = 1024, .vta_regs = B53_VTA_REGS, .imp_port = 8, @@ -75,7 +75,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, .jumbo_size_reg = B53_JUMBO_MAX_SIZE, -@@ -2455,7 +2448,6 @@ static const struct b53_chip_data b53_sw +@@ -2464,7 +2457,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -83,7 +83,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2469,7 +2461,6 @@ static const struct b53_chip_data b53_sw +@@ -2478,7 +2470,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -91,7 +91,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2483,7 +2474,6 @@ static const struct b53_chip_data b53_sw +@@ -2492,7 +2483,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -99,7 +99,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS_63XX, .duplex_reg = B53_DUPLEX_STAT_63XX, .jumbo_pm_reg = B53_JUMBO_PORT_MASK_63XX, -@@ -2497,7 +2487,6 @@ static const struct b53_chip_data b53_sw +@@ -2506,7 +2496,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -107,7 +107,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2511,7 +2500,6 @@ static const struct b53_chip_data b53_sw +@@ -2520,7 +2509,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -115,7 +115,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2525,7 +2513,6 @@ static const struct b53_chip_data b53_sw +@@ -2534,7 +2522,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -123,7 +123,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2539,7 +2526,6 @@ static const struct b53_chip_data b53_sw +@@ -2548,7 +2535,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -131,7 +131,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2553,7 +2539,6 @@ static const struct b53_chip_data b53_sw +@@ -2562,7 +2548,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -139,7 +139,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2567,7 +2552,6 @@ static const struct b53_chip_data b53_sw +@@ -2576,7 +2561,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -147,7 +147,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2581,7 +2565,6 @@ static const struct b53_chip_data b53_sw +@@ -2590,7 +2574,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -155,7 +155,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2610,7 +2593,6 @@ static const struct b53_chip_data b53_sw +@@ -2619,7 +2602,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 1024, .imp_port = 8, @@ -163,7 +163,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2624,7 +2606,6 @@ static const struct b53_chip_data b53_sw +@@ -2633,7 +2615,6 @@ static const struct b53_chip_data b53_sw .arl_bins = 4, .arl_buckets = 256, .imp_port = 8, @@ -171,7 +171,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE, .jumbo_pm_reg = B53_JUMBO_PORT_MASK, -@@ -2650,7 +2631,6 @@ static int b53_switch_init(struct b53_de +@@ -2659,7 +2640,6 @@ static int b53_switch_init(struct b53_de dev->vta_regs[2] = chip->vta_regs[2]; dev->jumbo_pm_reg = chip->jumbo_pm_reg; dev->imp_port = chip->imp_port; @@ -179,7 +179,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> dev->num_vlans = chip->vlans; dev->num_arl_bins = chip->arl_bins; dev->num_arl_buckets = chip->arl_buckets; -@@ -2682,13 +2662,6 @@ static int b53_switch_init(struct b53_de +@@ -2691,13 +2671,6 @@ static int b53_switch_init(struct b53_de break; #endif } diff --git a/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch b/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch index ba6c56a056..98060ff125 100644 --- a/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch +++ b/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch @@ -1157,5 +1157,5 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> - stmmac_clear_descriptors(priv); + stmmac_clear_descriptors(priv, &priv->dma_conf); - stmmac_hw_setup(ndev, false); - stmmac_init_coalesce(priv); + ret = stmmac_hw_setup(ndev, false); + if (ret < 0) { diff --git a/target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch b/target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch index ac77fc9b1d..95929b7fe3 100644 --- a/target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch +++ b/target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -17966,6 +17966,11 @@ L: netdev@vger.kernel.org +@@ -17961,6 +17961,11 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/dlink/sundance.c diff --git a/target/linux/generic/backport-5.15/810-v5.17-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch b/target/linux/generic/backport-5.15/810-v5.17-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch index be7f2bac58..109d5272c2 100644 --- a/target/linux/generic/backport-5.15/810-v5.17-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch +++ b/target/linux/generic/backport-5.15/810-v5.17-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch @@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1319,6 +1319,7 @@ static const struct usb_device_id produc +@@ -1325,6 +1325,7 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x19d2, 0x1426, 2)}, /* ZTE MF91 */ {QMI_FIXED_INTF(0x19d2, 0x1428, 2)}, /* Telewell TW-LTE 4G v2 */ {QMI_FIXED_INTF(0x19d2, 0x1432, 3)}, /* ZTE ME3620 */ diff --git a/target/linux/generic/backport-5.15/815-v6.4-07-net-phy-marvell-Add-software-control-of-the-LEDs.patch b/target/linux/generic/backport-5.15/815-v6.4-07-net-phy-marvell-Add-software-control-of-the-LEDs.patch index 053288ceca..8b15275f5b 100644 --- a/target/linux/generic/backport-5.15/815-v6.4-07-net-phy-marvell-Add-software-control-of-the-LEDs.patch +++ b/target/linux/generic/backport-5.15/815-v6.4-07-net-phy-marvell-Add-software-control-of-the-LEDs.patch @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* Magic Packet MAC address registers */ #define MII_88E1318S_PHY_MAGIC_PACKET_WORD2 0x17 -@@ -2793,6 +2795,34 @@ static int marvell_hwmon_probe(struct ph +@@ -2830,6 +2832,34 @@ static int marvell_hwmon_probe(struct ph } #endif @@ -70,7 +70,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static int marvell_probe(struct phy_device *phydev) { struct marvell_priv *priv; -@@ -3041,6 +3071,7 @@ static struct phy_driver marvell_drivers +@@ -3078,6 +3108,7 @@ static struct phy_driver marvell_drivers .get_sset_count = marvell_get_sset_count, .get_strings = marvell_get_strings, .get_stats = marvell_get_stats, @@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, { .phy_id = MARVELL_PHY_ID_88E1145, -@@ -3147,6 +3178,7 @@ static struct phy_driver marvell_drivers +@@ -3184,6 +3215,7 @@ static struct phy_driver marvell_drivers .cable_test_start = marvell_vct7_cable_test_start, .cable_test_tdr_start = marvell_vct5_cable_test_tdr_start, .cable_test_get_status = marvell_vct7_cable_test_get_status, @@ -86,7 +86,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, { .phy_id = MARVELL_PHY_ID_88E1540, -@@ -3173,6 +3205,7 @@ static struct phy_driver marvell_drivers +@@ -3210,6 +3242,7 @@ static struct phy_driver marvell_drivers .cable_test_start = marvell_vct7_cable_test_start, .cable_test_tdr_start = marvell_vct5_cable_test_tdr_start, .cable_test_get_status = marvell_vct7_cable_test_get_status, @@ -94,7 +94,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, { .phy_id = MARVELL_PHY_ID_88E1545, -@@ -3199,6 +3232,7 @@ static struct phy_driver marvell_drivers +@@ -3236,6 +3269,7 @@ static struct phy_driver marvell_drivers .cable_test_start = marvell_vct7_cable_test_start, .cable_test_tdr_start = marvell_vct5_cable_test_tdr_start, .cable_test_get_status = marvell_vct7_cable_test_get_status, @@ -102,7 +102,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, { .phy_id = MARVELL_PHY_ID_88E3016, -@@ -3340,6 +3374,7 @@ static struct phy_driver marvell_drivers +@@ -3377,6 +3411,7 @@ static struct phy_driver marvell_drivers .get_stats = marvell_get_stats, .get_tunable = m88e1540_get_tunable, .set_tunable = m88e1540_set_tunable, diff --git a/target/linux/generic/backport-5.15/815-v6.4-09-net-phy-marvell-Implement-led_blink_set.patch b/target/linux/generic/backport-5.15/815-v6.4-09-net-phy-marvell-Implement-led_blink_set.patch index 0f258c6b92..4748e28706 100644 --- a/target/linux/generic/backport-5.15/815-v6.4-09-net-phy-marvell-Implement-led_blink_set.patch +++ b/target/linux/generic/backport-5.15/815-v6.4-09-net-phy-marvell-Implement-led_blink_set.patch @@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #define MII_88E1318S_PHY_LED_TCR 0x12 #define MII_88E1318S_PHY_LED_TCR_FORCE_INT BIT(15) #define MII_88E1318S_PHY_LED_TCR_INTn_ENABLE BIT(7) -@@ -2823,6 +2825,35 @@ static int m88e1318_led_brightness_set(s +@@ -2860,6 +2862,35 @@ static int m88e1318_led_brightness_set(s MII_88E1318S_PHY_LED_FUNC, reg); } @@ -62,7 +62,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static int marvell_probe(struct phy_device *phydev) { struct marvell_priv *priv; -@@ -3072,6 +3103,7 @@ static struct phy_driver marvell_drivers +@@ -3109,6 +3140,7 @@ static struct phy_driver marvell_drivers .get_strings = marvell_get_strings, .get_stats = marvell_get_stats, .led_brightness_set = m88e1318_led_brightness_set, @@ -70,7 +70,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, { .phy_id = MARVELL_PHY_ID_88E1145, -@@ -3179,6 +3211,7 @@ static struct phy_driver marvell_drivers +@@ -3216,6 +3248,7 @@ static struct phy_driver marvell_drivers .cable_test_tdr_start = marvell_vct5_cable_test_tdr_start, .cable_test_get_status = marvell_vct7_cable_test_get_status, .led_brightness_set = m88e1318_led_brightness_set, @@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, { .phy_id = MARVELL_PHY_ID_88E1540, -@@ -3206,6 +3239,7 @@ static struct phy_driver marvell_drivers +@@ -3243,6 +3276,7 @@ static struct phy_driver marvell_drivers .cable_test_tdr_start = marvell_vct5_cable_test_tdr_start, .cable_test_get_status = marvell_vct7_cable_test_get_status, .led_brightness_set = m88e1318_led_brightness_set, @@ -86,7 +86,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, { .phy_id = MARVELL_PHY_ID_88E1545, -@@ -3233,6 +3267,7 @@ static struct phy_driver marvell_drivers +@@ -3270,6 +3304,7 @@ static struct phy_driver marvell_drivers .cable_test_tdr_start = marvell_vct5_cable_test_tdr_start, .cable_test_get_status = marvell_vct7_cable_test_get_status, .led_brightness_set = m88e1318_led_brightness_set, @@ -94,7 +94,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, { .phy_id = MARVELL_PHY_ID_88E3016, -@@ -3375,6 +3410,7 @@ static struct phy_driver marvell_drivers +@@ -3412,6 +3447,7 @@ static struct phy_driver marvell_drivers .get_tunable = m88e1540_get_tunable, .set_tunable = m88e1540_set_tunable, .led_brightness_set = m88e1318_led_brightness_set, diff --git a/target/linux/generic/backport-5.15/816-v6.4-net-phy-marvell-Fix-inconsistent-indenting-in-led_bl.patch b/target/linux/generic/backport-5.15/816-v6.4-net-phy-marvell-Fix-inconsistent-indenting-in-led_bl.patch index c5b611a125..85c8ca92c6 100644 --- a/target/linux/generic/backport-5.15/816-v6.4-net-phy-marvell-Fix-inconsistent-indenting-in-led_bl.patch +++ b/target/linux/generic/backport-5.15/816-v6.4-net-phy-marvell-Fix-inconsistent-indenting-in-led_bl.patch @@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c -@@ -2841,10 +2841,10 @@ static int m88e1318_led_blink_set(struct +@@ -2878,10 +2878,10 @@ static int m88e1318_led_blink_set(struct case 1: case 2: reg &= ~(0xf << (4 * index)); diff --git a/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch b/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch index 549a505214..a26385ca5b 100644 --- a/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch +++ b/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch @@ -105,7 +105,7 @@ Subject: [PATCH] kernel: add block fit partition parser /* everything is up and running, commence */ err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL); if (err) -@@ -602,6 +614,11 @@ static bool blk_add_partition(struct gen +@@ -597,6 +609,11 @@ static bool blk_add_partition(struct gen (state->parts[p].flags & ADDPART_FLAG_RAID)) md_autodetect_dev(part->bd_dev); diff --git a/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch index 5d02b9800d..89c94ccfed 100644 --- a/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch +++ b/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch @@ -10,7 +10,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1081,6 +1081,11 @@ static const struct usb_device_id produc +@@ -1087,6 +1087,11 @@ static const struct usb_device_id produc USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7), .driver_info = (unsigned long)&qmi_wwan_info, }, @@ -22,7 +22,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0122)}, /* Quectel RG650V */ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0125)}, /* Quectel EC25, EC20 R2.0 Mini PCIe */ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0306)}, /* Quectel EP06/EG06/EM06 */ -@@ -1088,6 +1093,7 @@ static const struct usb_device_id produc +@@ -1094,6 +1099,7 @@ static const struct usb_device_id produc {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)}, /* Quectel EM160R-GL */ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)}, /* Quectel RM500Q-GL */ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)}, /* Quectel RM520N */ diff --git a/target/linux/generic/hack-5.15/902-debloat_proc.patch b/target/linux/generic/hack-5.15/902-debloat_proc.patch index 27630c34d6..5b55deecf5 100644 --- a/target/linux/generic/hack-5.15/902-debloat_proc.patch +++ b/target/linux/generic/hack-5.15/902-debloat_proc.patch @@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -3892,6 +3892,8 @@ static __net_initdata struct pernet_oper +@@ -3895,6 +3895,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { diff --git a/target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch index 99b76748e2..a217af19ab 100644 --- a/target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch +++ b/target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch @@ -24,7 +24,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c -@@ -199,6 +199,7 @@ out: +@@ -200,6 +200,7 @@ out: void br_flood(struct net_bridge *br, struct sk_buff *skb, enum br_pkt_type pkt_type, bool local_rcv, bool local_orig) { @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> struct net_bridge_port *prev = NULL; struct net_bridge_port *p; -@@ -214,6 +215,10 @@ void br_flood(struct net_bridge *br, str +@@ -215,6 +216,10 @@ void br_flood(struct net_bridge *br, str case BR_PKT_MULTICAST: if (!(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev) continue; diff --git a/target/linux/generic/pending-5.15/772-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch b/target/linux/generic/pending-5.15/772-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch index 5db23a3491..ae7b64963a 100644 --- a/target/linux/generic/pending-5.15/772-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch +++ b/target/linux/generic/pending-5.15/772-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch @@ -95,7 +95,7 @@ Reviewed-by: Andrew Lunn <andrew@lunn.ch> --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c -@@ -1250,6 +1250,46 @@ static void b53_force_port_config(struct +@@ -1259,6 +1259,46 @@ static void b53_force_port_config(struct b53_write8(dev, B53_CTRL_PAGE, off, reg); } @@ -142,7 +142,7 @@ Reviewed-by: Andrew Lunn <andrew@lunn.ch> static void b53_adjust_link(struct dsa_switch *ds, int port, struct phy_device *phydev) { -@@ -1276,6 +1316,9 @@ static void b53_adjust_link(struct dsa_s +@@ -1285,6 +1325,9 @@ static void b53_adjust_link(struct dsa_s tx_pause, rx_pause); b53_force_link(dev, port, phydev->link); @@ -152,7 +152,7 @@ Reviewed-by: Andrew Lunn <andrew@lunn.ch> if (is531x5(dev) && phy_interface_is_rgmii(phydev)) { if (port == dev->imp_port) off = B53_RGMII_CTRL_IMP; -@@ -1460,6 +1503,9 @@ void b53_phylink_mac_link_up(struct dsa_ +@@ -1469,6 +1512,9 @@ void b53_phylink_mac_link_up(struct dsa_ { struct b53_device *dev = ds->priv; diff --git a/target/linux/generic/pending-5.15/774-net-dsa-b53-mmap-allow-passing-a-chip-ID.patch b/target/linux/generic/pending-5.15/774-net-dsa-b53-mmap-allow-passing-a-chip-ID.patch index dc19d4297b..3c89ff1e5c 100644 --- a/target/linux/generic/pending-5.15/774-net-dsa-b53-mmap-allow-passing-a-chip-ID.patch +++ b/target/linux/generic/pending-5.15/774-net-dsa-b53-mmap-allow-passing-a-chip-ID.patch @@ -100,7 +100,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c -@@ -2526,6 +2526,19 @@ static const struct b53_chip_data b53_sw +@@ -2535,6 +2535,19 @@ static const struct b53_chip_data b53_sw .jumbo_size_reg = B53_JUMBO_MAX_SIZE_63XX, }, { diff --git a/target/linux/generic/pending-5.15/775-net-dsa-b53-add-BCM63268-RGMII-configuration.patch b/target/linux/generic/pending-5.15/775-net-dsa-b53-add-BCM63268-RGMII-configuration.patch index a1fcd4e838..852b288eb6 100644 --- a/target/linux/generic/pending-5.15/775-net-dsa-b53-add-BCM63268-RGMII-configuration.patch +++ b/target/linux/generic/pending-5.15/775-net-dsa-b53-add-BCM63268-RGMII-configuration.patch @@ -97,7 +97,7 @@ Reviewed-by: Simon Horman <simon.horman@corigine.com> --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c -@@ -1281,8 +1281,12 @@ static void b53_adjust_63xx_rgmii(struct +@@ -1290,8 +1290,12 @@ static void b53_adjust_63xx_rgmii(struct break; } @@ -113,7 +113,7 @@ Reviewed-by: Simon Horman <simon.horman@corigine.com> --- a/drivers/net/dsa/b53/b53_regs.h +++ b/drivers/net/dsa/b53/b53_regs.h -@@ -140,6 +140,7 @@ +@@ -139,6 +139,7 @@ #define B53_RGMII_CTRL_IMP 0x60 #define RGMII_CTRL_ENABLE_GMII BIT(7) diff --git a/target/linux/generic/pending-5.15/777-net-dsa-b53-mdio-add-support-for-BCM53134.patch b/target/linux/generic/pending-5.15/777-net-dsa-b53-mdio-add-support-for-BCM53134.patch index d389c471f6..0fa3d12947 100644 --- a/target/linux/generic/pending-5.15/777-net-dsa-b53-mdio-add-support-for-BCM53134.patch +++ b/target/linux/generic/pending-5.15/777-net-dsa-b53-mdio-add-support-for-BCM53134.patch @@ -100,7 +100,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c -@@ -2674,6 +2674,20 @@ static const struct b53_chip_data b53_sw +@@ -2683,6 +2683,20 @@ static const struct b53_chip_data b53_sw .jumbo_pm_reg = B53_JUMBO_PORT_MASK, .jumbo_size_reg = B53_JUMBO_MAX_SIZE, }, @@ -121,7 +121,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> }; static int b53_switch_init(struct b53_device *dev) -@@ -2850,6 +2864,7 @@ int b53_switch_detect(struct b53_device +@@ -2859,6 +2873,7 @@ int b53_switch_detect(struct b53_device case BCM53012_DEVICE_ID: case BCM53018_DEVICE_ID: case BCM53019_DEVICE_ID: diff --git a/target/linux/generic/pending-5.15/810-pci_disable_common_quirks.patch b/target/linux/generic/pending-5.15/810-pci_disable_common_quirks.patch index 302051cc3b..142349f63f 100644 --- a/target/linux/generic/pending-5.15/810-pci_disable_common_quirks.patch +++ b/target/linux/generic/pending-5.15/810-pci_disable_common_quirks.patch @@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> /* * The Mellanox Tavor device gives false positive parity errors. Disable * parity error reporting. -@@ -3369,6 +3370,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -3370,6 +3371,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); @@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> /* * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. * To work around this, query the size it should be configured to by the -@@ -3394,6 +3397,8 @@ static void quirk_intel_ntb(struct pci_d +@@ -3395,6 +3398,8 @@ static void quirk_intel_ntb(struct pci_d DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb); @@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> /* * Some BIOS implementations leave the Intel GPU interrupts enabled, even * though no one is handling them (e.g., if the i915 driver is never -@@ -3432,6 +3437,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN +@@ -3433,6 +3438,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq); diff --git a/target/linux/ipq40xx/patches-5.15/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch b/target/linux/ipq40xx/patches-5.15/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch index fdf78b0e1d..ac7776f574 100644 --- a/target/linux/ipq40xx/patches-5.15/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch +++ b/target/linux/ipq40xx/patches-5.15/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch @@ -13,7 +13,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr> --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c -@@ -2510,7 +2510,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat +@@ -2525,7 +2525,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat static const struct sdhci_ops sdhci_msm_ops = { .reset = sdhci_msm_reset, diff --git a/target/linux/ipq40xx/patches-5.15/401-mmc-sdhci-msm-comment-unused-sdhci_msm_set_clock.patch b/target/linux/ipq40xx/patches-5.15/401-mmc-sdhci-msm-comment-unused-sdhci_msm_set_clock.patch index 575abdc8d0..6370b526fc 100644 --- a/target/linux/ipq40xx/patches-5.15/401-mmc-sdhci-msm-comment-unused-sdhci_msm_set_clock.patch +++ b/target/linux/ipq40xx/patches-5.15/401-mmc-sdhci-msm-comment-unused-sdhci_msm_set_clock.patch @@ -13,7 +13,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c -@@ -1814,49 +1814,49 @@ static unsigned int sdhci_msm_get_min_cl +@@ -1829,49 +1829,49 @@ static unsigned int sdhci_msm_get_min_cl return SDHCI_MSM_MIN_CLOCK; } diff --git a/target/linux/layerscape/patches-5.15/701-staging-add-fsl_ppfe-driver.patch b/target/linux/layerscape/patches-5.15/701-staging-add-fsl_ppfe-driver.patch index 445d050a78..2262869840 100644 --- a/target/linux/layerscape/patches-5.15/701-staging-add-fsl_ppfe-driver.patch +++ b/target/linux/layerscape/patches-5.15/701-staging-add-fsl_ppfe-driver.patch @@ -871,7 +871,7 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com> L: linux-spi@vger.kernel.org --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -102,4 +102,6 @@ source "drivers/staging/qlge/Kconfig" +@@ -100,4 +100,6 @@ source "drivers/staging/qlge/Kconfig" source "drivers/staging/wfx/Kconfig" @@ -880,7 +880,7 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -41,3 +41,4 @@ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo +@@ -40,3 +40,4 @@ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ obj-$(CONFIG_QLGE) += qlge/ obj-$(CONFIG_WFX) += wfx/ diff --git a/target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch b/target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch index 3b1b851a76..c82ee5b47d 100644 --- a/target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch +++ b/target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch @@ -22,7 +22,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> #include <linux/platform_data/x86/apple.h> #include <linux/pm_runtime.h> #include <linux/suspend.h> -@@ -6039,3 +6040,34 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -6040,3 +6041,34 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0xa73f, dpc_log_size); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0xa76e, dpc_log_size); #endif diff --git a/target/linux/ramips/patches-5.15/100-v5.16-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch b/target/linux/ramips/patches-5.15/100-v5.16-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch index 1c8c7cd3d0..85c27727ef 100644 --- a/target/linux/ramips/patches-5.15/100-v5.16-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch +++ b/target/linux/ramips/patches-5.15/100-v5.16-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch @@ -60,7 +60,7 @@ Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> obj-y += mobiveil/ --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -86,8 +86,6 @@ source "drivers/staging/vc04_services/Kc +@@ -84,8 +84,6 @@ source "drivers/staging/vc04_services/Kc source "drivers/staging/pi433/Kconfig" @@ -71,7 +71,7 @@ Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> source "drivers/staging/ralink-gdma/Kconfig" --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -33,7 +33,6 @@ obj-$(CONFIG_KS7010) += ks7010/ +@@ -32,7 +32,6 @@ obj-$(CONFIG_KS7010) += ks7010/ obj-$(CONFIG_GREYBUS) += greybus/ obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/ obj-$(CONFIG_PI433) += pi433/ diff --git a/target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch b/target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch index 7df22b0725..600901ee54 100644 --- a/target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch +++ b/target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch @@ -32,7 +32,7 @@ Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -15903,6 +15903,13 @@ S: Maintained +@@ -15904,6 +15904,13 @@ S: Maintained F: include/sound/rt*.h F: sound/soc/codecs/rt* diff --git a/target/linux/realtek/patches-5.15/800-net-mdio-support-hardware-assisted-indirect-access.patch b/target/linux/realtek/patches-5.15/800-net-mdio-support-hardware-assisted-indirect-access.patch index 7308c32775..bad2d5af03 100644 --- a/target/linux/realtek/patches-5.15/800-net-mdio-support-hardware-assisted-indirect-access.patch +++ b/target/linux/realtek/patches-5.15/800-net-mdio-support-hardware-assisted-indirect-access.patch @@ -32,7 +32,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c -@@ -742,6 +742,32 @@ out: +@@ -745,6 +745,32 @@ out: } /** @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> * __mdiobus_read - Unlocked version of the mdiobus_read function * @bus: the mii_bus struct * @addr: the phy address -@@ -761,7 +787,10 @@ int __mdiobus_read(struct mii_bus *bus, +@@ -764,7 +790,10 @@ int __mdiobus_read(struct mii_bus *bus, return -ENXIO; if (bus->read) @@ -77,7 +77,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> else retval = -EOPNOTSUPP; -@@ -773,6 +802,40 @@ int __mdiobus_read(struct mii_bus *bus, +@@ -776,6 +805,40 @@ int __mdiobus_read(struct mii_bus *bus, EXPORT_SYMBOL(__mdiobus_read); /** @@ -118,7 +118,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> * __mdiobus_write - Unlocked version of the mdiobus_write function * @bus: the mii_bus struct * @addr: the phy address -@@ -793,7 +856,10 @@ int __mdiobus_write(struct mii_bus *bus, +@@ -796,7 +859,10 @@ int __mdiobus_write(struct mii_bus *bus, return -ENXIO; if (bus->write) @@ -130,7 +130,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> else err = -EOPNOTSUPP; -@@ -805,6 +871,39 @@ int __mdiobus_write(struct mii_bus *bus, +@@ -808,6 +874,39 @@ int __mdiobus_write(struct mii_bus *bus, EXPORT_SYMBOL(__mdiobus_write); /** @@ -170,7 +170,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> * __mdiobus_modify_changed - Unlocked version of the mdiobus_modify function * @bus: the mii_bus struct * @addr: the phy address -@@ -837,6 +936,43 @@ int __mdiobus_modify_changed(struct mii_ +@@ -840,6 +939,43 @@ int __mdiobus_modify_changed(struct mii_ EXPORT_SYMBOL_GPL(__mdiobus_modify_changed); /** @@ -214,7 +214,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> * mdiobus_read_nested - Nested version of the mdiobus_read function * @bus: the mii_bus struct * @addr: the phy address -@@ -862,6 +998,79 @@ int mdiobus_read_nested(struct mii_bus * +@@ -865,6 +1001,79 @@ int mdiobus_read_nested(struct mii_bus * EXPORT_SYMBOL(mdiobus_read_nested); /** @@ -294,7 +294,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> * mdiobus_read - Convenience function for reading a given MII mgmt register * @bus: the mii_bus struct * @addr: the phy address -@@ -884,6 +1093,29 @@ int mdiobus_read(struct mii_bus *bus, in +@@ -887,6 +1096,29 @@ int mdiobus_read(struct mii_bus *bus, in EXPORT_SYMBOL(mdiobus_read); /** @@ -324,7 +324,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> * mdiobus_write_nested - Nested version of the mdiobus_write function * @bus: the mii_bus struct * @addr: the phy address -@@ -910,6 +1142,33 @@ int mdiobus_write_nested(struct mii_bus +@@ -913,6 +1145,33 @@ int mdiobus_write_nested(struct mii_bus EXPORT_SYMBOL(mdiobus_write_nested); /** @@ -358,7 +358,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> * mdiobus_write - Convenience function for writing a given MII mgmt register * @bus: the mii_bus struct * @addr: the phy address -@@ -933,6 +1192,30 @@ int mdiobus_write(struct mii_bus *bus, i +@@ -936,6 +1195,30 @@ int mdiobus_write(struct mii_bus *bus, i EXPORT_SYMBOL(mdiobus_write); /** @@ -389,7 +389,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> * mdiobus_modify - Convenience function for modifying a given mdio device * register * @bus: the mii_bus struct -@@ -954,6 +1237,51 @@ int mdiobus_modify(struct mii_bus *bus, +@@ -957,6 +1240,51 @@ int mdiobus_modify(struct mii_bus *bus, EXPORT_SYMBOL_GPL(mdiobus_modify); /** |