mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
9e86e0b33b
Changelogs: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.67 https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.68 https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.69 Upstreamed patches: target/linux/generic/backport-6.1/740-v6.9-01-netfilter-flowtable-validate-pppoe-header.patch [1] target/linux/generic/backport-6.1/740-v6.9-02-netfilter-flowtable-incorrect-pppoe-tuple.patch [2] target/linux/generic/backport-6.1/790-48-STABLE-net-dsa-mt7530-trap-link-local-frames-regardless-of-.patch [3] target/linux/generic/backport-6.1/790-50-v6.10-net-dsa-mt7530-fix-mirroring-frames-received-on-loca.patch [4] target/linux/generic/backport-6.1/790-16-v6.4-net-dsa-mt7530-set-all-CPU-ports-in-MT7531_CPU_PMAP.patch [5] target/linux/generic/backport-6.1/790-46-v6.9-net-dsa-mt7530-fix-improper-frames-on-all-25MHz-and-.patch [6] target/linux/generic/backport-6.1/790-47-v6.10-net-dsa-mt7530-fix-enabling-EEE-on-MT7531-switch-on-.patch [7] target/linux/mediatek/patches-6.1/220-v6.3-clk-mediatek-clk-gate-Propagate-struct-device-with-m.patch [8] target/linux/mediatek/patches-6.1/222-v6.3-clk-mediatek-clk-mtk-Propagate-struct-device-for-com.patch [9] target/linux/mediatek/patches-6.1/223-v6.3-clk-mediatek-clk-mux-Propagate-struct-device-for-mtk.patch [10] target/linux/mediatek/patches-6.1/226-v6.3-clk-mediatek-clk-mtk-Extend-mtk_clk_simple_probe.patch [11] Symbol changes: MITIGATION_SPECTRE_BHI (new) [12] SPECTRE_BHI_{ON,OFF} (deprecated) [12] References: [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=8bf7c76a2a207ca2b4cfda0a279192adf27678d7 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=f1c3c61701a0b12f4906152c1626a5de580ea3d2 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=19643bf8c9b5bb5eea5163bf2f6a3eee6fb5b99b [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=e86c9db58eba290e858e2bb80efcde9e3973a5ef [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=013c787d231188a6408e2991150d3c9bf9a2aa0b [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=41a004ffba9b1fd8a5a7128ebd0dfa3ed39c3316 [7] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=7d51db455ca03e5270cc585a75a674abd063fa6c [8] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=082b831488a41257b7ac7ffa1d80a0b60d98394d [9] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=6f5f72a684a2823f21efbfd20c7e4b528c44a781 [10] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=a4fe8813a7868ba5867e42e60de7a2b8baac30ff [11] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=c1d87d56af063c87961511ee25f6b07a5676d27d [12] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=d844df110084ef8bd950a52194865f3f63b561ca Signed-off-by: Shiji Yang <yangshiji66@qq.com>
105 lines
3.9 KiB
Diff
105 lines
3.9 KiB
Diff
From 7492e29b5535ca9694e45d6ca600a35169b690ec Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Bell <jonathan@raspberrypi.org>
|
|
Date: Tue, 11 Jun 2019 10:55:00 +0100
|
|
Subject: [PATCH] usb: add plumbing for updating interrupt endpoint
|
|
interval state
|
|
|
|
xHCI caches device and endpoint data after the interface is configured,
|
|
so an explicit command needs to be issued for any device driver wanting
|
|
to alter the polling interval of an endpoint.
|
|
|
|
Add usb_fixup_endpoint() to allow drivers to do this. The fixup must be
|
|
called after calculating endpoint bandwidth requirements but before any
|
|
URBs are submitted.
|
|
|
|
If polling intervals are shortened, any bandwidth reservations are no
|
|
longer valid but in practice polling intervals are only ever relaxed.
|
|
|
|
Limit the scope to interrupt transfers for now.
|
|
|
|
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|
---
|
|
drivers/usb/core/hcd.c | 10 ++++++++++
|
|
drivers/usb/core/message.c | 15 +++++++++++++++
|
|
include/linux/usb.h | 2 ++
|
|
include/linux/usb/hcd.h | 7 +++++++
|
|
4 files changed, 34 insertions(+)
|
|
|
|
--- a/drivers/usb/core/hcd.c
|
|
+++ b/drivers/usb/core/hcd.c
|
|
@@ -1977,6 +1977,16 @@ reset:
|
|
return ret;
|
|
}
|
|
|
|
+void usb_hcd_fixup_endpoint(struct usb_device *udev,
|
|
+ struct usb_host_endpoint *ep, int interval)
|
|
+{
|
|
+ struct usb_hcd *hcd;
|
|
+
|
|
+ hcd = bus_to_hcd(udev->bus);
|
|
+ if (hcd->driver->fixup_endpoint)
|
|
+ hcd->driver->fixup_endpoint(hcd, udev, ep, interval);
|
|
+}
|
|
+
|
|
/* Disables the endpoint: synchronizes with the hcd to make sure all
|
|
* endpoint state is gone from hardware. usb_hcd_flush_endpoint() must
|
|
* have been called previously. Use for set_configuration, set_interface,
|
|
--- a/drivers/usb/core/message.c
|
|
+++ b/drivers/usb/core/message.c
|
|
@@ -1263,6 +1263,21 @@ static void remove_intf_ep_devs(struct u
|
|
intf->ep_devs_created = 0;
|
|
}
|
|
|
|
+void usb_fixup_endpoint(struct usb_device *dev, int epaddr, int interval)
|
|
+{
|
|
+ unsigned int epnum = epaddr & USB_ENDPOINT_NUMBER_MASK;
|
|
+ struct usb_host_endpoint *ep;
|
|
+
|
|
+ if (usb_endpoint_out(epaddr))
|
|
+ ep = dev->ep_out[epnum];
|
|
+ else
|
|
+ ep = dev->ep_in[epnum];
|
|
+
|
|
+ if (ep && usb_endpoint_xfer_int(&ep->desc))
|
|
+ usb_hcd_fixup_endpoint(dev, ep, interval);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(usb_fixup_endpoint);
|
|
+
|
|
/**
|
|
* usb_disable_endpoint -- Disable an endpoint by address
|
|
* @dev: the device whose endpoint is being disabled
|
|
--- a/include/linux/usb.h
|
|
+++ b/include/linux/usb.h
|
|
@@ -1843,6 +1843,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);
|
|
+extern void usb_fixup_endpoint(struct usb_device *dev, int epaddr,
|
|
+ int interval);
|
|
|
|
/* this request isn't really synchronous, but it belongs with the others */
|
|
extern int usb_driver_set_configuration(struct usb_device *udev, int config);
|
|
--- a/include/linux/usb/hcd.h
|
|
+++ b/include/linux/usb/hcd.h
|
|
@@ -371,6 +371,11 @@ struct hc_driver {
|
|
* or bandwidth constraints.
|
|
*/
|
|
void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *);
|
|
+ /* Override the endpoint-derived interval
|
|
+ * (if there is any cached hardware state).
|
|
+ */
|
|
+ void (*fixup_endpoint)(struct usb_hcd *hcd, struct usb_device *udev,
|
|
+ struct usb_host_endpoint *ep, int interval);
|
|
/* Set the hardware-chosen device address */
|
|
int (*address_device)(struct usb_hcd *, struct usb_device *udev,
|
|
unsigned int timeout_ms);
|
|
@@ -436,6 +441,8 @@ extern void usb_hcd_unmap_urb_setup_for_
|
|
extern void usb_hcd_unmap_urb_for_dma(struct usb_hcd *, struct urb *);
|
|
extern void usb_hcd_flush_endpoint(struct usb_device *udev,
|
|
struct usb_host_endpoint *ep);
|
|
+extern void usb_hcd_fixup_endpoint(struct usb_device *udev,
|
|
+ struct usb_host_endpoint *ep, int interval);
|
|
extern void usb_hcd_disable_endpoint(struct usb_device *udev,
|
|
struct usb_host_endpoint *ep);
|
|
extern void usb_hcd_reset_endpoint(struct usb_device *udev,
|