ADD interconnect support for Qualcomm DWC3 driver
Subsystems (5)
PATCH v5 2/3 usb: dwc3: qcom: Add interconnect support in dwc3 driver
In reply to Sandeep MaheswaramAdd interconnect support in dwc3-qcom driver to vote for bus bandwidth.
This requires for two different paths - from USB master to DDR slave. The other is from APPS master to USB slave.
--- drivers/usb/dwc3/dwc3-qcom.c | 135 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 133 insertions(+), 2 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +133 -2
@@ -13,6 +13,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/extcon.h> +#include <linux/interconnect.h> #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/phy/phy.h>
@@ -43,6 +44,14 @@#define SDM845_QSCRATCH_SIZE 0x400#define SDM845_DWC3_CORE_SIZE 0xcd00 +/* Interconnect path bandwidths in MBps */ +#define USB_MEMORY_AVG_HS_BW MBps_to_icc(240) +#define USB_MEMORY_PEAK_HS_BW MBps_to_icc(700) +#define USB_MEMORY_AVG_SS_BW MBps_to_icc(1000) +#define USB_MEMORY_PEAK_SS_BW MBps_to_icc(2500) +#define APPS_USB_AVG_BW 0 +#define APPS_USB_PEAK_BW MBps_to_icc(40) +struct dwc3_acpi_pdata {u32 qscratch_base_offset;u32 qscratch_base_size;
@@ -76,8 +85,13 @@ struct dwc3_qcom {enum usb_dr_mode mode;bool is_suspended;bool pm_suspended; +struct icc_path *usb_ddr_icc_path; +struct icc_path *apps_usb_icc_path; }; +static int dwc3_qcom_interconnect_enable (struct dwc3_qcom *qcom); +static int dwc3_qcom_interconnect_disable (struct dwc3_qcom *qcom); +static inline void dwc3_qcom_setbits (void __iomem *base,u32 offset,u32 val) {u32 reg;
@@ -239,7 +253,7 @@ static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom)static int dwc3_qcom_suspend (struct dwc3_qcom *qcom) {u32 val; -int i; +int i, ret;if (qcom->is_suspended)return 0 ;
@@ -251,6 +265,10 @@ static int dwc3_qcom_suspend(struct dwc3_qcom *qcom)for (i = qcom->num_clocks -1 ; i >=0 ; i--)clk_disable_unprepare (qcom->clks[i]); + ret =dwc3_qcom_interconnect_disable (qcom); +if (ret) +dev_warn (qcom->dev,"failed to disable interconnect %d\n" , ret); + qcom->is_suspended = true;dwc3_qcom_enable_interrupts (qcom);
@@ -276,6 +294,10 @@ static int dwc3_qcom_resume(struct dwc3_qcom *qcom) } } + ret =dwc3_qcom_interconnect_enable (qcom); +if (ret) +dev_warn (qcom->dev,"failed to enable interconnect %d\n" , ret); +/* Clear existing events from PHY related to L2 in/out */ dwc3_qcom_setbits (qcom->qscratch_base,PWR_EVNT_IRQ_STAT_REG ,PWR_EVNT_LPM_IN_L2_MASK |PWR_EVNT_LPM_OUT_L2_MASK );
@@ -285,6 +307,108 @@ static int dwc3_qcom_resume(struct dwc3_qcom *qcom)return 0 ; } + +/** +* dwc3_qcom_interconnect_init() - Get interconnect path handles +* @qcom: Pointer to the concerned usb core. +* +*/ +static int dwc3_qcom_interconnect_init (struct dwc3_qcom *qcom) +{ +struct device *dev = qcom->dev; +int ret; + +if (!device_is_bound (&qcom->dwc3->dev)) +return -EPROBE_DEFER ; + + qcom->usb_ddr_icc_path =of_icc_get (dev,"usb-ddr" ); +if (IS_ERR (qcom->usb_ddr_icc_path)) { +dev_err (dev,"Error: (%ld) failed getting usb-ddr path\n" , +PTR_ERR (qcom->usb_ddr_icc_path)); +return PTR_ERR (qcom->usb_ddr_icc_path); + } + + qcom->apps_usb_icc_path =of_icc_get (dev,"apps-usb" ); +if (IS_ERR (qcom->apps_usb_icc_path)) { +dev_err (dev,"Error: (%ld) failed getting apps-usb path\n" , +PTR_ERR (qcom->apps_usb_icc_path)); +return PTR_ERR (qcom->apps_usb_icc_path); + } + + ret =dwc3_qcom_interconnect_enable (qcom); +if (ret) { +dev_err (dev,"failed to enable interconnect %d\n" , ret); +return ret; + } + +return 0 ; +} + +/** +* dwc3_qcom_interconnect_exit() - Release interconnect path handles +* @qcom: Pointer to the concerned usb core. +* +* This function is used to release interconnect path handle. +*/ +static void dwc3_qcom_interconnect_exit (struct dwc3_qcom *qcom) +{ +icc_put (qcom->usb_ddr_icc_path); +icc_put (qcom->apps_usb_icc_path); +} + +/* Currently we only use bandwidth level, so just "enable" interconnects */ +static int dwc3_qcom_interconnect_enable (struct dwc3_qcom *qcom) +{ +struct dwc3 *dwc =platform_get_drvdata (qcom->dwc3); +int ret; + +if (dwc->maximum_speed ==USB_SPEED_SUPER ) { + ret =icc_set_bw (qcom->usb_ddr_icc_path, +USB_MEMORY_AVG_SS_BW ,USB_MEMORY_PEAK_SS_BW ); + }else { + ret =icc_set_bw (qcom->usb_ddr_icc_path, +USB_MEMORY_AVG_HS_BW ,USB_MEMORY_PEAK_HS_BW ); + } + +if (ret) +return ret; + + ret =icc_set_bw (qcom->apps_usb_icc_path, +APPS_USB_AVG_BW ,APPS_USB_PEAK_BW ); +if (ret) +icc_set_bw (qcom->usb_ddr_icc_path,0 ,0 ); + +return ret; +} + +/* To disable an interconnect, we just set its bandwidth to 0 */ +static int dwc3_qcom_interconnect_disable (struct dwc3_qcom *qcom) +{ +struct dwc3 *dwc =platform_get_drvdata (qcom->dwc3); +int ret; + + ret =icc_set_bw (qcom->usb_ddr_icc_path,0 ,0 ); +if (ret) +return ret; + + ret =icc_set_bw (qcom->apps_usb_icc_path,0 ,0 ); +if (ret) + goto err_reenable_memory_path; + +return 0 ; + +/* Re-enable things in the event of an error */ +err_reenable_memory_path: +if (dwc->maximum_speed ==USB_SPEED_SUPER ) +icc_set_bw (qcom->usb_ddr_icc_path, +USB_MEMORY_AVG_SS_BW ,USB_MEMORY_PEAK_SS_BW ); +else +icc_set_bw (qcom->usb_ddr_icc_path, +USB_MEMORY_AVG_HS_BW ,USB_MEMORY_PEAK_HS_BW ); + +return ret; +} +static irqreturn_t qcom_dwc3_resume_irq (int irq,void *data) {struct dwc3_qcom *qcom = data;
@@ -648,6 +772,10 @@ static int dwc3_qcom_probe(struct platform_device *pdev) goto depopulate; } + ret =dwc3_qcom_interconnect_init (qcom); +if (ret) + goto depopulate; + qcom->mode =usb_get_dr_mode (&qcom->dwc3->dev);/* enable vbus override for device mode */
@@ -657,7 +785,7 @@ static int dwc3_qcom_probe(struct platform_device *pdev)/* register extcon to override sw_vbus on Vbus change later */ ret =dwc3_qcom_register_extcon (qcom);if (ret) - goto depopulate; + goto interconnect_exit;device_init_wakeup (&pdev->dev,1 ); qcom->is_suspended = false;
@@ -667,6 +795,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev)return 0 ; +interconnect_exit: +dwc3_qcom_interconnect_exit (qcom); depopulate:if (np)of_platform_depopulate (&pdev->dev);
@@ -697,6 +827,7 @@ static int dwc3_qcom_remove(struct platform_device *pdev) } qcom->num_clocks =0 ; +dwc3_qcom_interconnect_exit (qcom);reset_control_assert (qcom->resets);pm_runtime_allow (dev);
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v5 1/3 dt-bindings: usb: qcom,dwc3: Introduce interconnect properties for Qualcomm DWC3 driver
In reply to Sandeep MaheswaramAdd documentation for the interconnects and interconnect-names properties for USB.
--- Documentation/devicetree/bindings/usb/qcom,dwc3.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +16 -0
@@ -68,6 +68,22 @@ properties: resets: maxItems: 1 + interconnects: + description: + Pairs of phandles and interconnect provider specifiers + to denote the edge source and destination ports of + the interconnect path. Please refer to + Documentation/devicetree/bindings/interconnect/ + for more details. + + interconnect-names: + description: + List of interconnect path name strings sorted in the same + order as the interconnects property. Consumer drivers will use + interconnect-names to match interconnect paths with interconnect + specifiers. Please refer to Documentation/devicetree/bindings/ + interconnect/ for more details. + interrupts: items: - description: The interrupt that is asserted
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v5 3/3 arm64: dts: sdm845: Add interconnect properties for USB
In reply to Sandeep MaheswaramPopulate USB DT nodes with interconnect properties.
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +12 -0
@@ -2563,6 +2563,12 @@ resets = <&gcc GCC_USB30_PRIM_BCR>; + interconnects = <&aggre2_noc MASTER_USB3_0 + &mem_noc SLAVE_EBI1>, + <&gladiator_noc MASTER_APPSS_PROC + &config_noc SLAVE_USB3_0>; + interconnect-names = "usb-ddr", "apps-usb"; + usb_1_dwc3: dwc3@a600000 { compatible = "snps,dwc3"; reg = <0 0x0a600000 0 0xcd00>;
@@ -2607,6 +2613,12 @@ resets = <&gcc GCC_USB30_SEC_BCR>; + interconnects = <&aggre2_noc MASTER_USB3_1 + &mem_noc SLAVE_EBI1>, + <&gladiator_noc MASTER_APPSS_PROC + &config_noc SLAVE_USB3_1>; + interconnect-names = "usb-ddr", "apps-usb"; + usb_2_dwc3: dwc3@a800000 { compatible = "snps,dwc3"; reg = <0 0x0a800000 0 0xcd00>;
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
v5 cover ADD interconnect support for Qualcomm DWC3 driver
This path series aims to add interconnect support in dwc3-qcom driver on SDM845 SoCs.
Changes from v4 -> v5
Quoted 1 line
[PATCH 1/3] Added the interconnect properties in yaml. This patch depends
on series https://patchwork.kernel.org/cover/11372641/.
Quoted 2 lines
[PATCH 2/3] Fixed review comments from Matthias in DWC3 driver. [PATCH 3/3] Modified as per the new interconnect nodes in sdm845. Depends
on series https://patchwork.kernel.org/cover/11372211/.
Changes from v3 -> v4
Quoted 2 lines
Fixed review comments from Matthias
[PATCH 1/3] and [PATCH 3/3] remains unchanged
Changes from v2 -> v3
Quoted 2 lines
Fixed review comments from Matthias and Manu changed the functions prefix from usb_* to dwc3_qcom_*
Changes since V1:
Quoted 2 lines
Comments by Georgi Djakov on "[PATCH 2/3]" addressed [PATCH 1/3] and [PATCH 3/3] remains unchanged
Sandeep Maheswaram (3):
dt-bindings: usb: qcom,dwc3: Introduce interconnect properties for
Qualcomm DWC3 driver
usb: dwc3: qcom: Add interconnect support in dwc3 driver
arm64: dts: sdm845: Add interconnect properties for USB
.../devicetree/bindings/usb/qcom,dwc3.yaml | 16 +++ arch/arm64/boot/dts/qcom/sdm845.dtsi | 12 ++ drivers/usb/dwc3/dwc3-qcom.c | 135 ++++++++++++++++++++- 3 files changed, 161 insertions(+), 2 deletions(-)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v5 2/3] usb: dwc3: qcom: Add interconnect support in dwc3 driver
In reply to Sandeep MaheswaramHi Sandeep,
Quoted 63 lines · Sandeep Maheswaram
Add interconnect support in dwc3-qcom driver to vote for bus bandwidth.
This requires for two different paths - from USB master to DDR slave. The other is from APPS master to USB slave.
Signed-off-by Sandeep Maheswaram <[email protected]>Signed-off-by Chandana Kishori Chiluveru <[email protected]>--- drivers/usb/dwc3/dwc3-qcom.c | 135 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 133 insertions(+), 2 deletions(-)drivers/usb/dwc3/dwc3-qcom.c +15
-1@@ -13,6 +13,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/extcon.h> +#include <linux/interconnect.h> #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/phy/phy.h> @@ -43,6 +44,14 @@#define SDM845_QSCRATCH_SIZE 0x400#define SDM845_DWC3_CORE_SIZE 0xcd00 +/* Interconnect path bandwidths in MBps */ +#define USB_MEMORY_AVG_HS_BW MBps_to_icc(240) +#define USB_MEMORY_PEAK_HS_BW MBps_to_icc(700) +#define USB_MEMORY_AVG_SS_BW MBps_to_icc(1000) +#define USB_MEMORY_PEAK_SS_BW MBps_to_icc(2500) +#define APPS_USB_AVG_BW 0 +#define APPS_USB_PEAK_BW MBps_to_icc(40) +struct dwc3_acpi_pdata {u32 qscratch_base_offset;u32 qscratch_base_size;@@ -76,8 +85,13 @@ struct dwc3_qcom {enum usb_dr_mode mode;bool is_suspended;bool pm_suspended; +struct icc_path *usb_ddr_icc_path; +struct icc_path *apps_usb_icc_path; }; +static int dwc3_qcom_interconnect_enable (struct dwc3_qcom *qcom); +static int dwc3_qcom_interconnect_disable (struct dwc3_qcom *qcom); +static inline void dwc3_qcom_setbits (void __iomem *base,u32 offset,u32 val) {u32 reg;@@ -239,7 +253,7 @@ static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom)static int dwc3_qcom_suspend (struct dwc3_qcom *qcom) {u32 val; -int i; +int i, ret;if (qcom->is_suspended)return 0 ;
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_suspend(struct dwc3_qcom *qcom) · line 271
Quoted 7 lines
drivers/usb/dwc3/dwc3-qcom.c +4
-0@@ -251,6 +265,10 @@ static int dwc3_qcom_suspend(struct dwc3_qcom *qcom)for (i = qcom->num_clocks -1 ; i >=0 ; i--)clk_disable_unprepare (qcom->clks[i]); + ret =dwc3_qcom_interconnect_disable (qcom); +if (ret) +dev_warn (qcom->dev,"failed to disable interconnect %d\n" , ret); +
This assumes that all QCA systems with a DWC3 have an interconnect configuration, however after applying this series SDM845 is the only platform. You need to track somewhere if the controller in question has an ICC config for not.
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_resume(struct dwc3_qcom *qcom) · line 300
Quoted 11 lines
drivers/usb/dwc3/dwc3-qcom.c +4
-0qcom->is_suspended = true;dwc3_qcom_enable_interrupts (qcom);@@ -276,6 +294,10 @@ static int dwc3_qcom_resume(struct dwc3_qcom *qcom) } } + ret =dwc3_qcom_interconnect_enable (qcom); +if (ret) +dev_warn (qcom->dev,"failed to enable interconnect %d\n" , ret); +
same as above
Quoted 17 lines
drivers/usb/dwc3/dwc3-qcom.c +10
-0/* Clear existing events from PHY related to L2 in/out */ dwc3_qcom_setbits (qcom->qscratch_base,PWR_EVNT_IRQ_STAT_REG ,PWR_EVNT_LPM_IN_L2_MASK |PWR_EVNT_LPM_OUT_L2_MASK );@@ -285,6 +307,108 @@ static int dwc3_qcom_resume(struct dwc3_qcom *qcom)return 0 ; } + +/** +* dwc3_qcom_interconnect_init() - Get interconnect path handles +* @qcom: Pointer to the concerned usb core. +* +*/ +static int dwc3_qcom_interconnect_init (struct dwc3_qcom *qcom) +{ +struct device *dev = qcom->dev; +int ret;
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_resume(struct dwc3_qcom *qcom) · line 329
Quoted 10 lines
drivers/usb/dwc3/dwc3-qcom.c +10
-0+ +if (!device_is_bound (&qcom->dwc3->dev)) +return -EPROBE_DEFER ; + + qcom->usb_ddr_icc_path =of_icc_get (dev,"usb-ddr" ); +if (IS_ERR (qcom->usb_ddr_icc_path)) { +dev_err (dev,"Error: (%ld) failed getting usb-ddr path\n" , +PTR_ERR (qcom->usb_ddr_icc_path)); +return PTR_ERR (qcom->usb_ddr_icc_path); + }
This will break all QCA platforms with DWC3, except SDM845. Instead of failing you could interpret the basence of the 'usb-ddr' patch in the DT as signal that the controller has no ICC configuration, and continue without it (i.e. return 0 from here, don't print an error, at most a dev_info() log), and track somewhere that the controller has no ICC config.
Alternatively you could check above with of_find_property() whether the controller has an 'interconnects' property at all. If it doesn't exist return zero, otherwise return an error if any of the paths doesn't exist, as you do now.
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_resume(struct dwc3_qcom *qcom) · line 336
Quoted 7 lines
drivers/usb/dwc3/dwc3-qcom.c +7
-0+ + qcom->apps_usb_icc_path =of_icc_get (dev,"apps-usb" ); +if (IS_ERR (qcom->apps_usb_icc_path)) { +dev_err (dev,"Error: (%ld) failed getting apps-usb path\n" , +PTR_ERR (qcom->apps_usb_icc_path)); +return PTR_ERR (qcom->apps_usb_icc_path); + }
Failing here is ok, if 'usb-ddr' exists, we expect the rest of the config to be in place.
Quoted 25 lines
drivers/usb/dwc3/dwc3-qcom.c +25
-0+ + ret =dwc3_qcom_interconnect_enable (qcom); +if (ret) { +dev_err (dev,"failed to enable interconnect %d\n" , ret); +return ret; + } + +return 0 ; +} + +/** +* dwc3_qcom_interconnect_exit() - Release interconnect path handles +* @qcom: Pointer to the concerned usb core. +* +* This function is used to release interconnect path handle. +*/ +static void dwc3_qcom_interconnect_exit (struct dwc3_qcom *qcom) +{ +icc_put (qcom->usb_ddr_icc_path); +icc_put (qcom->apps_usb_icc_path); +} + +/* Currently we only use bandwidth level, so just "enable" interconnects */ +static int dwc3_qcom_interconnect_enable (struct dwc3_qcom *qcom) +{
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_resume(struct dwc3_qcom *qcom) · line 371
Quoted 10 lines
drivers/usb/dwc3/dwc3-qcom.c +10
-0+struct dwc3 *dwc =platform_get_drvdata (qcom->dwc3); +int ret; + +if (dwc->maximum_speed ==USB_SPEED_SUPER ) { + ret =icc_set_bw (qcom->usb_ddr_icc_path, +USB_MEMORY_AVG_SS_BW ,USB_MEMORY_PEAK_SS_BW ); + }else { + ret =icc_set_bw (qcom->usb_ddr_icc_path, +USB_MEMORY_AVG_HS_BW ,USB_MEMORY_PEAK_HS_BW ); + }
nit: curly braces are not needed here
Quoted 26 lines
drivers/usb/dwc3/dwc3-qcom.c +26
-0+ +if (ret) +return ret; + + ret =icc_set_bw (qcom->apps_usb_icc_path, +APPS_USB_AVG_BW ,APPS_USB_PEAK_BW ); +if (ret) +icc_set_bw (qcom->usb_ddr_icc_path,0 ,0 ); + +return ret; +} + +/* To disable an interconnect, we just set its bandwidth to 0 */ +static int dwc3_qcom_interconnect_disable (struct dwc3_qcom *qcom) +{ +struct dwc3 *dwc =platform_get_drvdata (qcom->dwc3); +int ret; + + ret =icc_set_bw (qcom->usb_ddr_icc_path,0 ,0 ); +if (ret) +return ret; + + ret =icc_set_bw (qcom->apps_usb_icc_path,0 ,0 ); +if (ret) + goto err_reenable_memory_path; +
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_resume(struct dwc3_qcom *qcom) · line 407
Quoted 10 lines
drivers/usb/dwc3/dwc3-qcom.c +10
-0+return 0 ; + +/* Re-enable things in the event of an error */ +err_reenable_memory_path: +if (dwc->maximum_speed ==USB_SPEED_SUPER ) +icc_set_bw (qcom->usb_ddr_icc_path, +USB_MEMORY_AVG_SS_BW ,USB_MEMORY_PEAK_SS_BW ); +else +icc_set_bw (qcom->usb_ddr_icc_path, +USB_MEMORY_AVG_HS_BW ,USB_MEMORY_PEAK_HS_BW );
instead of the above:
dwc3_qcom_interconnect_enable(qcom);
Quoted 48 lines
drivers/usb/dwc3/dwc3-qcom.c +12
-1+ +return ret; +} +static irqreturn_t qcom_dwc3_resume_irq (int irq,void *data) {struct dwc3_qcom *qcom = data;@@ -648,6 +772,10 @@ static int dwc3_qcom_probe(struct platform_device *pdev) goto depopulate; } + ret =dwc3_qcom_interconnect_init (qcom); +if (ret) + goto depopulate; + qcom->mode =usb_get_dr_mode (&qcom->dwc3->dev);/* enable vbus override for device mode */ @@ -657,7 +785,7 @@ static int dwc3_qcom_probe(struct platform_device *pdev)/* register extcon to override sw_vbus on Vbus change later */ ret =dwc3_qcom_register_extcon (qcom);if (ret) - goto depopulate; + goto interconnect_exit;device_init_wakeup (&pdev->dev,1 ); qcom->is_suspended = false;@@ -667,6 +795,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev)return 0 ; +interconnect_exit: +dwc3_qcom_interconnect_exit (qcom); depopulate:if (np)of_platform_depopulate (&pdev->dev);@@ -697,6 +827,7 @@ static int dwc3_qcom_remove(struct platform_device *pdev) } qcom->num_clocks =0 ; +dwc3_qcom_interconnect_exit (qcom);reset_control_assert (qcom->resets);pm_runtime_allow (dev);Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Rob Herring
maintainerRe: [PATCH v5 1/3] dt-bindings: usb: qcom,dwc3: Introduce interconnect properties for Qualcomm DWC3 driver
In reply to Sandeep MaheswaramQuoted 13 lines · Sandeep Maheswaram
Add documentation for the interconnects and interconnect-names properties for USB.
Signed-off-by Sandeep Maheswaram <[email protected]>--- Documentation/devicetree/bindings/usb/qcom,dwc3.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +0
-0
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml properties: · line 77
Quoted 10 lines
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +7
-0@@ -68,6 +68,22 @@ properties: resets: maxItems: 1 + interconnects: + description: + Pairs of phandles and interconnect provider specifiers + to denote the edge source and destination ports of + the interconnect path. Please refer to + Documentation/devicetree/bindings/interconnect/ + for more details.
No need to redefine a common property, but you do need to define how many entries (maxItems).
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml properties: · line 85
Quoted 8 lines
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +8
-0+ + interconnect-names: + description: + List of interconnect path name strings sorted in the same + order as the interconnects property. Consumer drivers will use + interconnect-names to match interconnect paths with interconnect + specifiers. Please refer to Documentation/devicetree/bindings/ + interconnect/ for more details.
Need to define what the names are.
Rob
Matthias Kaehlcke
Reviewed-byRe: [PATCH v5 2/3] usb: dwc3: qcom: Add interconnect support in dwc3 driver
In reply to a message not in the archiveQuoted 77 lines · Sandeep Maheswaram (Temp)
Hi Matthias
Quoted 65 lines · Matthias Kaehlcke
Hi Sandeep,
Quoted 62 lines · Sandeep Maheswaram
Add interconnect support in dwc3-qcom driver to vote for bus bandwidth.
This requires for two different paths - from USB master to DDR slave. The other is from APPS master to USB slave.
Signed-off-by Sandeep Maheswaram <[email protected]>Signed-off-by Chandana Kishori Chiluveru <[email protected]>--- drivers/usb/dwc3/dwc3-qcom.c | 135 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 133 insertions(+), 2 deletions(-)drivers/usb/dwc3/dwc3-qcom.c +15
-1@@ -13,6 +13,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/extcon.h> +#include <linux/interconnect.h> #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/phy/phy.h> @@ -43,6 +44,14 @@#define SDM845_QSCRATCH_SIZE 0x400#define SDM845_DWC3_CORE_SIZE 0xcd00 +/* Interconnect path bandwidths in MBps */ +#define USB_MEMORY_AVG_HS_BW MBps_to_icc(240) +#define USB_MEMORY_PEAK_HS_BW MBps_to_icc(700) +#define USB_MEMORY_AVG_SS_BW MBps_to_icc(1000) +#define USB_MEMORY_PEAK_SS_BW MBps_to_icc(2500) +#define APPS_USB_AVG_BW 0 +#define APPS_USB_PEAK_BW MBps_to_icc(40) +struct dwc3_acpi_pdata {u32 qscratch_base_offset;u32 qscratch_base_size;@@ -76,8 +85,13 @@ struct dwc3_qcom {enum usb_dr_mode mode;bool is_suspended;bool pm_suspended; +struct icc_path *usb_ddr_icc_path; +struct icc_path *apps_usb_icc_path; }; +static int dwc3_qcom_interconnect_enable (struct dwc3_qcom *qcom); +static int dwc3_qcom_interconnect_disable (struct dwc3_qcom *qcom); +static inline void dwc3_qcom_setbits (void __iomem *base,u32 offset,u32 val) {u32 reg;@@ -239,7 +253,7 @@ static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom)static int dwc3_qcom_suspend (struct dwc3_qcom *qcom) {u32 val; -int i; +int i, ret;if (qcom->is_suspended)return 0 ;@@ -251,6 +265,10 @@ static int dwc3_qcom_suspend(struct dwc3_qcom *qcom)for (i = qcom->num_clocks -1 ; i >=0 ; i--)clk_disable_unprepare (qcom->clks[i]);Quoted 8 lines
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_suspend(struct dwc3_qcom *qcom) · line 271
Quoted 4 lines
drivers/usb/dwc3/dwc3-qcom.c +4
-0+ ret =dwc3_qcom_interconnect_disable (qcom); +if (ret) +dev_warn (qcom->dev,"failed to disable interconnect %d\n" , ret); +This assumes that all QCA systems with a DWC3 have an interconnect configuration, however after applying this series SDM845 is the only platform. You need to track somewhere if the controller in question has an ICC config for not.
Quoted 2 lines
This is handled in drivers <https://opengrok.qualcomm.com/source/xref/LC.UM.3.0/src/third_party/kernel/v5.4/drivers/>/interconnect <https://opengrok.qualcomm.com/source/xref/LC.UM.3.0/src/third_party/kernel/v5.4/drivers/interconnect/>/core.c <https://opengrok.qualcomm.com/source/xref/LC.UM.3.0/src/third_party/kernel/v5.4/drivers/interconnect/core.c>
icc_set_bwfunction.
Thanks for the clarification!
Quoted 11 lines
Quoted 11 lines
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_resume(struct dwc3_qcom *qcom) · line 299
Quoted 10 lines
drivers/usb/dwc3/dwc3-qcom.c +4
-0qcom->is_suspended = true;dwc3_qcom_enable_interrupts (qcom);@@ -276,6 +294,10 @@ static int dwc3_qcom_resume(struct dwc3_qcom *qcom) } } + ret =dwc3_qcom_interconnect_enable (qcom); +if (ret) +dev_warn (qcom->dev,"failed to enable interconnect %d\n" , ret); +same as above
Quoted 2 lines
This is handled in drivers <https://opengrok.qualcomm.com/source/xref/LC.UM.3.0/src/third_party/kernel/v5.4/drivers/>/interconnect <https://opengrok.qualcomm.com/source/xref/LC.UM.3.0/src/third_party/kernel/v5.4/drivers/interconnect/>/core.c <https://opengrok.qualcomm.com/source/xref/LC.UM.3.0/src/third_party/kernel/v5.4/drivers/interconnect/core.c>
icc_set_bwfunction
ok
Quoted 32 lines
Quoted 32 lines
Quoted 16 lines
drivers/usb/dwc3/dwc3-qcom.c +10
-0/* Clear existing events from PHY related to L2 in/out */ dwc3_qcom_setbits (qcom->qscratch_base,PWR_EVNT_IRQ_STAT_REG ,PWR_EVNT_LPM_IN_L2_MASK |PWR_EVNT_LPM_OUT_L2_MASK );@@ -285,6 +307,108 @@ static int dwc3_qcom_resume(struct dwc3_qcom *qcom)return 0 ; } + +/** +* dwc3_qcom_interconnect_init() - Get interconnect path handles +* @qcom: Pointer to the concerned usb core. +* +*/ +static int dwc3_qcom_interconnect_init (struct dwc3_qcom *qcom) +{ +struct device *dev = qcom->dev; +int ret;drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_resume(struct dwc3_qcom *qcom) · line 328
Quoted 10 lines
drivers/usb/dwc3/dwc3-qcom.c +10
-0+ +if (!device_is_bound (&qcom->dwc3->dev)) +return -EPROBE_DEFER ; + + qcom->usb_ddr_icc_path =of_icc_get (dev,"usb-ddr" ); +if (IS_ERR (qcom->usb_ddr_icc_path)) { +dev_err (dev,"Error: (%ld) failed getting usb-ddr path\n" , +PTR_ERR (qcom->usb_ddr_icc_path)); +return PTR_ERR (qcom->usb_ddr_icc_path); + }This will break all QCA platforms with DWC3, except SDM845. Instead of failing you could interpret the basence of the 'usb-ddr' patch in the DT as signal that the controller has no ICC configuration, and continue without it (i.e. return 0 from here, don't print an error, at most a
dev_info()log), and track somewhere that the controller has no ICC config.
Quoted 6 lines
Quoted 4 lines
Alternatively you could check above with
of_find_property()whether the controller has an 'interconnects' property at all. If it doesn't exist return zero, otherwise return an error if any of the paths doesn't exist, as you do now.This is handled in drivers <https://opengrok.qualcomm.com/source/xref/LC.UM.3.0/src/third_party/kernel/v5.4/drivers/>/interconnect <https://opengrok.qualcomm.com/source/xref/LC.UM.3.0/src/third_party/kernel/v5.4/drivers/interconnect/>/core.c <https://opengrok.qualcomm.com/source/xref/LC.UM.3.0/src/third_party/kernel/v5.4/drivers/interconnect/core.c>
of_icc_getfunction.
You are right, of_icc_get() returns NULL if the property doesn't exist, and this is handled gracefully by the other ICC functions.
Quoted 10 lines
Quoted 9 lines
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_resume(struct dwc3_qcom *qcom) · line 336
Quoted 7 lines
drivers/usb/dwc3/dwc3-qcom.c +7
-0+ + qcom->apps_usb_icc_path =of_icc_get (dev,"apps-usb" ); +if (IS_ERR (qcom->apps_usb_icc_path)) { +dev_err (dev,"Error: (%ld) failed getting apps-usb path\n" , +PTR_ERR (qcom->apps_usb_icc_path)); +return PTR_ERR (qcom->apps_usb_icc_path); + }Failing here is ok, if 'usb-ddr' exists, we expect the rest of the config to be in place.
This may be required for error handling
Agreed, my comment meant to say the above handling seems correct.
Quoted 76 lines
Quoted 28 lines
Quoted 28 lines
drivers/usb/dwc3/dwc3-qcom.c +28
-0+ + ret =dwc3_qcom_interconnect_enable (qcom); +if (ret) { +dev_err (dev,"failed to enable interconnect %d\n" , ret); +return ret; + } + +return 0 ; +} + +/** +* dwc3_qcom_interconnect_exit() - Release interconnect path handles +* @qcom: Pointer to the concerned usb core. +* +* This function is used to release interconnect path handle. +*/ +static void dwc3_qcom_interconnect_exit (struct dwc3_qcom *qcom) +{ +icc_put (qcom->usb_ddr_icc_path); +icc_put (qcom->apps_usb_icc_path); +} + +/* Currently we only use bandwidth level, so just "enable" interconnects */ +static int dwc3_qcom_interconnect_enable (struct dwc3_qcom *qcom) +{ +struct dwc3 *dwc =platform_get_drvdata (qcom->dwc3); +int ret; +Quoted 8 lines
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_resume(struct dwc3_qcom *qcom) · line 371
Quoted 7 lines
drivers/usb/dwc3/dwc3-qcom.c +7
-0+if (dwc->maximum_speed ==USB_SPEED_SUPER ) { + ret =icc_set_bw (qcom->usb_ddr_icc_path, +USB_MEMORY_AVG_SS_BW ,USB_MEMORY_PEAK_SS_BW ); + }else { + ret =icc_set_bw (qcom->usb_ddr_icc_path, +USB_MEMORY_AVG_HS_BW ,USB_MEMORY_PEAK_HS_BW ); + }nit: curly braces are not needed here
Will remove in next version.
Quoted 39 lines
Quoted 27 lines
drivers/usb/dwc3/dwc3-qcom.c +26
-0+ +if (ret) +return ret; + + ret =icc_set_bw (qcom->apps_usb_icc_path, +APPS_USB_AVG_BW ,APPS_USB_PEAK_BW ); +if (ret) +icc_set_bw (qcom->usb_ddr_icc_path,0 ,0 ); + +return ret; +} + +/* To disable an interconnect, we just set its bandwidth to 0 */ +static int dwc3_qcom_interconnect_disable (struct dwc3_qcom *qcom) +{ +struct dwc3 *dwc =platform_get_drvdata (qcom->dwc3); +int ret; + + ret =icc_set_bw (qcom->usb_ddr_icc_path,0 ,0 ); +if (ret) +return ret; + + ret =icc_set_bw (qcom->apps_usb_icc_path,0 ,0 ); +if (ret) + goto err_reenable_memory_path; +drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_resume(struct dwc3_qcom *qcom) · line 407
Quoted 10 lines
drivers/usb/dwc3/dwc3-qcom.c +10
-0+return 0 ; + +/* Re-enable things in the event of an error */ +err_reenable_memory_path: +if (dwc->maximum_speed ==USB_SPEED_SUPER ) +icc_set_bw (qcom->usb_ddr_icc_path, +USB_MEMORY_AVG_SS_BW ,USB_MEMORY_PEAK_SS_BW ); +else +icc_set_bw (qcom->usb_ddr_icc_path, +USB_MEMORY_AVG_HS_BW ,USB_MEMORY_PEAK_HS_BW );instead of the above:
Quoted 2 lines
Quoted 1 line
dwc3_qcom_interconnect_enable(qcom);Will change in next version.
With that changed: