Commit fb47423d authored by Praveen Talari's avatar Praveen Talari Committed by Greg Kroah-Hartman
Browse files

serial: qcom_geni: Fix BT failure regression on RB2 platform 



Commit 10904d72 ("serial: qcom-geni: Enable PM runtime for serial
driver") caused BT init to fail during bootup on the RB2 platform,
preventing proper BT initialization. However, BT works correctly after
bootup completes.

The issue occurs when runtime PM is enabled and uart_add_one_port() is
called before wakeup IRQ setup. The uart_add_one_port() call activates
the device through runtime PM, which configures GPIOs to the "qup_x"
pinmux function during runtime resume. When wakeup IRQ registration
happens afterward using dev_pm_set_dedicated_wake_irq(), these GPIOs
are reset back to the "gpio" pinmux function, which impacts the RX GPIO
and leads to Bluetooth failures.

Fix this by ensuring wakeup IRQ setup is completed before calling
uart_add_one_port() to prevent the pinmux function conflict.

Fixes: 10904d72 ("serial: qcom-geni: Enable PM runtime for serial driver")
Reported-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Closes: https://lore.kernel.org/all/20251110101043.2108414-4-praveen.talari@oss.qualcomm.com/


Tested-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: default avatarPraveen Talari <praveen.talari@oss.qualcomm.com>
Link: https://patch.msgid.link/20260108041006.1874757-1-praveen.talari@oss.qualcomm.com


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

drivers/tty/serial/qcom_geni_serial.c

+6 −7
Original line number Diff line number Diff line
@@ -1888,12 +1888,6 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) 
	if (ret)

		goto error;



	devm_pm_runtime_enable(port->se.dev);



	ret = uart_add_one_port(drv, uport);

	if (ret)

		goto error;



	if (port->wakeup_irq > 0) {

		device_init_wakeup(&pdev->dev, true);

		ret = dev_pm_set_dedicated_wake_irq(&pdev->dev,
@@ -1901,11 +1895,16 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) 
		if (ret) {

			device_init_wakeup(&pdev->dev, false);

			ida_free(&port_ida, uport->line);

			uart_remove_one_port(drv, uport);

			goto error;

		}

	}



	devm_pm_runtime_enable(port->se.dev);



	ret = uart_add_one_port(drv, uport);

	if (ret)

		goto error;



	return 0;



error: