From: Yu Chen <chenyu56@huawei.com>
To: <linux-usb@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: <john.stultz@linaro.org>, <suzhuangluan@hisilicon.com>,
<kongfei@hisilicon.com>, <liuyu712@hisilicon.com>,
<wanghu17@hisilicon.com>, <butao@hisilicon.com>,
<chenyao11@huawei.com>, <fangshengzhou@hisilicon.com>,
<lipengcheng8@huawei.com>, <songxiaowei@hisilicon.com>,
<xuyiping@hisilicon.com>, <xuyoujun4@huawei.com>,
<yudongbin@hisilicon.com>, <zangleigang@hisilicon.com>,
Yu Chen <chenyu56@huawei.com>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Felipe Balbi <balbi@kernel.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
Binghui Wang <wangbinghui@hisilicon.com>
Subject: [PATCH v3 04/12] usb: dwc3: Add splitdisable quirk for Hisilicon Kirin Soc
Date: Sat, 2 Mar 2019 17:04:57 +0800 [thread overview]
Message-ID: <20190302090505.65542-5-chenyu56@huawei.com> (raw)
In-Reply-To: <20190302090505.65542-1-chenyu56@huawei.com>
SPLIT_BOUNDARY_DISABLE should be set for DesignWare USB3 DRD Core
of Hisilicon Kirin Soc when dwc3 core act as host.
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Felipe Balbi <balbi@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Binghui Wang <wangbinghui@hisilicon.com>
Signed-off-by: Yu Chen <chenyu56@huawei.com>
---
drivers/usb/dwc3/core.c | 24 ++++++++++++++++++++++++
drivers/usb/dwc3/core.h | 6 ++++++
2 files changed, 30 insertions(+)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index a1b126f90261..f7d561fe1f04 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -117,6 +117,7 @@ static void __dwc3_set_mode(struct work_struct *work)
struct dwc3 *dwc = work_to_dwc(work);
unsigned long flags;
int ret;
+ u32 reg;
if (dwc->dr_mode != USB_DR_MODE_OTG)
return;
@@ -169,6 +170,11 @@ static void __dwc3_set_mode(struct work_struct *work)
phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_HOST);
phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_HOST);
phy_calibrate(dwc->usb2_generic_phy);
+ if (dwc->dis_split_quirk) {
+ reg = dwc3_readl(dwc->regs, DWC3_GUCTL3);
+ reg |= DWC3_GUCTL3_SPLITDISABLE;
+ dwc3_writel(dwc->regs, DWC3_GUCTL3, reg);
+ }
}
break;
case DWC3_GCTL_PRTCAP_DEVICE:
@@ -1306,6 +1312,9 @@ static void dwc3_get_properties(struct dwc3 *dwc)
dwc->dis_metastability_quirk = device_property_read_bool(dev,
"snps,dis_metastability_quirk");
+ dwc->dis_split_quirk = device_property_read_bool(dev,
+ "snps,dis-split-quirk");
+
dwc->lpm_nyet_threshold = lpm_nyet_threshold;
dwc->tx_de_emphasis = tx_de_emphasis;
@@ -1825,10 +1834,25 @@ static int dwc3_resume(struct device *dev)
return 0;
}
+
+static void dwc3_complete(struct device *dev)
+{
+ struct dwc3 *dwc = dev_get_drvdata(dev);
+ u32 reg;
+
+ if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST &&
+ dwc->dis_split_quirk) {
+ dev_dbg(dwc->dev, "set DWC3_GUCTL3_SPLITDISABLE\n");
+ reg = dwc3_readl(dwc->regs, DWC3_GUCTL3);
+ reg |= DWC3_GUCTL3_SPLITDISABLE;
+ dwc3_writel(dwc->regs, DWC3_GUCTL3, reg);
+ }
+}
#endif /* CONFIG_PM_SLEEP */
static const struct dev_pm_ops dwc3_dev_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(dwc3_suspend, dwc3_resume)
+ .complete = dwc3_complete,
SET_RUNTIME_PM_OPS(dwc3_runtime_suspend, dwc3_runtime_resume,
dwc3_runtime_idle)
};
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index df876418cb78..bc2a1ebc0076 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -136,6 +136,7 @@
#define DWC3_GEVNTCOUNT(n) (0xc40c + ((n) * 0x10))
#define DWC3_GHWPARAMS8 0xc600
+#define DWC3_GUCTL3 0xc60c
#define DWC3_GFLADJ 0xc630
/* Device Registers */
@@ -370,6 +371,9 @@
/* Global User Control Register 2 */
#define DWC3_GUCTL2_RST_ACTBITLATER BIT(14)
+/* Global User Control Register 3 */
+#define DWC3_GUCTL3_SPLITDISABLE BIT(14)
+
/* Device Configuration Register */
#define DWC3_DCFG_DEVADDR(addr) ((addr) << 3)
#define DWC3_DCFG_DEVADDR_MASK DWC3_DCFG_DEVADDR(0x7f)
@@ -1210,6 +1214,8 @@ struct dwc3 {
unsigned dis_metastability_quirk:1;
+ unsigned dis_split_quirk:1;
+
u16 imod_interval;
};
--
2.15.0-rc2
next prev parent reply other threads:[~2019-03-02 9:06 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-02 9:04 [PATCH v3 00/12] Add support for usb on Hikey960 Yu Chen
2019-03-02 9:04 ` [PATCH v3 01/12] dt-bindings: phy: Add support for HiSilicon's hi3660 USB PHY Yu Chen
2019-03-12 13:45 ` Rob Herring
2019-03-13 1:40 ` Chen Yu
2019-03-13 19:38 ` Rob Herring
2019-03-02 9:04 ` [PATCH v3 02/12] dt-bindings: misc: Add bindings for HiSilicon usb hub and data role switch functionality on HiKey960 Yu Chen
2019-03-02 9:04 ` [PATCH v3 03/12] usb: dwc3: dwc3-of-simple: Add support for dwc3 of Hisilicon Soc Platform Yu Chen
2019-03-02 9:04 ` Yu Chen [this message]
2019-03-04 23:53 ` [PATCH v3 04/12] usb: dwc3: Add splitdisable quirk for Hisilicon Kirin Soc kbuild test robot
2019-03-05 3:11 ` kbuild test robot
2019-03-02 9:04 ` [PATCH v3 05/12] usb: dwc3: Execute GCTL Core Soft Reset while switch mdoe " Yu Chen
2019-03-02 9:04 ` [PATCH v3 06/12] usb: dwc3: Increase timeout for CmdAct cleared by device controller Yu Chen
2019-03-02 15:47 ` Andy Shevchenko
2019-03-04 2:53 ` //Re: " Chen Yu
2019-03-02 9:05 ` [PATCH v3 07/12] phy: Add usb phy support for hi3660 Soc of Hisilicon Yu Chen
2019-03-02 15:56 ` Andy Shevchenko
2019-03-04 2:37 ` Chen Yu
2019-03-02 9:05 ` [PATCH v3 08/12] usb: roles: Add usb role switch notifier Yu Chen
2019-03-02 9:05 ` [PATCH v3 09/12] usb: dwc3: Registering a role switch in the DRD code Yu Chen
2019-03-05 13:22 ` kbuild test robot
2019-03-02 9:05 ` [PATCH v3 10/12] hikey960: Support usb functionality of Hikey960 Yu Chen
2019-03-02 16:01 ` Andy Shevchenko
2019-03-04 2:35 ` Chen Yu
2019-03-04 6:55 ` Andy Shevchenko
2019-03-04 7:31 ` Chen Yu
2019-03-03 20:17 ` John Stultz
2019-03-04 1:27 ` Chen Yu
2019-03-04 1:47 ` Chunfeng Yun
2019-03-04 1:55 ` Chen Yu
2019-03-04 6:50 ` Andy Shevchenko
2019-03-04 6:58 ` Chunfeng Yun
2019-03-02 9:05 ` [PATCH v3 11/12] usb: gadget: Add configfs attribuite for controling match_existing_only Yu Chen
2019-03-02 9:05 ` [PATCH v3 12/12] dts: hi3660: Add support for usb on Hikey960 Yu Chen
2019-03-04 12:15 ` [PATCH v3 00/12] " Valentin Schneider
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190302090505.65542-5-chenyu56@huawei.com \
--to=chenyu56@huawei.com \
--cc=andy.shevchenko@gmail.com \
--cc=balbi@kernel.org \
--cc=butao@hisilicon.com \
--cc=chenyao11@huawei.com \
--cc=devicetree@vger.kernel.org \
--cc=fangshengzhou@hisilicon.com \
--cc=gregkh@linuxfoundation.org \
--cc=john.stultz@linaro.org \
--cc=kongfei@hisilicon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=lipengcheng8@huawei.com \
--cc=liuyu712@hisilicon.com \
--cc=songxiaowei@hisilicon.com \
--cc=suzhuangluan@hisilicon.com \
--cc=wangbinghui@hisilicon.com \
--cc=wanghu17@hisilicon.com \
--cc=xuyiping@hisilicon.com \
--cc=xuyoujun4@huawei.com \
--cc=yudongbin@hisilicon.com \
--cc=zangleigang@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).