Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e7f410f authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: dwc3: qcom: fix wakeup after probe deferral 



commit 41f5a0973259db9e4e3c9963d36505f80107d1a0 upstream.

The Qualcomm glue driver is overriding the interrupt trigger types
defined by firmware when requesting the wakeup interrupts during probe.

This can lead to a failure to map the DP/DM wakeup interrupts after a
probe deferral as the firmware defined trigger types do not match the
type used for the initial mapping:

	irq: type mismatch, failed to map hwirq-14 for interrupt-controller@b220000!
	irq: type mismatch, failed to map hwirq-15 for interrupt-controller@b220000!

Fix this by not overriding the firmware provided trigger types when
requesting the wakeup interrupts.

Fixes: a4333c3a ("usb: dwc3: Add Qualcomm DWC3 glue driver")
Cc: stable@vger.kernel.org      # 4.18
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/20231120161607.7405-3-johan+linaro@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db62d193

drivers/usb/dwc3/dwc3-qcom.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -361,7 +361,7 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev) 
		irq_set_status_flags(irq, IRQ_NOAUTOEN);

		irq_set_status_flags(irq, IRQ_NOAUTOEN);

		ret = devm_request_threaded_irq(qcom->dev, irq, NULL,

		ret = devm_request_threaded_irq(qcom->dev, irq, NULL,

					qcom_dwc3_resume_irq,

					qcom_dwc3_resume_irq,

					IRQF_TRIGGER_HIGH | IRQF_ONESHOT,

					IRQF_ONESHOT,

					"qcom_dwc3 HS", qcom);

					"qcom_dwc3 HS", qcom);

		if (ret) {

		if (ret) {

			dev_err(qcom->dev, "hs_phy_irq failed: %d\n", ret);

			dev_err(qcom->dev, "hs_phy_irq failed: %d\n", ret);
@@ -376,7 +376,7 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev) 
		irq_set_status_flags(irq, IRQ_NOAUTOEN);

		irq_set_status_flags(irq, IRQ_NOAUTOEN);

		ret = devm_request_threaded_irq(qcom->dev, irq, NULL,

		ret = devm_request_threaded_irq(qcom->dev, irq, NULL,

					qcom_dwc3_resume_irq,

					qcom_dwc3_resume_irq,

					IRQF_TRIGGER_HIGH | IRQF_ONESHOT,

					IRQF_ONESHOT,

					"qcom_dwc3 DP_HS", qcom);

					"qcom_dwc3 DP_HS", qcom);

		if (ret) {

		if (ret) {

			dev_err(qcom->dev, "dp_hs_phy_irq failed: %d\n", ret);

			dev_err(qcom->dev, "dp_hs_phy_irq failed: %d\n", ret);
@@ -391,7 +391,7 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev) 
		irq_set_status_flags(irq, IRQ_NOAUTOEN);

		irq_set_status_flags(irq, IRQ_NOAUTOEN);

		ret = devm_request_threaded_irq(qcom->dev, irq, NULL,

		ret = devm_request_threaded_irq(qcom->dev, irq, NULL,

					qcom_dwc3_resume_irq,

					qcom_dwc3_resume_irq,

					IRQF_TRIGGER_HIGH | IRQF_ONESHOT,

					IRQF_ONESHOT,

					"qcom_dwc3 DM_HS", qcom);

					"qcom_dwc3 DM_HS", qcom);

		if (ret) {

		if (ret) {

			dev_err(qcom->dev, "dm_hs_phy_irq failed: %d\n", ret);

			dev_err(qcom->dev, "dm_hs_phy_irq failed: %d\n", ret);
@@ -406,7 +406,7 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev) 
		irq_set_status_flags(irq, IRQ_NOAUTOEN);

		irq_set_status_flags(irq, IRQ_NOAUTOEN);

		ret = devm_request_threaded_irq(qcom->dev, irq, NULL,

		ret = devm_request_threaded_irq(qcom->dev, irq, NULL,

					qcom_dwc3_resume_irq,

					qcom_dwc3_resume_irq,

					IRQF_TRIGGER_HIGH | IRQF_ONESHOT,

					IRQF_ONESHOT,

					"qcom_dwc3 SS", qcom);

					"qcom_dwc3 SS", qcom);

		if (ret) {

		if (ret) {

			dev_err(qcom->dev, "ss_phy_irq failed: %d\n", ret);

			dev_err(qcom->dev, "ss_phy_irq failed: %d\n", ret);