You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/03/10 06:15:04 UTC
[incubator-nuttx] 02/02: Revert "arch: cxd56xx: Fix cxd56_usbdev.c
for SMP"
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2c753be0dfc1cdaf24caff7196519f9e40263485
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Wed Mar 10 11:41:15 2021 +0900
Revert "arch: cxd56xx: Fix cxd56_usbdev.c for SMP"
Summary:
- The original commit was added to avoid hardfault but the
root cause was the stack corruption which has been fixed by
the previous commit. So let me revert the original commit.
Impact:
- SMP only
Testing:
- spresense:rndis_smp with nxplayer + telnet
This reverts commit 197187d8267e1c72dd230bc46390192cf47270c3.
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
arch/arm/src/cxd56xx/cxd56_usbdev.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_usbdev.c b/arch/arm/src/cxd56xx/cxd56_usbdev.c
index a0e70fd..8a96636 100644
--- a/arch/arm/src/cxd56xx/cxd56_usbdev.c
+++ b/arch/arm/src/cxd56xx/cxd56_usbdev.c
@@ -1540,10 +1540,6 @@ static int cxd56_epinterrupt(int irq, FAR void *context)
uint16_t len;
int n;
-#ifdef CONFIG_SMP
- irqstate_t flags = enter_critical_section();
-#endif
-
eps = getreg32(CXD56_USB_DEV_EP_INTR);
{
for (n = 0; n < CXD56_NENDPOINTS; n++)
@@ -1817,10 +1813,6 @@ static int cxd56_epinterrupt(int irq, FAR void *context)
}
}
-#ifdef CONFIG_SMP
- leave_critical_section(flags);
-#endif
-
return OK;
}
@@ -2593,10 +2585,6 @@ static int cxd56_epstall(FAR struct usbdev_ep_s *ep, bool resume)
uint32_t ctrl;
uint32_t addr;
-#ifdef CONFIG_SMP
- irqstate_t flags = enter_critical_section();
-#endif
-
addr = USB_ISEPIN(ep->eplog) ? CXD56_USB_IN_EP_CONTROL(privep->epphy)
: CXD56_USB_OUT_EP_CONTROL(privep->epphy);
@@ -2615,10 +2603,6 @@ static int cxd56_epstall(FAR struct usbdev_ep_s *ep, bool resume)
privep->stalled = 1;
}
-#ifdef CONFIG_SMP
- leave_critical_section(flags);
-#endif
-
return OK;
}