Skip to content

os/arch/arm/src/amebasmart: fix sem_timedwait(&g_read_cmd_done) not b… #6994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhongnuo-tang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

os/arch/arm/src/amebasmart: fix sem_timedwait(&g_read_cmd_done) not b… #6994

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 30 additions & 13 deletions os/arch/arm/src/amebasmart/amebasmart_mipi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,7 @@ static int amebasmart_mipi_transfer(FAR struct mipi_dsi_host *dsi_host, FAR cons
return ret;
}
send_cmd_done = 0;
receive_cmd_done = 1;
rx_data_rdy = FALSE;
if (msg->rx_buf) {
rx_data_ptr = msg->rx_buf;
Expand All @@ -500,22 +501,18 @@ static int amebasmart_mipi_transfer(FAR struct mipi_dsi_host *dsi_host, FAR cons
(void)clock_gettime(CLOCK_REALTIME, &abstime);
abstime.tv_sec += MIPI_TRANSFER_TIMEOUT;
ret = sem_timedwait(&g_send_cmd_done, &abstime);
if (!receive_cmd_done) {
ret = sem_timedwait(&g_read_cmd_done, &abstime);
if (ret != OK) {
goto Fail_case;
}
leave_critical_section(flags);
if (send_cmd_done != 1 || receive_cmd_done != 1) {
#ifdef CONFIG_PM
bsp_pm_domain_control(BSP_MIPI_DRV, 0);
#endif
#ifdef CONFIG_SMP
spin_unlock(&g_rtl8730e_config_dev_s_underflow);
#endif
if (msg->rx_buf && msg->rx_len > 0) {
memset(msg->rx_buf, 0, msg->rx_len);
if (MIPI_LPTX_IS_READ(msg->type)) {
(void)clock_gettime(CLOCK_REALTIME, &abstime);
abstime.tv_sec += MIPI_TRANSFER_TIMEOUT;
ret = sem_timedwait(&g_read_cmd_done, &abstime);
if (ret != OK) {
goto Fail_case;
}
return FAIL;
}
leave_critical_section(flags);
#ifdef CONFIG_SMP
spin_unlock(&g_rtl8730e_config_dev_s_underflow);
#endif
Expand All @@ -527,6 +524,26 @@ static int amebasmart_mipi_transfer(FAR struct mipi_dsi_host *dsi_host, FAR cons
rx_data_len = 0;
}
return OK;
Fail_case:
if (send_cmd_done == 0) {
sem_init(&g_send_cmd_done, 0, 0);
}
if (receive_cmd_done == 0) {
sem_init(&g_read_cmd_done, 0, 0);
}
if (msg->rx_buf && msg->rx_len > 0 && MIPI_LPTX_IS_READ(msg->type)) {
memset(msg->rx_buf, 0, msg->rx_len);
rx_data_ptr = NULL;
rx_data_len = 0;
}
leave_critical_section(flags);
#ifdef CONFIG_SMP
spin_unlock(&g_rtl8730e_config_dev_s_underflow);
#endif
#ifdef CONFIG_PM
bsp_pm_domain_control(BSP_MIPI_DRV, 0);
#endif
return FAIL;
}

#ifdef CONFIG_PM
Expand Down