usb: dwc3: add support for SC8280XP
Subsystems (6)
cover usb: dwc3: add support for SC8280XP
This series adds the missing devicetree binding for SC8280XP, clean up the current bindings somewhat and fixes a related driver warning when an optional wakeup interrupt is missing.
The last four patches fix up the SC8280XP devicetree that's currently in Bjorn's tree and addresses some DT schema warnings in other Qualcomm devicetrees and are only included here for completeness.
The binding and driver updates are expected to go though the USB tree, while the devicetree updates can be picked up by Bjorn once the binding updates have been merged.
Johan
Johan Hovold (7):
dt-bindings: usb: qcom,dwc3: add SC8280XP binding
dt-bindings: usb: qcom,dwc3: refine interrupt requirements
usb: dwc3: qcom: fix missing optional irq warnings
arm64: dts: qcom: sc8280xp: fix USB clock order
arm64: dts: qcom: sc8280xp: fix USB interrupts
arm64: dts: qcom: sc7280: reorder USB interrupts
arm64: dts: qcom: reorder USB interrupts
.../devicetree/bindings/usb/qcom,dwc3.yaml | 152 ++++++++++++++++-- arch/arm/boot/dts/qcom-sdx65.dtsi | 10 +- arch/arm64/boot/dts/qcom/sc7280.dtsi | 15 +- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 28 ++-- arch/arm64/boot/dts/qcom/sm8250.dtsi | 20 ++- arch/arm64/boot/dts/qcom/sm8350.dtsi | 20 ++- drivers/usb/dwc3/dwc3-qcom.c | 4 +- 7 files changed, 194 insertions(+), 55 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/7 dt-bindings: usb: qcom,dwc3: add SC8280XP binding
Add SC8280XP to the DT schema.
Note that the SC8280XP controllers use the common set of five clocks and an additional set of four interconnect clocks whose purpose is not entirely clear at this point.
The set of wakeup interrupts is also different for SC8280XP.
--- .../devicetree/bindings/usb/qcom,dwc3.yaml | 102 +++++++++++++++--- 1 file changed, 88 insertions(+), 14 deletions(-)
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +88 -14
@@ -24,6 +24,7 @@ properties: - qcom,qcs404-dwc3 - qcom,sc7180-dwc3 - qcom,sc7280-dwc3 + - qcom,sc8280xp-dwc3 - qcom,sdm660-dwc3 - qcom,sdm845-dwc3 - qcom,sdx55-dwc3
@@ -66,11 +67,11 @@ properties: - mock_utmi:: Mock utmi clock needed for ITP/SOF generation in host mode. Its frequency should be 19.2MHz. minItems: 1 - maxItems: 6 + maxItems: 9 clock-names: minItems: 1 - maxItems: 6 + maxItems: 9 assigned-clocks: items:
@@ -93,20 +94,10 @@ properties: - const: apps-usb interrupts: - items: - - description: The interrupt that is asserted - when a wakeup event is received on USB2 bus. - - description: The interrupt that is asserted - when a wakeup event is received on USB3 bus. - - description: Wakeup event on DM line. - - description: Wakeup event on DP line. + maxItems: 4 interrupt-names: - items: - - const: hs_phy_irq - - const: ss_phy_irq - - const: dm_hs_phy_irq - - const: dp_hs_phy_irq + maxItems: 4 qcom,select-utmi-as-pipe-clk: description:
@@ -249,6 +240,28 @@ allOf: - const: sleep - const: mock_utmi + - if: + properties: + compatible: + contains: + enum: + - qcom,sc8280xp-dwc3 + then: + properties: + clocks: + maxItems: 9 + clock-names: + items: + - const: cfg_noc + - const: core + - const: iface + - const: sleep + - const: mock_utmi + - const: noc_aggr + - const: noc_aggr_north + - const: noc_aggr_south + - const: noc_sys + - if: properties: compatible:
@@ -311,6 +324,67 @@ allOf: - const: mock_utmi - const: xo + - if: + properties: + compatible: + contains: + enum: + - qcom,ipq4019-dwc3 + - qcom,ipq6018-dwc3 + - qcom,ipq8064-dwc3 + - qcom,ipq8074-dwc3 + - qcom,msm8953-dwc3 + - qcom,msm8994-dwc3 + - qcom,msm8996-dwc3 + - qcom,msm8998-dwc3 + - qcom,qcs404-dwc3 + - qcom,sc7180-dwc3 + - qcom,sc7280-dwc3 + - qcom,sdm660-dwc3 + - qcom,sdm845-dwc3 + - qcom,sdx55-dwc3 + - qcom,sdx65-dwc3 + - qcom,sm4250-dwc3 + - qcom,sm6115-dwc3 + - qcom,sm6125-dwc3 + - qcom,sm6350-dwc3 + - qcom,sm8150-dwc3 + - qcom,sm8250-dwc3 + - qcom,sm8350-dwc3 + - qcom,sm8450-dwc3 + then: + properties: + interrupts: + items: + - description: The interrupt that is asserted + when a wakeup event is received on USB2 bus. + - description: The interrupt that is asserted + when a wakeup event is received on USB3 bus. + - description: Wakeup event on DM line. + - description: Wakeup event on DP line. + interrupt-names: + items: + - const: hs_phy_irq + - const: ss_phy_irq + - const: dm_hs_phy_irq + - const: dp_hs_phy_irq + + - if: + properties: + compatible: + contains: + enum: + - qcom,sc8280xp-dwc3 + then: + properties: + interrupts: + maxItems: 4 + interrupt-names: + items: + - const: pwr_event + - const: dp_hs_phy_irq + - const: dm_hs_phy_irq + - const: ss_phy_irq additionalProperties: false
Signature · 1 line
2.35.1
Re: [PATCH 1/7] dt-bindings: usb: qcom,dwc3: add SC8280XP binding
Quoted 5 lines · Johan Hovold
Add SC8280XP to the DT schema.
Note that the SC8280XP controllers use the common set of five clocks and an additional set of four interconnect clocks whose purpose is not entirely clear at this point.
Thank you for your patch. There is something to discuss/improve.
Quoted 52 lines
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +51
-0+ - if: + properties: + compatible: + contains: + enum: + - qcom,ipq4019-dwc3 + - qcom,ipq6018-dwc3 + - qcom,ipq8064-dwc3 + - qcom,ipq8074-dwc3 + - qcom,msm8953-dwc3 + - qcom,msm8994-dwc3 + - qcom,msm8996-dwc3 + - qcom,msm8998-dwc3 + - qcom,qcs404-dwc3 + - qcom,sc7180-dwc3 + - qcom,sc7280-dwc3 + - qcom,sdm660-dwc3 + - qcom,sdm845-dwc3 + - qcom,sdx55-dwc3 + - qcom,sdx65-dwc3 + - qcom,sm4250-dwc3 + - qcom,sm6115-dwc3 + - qcom,sm6125-dwc3 + - qcom,sm6350-dwc3 + - qcom,sm8150-dwc3 + - qcom,sm8250-dwc3 + - qcom,sm8350-dwc3 + - qcom,sm8450-dwc3 + then: + properties: + interrupts: + items: + - description: The interrupt that is asserted + when a wakeup event is received on USB2 bus. + - description: The interrupt that is asserted + when a wakeup event is received on USB3 bus. + - description: Wakeup event on DM line. + - description: Wakeup event on DP line. + interrupt-names: + items: + - const: hs_phy_irq + - const: ss_phy_irq + - const: dm_hs_phy_irq + - const: dp_hs_phy_irq + + - if: + properties: + compatible: + contains: + enum: + - qcom,sc8280xp-dwc3
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml allOf: · line 387
Quoted 10 lines
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +10
-0+ then: + properties: + interrupts: + maxItems: 4 + interrupt-names: + items: + - const: pwr_event + - const: dp_hs_phy_irq + - const: dm_hs_phy_irq + - const: ss_phy_irq
Could you keep the closest order to exiting ones? In that case first entry will differ, but rest at least will be the same.
Quoted 3 lines
additionalProperties: false
Best regards,
Krzysztof
Re: [PATCH 1/7] dt-bindings: usb: qcom,dwc3: add SC8280XP binding
In reply to Johan HovoldQuoted 10 lines · Johan Hovold
Add SC8280XP to the DT schema.
Note that the SC8280XP controllers use the common set of five clocks and an additional set of four interconnect clocks whose purpose is not entirely clear at this point.
The set of wakeup interrupts is also different for SC8280XP.
Signed-off-by Johan Hovold <[email protected]>---
Second patch answers my questions, so:
Best regards,
Krzysztof
PATCH 2/7 dt-bindings: usb: qcom,dwc3: refine interrupt requirements
In reply to Johan HovoldNot all platforms have all of the four wakeup interrupts currently described by the bindings.
Specifically, MSM8953/6/8 and SDM660 do not use the DP/DM interrupts, while the SS PHY interrupt is optional on SDM660 and SC7280.
Note that no devicetree in mainline specify any wakeup interrupts for
- qcom,ipq4019-dwc3
- qcom,ipq6018-dwc3
- qcom,ipq8064-dwc3
- qcom,ipq8074-dwc3
- qcom,msm8994-dwc3
- qcom,qcs404-dwc3
but let's keep the schema warnings about that for now.
--- .../devicetree/bindings/usb/qcom,dwc3.yaml | 60 +++++++++++++++++-- 1 file changed, 55 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +55 -5
@@ -94,9 +94,11 @@ properties: - const: apps-usb interrupts: + minItems: 1 maxItems: 4 interrupt-names: + minItems: 1 maxItems: 4 qcom,select-utmi-as-pipe-clk:
@@ -333,14 +335,9 @@ allOf: - qcom,ipq6018-dwc3 - qcom,ipq8064-dwc3 - qcom,ipq8074-dwc3 - - qcom,msm8953-dwc3 - qcom,msm8994-dwc3 - - qcom,msm8996-dwc3 - - qcom,msm8998-dwc3 - qcom,qcs404-dwc3 - qcom,sc7180-dwc3 - - qcom,sc7280-dwc3 - - qcom,sdm660-dwc3 - qcom,sdm845-dwc3 - qcom,sdx55-dwc3 - qcom,sdx65-dwc3
@@ -369,6 +366,59 @@ allOf: - const: dm_hs_phy_irq - const: dp_hs_phy_irq + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8953-dwc3 + - qcom,msm8996-dwc3 + - qcom,msm8998-dwc3 + then: + properties: + interrupts: + maxItems: 2 + interrupt-names: + items: + - const: hs_phy_irq + - const: ss_phy_irq + + - if: + properties: + compatible: + contains: + enum: + - qcom,sdm660-dwc3 + then: + properties: + interrupts: + minItems: 1 + maxItems: 2 + interrupt-names: + minItems: 1 + items: + - const: hs_phy_irq + - const: ss_phy_irq + + - if: + properties: + compatible: + contains: + enum: + - qcom,sc7280-dwc3 + then: + properties: + interrupts: + minItems: 3 + maxItems: 4 + interrupt-names: + minItems: 3 + items: + - const: hs_phy_irq + - const: dp_hs_phy_irq + - const: dm_hs_phy_irq + - const: ss_phy_irq + - if: properties: compatible:
Signature · 1 line
2.35.1
Re: [PATCH 2/7] dt-bindings: usb: qcom,dwc3: refine interrupt requirements
Quoted 99 lines · Johan Hovold
Not all platforms have all of the four wakeup interrupts currently described by the bindings.
Specifically, MSM8953/6/8 and SDM660 do not use the DP/DM interrupts, while the SS PHY interrupt is optional on SDM660 and SC7280.
Note that no devicetree in mainline specify any wakeup interrupts for
- qcom,ipq4019-dwc3
- qcom,ipq6018-dwc3
- qcom,ipq8064-dwc3
- qcom,ipq8074-dwc3
- qcom,msm8994-dwc3
- qcom,qcs404-dwc3but let's keep the schema warnings about that for now.
Signed-off-by Johan Hovold <[email protected]>--- .../devicetree/bindings/usb/qcom,dwc3.yaml | 60 +++++++++++++++++-- 1 file changed, 55 insertions(+), 5 deletions(-)Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +44
-5@@ -94,9 +94,11 @@ properties: - const: apps-usb interrupts: + minItems: 1 maxItems: 4 interrupt-names: + minItems: 1 maxItems: 4 qcom,select-utmi-as-pipe-clk:@@ -333,14 +335,9 @@ allOf: - qcom,ipq6018-dwc3 - qcom,ipq8064-dwc3 - qcom,ipq8074-dwc3 - - qcom,msm8953-dwc3 - qcom,msm8994-dwc3 - - qcom,msm8996-dwc3 - - qcom,msm8998-dwc3 - qcom,qcs404-dwc3 - qcom,sc7180-dwc3 - - qcom,sc7280-dwc3 - - qcom,sdm660-dwc3 - qcom,sdm845-dwc3 - qcom,sdx55-dwc3 - qcom,sdx65-dwc3@@ -369,6 +366,59 @@ allOf: - const: dm_hs_phy_irq - const: dp_hs_phy_irq + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8953-dwc3 + - qcom,msm8996-dwc3 + - qcom,msm8998-dwc3 + then: + properties: + interrupts: + maxItems: 2 + interrupt-names: + items: + - const: hs_phy_irq + - const: ss_phy_irq + + - if: + properties: + compatible: + contains: + enum: + - qcom,sdm660-dwc3 + then: + properties: + interrupts: + minItems: 1 + maxItems: 2 + interrupt-names: + minItems: 1 + items: + - const: hs_phy_irq + - const: ss_phy_irq + + - if: + properties: + compatible: + contains: + enum: + - qcom,sc7280-dwc3 + then: + properties:
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml allOf: · line 420
Quoted 10 lines
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +10
-0+ interrupts: + minItems: 3 + maxItems: 4 + interrupt-names: + minItems: 3 + items: + - const: hs_phy_irq + - const: dp_hs_phy_irq + - const: dm_hs_phy_irq + - const: ss_phy_irq
OK, I see now that you used SC8280XP order matching this one.
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml allOf: · line 424
Quoted 4 lines
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +1
-0+ - if: properties: compatible:
Best regards,
Krzysztof
PATCH 3/7 usb: dwc3: qcom: fix missing optional irq warnings
In reply to Johan HovoldNot all platforms have all of the four currently supported wakeup interrupts so use the optional irq helpers when looking up interrupts to avoid printing error messages when an optional interrupt is not found:
dwc3-qcom a6f8800.usb: error -ENXIO: IRQ hs_phy_irq not found
--- drivers/usb/dwc3/dwc3-qcom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +2 -2
@@ -490,9 +490,9 @@ static int dwc3_qcom_get_irq(struct platform_device *pdev,int ret;if (np) - ret =platform_get_irq_byname (pdev_irq, name); + ret =platform_get_irq_byname_optional (pdev_irq, name);else - ret =platform_get_irq (pdev_irq, num); + ret =platform_get_irq_optional (pdev_irq, num);return ret; }
Signature · 1 line
2.35.1
Re: [PATCH 3/7] usb: dwc3: qcom: fix missing optional irq warnings
Quoted 31 lines · Johan Hovold
Not all platforms have all of the four currently supported wakeup interrupts so use the optional irq helpers when looking up interrupts to avoid printing error messages when an optional interrupt is not found:
dwc3-qcom a6f8800.usb: error
-ENXIO: IRQhs_phy_irqnot foundFixes a4333c3a6ba9 ("usb: dwc3: Add Qualcomm DWC3 glue driver")Signed-off-by Johan Hovold <[email protected]>--- drivers/usb/dwc3/dwc3-qcom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/usb/dwc3/dwc3-qcom.c +2
-2@@ -490,9 +490,9 @@ static int dwc3_qcom_get_irq(struct platform_device *pdev,int ret;if (np) - ret =platform_get_irq_byname (pdev_irq, name); + ret =platform_get_irq_byname_optional (pdev_irq, name);else - ret =platform_get_irq (pdev_irq, num); + ret =platform_get_irq_optional (pdev_irq, num);return ret; }Signature · 1 line
2.35.1
PATCH 4/7 arm64: dts: qcom: sc8280xp: fix USB clock order
In reply to Johan HovoldFix the USB controller clock order and naming so that they match the devicetree binding.
Note that the driver currently simply enables all clocks in the order that they are specified in the devicetree. Reordering the clocks as per the binding means that the only explicit ordering constraint found in the vendor driver, that cfg_noc should be enabled before the core_clk, is now honoured.
--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/qcom/sc8280xp.dtsi +8 -8
@@ -1855,16 +1855,16 @@ usb_0: usb@a6f8800 { #size-cells = <2>; ranges; - clocks = <&gcc GCC_USB30_PRIM_MASTER_CLK>, - <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>, + clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>, + <&gcc GCC_USB30_PRIM_MASTER_CLK>, <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>, - <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>, <&gcc GCC_USB30_PRIM_SLEEP_CLK>, + <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>, <&gcc GCC_AGGRE_USB_NOC_AXI_CLK>, <&gcc GCC_AGGRE_USB_NOC_NORTH_AXI_CLK>, <&gcc GCC_AGGRE_USB_NOC_SOUTH_AXI_CLK>, <&gcc GCC_SYS_NOC_USB_AXI_CLK>; - clock-names = "core", "iface", "bus_aggr", "utmi", "sleep", + clock-names = "cfg_noc", "core", "iface", "sleep", "mock_utmi", "noc_aggr", "noc_aggr_north", "noc_aggr_south", "noc_sys"; assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,
@@ -1905,16 +1905,16 @@ usb_1: usb@a8f8800 { #size-cells = <2>; ranges; - clocks = <&gcc GCC_USB30_SEC_MASTER_CLK>, - <&gcc GCC_CFG_NOC_USB3_SEC_AXI_CLK>, + clocks = <&gcc GCC_CFG_NOC_USB3_SEC_AXI_CLK>, + <&gcc GCC_USB30_SEC_MASTER_CLK>, <&gcc GCC_AGGRE_USB3_SEC_AXI_CLK>, - <&gcc GCC_USB30_SEC_MOCK_UTMI_CLK>, <&gcc GCC_USB30_SEC_SLEEP_CLK>, + <&gcc GCC_USB30_SEC_MOCK_UTMI_CLK>, <&gcc GCC_AGGRE_USB_NOC_AXI_CLK>, <&gcc GCC_AGGRE_USB_NOC_NORTH_AXI_CLK>, <&gcc GCC_AGGRE_USB_NOC_SOUTH_AXI_CLK>, <&gcc GCC_SYS_NOC_USB_AXI_CLK>; - clock-names = "core", "iface", "bus_aggr", "utmi", "sleep", + clock-names = "cfg_noc", "core", "iface", "sleep", "mock_utmi", "noc_aggr", "noc_aggr_north", "noc_aggr_south", "noc_sys"; assigned-clocks = <&gcc GCC_USB30_SEC_MOCK_UTMI_CLK>,
Signature · 1 line
2.35.1
Re: [PATCH 4/7] arm64: dts: qcom: sc8280xp: fix USB clock order
Quoted 28 lines · Johan Hovold
Fix the USB controller clock order and naming so that they match the devicetree binding.
Note that the driver currently simply enables all clocks in the order that they are specified in the devicetree. Reordering the clocks as per the binding means that the only explicit ordering constraint found in the vendor driver, that
cfg_nocshould be enabled before thecore_clk, is now honoured.Fixes 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")Signed-off-by Johan Hovold <[email protected]>--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)arch/arm64/boot/dts/qcom/sc8280xp.dtsi +2
-2@@ -1855,16 +1855,16 @@ usb_0: usb@a6f8800 { #size-cells = <2>; ranges; - clocks = <&gcc GCC_USB30_PRIM_MASTER_CLK>, - <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>, + clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>, + <&gcc GCC_USB30_PRIM_MASTER_CLK>, <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>,
arch/arm64/boot/dts/qcom/sc8280xp.dtsi usb_0: usb@a6f8800 { · line 1868
Quoted 10 lines
arch/arm64/boot/dts/qcom/sc8280xp.dtsi +2
-2- <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>, <&gcc GCC_USB30_PRIM_SLEEP_CLK>, + <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>, <&gcc GCC_AGGRE_USB_NOC_AXI_CLK>, <&gcc GCC_AGGRE_USB_NOC_NORTH_AXI_CLK>, <&gcc GCC_AGGRE_USB_NOC_SOUTH_AXI_CLK>, <&gcc GCC_SYS_NOC_USB_AXI_CLK>; - clock-names = "core", "iface", "bus_aggr", "utmi", "sleep", + clock-names = "cfg_noc", "core", "iface", "sleep", "mock_utmi", "noc_aggr", "noc_aggr_north", "noc_aggr_south", "noc_sys";
Your commit title should also include change of naming.
Best regards,
Krzysztof
PATCH 5/7 arm64: dts: qcom: sc8280xp: fix USB interrupts
In reply to Johan HovoldThe two single-port SC8280XP USB controllers do not have an hs_phy_irq interrupt. Instead they have a pwr_event interrupt which is distinct from the former and not yet supported by the driver.
Fix the USB node interrupt names so that they match the devicetree binding.
--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/qcom/sc8280xp.dtsi +8 -4
@@ -1875,8 +1875,10 @@ usb_0: usb@a6f8800 { <&pdc 14 IRQ_TYPE_EDGE_BOTH>, <&pdc 15 IRQ_TYPE_EDGE_BOTH>, <&pdc 138 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", - "dm_hs_phy_irq", "ss_phy_irq"; + interrupt-names = "pwr_event", + "dp_hs_phy_irq", + "dm_hs_phy_irq", + "ss_phy_irq"; power-domains = <&gcc USB30_PRIM_GDSC>;
@@ -1925,8 +1927,10 @@ usb_1: usb@a8f8800 { <&pdc 12 IRQ_TYPE_EDGE_BOTH>, <&pdc 13 IRQ_TYPE_EDGE_BOTH>, <&pdc 136 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", - "dm_hs_phy_irq", "ss_phy_irq"; + interrupt-names = "pwr_event", + "dp_hs_phy_irq", + "dm_hs_phy_irq", + "ss_phy_irq"; power-domains = <&gcc USB30_SEC_GDSC>;
Signature · 1 line
2.35.1
Re: [PATCH 5/7] arm64: dts: qcom: sc8280xp: fix USB interrupts
Quoted 31 lines · Johan Hovold
The two single-port SC8280XP USB controllers do not have an
hs_phy_irqinterrupt. Instead they have apwr_eventinterrupt which is distinct from the former and not yet supported by the driver.Fix the USB node interrupt names so that they match the devicetree binding.
Fixes 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")Signed-off-by Johan Hovold <[email protected]>--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)arch/arm64/boot/dts/qcom/sc8280xp.dtsi +4
-2@@ -1875,8 +1875,10 @@ usb_0: usb@a6f8800 { <&pdc 14 IRQ_TYPE_EDGE_BOTH>, <&pdc 15 IRQ_TYPE_EDGE_BOTH>, <&pdc 138 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", - "dm_hs_phy_irq", "ss_phy_irq"; + interrupt-names = "pwr_event", + "dp_hs_phy_irq", + "dm_hs_phy_irq", + "ss_phy_irq"; power-domains = <&gcc USB30_PRIM_GDSC>;
arch/arm64/boot/dts/qcom/sc8280xp.dtsi usb_1: usb@a8f8800 { · line 1933
Quoted 9 lines
arch/arm64/boot/dts/qcom/sc8280xp.dtsi +4
-2@@ -1925,8 +1927,10 @@ usb_1: usb@a8f8800 { <&pdc 12 IRQ_TYPE_EDGE_BOTH>, <&pdc 13 IRQ_TYPE_EDGE_BOTH>, <&pdc 136 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", - "dm_hs_phy_irq", "ss_phy_irq"; + interrupt-names = "pwr_event", + "dp_hs_phy_irq", + "dm_hs_phy_irq", + "ss_phy_irq";
For this specific change to pwr_event:
That being said, I was reviewing this against the (fairly old) downstream release I have, and the IRQs defined there look like this:
interrupts-extended = <&pdc 12 IRQ_TYPE_EDGE_RISING>, <&intc GIC_SPI 811 IRQ_TYPE_LEVEL_HIGH>, <&pdc 136 IRQ_TYPE_LEVEL_HIGH>, <&pdc 13 IRQ_TYPE_EDGE_RISING>; interrupt-names = "dp_hs_phy_irq", "pwr_event_irq", "ss_phy_irq", "dm_hs_phy_irq";
The part I want to highlight is that the "pwr_event" irq downstream maps to <&intc GIC_SPI 811 IRQ_TYPE_LEVEL_HIGH>, but the current upstream devicetree I'm looking at has it mapped to <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>
Do you happen to have any source you can also check to confirm if this is a bug or not?
Thanks,
Andrew
Quoted 6 lines
arch/arm64/boot/dts/qcom/sc8280xp.dtsi +0
-0power-domains = <&gcc USB30_SEC_GDSC>;Signature · 1 line
2.35.1
Re: [PATCH 5/7] arm64: dts: qcom: sc8280xp: fix USB interrupts
Quoted 56 lines · Andrew Halaney
Quoted 31 lines · Johan Hovold
The two single-port SC8280XP USB controllers do not have an
hs_phy_irqinterrupt. Instead they have apwr_eventinterrupt which is distinct from the former and not yet supported by the driver.Fix the USB node interrupt names so that they match the devicetree binding.
Fixes 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")Signed-off-by Johan Hovold <[email protected]>--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)arch/arm64/boot/dts/qcom/sc8280xp.dtsi +4
-2@@ -1875,8 +1875,10 @@ usb_0: usb@a6f8800 { <&pdc 14 IRQ_TYPE_EDGE_BOTH>, <&pdc 15 IRQ_TYPE_EDGE_BOTH>, <&pdc 138 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", - "dm_hs_phy_irq", "ss_phy_irq"; + interrupt-names = "pwr_event", + "dp_hs_phy_irq", + "dm_hs_phy_irq", + "ss_phy_irq"; power-domains = <&gcc USB30_PRIM_GDSC>;arch/arm64/boot/dts/qcom/sc8280xp.dtsi usb_1: usb@a8f8800 { · line 1933
Quoted 9 lines
arch/arm64/boot/dts/qcom/sc8280xp.dtsi +4
-2@@ -1925,8 +1927,10 @@ usb_1: usb@a8f8800 { <&pdc 12 IRQ_TYPE_EDGE_BOTH>, <&pdc 13 IRQ_TYPE_EDGE_BOTH>, <&pdc 136 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", - "dm_hs_phy_irq", "ss_phy_irq"; + interrupt-names = "pwr_event", + "dp_hs_phy_irq", + "dm_hs_phy_irq", + "ss_phy_irq";For this specific change to
pwr_event:Reviewed-by Andrew Halaney <[email protected]>That being said, I was reviewing this against the (fairly old) downstream release I have, and the IRQs defined there look like this:
interrupts-extended = <&pdc 12 IRQ_TYPE_EDGE_RISING>, <&intc GIC_SPI 811 IRQ_TYPE_LEVEL_HIGH>, <&pdc 136 IRQ_TYPE_LEVEL_HIGH>, <&pdc 13 IRQ_TYPE_EDGE_RISING>; interrupt-names = "dp_hs_phy_irq", "pwr_event_irq", "ss_phy_irq", "dm_hs_phy_irq";
Quoted 6 lines
The part I want to highlight is that the "
pwr_event" irq downstream maps to <&intcGIC_SPI811IRQ_TYPE_LEVEL_HIGH>, but the current upstream devicetree I'm looking at has it mapped to <&intcGIC_SPI136IRQ_TYPE_LEVEL_HIGH>Do you happen to have any source you can also check to confirm if this is a bug or not?
Good catch! I believe this is another copy-paste error when creating base dtsi based on some vendor source (or perhaps an error carried over from an earlier version).
The vendor devicetree I have access to also has 811 here, which matches the pattern for usb_0 (dwc3 interrupt + 1).
Do you mind if I fold a fix for that into a v2 of this patch?
Thanks for reviewing!
Johan
Re: [PATCH 5/7] arm64: dts: qcom: sc8280xp: fix USB interrupts
Quoted 68 lines · Johan Hovold
Quoted 56 lines · Andrew Halaney
Quoted 31 lines · Johan Hovold
The two single-port SC8280XP USB controllers do not have an
hs_phy_irqinterrupt. Instead they have apwr_eventinterrupt which is distinct from the former and not yet supported by the driver.Fix the USB node interrupt names so that they match the devicetree binding.
Fixes 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")Signed-off-by Johan Hovold <[email protected]>--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)arch/arm64/boot/dts/qcom/sc8280xp.dtsi +4
-2@@ -1875,8 +1875,10 @@ usb_0: usb@a6f8800 { <&pdc 14 IRQ_TYPE_EDGE_BOTH>, <&pdc 15 IRQ_TYPE_EDGE_BOTH>, <&pdc 138 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", - "dm_hs_phy_irq", "ss_phy_irq"; + interrupt-names = "pwr_event", + "dp_hs_phy_irq", + "dm_hs_phy_irq", + "ss_phy_irq"; power-domains = <&gcc USB30_PRIM_GDSC>;arch/arm64/boot/dts/qcom/sc8280xp.dtsi usb_1: usb@a8f8800 { · line 1933
Quoted 9 lines
arch/arm64/boot/dts/qcom/sc8280xp.dtsi +4
-2@@ -1925,8 +1927,10 @@ usb_1: usb@a8f8800 { <&pdc 12 IRQ_TYPE_EDGE_BOTH>, <&pdc 13 IRQ_TYPE_EDGE_BOTH>, <&pdc 136 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", - "dm_hs_phy_irq", "ss_phy_irq"; + interrupt-names = "pwr_event", + "dp_hs_phy_irq", + "dm_hs_phy_irq", + "ss_phy_irq";For this specific change to
pwr_event:Reviewed-by Andrew Halaney <[email protected]>That being said, I was reviewing this against the (fairly old) downstream release I have, and the IRQs defined there look like this:
interrupts-extended = <&pdc 12 IRQ_TYPE_EDGE_RISING>, <&intc GIC_SPI 811 IRQ_TYPE_LEVEL_HIGH>, <&pdc 136 IRQ_TYPE_LEVEL_HIGH>, <&pdc 13 IRQ_TYPE_EDGE_RISING>; interrupt-names = "dp_hs_phy_irq", "pwr_event_irq", "ss_phy_irq", "dm_hs_phy_irq";Quoted 6 lines
The part I want to highlight is that the "
pwr_event" irq downstream maps to <&intcGIC_SPI811IRQ_TYPE_LEVEL_HIGH>, but the current upstream devicetree I'm looking at has it mapped to <&intcGIC_SPI136IRQ_TYPE_LEVEL_HIGH>Do you happen to have any source you can also check to confirm if this is a bug or not?
Good catch! I believe this is another copy-paste error when creating base dtsi based on some vendor source (or perhaps an error carried over from an earlier version).
Quoted 6 lines
The vendor devicetree I have access to also has 811 here, which matches the pattern for
usb_0(dwc3 interrupt + 1).Do you mind if I fold a fix for that into a v2 of this patch?
Thanks for reviewing!
Sounds good, feel free to add my R-B with that change as well!
Quoted 3 lines
Johan
Re: [PATCH 5/7] arm64: dts: qcom: sc8280xp: fix USB interrupts
Quoted 5 lines · Andrew Halaney
Quoted 1 line · Johan Hovold
Do you mind if I fold a fix for that into a v2 of this patch?
Sounds good, feel free to add my R-B with that change as well!
Done. I'll wait a bit for any further comments before reposting.
Thanks again.
Johan
Re: [PATCH 5/7] arm64: dts: qcom: sc8280xp: fix USB interrupts
In reply to Johan HovoldQuoted 4 lines · Johan Hovold
The two single-port SC8280XP USB controllers do not have an
hs_phy_irqinterrupt. Instead they have apwr_eventinterrupt which is distinct from the former and not yet supported by the driver.
Quoted 9 lines
Fix the USB node interrupt names so that they match the devicetree binding.
Fixes 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")Signed-off-by Johan Hovold <[email protected]>--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
Best regards,
Krzysztof
PATCH 6/7 arm64: dts: qcom: sc7280: reorder USB interrupts
In reply to Johan HovoldOnly one of the USB controllers supports SuperSpeed and have an SS PHY wakeup interrupt.
Reorder the interrupts so that they match the updated binding which specifically has the optional interrupt last.
--- arch/arm64/boot/dts/qcom/sc7280.dtsi | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
arch/arm64/boot/dts/qcom/sc7280.dtsi +8 -7
@@ -3174,10 +3174,11 @@ usb_2: usb@8cf8800 { assigned-clock-rates = <19200000>, <200000000>; interrupts-extended = <&intc GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 13 IRQ_TYPE_EDGE_RISING>, - <&pdc 12 IRQ_TYPE_EDGE_RISING>; + <&pdc 12 IRQ_TYPE_EDGE_RISING>, + <&pdc 13 IRQ_TYPE_EDGE_RISING>; interrupt-names = "hs_phy_irq", - "dm_hs_phy_irq", "dp_hs_phy_irq"; + "dp_hs_phy_irq", + "dm_hs_phy_irq"; power-domains = <&gcc GCC_USB30_SEC_GDSC>;
@@ -3357,13 +3358,13 @@ usb_1: usb@a6f8800 { assigned-clock-rates = <19200000>, <200000000>; interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 17 IRQ_TYPE_EDGE_BOTH>, + <&pdc 14 IRQ_TYPE_LEVEL_HIGH>, <&pdc 15 IRQ_TYPE_EDGE_BOTH>, - <&pdc 14 IRQ_TYPE_LEVEL_HIGH>; + <&pdc 17 IRQ_TYPE_EDGE_BOTH>; interrupt-names = "hs_phy_irq", - "ss_phy_irq", + "dp_hs_phy_irq", "dm_hs_phy_irq", - "dp_hs_phy_irq"; + "ss_phy_irq"; power-domains = <&gcc GCC_USB30_PRIM_GDSC>;
Signature · 1 line
2.35.1
Re: [PATCH 6/7] arm64: dts: qcom: sc7280: reorder USB interrupts
Quoted 7 lines · Johan Hovold
Only one of the USB controllers supports SuperSpeed and have an SS PHY wakeup interrupt.
Reorder the interrupts so that they match the updated binding which specifically has the optional interrupt last.
Signed-off-by Johan Hovold <[email protected]>
Best regards,
Krzysztof
PATCH 7/7 arm64: dts: qcom: reorder USB interrupts
In reply to Johan HovoldThree SoCs did not follow the interrupt order specified by the USB controller binding.
While keeping the non-SuperSpeed interrupts together seems natural, reorder the interrupts to match the binding.
--- arch/arm/boot/dts/qcom-sdx65.dtsi | 10 ++++++---- arch/arm64/boot/dts/qcom/sm8250.dtsi | 20 ++++++++++++-------- arch/arm64/boot/dts/qcom/sm8350.dtsi | 20 ++++++++++++-------- 3 files changed, 30 insertions(+), 20 deletions(-)
arch/arm/boot/dts/qcom-sdx65.dtsi +6 -4
@@ -372,11 +372,13 @@ usb: usb@a6f8800 { assigned-clock-rates = <19200000>, <200000000>; interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 19 IRQ_TYPE_EDGE_BOTH>, <&pdc 76 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 18 IRQ_TYPE_EDGE_BOTH>; - interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", - "ss_phy_irq", "dm_hs_phy_irq"; + <&pdc 18 IRQ_TYPE_EDGE_BOTH>, + <&pdc 19 IRQ_TYPE_EDGE_BOTH>; + interrupt-names = "hs_phy_irq", + "ss_phy_irq", + "dm_hs_phy_irq", + "dp_hs_phy_irq"; power-domains = <&gcc USB30_GDSC>;
arch/arm64/boot/dts/qcom/sm8250.dtsi +12 -8
@@ -3026,11 +3026,13 @@ usb_1: usb@a6f8800 { assigned-clock-rates = <19200000>, <200000000>; interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 14 IRQ_TYPE_EDGE_BOTH>, + <&pdc 17 IRQ_TYPE_LEVEL_HIGH>, <&pdc 15 IRQ_TYPE_EDGE_BOTH>, - <&pdc 17 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", - "dm_hs_phy_irq", "ss_phy_irq"; + <&pdc 14 IRQ_TYPE_EDGE_BOTH>; + interrupt-names = "hs_phy_irq", + "ss_phy_irq", + "dm_hs_phy_irq", + "dp_hs_phy_irq"; power-domains = <&gcc USB30_PRIM_GDSC>;
@@ -3081,11 +3083,13 @@ usb_2: usb@a8f8800 { assigned-clock-rates = <19200000>, <200000000>; interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 12 IRQ_TYPE_EDGE_BOTH>, + <&pdc 16 IRQ_TYPE_LEVEL_HIGH>, <&pdc 13 IRQ_TYPE_EDGE_BOTH>, - <&pdc 16 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", - "dm_hs_phy_irq", "ss_phy_irq"; + <&pdc 12 IRQ_TYPE_EDGE_BOTH>; + interrupt-names = "hs_phy_irq", + "ss_phy_irq", + "dm_hs_phy_irq", + "dp_hs_phy_irq"; power-domains = <&gcc USB30_SEC_GDSC>;
arch/arm64/boot/dts/qcom/sm8350.dtsi +12 -8
@@ -2461,11 +2461,13 @@ usb_1: usb@a6f8800 { assigned-clock-rates = <19200000>, <200000000>; interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 14 IRQ_TYPE_EDGE_BOTH>, + <&pdc 17 IRQ_TYPE_LEVEL_HIGH>, <&pdc 15 IRQ_TYPE_EDGE_BOTH>, - <&pdc 17 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", - "dm_hs_phy_irq", "ss_phy_irq"; + <&pdc 14 IRQ_TYPE_EDGE_BOTH>; + interrupt-names = "hs_phy_irq", + "ss_phy_irq", + "dm_hs_phy_irq", + "dp_hs_phy_irq"; power-domains = <&gcc USB30_PRIM_GDSC>;
@@ -2509,11 +2511,13 @@ usb_2: usb@a8f8800 { assigned-clock-rates = <19200000>, <200000000>; interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 12 IRQ_TYPE_EDGE_BOTH>, + <&pdc 16 IRQ_TYPE_LEVEL_HIGH>, <&pdc 13 IRQ_TYPE_EDGE_BOTH>, - <&pdc 16 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", - "dm_hs_phy_irq", "ss_phy_irq"; + <&pdc 12 IRQ_TYPE_EDGE_BOTH>; + interrupt-names = "hs_phy_irq", + "ss_phy_irq", + "dm_hs_phy_irq", + "dp_hs_phy_irq"; power-domains = <&gcc USB30_SEC_GDSC>;
Signature · 1 line
2.35.1
Re: [PATCH 7/7] arm64: dts: qcom: reorder USB interrupts
Quoted 7 lines · Johan Hovold
Three SoCs did not follow the interrupt order specified by the USB controller binding.
While keeping the non-SuperSpeed interrupts together seems natural, reorder the interrupts to match the binding.
Signed-off-by Johan Hovold <[email protected]>
Best regards,
Krzysztof