A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

muc_uart: clean up init errors and fix race

Browse source 
There is a race between the muc triggering a
wake event and uart init completion.

When the wake event wins errors such as "no tty"
will be seen.  Fix this by starting the uart
module before registering the wake interrupt
handler.

Also moves the ldisc (rx callback) for the uart
module to after the "set ready" so we don't
start processing rx messages before we can
send a response.

Change-Id: I83380eabfd7aa4dfb8b3fac7fb7c4d4718ef8034
Signed-off-by: Ryan Lattrel <ryanl@motorola.com>
Reviewed-on: https://gerrit.mot.com/1297199
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Ling Jin <lingjin@motorola.com>
Reviewed-by: Kenneth Kessler <kennykessler@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Ryan Lattrel 2019-01-18 14:49:35 -06:00
commit a18c80c759
2 changed files with 93 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

18
drivers/mmi_muc_uart/mmi_uart.c
View file

@ -153,6 +153,7 @@ static int mmi_uart_get_ready(void *uart_data)
spin_lock_irqsave(&tx_lock, flags);
res = mud->tx_ready;
spin_unlock_irqrestore(&tx_lock, flags);
return res;
}
@ -365,6 +366,15 @@ int mmi_uart_open(void *uart_data)
*/
tty_unlock(tty_tmp);
/* Reset sysfs stat entries */
memset((void *)&mud->stats, 0, sizeof(struct mmi_uart_err_stats));
/* Set device to ready before we set up the ldisc, we don't want
* to not be ready if we start processing rx messages.
*/
mud->tty = tty_tmp;
mmi_uart_set_ready(uart_data, true);
/*
* Set the line discipline to the local ldisc. This will allow this
* driver to know when new data is received without having to poll.
@ -372,16 +382,12 @@ int mmi_uart_open(void *uart_data)
ret = tty_set_ldisc(tty_tmp, N_MMI_UART);
if (ret) {
dev_err(&mud->pdev->dev, "%s: Failed to set ldisc\n", __func__);
mmi_uart_set_ready(uart_data, false);
goto close_tty_unlocked;
}
tty_tmp->disc_data = mud;
/* Reset sysfs stat entries */
memset((void *)&mud->stats, 0, sizeof(struct mmi_uart_err_stats));
mud->tty = tty_tmp;
mmi_uart_set_ready(uart_data, true);
dev_info(&mud->pdev->dev, "%s: uart init done\n", __func__);
return 0;

152
drivers/mmi_muc_uart/muc_uart.c
View file

