summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-08-23 18:59:24 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-08-23 18:59:24 -0600
commit43ddf9e3103d8ffea64d379f11c07f4686acd01d (patch)
tree86bd4a6c4d60f22692d21da83a462ad1e0c149de
parent823f94590bd52f1475fa917b0d2ef8544e3ccae4 (diff)
downloadnuttx-43ddf9e3103d8ffea64d379f11c07f4686acd01d.tar.gz
nuttx-43ddf9e3103d8ffea64d379f11c07f4686acd01d.tar.bz2
nuttx-43ddf9e3103d8ffea64d379f11c07f4686acd01d.zip
ARMv7-A: Add skeleton environment and build support for process address environments
-rw-r--r--nuttx/arch/arm/Kconfig2
-rw-r--r--nuttx/arch/arm/src/a1x/Make.defs4
-rw-r--r--nuttx/arch/arm/src/armv7-a/arm_addrenv.c298
-rw-r--r--nuttx/arch/arm/src/sama5/Make.defs4
4 files changed, 308 insertions, 0 deletions
diff --git a/nuttx/arch/arm/Kconfig b/nuttx/arch/arm/Kconfig
index 7c07f13e6..f93bb037f 100644
--- a/nuttx/arch/arm/Kconfig
+++ b/nuttx/arch/arm/Kconfig
@@ -18,6 +18,7 @@ config ARCH_CHIP_A1X
select ARCH_HAVE_LOWVECTORS
select ARCH_HAVE_SDRAM
select BOOT_RUNFROMSDRAM
+ select ADDRENV if EXPERIMENTAL
---help---
Allwinner A1X family: A10, A10S (A12), A13 (ARM Cortex-A8)
@@ -135,6 +136,7 @@ config ARCH_CHIP_SAMA5
select ARCH_HAVE_LOWVECTORS
select ARCH_HAVE_I2CRESET
select ARCH_HAVE_TICKLESS
+ select ADDRENV if EXPERIMENTAL
---help---
Atmel SAMA5 (ARM Cortex-A5)
diff --git a/nuttx/arch/arm/src/a1x/Make.defs b/nuttx/arch/arm/src/a1x/Make.defs
index 4f22c88c8..c437a0c27 100644
--- a/nuttx/arch/arm/src/a1x/Make.defs
+++ b/nuttx/arch/arm/src/a1x/Make.defs
@@ -82,6 +82,10 @@ CMN_CSRCS += arm_allocpage.c arm_checkmapping.c arm_pginitialize.c
CMN_CSRCS += arm_va2pte.c
endif
+ifeq ($(CONFIG_ADDRENV),y)
+CMN_CSRCS += arm_addrenv.c
+endif
+
ifeq ($(CONFIG_ELF),y)
CMN_CSRCS += arm_elf.c
endif
diff --git a/nuttx/arch/arm/src/armv7-a/arm_addrenv.c b/nuttx/arch/arm/src/armv7-a/arm_addrenv.c
new file mode 100644
index 000000000..0813ed7ef
--- /dev/null
+++ b/nuttx/arch/arm/src/armv7-a/arm_addrenv.c
@@ -0,0 +1,298 @@
+/****************************************************************************
+ * arch/arm/src/armv7/arm_addrenv.c
+ *
+ * Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+/****************************************************************************
+ * Address Environment Interfaces
+ *
+ * Low-level interfaces used in binfmt/ to instantiate tasks with address
+ * environments. These interfaces all operate on type group_addrenv_t which
+ * is an abstract representation of a task group's address environment and
+ * must be defined in arch/arch.h if CONFIG_ADDRENV is defined.
+ *
+ * up_addrenv_create - Create an address environment
+ * up_addrenv_destroy - Destroy an address environment.
+ * up_addrenv_vaddr - Returns the virtual base address of the address
+ * environment
+ * up_addrenv_select - Instantiate an address environment
+ * up_addrenv_restore - Restore an address environment
+ * up_addrenv_assign - Assign an address environment to a group
+ *
+ * Higher-level interfaces used by the tasking logic. These interfaces are
+ * used by the functions in sched/ and all operate on the thread which whose
+ * group been assigned an address environment by up_addrenv_assign().
+ *
+ * up_addrenv_attach - Clone the address environment assigned to one TCB
+ * to another. This operation is done when a pthread
+ * is created that share's the same address
+ * environment.
+ * up_addrenv_detach - Release the threads reference to an address
+ * environment when a task/thread exits.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <errno.h>
+
+#include <nuttx/arch.h>
+#include <arch/arch.h>
+
+#ifdef CONFIG_ADDRENV
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: up_addrenv_create
+ *
+ * Description:
+ * This function is called when a new task is created in order to
+ * instantiate an address environment for the new task group.
+ * up_addrenv_create() is essentially the allocator of the physical
+ * memory for the new task.
+ *
+ * Input Parameters:
+ * envsize - The size (in bytes) of the address environment needed by the
+ * task.
+ * addrenv - The location to return the representation of the task address
+ * environment.
+ *
+ * Returned Value:
+ * Zero (OK) on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int up_addrenv_create(size_t envsize, FAR group_addrenv_t *addrenv)
+{
+#warning Missing logic
+ return -ENOSYS;
+}
+
+/****************************************************************************
+ * Name: up_addrenv_destroy
+ *
+ * Description:
+ * This function is called when a final thread leaves the task group and
+ * the task group is destroyed. This function then destroys the defunct
+ * address environment, releasing the underlying physical memory.
+ *
+ * Input Parameters:
+ * addrenv - The address environment to be destroyed.
+ *
+ * Returned Value:
+ * Zero (OK) on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int up_addrenv_destroy(group_addrenv_t addrenv)
+{
+#warning Missing logic
+ return -ENOSYS;
+}
+
+/****************************************************************************
+ * Name: up_addrenv_vaddr
+ *
+ * Description:
+ * Return the virtual address associated with the newly create address
+ * environment. This function is used by the binary loaders in order
+ * get an address that can be used to initialize the new task.
+ *
+ * Input Parameters:
+ * addrenv - The representation of the task address environment previously
+ * returned by up_addrenv_create.
+ * vaddr - The location to return the virtual address.
+ *
+ * Returned Value:
+ * Zero (OK) on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int up_addrenv_vaddr(FAR group_addrenv_t addrenv, FAR void **vaddr)
+{
+#warning Missing logic
+ return -ENOSYS;
+}
+
+/****************************************************************************
+ * Name: up_addrenv_select
+ *
+ * Description:
+ * After an address environment has been established for a task group (via
+ * up_addrenv_create(). This function may be called to to instantiate
+ * that address environment in the virtual address space. this might be
+ * necessary, for example, to load the code for the task group from a file or
+ * to access address environment private data.
+ *
+ * Input Parameters:
+ * addrenv - The representation of the task address environment previously
+ * returned by up_addrenv_create.
+ * oldenv
+ * The address environment that was in place before up_addrenv_select().
+ * This may be used with up_addrenv_restore() to restore the original
+ * address environment that was in place before up_addrenv_select() was
+ * called. Note that this may be a task agnostic, hardware
+ * representation that is different from group_addrenv_t.
+ *
+ * Returned Value:
+ * Zero (OK) on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int up_addrenv_select(group_addrenv_t addrenv, hw_addrenv_t *oldenv)
+{
+#warning Missing logic
+ return -ENOSYS;
+}
+
+/****************************************************************************
+ * Name: up_addrenv_restore
+ *
+ * Description:
+ * After an address environment has been temporarily instantiated by
+ * up_addrenv_select(), this function may be called to to restore the
+ * original address environment.
+ *
+ * Input Parameters:
+ * oldenv - The hardware representation of the address environment
+ * previously returned by up_addrenv_select.
+ *
+ * Returned Value:
+ * Zero (OK) on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int up_addrenv_restore(hw_addrenv_t oldenv)
+{
+#warning Missing logic
+ return -ENOSYS;
+}
+
+/****************************************************************************
+ * Name: up_addrenv_assign
+ *
+ * Description:
+ * Assign an address environment to a new task group.
+ *
+ * Input Parameters:
+ * addrenv - The representation of the task address environment previously
+ * returned by up_addrenv_create().
+ * group - The new task group to receive the address environment.
+ *
+ * Returned Value:
+ * Zero (OK) on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int up_addrenv_assign(group_addrenv_t addrenv, FAR struct task_group_s *group)
+{
+#warning Missing logic
+ return -ENOSYS;
+}
+
+/****************************************************************************
+ * Name: up_addrenv_attach
+ *
+ * Description:
+ * This function is called from the core scheduler logic when a thread
+ * is created that needs to share the address environment of its task
+ * group.
+ *
+ * NOTE: In some platforms, nothing will need to be done in this case.
+ * Simply being a member of the group that has the address environment
+ * may be sufficient.
+ *
+ * Input Parameters:
+ * group - The task group to which the new thread belongs.
+ * tcb - The TCB of the thread needing the address environment.
+ *
+ * Returned Value:
+ * Zero (OK) on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int up_addrenv_attach(FAR struct task_group_s *group, FAR struct tcb_s *tcb)
+{
+#warning Missing logic
+ return -ENOSYS;
+}
+
+/****************************************************************************
+ * Name: up_addrenv_detach
+ *
+ * Description:
+ * This function is called when a task or thread exits in order to release
+ * its reference to an address environment. The address environment,
+ * however, should persist until up_addrenv_destroy() is called when the
+ * task group is itself destroyed. Any resources unique to this thread
+ * may be destroyed now.
+ *
+ * NOTE: In some platforms, nothing will need to be done in this case.
+ * Simply being a member of the group that has the address environment
+ * may be sufficient.
+ *
+ * Input Parameters:
+ * group - The group to which the thread belonged.
+ * tcb - The TCB of the task or thread whose the address environment will
+ * be released.
+ *
+ * Returned Value:
+ * Zero (OK) on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int up_addrenv_detach(FAR struct task_group_s *group, FAR struct tcb_s *tcb)
+{
+#warning Missing logic
+ return -ENOSYS;
+}
+
+#endif /* CONFIG_ADDRENV */
diff --git a/nuttx/arch/arm/src/sama5/Make.defs b/nuttx/arch/arm/src/sama5/Make.defs
index 29d4adef6..222aa1c92 100644
--- a/nuttx/arch/arm/src/sama5/Make.defs
+++ b/nuttx/arch/arm/src/sama5/Make.defs
@@ -84,6 +84,10 @@ CMN_CSRCS += arm_allocpage.c arm_checkmapping.c arm_pginitialize.c
CMN_CSRCS += arm_va2pte.c
endif
+ifeq ($(CONFIG_ADDRENV),y)
+CMN_CSRCS += arm_addrenv.c
+endif
+
ifeq ($(CONFIG_ELF),y)
CMN_CSRCS += arm_elf.c
endif