From 4e05e7dddf9c0665135a743cfa32cbc8abc9e3aa Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 8 Sep 2022 06:19:20 -0400 Subject: [PATCH] kernel: bump 5.10 to 5.10.142 All patches automatically rebased. Signed-off-by: John Audia (cherry picked from commit 837fd23c80b22c566b40181a28630ac29af8f96e) --- include/kernel-5.10 | 4 ++-- .../802-usb-xhci-force-msi-renesas-xhci.patch | 2 +- ...core_get_rate_recalc-in-clk_rate_get.patch | 2 +- ...-for-updating-interrupt-endpoint-int.patch | 2 +- ...hci_fixup_endpoint-for-interval-adju.patch | 4 ++-- ...-raspberrypi-Also-support-HEVC-clock.patch | 2 +- ...37-clk-Introduce-a-clock-request-API.patch | 20 +++++++++---------- ...quests-Ignore-if-the-pointer-is-null.patch | 2 +- ...eference-the-request-pointer-after-t.patch | 2 +- ...96-clk-Always-clamp-the-rounded-rate.patch | 2 +- ...support-for-performing-fake-doorbell.patch | 6 +++--- .../780-usb-net-MeigLink_modem_support.patch | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 48ee49c920..e52f4b1c48 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .141 -LINUX_KERNEL_HASH-5.10.141 = 247afd935f96832eee07e6bcb97b6b0ee41efb4246803c9055df57ad2c1a0ef3 +LINUX_VERSION-5.10 = .142 +LINUX_KERNEL_HASH-5.10.142 = 3f47ebdb9afe152a0c32c1157336ef13fa5cc08ac6d884dfc1f6ddc2b7dba268 diff --git a/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch index e2b864df99..c995c90402 100644 --- a/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch +++ b/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch @@ -23,7 +23,7 @@ produce a noisy warning. xhci->quirks |= XHCI_RESET_ON_RESUME; --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -425,10 +425,14 @@ static int xhci_try_enable_msi(struct us +@@ -427,10 +427,14 @@ static int xhci_try_enable_msi(struct us free_irq(hcd->irq, hcd); hcd->irq = 0; diff --git a/target/linux/at91/patches-5.10/247-clk-use-clk_core_get_rate_recalc-in-clk_rate_get.patch b/target/linux/at91/patches-5.10/247-clk-use-clk_core_get_rate_recalc-in-clk_rate_get.patch index 2e8893645c..6751edec5c 100644 --- a/target/linux/at91/patches-5.10/247-clk-use-clk_core_get_rate_recalc-in-clk_rate_get.patch +++ b/target/linux/at91/patches-5.10/247-clk-use-clk_core_get_rate_recalc-in-clk_rate_get.patch @@ -18,7 +18,7 @@ Signed-off-by: Stephen Boyd --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c -@@ -3106,7 +3106,10 @@ static int clk_rate_get(void *data, u64 +@@ -3105,7 +3105,10 @@ static int clk_rate_get(void *data, u64 { struct clk_core *core = data; diff --git a/target/linux/bcm27xx/patches-5.10/950-0138-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch b/target/linux/bcm27xx/patches-5.10/950-0138-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch index a58df1bd13..96360b1748 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0138-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0138-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch @@ -70,7 +70,7 @@ Signed-off-by: Jonathan Bell * @dev: the device whose endpoint is being disabled --- a/include/linux/usb.h +++ b/include/linux/usb.h -@@ -1838,6 +1838,8 @@ extern int usb_clear_halt(struct usb_dev +@@ -1840,6 +1840,8 @@ extern int usb_clear_halt(struct usb_dev extern int usb_reset_configuration(struct usb_device *dev); extern int usb_set_interface(struct usb_device *dev, int ifnum, int alternate); extern void usb_reset_endpoint(struct usb_device *dev, unsigned int epaddr); diff --git a/target/linux/bcm27xx/patches-5.10/950-0139-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/bcm27xx/patches-5.10/950-0139-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch index d68d45b65d..6a8281971d 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0139-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0139-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch @@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1494,6 +1494,103 @@ command_cleanup: +@@ -1485,6 +1485,103 @@ command_cleanup: } /* @@ -119,7 +119,7 @@ Signed-off-by: Jonathan Bell * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it */ -@@ -5400,6 +5497,7 @@ static const struct hc_driver xhci_hc_dr +@@ -5391,6 +5488,7 @@ static const struct hc_driver xhci_hc_dr .endpoint_reset = xhci_endpoint_reset, .check_bandwidth = xhci_check_bandwidth, .reset_bandwidth = xhci_reset_bandwidth, diff --git a/target/linux/bcm27xx/patches-5.10/950-0513-clk-raspberrypi-Also-support-HEVC-clock.patch b/target/linux/bcm27xx/patches-5.10/950-0513-clk-raspberrypi-Also-support-HEVC-clock.patch index 6b44611e61..156e152853 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0513-clk-raspberrypi-Also-support-HEVC-clock.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0513-clk-raspberrypi-Also-support-HEVC-clock.patch @@ -10,7 +10,7 @@ Signed-off-by: Dom Cobley --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c -@@ -271,6 +271,7 @@ static int raspberrypi_discover_clocks(s +@@ -276,6 +276,7 @@ static int raspberrypi_discover_clocks(s case RPI_FIRMWARE_CORE_CLK_ID: case RPI_FIRMWARE_M2MC_CLK_ID: case RPI_FIRMWARE_V3D_CLK_ID: diff --git a/target/linux/bcm27xx/patches-5.10/950-0537-clk-Introduce-a-clock-request-API.patch b/target/linux/bcm27xx/patches-5.10/950-0537-clk-Introduce-a-clock-request-API.patch index e90134d682..08704ebc00 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0537-clk-Introduce-a-clock-request-API.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0537-clk-Introduce-a-clock-request-API.patch @@ -75,7 +75,7 @@ Signed-off-by: Maxime Ripard /*** runtime pm ***/ static int clk_pm_runtime_get(struct clk_core *core) { -@@ -1431,10 +1439,14 @@ unsigned long clk_hw_round_rate(struct c +@@ -1430,10 +1438,14 @@ unsigned long clk_hw_round_rate(struct c { int ret; struct clk_rate_request req; @@ -90,7 +90,7 @@ Signed-off-by: Maxime Ripard ret = clk_core_round_rate_nolock(hw->core, &req); if (ret) return 0; -@@ -1455,6 +1467,7 @@ EXPORT_SYMBOL_GPL(clk_hw_round_rate); +@@ -1454,6 +1466,7 @@ EXPORT_SYMBOL_GPL(clk_hw_round_rate); long clk_round_rate(struct clk *clk, unsigned long rate) { struct clk_rate_request req; @@ -98,7 +98,7 @@ Signed-off-by: Maxime Ripard int ret; if (!clk) -@@ -1468,6 +1481,9 @@ long clk_round_rate(struct clk *clk, uns +@@ -1467,6 +1480,9 @@ long clk_round_rate(struct clk *clk, uns clk_core_get_boundaries(clk->core, &req.min_rate, &req.max_rate); req.rate = rate; @@ -108,7 +108,7 @@ Signed-off-by: Maxime Ripard ret = clk_core_round_rate_nolock(clk->core, &req); if (clk->exclusive_count) -@@ -1935,6 +1951,7 @@ static struct clk_core *clk_calc_new_rat +@@ -1934,6 +1950,7 @@ static struct clk_core *clk_calc_new_rat unsigned long new_rate; unsigned long min_rate; unsigned long max_rate; @@ -116,7 +116,7 @@ Signed-off-by: Maxime Ripard int p_index = 0; long ret; -@@ -1949,6 +1966,9 @@ static struct clk_core *clk_calc_new_rat +@@ -1948,6 +1965,9 @@ static struct clk_core *clk_calc_new_rat clk_core_get_boundaries(core, &min_rate, &max_rate); @@ -126,7 +126,7 @@ Signed-off-by: Maxime Ripard /* find the closest rate and parent clk/rate */ if (clk_core_can_round(core)) { struct clk_rate_request req; -@@ -2153,6 +2173,7 @@ static unsigned long clk_core_req_round_ +@@ -2152,6 +2172,7 @@ static unsigned long clk_core_req_round_ { int ret, cnt; struct clk_rate_request req; @@ -134,7 +134,7 @@ Signed-off-by: Maxime Ripard lockdep_assert_held(&prepare_lock); -@@ -2167,6 +2188,9 @@ static unsigned long clk_core_req_round_ +@@ -2166,6 +2187,9 @@ static unsigned long clk_core_req_round_ clk_core_get_boundaries(core, &req.min_rate, &req.max_rate); req.rate = req_rate; @@ -144,7 +144,7 @@ Signed-off-by: Maxime Ripard ret = clk_core_round_rate_nolock(core, &req); /* restore the protection */ -@@ -2260,6 +2284,9 @@ int clk_set_rate(struct clk *clk, unsign +@@ -2259,6 +2283,9 @@ int clk_set_rate(struct clk *clk, unsign ret = clk_core_set_rate_nolock(clk->core, rate); @@ -154,7 +154,7 @@ Signed-off-by: Maxime Ripard if (clk->exclusive_count) clk_core_rate_protect(clk->core); -@@ -2426,6 +2453,99 @@ int clk_set_max_rate(struct clk *clk, un +@@ -2425,6 +2452,99 @@ int clk_set_max_rate(struct clk *clk, un EXPORT_SYMBOL_GPL(clk_set_max_rate); /** @@ -254,7 +254,7 @@ Signed-off-by: Maxime Ripard * clk_get_parent - return the parent of a clk * @clk: the clk whose parent gets returned * -@@ -3875,6 +3995,7 @@ __clk_register(struct device *dev, struc +@@ -3874,6 +3994,7 @@ __clk_register(struct device *dev, struc goto fail_parents; INIT_HLIST_HEAD(&core->clks); diff --git a/target/linux/bcm27xx/patches-5.10/950-0572-clk-requests-Ignore-if-the-pointer-is-null.patch b/target/linux/bcm27xx/patches-5.10/950-0572-clk-requests-Ignore-if-the-pointer-is-null.patch index 973fc4e92b..0fb6c8d2ae 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0572-clk-requests-Ignore-if-the-pointer-is-null.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0572-clk-requests-Ignore-if-the-pointer-is-null.patch @@ -10,7 +10,7 @@ Signed-off-by: Maxime Ripard --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c -@@ -2522,6 +2522,9 @@ void clk_request_done(struct clk_request +@@ -2521,6 +2521,9 @@ void clk_request_done(struct clk_request { struct clk_core *core = req->clk->core; diff --git a/target/linux/bcm27xx/patches-5.10/950-0581-clk-requests-Dereference-the-request-pointer-after-t.patch b/target/linux/bcm27xx/patches-5.10/950-0581-clk-requests-Dereference-the-request-pointer-after-t.patch index 9f7ccf85e9..ed394c19a8 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0581-clk-requests-Dereference-the-request-pointer-after-t.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0581-clk-requests-Dereference-the-request-pointer-after-t.patch @@ -15,7 +15,7 @@ Signed-off-by: Maxime Ripard --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c -@@ -2520,10 +2520,11 @@ EXPORT_SYMBOL_GPL(clk_request_start); +@@ -2519,10 +2519,11 @@ EXPORT_SYMBOL_GPL(clk_request_start); */ void clk_request_done(struct clk_request *req) { diff --git a/target/linux/bcm27xx/patches-5.10/950-0596-clk-Always-clamp-the-rounded-rate.patch b/target/linux/bcm27xx/patches-5.10/950-0596-clk-Always-clamp-the-rounded-rate.patch index 868e1569bc..83c1b6ff6e 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0596-clk-Always-clamp-the-rounded-rate.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0596-clk-Always-clamp-the-rounded-rate.patch @@ -17,7 +17,7 @@ Signed-off-by: Maxime Ripard --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c -@@ -1334,6 +1334,8 @@ static int clk_core_determine_round_nolo +@@ -1333,6 +1333,8 @@ static int clk_core_determine_round_nolo if (!core) return 0; diff --git a/target/linux/bcm53xx/patches-5.10/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/target/linux/bcm53xx/patches-5.10/180-usb-xhci-add-support-for-performing-fake-doorbell.patch index b51419c9b8..d6c206a5cd 100644 --- a/target/linux/bcm53xx/patches-5.10/180-usb-xhci-add-support-for-performing-fake-doorbell.patch +++ b/target/linux/bcm53xx/patches-5.10/180-usb-xhci-add-support-for-performing-fake-doorbell.patch @@ -40,7 +40,7 @@ it on BCM4708 family. /* called during probe() after chip reset completes */ --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -156,6 +156,49 @@ int xhci_start(struct xhci_hcd *xhci) +@@ -158,6 +158,49 @@ int xhci_start(struct xhci_hcd *xhci) return ret; } @@ -90,7 +90,7 @@ it on BCM4708 family. /* * Reset a halted HC. * -@@ -606,10 +649,20 @@ static int xhci_init(struct usb_hcd *hcd +@@ -608,10 +651,20 @@ static int xhci_init(struct usb_hcd *hcd static int xhci_run_finished(struct xhci_hcd *xhci) { @@ -114,7 +114,7 @@ it on BCM4708 family. xhci->shared_hcd->state = HC_STATE_RUNNING; xhci->cmd_ring_state = CMD_RING_STATE_RUNNING; -@@ -619,6 +672,10 @@ static int xhci_run_finished(struct xhci +@@ -621,6 +674,10 @@ static int xhci_run_finished(struct xhci xhci_dbg_trace(xhci, trace_xhci_dbg_init, "Finished xhci_run for USB3 roothub"); return 0; diff --git a/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch index 344ba809a9..0c0739e7eb 100644 --- a/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch +++ b/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch @@ -19,7 +19,7 @@ #define QUECTEL_VENDOR_ID 0x2c7c /* These Quectel products use Quectel's vendor ID */ -@@ -1133,6 +1135,11 @@ static const struct usb_device_id option +@@ -1140,6 +1142,11 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) }, { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), .driver_info = RSVD(4) }, -- 2.30.2