You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by je...@apache.org on 2020/09/10 06:55:49 UTC
[incubator-nuttx] branch master updated (06ca12e -> a712fbd)
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 06ca12e arch/: Trivial typos, mostly "their is" to "there is"
new 22651fa arch: cxd56xx: Introduce cxd56_testset.c
new a712fbd boards: wifi_smp: Add CONFIG_CXD56_TESTSET=y to defconfig
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/cxd56xx/Kconfig | 7 +++++
arch/arm/src/cxd56xx/Make.defs | 9 +++++-
arch/arm/src/cxd56xx/cxd56_sph.c | 6 +++-
.../lc823450_testset.c => cxd56xx/cxd56_testset.c} | 33 ++++++++--------------
.../cxd56xx/spresense/configs/wifi_smp/defconfig | 1 +
5 files changed, 33 insertions(+), 23 deletions(-)
copy arch/arm/src/{lc823450/lc823450_testset.c => cxd56xx/cxd56_testset.c} (82%)
[incubator-nuttx] 02/02: boards: wifi_smp: Add
CONFIG_CXD56_TESTSET=y to defconfig
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit a712fbd0a0a516abee84ad1d582231f8a21e1372
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Thu Sep 10 14:13:23 2020 +0900
boards: wifi_smp: Add CONFIG_CXD56_TESTSET=y to defconfig
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
index 081d6a9..5ab2bb7 100644
--- a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
@@ -31,6 +31,7 @@ CONFIG_CXD56_DMAC_SPI5_TX=y
CONFIG_CXD56_SDIO=y
CONFIG_CXD56_SPI5=y
CONFIG_CXD56_SPI=y
+CONFIG_CXD56_TESTSET=y
CONFIG_CXD56_USBDEV=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_HARDFAULT_ALERT=y
[incubator-nuttx] 01/02: arch: cxd56xx: Introduce cxd56_testset.c
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 22651fa22bf67be4cc7edd167b00be77a9fa55e4
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Thu Sep 10 14:02:51 2020 +0900
arch: cxd56xx: Introduce cxd56_testset.c
Summary:
- I noticed that ldrex/strex on cxd56xx have an issue
- The issue is still under investigation
- This commit introduces a custom testset to avoid the issue
Impact:
- Affects cxd56xx in SMP mode if it is enabled
Testing:
- Tested with spresense:wifi_smp
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
arch/arm/src/cxd56xx/Kconfig | 7 +++
arch/arm/src/cxd56xx/Make.defs | 9 +++-
arch/arm/src/cxd56xx/cxd56_sph.c | 6 ++-
arch/arm/src/cxd56xx/cxd56_testset.c | 90 ++++++++++++++++++++++++++++++++++++
4 files changed, 110 insertions(+), 2 deletions(-)
diff --git a/arch/arm/src/cxd56xx/Kconfig b/arch/arm/src/cxd56xx/Kconfig
index 62a0882..2f1f404 100644
--- a/arch/arm/src/cxd56xx/Kconfig
+++ b/arch/arm/src/cxd56xx/Kconfig
@@ -1284,4 +1284,11 @@ config CXD56_GEOFENCE
endif
+config CXD56_TESTSET
+ bool "Use custom testset for spinlock"
+ default n
+ depends on SPINLOCK
+ ---help---
+ Use custom testset based on hardware semaphore
+
endmenu
diff --git a/arch/arm/src/cxd56xx/Make.defs b/arch/arm/src/cxd56xx/Make.defs
index 8c3d142..6e47d4d 100644
--- a/arch/arm/src/cxd56xx/Make.defs
+++ b/arch/arm/src/cxd56xx/Make.defs
@@ -36,7 +36,11 @@
############################################################################
CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S
-CMN_ASRCS += arm_testset.S vfork.S
+CMN_ASRCS += vfork.S
+
+ifneq ($(CONFIG_CXD56_TESTSET),y)
+CMN_ASRCS += arm_testset.S
+endif
ifeq ($(CONFIG_ARCH_SETJMP_H),y)
ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
@@ -110,6 +114,9 @@ CHIP_CSRCS += cxd56_cpuidlestack.c
CHIP_CSRCS += cxd56_cpuindex.c
CHIP_CSRCS += cxd56_cpupause.c
CHIP_CSRCS += cxd56_cpustart.c
+ifeq ($(CONFIG_CXD56_TESTSET),y)
+CHIP_CSRCS += cxd56_testset.c
+endif
endif
ifeq ($(CONFIG_CXD56_UART0),y)
diff --git a/arch/arm/src/cxd56xx/cxd56_sph.c b/arch/arm/src/cxd56xx/cxd56_sph.c
index b9d33b8..b0e0f19 100644
--- a/arch/arm/src/cxd56xx/cxd56_sph.c
+++ b/arch/arm/src/cxd56xx/cxd56_sph.c
@@ -300,9 +300,13 @@ int cxd56_sphinitialize(FAR const char *devname)
int ret;
int i;
- /* No. 0-2 and 15 semaphores are reserved by other system. */
+ /* No. 0-2 and (14)-15 semaphores are reserved by other system. */
+#ifdef CONFIG_CXD56_TESTSET
+ for (i = 3; i < 14; i++)
+#else
for (i = 3; i < 15; i++)
+#endif
{
ret = cxd56_sphdevinit(devname, i);
if (ret != OK)
diff --git a/arch/arm/src/cxd56xx/cxd56_testset.c b/arch/arm/src/cxd56xx/cxd56_testset.c
new file mode 100644
index 0000000..5a238ea
--- /dev/null
+++ b/arch/arm/src/cxd56xx/cxd56_testset.c
@@ -0,0 +1,90 @@
+/****************************************************************************
+ * arch/arm/src/cxd56xx/cxd56_testset.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/arch.h>
+#include <nuttx/spinlock.h>
+
+#include "hardware/cxd56_sph.h"
+#include "cxd56_sph.h"
+
+#include "arm_arch.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define SPH_SMP 14 /* Use hardware semaphore #14 */
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: up_testset
+ *
+ * Description:
+ * Perform and atomic test and set operation on the provided spinlock.
+ * This function must be provided via the architecture-specific logic.
+ *
+ * Input Parameters:
+ * lock - The address of spinlock object.
+ *
+ * Returned Value:
+ * The spinlock is always locked upon return. The value of previous value
+ * of the spinlock variable is returned, either SP_LOCKED if the spinlock
+ * as previously locked (meaning that the test-and-set operation failed to
+ * obtain the lock) or SP_UNLOCKED if the spinlock was previously unlocked
+ * (meaning that we successfully obtained the lock)
+ *
+ ****************************************************************************/
+
+spinlock_t up_testset(volatile FAR spinlock_t *lock)
+{
+ spinlock_t ret;
+ uint32_t sphlocked = ((up_cpu_index() + 2) << 16) | 0x1;
+
+ /* Lock hardware semaphore */
+
+ do
+ {
+ putreg32(REQ_LOCK, CXD56_SPH_REQ(SPH_SMP));
+ }
+ while (getreg32(CXD56_SPH_STS(SPH_SMP)) != sphlocked);
+
+ ret = *lock;
+
+ if (ret == SP_UNLOCKED)
+ {
+ *lock = SP_LOCKED;
+ SP_DMB();
+ }
+
+ /* Unlock hardware semaphore */
+
+ putreg32(REQ_UNLOCK, CXD56_SPH_REQ(SPH_SMP));
+
+ return ret;
+}