@ -1524,6 +1524,14 @@ static int muc_uart_probe(struct platform_device *pdev)
struct mod_muc_data_t *mm_data;
struct power_supply_config psy_cfg = {};
#ifdef CONFIG_IPC_LOGGING
muc_ipc_log = ipc_log_context_create(MUC_IPC_LOG_PAGES, "muc_uart", 0);
if (!muc_ipc_log)
MUC_ERR("Failed to create IPC logging context\n");
#endif
MUC_LOG("probe start\n");
mm_data = devm_kzalloc(&pdev->dev, sizeof(*mm_data), GFP_KERNEL);
if (!mm_data)
return -ENOMEM;
@ -1531,8 +1539,6 @@ static int muc_uart_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, mm_data);
psy_cfg.drv_data = mm_data;
MUC_LOG("probe start\n");
INIT_DELAYED_WORK(&mm_data->wake_work, muc_uart_wake_work);
INIT_DELAYED_WORK(&mm_data->sleep_work, muc_uart_sleep_work);
INIT_DELAYED_WORK(&mm_data->idle_work, muc_uart_idle_work);
@ -1559,20 +1565,41 @@ static int muc_uart_probe(struct platform_device *pdev)
muc_uart_sleep_req_cb,
(unsigned long)mm_data);
mm_data->wake_out_gpio = of_get_gpio(np, 0);
if (mm_data->wake_out_gpio >= 0) {
if (muc_uart_config_gpio(&pdev->dev,
mm_data->wake_out_gpio, "muc_wake", 1, 1))
goto err1;
} else
goto err1;
if (sysfs_create_groups(&pdev->dev.kobj, muc_uart_groups)) {
dev_err(&pdev->dev, "Failed to create sysfs attributes\n");
goto err_dest_wq;
}
if (mmi_uart_init(muc_uart_rx_cb,
muc_uart_register_cb,
muc_uart_get_uart_data,
pdev))
goto err_dest_groups;
mm_data->wake_out_gpio = of_get_gpio(np, 0);
mm_data->wake_in_gpio = of_get_gpio(np, 1);
if (mm_data->wake_in_gpio >= 0)
mm_data->wake_irq =
gpio_to_irq(mm_data->wake_in_gpio);
else
goto err2;
mm_data->mod_attached_gpio = of_get_gpio(np, 2);
mm_data->muc_1_gpio = of_get_gpio(np, 3);
mm_data->muc_2_gpio = of_get_gpio(np, 4);
if (mm_data->wake_out_gpio < 0 ||
mm_data->wake_in_gpio < 0 ||
mm_data->mod_attached_gpio < 0 ||
mm_data->muc_1_gpio < 0 ||
mm_data->muc_2_gpio < 0)
goto err_exit_uart;
mm_data->wake_irq =
gpio_to_irq(mm_data->wake_in_gpio);
mm_data->mod_attached_irq =
gpio_to_irq(mm_data->mod_attached_gpio);
/* Let wake irq take us out of suspend */
if (irq_set_irq_wake(mm_data->wake_irq, 1))
MUC_ERR("Failed to set wake irq as wake source");
/* Let attach irq take us out of suspend */
if (irq_set_irq_wake(mm_data->mod_attached_irq, 1))
MUC_ERR("Failed to set attach irq as wake source");
if (devm_request_irq(&pdev->dev,
mm_data->wake_irq,
@ -1580,34 +1607,7 @@ static int muc_uart_probe(struct platform_device *pdev)
IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
pdev->dev.driver->name,
mm_data))
goto err2;
/* Let wake irq take us out of suspend */
if (irq_set_irq_wake(mm_data->wake_irq, 1))
MUC_ERR("Failed to set wake irq as wake source");
mm_data->mod_attached_gpio = of_get_gpio(np, 2);
if (mm_data->mod_attached_gpio >= 0)
mm_data->mod_attached_irq =
gpio_to_irq(mm_data->mod_attached_gpio);
else
goto err2;
mm_data->muc_1_gpio = of_get_gpio(np, 3);
if (mm_data->muc_1_gpio >= 0) {
if (muc_uart_config_gpio(&pdev->dev,
mm_data->muc_1_gpio, "muc_1", 1, 0))
goto err1;
} else
goto err2;
mm_data->muc_2_gpio = of_get_gpio(np, 4);
if (mm_data->muc_2_gpio >= 0) {
if (muc_uart_config_gpio(&pdev->dev,
mm_data->muc_2_gpio, "muc_2", 1, 1))
goto err1;
} else
goto err2;
goto err_exit_uart;
if (devm_request_irq(&pdev->dev,
mm_data->mod_attached_irq,
@ -1615,32 +1615,29 @@ static int muc_uart_probe(struct platform_device *pdev)
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
pdev->dev.driver->name,
mm_data))
goto err2;
goto err_exit_uart;
/* Let attach irq take us out of suspend */
if (irq_set_irq_wake(mm_data->mod_attached_irq, 1))
MUC_ERR("Failed to set attach irq as wake source");
if (muc_uart_config_gpio(&pdev->dev,
mm_data->wake_out_gpio, "muc_wake", 1, 1))
goto err_exit_uart;
if (sysfs_create_groups(&pdev->dev.kobj, muc_uart_groups)) {
dev_err(&pdev->dev, "Failed to create sysfs attributes\n");
goto err2;
}
if (muc_uart_config_gpio(&pdev->dev,
mm_data->muc_1_gpio, "muc_1", 1, 0))
goto err_free_wake_out;
if (mmi_uart_init(muc_uart_rx_cb,
muc_uart_register_cb,
muc_uart_get_uart_data,
pdev))
goto err2;
if (muc_uart_config_gpio(&pdev->dev,
mm_data->muc_2_gpio, "muc_2", 1, 1))
goto err_free_muc1;
if (mmi_char_init(UART_MAX_MSG_SIZE - MSG_META_DATA_SIZE, pdev))
goto err3;
goto err_free_muc2;
mm_data->phone_psy = devm_power_supply_register(&pdev->dev,
&phone_psy_desc,
&psy_cfg);
if (IS_ERR(mm_data->phone_psy)) {
dev_err(&pdev->dev, "failed: phone power supply register\n");
goto err3;
MUC_ERR("failed: phone power supply register\n");
goto err_exit_char;
}
mm_data->batt_psy = power_supply_get_by_name("battery");
@ -1650,27 +1647,40 @@ static int muc_uart_probe(struct platform_device *pdev)
mm_data->dc_psy = power_supply_get_by_name("dc");
mm_data->ps_nb.notifier_call = muc_uart_ps_notifier_cb;
if (power_supply_reg_notifier(&mm_data->ps_nb))
dev_err(&pdev->dev,
"couldn't register ps notifier\n");
if (power_supply_reg_notifier(&mm_data->ps_nb)) {
MUC_ERR("couldn't register ps notifier\n");
goto err_put_ps;
}
kobject_uevent(&pdev->dev.kobj, KOBJ_ADD);
schedule_delayed_work(&mm_data->attach_work, msecs_to_jiffies(0));
MUC_LOG("probe done\n");
#ifdef CONFIG_IPC_LOGGING
muc_ipc_log = ipc_log_context_create(MUC_IPC_LOG_PAGES, "muc_uart", 0);
if (!muc_ipc_log)
MUC_ERR("Failed to create IPC logging context\n");
#endif
return 0;
err3:
mmi_uart_exit(mm_data->uart_data);
err2:
err_put_ps:
power_supply_put(mm_data->batt_psy);
power_supply_put(mm_data->bms_psy);
power_supply_put(mm_data->usb_psy);
power_supply_put(mm_data->mmi_psy);
power_supply_put(mm_data->dc_psy);
err_exit_char:
mmi_char_exit();
err_free_muc2:
gpio_free(mm_data->muc_2_gpio);
err_free_muc1:
gpio_free(mm_data->muc_1_gpio);
err_free_wake_out:
gpio_free(mm_data->wake_out_gpio);
err1:
err_exit_uart:
mmi_uart_exit(mm_data->uart_data);
err_dest_groups:
sysfs_remove_groups(&pdev->dev.kobj, muc_uart_groups);
err_dest_wq:
del_timer(&mm_data->idle_timer);
del_timer(&mm_data->ack_timer);
del_timer(&mm_data->sleep_req_timer);
destroy_workqueue(mm_data->write_wq);
err:
return 1;