mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 02:29:01 +00:00
22b9f99b87
Drop patch that was superseded upstream: ramips/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch Drop upstreamed patches: - apm821xx/020-0001-crypto-crypto4xx-remove-bad-list_del.patch - apm821xx/020-0011-crypto-crypto4xx-fix-crypto4xx_build_pdr-crypto4xx_b.patch - ath79/0011-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch - brcm63xx/001-4.15-08-bcm63xx_enet-correct-clock-usage.patch - brcm63xx/001-4.15-09-bcm63xx_enet-do-not-write-to-random-DMA-channel-on-B.patch - generic/backport/080-net-convert-sock.sk_wmem_alloc-from-atomic_t-to-refc.patch - generic/pending/170-usb-dwc2-Fix-DMA-alignment-to-start-at-allocated-boun.patch - generic/pending/900-gen_stats-fix-netlink-stats-padding.patch In 4.14.55, a patch was introduced that breaks ext4 images in some cases. The newly introduced patch backport-4.14/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch addresses this breakage. Fixes the following CVEs: - CVE-2018-10876 - CVE-2018-10877 - CVE-2018-10879 - CVE-2018-10880 - CVE-2018-10881 - CVE-2018-10882 - CVE-2018-10883 Compile-tested: ath79, octeon, x86/64 Runtime-tested: ath79, octeon, x86/64 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
110 lines
3.3 KiB
Diff
110 lines
3.3 KiB
Diff
From 531ef5ebea96394ddb7f554d4d88e017dde30a59 Mon Sep 17 00:00:00 2001
|
|
From: Amelie Delaunay <amelie.delaunay@st.com>
|
|
Date: Tue, 13 Feb 2018 09:28:12 +0100
|
|
Subject: [PATCH] usb: dwc2: add support for host mode external vbus supply
|
|
|
|
This patch adds a way to enable an external vbus supply in host mode,
|
|
when dwc2 drvvbus signal is not used.
|
|
|
|
This patch is very similar to the one done in U-Boot dwc2 driver [1]. It
|
|
also adds dynamic vbus supply management depending on the role and state
|
|
of the core.
|
|
|
|
[1] https://lists.denx.de/pipermail/u-boot/2017-March/283434.html
|
|
|
|
Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
|
|
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
|
---
|
|
drivers/usb/dwc2/core.h | 2 ++
|
|
drivers/usb/dwc2/hcd.c | 26 ++++++++++++++++++++++++++
|
|
2 files changed, 28 insertions(+)
|
|
|
|
--- a/drivers/usb/dwc2/core.h
|
|
+++ b/drivers/usb/dwc2/core.h
|
|
@@ -777,6 +777,7 @@ struct dwc2_hregs_backup {
|
|
* @plat: The platform specific configuration data. This can be
|
|
* removed once all SoCs support usb transceiver.
|
|
* @supplies: Definition of USB power supplies
|
|
+ * @vbus_supply: Regulator supplying vbus.
|
|
* @phyif: PHY interface width
|
|
* @lock: Spinlock that protects all the driver data structures
|
|
* @priv: Stores a pointer to the struct usb_hcd
|
|
@@ -913,6 +914,7 @@ struct dwc2_hsotg {
|
|
struct usb_phy *uphy;
|
|
struct dwc2_hsotg_plat *plat;
|
|
struct regulator_bulk_data supplies[DWC2_NUM_SUPPLIES];
|
|
+ struct regulator *vbus_supply;
|
|
u32 phyif;
|
|
|
|
spinlock_t lock;
|
|
--- a/drivers/usb/dwc2/hcd.c
|
|
+++ b/drivers/usb/dwc2/hcd.c
|
|
@@ -359,6 +359,23 @@ static void dwc2_gusbcfg_init(struct dwc
|
|
dwc2_writel(usbcfg, hsotg->regs + GUSBCFG);
|
|
}
|
|
|
|
+static int dwc2_vbus_supply_init(struct dwc2_hsotg *hsotg)
|
|
+{
|
|
+ hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");
|
|
+ if (IS_ERR(hsotg->vbus_supply))
|
|
+ return 0;
|
|
+
|
|
+ return regulator_enable(hsotg->vbus_supply);
|
|
+}
|
|
+
|
|
+static int dwc2_vbus_supply_exit(struct dwc2_hsotg *hsotg)
|
|
+{
|
|
+ if (hsotg->vbus_supply)
|
|
+ return regulator_disable(hsotg->vbus_supply);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
/**
|
|
* dwc2_enable_host_interrupts() - Enables the Host mode interrupts
|
|
*
|
|
@@ -3278,6 +3295,7 @@ static void dwc2_conn_id_status_change(s
|
|
|
|
/* B-Device connector (Device Mode) */
|
|
if (gotgctl & GOTGCTL_CONID_B) {
|
|
+ dwc2_vbus_supply_exit(hsotg);
|
|
/* Wait for switch to device mode */
|
|
dev_dbg(hsotg->dev, "connId B\n");
|
|
if (hsotg->bus_suspended) {
|
|
@@ -4384,6 +4402,9 @@ static int _dwc2_hcd_start(struct usb_hc
|
|
}
|
|
|
|
spin_unlock_irqrestore(&hsotg->lock, flags);
|
|
+
|
|
+ dwc2_vbus_supply_init(hsotg);
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
@@ -4411,6 +4432,8 @@ static void _dwc2_hcd_stop(struct usb_hc
|
|
clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
|
|
spin_unlock_irqrestore(&hsotg->lock, flags);
|
|
|
|
+ dwc2_vbus_supply_exit(hsotg);
|
|
+
|
|
usleep_range(1000, 3000);
|
|
}
|
|
|
|
@@ -4447,6 +4470,7 @@ static int _dwc2_hcd_suspend(struct usb_
|
|
hprt0 |= HPRT0_SUSP;
|
|
hprt0 &= ~HPRT0_PWR;
|
|
dwc2_writel(hprt0, hsotg->regs + HPRT0);
|
|
+ dwc2_vbus_supply_exit(hsotg);
|
|
}
|
|
|
|
/* Enter hibernation */
|
|
@@ -4527,6 +4551,8 @@ static int _dwc2_hcd_resume(struct usb_h
|
|
spin_unlock_irqrestore(&hsotg->lock, flags);
|
|
dwc2_port_resume(hsotg);
|
|
} else {
|
|
+ dwc2_vbus_supply_init(hsotg);
|
|
+
|
|
/* Wait for controller to correctly update D+/D- level */
|
|
usleep_range(3000, 5000);
|
|
|