mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-05 02:29:28 +00:00
1d94f72439
Rebased patches:
* generic: 273-batman-adv-Convert-packet.h-to-uapi-header.patch
* ipq806x: 0065-arm-override-compiler-flags.patch
* mvebu: 513-arm64-dts-marvell-armada37xx-Add-emmc-sdio-pinctrl-d.patch
Removed patches:
Fixed upstream:
* ar71xx: 821-serial-core-add-support-for-boot-console-with-arbitr.patch
* ath79: 921-serial-core-add-support-for-boot-console-with-arbitr.patch
- in 4.14.256 via 9112e7ef87149b3d8093e7446d784117f6e18d69
* mvebu: 527-PCI-aardvark-allow-to-specify-link-capability.patch
- in 4.14.257 via 62a3dc9b65a2b24800fc4267b8cf590fad135034
* mvebu: 524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch
- should be hopefully fixed by the bunch of changes in .256 and .257
Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia.
Fixes: CVE-2021-3640
Signed-off-by: Petr Štetiar <ynezz@true.cz>
73 lines
2.3 KiB
Diff
73 lines
2.3 KiB
Diff
--- a/drivers/usb/chipidea/ci.h
|
|
+++ b/drivers/usb/chipidea/ci.h
|
|
@@ -205,6 +205,7 @@ struct hw_bank {
|
|
* @in_lpm: if the core in low power mode
|
|
* @wakeup_int: if wakeup interrupt occur
|
|
* @rev: The revision number for controller
|
|
+ * @dp_always_pullup: keep dp always pullup at device mode
|
|
*/
|
|
struct ci_hdrc {
|
|
struct device *dev;
|
|
@@ -259,6 +260,7 @@ struct ci_hdrc {
|
|
bool in_lpm;
|
|
bool wakeup_int;
|
|
enum ci_revision rev;
|
|
+ bool dp_always_pullup;
|
|
};
|
|
|
|
static inline struct ci_role_driver *ci_role(struct ci_hdrc *ci)
|
|
--- a/drivers/usb/chipidea/core.c
|
|
+++ b/drivers/usb/chipidea/core.c
|
|
@@ -827,7 +827,7 @@ static inline void ci_role_destroy(struc
|
|
{
|
|
ci_hdrc_gadget_destroy(ci);
|
|
ci_hdrc_host_destroy(ci);
|
|
- if (ci->is_otg && ci->roles[CI_ROLE_GADGET])
|
|
+ if (!ci->dp_always_pullup && ci->roles[CI_ROLE_GADGET])
|
|
ci_hdrc_otg_destroy(ci);
|
|
}
|
|
|
|
@@ -932,6 +932,9 @@ static int ci_hdrc_probe(struct platform
|
|
CI_HDRC_SUPPORTS_RUNTIME_PM);
|
|
platform_set_drvdata(pdev, ci);
|
|
|
|
+ ci->dp_always_pullup = !!(ci->platdata->flags &
|
|
+ CI_HDRC_DP_ALWAYS_PULLUP);
|
|
+
|
|
ret = hw_device_init(ci, base);
|
|
if (ret < 0) {
|
|
dev_err(dev, "can't initialize hardware\n");
|
|
@@ -1020,7 +1023,7 @@ static int ci_hdrc_probe(struct platform
|
|
goto deinit_gadget;
|
|
}
|
|
|
|
- if (ci->is_otg && ci->roles[CI_ROLE_GADGET]) {
|
|
+ if (!ci->dp_always_pullup && ci->roles[CI_ROLE_GADGET]) {
|
|
ret = ci_hdrc_otg_init(ci);
|
|
if (ret) {
|
|
dev_err(dev, "init otg fails, ret = %d\n", ret);
|
|
--- a/drivers/usb/chipidea/otg.c
|
|
+++ b/drivers/usb/chipidea/otg.c
|
|
@@ -131,8 +131,10 @@ enum ci_role ci_otg_role(struct ci_hdrc
|
|
|
|
void ci_handle_vbus_change(struct ci_hdrc *ci)
|
|
{
|
|
- if (!ci->is_otg)
|
|
+ if (ci->dp_always_pullup) {
|
|
+ usb_gadget_vbus_connect(&ci->gadget);
|
|
return;
|
|
+ }
|
|
|
|
if (hw_read_otgsc(ci, OTGSC_BSV) && !ci->vbus_active)
|
|
usb_gadget_vbus_connect(&ci->gadget);
|
|
--- a/include/linux/usb/chipidea.h
|
|
+++ b/include/linux/usb/chipidea.h
|
|
@@ -60,6 +60,7 @@ struct ci_hdrc_platform_data {
|
|
#define CI_HDRC_OVERRIDE_RX_BURST BIT(11)
|
|
#define CI_HDRC_OVERRIDE_PHY_CONTROL BIT(12) /* Glue layer manages phy */
|
|
#define CI_HDRC_REQUIRES_ALIGNED_DMA BIT(13)
|
|
+#define CI_HDRC_DP_ALWAYS_PULLUP BIT(14)
|
|
enum usb_dr_mode dr_mode;
|
|
#define CI_HDRC_CONTROLLER_RESET_EVENT 0
|
|
#define CI_HDRC_CONTROLLER_STOPPED_EVENT 1
|