usb: dwc3: add support for AMD Nolan SoC
Subsystems (4)
v5 cover usb: dwc3: add support for AMD Nolan SoC
Hi,
The series of patches add AMD Nolan (NL) SoC support for DesignWare USB3 OTG IP with PCI bus glue layer. This controller supported hibernation, LPM erratum and used the 2.80a IP version and amd own phy. Current implementation support both simulation and SoC platform. And already tested with gadget zero and msc tool. It works well on file storage gadget.
These patches are rebased on balbi/testing/next, and only send the rest ones which are not applied.
Changes from v4 -> v5
- Rebase rest ones which are not applied on testing/next.
- Fix some typos.
- Add comments of hibernation patch.
Changes from v3 -> v4
- Add comment on hibernation patch
- Fix typos of commit log and comments
- Remove WARN_ON for temporary solution of FPGA board
- Rename tx deemph to tx de-emphasis
- Add documentation under Documentation/devicetree/bindings/usb/dwc3.txt
- Check FPGA flag on usb3 and usb2 suspend phy quirk
- Refine description of PCI quirk patch
- Remove amd_nl_plat flag at dwc3 structure
- Make HIRD threshold configurable
Changes from v2 -> v3
- Confirmed these quirks will be needed in product level
- Move AMD configuration patch to the last one with all quirk flags
- Make all quirks as 1-bit field instead of single-bits on a 32-bit variable
- Add all quirks DeviceTree counterparts
- Make LPM erratum configurable
- Add PCI ID into pci_ids.h because it will be used both on PCI and DWC3 device driver.
Changes from v1 -> v2
- Remove dual role function temporarily
- Add pci quirk to avoid to bind with xhci driver
- Distinguish between simulation board and soc
- Break down all the special quirks
Thanks,
Rui
Huang Rui (8):
usb: dwc3: add Tx de-emphasis quirk
usb: dwc3: add disable usb3 suspend phy quirk
usb: dwc3: add disable usb2 suspend phy quirk
PCI: Add support for AMD Nolan USB3 DRD
PCI: Prevent xHCI driver from claiming AMD Nolan USB3 DRD device
usb: dwc3: add support for AMD Nolan platform
usb: dwc3: make HIRD threshold configurable
usb: dwc3: point host-mode hibernation enablement not device-mode
Documentation/devicetree/bindings/usb/dwc3.txt | 8 ++++ drivers/pci/quirks.c | 20 ++++++++++ drivers/usb/dwc3/core.c | 53 +++++++++++++++++++++++++- drivers/usb/dwc3/core.h | 21 ++++++++++ drivers/usb/dwc3/dwc3-pci.c | 26 +++++++++++++ drivers/usb/dwc3/gadget.c | 8 +--- drivers/usb/dwc3/platform_data.h | 8 ++++ include/linux/pci_ids.h | 1 + 8 files changed, 138 insertions(+), 7 deletions(-)
Signature · 1 line
1.9.1
PATCH v5 1/8 usb: dwc3: add Tx de-emphasis quirk
This patch adds Tx de-emphasis quirk, and the Tx de-emphasis value is configurable according to PIPE3 specification.
Value Description
0 -6dB de-emphasis
1 -3.5dB de-emphasis
2 No de-emphasis
3 Reserved
It can be configured on DT or platform data.
--- Documentation/devicetree/bindings/usb/dwc3.txt | 3 +++ drivers/usb/dwc3/core.c | 17 +++++++++++++++++ drivers/usb/dwc3/core.h | 11 +++++++++++ drivers/usb/dwc3/platform_data.h | 3 +++ 4 files changed, 34 insertions(+)
Documentation/devicetree/bindings/usb/dwc3.txt +3 -0
@@ -29,6 +29,9 @@ Optional properties: - snps,lfps_filter_quirk: when set core will filter LFPS reception. - snps,rx_detect_poll_quirk: when set core will disable a 400us delay to start Polling LFPS after RX.Detect. + - snps,tx_de_emphasis_quirk: when set core will set Tx de-emphasis value. + - snps,tx_de_emphasis: the value driven to the PHY is controlled by the + LTSSM during USB3 Compliance mode. This is usually a subnode to DWC3 glue to which it is connected.
drivers/usb/dwc3/core.c +17 -0
@@ -401,6 +401,9 @@ static void dwc3_phy_setup(struct dwc3 *dwc)if (dwc->rx_detect_poll_quirk) reg |=DWC3_GUSB3PIPECTL_RX_DETOPOLL ; +if (dwc->tx_de_emphasis_quirk) + reg |=DWC3_GUSB3PIPECTL_TX_DEEPH (dwc->tx_de_emphasis); +dwc3_writel (dwc->regs,DWC3_GUSB3PIPECTL (0 ), reg);mdelay (100 );
@@ -715,6 +718,7 @@ static int dwc3_probe(struct platform_device *pdev)struct resource *res;struct dwc3 *dwc;u8 lpm_nyet_threshold; +u8 tx_de_emphasis;int ret;
@@ -773,6 +777,9 @@ static int dwc3_probe(struct platform_device *pdev)/* default to highest possible threshold */ lpm_nyet_threshold =0xff ; +/* default to -3.5dB de-emphasis */ + tx_de_emphasis =1 ; +if (node) { dwc->maximum_speed =of_usb_get_maximum_speed (node); dwc->has_lpm_erratum = of_property_read_bool(node,
@@ -800,6 +807,11 @@ static int dwc3_probe(struct platform_device *pdev) "snps,lfps_filter_quirk"); dwc->rx_detect_poll_quirk =of_property_read_bool (node,"snps,rx_detect_poll_quirk" ); + + dwc->tx_de_emphasis_quirk =of_property_read_bool (node, +"snps,tx_de_emphasis_quirk" ); +of_property_read_u8 (node,"snps,tx_de_emphasis" , + &tx_de_emphasis); }else if (pdata) { dwc->maximum_speed = pdata->maximum_speed; dwc->has_lpm_erratum = pdata->has_lpm_erratum;
@@ -817,6 +829,10 @@ static int dwc3_probe(struct platform_device *pdev) dwc->del_phy_power_chg_quirk = pdata->del_phy_power_chg_quirk; dwc->lfps_filter_quirk = pdata->lfps_filter_quirk; dwc->rx_detect_poll_quirk = pdata->rx_detect_poll_quirk; + + dwc->tx_de_emphasis_quirk = pdata->tx_de_emphasis_quirk; +if (pdata->tx_de_emphasis) + tx_de_emphasis = pdata->tx_de_emphasis; }/* default to superspeed if no maximum_speed passed */
@@ -824,6 +840,7 @@ static int dwc3_probe(struct platform_device *pdev) dwc->maximum_speed =USB_SPEED_SUPER ; dwc->lpm_nyet_threshold = lpm_nyet_threshold; + dwc->tx_de_emphasis = tx_de_emphasis; ret =dwc3_core_get_phy (dwc);if (ret)
drivers/usb/dwc3/core.h +11 -0
@@ -185,6 +185,8 @@#define DWC3_GUSB3PIPECTL_SUSPHY (1 << 17)#define DWC3_GUSB3PIPECTL_LFPSFILT (1 << 9)#define DWC3_GUSB3PIPECTL_RX_DETOPOLL (1 << 8) +#define DWC3_GUSB3PIPECTL_TX_DEEPH_MASK DWC3_GUSB3PIPECTL_TX_DEEPH(3) +#define DWC3_GUSB3PIPECTL_TX_DEEPH (n) ((n) << 1)/* Global TX Fifo Size Register */ #define DWC3_GTXFIFOSIZ_TXFDEF (n) ((n) & 0xffff)
@@ -695,6 +697,12 @@ struct dwc3_scratchpad_array {* @del_phy_power_chg_quirk: set if we enable delay phy power change quirk * @lfps_filter_quirk: set if we enable LFPS filter quirk * @rx_detect_poll_quirk: set if we enable rx_detect to polling lfps quirk +* @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk +* @tx_de_emphasis: Tx de-emphasis value +* 0 - -6dB de-emphasis +* 1 - -3.5dB de-emphasis +* 2 - No de-emphasis +* 3 - Reserved */ struct dwc3 {struct usb_ctrlrequest *ctrl_req;
@@ -810,6 +818,9 @@ struct dwc3 { unsigned del_phy_power_chg_quirk:1; unsigned lfps_filter_quirk:1; unsigned rx_detect_poll_quirk:1; + + unsigned tx_de_emphasis_quirk:1; + unsigned tx_de_emphasis:2; };/* -------------------------------------------------------------------------- */
drivers/usb/dwc3/platform_data.h +3 -0
@@ -36,4 +36,7 @@ struct dwc3_platform_data { unsigned del_phy_power_chg_quirk:1; unsigned lfps_filter_quirk:1; unsigned rx_detect_poll_quirk:1; + + unsigned tx_de_emphasis_quirk:1; + unsigned tx_de_emphasis:2; };
Signature · 1 line
1.9.1
PATCH v5 2/8 usb: dwc3: add disable usb3 suspend phy quirk
In reply to Huang RuiThis patch adds disable usb3 suspend phy quirk, and some special platforms can configure that if it is needed.
--- Documentation/devicetree/bindings/usb/dwc3.txt | 1 + drivers/usb/dwc3/core.c | 6 ++++++ drivers/usb/dwc3/core.h | 2 ++ drivers/usb/dwc3/platform_data.h | 1 + 4 files changed, 10 insertions(+)
Documentation/devicetree/bindings/usb/dwc3.txt +1 -0
@@ -32,6 +32,7 @@ Optional properties: - snps,tx_de_emphasis_quirk: when set core will set Tx de-emphasis value. - snps,tx_de_emphasis: the value driven to the PHY is controlled by the LTSSM during USB3 Compliance mode. + - snps,dis_u3_susphy_quirk: when set core will disable USB3 suspend phy. This is usually a subnode to DWC3 glue to which it is connected.
drivers/usb/dwc3/core.c +6 -0
@@ -404,6 +404,9 @@ static void dwc3_phy_setup(struct dwc3 *dwc)if (dwc->tx_de_emphasis_quirk) reg |=DWC3_GUSB3PIPECTL_TX_DEEPH (dwc->tx_de_emphasis); +if (dwc->dis_u3_susphy_quirk && dwc->is_fpga) + reg &= ~DWC3_GUSB3PIPECTL_SUSPHY ; +dwc3_writel (dwc->regs,DWC3_GUSB3PIPECTL (0 ), reg);mdelay (100 );
@@ -807,6 +810,8 @@ static int dwc3_probe(struct platform_device *pdev) "snps,lfps_filter_quirk"); dwc->rx_detect_poll_quirk =of_property_read_bool (node,"snps,rx_detect_poll_quirk" ); + dwc->dis_u3_susphy_quirk =of_property_read_bool (node, +"snps,dis_u3_susphy_quirk" ); dwc->tx_de_emphasis_quirk =of_property_read_bool (node,"snps,tx_de_emphasis_quirk" );
@@ -829,6 +834,7 @@ static int dwc3_probe(struct platform_device *pdev) dwc->del_phy_power_chg_quirk = pdata->del_phy_power_chg_quirk; dwc->lfps_filter_quirk = pdata->lfps_filter_quirk; dwc->rx_detect_poll_quirk = pdata->rx_detect_poll_quirk; + dwc->dis_u3_susphy_quirk = pdata->dis_u3_susphy_quirk; dwc->tx_de_emphasis_quirk = pdata->tx_de_emphasis_quirk;if (pdata->tx_de_emphasis)
drivers/usb/dwc3/core.h +2 -0
@@ -697,6 +697,7 @@ struct dwc3_scratchpad_array {* @del_phy_power_chg_quirk: set if we enable delay phy power change quirk * @lfps_filter_quirk: set if we enable LFPS filter quirk * @rx_detect_poll_quirk: set if we enable rx_detect to polling lfps quirk +* @dis_u3_susphy_quirk: set if we disable usb3 suspend phy * @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk * @tx_de_emphasis: Tx de-emphasis value * 0 - -6dB de-emphasis
@@ -818,6 +819,7 @@ struct dwc3 { unsigned del_phy_power_chg_quirk:1; unsigned lfps_filter_quirk:1; unsigned rx_detect_poll_quirk:1; + unsigned dis_u3_susphy_quirk:1; unsigned tx_de_emphasis_quirk:1; unsigned tx_de_emphasis:2;
drivers/usb/dwc3/platform_data.h +1 -0
@@ -36,6 +36,7 @@ struct dwc3_platform_data { unsigned del_phy_power_chg_quirk:1; unsigned lfps_filter_quirk:1; unsigned rx_detect_poll_quirk:1; + unsigned dis_u3_susphy_quirk:1; unsigned tx_de_emphasis_quirk:1; unsigned tx_de_emphasis:2;
Signature · 1 line
1.9.1
PATCH v5 3/8 usb: dwc3: add disable usb2 suspend phy quirk
In reply to Huang RuiThis patch adds disable usb2 suspend phy quirk, and some special platforms can configure that if it is needed.
--- Documentation/devicetree/bindings/usb/dwc3.txt | 1 + drivers/usb/dwc3/core.c | 6 ++++++ drivers/usb/dwc3/core.h | 2 ++ drivers/usb/dwc3/platform_data.h | 1 + 4 files changed, 10 insertions(+)
Documentation/devicetree/bindings/usb/dwc3.txt +1 -0
@@ -33,6 +33,7 @@ Optional properties: - snps,tx_de_emphasis: the value driven to the PHY is controlled by the LTSSM during USB3 Compliance mode. - snps,dis_u3_susphy_quirk: when set core will disable USB3 suspend phy. + - snps,dis_u2_susphy_quirk: when set core will disable USB2 suspend phy. This is usually a subnode to DWC3 glue to which it is connected.
drivers/usb/dwc3/core.c +6 -0
@@ -422,6 +422,9 @@ static void dwc3_phy_setup(struct dwc3 *dwc)if (dwc->revision >DWC3_REVISION_194A ) reg |=DWC3_GUSB2PHYCFG_SUSPHY ; +if (dwc->dis_u2_susphy_quirk && dwc->is_fpga) + reg &= ~DWC3_GUSB2PHYCFG_SUSPHY ; +dwc3_writel (dwc->regs,DWC3_GUSB2PHYCFG (0 ), reg);mdelay (100 );
@@ -812,6 +815,8 @@ static int dwc3_probe(struct platform_device *pdev) "snps,rx_detect_poll_quirk"); dwc->dis_u3_susphy_quirk =of_property_read_bool (node,"snps,dis_u3_susphy_quirk" ); + dwc->dis_u2_susphy_quirk =of_property_read_bool (node, +"snps,dis_u2_susphy_quirk" ); dwc->tx_de_emphasis_quirk =of_property_read_bool (node,"snps,tx_de_emphasis_quirk" );
@@ -835,6 +840,7 @@ static int dwc3_probe(struct platform_device *pdev) dwc->lfps_filter_quirk = pdata->lfps_filter_quirk; dwc->rx_detect_poll_quirk = pdata->rx_detect_poll_quirk; dwc->dis_u3_susphy_quirk = pdata->dis_u3_susphy_quirk; + dwc->dis_u2_susphy_quirk = pdata->dis_u2_susphy_quirk; dwc->tx_de_emphasis_quirk = pdata->tx_de_emphasis_quirk;if (pdata->tx_de_emphasis)
drivers/usb/dwc3/core.h +2 -0
@@ -698,6 +698,7 @@ struct dwc3_scratchpad_array {* @lfps_filter_quirk: set if we enable LFPS filter quirk * @rx_detect_poll_quirk: set if we enable rx_detect to polling lfps quirk * @dis_u3_susphy_quirk: set if we disable usb3 suspend phy +* @dis_u2_susphy_quirk: set if we disable usb2 suspend phy * @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk * @tx_de_emphasis: Tx de-emphasis value * 0 - -6dB de-emphasis
@@ -820,6 +821,7 @@ struct dwc3 { unsigned lfps_filter_quirk:1; unsigned rx_detect_poll_quirk:1; unsigned dis_u3_susphy_quirk:1; + unsigned dis_u2_susphy_quirk:1; unsigned tx_de_emphasis_quirk:1; unsigned tx_de_emphasis:2;
drivers/usb/dwc3/platform_data.h +1 -0
@@ -37,6 +37,7 @@ struct dwc3_platform_data { unsigned lfps_filter_quirk:1; unsigned rx_detect_poll_quirk:1; unsigned dis_u3_susphy_quirk:1; + unsigned dis_u2_susphy_quirk:1; unsigned tx_de_emphasis_quirk:1; unsigned tx_de_emphasis:2;
Signature · 1 line
1.9.1
PATCH v5 4/8 PCI: Add support for AMD Nolan USB3 DRD
In reply to Huang RuiThis patch adds PCI id for USB3 Dual-Role Device of AMD Nolan (NL) SoC. It will be used for PCI quirks and DWC3 device driver.
--- include/linux/pci_ids.h | 1 + 1 file changed, 1 insertion(+)
include/linux/pci_ids.h +1 -0
@@ -562,6 +562,7 @@#define PCI_DEVICE_ID_AMD_8131_BRIDGE 0x7450#define PCI_DEVICE_ID_AMD_8131_APIC 0x7451#define PCI_DEVICE_ID_AMD_8132_BRIDGE 0x7458 +#define PCI_DEVICE_ID_AMD_NL_USB 0x7912#define PCI_DEVICE_ID_AMD_CS5535_IDE 0x208F#define PCI_DEVICE_ID_AMD_CS5536_ISA 0x2090#define PCI_DEVICE_ID_AMD_CS5536_FLASH 0x2091
Signature · 1 line
1.9.1
PATCH v5 5/8 PCI: Prevent xHCI driver from claiming AMD Nolan USB3 DRD device
In reply to Huang RuiThe AMD Nolan (NL) SoC contains a DesignWare USB3 Dual-Role Device that can be operated either as a USB Host or a USB Device. In the AMD NL platform, this device ([1022:7912]) has a class code of PCI_CLASS_SERIAL_USB_XHCI (0x0c0330), which means the xhci driver will claim it.
But the dwc3 driver is a more specific driver for this device, and we'd prefer to use it instead of xhci. To prevent xhci from claiming the device, change the class code to 0x0c03fe, which the PCI r3.0 spec defines as "USB device (not host controller)". The dwc3 driver can then claim it based on its Vendor and Device ID.
--- drivers/pci/quirks.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/pci/quirks.c +20 -0
@@ -379,6 +379,26 @@ static void quirk_ati_exploding_mce(struct pci_dev *dev)DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,PCI_DEVICE_ID_ATI_RS100 , quirk_ati_exploding_mce);/* +* In the AMD NL platform, this device ([1022:7912]) has a class code of +* PCI_CLASS_SERIAL_USB_XHCI (0x0c0330), which means the xhci driver will +* claim it. +* But the dwc3 driver is a more specific driver for this device, and we'd +* prefer to use it instead of xhci. To prevent xhci from claiming the +* device, change the class code to 0x0c03fe, which the PCI r3.0 spec +* defines as "USB device (not host controller)". The dwc3 driver can then +* claim it based on its Vendor and Device ID. +*/ +static void quirk_amd_nl_class (struct pci_dev *pdev) +{ +/* +* Use 'USB Device' (0x0c03fe) instead of PCI header provided +*/ + pdev->class =0x0c03fe ; +} +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_NL_USB , + quirk_amd_nl_class); + +/* * Let's make the southbridge information explicit instead * of having to worry about people probing the ACPI areas, * for example.. (Yes, it happens, and if you read the wrong
Signature · 6 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v5 6/8 usb: dwc3: add support for AMD Nolan platform
In reply to Huang RuiThis patch adds support for AMD Nolan (NL) FPGA and SoC platform.
--- drivers/usb/dwc3/dwc3-pci.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/usb/dwc3/dwc3-pci.c +26 -0
@@ -145,6 +145,31 @@ static int dwc3_pci_probe(struct pci_dev *pci, res[1 ].name ="dwc_usb3" ; res[1 ].flags =IORESOURCE_IRQ ; +if (pci->vendor ==PCI_VENDOR_ID_AMD && + pci->device ==PCI_DEVICE_ID_AMD_NL_USB ) { + dwc3_pdata.has_lpm_erratum = true; + dwc3_pdata.lpm_nyet_threshold =0xf ; + + dwc3_pdata.u2exit_lfps_quirk = true; + dwc3_pdata.u2ss_inp3_quirk = true; + dwc3_pdata.req_p1p2p3_quirk = true; + dwc3_pdata.del_p1p2p3_quirk = true; + dwc3_pdata.del_phy_power_chg_quirk = true; + dwc3_pdata.lfps_filter_quirk = true; + dwc3_pdata.rx_detect_poll_quirk = true; + + dwc3_pdata.tx_de_emphasis_quirk = true; + dwc3_pdata.tx_de_emphasis =1 ; + +/* +* FIXME these quirks should be removed when AMD NL +* taps out +*/ + dwc3_pdata.disable_scramble_quirk = true; + dwc3_pdata.dis_u3_susphy_quirk = true; + dwc3_pdata.dis_u2_susphy_quirk = true; + } + ret =platform_device_add_resources (dwc3, res,ARRAY_SIZE (res));if (ret) {dev_err (dev,"couldn't add resources to dwc3 device\n" );
@@ -194,6 +219,7 @@ static const struct pci_device_id dwc3_pci_id_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BSW), }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT), }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MRFLD), }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB), }, { } /* Terminating Entry */ };MODULE_DEVICE_TABLE (pci, dwc3_pci_id_table);
Signature · 1 line
1.9.1
PATCH v5 7/8 usb: dwc3: make HIRD threshold configurable
In reply to Huang RuiHIRD threshold should be configurable by different platforms.
Quoted 1 line
From DesignWare databook:
When HIRD_Threshold[4] is set to 1b1 and HIRD value is greater than or equal to the value in HIRD_Threshold[3:0], dwc3 asserts output signals utmi_l1_suspend_n to put PHY into Deep Low-Power mode in L1.
When HIRD_Threshold[4] is set to 1b0 or the HIRD value is less than HIRD_Threshold[3:0], dwc3 asserts output signals utmi_sleep_n on L1.
--- Documentation/devicetree/bindings/usb/dwc3.txt | 3 +++ drivers/usb/dwc3/core.c | 17 +++++++++++++++++ drivers/usb/dwc3/core.h | 6 ++++++ drivers/usb/dwc3/gadget.c | 6 +----- drivers/usb/dwc3/platform_data.h | 3 +++ 5 files changed, 30 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/usb/dwc3.txt +3 -0
@@ -34,6 +34,9 @@ Optional properties: LTSSM during USB3 Compliance mode. - snps,dis_u3_susphy_quirk: when set core will disable USB3 suspend phy. - snps,dis_u2_susphy_quirk: when set core will disable USB2 suspend phy. + - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal + utmi_l1_suspend_n, false when asserts utmi_sleep_n + - snps,hird-threshold: HIRD threshold This is usually a subnode to DWC3 glue to which it is connected.
drivers/usb/dwc3/core.c +17 -0
@@ -725,6 +725,7 @@ static int dwc3_probe(struct platform_device *pdev)struct dwc3 *dwc;u8 lpm_nyet_threshold;u8 tx_de_emphasis; +u8 hird_threshold;int ret;
@@ -786,12 +787,22 @@ static int dwc3_probe(struct platform_device *pdev)/* default to -3.5dB de-emphasis */ tx_de_emphasis =1 ; +/* +* default to assert utmi_sleep_n and use maximum allowed HIRD +* threshold value of 0b1100 +*/ + hird_threshold =12 ; +if (node) { dwc->maximum_speed =of_usb_get_maximum_speed (node); dwc->has_lpm_erratum =of_property_read_bool (node,"snps,has-lpm-erratum" );of_property_read_u8 (node,"snps,lpm-nyet-threshold" , &lpm_nyet_threshold); + dwc->is_utmi_l1_suspend =of_property_read_bool (node, +"snps,is-utmi-l1-suspend" ); +of_property_read_u8 (node,"snps,hird-threshold" , + &hird_threshold); dwc->needs_fifo_resize =of_property_read_bool (node,"tx-fifo-resize" );
@@ -827,6 +838,9 @@ static int dwc3_probe(struct platform_device *pdev) dwc->has_lpm_erratum = pdata->has_lpm_erratum;if (pdata->lpm_nyet_threshold) lpm_nyet_threshold = pdata->lpm_nyet_threshold; + dwc->is_utmi_l1_suspend = pdata->is_utmi_l1_suspend; +if (pdata->hird_threshold) + hird_threshold = pdata->hird_threshold; dwc->needs_fifo_resize = pdata->tx_fifo_resize; dwc->dr_mode = pdata->dr_mode;
@@ -854,6 +868,9 @@ static int dwc3_probe(struct platform_device *pdev) dwc->lpm_nyet_threshold = lpm_nyet_threshold; dwc->tx_de_emphasis = tx_de_emphasis; + dwc->hird_threshold = hird_threshold + | (dwc->is_utmi_l1_suspend <<4 ); + ret =dwc3_core_get_phy (dwc);if (ret)return ret;
drivers/usb/dwc3/core.h +6 -0
@@ -675,12 +675,16 @@ struct dwc3_scratchpad_array {* @test_mode: true when we're entering a USB test mode * @test_mode_nr: test feature selector * @lpm_nyet_threshold: LPM NYET response threshold +* @hird_threshold: HIRD threshold * @delayed_status: true when gadget driver asks for delayed status * @ep0_bounced: true when we used bounce buffer * @ep0_expect_in: true when we expect a DATA IN transfer * @has_hibernation: true when dwc3 was configured with Hibernation * @has_lpm_erratum: true when core was configured with LPM Erratum. Note that * there's now way for software to detect this in runtime. +* @is_utmi_l1_suspend: the core asserts output signal +* 0 - utmi_sleep_n +* 1 - utmi_l1_suspend_n * @is_selfpowered: true when we are selfpowered * @is_fpga: true when we are using the FPGA board * @needs_fifo_resize: not all users might want fifo resizing, flag it
@@ -797,12 +801,14 @@ struct dwc3 {u8 test_mode;u8 test_mode_nr;u8 lpm_nyet_threshold; +u8 hird_threshold; unsigned delayed_status:1; unsigned ep0_bounced:1; unsigned ep0_expect_in:1; unsigned has_hibernation:1; unsigned has_lpm_erratum:1; + unsigned is_utmi_l1_suspend:1; unsigned is_selfpowered:1; unsigned is_fpga:1; unsigned needs_fifo_resize:1;
drivers/usb/dwc3/gadget.c +1 -5
@@ -2295,11 +2295,7 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc) reg =dwc3_readl (dwc->regs,DWC3_DCTL ); reg &= ~(DWC3_DCTL_HIRD_THRES_MASK |DWC3_DCTL_L1_HIBER_EN ); -/* -* TODO: This should be configurable. For now using -* maximum allowed HIRD threshold value of 0b1100 -*/ - reg |=DWC3_DCTL_HIRD_THRES (12 ); + reg |=DWC3_DCTL_HIRD_THRES (dwc->hird_threshold);/* * When dwc3 revisions >= 2.40a, LPM Erratum is enabled and
drivers/usb/dwc3/platform_data.h +3 -0
@@ -25,6 +25,9 @@ struct dwc3_platform_data {enum usb_dr_mode dr_mode;bool tx_fifo_resize; + unsigned is_utmi_l1_suspend:1; +u8 hird_threshold; +u8 lpm_nyet_threshold; unsigned disable_scramble_quirk:1;
Signature · 1 line
1.9.1
PATCH v5 8/8 usb: dwc3: point host-mode hibernation enablement not device-mode
In reply to Huang RuiSince the discussion of below thread, current enablement works for host-mode, device-mode hibernation is not implemented yet.
http://marc.info/?l=linux-usb&m=141452396814414&w=2
--- drivers/usb/dwc3/core.c | 7 ++++++- drivers/usb/dwc3/gadget.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/usb/dwc3/core.c +6 -1
@@ -512,8 +512,13 @@ static int dwc3_core_init(struct dwc3 *dwc) reg &= ~DWC3_GCTL_DSBLCLKGTNG ;break ;case DWC3_GHWPARAMS1_EN_PWROPT_HIB : -/* enable hibernation here */ dwc->nr_scratch =DWC3_GHWPARAMS4_HIBER_SCRATCHBUFS (hwparams4); +/* +* Enable hibernation here. +* +* Enabling this bit so that host-mode hibernation will +* work, device-mode hibernation is not implemented yet. +*/ reg |=DWC3_GCTL_GBLHIBERNATIONEN ;break ;default :
drivers/usb/dwc3/gadget.c +1 -1
@@ -2300,7 +2300,7 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)/* * When dwc3 revisions >= 2.40a, LPM Erratum is enabled and * DCFG.LPMCap is set, core responses with an ACK and the -* BESL value in the LPM token is less than or equal to lPM +* BESL value in the LPM token is less than or equal to LPM * NYET threshold. */ WARN_ONCE(dwc->revision < DWC3_REVISION_240A
Signature · 1 line
1.9.1