Merge "mobicore: New branch incorporating QC code review suggestions."
diff --git a/drivers/gud/Kconfig b/drivers/gud/Kconfig
index 3a241b7..929ba01d 100644
--- a/drivers/gud/Kconfig
+++ b/drivers/gud/Kconfig
@@ -3,7 +3,6 @@
#
config MOBICORE_SUPPORT
tristate "Linux MobiCore Support"
- #depends on ARM_TRUSTZONE
---help---
Enable Linux Kernel MobiCore Support
@@ -12,14 +11,14 @@
depends on MOBICORE_SUPPORT
---help---
Enable Debug mode in the MobiCore Driver.
- It enables printing information about mobicore operations
+ It enables printing information about MobiCore operations
config MOBICORE_VERBOSE
bool "MobiCore Module verbose debug mode"
depends on MOBICORE_DEBUG
---help---
Enable Verbose Debug mode in the MobiCore Driver.
- It enables printing extra information about mobicore operations
+ It enables printing extra information about MobiCore operations
Beware: this is only useful for debuging deep in the driver because
it prints too much logs
@@ -29,4 +28,3 @@
depends on MOBICORE_SUPPORT
---help---
Enable Linux Kernel MobiCore API
-
diff --git a/drivers/gud/mobicore_driver/build_tag.h b/drivers/gud/mobicore_driver/build_tag.h
index 43541bb..79404fd 100644
--- a/drivers/gud/mobicore_driver/build_tag.h
+++ b/drivers/gud/mobicore_driver/build_tag.h
@@ -1,6 +1,5 @@
-/**
- *
- * <!-- Copyright Giesecke & Devrient GmbH 2012-2012 -->
+/*
+ * <-- Copyright Giesecke & Devrient GmbH 2010-2012 -->
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,4 +25,5 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define MOBICORE_COMPONENT_BUILD_TAG "*** GC_MSM8960_Release_V010 ###"
+#define MOBICORE_COMPONENT_BUILD_TAG \
+ "*** Build by haenellu@n500956-ubuntu, svn@r19078 ###"
diff --git a/drivers/gud/mobicore_driver/logging.c b/drivers/gud/mobicore_driver/logging.c
index eb44c8a..a1da6e2 100644
--- a/drivers/gud/mobicore_driver/logging.c
+++ b/drivers/gud/mobicore_driver/logging.c
@@ -1,108 +1,102 @@
-/** MobiCore driver module.(interface to the secure world SWD)
- * @addtogroup MCD_MCDIMPL_KMOD_LOGGING MobiCore Driver Logging Subsystem.
- * @ingroup MCD_MCDIMPL_KMOD
- * @{
- * @file
+/*
* MobiCore Driver Logging Subsystem.
+ *
* The logging subsytem provides the interface between the Mobicore trace
* buffer and the Linux log
*
- * <!-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+#include <linux/miscdevice.h>
+#include <linux/moduleparam.h>
+#include <linux/kthread.h>
+#include <linux/slab.h>
+#include <linux/mm.h>
+#include <linux/device.h>
+
#include "mc_drv_module.h"
-#include "mc_drv_module_linux_api.h"
#include "mc_drv_module_fastcalls.h"
/* Default len of the log ring buffer 256KB*/
-#define LOG_BUF_SIZE (64 * PAGE_SIZE)
+#define LOG_BUF_SIZE (64 * PAGE_SIZE)
/* Max Len of a log line for printing */
-#define LOG_LINE_SIZE 256
+#define LOG_LINE_SIZE 256
static uint32_t log_size = LOG_BUF_SIZE;
-module_param(log_size, uint, 0);
-MODULE_PARM_DESC(log_size, " Size of the MobiCore log ringbuffer "
- "(or 256KB default).");
-/*----------------------------------------------------------------------------*/
+module_param(log_size, uint, 0);
+MODULE_PARM_DESC(log_size, " Size of the log ringbuffer (or 256KB default).");
+
/* Definitions for log version 2 */
-#define LOG_TYPE_MASK (0x0007)
-#define LOG_TYPE_CHAR 0
-#define LOG_TYPE_INTEGER 1
+#define LOG_TYPE_MASK (0x0007)
+#define LOG_TYPE_CHAR 0
+#define LOG_TYPE_INTEGER 1
/* Field length */
-#define LOG_LENGTH_MASK (0x00F8)
-#define LOG_LENGTH_SHIFT 3
+#define LOG_LENGTH_MASK (0x00F8)
+#define LOG_LENGTH_SHIFT 3
/* Extra attributes */
-#define LOG_EOL (0x0100)
-#define LOG_INTEGER_DECIMAL (0x0200)
-#define LOG_INTEGER_SIGNED (0x0400)
+#define LOG_EOL (0x0100)
+#define LOG_INTEGER_DECIMAL (0x0200)
+#define LOG_INTEGER_SIGNED (0x0400)
struct logmsg_struct {
- /* Type and format of data */
- uint16_t ctrl;
- /* Unique value for each event source */
- uint16_t source;
- /* Value, if any */
- uint32_t log_data;
+ uint16_t ctrl; /* Type and format of data */
+ uint16_t source; /* Unique value for each event source */
+ uint32_t log_data; /* Value, if any */
};
-/** MobiCore log previous position */
-static uint32_t log_pos;
-/** MobiCore log buffer structure */
-static struct mc_trace_buf *log_buf;
-/** Log Thread task structure */
-struct task_struct *log_thread;
-/** Log Line buffer */
-static char *log_line;
+static uint32_t log_pos; /* MobiCore log previous position */
+static struct mc_trace_buf *log_buf; /* MobiCore log buffer structure */
+struct task_struct *log_thread; /* Log Thread task structure */
+static char *log_line; /* Log Line buffer */
+static uint32_t log_line_len; /* Log Line buffer current len */
-static void log_msg(struct logmsg_struct *msg);
-
-/*----------------------------------------------------------------------------*/
static void log_eol(void)
{
if (!strnlen(log_line, LOG_LINE_SIZE))
return;
- printk(KERN_INFO "%s\n", log_line);
+ dev_info(mcd, "%s\n", log_line);
+ log_line_len = 0;
log_line[0] = 0;
}
-/*----------------------------------------------------------------------------*/
-/**
- * Put a char to the log line if there is enough space if not then also
- * output the line. Assume nobody else is updating the line! */
+
+/*
+ * Collect chars in log_line buffer and output the buffer when it is full.
+ * No locking needed because only "mobicore_log" thread updates this buffer.
+ */
static void log_char(char ch)
{
- uint32_t len;
if (ch == '\n' || ch == '\r') {
log_eol();
return;
}
- if (strnlen(log_line, LOG_LINE_SIZE) >= LOG_LINE_SIZE - 1) {
- printk(KERN_INFO "%s\n", log_line);
+ if (log_line_len >= LOG_LINE_SIZE - 1) {
+ dev_info(mcd, "%s\n", log_line);
+ log_line_len = 0;
log_line[0] = 0;
}
- len = strnlen(log_line, LOG_LINE_SIZE);
- log_line[len] = ch;
- log_line[len + 1] = 0;
+ log_line[log_line_len] = ch;
+ log_line[log_line_len + 1] = 0;
+ log_line_len++;
}
-/*----------------------------------------------------------------------------*/
-/**
- * Put a string to the log line if there is enough space if not then also
- * output the line. Assume nobody else is updating the line! */
+/*
+ * Put a string to the log line.
+ */
static void log_str(const char *s)
{
int i;
+
for (i = 0; i < strnlen(s, LOG_LINE_SIZE); i++)
log_char(s[i]);
}
-/*----------------------------------------------------------------------------*/
static uint32_t process_v1log(void)
{
char *last_char = log_buf->buff + log_buf->write_pos;
@@ -116,44 +110,28 @@
return buff - log_buf->buff;
}
-/*----------------------------------------------------------------------------*/
-static uint32_t process_v2log(void)
-{
- char *last_msg = log_buf->buff + log_buf->write_pos;
- char *buff = log_buf->buff + log_pos;
- while (buff != last_msg) {
- log_msg((struct logmsg_struct *)buff);
- buff += sizeof(struct logmsg_struct);
- /* Wrap around */
- if (buff + sizeof(struct logmsg_struct) >
- (char *)log_buf + log_size)
- buff = log_buf->buff;
- }
- return buff - log_buf->buff;
-}
+static const uint8_t HEX2ASCII[16] = {
+ '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-static const uint8_t HEX2ASCII[16] = { '0', '1', '2', '3', '4', '5', '6', '7',
- '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-
-/*----------------------------------------------------------------------------*/
static void dbg_raw_nro(uint32_t format, uint32_t value)
{
int digits = 1;
uint32_t base = (format & LOG_INTEGER_DECIMAL) ? 10 : 16;
int width = (format & LOG_LENGTH_MASK) >> LOG_LENGTH_SHIFT;
- int negative = FALSE;
+ int negative = 0;
uint32_t digit_base = 1;
if ((format & LOG_INTEGER_SIGNED) != 0 && ((signed int)value) < 0) {
- negative = TRUE;
- value = (uint32_t)(-(signed int)value);
- width--;
+ negative = 1;
+ value = (uint32_t)(-(signed int)value);
+ width--;
}
/* Find length and divider to get largest digit */
while (value / digit_base >= base) {
- digit_base *= base;
- digits++;
+ digit_base *= base;
+ digits++;
}
if (width > digits) {
@@ -175,11 +153,11 @@
}
}
-/*----------------------------------------------------------------------------*/
static void log_msg(struct logmsg_struct *msg)
{
unsigned char msgtxt[5];
int mpos = 0;
+
switch (msg->ctrl & LOG_TYPE_MASK) {
case LOG_TYPE_CHAR: {
uint32_t ch;
@@ -203,16 +181,26 @@
log_eol();
}
-/*----------------------------------------------------------------------------*/
+static uint32_t process_v2log(void)
+{
+ char *last_msg = log_buf->buff + log_buf->write_pos;
+ char *buff = log_buf->buff + log_pos;
+ while (buff != last_msg) {
+ log_msg((struct logmsg_struct *)buff);
+ buff += sizeof(struct logmsg_struct);
+ /* Wrap around */
+ if ((buff + sizeof(struct logmsg_struct)) >
+ ((char *)log_buf + log_size))
+ buff = log_buf->buff;
+ }
+ return buff - log_buf->buff;
+}
+
static int log_worker(void *p)
{
if (log_buf == NULL)
return -EFAULT;
- /* The thread should have never started */
- if (log_buf == NULL)
- return -EFAULT;
-
while (!kthread_should_stop()) {
if (log_buf->write_pos == log_pos)
schedule_timeout_interruptible(MAX_SCHEDULE_TIMEOUT);
@@ -225,22 +213,22 @@
log_pos = process_v2log();
break;
default:
- MCDRV_DBG_ERROR("Unknown Mobicore log data "
- "version %d logging disabled.",
- log_buf->version);
+ MCDRV_DBG_ERROR(mcd, "Unknown Mobicore log data");
+ MCDRV_DBG_ERROR(mcd, "version %d logging disabled.",
+ log_buf->version);
log_pos = log_buf->write_pos;
- /* Stop the thread as we have no idea what
- * happens next */
+ /*
+ * Stop the thread as we have no idea what
+ * happens next
+ */
return -EFAULT;
}
}
- MCDRV_DBG("Logging thread stopped!");
+ MCDRV_DBG(mcd, "Logging thread stopped!");
return 0;
}
-
-/*----------------------------------------------------------------------------*/
-/**
+/*
* Wakeup the log reader thread
* This should be called from the places where calls into MobiCore have
* generated some logs(eg, yield, SIQ...)
@@ -253,9 +241,8 @@
wake_up_process(log_thread);
}
-/*----------------------------------------------------------------------------*/
-/**
- * Setup mobicore kernel log. It assumes it's running on CORE 0!
+/*
+ * Setup MobiCore kernel log. It assumes it's running on CORE 0!
* The fastcall will complain is that is not the case!
*/
long mobicore_log_setup(void *data)
@@ -263,64 +250,77 @@
unsigned long phys_log_buf;
union fc_generic fc_log;
+ long ret;
log_pos = 0;
log_buf = NULL;
log_thread = NULL;
log_line = NULL;
+ log_line_len = 0;
/* Sanity check for the log size */
if (log_size < PAGE_SIZE)
return -EFAULT;
else
- log_size =
- get_nr_of_pages_for_buffer(NULL, log_size) * PAGE_SIZE;
+ log_size = PAGE_ALIGN(log_size);
log_line = kzalloc(LOG_LINE_SIZE, GFP_KERNEL);
if (IS_ERR(log_line)) {
- MCDRV_DBG_ERROR("failed to allocate log line!");
+ MCDRV_DBG_ERROR(mcd, "failed to allocate log line!");
return -ENOMEM;
}
log_thread = kthread_create(log_worker, NULL, "mobicore_log");
if (IS_ERR(log_thread)) {
- MCDRV_DBG_ERROR("mobicore log thread creation failed!");
- return -EFAULT;
+ MCDRV_DBG_ERROR(mcd, "MobiCore log thread creation failed!");
+ ret = -EFAULT;
+ goto mobicore_log_setup_log_line;
}
- log_pos = 0;
+ /*
+ * We are going to map this buffer into virtual address space in SWd.
+ * To reduce complexity there, we use a contiguous buffer.
+ */
log_buf = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
- size_to_order(log_size));
+ get_order(log_size));
if (!log_buf) {
- MCDRV_DBG_ERROR("Failed to get page for logger!");
- return -ENOMEM;
+ MCDRV_DBG_ERROR(mcd, "Failed to get page for logger!");
+ ret = -ENOMEM;
+ goto mobicore_log_setup_kthread;
}
phys_log_buf = virt_to_phys(log_buf);
memset(&fc_log, 0, sizeof(fc_log));
- fc_log.as_in.cmd = MC_FC_NWD_TRACE;
+ fc_log.as_in.cmd = MC_FC_NWD_TRACE;
fc_log.as_in.param[0] = phys_log_buf;
fc_log.as_in.param[1] = log_size;
- MCDRV_DBG("fc_log virt=%p phys=%p ", log_buf, (void *)phys_log_buf);
+ MCDRV_DBG(mcd, "fc_log virt=%p phys=%p ",
+ log_buf, (void *)phys_log_buf);
mc_fastcall(&fc_log);
- MCDRV_DBG("fc_log out ret=0x%08x", fc_log.as_out.ret);
+ MCDRV_DBG(mcd, "fc_log out ret=0x%08x", fc_log.as_out.ret);
+
/* If the setup failed we must free the memory allocated */
if (fc_log.as_out.ret) {
- MCDRV_DBG_ERROR("MobiCore shared traces setup failed!");
- kthread_stop(log_thread);
- free_pages((unsigned long)log_buf, size_to_order(log_size));
-
+ MCDRV_DBG_ERROR(mcd, "MobiCore shared traces setup failed!");
+ free_pages((unsigned long)log_buf, get_order(log_size));
log_buf = NULL;
- log_thread = NULL;
- return -EIO;
+ ret = -EIO;
+ goto mobicore_log_setup_kthread;
}
- MCDRV_DBG("fc_log Logger version %u\n", log_buf->version);
+ MCDRV_DBG(mcd, "fc_log Logger version %u\n", log_buf->version);
return 0;
+
+mobicore_log_setup_kthread:
+ kthread_stop(log_thread);
+ log_thread = NULL;
+mobicore_log_setup_log_line:
+ kfree(log_line);
+ log_line = NULL;
+ return ret;
}
-/*----------------------------------------------------------------------------*/
-/**
+/*
* Free kernel log componenets.
* ATTN: We can't free the log buffer because it's also in use by MobiCore and
* even if the module is unloaded MobiCore is still running.
diff --git a/drivers/gud/mobicore_driver/main.c b/drivers/gud/mobicore_driver/main.c
index 8a8ea1e..bc47d8e 100644
--- a/drivers/gud/mobicore_driver/main.c
+++ b/drivers/gud/mobicore_driver/main.c
@@ -1,8 +1,6 @@
-/** MobiCore driver module.(interface to the secure world SWD)
- * @addtogroup MCD_MCDIMPL_KMOD_IMPL
- * @{
- * @file
+/*
* MobiCore Driver Kernel Module.
+ *
* This module is written as a Linux device driver.
* This driver represents the command proxy on the lowest layer, from the
* secure world to the non secure world, and vice versa.
@@ -12,16 +10,22 @@
* The access to the driver is possible with a file descriptor,
* which has to be created by the fd = open(/dev/mobicore) command.
*
- * <!-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-
+#include <linux/miscdevice.h>
+#include <linux/interrupt.h>
+#include <linux/highmem.h>
+#include <linux/slab.h>
+#include <linux/kthread.h>
+#include <linux/ptrace.h>
+#include <linux/device.h>
#include <linux/module.h>
+
#include "mc_drv_module.h"
-#include "mc_drv_module_linux_api.h"
#include "mc_drv_module_android.h"
#include "mc_drv_module_fastcalls.h"
#include "public/mc_kernel_api.h"
@@ -29,89 +33,101 @@
/* Initial value for the daemon sempahore signaling */
#define DAEMON_SEM_VAL 0
-/** MobiCore interrupt context data */
+/* Define a MobiCore device structure for use with dev_debug() etc */
+struct device_driver mcd_debug_name = {
+ .name = "mcdrvkmod"
+};
+
+struct device mcd_debug_subname = {
+ .init_name = "", /* Set to 'mcd' at mc_init() time */
+ .driver = &mcd_debug_name
+};
+
+struct device *mcd = &mcd_debug_subname;
+
+/* MobiCore interrupt context data */
static struct mc_drv_kmod_ctx mc_drv_kmod_ctx;
-/** MobiCore MCI information */
+/* MobiCore MCI information */
static uint32_t mci_base;
+
/*
-#############################################################################
-##
-## Convenience functions for Linux API functions
-##
-#############################################################################*/
+ * #############################################################################
+ * ##
+ * ## Convenience functions for Linux API functions
+ * ##
+ * #############################################################################
+ */
static int goto_cpu0(void);
static int goto_all_cpu(void) __attribute__ ((unused));
-
-/*----------------------------------------------------------------------------*/
-static void init_and_add_to_list(
- struct list_head *item,
- struct list_head *list_head
-)
+static void init_and_add_to_list(struct list_head *item,
+ struct list_head *list_head)
{
INIT_LIST_HEAD(item);
list_add(item, list_head);
}
-/*----------------------------------------------------------------------------*/
-/** check if CPU supports the ARM TrustZone Security Extensions
- * @return int TRUE or FALSE */
-static int has_security_extensions(
- void
-)
+/*
+ * check if CPU supports the ARM TrustZone Security Extensions
+ */
+static bool has_security_extensions(void)
{
u32 fea = 0;
+
asm volatile(
"mrc p15, 0, %[fea], cr0, cr1, 0" :
[fea]"=r" (fea));
- MCDRV_DBG_VERBOSE("CPU Features: 0x%X", fea);
+ MCDRV_DBG_VERBOSE(mcd, "CPU Features: 0x%X", fea);
- /* If the CPU features ID has 0 for security features then the CPU
+ /*
+ * If the CPU features ID has 0 for security features then the CPU
* doesn't support TrustZone at all!
*/
if ((fea & ARM_SECURITY_EXTENSION_MASK) == 0)
- return 0;
+ return false;
- return 1;
+ return true;
}
-/*----------------------------------------------------------------------------*/
-/** check if running in secure mode
- * @return int TRUE or FALSE */
-static int is_secure_mode(
- void
-)
+/*
+ * check if running in secure mode
+ */
+static bool is_secure_mode(void)
{
- u32 cpsr = 0, nsacr = 0;
+ u32 cpsr = 0;
+ u32 nsacr = 0;
+
asm volatile(
"mrc p15, 0, %[nsacr], cr1, cr1, 2\n"
"mrs %[cpsr], cpsr\n" :
[nsacr]"=r" (nsacr),
[cpsr]"=r"(cpsr));
- MCDRV_DBG_VERBOSE("CPRS.M = set to 0x%X\n", cpsr & ARM_CPSR_MASK);
- MCDRV_DBG_VERBOSE("SCR.NS = set to 0x%X\n", nsacr);
+ MCDRV_DBG_VERBOSE(mcd, "CPRS.M = set to 0x%X\n", cpsr & MODE_MASK);
+ MCDRV_DBG_VERBOSE(mcd, "SCR.NS = set to 0x%X\n", nsacr);
- /* If the NSACR contains the reset value(=0) then most likely we are
+ /*
+ * If the NSACR contains the reset value(=0) then most likely we are
* running in Secure MODE.
* If the cpsr mode is set to monitor mode then we cannot load!
*/
- if (nsacr == 0 || ((cpsr & ARM_CPSR_MASK) == ARM_MONITOR_MODE))
- return 1;
+ if (nsacr == 0 || ((cpsr & MODE_MASK) == ARM_MONITOR_MODE))
+ return true;
- return 0;
+ return false;
}
-/*----------------------------------------------------------------------------*/
-/** check if userland caller is privileged (aka has "root" access rights).
- @return int TRUE or FALSE */
-static int is_userland_caller_privileged(
- void
-) {
- /* For some platforms we cannot run the Daemon as root - for Android
+/*
+ * check if userland caller is privileged (aka has "root" access rights).
+ * return int 1 or 0
+ */
+static int is_userland_caller_privileged(void)
+{
+ /*
+ * For some platforms we cannot run the Daemon as root - for Android
* compliance tests it is not allowed, thus we assume the daemon is ran
* as the system user.
* In Android the system user for daemons has no particular capabilities
@@ -121,89 +137,72 @@
* the Android source tree for all UIDs and their meaning:
* http://android-dls.com/wiki/index.php?title=Android_UIDs_and_GIDs
*/
-#ifdef MC_ANDROID_UID_CHECK
+#if defined(CONFIG_ANDROID) && defined(MC_ANDROID_UID_CHECK)
return current_euid() <= AID_SYSTEM;
#else
- /* capable should cover all possibilities, root or sudo, uid checking
- * was not very reliable */
+ /*
+ * capable should cover all possibilities, root or sudo, uid checking
+ * was not very reliable
+ */
return capable(CAP_SYS_ADMIN);
#endif
}
-
-
-/*----------------------------------------------------------------------------*/
-static void unlock_page_from_used_l2_table(
- struct page *page
-){
- /* REV axh: check if we should do this. */
+static void unlock_page_from_used_l2_table(struct page *page)
+{
SetPageDirty(page);
-
- /* release page, old api was page_cache_release() */
ClearPageReserved(page);
put_page(page);
}
-/*----------------------------------------------------------------------------*/
/* convert L2 PTE to page pointer */
-static struct page *l2_pte_to_page(
- pte_t pte
-) {
- void *phys_page_addr = (void *)((unsigned int)pte & PAGE_MASK);
- unsigned int pfn = addr_to_pfn(phys_page_addr);
- struct page *page = pfn_to_page(pfn);
+static struct page *l2_pte_to_page(pte_t pte)
+{
+ void *phys_page_addr = (void *)((unsigned int)pte & PAGE_MASK);
+ unsigned int pfn = (unsigned int)phys_page_addr >> PAGE_SHIFT;
+ struct page *page = pfn_to_page(pfn);
+
return page;
}
-/*----------------------------------------------------------------------------*/
/* convert page pointer to L2 PTE */
-static pte_t page_to_l2_pte(
- struct page *page
-)
+static pte_t page_to_l2_pte(struct page *page)
{
- unsigned int pfn = page_to_pfn(page);
- void *phys_addr = pfn_to_addr(pfn);
- pte_t pte = (pte_t)((unsigned int)phys_addr & PAGE_MASK);
+ unsigned int pfn = page_to_pfn(page);
+ void *phys_addr = (void *)(pfn << PAGE_SHIFT);
+ pte_t pte = (pte_t)((unsigned int)phys_addr & PAGE_MASK);
+
return pte;
}
-
-/*----------------------------------------------------------------------------*/
-static inline int lock_user_pages(
- struct task_struct *task,
- void *virt_start_page_addr,
- int nr_of_pages,
- struct page **pages
-)
+static inline int lock_user_pages(struct task_struct *task,
+ void *virt_start_page_addr, int nr_of_pages,
+ struct page **pages)
{
- int ret = 0;
- int locked_pages = 0;
- unsigned int i;
+ int ret = 0;
+ int locked_pages = 0;
+ unsigned int i;
do {
-
/* lock user pages, must hold the mmap_sem to do this. */
down_read(&(task->mm->mmap_sem));
- locked_pages = get_user_pages(
- task,
- task->mm,
- (unsigned long)virt_start_page_addr,
- nr_of_pages,
- 1, /* write access */
- 0, /* they say drivers should always
- pass 0 here..... */
- pages,
- NULL); /* we don't need the VMAs */
+ locked_pages =
+ get_user_pages(task,
+ task->mm,
+ (unsigned long)virt_start_page_addr,
+ nr_of_pages,
+ 1,
+ 0,
+ pages,
+ NULL);
up_read(&(task->mm->mmap_sem));
- /* could as lock all pages? */
+ /* check if we could lock all pages. */
if (locked_pages != nr_of_pages) {
- MCDRV_DBG_ERROR(
- "get_user_pages() failed, "
- "locked_pages=%d\n",
- locked_pages);
+ MCDRV_DBG_ERROR(mcd,
+ "get_user_pages() err, locked_pages=%d",
+ locked_pages);
ret = -ENOMEM;
- /* check if an error has been returned. */
if (locked_pages < 0) {
ret = locked_pages;
locked_pages = 0;
@@ -215,8 +214,7 @@
for (i = 0; i < nr_of_pages; i++)
flush_dcache_page(pages[i]);
- } while (FALSE);
-
+ } while (0);
if (ret != 0) {
/* release all locked pages. */
@@ -230,49 +228,38 @@
}
/*
-#############################################################################
-##
-## Driver implementation functions
-##
-#############################################################################*/
-/*----------------------------------------------------------------------------*/
+ * #############################################################################
+ * ##
+ * ## Driver implementation functions
+ * ##
+ * #############################################################################
+ */
+
/* check if caller is MobiCore Daemon */
-static unsigned int is_caller_mc_daemon(
- struct mc_instance *instance
-)
+static unsigned int is_caller_mc_daemon(struct mc_instance *instance)
{
- return ((instance != NULL)
- && (mc_drv_kmod_ctx.daemon_inst == instance));
+ return ((instance != NULL) &&
+ (mc_drv_kmod_ctx.daemon_inst == instance));
}
-
-/*----------------------------------------------------------------------------*/
/* Get process context from file pointer */
-static struct mc_instance *get_instance(
- struct file *file
-) {
+static struct mc_instance *get_instance(struct file *file)
+{
MCDRV_ASSERT(file != NULL);
return (struct mc_instance *)(file->private_data);
}
-
-/*----------------------------------------------------------------------------*/
/* Get a unique ID */
-static unsigned int get_mc_kmod_unique_id(
- void
-)
+static unsigned int get_mc_kmod_unique_id(void)
{
return (unsigned int)atomic_inc_return(
- &(mc_drv_kmod_ctx.unique_counter));
+ &(mc_drv_kmod_ctx.unique_counter));
}
-
-/*----------------------------------------------------------------------------*/
/* Get kernel pointer to shared L2 table given a per-process reference */
static struct l2table *get_l2_table_kernel_virt(
- struct mc_used_l2_table *used_l2table
-)
+ struct mc_used_l2_table *used_l2table)
{
MCDRV_ASSERT(used_l2table != NULL);
MCDRV_ASSERT(used_l2table->set != NULL);
@@ -280,11 +267,8 @@
return &(used_l2table->set->kernel_virt->table[used_l2table->idx]);
}
-/*----------------------------------------------------------------------------*/
/* Get physical address of a shared L2 table given a per-process reference */
-static struct l2table *get_l2_table_phys(
- struct mc_used_l2_table *used_l2table
-)
+static struct l2table *get_l2_table_phys(struct mc_used_l2_table *used_l2table)
{
MCDRV_ASSERT(used_l2table != NULL);
MCDRV_ASSERT(used_l2table->set != NULL);
@@ -292,30 +276,22 @@
return &(used_l2table->set->phys->table[used_l2table->idx]);
}
-/*----------------------------------------------------------------------------*/
static unsigned int is_in_use_used_l2_table(
- struct mc_used_l2_table *used_l2table
-)
+ struct mc_used_l2_table *used_l2table)
{
return ((used_l2table->flags &
- (MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_APP
- | MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_MC)) != 0);
+ (MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_APP |
+ MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_MC)) != 0);
}
-
-
-/*----------------------------------------------------------------------------*/
static struct mc_used_l2_table *find_used_l2_table_by_handle(
- unsigned int handle
-) {
- struct mc_used_l2_table *used_l2table;
- struct mc_used_l2_table *used_l2table_with_handle = NULL;
+ unsigned int handle)
+{
+ struct mc_used_l2_table *used_l2table;
+ struct mc_used_l2_table *used_l2table_with_handle = NULL;
- list_for_each_entry(
- used_l2table,
- &(mc_drv_kmod_ctx.mc_used_l2_tables),
- list
- ) {
+ list_for_each_entry(used_l2table,
+ &(mc_drv_kmod_ctx.mc_used_l2_tables), list) {
if (handle == used_l2table->handle) {
used_l2table_with_handle = used_l2table;
break;
@@ -326,29 +302,28 @@
}
/*
-#############################################################################
-##
-## L2 Table Pool
-##
-#############################################################################*/
-
-/*----------------------------------------------------------------------------*/
+ * #############################################################################
+ * ##
+ * ## L2 Table Pool
+ * ##
+ * #############################################################################
+ */
static struct mc_used_l2_table *allocate_used_l2_table(
- struct mc_instance *instance
-) {
- int ret = 0;
- struct mc_l2_table_store *l2table_store = NULL;
- struct mc_l2_tables_set *l2table_set = NULL;
- struct mc_used_l2_table *used_l2table = NULL;
- struct page *page;
- unsigned int i = 0;
+ struct mc_instance *instance)
+{
+ int ret = 0;
+ struct mc_l2_table_store *l2table_store = NULL;
+ struct mc_l2_tables_set *l2table_set = NULL;
+ struct mc_used_l2_table *used_l2table = NULL;
+ struct page *page;
+ unsigned int i = 0;
do {
/* allocate a WSM L2 descriptor */
- used_l2table = kmalloc(sizeof(*used_l2table), GFP_KERNEL);
+ used_l2table = kmalloc(sizeof(*used_l2table), GFP_KERNEL);
if (used_l2table == NULL) {
ret = -ENOMEM;
- MCDRV_DBG_ERROR("out of memory\n");
+ MCDRV_DBG_ERROR(mcd, "out of memory\n");
break;
}
/* clean */
@@ -357,21 +332,20 @@
used_l2table->owner = instance;
/* add to global list. */
- init_and_add_to_list(
- &(used_l2table->list),
- &(mc_drv_kmod_ctx.mc_used_l2_tables));
+ init_and_add_to_list(&(used_l2table->list),
+ &(mc_drv_kmod_ctx.mc_used_l2_tables));
/* walk though list to find free set. */
- list_for_each_entry(
- l2table_set,
- &(mc_drv_kmod_ctx.mc_l2_tables_sets),
- list
- ) {
+ list_for_each_entry(l2table_set,
+ &(mc_drv_kmod_ctx.mc_l2_tables_sets),
+ list) {
for (i = 0; i < MC_DRV_KMOD_L2_TABLE_PER_PAGES; i++) {
if ((l2table_set->usage_bitmap & (1U << i))
== 0) {
- /* found a set,
- l2table_set and i are set. */
+ /*
+ * found a set,
+ * l2table_set and i are set.
+ */
l2table_store =
l2table_set->kernel_virt;
break;
@@ -379,7 +353,7 @@
}
if (l2table_store != NULL)
break;
- } /* end while */
+ } /* end list_for_each_entry() */
if (l2table_store == NULL) {
l2table_store = (struct mc_l2_table_store *)
@@ -389,9 +363,11 @@
break;
}
- /* Actually, locking is not necessary, because kernel
- memory is not supposed to get swapped out. But
- we play safe.... */
+ /*
+ * Actually, locking is not necessary, because kernel
+ * memory is not supposed to get swapped out. But we
+ * play safe....
+ */
page = virt_to_page(l2table_store);
SetPageReserved(page);
@@ -411,8 +387,8 @@
/* init add to list. */
init_and_add_to_list(
- &(l2table_set->list),
- &(mc_drv_kmod_ctx.mc_l2_tables_sets));
+ &(l2table_set->list),
+ &(mc_drv_kmod_ctx.mc_l2_tables_sets));
/* use first table */
i = 0;
@@ -425,32 +401,24 @@
used_l2table->set = l2table_set;
used_l2table->idx = i;
- MCDRV_DBG_VERBOSE(
- "chunkPhys=%p,idx=%d\n",
- l2table_set->phys, i);
+ MCDRV_DBG_VERBOSE(mcd, "chunkPhys=%p,idx=%d\n",
+ l2table_set->phys, i);
- } while (FALSE);
+ } while (0);
- if (ret != 0) {
- if (used_l2table != NULL) {
- /* remove from list */
- list_del(&(l2table_set->list));
- /* free memory */
- kfree(used_l2table);
- used_l2table = NULL;
- }
+ if (ret != 0 && used_l2table != NULL) {
+ list_del(&(l2table_set->list));
+ kfree(used_l2table);
+ used_l2table = NULL;
}
return used_l2table;
}
-/*----------------------------------------------------------------------------*/
-static void free_used_l2_table(
- struct mc_used_l2_table *used_l2table
-)
+static void free_used_l2_table(struct mc_used_l2_table *used_l2table)
{
- struct mc_l2_tables_set *l2table_set;
- unsigned int idx;
+ struct mc_l2_tables_set *l2table_set;
+ unsigned int idx;
MCDRV_ASSERT(used_l2table != NULL);
@@ -470,98 +438,99 @@
MCDRV_ASSERT(l2table_set->kernel_virt != NULL);
free_page((unsigned long)l2table_set->kernel_virt);
- /* remove from list */
list_del(&(l2table_set->list));
-
- /* free memory */
kfree(l2table_set);
}
return;
}
-
-
-/*----------------------------------------------------------------------------*/
-/**
+/*
* Create a L2 table in a WSM container that has been allocates previously.
*
- * @param task pointer to task owning WSM
- * @param wsm_buffer user space WSM start
- * @param wsm_len WSM length
- * @param used_l2table Pointer to L2 table details
+ * task pointer to task owning WSM
+ * wsm_buffer user space WSM start
+ * wsm_len WSM length
+ * used_l2table Pointer to L2 table details
*/
-static int map_buffer_into_used_l2_table(
- struct task_struct *task,
- void *wsm_buffer,
- unsigned int wsm_len,
- struct mc_used_l2_table *used_l2table
-)
+static int map_buffer_into_used_l2_table(struct task_struct *task,
+ void *wsm_buffer, unsigned int wsm_len,
+ struct mc_used_l2_table *used_l2table)
{
- int ret = 0;
- unsigned int i, nr_of_pages;
- void *virt_addr_page;
- struct page *page;
- struct l2table *l2table;
- struct page **l2table_as_array_of_pointers_to_page;
+ int ret = 0;
+ unsigned int i, nr_of_pages;
+ struct page *page;
+ struct l2table *l2table;
+ struct page **l2table_as_array_of_pointers_to_page;
+ void *virt_addr_page; /* start addr of the 4 KiB page of wsm_buffer */
+ unsigned int offset; /* page offset in wsm buffer */
/* task can be null when called from kernel space */
MCDRV_ASSERT(wsm_buffer != NULL);
MCDRV_ASSERT(wsm_len != 0);
MCDRV_ASSERT(used_l2table != NULL);
- MCDRV_DBG_VERBOSE("WSM addr=0x%p, len=0x%08x\n", wsm_buffer, wsm_len);
+ MCDRV_DBG_VERBOSE(mcd, "WSM addr=0x%p, len=0x%08x\n",
+ wsm_buffer, wsm_len);
- /* Check if called from kernel space wsm_buffer is actually
- * vmalloced or not */
+ /*
+ * Check if called from kernel space wsm_buffer is actually
+ * vmalloced or not
+ */
if (task == NULL && !is_vmalloc_addr(wsm_buffer)) {
- MCDRV_DBG_ERROR("WSM addr is not a vmalloc address");
+ MCDRV_DBG_ERROR(mcd, "WSM addr is not a vmalloc address");
return -EINVAL;
}
l2table = get_l2_table_kernel_virt(used_l2table);
- /* We use the memory for the L2 table to hold the pointer
- and convert them later. This works, as everything comes
- down to a 32 bit value. */
+ /*
+ * We use the memory for the L2 table to hold the pointer
+ * and convert them later. This works, as everything comes
+ * down to a 32 bit value.
+ */
l2table_as_array_of_pointers_to_page = (struct page **)l2table;
do {
/* no size > 1Mib supported */
if (wsm_len > SZ_1M) {
- MCDRV_DBG_ERROR("size > 1 MiB\n");
+ MCDRV_DBG_ERROR(mcd, "size > 1 MiB\n");
ret = -EINVAL;
break;
}
/* calculate page usage */
- virt_addr_page = get_page_start(wsm_buffer);
- nr_of_pages = get_nr_of_pages_for_buffer(wsm_buffer, wsm_len);
+ virt_addr_page = (void *)
+ (((unsigned long)(wsm_buffer)) & PAGE_MASK);
+ offset = (unsigned int)
+ (((unsigned long)(wsm_buffer)) & (~PAGE_MASK));
+ nr_of_pages = PAGE_ALIGN(offset + wsm_len) / PAGE_SIZE;
-
- MCDRV_DBG_VERBOSE("virt addr pageStart=0x%p,pages=%d\n",
+ MCDRV_DBG_VERBOSE(mcd, "virt addr page start=0x%p, pages=%d\n",
virt_addr_page,
nr_of_pages);
/* L2 table can hold max 1MiB in 256 pages. */
if ((nr_of_pages*PAGE_SIZE) > SZ_1M) {
- MCDRV_DBG_ERROR("WSM paged exceed 1 MiB\n");
+ MCDRV_DBG_ERROR(mcd, "WSM paged exceed 1 MiB\n");
ret = -EINVAL;
break;
}
/* Request comes from user space */
if (task != NULL) {
- /* lock user page in memory, so they do not get swapped
- * out.
- * REV axh:
- * Kernel 2.6.27 added a new get_user_pages_fast()
- * function, maybe it is called fast_gup() in some
- * versions.
- * handle user process doing a fork().
- * Child should not get things.
- * http://osdir.com/ml/linux-media/2009-07/msg00813.html
- * http://lwn.net/Articles/275808/ */
+ /*
+ * lock user page in memory, so they do not get swapped
+ * out.
+ * REV axh:
+ * Kernel 2.6.27 added a new get_user_pages_fast()
+ * function, maybe it is called fast_gup() in some
+ * versions.
+ * handle user process doing a fork().
+ * Child should not get things.
+ * http://osdir.com/ml/linux-media/2009-07/msg00813.html
+ * http://lwn.net/Articles/275808/
+ */
ret = lock_user_pages(
task,
@@ -569,7 +538,8 @@
nr_of_pages,
l2table_as_array_of_pointers_to_page);
if (ret != 0) {
- MCDRV_DBG_ERROR("lock_user_pages() failed\n");
+ MCDRV_DBG_ERROR(mcd,
+ "lock_user_pages() failed\n");
break;
}
}
@@ -579,15 +549,16 @@
for (i = 0; i < nr_of_pages; i++) {
page = vmalloc_to_page(uaddr);
if (!page) {
- MCDRV_DBG_ERROR(
- "vmalloc_to_Page()"
- " failed to map address\n");
+ MCDRV_DBG_ERROR(mcd,
+ "failed to map addr");
ret = -EINVAL;
break;
}
get_page(page);
- /* Lock the page in memory, it can't be swapped
- * out */
+ /*
+ * Lock the page in memory, it can't be swapped
+ * out
+ */
SetPageReserved(page);
l2table_as_array_of_pointers_to_page[i] = page;
uaddr += PAGE_SIZE;
@@ -597,39 +568,46 @@
used_l2table->nr_of_pages = nr_of_pages;
used_l2table->flags |= MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_APP;
- /* create L2 Table entries. used_l2table->table contains a list
- of page pointers here. For a proper cleanup we have to ensure
- that the following code either works and used_l2table contains
- a valid L2 table - or fails and used_l2table->table contains the
- list of page pointers. Any mixed contents will make cleanup
- difficult.*/
-
+ /*
+ * create L2 Table entries.
+ * used_l2table->table contains a list of page pointers here.
+ * For a proper cleanup we have to ensure that the following
+ * code either works and used_l2table contains a valid L2 table
+ * - or fails and used_l2table->table contains the list of page
+ * pointers.
+ * Any mixed contents will make cleanup difficult.
+ */
for (i = 0; i < nr_of_pages; i++) {
pte_t pte;
page = l2table_as_array_of_pointers_to_page[i];
- /* create L2 table entry, see ARM MMU docu for details
- about flags stored in the lowest 12 bits. As a side
- reference, the Article "ARM's multiply-mapped memory
- mess" found in the collection at at
- http://lwn.net/Articles/409032/ is also worth reading.*/
+ /*
+ * create L2 table entry, see ARM MMU docu for details
+ * about flags stored in the lowest 12 bits.
+ * As a side reference, the Article
+ * "ARM's multiply-mapped memory mess"
+ * found in the collection at
+ * http://lwn.net/Articles/409032/
+ * is also worth reading.
+ */
pte = page_to_l2_pte(page)
- | L2_FLAG_AP1 | L2_FLAG_AP0
- | L2_FLAG_C | L2_FLAG_B
- | L2_FLAG_SMALL | L2_FLAG_SMALL_XN
- /* Linux uses different mappings for SMP systems(the
+ | PTE_EXT_AP1 | PTE_EXT_AP0
+ | PTE_CACHEABLE | PTE_BUFFERABLE
+ | PTE_TYPE_SMALL | PTE_TYPE_EXT
+ /*
+ * Linux uses different mappings for SMP systems(the
* sharing flag is set for the pte. In order not to
* confuse things too much in Mobicore make sure the
* shared buffers have the same flags.
* This should also be done in SWD side
*/
#ifdef CONFIG_SMP
- | L2_FLAG_S | L2_FLAG_SMALL_TEX0
+ | PTE_EXT_SHARED | PTE_EXT_TEX(1)
#endif
;
l2table->table_entries[i] = pte;
- MCDRV_DBG_VERBOSE("L2 entry %d: 0x%08x\n", i,
+ MCDRV_DBG_VERBOSE(mcd, "L2 entry %d: 0x%08x\n", i,
(unsigned int)(pte));
}
@@ -637,33 +615,29 @@
while (i < 255)
l2table->table_entries[i++] = (pte_t)0;
- } while (FALSE);
+ } while (0);
return ret;
}
-
-/*----------------------------------------------------------------------------*/
-/**
+/*
* Remove a L2 table in a WSM container. Afterwards the container may be
* released.
*
- * @param used_l2table Pointer to L2 table details
+ * used_l2table Pointer to L2 table details
*/
-
static void unmap_buffers_from_used_l2_table(
- struct mc_used_l2_table *used_l2table
-)
+ struct mc_used_l2_table *used_l2table)
{
- unsigned int i;
- struct l2table *l2table;
+ unsigned int i;
+ struct l2table *l2table;
MCDRV_ASSERT(used_l2table != NULL);
/* this should not happen, as we have no empty tables. */
MCDRV_ASSERT(!is_in_use_used_l2_table(used_l2table));
/* found the table, now release the resources. */
- MCDRV_DBG_VERBOSE("clear L2 table, phys_base=%p, nr_of_pages=%d\n",
+ MCDRV_DBG_VERBOSE(mcd, "clear L2 table, phys_base=%p, nr_of_pages=%d\n",
get_l2_table_phys(used_l2table),
used_l2table->nr_of_pages);
@@ -684,21 +658,19 @@
return;
}
-
/*
-#############################################################################
-##
-## Helper functions
-##
-#############################################################################*/
-/*----------------------------------------------------------------------------*/
-#define FREE_FROM_SWD TRUE
-#define FREE_FROM_NWD FALSE
-/** Delete a used l2 table. */
-static void delete_used_l2_table(
- struct mc_used_l2_table *used_l2table,
- unsigned int is_swd
-)
+ * #############################################################################
+ * ##
+ * ## Helper functions
+ * ##
+ * #############################################################################
+ */
+#define FREE_FROM_SWD 1
+#define FREE_FROM_NWD 0
+
+/* Delete a used l2 table. */
+static void delete_used_l2_table(struct mc_used_l2_table *used_l2table,
+ unsigned int is_swd)
{
if (is_swd) {
used_l2table->flags &=
@@ -711,98 +683,79 @@
/* release if Nwd and Swd/MC do no longer use it. */
if (is_in_use_used_l2_table(used_l2table)) {
- MCDRV_DBG_WARN(
- "WSM L2 table still in use: physBase=%p, "
- "nr_of_pages=%d\n",
- get_l2_table_phys(used_l2table),
- used_l2table->nr_of_pages);
+ MCDRV_DBG_WARN(mcd,
+ "WSM L2 table still in use: %p, nr_of_pages=%d",
+ get_l2_table_phys(used_l2table),
+ used_l2table->nr_of_pages);
} else {
unmap_buffers_from_used_l2_table(used_l2table);
free_used_l2_table(used_l2table);
list_del(&(used_l2table->list));
-
kfree(used_l2table);
}
return;
}
-/*----------------------------------------------------------------------------*/
-/** Allocate L2 table and map buffer into it. That is, create respective table
- entries. Must hold Semaphore mc_drv_kmod_ctx.wsm_l2_sem */
-static struct mc_used_l2_table *new_used_l2_table(
- struct mc_instance *instance,
- struct task_struct *task,
- void *wsm_buffer,
- unsigned int wsm_len
-) {
- int ret = 0;
- struct mc_used_l2_table *used_l2table;
+/*
+ * Allocate L2 table and map buffer into it.
+ * That is, create respective table entries.
+ * Must hold Semaphore mc_drv_kmod_ctx.wsm_l2_sem
+ */
+static struct mc_used_l2_table *new_used_l2_table(struct mc_instance *instance,
+ struct task_struct *task,
+ void *wsm_buffer,
+ unsigned int wsm_len)
+{
+ int ret = 0;
+ struct mc_used_l2_table *used_l2table;
do {
used_l2table = allocate_used_l2_table(instance);
if (used_l2table == NULL) {
- MCDRV_DBG_ERROR(
- "allocate_used_l2_table() failed\n");
+ MCDRV_DBG_ERROR(mcd,
+ "allocate_used_l2_table() failed\n");
break;
}
/* create the L2 page for the WSM */
- ret = map_buffer_into_used_l2_table(
- task,
- wsm_buffer,
- wsm_len,
- used_l2table);
+ ret = map_buffer_into_used_l2_table(task,
+ wsm_buffer,
+ wsm_len,
+ used_l2table);
if (ret != 0) {
- MCDRV_DBG_ERROR(
- "map_buffer_into_used_l2_table() failed\n");
+ MCDRV_DBG_ERROR(mcd,
+ "map_buffer_into_used_l2_table() err");
delete_used_l2_table(used_l2table, FREE_FROM_NWD);
used_l2table = NULL;
break;
}
- } while (FALSE);
-
+ } while (0);
return used_l2table;
}
/*
-#############################################################################
-##
-## IoCtl handler
-##
-#############################################################################*/
-
-/**
- * Map a virtual memory buffer structure to Mobicore
- * @param instance
- * @param addr address of the buffer(NB it must be kernel virtual!)
- * @param len buffer length
- * @param handle pointer to handle
- * @param phys_wsm_l2_table pointer to physical L2 table(?)
- *
- * @return 0 if no error
- *
+ * #############################################################################
+ * ##
+ * ## IoCtl handler
+ * ##
+ * #############################################################################
*/
-/*----------------------------------------------------------------------------*/
-int mobicore_map_vmem(
- struct mc_instance *instance,
- void *addr,
- uint32_t len,
- uint32_t *handle,
- void **phys_wsm_l2_table
-)
+
+int mobicore_map_vmem(struct mc_instance *instance, void *addr, uint32_t len,
+ uint32_t *handle, void **phys_wsm_l2_table)
{
int ret = 0;
struct mc_used_l2_table *used_l2table = NULL;
MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
if (len == 0) {
- MCDRV_DBG_ERROR("len=0 is not supported!\n");
+ MCDRV_DBG_ERROR(mcd, "len=0 is not supported!\n");
ret = -EINVAL;
break;
}
@@ -810,21 +763,22 @@
/* try to get the semaphore */
ret = down_interruptible(&(mc_drv_kmod_ctx.wsm_l2_sem));
if (ret != 0) {
- MCDRV_DBG_ERROR("down_interruptible() failed with %d\n",
+ MCDRV_DBG_ERROR(mcd,
+ "down_interruptible() failed with %d\n",
ret);
ret = -ERESTARTSYS;
break;
}
do {
- used_l2table = new_used_l2_table(
- instance,
- NULL,
- addr,
- len);
+ used_l2table = new_used_l2_table(instance,
+ NULL,
+ addr,
+ len);
if (used_l2table == NULL) {
- MCDRV_DBG_ERROR("new_used_l2_table() failed\n");
+ MCDRV_DBG_ERROR(mcd,
+ "new_used_l2_table() failed\n");
ret = -EINVAL;
break;
}
@@ -833,65 +787,55 @@
*handle = used_l2table->handle;
*phys_wsm_l2_table =
(void *)get_l2_table_phys(used_l2table);
- MCDRV_DBG_VERBOSE("handle: %d, phys=%p\n",
+ MCDRV_DBG_VERBOSE(mcd, "handle: %d, phys=%p\n",
*handle,
(void *)(*phys_wsm_l2_table));
- } while (FALSE);
+ } while (0);
/* release semaphore */
up(&(mc_drv_kmod_ctx.wsm_l2_sem));
- } while (FALSE);
+ } while (0);
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
return ret;
}
EXPORT_SYMBOL(mobicore_map_vmem);
-/*----------------------------------------------------------------------------*/
-/**
- *
- * @param instance
- * @param arg
- *
- * @return 0 if no error
- *
- */
+
static int handle_ioctl_app_register_wsm_l2(
- struct mc_instance *instance,
- union mc_ioctl_app_reg_wsm_l2_params *user_params
-)
+ struct mc_instance *instance,
+ union mc_ioctl_app_reg_wsm_l2_params *user_params)
{
- int ret = 0;
- union mc_ioctl_app_reg_wsm_l2_params params;
- struct mc_used_l2_table *used_l2table = NULL;
- struct pid *pid_struct = NULL;
- struct task_struct *task = current;
+ int ret = 0;
+ union mc_ioctl_app_reg_wsm_l2_params params;
+ struct mc_used_l2_table *used_l2table = NULL;
+ struct pid *pid_struct = NULL;
+ struct task_struct *task = current;
+ void *phys_wsm_l2_table;
MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
- /* get use parameters */
- ret = copy_from_user(
- &(params.in),
- &(user_params->in),
- sizeof(params.in));
+ /* get user parameters */
+ ret = copy_from_user(&(params.in), &(user_params->in),
+ sizeof(params.in));
if (ret != 0) {
- MCDRV_DBG_ERROR("copy_from_user() failed\n");
+ MCDRV_DBG_ERROR(mcd, "copy_from_user() failed\n");
break;
}
/* daemon can do this for another task. */
if (params.in.pid != 0) {
- MCDRV_DBG_ERROR("pid != 0 unsupported\n");
+ MCDRV_DBG_ERROR(mcd, "pid != 0 unsupported\n");
ret = -EINVAL;
break;
}
if (params.in.len == 0) {
- MCDRV_DBG_ERROR("len=0 is not supported!\n");
+ MCDRV_DBG_ERROR(mcd, "len=0 is not supported!\n");
ret = -EINVAL;
break;
}
@@ -899,7 +843,8 @@
/* try to get the semaphore */
ret = down_interruptible(&(mc_drv_kmod_ctx.wsm_l2_sem));
if (ret != 0) {
- MCDRV_DBG_ERROR("down_interruptible() failed with %d\n",
+ MCDRV_DBG_ERROR(mcd,
+ "down_interruptible() failed with %d\n",
ret);
ret = -ERESTARTSYS;
break;
@@ -913,7 +858,8 @@
params.in.len);
if (used_l2table == NULL) {
- MCDRV_DBG_ERROR("new_used_l2_table() failed\n");
+ MCDRV_DBG_ERROR(mcd,
+ "new_used_l2_table() failed\n");
ret = -EINVAL;
break;
}
@@ -926,81 +872,68 @@
/* set response */
memset(¶ms.out, 0, sizeof(params.out));
params.out.handle = used_l2table->handle;
- /* TODO: return the physical address for daemon only,
- otherwise set NULL */
+
params.out.phys_wsm_l2_table =
(uint32_t)get_l2_table_phys(used_l2table);
- MCDRV_DBG_VERBOSE("handle: %d, phys=%p\n",
- params.out.handle,
- (void *)(params.out.phys_wsm_l2_table));
+ phys_wsm_l2_table =
+ (void *)(params.out.phys_wsm_l2_table);
+ MCDRV_DBG_VERBOSE(mcd, "handle: %d, phys=%p\n",
+ params.out.handle,
+ phys_wsm_l2_table);
/* copy L2Table to user space */
- ret = copy_to_user(
- &(user_params->out),
- &(params.out),
- sizeof(params.out));
+ ret = copy_to_user(&(user_params->out),
+ &(params.out),
+ sizeof(params.out));
if (ret != 0) {
- MCDRV_DBG_ERROR("copy_to_user() failed\n");
+ MCDRV_DBG_ERROR(mcd, "copy_to_user() failed\n");
- /* free the table again, as app does not know
- about anything. */
+ /*
+ * free the table again,
+ * app does not know anything about it.
+ */
if (is_caller_mc_daemon(instance)) {
used_l2table->flags &=
~MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_MC;
}
delete_used_l2_table(used_l2table,
- FREE_FROM_NWD);
+ FREE_FROM_NWD);
used_l2table = NULL;
break;
}
- } while (FALSE);
+ } while (0);
/* release semaphore */
up(&(mc_drv_kmod_ctx.wsm_l2_sem));
- } while (FALSE);
-
-
+ } while (0);
/* release PID struct reference */
if (pid_struct != NULL)
put_pid(pid_struct);
-
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
return ret;
}
-
-/*----------------------------------------------------------------------------*/
-/**
- * Unmap a virtual memory buffer from mobicore
- * @param instance
- * @param handle
- *
- * @return 0 if no error
- *
- */
-int mobicore_unmap_vmem(
- struct mc_instance *instance,
- uint32_t handle
-)
+int mobicore_unmap_vmem(struct mc_instance *instance, uint32_t handle)
{
int ret = 0;
struct mc_used_l2_table *used_l2table = NULL;
MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
/* try to get the semaphore */
ret = down_interruptible(&(mc_drv_kmod_ctx.wsm_l2_sem));
if (ret != 0) {
- MCDRV_DBG_ERROR("processOpenSession() failed with %d\n",
+ MCDRV_DBG_ERROR(mcd,
+ "processOpenSession() failed with %d\n",
ret);
ret = -ERESTARTSYS;
break;
@@ -1010,13 +943,14 @@
used_l2table = find_used_l2_table_by_handle(handle);
if (used_l2table == NULL) {
ret = -EINVAL;
- MCDRV_DBG_ERROR("entry not found\n");
+ MCDRV_DBG_ERROR(mcd, "entry not found\n");
break;
}
if (instance != used_l2table->owner) {
ret = -EINVAL;
- MCDRV_DBG_ERROR("instance does no own it\n");
+ MCDRV_DBG_ERROR(mcd,
+ "instance does no own it\n");
break;
}
@@ -1024,53 +958,43 @@
delete_used_l2_table(used_l2table, FREE_FROM_NWD);
used_l2table = NULL;
/* there are no out parameters */
- } while (FALSE);
+ } while (0);
/* release semaphore */
up(&(mc_drv_kmod_ctx.wsm_l2_sem));
- } while (FALSE);
+ } while (0);
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
return ret;
}
EXPORT_SYMBOL(mobicore_unmap_vmem);
-/*----------------------------------------------------------------------------*/
-/**
- *
- * @param instance
- * @param arg
- *
- * @return 0 if no error
- *
- */
+
static int handle_ioctl_app_unregister_wsm_l2(
- struct mc_instance *instance,
- struct mc_ioctl_app_unreg_wsm_l2_params *user_params
-)
+ struct mc_instance *instance,
+ struct mc_ioctl_app_unreg_wsm_l2_params *user_params)
{
- int ret = 0;
- struct mc_ioctl_app_unreg_wsm_l2_params params;
- struct mc_used_l2_table *used_l2table = NULL;
+ int ret = 0;
+ struct mc_ioctl_app_unreg_wsm_l2_params params;
+ struct mc_used_l2_table *used_l2table = NULL;
MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
- ret = copy_from_user(
- &(params.in),
- &(user_params->in),
- sizeof(params.in));
+ ret = copy_from_user(&(params.in), &(user_params->in),
+ sizeof(params.in));
if (ret != 0) {
- MCDRV_DBG_ERROR("copy_from_user\n");
+ MCDRV_DBG_ERROR(mcd, "copy_from_user\n");
break;
}
/* try to get the semaphore */
ret = down_interruptible(&(mc_drv_kmod_ctx.wsm_l2_sem));
if (ret != 0) {
- MCDRV_DBG_ERROR("down_interruptible() failed with %d\n",
+ MCDRV_DBG_ERROR(mcd,
+ "down_interruptible() failed with %d\n",
ret);
ret = -ERESTARTSYS;
break;
@@ -1079,7 +1003,7 @@
do {
/* daemon can do this for another task. */
if (params.in.pid != 0) {
- MCDRV_DBG_ERROR("pid != 0 unsupported\n");
+ MCDRV_DBG_ERROR(mcd, "pid != 0 unsupported\n");
ret = -EINVAL;
break;
}
@@ -1088,18 +1012,21 @@
find_used_l2_table_by_handle(params.in.handle);
if (used_l2table == NULL) {
ret = -EINVAL;
- MCDRV_DBG_ERROR("entry not found\n");
+ MCDRV_DBG_ERROR(mcd, "entry not found\n");
break;
}
if (is_caller_mc_daemon(instance)) {
- /* if daemon does this, we have to release the
- MobiCore lock. */
+ /*
+ * if daemon does this, we have to release the
+ * MobiCore lock.
+ */
used_l2table->flags &=
~MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_MC;
} else if (instance != used_l2table->owner) {
ret = -EINVAL;
- MCDRV_DBG_ERROR("instance does no own it\n");
+ MCDRV_DBG_ERROR(mcd,
+ "instance does no own it\n");
break;
}
@@ -1109,52 +1036,48 @@
/* there are no out parameters */
- } while (FALSE);
+ } while (0);
/* release semaphore */
up(&(mc_drv_kmod_ctx.wsm_l2_sem));
- } while (FALSE);
+ } while (0);
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
return ret;
}
-
-/*----------------------------------------------------------------------------*/
static int handle_ioctl_daemon_lock_wsm_l2(
- struct mc_instance *instance,
- struct mc_ioctl_daemon_lock_wsm_l2_params *user_params
-)
+ struct mc_instance *instance,
+ struct mc_ioctl_daemon_lock_wsm_l2_params *user_params)
{
- int ret = 0;
- struct mc_ioctl_daemon_lock_wsm_l2_params params;
- struct mc_used_l2_table *used_l2table = NULL;
+ int ret = 0;
+ struct mc_ioctl_daemon_lock_wsm_l2_params params;
+ struct mc_used_l2_table *used_l2table = NULL;
MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
if (!is_caller_mc_daemon(instance)) {
- MCDRV_DBG_ERROR("caller not MobiCore Daemon\n");
+ MCDRV_DBG_ERROR(mcd, "caller not MobiCore Daemon\n");
ret = -EFAULT;
break;
}
- ret = copy_from_user(
- &(params.in),
- &(user_params->in),
- sizeof(params.in));
+ ret = copy_from_user(&(params.in), &(user_params->in),
+ sizeof(params.in));
if (ret != 0) {
- MCDRV_DBG_ERROR("copy_from_user\n");
+ MCDRV_DBG_ERROR(mcd, "copy_from_user\n");
break;
}
/* try to get the semaphore */
ret = down_interruptible(&(mc_drv_kmod_ctx.wsm_l2_sem));
if (ret != 0) {
- MCDRV_DBG_ERROR("down_interruptible() failed with %d\n",
+ MCDRV_DBG_ERROR(mcd,
+ "down_interruptible() failed with %d\n",
ret);
ret = -ERESTARTSYS;
break;
@@ -1165,19 +1088,20 @@
find_used_l2_table_by_handle(params.in.handle);
if (used_l2table == NULL) {
ret = -EINVAL;
- MCDRV_DBG_ERROR("entry not found\n");
+ MCDRV_DBG_ERROR(mcd, "entry not found\n");
break;
}
if (instance != used_l2table->owner) {
ret = -EINVAL;
- MCDRV_DBG_ERROR("instance does no own it\n");
+ MCDRV_DBG_ERROR(mcd,
+ "instance does no own it\n");
break;
}
/* lock entry */
if ((used_l2table->flags &
- MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_MC) != 0) {
- MCDRV_DBG_WARN("entry already locked\n");
+ MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_MC) != 0) {
+ MCDRV_DBG_WARN(mcd, "entry already locked\n");
}
used_l2table->flags |=
MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_MC;
@@ -1188,12 +1112,10 @@
(uint32_t)get_l2_table_phys(used_l2table);
/* copy to user space */
- ret = copy_to_user(
- &(user_params->out),
- &(params.out),
- sizeof(params.out));
+ ret = copy_to_user(&(user_params->out), &(params.out),
+ sizeof(params.out));
if (ret != 0) {
- MCDRV_DBG_ERROR("copy_to_user() failed\n");
+ MCDRV_DBG_ERROR(mcd, "copy_to_user() failed\n");
/* undo, as userspace did not get it. */
used_l2table->flags |=
@@ -1201,53 +1123,49 @@
break;
}
- } while (FALSE);
+ } while (0);
/* release semaphore */
up(&(mc_drv_kmod_ctx.wsm_l2_sem));
- } while (FALSE);
+ } while (0);
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
return ret;
}
-
-/*----------------------------------------------------------------------------*/
static int handle_ioctl_daemon_unlock_wsm_l2(
- struct mc_instance *instance,
- struct mc_ioctl_daemon_unlock_wsm_l2_params *user_params
-)
+ struct mc_instance *instance,
+ struct mc_ioctl_daemon_unlock_wsm_l2_params *user_params)
{
- int ret = 0;
- struct mc_ioctl_daemon_unlock_wsm_l2_params params;
- struct mc_used_l2_table *used_l2table = NULL;
+ int ret = 0;
+ struct mc_ioctl_daemon_unlock_wsm_l2_params params;
+ struct mc_used_l2_table *used_l2table = NULL;
MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
if (!is_caller_mc_daemon(instance)) {
- MCDRV_DBG_ERROR("caller not MobiCore Daemon\n");
+ MCDRV_DBG_ERROR(mcd, "caller not MobiCore Daemon\n");
ret = -EFAULT;
break;
}
- ret = copy_from_user(
- &(params.in),
- &(user_params->in),
- sizeof(params.in));
+ ret = copy_from_user(&(params.in), &(user_params->in),
+ sizeof(params.in));
if (ret != 0) {
- MCDRV_DBG_ERROR("copy_from_user\n");
+ MCDRV_DBG_ERROR(mcd, "copy_from_user\n");
break;
}
/* try to get the semaphore */
ret = down_interruptible(&(mc_drv_kmod_ctx.wsm_l2_sem));
if (ret != 0) {
- MCDRV_DBG_ERROR("down_interruptible() failed with %d\n",
- ret);
+ MCDRV_DBG_ERROR(mcd,
+ "down_interruptible() failed with %d\n",
+ ret);
ret = -ERESTARTSYS;
break;
}
@@ -1257,19 +1175,21 @@
find_used_l2_table_by_handle(params.in.handle);
if (used_l2table == NULL) {
ret = -EINVAL;
- MCDRV_DBG_ERROR("entry not found\n");
+ MCDRV_DBG_ERROR(mcd, "entry not found\n");
break;
}
if (instance != used_l2table->owner) {
ret = -EINVAL;
- MCDRV_DBG_ERROR("instance does no own it\n");
+ MCDRV_DBG_ERROR(mcd,
+ "instance does no own it\n");
break;
}
/* lock entry */
if ((used_l2table->flags &
- MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_MC) == 0) {
- MCDRV_DBG_WARN("entry is not locked locked\n");
+ MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_MC) == 0) {
+ MCDRV_DBG_WARN(mcd,
+ "entry is not locked locked\n");
}
/* free table (if no further locks exist) */
@@ -1278,51 +1198,35 @@
/* there are no out parameters */
- } while (FALSE);
+ } while (0);
- } while (FALSE);
+ } while (0);
-
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
return ret;
}
-/*----------------------------------------------------------------------------*/
-/** Clears the reserved bit of each page and frees the pages */
-static inline void free_continguous_pages(
- void *addr,
- unsigned int size
-)
+/* Clears the reserved bit of each page and frees the pages */
+static inline void free_continguous_pages(void *addr, unsigned int order)
{
struct page *page = virt_to_page(addr);
int i;
- for (i = 0; i < size; i++) {
- MCDRV_DBG_VERBOSE("free page at 0x%p\n", page);
+
+ for (i = 0; i < (1 << order); i++) {
+ MCDRV_DBG_VERBOSE(mcd, "free page at 0x%p\n", page);
ClearPageReserved(page);
page++;
}
- /* REV luh: see man kmalloc */
- free_pages((unsigned long)addr, size_to_order(size));
+ MCDRV_DBG(mcd, "freeing addr:%p, order:%x\n", addr, order);
+ free_pages((unsigned long)addr, order);
}
-/*----------------------------------------------------------------------------*/
-/**
- * Free a WSM buffer allocated with mobicore_allocate_wsm
- * @param instance
- * @param handle handle of the buffer
- *
- * @return 0 if no error
- *
- */
-int mobicore_free(
- struct mc_instance *instance,
- uint32_t handle
-)
+int mobicore_free(struct mc_instance *instance, uint32_t handle)
{
int ret = 0;
unsigned int i;
- struct mc_contg_buffer *contg_buffer;
+ struct mc_contg_buffer *contg_buffer;
do {
/* search for the given address in the contg_buffers list */
@@ -1332,64 +1236,49 @@
break;
}
if (i == MC_DRV_KMOD_CONTG_BUFFER_MAX) {
- MCDRV_DBG_ERROR("contigous buffer not found\n");
+ MCDRV_DBG_ERROR(mcd, "contigous buffer not found\n");
ret = -EFAULT;
break;
}
- MCDRV_DBG_VERBOSE("phys_addr=0x%p, virt_addr=0x%p\n",
- contg_buffer->phys_addr,
- contg_buffer->virt_kernel_addr);
+ MCDRV_DBG_VERBOSE(mcd, "phys_addr=0x%p, virt_addr=0x%p\n",
+ contg_buffer->phys_addr,
+ contg_buffer->virt_kernel_addr);
free_continguous_pages(contg_buffer->virt_kernel_addr,
- contg_buffer->num_pages);
+ contg_buffer->order);
memset(contg_buffer, 0, sizeof(*contg_buffer));
/* there are no out parameters */
- } while (FALSE);
-
+ } while (0);
return ret;
}
EXPORT_SYMBOL(mobicore_free);
-/*----------------------------------------------------------------------------*/
-/**
- *
- * @param instance
- * @param arg
- *
- * @return 0 if no error
- *
- */
-static int handle_ioctl_free(
- struct mc_instance *instance,
- union mc_ioctl_free_params *user_params
-)
+static int handle_ioctl_free(struct mc_instance *instance,
+ union mc_ioctl_free_params *user_params)
{
- int ret = 0;
- union mc_ioctl_free_params params;
-
+ int ret = 0;
+ union mc_ioctl_free_params params;
MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
- ret = copy_from_user(
- &(params.in),
- &(user_params->in),
- sizeof(params.in));
+ ret = copy_from_user(&(params.in), &(user_params->in),
+ sizeof(params.in));
if (ret != 0) {
- MCDRV_DBG_ERROR("copy_from_user\n");
+ MCDRV_DBG_ERROR(mcd, "copy_from_user\n");
break;
}
/* daemon can do this for another task. */
if (params.in.pid != 0) {
- MCDRV_DBG_ERROR("pid != 0 unsupported\n");
+ MCDRV_DBG_ERROR(mcd, "pid != 0 unsupported\n");
ret = -EINVAL;
break;
}
@@ -1398,127 +1287,98 @@
/* there are no out parameters */
- } while (FALSE);
+ } while (0);
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
return ret;
}
-
-/*----------------------------------------------------------------------------*/
-/**
- *
- * @param instance
- * @param arg
- *
- * @return 0 if no error
- *
- */
-static int handle_ioctl_info(
- struct mc_instance *instance,
- union mc_ioctl_info_params *user_params
-)
+static int handle_ioctl_info(struct mc_instance *instance,
+ union mc_ioctl_info_params *user_params)
{
- int ret = 0;
- union mc_ioctl_info_params params;
- union mc_fc_info fc_info;
-
+ int ret = 0;
+ union mc_ioctl_info_params params;
+ union mc_fc_info fc_info;
MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
/* only the MobiCore Daemon is allowed to call this function */
if (!is_caller_mc_daemon(instance)) {
- MCDRV_DBG_ERROR("caller not MobiCore Daemon\n");
+ MCDRV_DBG_ERROR(mcd, "caller not MobiCore Daemon\n");
ret = -EFAULT;
break;
}
- ret = copy_from_user(
- &(params.in),
- &(user_params->in),
- sizeof(params.in));
+ ret = copy_from_user(&(params.in), &(user_params->in),
+ sizeof(params.in));
if (ret != 0) {
- MCDRV_DBG_ERROR("copy_from_user\n");
+ MCDRV_DBG_ERROR(mcd, "copy_from_user\n");
break;
}
-
memset(&fc_info, 0, sizeof(fc_info));
- fc_info.as_in.cmd = MC_FC_INFO;
+ fc_info.as_in.cmd = MC_FC_INFO;
fc_info.as_in.ext_info_id = params.in.ext_info_id;
- MCDRV_DBG(
- "fc_info in cmd=0x%08x, ext_info_id=0x%08x "
- "rfu=(0x%08x, 0x%08x)\n",
- fc_info.as_in.cmd,
- fc_info.as_in.ext_info_id,
- fc_info.as_in.rfu[0],
- fc_info.as_in.rfu[1]);
+ MCDRV_DBG(mcd,
+ "fc_info in cmd=0x%08x, ext_info_id=0x%08x "
+ "rfu=(0x%08x, 0x%08x)\n",
+ fc_info.as_in.cmd,
+ fc_info.as_in.ext_info_id,
+ fc_info.as_in.rfu[0],
+ fc_info.as_in.rfu[1]);
mc_fastcall(&(fc_info.as_generic));
- MCDRV_DBG(
- "fc_info out resp=0x%08x, ret=0x%08x "
- "state=0x%08x, ext_info=0x%08x\n",
- fc_info.as_out.resp,
- fc_info.as_out.ret,
- fc_info.as_out.state,
- fc_info.as_out.ext_info);
+ MCDRV_DBG(mcd,
+ "fc_info out resp=0x%08x, ret=0x%08x "
+ "state=0x%08x, ext_info=0x%08x\n",
+ fc_info.as_out.resp,
+ fc_info.as_out.ret,
+ fc_info.as_out.state,
+ fc_info.as_out.ext_info);
ret = convert_fc_ret(fc_info.as_out.ret);
if (ret != 0)
break;
memset(&(params.out), 0, sizeof(params.out));
- params.out.state = fc_info.as_out.state;
+ params.out.state = fc_info.as_out.state;
params.out.ext_info = fc_info.as_out.ext_info;
- ret = copy_to_user(
- &(user_params->out),
- &(params.out),
- sizeof(params.out));
+ ret = copy_to_user(&(user_params->out), &(params.out),
+ sizeof(params.out));
if (ret != 0) {
- MCDRV_DBG_ERROR("copy_to_user\n");
+ MCDRV_DBG_ERROR(mcd, "copy_to_user\n");
break;
}
- } while (FALSE);
+ } while (0);
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
return ret;
}
-/*----------------------------------------------------------------------------*/
-/**
- *
- * @param instance
- * @param arg
- *
- * @return 0 if no error
- *
- */
-static int handle_ioctl_yield(
- struct mc_instance *instance
-)
+static int handle_ioctl_yield(struct mc_instance *instance)
{
- int ret = 0;
- union mc_fc_s_yield fc_s_yield;
+ int ret = 0;
+ union mc_fc_s_yield fc_s_yield;
MCDRV_ASSERT(instance != NULL);
/* avoid putting debug output here, as we do this very often */
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
/* only the MobiCore Daemon is allowed to call this function */
if (!is_caller_mc_daemon(instance)) {
- MCDRV_DBG_ERROR("caller not MobiCore Daemon\n");
+ MCDRV_DBG_ERROR(mcd, "caller not MobiCore Daemon\n");
ret = -EFAULT;
break;
}
@@ -1530,37 +1390,31 @@
if (ret != 0)
break;
- } while (FALSE);
+ } while (0);
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
return ret;
}
-/*----------------------------------------------------------------------------*/
-/**
+/*
* handle ioctl and call common notify
*
- * @param instance
- * @param arg
- *
- * @return 0 if no error
+ * returns 0 if no error
*
*/
-static int handle_ioctl_nsiq(
- struct mc_instance *instance,
- unsigned long arg
-)
+static int handle_ioctl_nsiq(struct mc_instance *instance, unsigned long arg)
{
- int ret = 0;
+ int ret = 0;
MCDRV_ASSERT(instance != NULL);
/* avoid putting debug output here, as we do this very often */
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
+
/* only the MobiCore Daemon is allowed to call this function */
if (!is_caller_mc_daemon(instance)) {
- MCDRV_DBG_ERROR("caller not MobiCore Daemon\n");
+ MCDRV_DBG_ERROR(mcd, "caller not MobiCore Daemon\n");
return -EFAULT;
}
@@ -1572,145 +1426,60 @@
ret = convert_fc_ret(fc_nsiq.as_out.ret);
if (ret != 0)
break;
- } while (FALSE);
+ } while (0);
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
return ret;
}
-/*----------------------------------------------------------------------------*/
-/**
- *
- * @param instance
- * @param arg
- *
- * @return 0 if no error
- *
- */
-static int handle_ioctl_dump_status(
- struct mc_instance *instance,
- unsigned long arg
-)
+static int handle_ioctl_init(struct mc_instance *instance,
+ union mc_ioctl_init_params *user_params)
{
- int ret = 0;
- int i = 0;
- union mc_fc_info fc_info;
+ int ret = 0;
+ union mc_ioctl_init_params params;
+ union mc_fc_init fc_init;
MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG_VERBOSE("enter\n");
-
- do {
- /* anybody with root access can do this. */
- if (!is_userland_caller_privileged()) {
- MCDRV_DBG_ERROR("caller must have root privileges\n");
- ret = -EFAULT;
- break;
- }
-
- /* loop ext_info */
- while (TRUE) {
- memset(&fc_info, 0, sizeof(fc_info));
- fc_info.as_in.cmd = MC_FC_INFO;
- fc_info.as_in.ext_info_id = i;
-
- MCDRV_DBG(
- "fc_info in cmd=0x%08x, ext_info_id=0x%08x "
- "rfu=(0x%08x, 0x%08x)\n",
- fc_info.as_in.cmd,
- fc_info.as_in.ext_info_id,
- fc_info.as_in.rfu[0],
- fc_info.as_in.rfu[1]);
-
- mc_fastcall(&(fc_info.as_generic));
-
- MCDRV_DBG(
- "fc_info out resp=0x%08x, ret=0x%08x "
- "state=0x%08x, ext_info=0x%08x\n",
- fc_info.as_out.resp,
- fc_info.as_out.ret,
- fc_info.as_out.state,
- fc_info.as_out.ext_info);
-
- ret = convert_fc_ret(fc_info.as_out.ret);
- if (ret != 0)
- break;
-
- MCDRV_DBG("state=%08X, idx=%02d: ext_info=%08X\n",
- fc_info.as_out.state,
- i,
- fc_info.as_out.ext_info);
- i++;
- };
-
- if (ret != 0)
- break;
-
-
- } while (FALSE);
-
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
-
- return ret;
-}
-
-/*----------------------------------------------------------------------------*/
-/**
- *
- * @param instance
- * @param arg
- *
- * @return 0 if no error
- *
- */
-static int handle_ioctl_init(
- struct mc_instance *instance,
- union mc_ioctl_init_params *user_params
-)
-{
- int ret = 0;
- union mc_ioctl_init_params params;
- union mc_fc_init fc_init;
-
- MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
/* only the MobiCore Daemon is allowed to call this function */
if (!is_caller_mc_daemon(instance)) {
- MCDRV_DBG_ERROR("caller not MobiCore Daemon\n");
+ MCDRV_DBG_ERROR(mcd, "caller not MobiCore Daemon\n");
ret = -EFAULT;
break;
}
- ret = copy_from_user(
- &(params.in),
- &(user_params->in),
- sizeof(params.in));
+ ret = copy_from_user(&(params.in), &(user_params->in),
+ sizeof(params.in));
if (ret != 0) {
- MCDRV_DBG_ERROR("copy_from_user failed\n");
+ MCDRV_DBG_ERROR(mcd, "copy_from_user failed\n");
break;
}
memset(&fc_init, 0, sizeof(fc_init));
- fc_init.as_in.cmd = MC_FC_INIT;
+ fc_init.as_in.cmd = MC_FC_INIT;
/* base address of mci buffer 4KB aligned */
- fc_init.as_in.base = (uint32_t)params.in.base;
+ fc_init.as_in.base = (uint32_t)params.in.base;
/* notification buffer start/length [16:16] [start, length] */
- fc_init.as_in.nq_info = (params.in.nq_offset << 16)
- | (params.in.nq_length & 0xFFFF);
+ fc_init.as_in.nq_info = (params.in.nq_offset << 16) |
+ (params.in.nq_length & 0xFFFF);
/* mcp buffer start/length [16:16] [start, length] */
- fc_init.as_in.mcp_info = (params.in.mcp_offset << 16)
- | (params.in.mcp_length & 0xFFFF);
+ fc_init.as_in.mcp_info = (params.in.mcp_offset << 16) |
+ (params.in.mcp_length & 0xFFFF);
- /* Set KMOD notification queue to start of MCI
- mciInfo was already set up in mmap */
+ /*
+ * Set KMOD notification queue to start of MCI
+ * mciInfo was already set up in mmap
+ */
if (!mci_base) {
- MCDRV_DBG_ERROR("No MCI set yet.\n");
+ MCDRV_DBG_ERROR(mcd, "No MCI set yet.\n");
return -EFAULT;
}
- MCDRV_DBG("in cmd=0x%08x, base=0x%08x, "
+ MCDRV_DBG(mcd,
+ "in cmd=0x%08x, base=0x%08x, "
"nq_info=0x%08x, mcp_info=0x%08x\n",
fc_init.as_in.cmd,
fc_init.as_in.base,
@@ -1719,7 +1488,8 @@
mc_fastcall(&(fc_init.as_generic));
- MCDRV_DBG("out cmd=0x%08x, ret=0x%08x rfu=(0x%08x, 0x%08x)\n",
+ MCDRV_DBG(mcd,
+ "out cmd=0x%08x, ret=0x%08x rfu=(0x%08x, 0x%08x)\n",
fc_init.as_out.resp,
fc_init.as_out.ret,
fc_init.as_out.rfu[0],
@@ -1731,97 +1501,19 @@
/* no ioctl response parameters */
- } while (FALSE);
+ } while (0);
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
return ret;
}
-/*----------------------------------------------------------------------------*/
-/**
- *
- * @param instance
- * @param arg
- *
- * @return 0 if no error
- *
- */
-static int handle_ioctl_fc_execute(
- struct mc_instance *instance,
- union mc_ioctl_fc_execute_params *user_params
-)
-{
- int ret = 0;
- union mc_ioctl_fc_execute_params params;
- union fc_generic fc_params;
-
- MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG_VERBOSE("enter\n");
-
- do {
- /* only the MobiCore Daemon is allowed to call this function */
- if (!is_caller_mc_daemon(instance)) {
- MCDRV_DBG_ERROR("caller not MobiCore Daemon\n");
- ret = -EFAULT;
- break;
- }
-
- ret = copy_from_user(
- &(params.in),
- &(user_params->in),
- sizeof(params.in));
- if (ret != 0) {
- MCDRV_DBG_ERROR("copy_from_user failed\n");
- break;
- }
-
- fc_params.as_in.cmd = -4;/*FC_EXECUTE */
- fc_params.as_in.param[0] = params.in.phys_start_addr;
- fc_params.as_in.param[1] = params.in.length;
- fc_params.as_in.param[2] = 0;
-
- MCDRV_DBG("in cmd=0x%08x, startAddr=0x%08x, length=0x%08x\n",
- fc_params.as_in.cmd,
- fc_params.as_in.param[0],
- fc_params.as_in.param[1]);
-
- mc_fastcall(&fc_params);
-
- MCDRV_DBG("out cmd=0x%08x, ret=0x%08x rfu=(0x%08x, 0x%08x)\n",
- fc_params.as_out.resp,
- fc_params.as_out.ret,
- fc_params.as_out.param[0],
- fc_params.as_out.param[1]);
-
- ret = convert_fc_ret(fc_params.as_out.ret);
- if (ret != 0)
- break;
-
- /* no ioctl response parameters */
-
- } while (FALSE);
-
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
-
- return ret;
-}
-
-/*----------------------------------------------------------------------------*/
#define MC_MAKE_VERSION(major, minor) \
(((major & 0x0000ffff) << 16) | (minor & 0x0000ffff))
-/**
- *
- * @param instance
- * @param arg
- *
- * @return 0 if no error
- *
- */
+
static int handle_ioctl_get_version(
- struct mc_instance *instance,
- struct mc_ioctl_get_version_params *user_params
-)
+ struct mc_instance *instance,
+ struct mc_ioctl_get_version_params *user_params)
{
int ret = 0;
struct mc_ioctl_get_version_params params = {
@@ -1832,42 +1524,27 @@
};
MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
- MCDRV_DBG("mcDrvModuleApi version is %i.%i\n",
- MCDRVMODULEAPI_VERSION_MAJOR,
- MCDRVMODULEAPI_VERSION_MINOR);
+ MCDRV_DBG(mcd, "mcDrvModuleApi version is %i.%i\n",
+ MCDRVMODULEAPI_VERSION_MAJOR,
+ MCDRVMODULEAPI_VERSION_MINOR);
/* no ioctl response parameters */
- ret = copy_to_user(
- &(user_params->out),
- &(params.out),
- sizeof(params.out));
+ ret = copy_to_user(&(user_params->out), &(params.out),
+ sizeof(params.out));
if (ret != 0)
- MCDRV_DBG_ERROR("copy_to_user() failed\n");
+ MCDRV_DBG_ERROR(mcd, "copy_to_user() failed\n");
- } while (FALSE);
+ } while (0);
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
return ret;
}
-/*----------------------------------------------------------------------------*/
-/**
- * This function will be called from user space as ioctl(...).
- * @param file pointer to file
- * @param cmd command
- * @param arg arguments
- *
- * @return int 0 for OK and an errno in case of error
- */
-static long mc_kernel_module_ioctl(
- struct file *file,
- unsigned int cmd,
- unsigned long arg
-)
+static long mc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
int ret;
struct mc_instance *instance = get_instance(file);
@@ -1875,145 +1552,102 @@
MCDRV_ASSERT(instance != NULL);
switch (cmd) {
- /*--------------------------------------------------------------------*/
- case MC_DRV_KMOD_IOCTL_DUMP_STATUS:
- ret = handle_ioctl_dump_status(
- instance,
- arg);
- break;
-
- /*--------------------------------------------------------------------*/
case MC_DRV_KMOD_IOCTL_FC_INIT:
- ret = handle_ioctl_init(
- instance,
- (union mc_ioctl_init_params *)arg);
+ ret = handle_ioctl_init(instance,
+ (union mc_ioctl_init_params *)arg);
break;
- /*--------------------------------------------------------------------*/
case MC_DRV_KMOD_IOCTL_FC_INFO:
- ret = handle_ioctl_info(
- instance,
- (union mc_ioctl_info_params *)arg);
+ ret = handle_ioctl_info(instance,
+ (union mc_ioctl_info_params *)arg);
break;
-
- /*--------------------------------------------------------------------*/
case MC_DRV_KMOD_IOCTL_FC_YIELD:
- ret = handle_ioctl_yield(
- instance);
+ ret = handle_ioctl_yield(instance);
break;
-
- /*--------------------------------------------------------------------*/
case MC_DRV_KMOD_IOCTL_FC_NSIQ:
- ret = handle_ioctl_nsiq(
- instance,
- arg);
+ ret = handle_ioctl_nsiq(instance, arg);
break;
-
- /*--------------------------------------------------------------------*/
case MC_DRV_KMOD_IOCTL_DAEMON_LOCK_WSM_L2:
ret = handle_ioctl_daemon_lock_wsm_l2(
instance,
(struct mc_ioctl_daemon_lock_wsm_l2_params *)arg);
break;
-
- /*--------------------------------------------------------------------*/
case MC_DRV_KMOD_IOCTL_DAEMON_UNLOCK_WSM_L2:
ret = handle_ioctl_daemon_unlock_wsm_l2(
instance,
(struct mc_ioctl_daemon_unlock_wsm_l2_params *)arg);
break;
-
- /*--------------------------------------------------------------------*/
case MC_DRV_KMOD_IOCTL_FREE:
/* called by ClientLib */
- ret = handle_ioctl_free(
- instance,
- (union mc_ioctl_free_params *)arg);
+ ret = handle_ioctl_free(instance,
+ (union mc_ioctl_free_params *)arg);
break;
-
- /*--------------------------------------------------------------------*/
case MC_DRV_KMOD_IOCTL_APP_REGISTER_WSM_L2:
/* called by ClientLib */
ret = handle_ioctl_app_register_wsm_l2(
instance,
(union mc_ioctl_app_reg_wsm_l2_params *)arg);
break;
-
- /*--------------------------------------------------------------------*/
case MC_DRV_KMOD_IOCTL_APP_UNREGISTER_WSM_L2:
/* called by ClientLib */
ret = handle_ioctl_app_unregister_wsm_l2(
instance,
(struct mc_ioctl_app_unreg_wsm_l2_params *)arg);
break;
-
- /*--------------------------------------------------------------------*/
- case MC_DRV_KMOD_IOCTL_FC_EXECUTE:
- ret = handle_ioctl_fc_execute(
- instance,
- (union mc_ioctl_fc_execute_params *)arg);
- break;
-
- /*--------------------------------------------------------------------*/
case MC_DRV_KMOD_IOCTL_GET_VERSION:
ret = handle_ioctl_get_version(
instance,
(struct mc_ioctl_get_version_params *)arg);
break;
-
- /*--------------------------------------------------------------------*/
default:
- MCDRV_DBG_ERROR("unsupported cmd=%d\n", cmd);
+ MCDRV_DBG_ERROR(mcd, "unsupported cmd=%d\n", cmd);
ret = -EFAULT;
break;
-
} /* end switch(cmd) */
#ifdef MC_MEM_TRACES
mobicore_log_read();
#endif
- return (int)ret;
+ return (long)ret;
}
-
-/*----------------------------------------------------------------------------*/
/**
- * This function will be called from user space as read(...).
+ * mc_read() - This will be called from user space as read(...)
+ * @file: file pointer
+ * @buffer: buffer where to copy to(userspace)
+ * @buffer_len: number of requested data
+ * @pos: not used
+ *
* The read function is blocking until a interrupt occurs. In that case the
* event counter is copied into user space and the function is finished.
- * @param *file
- * @param *buffer buffer where to copy to(userspace)
- * @param buffer_len number of requested data
- * @param *pos not used
- * @return ssize_t ok case: number of copied data
- * error case: return errno
+ *
+ * If OK this function returns the number of copied data otherwise it returns
+ * errno
*/
-static ssize_t mc_kernel_module_read(
- struct file *file,
- char *buffer,
- size_t buffer_len,
- loff_t *pos
-)
+static ssize_t mc_read(struct file *file, char *buffer,
+ size_t buffer_len, loff_t *pos)
{
- int ret = 0, ssiq_counter;
+ int ret = 0;
+ int ssiq_counter;
+ int ctx_counter;
size_t retLen = 0;
struct mc_instance *instance = get_instance(file);
MCDRV_ASSERT(instance != NULL);
/* avoid debug output on non-error, because this is call quite often */
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
/* only the MobiCore Daemon is allowed to call this function */
if (!is_caller_mc_daemon(instance)) {
- MCDRV_DBG_ERROR("caller not MobiCore Daemon\n");
+ MCDRV_DBG_ERROR(mcd, "caller not MobiCore Daemon\n");
ret = -EFAULT;
break;
}
if (buffer_len < sizeof(unsigned int)) {
- MCDRV_DBG_ERROR("invalid length\n");
+ MCDRV_DBG_ERROR(mcd, "invalid length\n");
ret = (ssize_t)(-EINVAL);
break;
}
@@ -2021,16 +1655,20 @@
for (;;) {
if (down_interruptible(
&mc_drv_kmod_ctx.daemon_ctx.sem)) {
- MCDRV_DBG_VERBOSE("read interrupted\n");
+ MCDRV_DBG_VERBOSE(mcd, "read interrupted\n");
ret = (ssize_t)-ERESTARTSYS;
break;
}
ssiq_counter = atomic_read(
&(mc_drv_kmod_ctx.ssiq_ctx.counter));
- MCDRV_DBG_VERBOSE("ssiq_counter=%i, ctx.counter=%i\n",
- ssiq_counter,
- mc_drv_kmod_ctx.daemon_ctx.ssiq_counter);
+ ctx_counter =
+ mc_drv_kmod_ctx.daemon_ctx.ssiq_counter;
+
+ MCDRV_DBG_VERBOSE(mcd,
+ "ssiq_counter=%i, ctx.counter=%i\n",
+ ssiq_counter,
+ ctx_counter);
if (ssiq_counter !=
mc_drv_kmod_ctx.daemon_ctx.ssiq_counter) {
@@ -2044,98 +1682,80 @@
/* end loop if non-blocking */
if ((file->f_flags & O_NONBLOCK) != 0) {
- MCDRV_DBG_ERROR("non-blocking read\n");
+ MCDRV_DBG_ERROR(mcd, "non-blocking read\n");
ret = (ssize_t)(-EAGAIN);
break;
}
if (signal_pending(current) != 0) {
- MCDRV_DBG_VERBOSE("received signal.\n");
+ MCDRV_DBG_VERBOSE(mcd, "received signal.\n");
ret = (ssize_t)(-ERESTARTSYS);
break;
}
}
- /* we are here if an event occurred or we had an
- error.*/
+ /*
+ * we are here if an event occurred
+ * or if we had an error.
+ */
if (ret != 0)
break;
/* read data and exit loop */
- ret = copy_to_user(
- buffer,
- &(mc_drv_kmod_ctx.daemon_ctx.ssiq_counter),
- sizeof(unsigned int));
-
+ ret = copy_to_user(buffer,
+ &(mc_drv_kmod_ctx.daemon_ctx.ssiq_counter),
+ sizeof(unsigned int));
if (ret != 0) {
- MCDRV_DBG_ERROR("copy_to_user failed\n");
+ MCDRV_DBG_ERROR(mcd, "copy_to_user failed\n");
ret = (ssize_t)(-EFAULT);
break;
}
retLen = sizeof(s32);
- } while (FALSE);
+ } while (0);
/* avoid debug on non-error. */
if (ret == 0)
ret = (size_t)retLen;
else
- MCDRV_DBG("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG(mcd, "exit with %d/0x%08X\n", ret, ret);
return (ssize_t)ret;
}
-/*----------------------------------------------------------------------------*/
-/**
- * Allocate WSM for given instance
- *
- * @param instance instance
- * @param requested_size size of the WSM
- * @param handle pointer where the handle will be saved
- * @param virt_kernel_addr pointer for the kernel virtual address
- * @param phys_addr pointer for the physical address
- *
- * @return error code or 0 for success
- */
-int mobicore_allocate_wsm(
- struct mc_instance *instance,
- unsigned long requested_size,
- uint32_t *handle,
- void **virt_kernel_addr,
- void **phys_addr
-)
+int mobicore_allocate_wsm(struct mc_instance *instance,
+ unsigned long requested_size, uint32_t *handle,
+ void **virt_kernel_addr, void **phys_addr)
{
- unsigned int i;
- unsigned int order;
- unsigned long allocated_size;
- int ret = 0;
- struct mc_contg_buffer *contg_buffer = 0;
- void *virt_kernel_addr_stack;
- void *phys_addr_stack;
+ unsigned int i;
+ unsigned int order;
+ unsigned long allocated_size;
+ int ret = 0;
+ struct mc_contg_buffer *contg_buffer = 0;
+ void *kaddr_buffer;
+ void *paddr_buffer;
MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG("%s (size=%ld)\n", __func__, requested_size);
+ MCDRV_DBG(mcd, "%s (size=%ld)\n", __func__, requested_size);
- order = size_to_order(requested_size);
- if (order == INVALID_ORDER) {
- MCDRV_DBG_ERROR(
- "size to order converting failed for size %ld\n",
- requested_size);
- return INVALID_ORDER;
+ if (requested_size == 0) {
+ MCDRV_DBG_ERROR(mcd, "cannot allocate size 0\n");
+ return -ENOMEM;
}
+ order = get_order(requested_size);
+ allocated_size = (1 << order)*PAGE_SIZE;
- allocated_size = (1<<order)*PAGE_SIZE;
-
- MCDRV_DBG("size %ld -> order %d --> %ld (2^n pages)\n",
+ MCDRV_DBG(mcd, "size %ld -> order %d --> %ld (2^n pages)\n",
requested_size, order, allocated_size);
do {
- /* Usual Wsm request, allocate contigous buffer. */
- /* search for a free entry in the wsm buffer list
- * REV axh: serialize this over multiple instances. */
+ /*
+ * Usual Wsm request, allocate contigous buffer.
+ * search for a free entry in the wsm buffer list
+ */
for (i = 0; i < MC_DRV_KMOD_CONTG_BUFFER_MAX; i++) {
contg_buffer = &(instance->contg_buffers[i]);
if (contg_buffer->handle == 0) {
@@ -2144,334 +1764,291 @@
}
}
if (i == MC_DRV_KMOD_CONTG_BUFFER_MAX) {
- MCDRV_DBG_ERROR("no free contigous buffer\n");
+ MCDRV_DBG_ERROR(mcd, "no free contigous buffer\n");
ret = -EFAULT;
break;
}
/* Common code for all allocation paths */
- virt_kernel_addr_stack = (void *)__get_free_pages(
- GFP_USER | __GFP_COMP,
+ kaddr_buffer = (void *)__get_free_pages(GFP_USER | __GFP_COMP,
order);
- if (virt_kernel_addr_stack == NULL) {
- MCDRV_DBG_ERROR("get_free_pages failed\n");
+ if (kaddr_buffer == NULL) {
+ MCDRV_DBG_ERROR(mcd, "get_free_pages failed\n");
ret = -ENOMEM;
break;
}
/* Get physical address to instance data */
- phys_addr_stack = (void *)virt_to_phys(virt_kernel_addr_stack);
- /* TODO: check for INVALID_ADDRESS? */
+ paddr_buffer = (void *)virt_to_phys(kaddr_buffer);
- MCDRV_DBG(
- "allocated phys=0x%p - 0x%p, "
- "size=%ld, kernel_virt=0x%p, handle=%d\n",
- phys_addr_stack,
- (void *)((unsigned int)phys_addr_stack+allocated_size),
- allocated_size,
- virt_kernel_addr_stack,
- contg_buffer->handle);
+ MCDRV_DBG(mcd,
+ "allocated phys=0x%p - 0x%p, "
+ "size=%ld, kernel_virt=0x%p, handle=%d\n",
+ paddr_buffer,
+ (void *)((unsigned int)paddr_buffer+allocated_size),
+ allocated_size,
+ kaddr_buffer,
+ contg_buffer->handle);
- /* Usual Wsm request, allocate contg_buffer.
- * Also, we never free a persistent Tci */
- contg_buffer->phys_addr = phys_addr_stack;
- contg_buffer->virt_kernel_addr = virt_kernel_addr_stack;
- contg_buffer->virt_user_addr = virt_kernel_addr_stack;
- contg_buffer->num_pages = (1U << order);
+ /*
+ * Usual Wsm request, allocate contg_buffer.
+ * Also, we never free a persistent Tci
+ */
+ contg_buffer->phys_addr = paddr_buffer;
+ contg_buffer->virt_kernel_addr = kaddr_buffer;
+ contg_buffer->virt_user_addr = kaddr_buffer;
+ contg_buffer->order = order;
*handle = contg_buffer->handle;
- *virt_kernel_addr = virt_kernel_addr_stack;
- *phys_addr = phys_addr_stack;
+ *virt_kernel_addr = kaddr_buffer;
+ *phys_addr = paddr_buffer;
- } while (FALSE);
+ } while (0);
- MCDRV_DBG_VERBOSE("%s: exit with 0x%08X\n", __func__, ret);
+ MCDRV_DBG_VERBOSE(mcd, "%s: exit with 0x%08X\n", __func__, ret);
return ret;
}
EXPORT_SYMBOL(mobicore_allocate_wsm);
-
-/*----------------------------------------------------------------------------*/
/**
- * This function will be called from user space as address = mmap(...).
+ * mc_mmap() - Called from user space as address = mmap(...).
+ * @file: file pointer
+ * @vmarea: vmarea.pg_offset != 0 is mapping of MCI is requested
*
- * @param file
- * @param vmarea
- * vmarea.pg_offset != 0 is mapping of MCI is requested
- *
- * @return 0 if OK or -ENOMEM in case of error.
+ * This function returns either 0 or -ENOMEM in case of error.
*/
-static int mc_kernel_module_mmap(
- struct file *file,
- struct vm_area_struct *vmarea
-)
+static int mc_mmap(struct file *file, struct vm_area_struct *vmarea)
{
- unsigned int i;
- unsigned int order;
- void *virt_kernel_addr_stack = 0;
- void *phys_addr = 0;
- unsigned long requested_size =
- vmarea->vm_end - vmarea->vm_start;
- unsigned long allocated_size;
- int ret = 0;
- struct mc_contg_buffer *contg_buffer = 0;
- unsigned int handle = 0;
- struct mc_instance *instance = get_instance(file);
- unsigned int request = vmarea->vm_pgoff * 4096;
-#if defined(DEBUG)
- bool release = false;
-#else
- bool release = true;
-#endif
+ int ret = 0;
+ unsigned int i;
+ struct mc_instance *instance = get_instance(file);
+ unsigned int request = vmarea->vm_pgoff * 4096;
+ unsigned long requested_size = vmarea->vm_end - vmarea->vm_start;
+ unsigned int order;
+ unsigned long allocated_size;
+ void *kaddr_buffer = 0;
+ void *paddr_buffer = 0;
+ unsigned int pfn;
+ struct mc_contg_buffer *contg_buffer = 0;
+ unsigned int uq_handle_buffer = 0;
+ bool allocate_buffer = false;
MCDRV_ASSERT(instance != NULL);
- MCDRV_DBG("enter (vmaStart=0x%p, size=%ld, request=0x%x, mci=0x%x)\n",
+ MCDRV_DBG(mcd,
+ "enter (vma start=0x%p, size=%ld, request=0x%x, mci=0x%x)\n",
(void *)vmarea->vm_start,
requested_size,
request,
mci_base);
- order = size_to_order(requested_size);
- if (order == INVALID_ORDER) {
- MCDRV_DBG_ERROR(
- "size to order converting failed for size %ld\n",
- requested_size);
- return -ENOMEM;
+ if (requested_size == 0) {
+ MCDRV_DBG_ERROR(mcd, "cannot allocate size 0\n");
+ ret = -ENOMEM;
+ goto mc_mmap_end;
}
+ order = get_order(requested_size);
+ allocated_size = (1 << order)*PAGE_SIZE;
- allocated_size = (1<<order)*PAGE_SIZE;
-
- MCDRV_DBG("size %ld -> order %d --> %ld (2^n pages)\n",
+ MCDRV_DBG(mcd,
+ "size %ld -> order %d --> %ld (2^n pages)\n",
requested_size, order, allocated_size);
- do {
- /* Daemon tries to get an existing MCI */
- if ((request == MC_DRV_KMOD_MMAP_MCI) && (mci_base != 0)) {
- MCDRV_DBG("Request MCI, it is at (%x)\n", mci_base);
+ switch (request) {
- if (!is_caller_mc_daemon(instance)) {
- ret = -EPERM;
- break;
- }
- virt_kernel_addr_stack = (void *)mci_base;
- phys_addr =
- (void *)virt_to_phys(virt_kernel_addr_stack);
+ /* Daemon tries to get the MCI - the MobiCore Interface buffer */
+ case MC_DRV_KMOD_MMAP_MCI:
+ if (!is_caller_mc_daemon(instance)) {
+ ret = -EPERM;
+ goto mc_mmap_end;
+ }
+
+ if (mci_base == 0) {
+ allocate_buffer = true;
} else {
- /* Usual Wsm request, allocate buffer. */
- if (request == MC_DRV_KMOD_MMAP_WSM) {
- /* search for a free entry in the buffer list
- REV axh: serialize this over multiple instances.
- */
- for (i = 0; i < MC_DRV_KMOD_CONTG_BUFFER_MAX;
- i++) {
- contg_buffer =
- &(instance->contg_buffers[i]);
- if (contg_buffer->handle == 0) {
- contg_buffer->handle =
- get_mc_kmod_unique_id();
- break;
- }
- }
- if (i == MC_DRV_KMOD_CONTG_BUFFER_MAX) {
- MCDRV_DBG_ERROR(
- "no free contigous buffer\n");
- ret = -EFAULT;
- break;
- }
- } else {
- if (request <= MC_DRV_KMOD_MMAP_PERSISTENTWSM
- || release) {
- /* Special Wsm request
- --> only Daemon is allowed */
- if (!is_caller_mc_daemon(instance)) {
- ret = -EPERM;
- break;
- }
- }
- }
- if (request <= MC_DRV_KMOD_MMAP_PERSISTENTWSM) {
- /* Common code for all allocation paths
- * get physical address, */
- virt_kernel_addr_stack =
- (void *)__get_free_pages(
- GFP_USER | __GFP_COMP,
- order);
- if (virt_kernel_addr_stack == NULL) {
- MCDRV_DBG_ERROR(
- "get_free_pages failed\n");
- ret = -ENOMEM;
- break;
- }
- if (request == MC_DRV_KMOD_MMAP_WSM)
- handle = contg_buffer->handle;
- /* Get physical address to instance data */
- /* TODO: check for INVALID_ADDRESS? */
- phys_addr = (void *)virt_to_phys(
- virt_kernel_addr_stack);
- } else {
+ MCDRV_DBG(mcd,
+ "Request MCI, it is at (%x)\n", mci_base);
+
+ kaddr_buffer = (void *)mci_base;
+ paddr_buffer = (void *)virt_to_phys(kaddr_buffer);
+ allocate_buffer = false;
+ }
+ break;
+ /* Usual Wsm request, find free buffer slot. */
+ case MC_DRV_KMOD_MMAP_WSM:
+ /* search for a free slot in the buffer list. */
+ for (i = 0; i < MC_DRV_KMOD_CONTG_BUFFER_MAX; i++) {
+ contg_buffer = &(instance->contg_buffers[i]);
+ if (contg_buffer->handle == 0)
+ break;
+ }
+ if (i == MC_DRV_KMOD_CONTG_BUFFER_MAX) {
+ MCDRV_DBG_WARN(mcd,
+ "no free slot for wsm buffer avail\n");
+ ret = -EFAULT;
+ goto mc_mmap_end;
+ }
+ uq_handle_buffer =
+ contg_buffer->handle = get_mc_kmod_unique_id();
+ allocate_buffer = true;
+ break;
+ /* Special Wsm request that is not bound to a process. */
+ case MC_DRV_KMOD_MMAP_PERSISTENTWSM:
+ if (!is_caller_mc_daemon(instance)) {
+ ret = -EPERM;
+ goto mc_mmap_end;
+ }
+ allocate_buffer = true;
+ break;
+ default:
#if defined(DEBUG)
- phys_addr = (void *)request;
- virt_kernel_addr_stack = phys_to_virt(request);
-#endif
- }
- }
- /* Common code for all mmap calls:
- * map page to user
- * store data in page */
-
- MCDRV_DBG("allocated phys=0x%p - 0x%p, "
- "size=%ld, kernel_virt=0x%p, handle=%d\n",
- phys_addr,
- (void *)((unsigned int)phys_addr+allocated_size),
- allocated_size, virt_kernel_addr_stack, handle);
-
- vmarea->vm_flags |= VM_RESERVED;
- /* convert Kernel address to User Address. Kernel address begins
- at PAGE_OFFSET, user Address range is below PAGE_OFFSET.
- Remapping the area is always done, so multiple mappings
- of one region are possible. Now remap kernel address
- space into user space */
- ret = (int)remap_pfn_range(
- vmarea,
- (vmarea->vm_start),
- addr_to_pfn(phys_addr),
- requested_size,
- vmarea->vm_page_prot);
- if (ret != 0) {
- MCDRV_DBG_ERROR("remapPfnRange failed\n");
-
- /* free allocated pages when mmap fails, however, do not
- do it, when daemon tried to get an MCI that
- existed */
- if (!((request == MC_DRV_KMOD_MMAP_MCI) &&
- (mci_base != 0)))
- free_continguous_pages(virt_kernel_addr_stack,
- (1U << order));
- break;
- }
-
- /* Usual Wsm request, allocate contg_buffer.
- When requesting Mci, we do not associate the page with
- the process.
- Note: we also never free the Mci
- Also, we never free a persistent Tci */
- if (request == MC_DRV_KMOD_MMAP_WSM) {
- contg_buffer->phys_addr = phys_addr;
- contg_buffer->virt_kernel_addr = virt_kernel_addr_stack;
- contg_buffer->virt_user_addr =
- (void *)(vmarea->vm_start);
- contg_buffer->num_pages = (1U << order);
- }
-
- /* set response in allocated buffer */
- {
- struct mc_mmap_resp *mmap_resp =
- (struct mc_mmap_resp *)virt_kernel_addr_stack;
- /* TODO: do this for daemon only, otherwise set NULL */
- mmap_resp->phys_addr = (uint32_t)phys_addr;
- mmap_resp->handle = handle;
- if ((request == MC_DRV_KMOD_MMAP_MCI) &&
- (mci_base != 0)) {
- mmap_resp->is_reused = 1;
- } else
- mmap_resp->is_reused = 0;
- }
-
- /* store MCI pointer */
- if ((request == MC_DRV_KMOD_MMAP_MCI) && (mci_base == 0)) {
- mci_base = (uint32_t)virt_kernel_addr_stack;
- MCDRV_DBG("MCI base set to 0x%x\n", mci_base);
- }
- } while (FALSE);
-
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
-
- return (int)ret;
-}
-
-#ifdef CONFIG_SMP
-/*----------------------------------------------------------------------------*/
-/**
- * Force migration of current task to CPU0(where the monitor resides)
- *
- * @return Error code or 0 for success
- */
-static int goto_cpu0(
- void
-)
-{
- int ret = 0;
- struct cpumask mask = CPU_MASK_CPU0;
-
- MCDRV_DBG_VERBOSE("System has %d CPU's, we are on CPU #%d\n"
- "\tBinding this process to CPU #0.\n"
- "\tactive mask is %lx, setting it to mask=%lx\n",
- nr_cpu_ids,
- raw_smp_processor_id(),
- cpu_active_mask->bits[0],
- mask.bits[0]);
- ret = set_cpus_allowed_ptr(current, &mask);
- if (ret != 0)
- MCDRV_DBG_ERROR("set_cpus_allowed_ptr=%d.\n", ret);
- MCDRV_DBG_VERBOSE("And now we are on CPU #%d\n",
- raw_smp_processor_id());
-
- return ret;
-}
-
-/*----------------------------------------------------------------------------*/
-/**
- * Restore CPU mask for current to ALL Cpus(reverse of goto_cpu0)
- *
- * @return Error code or 0 for success
- */
-static int goto_all_cpu(
- void
-)
-{
- int ret = 0;
-
- struct cpumask mask = CPU_MASK_ALL;
-
- MCDRV_DBG_VERBOSE("System has %d CPU's, we are on CPU #%d\n"
- "\tBinding this process to CPU #0.\n"
- "\tactive mask is %lx, setting it to mask=%lx\n",
- nr_cpu_ids,
- raw_smp_processor_id(),
- cpu_active_mask->bits[0],
- mask.bits[0]);
- ret = set_cpus_allowed_ptr(current, &mask);
- if (ret != 0)
- MCDRV_DBG_ERROR("set_cpus_allowed_ptr=%d.\n", ret);
- MCDRV_DBG_VERBOSE("And now we are on CPU #%d\n",
- raw_smp_processor_id());
-
- return ret;
-}
-
+ /*
+ * In debug version, allow mapping of arbitry physical memory to
+ * a process to allow testing of TZASC/XPU memory protection set
+ * up by SWd.
+ */
+ paddr_buffer = (void *)request;
+ kaddr_buffer = phys_to_virt(request);
+ allocate_buffer = false;
#else
+ ret = -EPERM;
+ goto mc_mmap_end;
+#endif
+ break;
+ } /* switch(request) */
+
+ /* Allocate memory */
+ if (allocate_buffer) {
+ kaddr_buffer = (void *)__get_free_pages(GFP_USER | __GFP_COMP,
+ order);
+ if (kaddr_buffer == NULL) {
+ MCDRV_DBG_WARN(mcd,
+ "no contiguous region available.\n");
+ ret = -ENOMEM;
+ goto mc_mmap_end;
+ }
+ paddr_buffer = (void *)virt_to_phys(kaddr_buffer);
+ }
+
+ /*
+ * Common code for all mmap calls:
+ * map page to user
+ * store data in page
+ */
+
+ MCDRV_DBG(mcd,
+ "alloc phys=0x%p - 0x%p, sz=%ld, kernel_virt=0x%p, hndl=%d\n",
+ paddr_buffer,
+ (void *)((unsigned int)paddr_buffer+allocated_size),
+ allocated_size, kaddr_buffer, uq_handle_buffer);
+
+ vmarea->vm_flags |= VM_RESERVED;
+
+ /*
+ * Convert kernel address to user address. Kernel address begins
+ * at PAGE_OFFSET, user address range is below PAGE_OFFSET.
+ * Remapping the area is always done, so multiple mappings
+ * of one region are possible. Now remap kernel address
+ * space into user space
+ */
+ pfn = (unsigned int)paddr_buffer >> PAGE_SHIFT;
+ ret = (int)remap_pfn_range(vmarea, vmarea->vm_start, pfn,
+ requested_size, vmarea->vm_page_prot);
+ if (ret != 0) {
+ MCDRV_DBG_WARN(mcd, "remap_pfn_range failed\n");
+
+ if (allocate_buffer)
+ free_continguous_pages(kaddr_buffer, order);
+
+ goto mc_mmap_end;
+ }
+
+ /* Usual wsm request, store reference to buffer for later freeing. */
+ if (request == MC_DRV_KMOD_MMAP_WSM) {
+ contg_buffer->phys_addr = paddr_buffer;
+ contg_buffer->virt_kernel_addr = kaddr_buffer;
+ contg_buffer->virt_user_addr = (void *)(vmarea->vm_start);
+ contg_buffer->order = order;
+ }
+
+ /* set response in allocated buffer */
+ {
+ struct mc_mmap_resp *mmap_resp =
+ (struct mc_mmap_resp *)kaddr_buffer;
+ mmap_resp->phys_addr = (uint32_t)paddr_buffer;
+ mmap_resp->handle = uq_handle_buffer;
+ mmap_resp->is_reused = (request == MC_DRV_KMOD_MMAP_MCI) &&
+ (mci_base != 0);
+ }
+
+ /* store MCI pointer */
+ if ((request == MC_DRV_KMOD_MMAP_MCI) && (mci_base == 0)) {
+ mci_base = (uint32_t)kaddr_buffer;
+ MCDRV_DBG(mcd, "MCI base set to 0x%x\n", mci_base);
+ }
+
+mc_mmap_end:
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
+
+ return ret;
+}
+
+/**
+ * goto_cpu0() - Force migration of current task to CPU0
+ *
+ * Returns either an error code or 0 for success
+ */
static int goto_cpu0(void)
{
- return 0;
+ int ret = 0;
+ struct cpumask mask = CPU_MASK_CPU0;
+
+ MCDRV_DBG_VERBOSE(mcd, "System has %d CPU's, we are on CPU #%d\n",
+ nr_cpu_ids, raw_smp_processor_id());
+ MCDRV_DBG_VERBOSE(mcd, "\tBinding this process to CPU #0.\n");
+ MCDRV_DBG_VERBOSE(mcd, "\tactive mask is %lx, setting it to mask=%lx\n",
+ cpu_active_mask->bits[0],
+ mask.bits[0]);
+
+ ret = set_cpus_allowed_ptr(current, &mask);
+ if (ret != 0)
+ MCDRV_DBG_ERROR(mcd, "set_cpus_allowed_ptr=%d.\n", ret);
+
+ MCDRV_DBG_VERBOSE(mcd, "And now we are on CPU #%d\n",
+ raw_smp_processor_id());
+
+ return ret;
}
+/**
+ * goto_all_cpu() - Restore CPU mask for current to ALL Cpus
+ *
+ * Returns either an error code or 0 for success
+ */
static int goto_all_cpu(void)
{
- return 0;
-}
-#endif
+ int ret = 0;
+ struct cpumask mask = CPU_MASK_ALL;
-/*----------------------------------------------------------------------------*/
-/**
- * Initialize a new mobicore API instance object
- *
- * @return Instance or NULL if no allocation was possible.
- */
-struct mc_instance *mobicore_open(
- void
-) {
- struct mc_instance *instance;
- pid_t pid_vnr;
+ MCDRV_DBG_VERBOSE(mcd, "System has %d CPU's, we are on CPU #%d\n",
+ nr_cpu_ids, raw_smp_processor_id());
+ MCDRV_DBG_VERBOSE(mcd, "\tBinding this process to CPU #0.\n");
+ MCDRV_DBG_VERBOSE(mcd, "\tactive mask is %lx, setting it to mask=%lx\n",
+ cpu_active_mask->bits[0], mask.bits[0]);
+
+ ret = set_cpus_allowed_ptr(current, &mask);
+ if (ret != 0)
+ MCDRV_DBG_ERROR(mcd, "set_cpus_allowed_ptr=%d.\n", ret);
+
+ MCDRV_DBG_VERBOSE(mcd, "And now we are on CPU #%d\n",
+ raw_smp_processor_id());
+
+ return ret;
+}
+
+struct mc_instance *mobicore_open(void)
+{
+ struct mc_instance *instance;
+ pid_t pid_vnr;
instance = kzalloc(sizeof(*instance), GFP_KERNEL);
if (instance == NULL)
@@ -2480,9 +2057,11 @@
/* get a unique ID for this instance (PIDs are not unique) */
instance->handle = get_mc_kmod_unique_id();
- /* get the PID of the calling process. We avoid using
+ /*
+ * get the PID of the calling process. We avoid using
* current->pid directly, as 2.6.24 introduced PID
- * namespaces. See also http://lwn.net/Articles/259217 */
+ * namespaces. See also http://lwn.net/Articles/259217
+ */
pid_vnr = task_pid_vnr(current);
instance->pid_vnr = pid_vnr;
@@ -2490,59 +2069,62 @@
}
EXPORT_SYMBOL(mobicore_open);
-/*----------------------------------------------------------------------------*/
/**
- * This function will be called from user space as fd = open(...).
+ * mc_open() - Called from user space as fd = open(...)
+ * @inode: file inode
+ * @file: file pointer
+ *
* A set of internal instance data are created and initialized.
*
- * @param inode
- * @param file
- * @return 0 if OK or -ENOMEM if no allocation was possible.
+ * This function returns either 0 or -ENOMEM in case of error.
*/
-static int mc_kernel_module_open(
- struct inode *inode,
- struct file *file
-)
+static int mc_open(struct inode *inode, struct file *file)
{
- struct mc_instance *instance;
- int ret = 0;
+ struct mc_instance *instance;
+ int ret = 0;
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
instance = mobicore_open();
if (instance == NULL)
return -ENOMEM;
- /* check if Daemon. We simply assume that the first to open us
- with root privileges must be the daemon. */
- if ((is_userland_caller_privileged())
- && (mc_drv_kmod_ctx.daemon_inst == NULL)) {
- MCDRV_DBG("accept this as MobiCore Daemon\n");
+ /*
+ * check if Daemon. We simply assume that the first to open us
+ * with root privileges must be the daemon.
+ */
+ if ((is_userland_caller_privileged()) &&
+ (mc_drv_kmod_ctx.daemon_inst == NULL)) {
+ MCDRV_DBG(mcd, "accept this as MobiCore Daemon\n");
- /* Set the caller's CPU mask to CPU0*/
+ /* Set the caller's CPU mask to CPU0 */
ret = goto_cpu0();
if (ret != 0) {
mobicore_release(instance);
file->private_data = NULL;
- MCDRV_DBG("changing core failed!\n");
+ MCDRV_DBG(mcd, "changing core failed!\n");
break;
}
mc_drv_kmod_ctx.daemon_inst = instance;
sema_init(&mc_drv_kmod_ctx.daemon_ctx.sem,
- DAEMON_SEM_VAL);
+ DAEMON_SEM_VAL);
/* init ssiq event counter */
mc_drv_kmod_ctx.daemon_ctx.ssiq_counter =
atomic_read(
&(mc_drv_kmod_ctx.ssiq_ctx.counter));
#ifdef MC_MEM_TRACES
- /* The traces have to be setup on CPU-0 since we must
- * do a fastcall to MobiCore. */
+ /*
+ * The traces have to be setup on CPU-0 since we must
+ * do a fastcall to MobiCore.
+ */
if (!mci_base)
- /* Do the work only if MCI base is not
- * initialized properly */
+ /*
+ * Do the work only if MCI base is not
+ * initialized properly
+ */
work_on_cpu(0, mobicore_log_setup, NULL);
#endif
}
@@ -2550,25 +2132,15 @@
/* store instance data reference */
file->private_data = instance;
- /* TODO axh: link all instances to allow clean up? */
+ } while (0);
- } while (FALSE);
-
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
return (int)ret;
}
-/*----------------------------------------------------------------------------*/
-/**
- * Release a mobicore instance object and all objects related to it
- * @param instance instance
- * @return 0 if Ok or -E ERROR
- */
-int mobicore_release(
- struct mc_instance *instance
-)
+int mobicore_release(struct mc_instance *instance)
{
int ret = 0;
int i;
@@ -2578,29 +2150,32 @@
/* try to get the semaphore */
ret = down_interruptible(&(mc_drv_kmod_ctx.wsm_l2_sem));
if (ret != 0) {
- MCDRV_DBG_ERROR(
- "down_interruptible() failed with %d\n", ret);
- /* TODO: can be block here? */
+ MCDRV_DBG_ERROR(mcd,
+ "down_interruptible() failed %d\n",
+ ret);
+
ret = -ERESTARTSYS;
} else {
/* Check if some WSM is still in use. */
list_for_each_entry_safe(
- used_l2table,
- used_l2table_temp,
- &(mc_drv_kmod_ctx.mc_used_l2_tables),
- list
+ used_l2table, used_l2table_temp,
+ &(mc_drv_kmod_ctx.mc_used_l2_tables),
+ list
) {
if (used_l2table->owner == instance) {
MCDRV_DBG_WARN(
+ mcd,
"trying to release WSM L2: "
"physBase=%p ,nr_of_pages=%d\n",
get_l2_table_phys(used_l2table),
used_l2table->nr_of_pages);
- /* unlock app usage and free if MobiCore
- does not use it */
+ /*
+ * unlock app usage and free if MobiCore
+ * does not use it
+ */
delete_used_l2_table(used_l2table,
- FREE_FROM_NWD);
+ FREE_FROM_NWD);
}
} /* end while */
@@ -2608,7 +2183,6 @@
up(&(mc_drv_kmod_ctx.wsm_l2_sem));
}
-
/* release all mapped data */
for (i = 0; i < MC_DRV_KMOD_CONTG_BUFFER_MAX; i++) {
struct mc_contg_buffer *contg_buffer =
@@ -2617,89 +2191,79 @@
if (contg_buffer->virt_user_addr != 0) {
free_continguous_pages(
contg_buffer->virt_kernel_addr,
- contg_buffer->num_pages);
+ contg_buffer->order);
}
}
/* release instance context */
kfree(instance);
- } while (FALSE);
+ } while (0);
return ret;
}
EXPORT_SYMBOL(mobicore_release);
-/*----------------------------------------------------------------------------*/
/**
- * This function will be called from user space as close(...).
+ * mc_release() - Called from user space as close(...)
+ * @inode: file inode
+ * @file: file pointer
+ *
* The instance data are freed and the associated memory pages are unreserved.
*
- * @param inode
- * @param file
- *
- * @return 0
+ * Returns either an error code or 0 on success
*/
-static int mc_kernel_module_release(
- struct inode *inode,
- struct file *file
-)
+static int mc_release(struct inode *inode, struct file *file)
{
- int ret = 0;
- struct mc_instance *instance = get_instance(file);
+ int ret = 0;
+ struct mc_instance *instance = get_instance(file);
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
do {
/* check if daemon closes us. */
if (is_caller_mc_daemon(instance)) {
- /* TODO: cleanup?
- * mc_drv_kmod_ctx.mc_used_l2_tables remains */
- MCDRV_DBG_WARN("WARNING: MobiCore Daemon died\n");
+ MCDRV_DBG_WARN(mcd, "WARNING: MobiCore Daemon died\n");
mc_drv_kmod_ctx.daemon_inst = NULL;
}
ret = mobicore_release(instance);
- } while (FALSE);
+ } while (0);
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
- return (int)ret;
+ return ret;
}
-
-/*----------------------------------------------------------------------------*/
/**
- * This function represents the interrupt function of the mcDrvModule.
- * It signals by incrementing of an event counter and the start of the read
- * waiting queue, the read function a interrupt has occurred.
+ * mc_intr_ssiq() - The interrupt function of the mcDrvModule
+ * @intr: Interrupt number
+ * @context: pointer to registered device data
*
- * @param intr
- * @param *context pointer to registered device data
+ * This function signals an interrupt by incrementing of an event counter
+ * and the start of the read waiting queue
*
- * @return IRQ_HANDLED
+ * Returns either IRQ_HANDLED or IRQ_NONE
*/
-static irqreturn_t mc_kernel_module_intr_ssiq(
- int intr,
- void *context
-)
+static irqreturn_t mc_intr_ssiq(int intr, void *context)
{
- irqreturn_t ret = IRQ_NONE;
+ irqreturn_t ret = IRQ_NONE;
/* we know the context. */
MCDRV_ASSERT(&mc_drv_kmod_ctx == context);
do {
if (intr != MC_INTR_SSIQ) {
- /* this should not happen, as we did no register for any
- other interrupt. For debugging, we print a
- message, but continue */
- MCDRV_DBG_WARN(
- "unknown interrupt %d, expecting only %d\n",
- intr, MC_INTR_SSIQ);
+ /*
+ * this should not happen, as we did no register for any
+ * other interrupt. For debugging, we print a message,
+ * but continue
+ */
+ MCDRV_DBG_WARN(mcd,
+ "unknown int %d, expecting only %d\n",
+ intr, MC_INTR_SSIQ);
}
- MCDRV_DBG_VERBOSE("received interrupt %d\n",
- intr);
+ MCDRV_DBG_VERBOSE(mcd, "received interrupt %d\n", intr);
/* increment interrupt event counter */
atomic_inc(&(mc_drv_kmod_ctx.ssiq_ctx.counter));
@@ -2707,89 +2271,77 @@
/* signal the daemon */
up(&mc_drv_kmod_ctx.daemon_ctx.sem);
-
ret = IRQ_HANDLED;
- } while (FALSE);
+ } while (0);
return ret;
}
-/*----------------------------------------------------------------------------*/
-/** function table structure of this device driver. */
-static const struct file_operations mc_kernel_module_file_operations = {
- .owner = THIS_MODULE, /**< driver owner */
- .open = mc_kernel_module_open, /**< driver open function */
- .release = mc_kernel_module_release, /**< driver release function*/
- .unlocked_ioctl = mc_kernel_module_ioctl, /**< driver ioctl function */
- .mmap = mc_kernel_module_mmap, /**< driver mmap function */
- .read = mc_kernel_module_read, /**< driver read function */
+/* function table structure of this device driver. */
+static const struct file_operations mc_file_operations = {
+ .owner = THIS_MODULE, /*< driver owner */
+ .open = mc_open, /*< driver open function */
+ .release = mc_release, /*< driver rel function*/
+ .unlocked_ioctl = mc_ioctl, /*< driver ioctl function */
+ .mmap = mc_mmap, /*< driver mmap function */
+ .read = mc_read, /*< driver read function */
};
-/*----------------------------------------------------------------------------*/
-/** registration structure as miscdevice. */
-static struct miscdevice mc_kernel_module_device = {
- .name = MC_DRV_MOD_DEVNODE, /**< device name */
- .minor = MISC_DYNAMIC_MINOR, /**< device minor number */
- /** device interface function structure */
- .fops = &mc_kernel_module_file_operations,
+/* registration structure as miscdevice. */
+static struct miscdevice mc_device = {
+ .name = MC_DRV_MOD_DEVNODE, /*< device name */
+ .minor = MISC_DYNAMIC_MINOR, /*< device minor number */
+ /* device interface function structure */
+ .fops = &mc_file_operations,
};
-
-/*----------------------------------------------------------------------------*/
-/**
- * This function is called the kernel during startup or by a insmod command.
- * This device is installed and registered as miscdevice, then interrupt and
- * queue handling is set up
- *
- * @return 0 for no error or -EIO if registration fails
- */
-static int __init mc_kernel_module_init(
- void
-)
+static int __init mc_init(void)
{
int ret = 0;
- MCDRV_DBG("enter (Build " __TIMESTAMP__ ")\n");
- MCDRV_DBG("mcDrvModuleApi version is %i.%i\n",
- MCDRVMODULEAPI_VERSION_MAJOR,
- MCDRVMODULEAPI_VERSION_MINOR);
+ dev_set_name(mcd, "mcd");
+
+ MCDRV_DBG(mcd, "enter (Build " __TIMESTAMP__ ")\n");
+ MCDRV_DBG(mcd, "mcDrvModuleApi version is %i.%i\n",
+ MCDRVMODULEAPI_VERSION_MAJOR,
+ MCDRVMODULEAPI_VERSION_MINOR);
#ifdef MOBICORE_COMPONENT_BUILD_TAG
- MCDRV_DBG("%s\n", MOBICORE_COMPONENT_BUILD_TAG);
+ MCDRV_DBG(mcd, "%s\n", MOBICORE_COMPONENT_BUILD_TAG);
#endif
do {
- /* Hardware does not support ARM TrustZone
- -> Cannot continue! */
- if (!has_security_extensions()) {
- MCDRV_DBG_ERROR(
- "Hardware does't support ARM TrustZone!\n");
+ /*
+ * Hardware does not support ARM TrustZone
+ * -> Cannot continue!
+ */
+ if (has_security_extensions() == false) {
+ MCDRV_DBG_ERROR(mcd,
+ "HW does't support ARM TrustZone!\n");
ret = -ENODEV;
break;
}
/* Running in secure mode -> Cannot load the driver! */
- if (is_secure_mode()) {
- MCDRV_DBG_ERROR("Running in secure MODE!\n");
+ if (is_secure_mode() == true) {
+ MCDRV_DBG_ERROR(mcd, "Running in secure MODE!\n");
ret = -ENODEV;
break;
}
sema_init(&mc_drv_kmod_ctx.daemon_ctx.sem, DAEMON_SEM_VAL);
+
/* set up S-SIQ interrupt handler */
- ret = request_irq(
- MC_INTR_SSIQ,
- mc_kernel_module_intr_ssiq,
- IRQF_TRIGGER_RISING,
- MC_DRV_MOD_DEVNODE,
+ ret = request_irq(MC_INTR_SSIQ, mc_intr_ssiq,
+ IRQF_TRIGGER_RISING, MC_DRV_MOD_DEVNODE,
&mc_drv_kmod_ctx);
if (ret != 0) {
- MCDRV_DBG_ERROR("interrupt request failed\n");
+ MCDRV_DBG_ERROR(mcd, "interrupt request failed\n");
break;
}
- ret = misc_register(&mc_kernel_module_device);
+ ret = misc_register(&mc_device);
if (ret != 0) {
- MCDRV_DBG_ERROR("device register failed\n");
+ MCDRV_DBG_ERROR(mcd, "device register failed\n");
break;
}
@@ -2804,66 +2356,52 @@
sema_init(&(mc_drv_kmod_ctx.wsm_l2_sem), 1);
- /* initialize unique number counter which we can use for
- handles. It is limited to 2^32, but this should be
- enough to be roll-over safe for us. We start with 1
- instead of 0. */
+ /*
+ * initialize unique number counter which we can use for
+ * handles. It is limited to 2^32, but this should be
+ * enough to be roll-over safe for us. We start with 1
+ * instead of 0.
+ */
atomic_set(&(mc_drv_kmod_ctx.unique_counter), 1);
mci_base = 0;
- MCDRV_DBG("initialized\n");
+ MCDRV_DBG(mcd, "initialized\n");
ret = 0;
- } while (FALSE);
+ } while (0);
- MCDRV_DBG_VERBOSE("exit with %d/0x%08X\n", ret, ret);
+ MCDRV_DBG_VERBOSE(mcd, "exit with %d/0x%08X\n", ret, ret);
- return (int)ret;
+ return ret;
}
-
-
-/*----------------------------------------------------------------------------*/
-/**
- * This function removes this device driver from the Linux device manager .
- */
-static void __exit mc_kernel_module_exit(
- void
-)
+static void __exit mc_exit(void)
{
struct mc_used_l2_table *used_l2table;
- MCDRV_DBG_VERBOSE("enter\n");
+ MCDRV_DBG_VERBOSE(mcd, "enter\n");
mobicore_log_free();
/* Check if some WSM is still in use. */
- list_for_each_entry(
- used_l2table,
- &(mc_drv_kmod_ctx.mc_used_l2_tables),
- list
- ) {
- MCDRV_DBG_WARN(
- "WSM L2 still in use: physBase=%p ,nr_of_pages=%d\n",
- get_l2_table_phys(used_l2table),
- used_l2table->nr_of_pages);
- } /* end while */
+ list_for_each_entry(used_l2table, &(mc_drv_kmod_ctx.mc_used_l2_tables),
+ list) {
+ MCDRV_DBG_WARN(mcd,
+ "WSM L2 in use: physBase=%p ,nr_of_pages=%d\n",
+ get_l2_table_phys(used_l2table),
+ used_l2table->nr_of_pages);
+ } /* end list_for_each_entry */
free_irq(MC_INTR_SSIQ, &mc_drv_kmod_ctx);
- misc_deregister(&mc_kernel_module_device);
- MCDRV_DBG_VERBOSE("exit");
+ misc_deregister(&mc_device);
+ MCDRV_DBG_VERBOSE(mcd, "exit");
}
-
-/*----------------------------------------------------------------------------*/
/* Linux Driver Module Macros */
-module_init(mc_kernel_module_init);
-module_exit(mc_kernel_module_exit);
+module_init(mc_init);
+module_exit(mc_exit);
MODULE_AUTHOR("Giesecke & Devrient GmbH");
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("MobiCore driver");
-
-/** @} */
-
diff --git a/drivers/gud/mobicore_driver/mc_drv_module.h b/drivers/gud/mobicore_driver/mc_drv_module.h
index 8b402d6..c540c94 100644
--- a/drivers/gud/mobicore_driver/mc_drv_module.h
+++ b/drivers/gud/mobicore_driver/mc_drv_module.h
@@ -1,107 +1,110 @@
-/**
- * Header file of MobiCore Driver Kernel Module.
+/*
+ * MobiCore Driver Kernel Module.
*
- * @addtogroup MCD_MCDIMPL_KMOD_IMPL
- * @{
* Internal structures of the McDrvModule
- * @file
*
- * Header file the MobiCore Driver Kernel Module,
- * its internal structures and defines.
- *
- * <!-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#ifndef _MC_DRV_KMOD_H_
-#define _MC_DRV_KMOD_H_
+#ifndef _MC_DRV_MODULE_H
+#define _MC_DRV_MODULE_H
-#include "mc_drv_module_linux_api.h"
+#include <asm/pgtable.h>
+#include <linux/semaphore.h>
+
#include "public/mc_drv_module_api.h"
-/** Platform specific settings */
+
+/* Platform specific settings */
#include "platform.h"
-/** ARM Specific masks and modes */
-#define ARM_CPSR_MASK 0x1F
-#define ARM_MONITOR_MODE 0b10110
-#define ARM_SECURITY_EXTENSION_MASK 0x30
-
-/**
- * Number of page table entries in one L2 table. This is ARM specific, an
- * L2 table covers 1 MiB by using 256 entry referring to 4KiB pages each.
+/*
+ * ARM Trustzone specific masks and modes
+ * Vanilla Linux is unaware of TrustZone extension.
+ * I.e. arch/arm/include/asm/ptrace.h does not define monitor mode.
+ * Also TZ bits in cpuid is not defined, ARM port uses magic numbers,
+ * see arch/arm/kernel/setup.c
*/
-#define MC_ARM_L2_TABLE_ENTRIES 256
+#define ARM_MONITOR_MODE (0b10110)
+#define ARM_SECURITY_EXTENSION_MASK 0x30
-/** Maximum number of contiguous buffer allocations for one driver instance. */
-#define MC_DRV_KMOD_CONTG_BUFFER_MAX 16
-
-/** Number of pages for L2 tables. There are 4 table in each page. */
-#define MC_DRV_KMOD_L2_TABLE_PER_PAGES 4
-
-/** ARM level 2 (L2) table with 256 entries. Size: 1k */
-struct l2table {
- pte_t table_entries[MC_ARM_L2_TABLE_ENTRIES];
-};
-
-#define INVALID_ADDRESS ((void *)(-1))
-
-/** ARM L2 PTE bits */
-#define L2_FLAG_SMALL_XN (1U << 0)
-#define L2_FLAG_SMALL (1U << 1)
-#define L2_FLAG_B (1U << 2)
-#define L2_FLAG_C (1U << 3)
-#define L2_FLAG_AP0 (1U << 4)
-#define L2_FLAG_AP1 (1U << 5)
-#define L2_FLAG_SMALL_TEX0 (1U << 6)
-#define L2_FLAG_SMALL_TEX1 (1U << 7)
-#define L2_FLAG_SMALL_TEX2 (1U << 8)
-#define L2_FLAG_APX (1U << 9)
-#define L2_FLAG_S (1U << 10)
-#define L2_FLAG_NG (1U << 11)
-
-/**
+/*
* Contiguous buffer allocated to TLCs.
* These buffers are uses as world shared memory (wsm) and shared with
* secure world.
* The virtual kernel address is added for a simpler search algorithm.
*/
struct mc_contg_buffer {
- unsigned int handle; /* unique handle */
- void *virt_user_addr; /**< virtual User start address */
- void *virt_kernel_addr; /**< virtual Kernel start address */
- void *phys_addr; /**< physical start address */
- unsigned int num_pages; /**< number of pages */
+ unsigned int handle; /* unique handle */
+ void *virt_user_addr; /* virtual User start address */
+
+ /* virtual kernel start address */
+ void *virt_kernel_addr;
+
+ void *phys_addr; /* physical start address */
+ unsigned int order; /* order of number of pages */
};
-/** Instance data for MobiCore Daemon and TLCs. */
+/*
+ * Maximum number of contiguous buffer allocations that one process can get via
+ * mmap
+ */
+#define MC_DRV_KMOD_CONTG_BUFFER_MAX 16
+
+/* Instance data for MobiCore Daemon and TLCs. */
struct mc_instance {
- /** unique handle */
+ /* unique handle */
unsigned int handle;
- /** process that opened this instance */
+ /* process that opened this instance */
pid_t pid_vnr;
- /** buffer list for mmap generated address space and
- its virtual client address */
+
+ /*
+ * buffer list for mmap generated address space and its virtual client
+ * address
+ */
struct mc_contg_buffer contg_buffers[MC_DRV_KMOD_CONTG_BUFFER_MAX];
};
-/** Store for four L2 tables in one 4kb page*/
+/*
+ * MobiCore specific page tables for world shared memory.
+ * Linux uses shadow page tables, see arch/arm/include/asm/pgtable-2level.
+ * MobiCore uses the default ARM format.
+ *
+ * Number of page table entries in one L2 table. This is ARM specific, an
+ * L2 table covers 1 MiB by using 256 entry referring to 4KiB pages each.
+ */
+#define MC_ARM_L2_TABLE_ENTRIES 256
+
+/* ARM level 2 (L2) table with 256 entries. Size: 1k */
+struct l2table {
+ pte_t table_entries[MC_ARM_L2_TABLE_ENTRIES];
+};
+
+/* Number of pages for L2 tables. There are 4 table in each page. */
+#define MC_DRV_KMOD_L2_TABLE_PER_PAGES 4
+
+/* Store for four L2 tables in one 4kb page*/
struct mc_l2_table_store {
struct l2table table[MC_DRV_KMOD_L2_TABLE_PER_PAGES];
};
-/** Usage and maintenance information about mc_l2_table_store */
+/* Usage and maintenance information about mc_l2_table_store */
struct mc_l2_tables_set {
struct list_head list;
- unsigned int usage_bitmap; /**< usage bitmap */
- struct mc_l2_table_store *kernel_virt; /**< kernel virtual address */
- struct mc_l2_table_store *phys; /**< physical address */
- struct page *page; /**< pointer to page struct */
+ unsigned int usage_bitmap; /* usage bitmap */
+
+ /* kernel virtual address */
+ struct mc_l2_table_store *kernel_virt;
+ struct mc_l2_table_store *phys; /* physical address */
+
+ /* pointer to page struct */
+ struct page *page;
};
-/**
+/*
* L2 table allocated to the Daemon or a TLC describing a world shared buffer.
* When users map a malloc()ed area into SWd, a L2 table is allocated.
* In addition, the area of maximum 1MB virtual address space is mapped into
@@ -110,116 +113,116 @@
struct mc_used_l2_table {
struct list_head list;
- /** handle as communicated to user mode */
+ /* handle as communicated to user mode */
unsigned int handle;
unsigned int flags;
- /** owner of this L2 table */
+ /* owner of this L2 table */
struct mc_instance *owner;
- /** set describing where our L2 table is stored */
+ /* set describing where our L2 table is stored */
struct mc_l2_tables_set *set;
- /** index into L2 table set */
+ /* index into L2 table set */
unsigned int idx;
- /** size of buffer */
+ /* size of buffer */
unsigned int nr_of_pages;
};
#define MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_APP (1U << 0)
#define MC_WSM_L2_CONTAINER_WSM_LOCKED_BY_MC (1U << 1)
-
-/** MobiCore S-SIQ interrupt context data. */
+/* MobiCore S-SIQ interrupt context data. */
struct mc_ssiq_ctx {
- /** S-SIQ interrupt counter */
+ /* S-SIQ interrupt counter */
atomic_t counter;
};
-/** MobiCore Daemon context data. */
+/* MobiCore Daemon context data. */
struct mc_daemon_ctx {
- /** event semaphore */
+ /* event semaphore */
struct semaphore sem;
struct fasync_struct *async_queue;
- /** event counter */
+ /* event counter */
unsigned int ssiq_counter;
};
-/** MobiCore Driver Kernel Module context data. */
+/* MobiCore Driver Kernel Module context data. */
struct mc_drv_kmod_ctx {
- /** ever incrementing counter */
+ /* ever incrementing counter */
atomic_t unique_counter;
- /** S-SIQ interrupt context */
+ /* S-SIQ interrupt context */
struct mc_ssiq_ctx ssiq_ctx;
- /** MobiCore Daemon context */
+ /* MobiCore Daemon context */
struct mc_daemon_ctx daemon_ctx;
- /** pointer to instance of daemon */
+ /* pointer to instance of daemon */
struct mc_instance *daemon_inst;
- /** Backing store for L2 tables */
+ /* Backing store for L2 tables */
struct list_head mc_l2_tables_sets;
- /** Bookkeeping for used L2 tables */
+ /* Bookkeeping for used L2 tables */
struct list_head mc_used_l2_tables;
- /** semaphore to synchronize access to above lists */
+ /* semaphore to synchronize access to above lists */
struct semaphore wsm_l2_sem;
};
-/** MobiCore internal trace buffer structure. */
+/* MobiCore internal trace buffer structure. */
struct mc_trace_buf {
- uint32_t version; /**< version of trace buffer */
- uint32_t length; /**< length of allocated buffer(includes header) */
- uint32_t write_pos; /**< last write position */
- char buff[1]; /**< start of the log buffer */
+ uint32_t version; /* version of trace buffer */
+ uint32_t length; /* len of allocated buffer(includes header) */
+ uint32_t write_pos; /* last write position */
+ char buff[1]; /* start of the log buffer */
};
-/*** MobiCore internal trace log setup. */
+/* MobiCore internal trace log setup. */
void mobicore_log_read(void);
long mobicore_log_setup(void *);
void mobicore_log_free(void);
-#define MCDRV_DBG_ERROR(txt, ...) \
- printk(KERN_ERR "mcDrvKMod [%d] %s() ### ERROR: " txt, \
+/* Found in main.c */
+extern struct device *mcd;
+
+#define MCDRV_DBG_ERROR(dev, txt, ...) \
+ dev_err(dev, "[%d] %s() ### ERROR: " txt, \
task_pid_vnr(current), \
__func__, \
##__VA_ARGS__)
/* dummy function helper macro. */
-#define DUMMY_FUNCTION() do {} while (0)
+#define DUMMY_FUNCTION() do {} while (0)
#if defined(DEBUG)
-
-/* #define DEBUG_VERBOSE */
#if defined(DEBUG_VERBOSE)
-#define MCDRV_DBG_VERBOSE MCDRV_DBG
+#define MCDRV_DBG_VERBOSE MCDRV_DBG
#else
-#define MCDRV_DBG_VERBOSE(...) DUMMY_FUNCTION()
+#define MCDRV_DBG_VERBOSE(...) DUMMY_FUNCTION()
#endif
-#define MCDRV_DBG(txt, ...) \
- printk(KERN_INFO "mcDrvKMod [%d on CPU%d] %s(): " txt, \
- task_pid_vnr(current), \
- raw_smp_processor_id(), \
- __func__, \
- ##__VA_ARGS__)
+#define MCDRV_DBG(dev, txt, ...) \
+ dev_info(dev, "[%d on CPU%d] %s(): " txt, \
+ task_pid_vnr(current), \
+ raw_smp_processor_id(), \
+ __func__, \
+ ##__VA_ARGS__)
-#define MCDRV_DBG_WARN(txt, ...) \
- printk(KERN_WARNING "mcDrvKMod [%d] %s() WARNING: " txt, \
- task_pid_vnr(current), \
- __func__, \
- ##__VA_ARGS__)
+#define MCDRV_DBG_WARN(dev, txt, ...) \
+ dev_warn(dev, "[%d] %s() WARNING: " txt, \
+ task_pid_vnr(current), \
+ __func__, \
+ ##__VA_ARGS__)
#define MCDRV_ASSERT(cond) \
do { \
if (unlikely(!(cond))) { \
- panic("mcDrvKMod Assertion failed: %s:%d\n", \
- __FILE__, __LINE__); \
+ panic("Assertion failed: %s:%d\n", \
+ __FILE__, __LINE__); \
} \
} while (0)
@@ -233,6 +236,4 @@
#endif /* [not] defined(DEBUG) */
-
-#endif /* _MC_DRV_KMOD_H_ */
-/** @} */
+#endif /* _MC_DRV_MODULE_H */
diff --git a/drivers/gud/mobicore_driver/mc_drv_module_android.h b/drivers/gud/mobicore_driver/mc_drv_module_android.h
index 319509f..d6f2161 100644
--- a/drivers/gud/mobicore_driver/mc_drv_module_android.h
+++ b/drivers/gud/mobicore_driver/mc_drv_module_android.h
@@ -1,14 +1,9 @@
-/**
+/*
* Header file of MobiCore Driver Kernel Module.
*
- * @addtogroup MobiCore_Driver_Kernel_Module
- * @{
- * Android specific defines
- * @file
- *
* Android specific defines
*
- * <!-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -18,11 +13,14 @@
#ifndef _MC_DRV_MODULE_ANDROID_H_
#define _MC_DRV_MODULE_ANDROID_H_
-/* Defines needed to identify the Daemon in Android systems
+#ifdef CONFIG_ANDROID
+/*
+ * Defines needed to identify the Daemon in Android systems
* For the full list see:
* platform_system_core/include/private/android_filesystem_config.h in the
* Android source tree
*/
+
/* traditional unix root user */
#define AID_ROOT 0
/* system server */
@@ -33,5 +31,7 @@
/* first app user */
#define AID_APP 10000
+#endif /* CONFIG_ANDROID */
+
#endif /* _MC_DRV_MODULE_ANDROID_H_ */
-/** @} */
+
diff --git a/drivers/gud/mobicore_driver/mc_drv_module_fastcalls.h b/drivers/gud/mobicore_driver/mc_drv_module_fastcalls.h
index d058043..0d4f92c 100644
--- a/drivers/gud/mobicore_driver/mc_drv_module_fastcalls.h
+++ b/drivers/gud/mobicore_driver/mc_drv_module_fastcalls.h
@@ -1,60 +1,51 @@
-/**
+/*
* Header file of MobiCore Driver Kernel Module.
*
- * @addtogroup MobiCore_Driver_Kernel_Module
- * @{
- * Internal structures of the McDrvModule
- * @file
- *
* MobiCore Fast Call interface
*
- * <!-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#ifndef _MC_DRV_MODULE_FC_H_
-#define _MC_DRV_MODULE_FC_H_
+#ifndef _MC_DRV_MODULE_FASTCALLS_H_
+#define _MC_DRV_MODULE_FASTCALLS_H_
#include "mc_drv_module.h"
-/**
+/*
* MobiCore SMCs
*/
enum mc_smc_codes {
- MC_SMC_N_YIELD = 0x3, /**< Yield to switch from NWd to SWd. */
- MC_SMC_N_SIQ = 0x4 /**< SIQ to switch from NWd to SWd. */
+ MC_SMC_N_YIELD = 0x3, /* Yield to switch from NWd to SWd. */
+ MC_SMC_N_SIQ = 0x4 /* SIQ to switch from NWd to SWd. */
};
-/**
+/*
* MobiCore fast calls. See MCI documentation
*/
enum mc_fast_call_codes {
- MC_FC_INIT = -1,
- MC_FC_INFO = -2,
- MC_FC_POWER = -3,
- MC_FC_DUMP = -4,
- MC_FC_NWD_TRACE = -31 /**< Mem trace setup fastcall */
+ MC_FC_INIT = -1,
+ MC_FC_INFO = -2,
+ MC_FC_POWER = -3,
+ MC_FC_DUMP = -4,
+ MC_FC_NWD_TRACE = -31 /* Mem trace setup fastcall */
};
-/**
+/*
* return code for fast calls
*/
enum mc_fast_calls_result {
- MC_FC_RET_OK = 0,
- MC_FC_RET_ERR_INVALID = 1,
- MC_FC_RET_ERR_ALREADY_INITIALIZED = 5
+ MC_FC_RET_OK = 0,
+ MC_FC_RET_ERR_INVALID = 1,
+ MC_FC_RET_ERR_ALREADY_INITIALIZED = 5
};
+/* structure wrappers for specific fastcalls */
-
-/*------------------------------------------------------------------------------
- structure wrappers for specific fastcalls
-------------------------------------------------------------------------------*/
-
-/** generic fast call parameters */
+/* generic fast call parameters */
union fc_generic {
struct {
uint32_t cmd;
@@ -67,8 +58,7 @@
} as_out;
};
-
-/** fast call init */
+/* fast call init */
union mc_fc_init {
union fc_generic as_generic;
struct {
@@ -84,8 +74,7 @@
} as_out;
};
-
-/** fast call info parameters */
+/* fast call info parameters */
union mc_fc_info {
union fc_generic as_generic;
struct {
@@ -101,8 +90,7 @@
} as_out;
};
-
-/** fast call S-Yield parameters */
+/* fast call S-Yield parameters */
union mc_fc_s_yield {
union fc_generic as_generic;
struct {
@@ -116,8 +104,7 @@
} as_out;
};
-
-/** fast call N-SIQ parameters */
+/* fast call N-SIQ parameters */
union mc_fc_nsiq {
union fc_generic as_generic;
struct {
@@ -131,30 +118,27 @@
} as_out;
};
-
-/*----------------------------------------------------------------------------*/
/**
- * fast call to MobiCore
+ * mc_fastcall() - fast call to MobiCore
*
- * @param fc_generic pointer to fast call data
+ * @fc_generic: pointer to fast call data
*/
-static inline void mc_fastcall(
- union fc_generic *fc_generic
-)
+static inline void mc_fastcall(union fc_generic *fc_generic)
{
MCDRV_ASSERT(fc_generic != NULL);
- /* We only expect to make smc calls on CPU0 otherwise something wrong
- * will happen */
+
+ /*
+ * We only expect to make smc calls on CPU0 otherwise something wrong
+ * will happen
+ */
MCDRV_ASSERT(raw_smp_processor_id() == 0);
+
+ /* Required by an old version of MobiCore, subject to be removed. */
mb();
#ifdef MC_SMC_FASTCALL
{
int ret = 0;
- MCDRV_DBG("Going into SCM()");
ret = smc_fastcall((void *)fc_generic, sizeof(*fc_generic));
- MCDRV_DBG("Coming from SCM, scm_call=%i, resp=%d/0x%x\n",
- ret,
- fc_generic->as_out.resp, fc_generic->as_out.resp);
}
#else
{
@@ -165,14 +149,18 @@
register u32 reg3 __asm__("r3") = fc_generic->as_in.param[2];
/* one of the famous preprocessor hacks to stingitize things.*/
-#define __STR2(x) #x
+#define __STR2(x) (#x)
#define __STR(x) __STR2(x)
- /* compiler does not support certain instructions
- "SMC": secure monitor call.*/
+ /*
+ * Compiler does not support certain instructions
+ * "SMC": secure monitor call
+ */
#define ASM_ARM_SMC 0xE1600070
- /* "BPKT": debugging breakpoint. We keep this, as is comes
- quite handy for debugging. */
+ /*
+ * "BPKT": debugging breakpoint.
+ * We keep this, as is comes quite handy for debugging.
+ */
#define ASM_ARM_BPKT 0xE1200070
#define ASM_THUMB_BPKT 0xBE00
@@ -191,37 +179,27 @@
#endif
}
-
-/*----------------------------------------------------------------------------*/
-/**
+/*
* convert fast call return code to linux driver module error code
- *
*/
-static inline int convert_fc_ret(
- uint32_t sret
-)
+static inline int convert_fc_ret(uint32_t sret)
{
- int ret = -EFAULT;
+ int ret = -EFAULT;
switch (sret) {
-
case MC_FC_RET_OK:
ret = 0;
break;
-
case MC_FC_RET_ERR_INVALID:
ret = -EINVAL;
break;
-
case MC_FC_RET_ERR_ALREADY_INITIALIZED:
ret = -EBUSY;
break;
-
default:
break;
- } /* end switch( sret ) */
+ }
return ret;
}
-#endif /* _MC_DRV_MODULE_FC_H_ */
-/** @} */
+#endif /* _MC_DRV_MODULE_FASTCALLS_H_ */
diff --git a/drivers/gud/mobicore_driver/mc_drv_module_linux_api.h b/drivers/gud/mobicore_driver/mc_drv_module_linux_api.h
deleted file mode 100644
index b2a99f1..0000000
--- a/drivers/gud/mobicore_driver/mc_drv_module_linux_api.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Header file of MobiCore Driver Kernel Module.
- *
- * @addtogroup MobiCore_Driver_Kernel_Module
- * @{
- * Wrapper for Linux API
- * @file
- *
- * Some convenient wrappers for memory functions
- *
- * <!-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef _MC_DRV_MODULE_LINUX_API_H_
-#define _MC_DRV_MODULE_LINUX_API_H_
-
-#include <linux/version.h>
-#include <linux/miscdevice.h>
-#include <linux/interrupt.h>
-#include <linux/highmem.h>
-#include <linux/kthread.h>
-#include <linux/io.h>
-#include <linux/uaccess.h>
-#include <asm/sizes.h>
-#include <asm/pgtable.h>
-#include <linux/semaphore.h>
-#include <linux/moduleparam.h>
-#include <linux/slab.h>
-
-
-/* make some nice types */
-#if !defined(TRUE)
-#define TRUE (1 == 1)
-#endif
-
-#if !defined(FALSE)
-#define FALSE (1 != 1)
-#endif
-
-
-/* Linux GCC modifiers */
-#if !defined(__init)
-#warning "missing definition: __init"
-/* define a dummy */
-#define __init
-#endif
-
-
-#if !defined(__exit)
-#warning "missing definition: __exit"
-/* define a dummy */
-#define __exit
-#endif
-
-
-#if !defined(__must_check)
-#warning "missing definition: __must_check"
-/* define a dummy */
-#define __must_check
-#endif
-
-
-#if !defined(__user)
-#warning "missing definition: __user"
-/* define a dummy */
-#define __user
-#endif
-
-#define INVALID_ORDER ((unsigned int)(-1))
-
-/*----------------------------------------------------------------------------*/
-/* get start address of the 4 KiB page where the given addres is located in. */
-static inline void *get_page_start(
- void *addr
-)
-{
- return (void *)(((unsigned long)(addr)) & PAGE_MASK);
-}
-
-/*----------------------------------------------------------------------------*/
-/* get offset into the 4 KiB page where the given addres is located in. */
-static inline unsigned int get_offset_in_page(
- void *addr
-)
-{
- return (unsigned int)(((unsigned long)(addr)) & (~PAGE_MASK));
-}
-
-/*----------------------------------------------------------------------------*/
-/* get number of pages for a given buffer. */
-static inline unsigned int get_nr_of_pages_for_buffer(
- void *addr_start, /* may be null */
- unsigned int len
-)
-{
- /* calculate used number of pages. Example:
- offset+size newSize+PAGE_SIZE-1 nr_of_pages
- 0 4095 0
- 1 4096 1
- 4095 8190 1
- 4096 8191 1
- 4097 8192 2 */
-
- return (get_offset_in_page(addr_start) + len + PAGE_SIZE-1) / PAGE_SIZE;
-}
-
-
-/*----------------------------------------------------------------------------*/
-/**
- * convert a given size to page order, which is equivalent to finding log_2(x).
- * The maximum for order was 5 in Linux 2.0 corresponding to 32 pages.
- * Later versions allow 9 corresponding to 512 pages, which is 2 MB on
- * most platforms). Anyway, the bigger order is, the more likely it is
- * that the allocation will fail.
- * Size 0 1 4097 8193 12289 24577 28673 40961 61441
- * Pages - 1 2 3 4 7 8 15 16
- * Order INVALID_ORDER 0 1 1 2 2 3 3 4
- *
- * @param size
- * @return order
- */
-static inline unsigned int size_to_order(
- unsigned int size
-)
-{
- unsigned int order = INVALID_ORDER;
-
- if (size != 0) {
- /* ARMv5 as a CLZ instruction which count the leading zeros of
- the binary representation of a value. It return a value
- between 0 and 32.
- Value 0 1 2 3 4 5 6 7 8 9 10 ...
- CLZ 32 31 30 30 29 29 29 29 28 28 28 ...
-
- We have excluded Size==0 before, so this is safe. */
- order = __builtin_clz(
- get_nr_of_pages_for_buffer(NULL, size));
-
- /* there is a size overflow in get_nr_of_pages_for_buffer when
- * the size is too large */
- if (unlikely(order > 31))
- return INVALID_ORDER;
- order = 31 - order;
-
- /* above algorithm rounds down: clz(5)=2 instead of 3 */
- /* quick correction to fix it: */
- if (((1<<order)*PAGE_SIZE) < size)
- order++;
- }
- return order;
-}
-
-/* magic linux macro */
-#if !defined(list_for_each_entry)
-/* stop compiler */
-#error "missing macro: list_for_each_entry()"
-/* define a dummy */
-#define list_for_each_entry(a, b, c) if (0)
-#endif
-
-/*----------------------------------------------------------------------------*/
-/* return the page frame number of an address */
-static inline unsigned int addr_to_pfn(
- void *addr
-)
-{
- /* there is no real API for this */
- return ((unsigned int)(addr)) >> PAGE_SHIFT;
-}
-
-
-/*----------------------------------------------------------------------------*/
-/* return the address of a page frame number */
-static inline void *pfn_to_addr(
- unsigned int pfn
-)
-{
- /* there is no real API for this */
- return (void *)(pfn << PAGE_SHIFT);
-}
-
-#endif /* _MC_DRV_MODULE_LINUX_API_H_ */
-/** @} */
diff --git a/drivers/gud/mobicore_driver/platforms/msm8960_surf_std/platform.h b/drivers/gud/mobicore_driver/platforms/msm8960_surf_std/platform.h
index 070222e..9efa026 100644
--- a/drivers/gud/mobicore_driver/platforms/msm8960_surf_std/platform.h
+++ b/drivers/gud/mobicore_driver/platforms/msm8960_surf_std/platform.h
@@ -1,32 +1,23 @@
-/**
- * Header file of MobiCore Driver Kernel Module Platform
- * specific structures
- *
- * @addtogroup MobiCore_Driver_Kernel_Module
- * @{
- * Internal structures of the McDrvModule
- * @file
- *
- * Header file the MobiCore Driver Kernel Module,
+/*
+ * Header file for the MobiCore Driver Kernel Module,
* its internal structures and defines.
*
- * <!-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#ifndef _MC_DRV_PLATFORM_H_
-#define _MC_DRV_PLATFORM_H_
+#ifndef _MC_PLATFORM_H_
+#define _MC_PLATFORM_H_
-/** MobiCore Interrupt for Qualcomm */
+/* MobiCore Interrupt for Qualcomm */
#define MC_INTR_SSIQ 280
-/** Use SMC for fastcalls */
+/* Use SMC for fastcalls */
#define MC_SMC_FASTCALL
-
/*--------------- Implementation -------------- */
#include <mach/scm.h>
/* from following file */
@@ -34,17 +25,16 @@
#define SCM_CMD_MOBICORE 1
extern int scm_call(u32 svc_id, u32 cmd_id, const void *cmd_buf, size_t cmd_len,
- void *resp_buf, size_t resp_len);
+ void *resp_buf, size_t resp_len);
static inline int smc_fastcall(void *fc_generic, size_t size)
{
return scm_call(SCM_SVC_MOBICORE, SCM_CMD_MOBICORE,
- fc_generic, size,
- fc_generic, size);
+ fc_generic, size,
+ fc_generic, size);
}
-/** Enable mobicore mem traces */
+/* Enable mobicore mem traces */
#define MC_MEM_TRACES
-#endif /* _MC_DRV_PLATFORM_H_ */
-/** @} */
+#endif /* _MC_PLATFORM_H_ */
diff --git a/drivers/gud/mobicore_driver/public/mc_drv_module_api.h b/drivers/gud/mobicore_driver/public/mc_drv_module_api.h
index 59366f3..fc6f69f 100644
--- a/drivers/gud/mobicore_driver/public/mc_drv_module_api.h
+++ b/drivers/gud/mobicore_driver/public/mc_drv_module_api.h
@@ -1,10 +1,4 @@
-/** @addtogroup MCD_MCDIMPL_KMOD_API Mobicore Driver Module API
- * @ingroup MCD_MCDIMPL_KMOD
- * @{
- * Interface to Mobicore Driver Kernel Module.
- * @file
- *
- * <h2>Introduction</h2>
+/*
* The MobiCore Driver Kernel Module is a Linux device driver, which represents
* the command proxy on the lowest layer to the secure world (Swd). Additional
* services like memory allocation via mmap and generation of a L2 tables for
@@ -16,15 +10,7 @@
* The MobiCore Driver Kernel Module must be installed via
* "insmod mcDrvModule.ko".
*
- *
- * <h2>Version history</h2>
- * <table class="customtab">
- * <tr><td width="100px"><b>Date</b></td><td width="80px"><b>Version</b></td>
- * <td><b>Changes</b></td></tr>
- * <tr><td>2010-05-25</td><td>0.1</td><td>Initial Release</td></tr>
- * </table>
- *
- * <!-- Copyright Giesecke & Devrient GmbH 2010-2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2010-2012 -->
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -51,65 +37,64 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _MC_DRV_MODULEAPI_H_
-#define _MC_DRV_MODULEAPI_H_
+#ifndef _MC_DRV_MODULE_API_H_
+#define _MC_DRV_MODULE_API_H_
#include "version.h"
-#define MC_DRV_MOD_DEVNODE "mobicore"
-#define MC_DRV_MOD_DEVNODE_FULLPATH "/dev/" MC_DRV_MOD_DEVNODE
+#define MC_DRV_MOD_DEVNODE "mobicore"
+#define MC_DRV_MOD_DEVNODE_FULLPATH "/dev/" MC_DRV_MOD_DEVNODE
-/**
+/*
* Data exchange structure of the MC_DRV_MODULE_INIT ioctl command.
* INIT request data to SWD
*/
union mc_ioctl_init_params {
struct {
- /** base address of mci buffer 4KB align */
- uint32_t base;
- /** notification buffer start/length [16:16] [start, length] */
- uint32_t nq_offset;
- /** length of notification queue */
- uint32_t nq_length;
- /** mcp buffer start/length [16:16] [start, length] */
- uint32_t mcp_offset;
- /** length of mcp buffer */
- uint32_t mcp_length;
+ /* base address of mci buffer 4KB align */
+ uint32_t base;
+ /* notification buffer start/length [16:16] [start, length] */
+ uint32_t nq_offset;
+ /* length of notification queue */
+ uint32_t nq_length;
+ /* mcp buffer start/length [16:16] [start, length] */
+ uint32_t mcp_offset;
+ /* length of mcp buffer */
+ uint32_t mcp_length;
} in;
struct {
/* nothing */
} out;
};
-
-/**
+/*
* Data exchange structure of the MC_DRV_MODULE_INFO ioctl command.
* INFO request data to the SWD
*/
union mc_ioctl_info_params {
struct {
- uint32_t ext_info_id; /**< extended info ID */
+ uint32_t ext_info_id; /* extended info ID */
} in;
struct {
- uint32_t state; /**< state */
- uint32_t ext_info; /**< extended info */
+ uint32_t state; /* state */
+ uint32_t ext_info; /* extended info */
} out;
};
-/**
- * Mmap allocates and maps contiguous memory into a process.
+/*
+ * mmap allocates and maps contiguous memory into a process.
* We use the third parameter, void *offset, to distinguish between some cases
* offset = MC_DRV_KMOD_MMAP_WSM usual operation, pages are registered in
- device structure and freed later.
+ * device structure and freed later.
* offset = MC_DRV_KMOD_MMAP_MCI get Instance of MCI, allocates or mmaps
- the MCI to daemon
+ * the MCI to daemon
* offset = MC_DRV_KMOD_MMAP_PERSISTENTWSM special operation, without
- registration of pages
+ * registration of pages
*
* In mmap(), the offset specifies which of several device I/O pages is
- * requested. Linux only transfers the page number, i.e. the upper 20 bits to
- * kernel module. Therefore we define our special offsets as multiples of page
- * size.
+ * requested. Linux only transfers the page number, i.e. the upper 20 bits to
+ * kernel module. Therefore we define our special offsets as multiples of page
+ * size.
*/
enum mc_mmap_memtype {
MC_DRV_KMOD_MMAP_WSM = 0,
@@ -118,54 +103,52 @@
};
struct mc_mmap_resp {
- uint32_t handle; /**< WSN handle */
- uint32_t phys_addr; /**< physical address of WSM (or NULL) */
- bool is_reused; /**< if WSM memory was reused, or new allocated */
+ uint32_t handle; /* WSN handle */
+ uint32_t phys_addr; /* physical address of WSM (or NULL) */
+ bool is_reused; /* if WSM memory was reused, or new allocated */
};
-/**
+/*
* Data exchange structure of the MC_DRV_KMOD_IOCTL_FREE ioctl command.
*/
union mc_ioctl_free_params {
struct {
- uint32_t handle; /**< driver handle */
- uint32_t pid; /**< process id */
+ uint32_t handle;/* driver handle */
+ uint32_t pid; /* process id */
} in;
struct {
/* nothing */
} out;
};
-
-/**
- * Data exchange structure of the MC_DRV_KMOD_IOCTL_APP_REGISTER_WSM_L2 command.
- *
- * Allocates a physical L2 table and maps the buffer into this page.
- * Returns the physical address of the L2 table.
- * The page alignment will be created and the appropriated pSize and pOffsetL2
- * will be modified to the used values.
+/*
+ * Data exchange structure of the MC_DRV_KMOD_IOCTL_APP_REGISTER_WSM_L2
+ * command.
*/
union mc_ioctl_app_reg_wsm_l2_params {
struct {
- uint32_t buffer; /**< base address of the virtual address */
- uint32_t len; /**< size of the virtual address space */
- uint32_t pid; /**< process id */
+ uint32_t buffer; /* base address of the virtual address */
+ uint32_t len; /* size of the virtual address space */
+ uint32_t pid; /* process id */
} in;
struct {
- uint32_t handle; /**< driver handle for locked memory */
- uint32_t phys_wsm_l2_table; /* physical address of the L2 table */
+ /* driver handle for locked memory */
+ uint32_t handle;
+
+ /* physical address of the L2 table */
+ uint32_t phys_wsm_l2_table;
} out;
};
-/**
+/*
* Data exchange structure of the MC_DRV_KMOD_IOCTL_APP_UNREGISTER_WSM_L2
* command.
*/
struct mc_ioctl_app_unreg_wsm_l2_params {
struct {
- uint32_t handle; /**< driver handle for locked memory */
- uint32_t pid; /**< process id */
+ uint32_t handle; /* driver handle for locked memory */
+ uint32_t pid; /* process id */
} in;
struct {
/* nothing */
@@ -173,12 +156,12 @@
};
-/**
+/*
* Data exchange structure of the MC_DRV_KMOD_IOCTL_DAEMON_LOCK_WSM_L2 command.
*/
struct mc_ioctl_daemon_lock_wsm_l2_params {
struct {
- uint32_t handle; /**< driver handle for locked memory */
+ uint32_t handle; /* driver handle for locked memory */
} in;
struct {
uint32_t phys_wsm_l2_table;
@@ -186,90 +169,72 @@
};
-/**
+/*
* Data exchange structure of the MC_DRV_KMOD_IOCTL_DAEMON_UNLOCK_WSM_L2
* command.
*/
struct mc_ioctl_daemon_unlock_wsm_l2_params {
struct {
- uint32_t handle; /**< driver handle for locked memory */
+ uint32_t handle; /* driver handle for locked memory */
} in;
struct {
/* nothing */
} out;
};
-/**
- * Data exchange structure of the MC_DRV_MODULE_FC_EXECUTE ioctl command.
- */
-union mc_ioctl_fc_execute_params {
- struct {
- /**< base address of mobicore binary */
- uint32_t phys_start_addr;
- /**< length of DDR area */
- uint32_t length;
- } in;
- struct {
- /* nothing */
- } out;
-};
-
-/**
+/*
* Data exchange structure of the MC_DRV_MODULE_GET_VERSION ioctl command.
*/
struct mc_ioctl_get_version_params {
struct {
- uint32_t kernel_module_version;
+ uint32_t kernel_module_version;
} out;
};
-/* @defgroup Mobicore_Driver_Kernel_Module_Interface IOCTL */
-
-
-
-
-/* TODO: use IOCTL macros like _IOWR. See Documentation/ioctl/ioctl-number.txt,
- Documentation/ioctl/ioctl-decoding.txt */
-/**
- * defines for the ioctl mobicore driver module function call from user space.
+/*
+ * defines for the ioctl MobiCore driver module function call from user space.
*/
enum mc_kmod_ioctl {
/*
* get detailed MobiCore Status
+ * internal, unsupported
*/
- MC_DRV_KMOD_IOCTL_DUMP_STATUS = 200,
+ MC_DRV_KMOD_IOCTL_DUMP_STATUS = 200,
/*
* initialize MobiCore
*/
- MC_DRV_KMOD_IOCTL_FC_INIT = 201,
+ MC_DRV_KMOD_IOCTL_FC_INIT = 201,
/*
* get MobiCore status
*/
- MC_DRV_KMOD_IOCTL_FC_INFO = 202,
+ MC_DRV_KMOD_IOCTL_FC_INFO = 202,
- /**
+ /*
* ioctl parameter to send the YIELD command to the SWD.
* Only possible in Privileged Mode.
* ioctl(fd, MC_DRV_MODULE_YIELD)
*/
- MC_DRV_KMOD_IOCTL_FC_YIELD = 203,
- /**
+ MC_DRV_KMOD_IOCTL_FC_YIELD = 203,
+
+ /*
* ioctl parameter to send the NSIQ signal to the SWD.
* Only possible in Privileged Mode
* ioctl(fd, MC_DRV_MODULE_NSIQ)
*/
- MC_DRV_KMOD_IOCTL_FC_NSIQ = 204,
- /**
+ MC_DRV_KMOD_IOCTL_FC_NSIQ = 204,
+
+ /*
* ioctl parameter to tzbsp to start Mobicore binary from DDR.
* Only possible in Privileged Mode
* ioctl(fd, MC_DRV_KMOD_IOCTL_FC_EXECUTE)
+ * internal, unsupported
*/
- MC_DRV_KMOD_IOCTL_FC_EXECUTE = 205,
+ MC_DRV_KMOD_IOCTL_FC_EXECUTE = 205,
- /**
+ /*
* Free's memory which is formerly allocated by the driver's mmap
* command. The parameter must be this mmaped address.
* The internal instance data regarding to this address are deleted as
@@ -278,34 +243,35 @@
* Usage: ioctl(fd, MC_DRV_MODULE_FREE, &address) with address beeing of
* type long address
*/
- MC_DRV_KMOD_IOCTL_FREE = 218,
+ MC_DRV_KMOD_IOCTL_FREE = 218,
- /**
+ /*
* Creates a L2 Table of the given base address and the size of the
* data.
* Parameter: mc_ioctl_app_reg_wsm_l2_params
*/
- MC_DRV_KMOD_IOCTL_APP_REGISTER_WSM_L2 = 220,
+ MC_DRV_KMOD_IOCTL_APP_REGISTER_WSM_L2 = 220,
- /**
+ /*
* Frees the L2 table created by a MC_DRV_KMOD_IOCTL_APP_REGISTER_WSM_L2
* ioctl.
* Parameter: mc_ioctl_app_unreg_wsm_l2_params
*/
MC_DRV_KMOD_IOCTL_APP_UNREGISTER_WSM_L2 = 221,
+ /*
+ * Locked memory is still in use by SWd.
+ * internal, unsupported
+ */
+ MC_DRV_KMOD_IOCTL_DAEMON_LOCK_WSM_L2 = 222,
+ MC_DRV_KMOD_IOCTL_DAEMON_UNLOCK_WSM_L2 = 223,
- /* TODO: comment this. */
- MC_DRV_KMOD_IOCTL_DAEMON_LOCK_WSM_L2 = 222,
- MC_DRV_KMOD_IOCTL_DAEMON_UNLOCK_WSM_L2 = 223,
-
- /**
+ /*
* Return kernel driver version.
* Parameter: mc_ioctl_get_version_params
*/
- MC_DRV_KMOD_IOCTL_GET_VERSION = 224,
+ MC_DRV_KMOD_IOCTL_GET_VERSION = 224,
};
-#endif /* _MC_DRV_MODULEAPI_H_ */
-/** @} */
+#endif /* _MC_DRV_MODULE_API_H_ */
diff --git a/drivers/gud/mobicore_driver/public/mc_kernel_api.h b/drivers/gud/mobicore_driver/public/mc_kernel_api.h
index fdfc618..6408776 100644
--- a/drivers/gud/mobicore_driver/public/mc_kernel_api.h
+++ b/drivers/gud/mobicore_driver/public/mc_kernel_api.h
@@ -1,100 +1,79 @@
-/** @addtogroup MCD_MCDIMPL_KMOD_KAPI Mobicore Driver Module API inside Kernel.
- * @ingroup MCD_MCDIMPL_KMOD
- * @{
+/*
* Interface to Mobicore Driver Kernel Module inside Kernel.
- * @file
*
- * Interface to be used by module MobiCoreKernelAPI.
- *
- * <!-- Copyright Giesecke & Devrient GmbH 2010-2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2010-2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#ifndef _MOBICORE_KERNELMODULE_API_H_
-#define _MOBICORE_KERNELMODULE_API_H_
+#ifndef _MC_KERNEL_API_H_
+#define _MC_KERNEL_API_H_
struct mc_instance;
/**
- * Initialize a new mobicore API instance object
+ * mobicore_open() - Initialize a new MobiCore API instance object
*
- * @return Instance or NULL if no allocation was possible.
+ * Returns a MobiCore Instance or NULL if no allocation was possible.
*/
-struct mc_instance *mobicore_open(
- void
-);
+struct mc_instance *mobicore_open(void);
/**
- * Release a mobicore instance object and all objects related to it
- * @param instance instance
- * @return 0 if Ok or -E ERROR
+ * mobicore_release() - Release a MobiCore instance object
+ * @instance: MobiCore instance
+ *
+ * Returns 0 if Ok or -E ERROR
*/
-int mobicore_release(
- struct mc_instance *instance
-);
+int mobicore_release(struct mc_instance *instance);
/**
- * Free a WSM buffer allocated with mobicore_allocate_wsm
- * @param instance
- * @param handle handle of the buffer
+ * mobicore_allocate_wsm() - Allocate MobiCore WSM
+ * @instance: instance data for MobiCore Daemon and TLCs
+ * @requested_size: memory size requested in bytes
+ * @handle: pointer to handle
+ * @kernel_virt_addr: virtual user start address
+ * @phys_addr: physical start address
*
- * @return 0 if no error
- *
+ * Returns 0 if OK
*/
-int mobicore_allocate_wsm(
- struct mc_instance *instance,
- unsigned long requested_size,
- uint32_t *handle,
- void **kernel_virt_addr,
- void **phys_addr
-);
+int mobicore_allocate_wsm(struct mc_instance *instance,
+ unsigned long requested_size,
+ uint32_t *handle,
+ void **kernel_virt_addr,
+ void **phys_addr);
/**
- * Free a WSM buffer allocated with mobicore_allocate_wsm
- * @param instance
- * @param handle handle of the buffer
+ * mobicore_free() - Free a WSM buffer allocated with mobicore_allocate_wsm
+ * @instance: instance data for MobiCore Daemon and TLCs
+ * @handle: handle of the buffer
*
- * @return 0 if no error
- *
+ * Returns 0 if OK
*/
-int mobicore_free(
- struct mc_instance *instance,
- uint32_t handle
-);
+int mobicore_free(struct mc_instance *instance, uint32_t handle);
/**
- * Map a virtual memory buffer structure to Mobicore
- * @param instance
- * @param addr address of the buffer(NB it must be kernel virtual!)
- * @param len buffer length
- * @param handle pointer to handle
- * @param phys_wsm_l2_table pointer to physical L2 table(?)
+ * mobicore_map_vmem() - Map a virtual memory buffer structure to Mobicore
+ * @instance: instance data for MobiCore Daemon and TLCs
+ * @addr: address of the buffer (NB it must be kernel virtual!)
+ * @len: buffer length (in bytes)
+ * @handle: unique handle
+ * @phys_wsm_l2_table: pointer for physical address of L2 table
*
- * @return 0 if no error
- *
+ * Returns 0 if no error
*/
-int mobicore_map_vmem(
- struct mc_instance *instance,
- void *addr,
- uint32_t len,
- uint32_t *handle,
- void **phys_wsm_l2_table
-);
+int mobicore_map_vmem(struct mc_instance *instance, void *addr,
+ uint32_t len, uint32_t *handle,
+ void **phys_wsm_l2_table);
/**
- * Unmap a virtual memory buffer from mobicore
- * @param instance
- * @param handle
+ * mobicore_unmap_vmem() - Unmap a virtual memory buffer from MobiCore
+ * @instance: instance data for MobiCore Daemon and TLCs
+ * @handle: unique handle
*
- * @return 0 if no error
- *
+ * Returns 0 if no error
*/
-int mobicore_unmap_vmem(
- struct mc_instance *instance,
- uint32_t handle
-);
-#endif /* _MOBICORE_KERNELMODULE_API_H_ */
-/** @} */
+int mobicore_unmap_vmem(struct mc_instance *instance, uint32_t handle);
+
+#endif /* _MC_KERNEL_API_H_ */
diff --git a/drivers/gud/mobicore_driver/public/version.h b/drivers/gud/mobicore_driver/public/version.h
index 9b2dbca..d0d272c 100644
--- a/drivers/gud/mobicore_driver/public/version.h
+++ b/drivers/gud/mobicore_driver/public/version.h
@@ -1,6 +1,5 @@
-/** @addtogroup MCD_MCDIMPL_KMOD
- * @{
- * <!-- Copyright Giesecke & Devrient GmbH 2010-2012 -->
+/*
+ * <-- Copyright Giesecke & Devrient GmbH 2010-2012 -->
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,10 +26,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _MC_DRV_VERSION_H_
-#define _MC_DRV_VERSION_H_
+#ifndef _VERSION_H_
+#define _VERSION_H_
#define MCDRVMODULEAPI_VERSION_MAJOR 0
#define MCDRVMODULEAPI_VERSION_MINOR 1
-#endif /* _MC_DRV_VERSION_H_ */
+#endif /* _VERSION_H_ */
diff --git a/drivers/gud/mobicore_kernelapi/clientlib.c b/drivers/gud/mobicore_kernelapi/clientlib.c
index 13826f2..264e7aa 100644
--- a/drivers/gud/mobicore_kernelapi/clientlib.c
+++ b/drivers/gud/mobicore_kernelapi/clientlib.c
@@ -1,7 +1,7 @@
-/**
+/*
* MobiCore KernelApi module
*
- * <!-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -25,10 +25,8 @@
/* device list */
LIST_HEAD(devices);
-/*----------------------------------------------------------------------------*/
-static struct mcore_device_t *resolve_device_id(
- uint32_t device_id
-) {
+static struct mcore_device_t *resolve_device_id(uint32_t device_id)
+{
struct mcore_device_t *tmp;
struct list_head *pos;
@@ -41,19 +39,13 @@
return NULL;
}
-
-/*----------------------------------------------------------------------------*/
-static void add_device(
- struct mcore_device_t *device
-) {
+static void add_device(struct mcore_device_t *device)
+{
list_add_tail(&(device->list), &devices);
}
-
-/*----------------------------------------------------------------------------*/
-static bool remove_device(
- uint32_t device_id
-) {
+static bool remove_device(uint32_t device_id)
+{
struct mcore_device_t *tmp;
struct list_head *pos, *q;
@@ -68,22 +60,18 @@
return false;
}
-
-/*----------------------------------------------------------------------------*/
-enum mc_result mc_open_device(
- uint32_t device_id
-) {
+enum mc_result mc_open_device(uint32_t device_id)
+{
enum mc_result mc_result = MC_DRV_OK;
struct connection *dev_con = NULL;
- MCDRV_DBG_VERBOSE("===%s()===", __func__);
-
- /* Enter critical section */
+ MCDRV_DBG_VERBOSE(mc_kapi, "===%s()===", __func__);
do {
struct mcore_device_t *device = resolve_device_id(device_id);
if (device != NULL) {
- MCDRV_DBG_ERROR("Device %d already opened", device_id);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "Device %d already opened", device_id);
mc_result = MC_DRV_ERR_INVALID_OPERATION;
break;
}
@@ -92,6 +80,7 @@
dev_con = connection_new();
if (!connection_connect(dev_con, MC_DAEMON_PID)) {
MCDRV_DBG_ERROR(
+ mc_kapi,
"Could not setup netlink connection to PID %u",
MC_DAEMON_PID);
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
@@ -100,12 +89,11 @@
/* Forward device open to the daemon and read result */
struct mc_drv_cmd_open_device_t mc_drv_cmd_open_device = {
- /* C++ does not support C99 designated initializers */
- /* .header = */ {
- /* .command_id = */ MC_DRV_CMD_OPEN_DEVICE
+ {
+ MC_DRV_CMD_OPEN_DEVICE
},
- /* .payload = */ {
- /* .device_id = */ device_id
+ {
+ device_id
}
};
@@ -114,8 +102,9 @@
&mc_drv_cmd_open_device,
sizeof(struct mc_drv_cmd_open_device_t));
if (len < 0) {
- MCDRV_DBG_ERROR("CMD_OPEN_DEVICE writeCmd failed "
- "ret=%d", len);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_OPEN_DEVICE writeCmd failed %d",
+ len);
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
break;
}
@@ -126,14 +115,16 @@
&rsp_header,
sizeof(rsp_header));
if (len != sizeof(rsp_header)) {
- MCDRV_DBG_ERROR("CMD_OPEN_DEVICE readRsp failed "
- "ret=%d", len);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_OPEN_DEVICE readRsp failed %d",
+ len);
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
break;
}
if (rsp_header.response_id != MC_DRV_RSP_OK) {
- MCDRV_DBG_ERROR("CMD_OPEN_DEVICE failed, respId=%d",
- rsp_header.response_id);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_OPEN_DEVICE failed, respId=%d",
+ rsp_header.response_id);
switch (rsp_header.response_id) {
case MC_DRV_RSP_PAYLOAD_LENGTH_ERROR:
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
@@ -154,8 +145,9 @@
device = mcore_device_create(device_id, dev_con);
if (!mcore_device_open(device, MC_DRV_MOD_DEVNODE_FULLPATH)) {
mcore_device_cleanup(device);
- MCDRV_DBG_ERROR("could not open device file: %s",
- MC_DRV_MOD_DEVNODE_FULLPATH);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "could not open device file: %s",
+ MC_DRV_MOD_DEVNODE_FULLPATH);
mc_result = MC_DRV_ERR_INVALID_DEVICE_FILE;
break;
}
@@ -167,25 +159,20 @@
if (mc_result != MC_DRV_OK)
connection_cleanup(dev_con);
- /* Exit critical section */
-
return mc_result;
}
EXPORT_SYMBOL(mc_open_device);
-/*----------------------------------------------------------------------------*/
-enum mc_result mc_close_device(
- uint32_t device_id
-) {
+enum mc_result mc_close_device(uint32_t device_id)
+{
enum mc_result mc_result = MC_DRV_OK;
- MCDRV_DBG_VERBOSE("===%s()===", __func__);
+ MCDRV_DBG_VERBOSE(mc_kapi, "===%s()===", __func__);
- /* Enter critical section */
do {
struct mcore_device_t *device = resolve_device_id(device_id);
if (device == NULL) {
- MCDRV_DBG_ERROR("Device not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Device not found");
mc_result = MC_DRV_ERR_UNKNOWN_DEVICE;
break;
}
@@ -193,15 +180,15 @@
/* Return if not all sessions have been closed */
if (mcore_device_has_sessions(device)) {
- MCDRV_DBG_ERROR("cannot close with sessions pending");
+ MCDRV_DBG_ERROR(mc_kapi,
+ "cannot close with sessions pending");
mc_result = MC_DRV_ERR_SESSION_PENDING;
break;
}
struct mc_drv_cmd_close_device_t mc_drv_cmd_close_device = {
- /* C++ does not support C99 designated initializers */
- /* .header = */ {
- /* .command_id = */ MC_DRV_CMD_CLOSE_DEVICE
+ {
+ MC_DRV_CMD_CLOSE_DEVICE
}
};
int len = connection_write_data(
@@ -210,8 +197,9 @@
sizeof(struct mc_drv_cmd_close_device_t));
/* ignore error, but log details */
if (len < 0) {
- MCDRV_DBG_ERROR("CMD_CLOSE_DEVICE writeCmd failed "
- "ret=%d", len);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_CLOSE_DEVICE writeCmd failed %d",
+ len);
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
}
@@ -221,15 +209,17 @@
&rsp_header,
sizeof(rsp_header));
if (len != sizeof(rsp_header)) {
- MCDRV_DBG_ERROR("CMD_CLOSE_DEVICE readResp failed "
- " ret=%d", len);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_CLOSE_DEVICE readResp failed %d",
+ len);
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
break;
}
if (rsp_header.response_id != MC_DRV_RSP_OK) {
- MCDRV_DBG_ERROR("CMD_CLOSE_DEVICE failed, respId=%d",
- rsp_header.response_id);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_CLOSE_DEVICE failed, respId=%d",
+ rsp_header.response_id);
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
break;
}
@@ -238,44 +228,37 @@
} while (false);
- /* Exit critical section */
-
return mc_result;
}
EXPORT_SYMBOL(mc_close_device);
-/*----------------------------------------------------------------------------*/
-enum mc_result mc_open_session(
- struct mc_session_handle *session,
- const struct mc_uuid_t *uuid,
- uint8_t *tci,
- uint32_t len
-) {
+enum mc_result mc_open_session(struct mc_session_handle *session,
+ const struct mc_uuid_t *uuid,
+ uint8_t *tci, uint32_t len)
+{
enum mc_result mc_result = MC_DRV_OK;
- MCDRV_DBG_VERBOSE("===%s()===", __func__);
-
- /* Enter critical section */
+ MCDRV_DBG_VERBOSE(mc_kapi, "===%s()===", __func__);
do {
if (session == NULL) {
- MCDRV_DBG_ERROR("Session is null");
+ MCDRV_DBG_ERROR(mc_kapi, "Session is null");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
if (uuid == NULL) {
- MCDRV_DBG_ERROR("UUID is null");
+ MCDRV_DBG_ERROR(mc_kapi, "UUID is null");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
if (tci == NULL) {
- MCDRV_DBG_ERROR("TCI is null");
+ MCDRV_DBG_ERROR(mc_kapi, "TCI is null");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
if (len > MC_MAX_TCI_LEN) {
- MCDRV_DBG_ERROR("TCI length is longer than %d",
- MC_MAX_TCI_LEN);
+ MCDRV_DBG_ERROR(mc_kapi, "TCI length is longer than %d",
+ MC_MAX_TCI_LEN);
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
@@ -284,7 +267,7 @@
struct mcore_device_t *device =
resolve_device_id(session->device_id);
if (device == NULL) {
- MCDRV_DBG_ERROR("Device not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Device not found");
mc_result = MC_DRV_ERR_UNKNOWN_DEVICE;
break;
}
@@ -294,40 +277,40 @@
struct wsm *wsm =
mcore_device_find_contiguous_wsm(device, tci);
if (wsm == NULL) {
- MCDRV_DBG_ERROR("Could not resolve TCI phy address ");
+ MCDRV_DBG_ERROR(mc_kapi,
+ "Could not resolve TCI phy address ");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
if (wsm->len < len) {
- MCDRV_DBG_ERROR("length is more than allocated TCI");
+ MCDRV_DBG_ERROR(mc_kapi,
+ "length is more than allocated TCI");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
/* Prepare open session command */
struct mc_drv_cmd_open_session_t cmdOpenSession = {
- /* C++ does not support C99 designated initializers */
- /* .header = */ {
- /* .command_id = */ MC_DRV_CMD_OPEN_SESSION
+ {
+ MC_DRV_CMD_OPEN_SESSION
},
- /* .payload = */ {
- /* .device_id = */ session->device_id,
- /* .uuid = */ *uuid,
- /* .tci = */ (uint32_t)wsm->phys_addr,
- /* .len = */ len
+ {
+ session->device_id,
+ *uuid,
+ (uint32_t)wsm->phys_addr,
+ len
}
};
/* Transmit command data */
-
- int len = connection_write_data(
- dev_con,
+ int len = connection_write_data(dev_con,
&cmdOpenSession,
sizeof(cmdOpenSession));
if (len != sizeof(cmdOpenSession)) {
- MCDRV_DBG_ERROR("CMD_OPEN_SESSION writeData failed "
- "ret=%d", len);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_OPEN_SESSION writeData failed %d",
+ len);
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
break;
}
@@ -336,20 +319,21 @@
/* read header first */
struct mc_drv_response_header_t rsp_header;
- len = connection_read_datablock(
- dev_con,
- &rsp_header,
- sizeof(rsp_header));
+ len = connection_read_datablock(dev_con,
+ &rsp_header,
+ sizeof(rsp_header));
if (len != sizeof(rsp_header)) {
- MCDRV_DBG_ERROR("CMD_OPEN_SESSION readResp failed "
- " ret=%d", len);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_OPEN_SESSION readResp failed %d",
+ len);
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
break;
}
if (rsp_header.response_id != MC_DRV_RSP_OK) {
- MCDRV_DBG_ERROR("CMD_OPEN_SESSION failed, respId=%d",
- rsp_header.response_id);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_OPEN_SESSION failed, respId=%d",
+ rsp_header.response_id);
switch (rsp_header.response_id) {
case MC_DRV_RSP_TRUSTLET_NOT_FOUND:
mc_result = MC_DRV_ERR_INVALID_DEVICE_FILE;
@@ -366,14 +350,15 @@
/* read payload */
struct mc_drv_rsp_open_session_payload_t
- rsp_open_session_payload;
+ rsp_open_session_payload;
len = connection_read_datablock(
dev_con,
&rsp_open_session_payload,
sizeof(rsp_open_session_payload));
if (len != sizeof(rsp_open_session_payload)) {
- MCDRV_DBG_ERROR("CMD_OPEN_SESSION readPayload failed "
- "ret=%d", len);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_OPEN_SESSION readPayload fail %d",
+ len);
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
break;
}
@@ -383,9 +368,10 @@
/* Set up second channel for notifications */
struct connection *session_connection = connection_new();
- /*TODO: no real need to connect here? */
+
if (!connection_connect(session_connection, MC_DAEMON_PID)) {
MCDRV_DBG_ERROR(
+ mc_kapi,
"Could not setup netlink connection to PID %u",
MC_DAEMON_PID);
connection_cleanup(session_connection);
@@ -393,42 +379,38 @@
break;
}
- /*TODO CONTINOUE HERE !!!! FIX RW RETURN HANDLING!!!! */
-
/* Write command to use channel for notifications */
struct mc_drv_cmd_nqconnect_t cmd_nqconnect = {
- /* C++ does not support C99 designated initializers */
- /* .header = */ {
- /* .command_id = */ MC_DRV_CMD_NQ_CONNECT
+ {
+ MC_DRV_CMD_NQ_CONNECT
},
- /* .payload = */ {
- /* .device_id = */ session->device_id,
- /* .session_id = */ session->session_id,
- /* .device_session_id = */
+ {
+ session->device_id,
+ session->session_id,
rsp_open_session_payload.device_session_id,
- /* .session_magic = */
- rsp_open_session_payload.session_magic
+ rsp_open_session_payload.session_magic
}
};
connection_write_data(session_connection,
- &cmd_nqconnect,
- sizeof(cmd_nqconnect));
+ &cmd_nqconnect,
+ sizeof(cmd_nqconnect));
/* Read command response, header first */
- len = connection_read_datablock(
- session_connection,
- &rsp_header,
- sizeof(rsp_header));
+ len = connection_read_datablock(session_connection,
+ &rsp_header,
+ sizeof(rsp_header));
if (len != sizeof(rsp_header)) {
- MCDRV_DBG_ERROR("CMD_NQ_CONNECT readRsp failed "
- "ret=%d", len);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_NQ_CONNECT readRsp failed %d",
+ len);
connection_cleanup(session_connection);
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
break;
}
if (rsp_header.response_id != MC_DRV_RSP_OK) {
- MCDRV_DBG_ERROR("CMD_NQ_CONNECT failed, respId=%d",
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_NQ_CONNECT failed, respId=%d",
rsp_header.response_id);
connection_cleanup(session_connection);
mc_result = MC_DRV_ERR_NQ_FAILED;
@@ -438,84 +420,78 @@
/* there is no payload. */
/* Session established, new session object must be created */
- mcore_device_create_new_session(
- device,
- session->session_id,
- session_connection);
+ mcore_device_create_new_session(device,
+ session->session_id,
+ session_connection);
} while (false);
- /* Exit critical section */
-
return mc_result;
}
EXPORT_SYMBOL(mc_open_session);
-/*----------------------------------------------------------------------------*/
-enum mc_result mc_close_session(
- struct mc_session_handle *session
-) {
+enum mc_result mc_close_session(struct mc_session_handle *session)
+{
enum mc_result mc_result = MC_DRV_OK;
- MCDRV_DBG_VERBOSE("===%s()===", __func__);
-
- /* Enter critical section */
+ MCDRV_DBG_VERBOSE(mc_kapi, "===%s()===", __func__);
do {
if (session == NULL) {
- MCDRV_DBG_ERROR("Session is null");
+ MCDRV_DBG_ERROR(mc_kapi, "Session is null");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
- struct mcore_device_t *device =
+ struct mcore_device_t *device =
resolve_device_id(session->device_id);
if (device == NULL) {
- MCDRV_DBG_ERROR("Device not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Device not found");
mc_result = MC_DRV_ERR_UNKNOWN_DEVICE;
break;
}
- struct connection *dev_con = device->connection;
+ struct connection *dev_con = device->connection;
- struct session *nq_session =
- mcore_device_resolve_session_id(device, session->session_id);
+ struct session *nq_session =
+ mcore_device_resolve_session_id(device,
+ session->session_id);
+
if (nq_session == NULL) {
- MCDRV_DBG_ERROR("Session not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Session not found");
mc_result = MC_DRV_ERR_UNKNOWN_SESSION;
break;
}
/* Write close session command */
struct mc_drv_cmd_close_session_t cmd_close_session = {
- /* C++ does not support C99 designated initializers */
- /* .header = */ {
- /* .command_id = */ MC_DRV_CMD_CLOSE_SESSION
+ {
+ MC_DRV_CMD_CLOSE_SESSION
},
- /* .payload = */ {
- /* .session_id = */ session->session_id,
+ {
+ session->session_id,
}
};
- connection_write_data(
- dev_con,
- &cmd_close_session,
- sizeof(cmd_close_session));
+ connection_write_data(dev_con,
+ &cmd_close_session,
+ sizeof(cmd_close_session));
/* Read command response */
struct mc_drv_response_header_t rsp_header;
- int len = connection_read_datablock(
- dev_con,
- &rsp_header,
- sizeof(rsp_header));
+ int len = connection_read_datablock(dev_con,
+ &rsp_header,
+ sizeof(rsp_header));
if (len != sizeof(rsp_header)) {
- MCDRV_DBG_ERROR("CMD_CLOSE_SESSION readRsp failed "
- "ret=%d", len);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_CLOSE_SESSION readRsp failed %d",
+ len);
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
break;
}
if (rsp_header.response_id != MC_DRV_RSP_OK) {
- MCDRV_DBG_ERROR("CMD_CLOSE_SESSION failed, respId=%d",
- rsp_header.response_id);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_CLOSE_SESSION failed, respId=%d",
+ rsp_header.response_id);
mc_result = MC_DRV_ERR_UNKNOWN_DEVICE;
break;
}
@@ -525,23 +501,19 @@
} while (false);
- /* Exit critical section */
-
return mc_result;
}
EXPORT_SYMBOL(mc_close_session);
-/*----------------------------------------------------------------------------*/
-enum mc_result mc_notify(
- struct mc_session_handle *session
-) {
+enum mc_result mc_notify(struct mc_session_handle *session)
+{
enum mc_result mc_result = MC_DRV_OK;
- MCDRV_DBG_VERBOSE("===%s()===", __func__);
+ MCDRV_DBG_VERBOSE(mc_kapi, "===%s()===", __func__);
do {
if (session == NULL) {
- MCDRV_DBG_ERROR("Session is null");
+ MCDRV_DBG_ERROR(mc_kapi, "Session is null");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
@@ -549,7 +521,7 @@
struct mcore_device_t *device =
resolve_device_id(session->device_id);
if (device == NULL) {
- MCDRV_DBG_ERROR("Device not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Device not found");
mc_result = MC_DRV_ERR_UNKNOWN_DEVICE;
break;
}
@@ -558,25 +530,23 @@
struct session *nqsession =
mcore_device_resolve_session_id(device, session->session_id);
if (nqsession == NULL) {
- MCDRV_DBG_ERROR("Session not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Session not found");
mc_result = MC_DRV_ERR_UNKNOWN_SESSION;
break;
}
struct mc_drv_cmd_notify_t cmd_notify = {
- /* C++ does not support C99 designated initializers */
- /* .header = */ {
- /* .command_id = */ MC_DRV_CMD_NOTIFY
+ {
+ MC_DRV_CMD_NOTIFY
},
- /* .payload = */ {
- /* .session_id = */ session->session_id,
+ {
+ session->session_id
}
};
- connection_write_data(
- dev_con,
- &cmd_notify,
- sizeof(cmd_notify));
+ connection_write_data(dev_con,
+ &cmd_notify,
+ sizeof(cmd_notify));
/* Daemon will not return a response */
@@ -586,14 +556,12 @@
}
EXPORT_SYMBOL(mc_notify);
-/*----------------------------------------------------------------------------*/
-enum mc_result mc_wait_notification(
- struct mc_session_handle *session,
- int32_t timeout
-) {
+enum mc_result mc_wait_notification(struct mc_session_handle *session,
+ int32_t timeout)
+{
enum mc_result mc_result = MC_DRV_OK;
- MCDRV_DBG_VERBOSE("===%s()===", __func__);
+ MCDRV_DBG_VERBOSE(mc_kapi, "===%s()===", __func__);
do {
if (session == NULL) {
@@ -601,18 +569,19 @@
break;
}
- struct mcore_device_t *device =
+ struct mcore_device_t *device =
resolve_device_id(session->device_id);
if (device == NULL) {
- MCDRV_DBG_ERROR("Device not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Device not found");
mc_result = MC_DRV_ERR_UNKNOWN_DEVICE;
break;
}
- struct session *nq_session =
- mcore_device_resolve_session_id(device, session->session_id);
+ struct session *nq_session =
+ mcore_device_resolve_session_id(device,
+ session->session_id);
if (nq_session == NULL) {
- MCDRV_DBG_ERROR("Session not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Session not found");
mc_result = MC_DRV_ERR_UNKNOWN_SESSION;
break;
}
@@ -624,22 +593,26 @@
/* Read notification queue till it's empty */
for (;;) {
struct notification notification;
- ssize_t num_read = connection_read_data(
- nqconnection,
- ¬ification,
- sizeof(notification),
- timeout);
- /* Exit on timeout in first run. Later runs have
+ ssize_t num_read =
+ connection_read_data(nqconnection,
+ ¬ification,
+ sizeof(notification),
+ timeout);
+ /*
+ * Exit on timeout in first run. Later runs have
* timeout set to 0.
- * -2 means, there is no more data. */
+ * -2 means, there is no more data.
+ */
if (count == 0 && num_read == -2) {
- MCDRV_DBG_ERROR("read timeout");
+ MCDRV_DBG_ERROR(mc_kapi, "read timeout");
mc_result = MC_DRV_ERR_TIMEOUT;
break;
}
- /* After first notification the queue will be
+ /*
+ * After first notification the queue will be
* drained, Thus we set no timeout for the
- * following reads */
+ * following reads
+ */
timeout = 0;
if (num_read != sizeof(struct notification)) {
@@ -647,28 +620,33 @@
/* failure in first read, notify it */
mc_result = MC_DRV_ERR_NOTIFICATION;
MCDRV_DBG_ERROR(
+ mc_kapi,
"read notification failed, "
"%i bytes received", (int)num_read);
break;
} else {
- /* Read of the n-th notification
- failed/timeout. We don't tell the
- caller, as we got valid notifications
- before. */
+ /*
+ * Read of the n-th notification
+ * failed/timeout. We don't tell the
+ * caller, as we got valid notifications
+ * before.
+ */
mc_result = MC_DRV_OK;
break;
}
}
count++;
- MCDRV_DBG_VERBOSE("readNq count=%d, SessionID=%d, "
- "Payload=%d", count,
- notification.session_id, notification.payload);
+ MCDRV_DBG_VERBOSE(mc_kapi,
+ "count=%d, SessionID=%d, Payload=%d",
+ count,
+ notification.session_id,
+ notification.payload);
if (notification.payload != 0) {
/* Session end point died -> store exit code */
session_set_error_info(nq_session,
- notification.payload);
+ notification.payload);
mc_result = MC_DRV_INFO_NOTIFICATION;
break;
@@ -681,24 +659,17 @@
}
EXPORT_SYMBOL(mc_wait_notification);
-/*----------------------------------------------------------------------------*/
-enum mc_result mc_malloc_wsm(
- uint32_t device_id,
- uint32_t align,
- uint32_t len,
- uint8_t **wsm,
- uint32_t wsm_flags
-) {
+enum mc_result mc_malloc_wsm(uint32_t device_id, uint32_t align, uint32_t len,
+ uint8_t **wsm, uint32_t wsm_flags)
+{
enum mc_result mc_result = MC_DRV_ERR_UNKNOWN;
- MCDRV_DBG_VERBOSE("===%s()===", __func__);
-
- /* Enter critical section */
+ MCDRV_DBG_VERBOSE(mc_kapi, "===%s()===", __func__);
do {
struct mcore_device_t *device = resolve_device_id(device_id);
if (device == NULL) {
- MCDRV_DBG_ERROR("Device not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Device not found");
mc_result = MC_DRV_ERR_UNKNOWN_DEVICE;
break;
}
@@ -710,7 +681,7 @@
struct wsm *wsm_stack =
mcore_device_allocate_contiguous_wsm(device, len);
if (wsm_stack == NULL) {
- MCDRV_DBG_ERROR("Allocation of WSM failed");
+ MCDRV_DBG_ERROR(mc_kapi, "Allocation of WSM failed");
mc_result = MC_DRV_ERR_NO_FREE_MEMORY;
break;
}
@@ -720,31 +691,24 @@
} while (false);
- /* Exit critical section */
-
return mc_result;
}
EXPORT_SYMBOL(mc_malloc_wsm);
-/*----------------------------------------------------------------------------*/
-enum mc_result mc_free_wsm(
- uint32_t device_id,
- uint8_t *wsm
-) {
+enum mc_result mc_free_wsm(uint32_t device_id, uint8_t *wsm)
+{
enum mc_result mc_result = MC_DRV_ERR_UNKNOWN;
struct mcore_device_t *device;
- MCDRV_DBG_VERBOSE("===%s()===", __func__);
-
- /* Enter critical section */
+ MCDRV_DBG_VERBOSE(mc_kapi, "===%s()===", __func__);
do {
/* Get the device associated wit the given session */
device = resolve_device_id(device_id);
if (device == NULL) {
- MCDRV_DBG_ERROR("Device not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Device not found");
mc_result = MC_DRV_ERR_UNKNOWN_DEVICE;
break;
}
@@ -753,14 +717,15 @@
struct wsm *wsm_stack =
mcore_device_find_contiguous_wsm(device, wsm);
if (wsm_stack == NULL) {
- MCDRV_DBG_ERROR("unknown address");
+ MCDRV_DBG_ERROR(mc_kapi, "unknown address");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
/* Free the given virtual address */
if (!mcore_device_free_contiguous_wsm(device, wsm_stack)) {
- MCDRV_DBG_ERROR("Free of virtual address failed");
+ MCDRV_DBG_ERROR(mc_kapi,
+ "Free of virtual address failed");
mc_result = MC_DRV_ERR_FREE_MEMORY_FAILED;
break;
}
@@ -768,130 +733,123 @@
} while (false);
- /* Exit critical section */
-
return mc_result;
}
EXPORT_SYMBOL(mc_free_wsm);
-/*----------------------------------------------------------------------------*/
-enum mc_result mc_map(
- struct mc_session_handle *session_handle,
- void *buf,
- uint32_t buf_len,
- struct mc_bulk_map *map_info
-) {
+enum mc_result mc_map(struct mc_session_handle *session_handle, void *buf,
+ uint32_t buf_len, struct mc_bulk_map *map_info)
+{
enum mc_result mc_result = MC_DRV_ERR_UNKNOWN;
- MCDRV_DBG_VERBOSE("===%s()===", __func__);
-
- /* Enter critical section */
+ MCDRV_DBG_VERBOSE(mc_kapi, "===%s()===", __func__);
do {
if (session_handle == NULL) {
- MCDRV_DBG_ERROR("session_handle is null");
+ MCDRV_DBG_ERROR(mc_kapi, "session_handle is null");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
if (map_info == NULL) {
- MCDRV_DBG_ERROR("map_info is null");
+ MCDRV_DBG_ERROR(mc_kapi, "map_info is null");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
if (buf == NULL) {
- MCDRV_DBG_ERROR("buf is null");
+ MCDRV_DBG_ERROR(mc_kapi, "buf is null");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
/* Determine device the session belongs to */
- struct mcore_device_t *device = resolve_device_id(
- session_handle->device_id);
+ struct mcore_device_t *device =
+ resolve_device_id(session_handle->device_id);
+
if (device == NULL) {
- MCDRV_DBG_ERROR("Device not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Device not found");
mc_result = MC_DRV_ERR_UNKNOWN_DEVICE;
break;
}
struct connection *dev_con = device->connection;
/* Get session */
- struct session *session =
- mcore_device_resolve_session_id(device,
- session_handle->session_id);
+ uint32_t session_id = session_handle->session_id;
+ struct session *session =
+ mcore_device_resolve_session_id(device,
+ session_id);
if (session == NULL) {
- MCDRV_DBG_ERROR("Session not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Session not found");
mc_result = MC_DRV_ERR_UNKNOWN_SESSION;
break;
}
- /* Register mapped bulk buffer to Kernel Module and keep mapped
- bulk buffer in mind */
- struct bulk_buffer_descriptor *bulk_buf = session_add_bulk_buf(
- session, buf, buf_len);
+ /*
+ * Register mapped bulk buffer to Kernel Module and keep mapped
+ * bulk buffer in mind
+ */
+ struct bulk_buffer_descriptor *bulk_buf =
+ session_add_bulk_buf(session, buf, buf_len);
if (bulk_buf == NULL) {
- MCDRV_DBG_ERROR("Error mapping bulk buffer");
+ MCDRV_DBG_ERROR(mc_kapi, "Error mapping bulk buffer");
mc_result = MC_DRV_ERR_BULK_MAPPING;
break;
}
/* Prepare map command */
struct mc_drv_cmd_map_bulk_mem_t mc_drv_cmd_map_bulk_mem = {
- /* C++ does not support C99 designated initializers */
- /* .header = */ {
- /* .command_id = */ MC_DRV_CMD_MAP_BULK_BUF
+ {
+ MC_DRV_CMD_MAP_BULK_BUF
},
- /* .payload = */ {
- /* .session_id = */ session->session_id,
- /* .phys_addr_l2; = */
- (uint32_t)bulk_buf->phys_addr_wsm_l2,
- /* .offset_payload = */
- (uint32_t)(bulk_buf->virt_addr) & 0xFFF,
- /* .len_bulk_mem = */ bulk_buf->len
+ {
+ session->session_id,
+ (uint32_t)bulk_buf->phys_addr_wsm_l2,
+ (uint32_t)(bulk_buf->virt_addr) & 0xFFF,
+ bulk_buf->len
}
};
/* Transmit map command to MobiCore device */
- connection_write_data(
- dev_con,
- &mc_drv_cmd_map_bulk_mem,
- sizeof(mc_drv_cmd_map_bulk_mem));
+ connection_write_data(dev_con,
+ &mc_drv_cmd_map_bulk_mem,
+ sizeof(mc_drv_cmd_map_bulk_mem));
/* Read command response */
struct mc_drv_response_header_t rsp_header;
- int len = connection_read_datablock(
- dev_con,
- &rsp_header,
- sizeof(rsp_header));
+ int len = connection_read_datablock(dev_con,
+ &rsp_header,
+ sizeof(rsp_header));
if (len != sizeof(rsp_header)) {
- MCDRV_DBG_ERROR("CMD_MAP_BULK_BUF readRsp failed, "
- "ret=%d", len);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_MAP_BULK_BUF readRsp failed %d",
+ len);
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
break;
}
if (rsp_header.response_id != MC_DRV_RSP_OK) {
- MCDRV_DBG_ERROR("CMD_MAP_BULK_BUF failed, respId=%d",
- rsp_header.response_id);
- /* REV We ignore Daemon Error code because client cannot
- handle it anyhow. */
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_MAP_BULK_BUF failed, respId=%d",
+ rsp_header.response_id);
+
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
- /* Unregister mapped bulk buffer from Kernel Module and
- remove mapped bulk buffer from session maintenance */
+ /*
+ * Unregister mapped bulk buffer from Kernel Module and
+ * remove mapped bulk buffer from session maintenance
+ */
if (!session_remove_bulk_buf(session, buf)) {
/* Removing of bulk buffer not possible */
- MCDRV_DBG_ERROR("Unregistering of bulk memory"
- "from Kernel Module failed");
+ MCDRV_DBG_ERROR(mc_kapi,
+ "Unreg of bulk memory failed");
}
break;
}
struct mc_drv_rsp_map_bulk_mem_payload_t
rsp_map_bulk_mem_payload;
- connection_read_datablock(
- dev_con,
- &rsp_map_bulk_mem_payload,
- sizeof(rsp_map_bulk_mem_payload));
+ connection_read_datablock(dev_con,
+ &rsp_map_bulk_mem_payload,
+ sizeof(rsp_map_bulk_mem_payload));
/* Set mapping info for Trustlet */
map_info->secure_virt_addr =
@@ -901,37 +859,30 @@
} while (false);
- /* Exit critical section */
-
return mc_result;
}
EXPORT_SYMBOL(mc_map);
-/*----------------------------------------------------------------------------*/
-enum mc_result mc_unmap(
- struct mc_session_handle *session_handle,
- void *buf,
- struct mc_bulk_map *map_info
-) {
+enum mc_result mc_unmap(struct mc_session_handle *session_handle, void *buf,
+ struct mc_bulk_map *map_info)
+{
enum mc_result mc_result = MC_DRV_ERR_UNKNOWN;
- MCDRV_DBG_VERBOSE("===%s()===", __func__);
-
- /* Enter critical section */
+ MCDRV_DBG_VERBOSE(mc_kapi, "===%s()===", __func__);
do {
if (session_handle == NULL) {
- MCDRV_DBG_ERROR("session_handle is null");
+ MCDRV_DBG_ERROR(mc_kapi, "session_handle is null");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
if (map_info == NULL) {
- MCDRV_DBG_ERROR("map_info is null");
+ MCDRV_DBG_ERROR(mc_kapi, "map_info is null");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
if (buf == NULL) {
- MCDRV_DBG_ERROR("buf is null");
+ MCDRV_DBG_ERROR(mc_kapi, "buf is null");
mc_result = MC_DRV_ERR_INVALID_PARAMETER;
break;
}
@@ -940,79 +891,74 @@
struct mcore_device_t *device =
resolve_device_id(session_handle->device_id);
if (device == NULL) {
- MCDRV_DBG_ERROR("Device not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Device not found");
mc_result = MC_DRV_ERR_UNKNOWN_DEVICE;
break;
}
- struct connection *dev_con = device->connection;
+ struct connection *dev_con = device->connection;
/* Get session */
+ uint32_t session_id = session_handle->session_id;
struct session *session =
mcore_device_resolve_session_id(device,
- session_handle->session_id);
+ session_id);
if (session == NULL) {
- MCDRV_DBG_ERROR("Session not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Session not found");
mc_result = MC_DRV_ERR_UNKNOWN_SESSION;
break;
}
/* Prepare unmap command */
struct mc_drv_cmd_unmap_bulk_mem_t cmd_unmap_bulk_mem = {
- /* .header = */ {
- /* .command_id = */
- MC_DRV_CMD_UNMAP_BULK_BUF
+ {
+ MC_DRV_CMD_UNMAP_BULK_BUF
},
- /* .payload = */ {
- /* .session_id = */ session->session_id,
- /* .secure_virtual_adr = */
- (uint32_t)(map_info->secure_virt_addr),
- /* .len_bulk_mem =
- map_info->secure_virt_len*/
+ {
+ session->session_id,
+ (uint32_t)(map_info->secure_virt_addr)
}
};
- connection_write_data(
- dev_con,
- &cmd_unmap_bulk_mem,
- sizeof(cmd_unmap_bulk_mem));
+ connection_write_data(dev_con,
+ &cmd_unmap_bulk_mem,
+ sizeof(cmd_unmap_bulk_mem));
/* Read command response */
struct mc_drv_response_header_t rsp_header;
- int len = connection_read_datablock(
- dev_con,
- &rsp_header,
- sizeof(rsp_header));
+ int len = connection_read_datablock(dev_con,
+ &rsp_header,
+ sizeof(rsp_header));
if (len != sizeof(rsp_header)) {
- MCDRV_DBG_ERROR("CMD_UNMAP_BULK_BUF readRsp failed, "
- "ret=%d", len);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_UNMAP_BULK_BUF readRsp failed %d",
+ len);
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
break;
}
if (rsp_header.response_id != MC_DRV_RSP_OK) {
- MCDRV_DBG_ERROR("CMD_UNMAP_BULK_BUF failed, respId=%d",
- rsp_header.response_id);
- /* REV We ignore Daemon Error code because client
- cannot handle it anyhow. */
+ MCDRV_DBG_ERROR(mc_kapi,
+ "CMD_UNMAP_BULK_BUF failed, respId=%d",
+ rsp_header.response_id);
+
mc_result = MC_DRV_ERR_DAEMON_UNREACHABLE;
break;
}
struct mc_drv_rsp_unmap_bulk_mem_payload_t
rsp_unmap_bulk_mem_payload;
- connection_read_datablock(
- dev_con,
- &rsp_unmap_bulk_mem_payload,
- sizeof(rsp_unmap_bulk_mem_payload));
+ connection_read_datablock(dev_con,
+ &rsp_unmap_bulk_mem_payload,
+ sizeof(rsp_unmap_bulk_mem_payload));
- /* REV axh: what about check the payload? */
-
- /* Unregister mapped bulk buffer from Kernel Module and
- * remove mapped bulk buffer from session maintenance */
+ /*
+ * Unregister mapped bulk buffer from Kernel Module and
+ * remove mapped bulk buffer from session maintenance
+ */
if (!session_remove_bulk_buf(session, buf)) {
/* Removing of bulk buffer not possible */
- MCDRV_DBG_ERROR("Unregistering of bulk memory from "
- "Kernel Module failed");
+ MCDRV_DBG_ERROR(mc_kapi,
+ "Unregistering of bulk memory failed");
mc_result = MC_DRV_ERR_BULK_UNMAPPING;
break;
}
@@ -1021,20 +967,16 @@
} while (false);
- /* Exit critical section */
-
return mc_result;
}
EXPORT_SYMBOL(mc_unmap);
-/*----------------------------------------------------------------------------*/
-enum mc_result mc_get_session_error_code(
- struct mc_session_handle *session,
- int32_t *last_error
-) {
+enum mc_result mc_get_session_error_code(struct mc_session_handle *session,
+ int32_t *last_error)
+{
enum mc_result mc_result = MC_DRV_OK;
- MCDRV_DBG_VERBOSE("===%s()===", __func__);
+ MCDRV_DBG_VERBOSE(mc_kapi, "===%s()===", __func__);
do {
if (session == NULL || last_error == NULL) {
@@ -1044,23 +986,24 @@
/* Get device */
struct mcore_device_t *device =
- resolve_device_id(session->device_id);
+ resolve_device_id(session->device_id);
if (device == NULL) {
- MCDRV_DBG_ERROR("Device not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Device not found");
mc_result = MC_DRV_ERR_UNKNOWN_DEVICE;
break;
}
/* Get session */
+ uint32_t session_id = session->session_id;
struct session *nqsession =
- mcore_device_resolve_session_id(device, session->session_id);
+ mcore_device_resolve_session_id(device,
+ session_id);
if (nqsession == NULL) {
- MCDRV_DBG_ERROR("Session not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Session not found");
mc_result = MC_DRV_ERR_UNKNOWN_SESSION;
break;
}
- /* get session error code from session */
*last_error = session_get_last_err(nqsession);
} while (false);
@@ -1069,24 +1012,17 @@
}
EXPORT_SYMBOL(mc_get_session_error_code);
-/*----------------------------------------------------------------------------*/
-enum mc_result mc_driver_ctrl(
- enum mc_driver_ctrl param,
- uint8_t *data,
- uint32_t len
-) {
- MCDRV_DBG_WARN("not implemented");
+enum mc_result mc_driver_ctrl(enum mc_driver_ctrl param, uint8_t *data,
+ uint32_t len)
+{
+ MCDRV_DBG_WARN(mc_kapi, "not implemented");
return MC_DRV_ERR_NOT_IMPLEMENTED;
}
EXPORT_SYMBOL(mc_driver_ctrl);
-/*----------------------------------------------------------------------------*/
-enum mc_result mc_manage(
- uint32_t device_id,
- uint8_t *data,
- uint32_t len
-) {
- MCDRV_DBG_WARN("not implemented");
+enum mc_result mc_manage(uint32_t device_id, uint8_t *data, uint32_t len)
+{
+ MCDRV_DBG_WARN(mc_kapi, "not implemented");
return MC_DRV_ERR_NOT_IMPLEMENTED;
}
EXPORT_SYMBOL(mc_manage);
diff --git a/drivers/gud/mobicore_kernelapi/common.h b/drivers/gud/mobicore_kernelapi/common.h
index 2a73474..8e74520 100644
--- a/drivers/gud/mobicore_kernelapi/common.h
+++ b/drivers/gud/mobicore_kernelapi/common.h
@@ -1,97 +1,71 @@
-/**
+/*
+ * Common data types for use by the MobiCore Kernel API Driver
*
- * Common data types
- *
- * <!-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef _MC_KAPI_COMMON_H
+#define _MC_KAPI_COMMON_H
#include "connection.h"
#include "mcinq.h"
-void mcapi_insert_connection(
- struct connection *connection
-);
+void mcapi_insert_connection(struct connection *connection);
+void mcapi_remove_connection(uint32_t seq);
+unsigned int mcapi_unique_id(void);
-void mcapi_remove_connection(
- uint32_t seq
-);
+#define MC_DAEMON_PID 0xFFFFFFFF
+#define MC_DRV_MOD_DEVNODE_FULLPATH "/dev/mobicore"
-unsigned int mcapi_unique_id(
- void
-);
+/* dummy function helper macro */
+#define DUMMY_FUNCTION() do {} while (0)
+/* Found in main.c */
+extern struct device *mc_kapi;
-#define MC_DAEMON_PID 0xFFFFFFFF
-#define MC_DRV_MOD_DEVNODE_FULLPATH "/dev/mobicore"
-
-/* dummy function helper macro. */
-#define DUMMY_FUNCTION() do {} while (0)
-
-#define MCDRV_ERROR(txt, ...) \
- printk(KERN_ERR "mcKernelApi %s() ### ERROR: " txt, \
- __func__, \
- ##__VA_ARGS__)
+#define MCDRV_ERROR(dev, txt, ...) \
+ dev_err(dev, "%s() ### ERROR: " txt, __func__, ##__VA_ARGS__)
#if defined(DEBUG)
-
-/* #define DEBUG_VERBOSE */
#if defined(DEBUG_VERBOSE)
-#define MCDRV_DBG_VERBOSE MCDRV_DBG
+#define MCDRV_DBG_VERBOSE MCDRV_DBG
#else
-#define MCDRV_DBG_VERBOSE(...) DUMMY_FUNCTION()
+#define MCDRV_DBG_VERBOSE(...) DUMMY_FUNCTION()
#endif
-#define MCDRV_DBG(txt, ...) \
- printk(KERN_INFO "mcKernelApi %s(): " txt, \
- __func__, \
- ##__VA_ARGS__)
+#define MCDRV_DBG(dev, txt, ...) \
+ dev_info(dev, "%s(): " txt, __func__, ##__VA_ARGS__)
-#define MCDRV_DBG_WARN(txt, ...) \
- printk(KERN_WARNING "mcKernelApi %s() WARNING: " txt, \
- __func__, \
- ##__VA_ARGS__)
+#define MCDRV_DBG_WARN(dev, txt, ...) \
+ dev_warn(dev, "%s() WARNING: " txt, __func__, ##__VA_ARGS__)
-#define MCDRV_DBG_ERROR(txt, ...) \
- printk(KERN_ERR "mcKernelApi %s() ### ERROR: " txt, \
- __func__, \
- ##__VA_ARGS__)
-
+#define MCDRV_DBG_ERROR(dev, txt, ...) \
+ dev_err(dev, "%s() ### ERROR: " txt, __func__, ##__VA_ARGS__)
#define MCDRV_ASSERT(cond) \
do { \
if (unlikely(!(cond))) { \
- panic("mcKernelApi Assertion failed: %s:%d\n", \
- __FILE__, __LINE__); \
+ panic("mc_kernelapi Assertion failed: %s:%d\n", \
+ __FILE__, __LINE__); \
} \
} while (0)
#elif defined(NDEBUG)
-#define MCDRV_DBG_VERBOSE(...) DUMMY_FUNCTION()
-#define MCDRV_DBG(...) DUMMY_FUNCTION()
-#define MCDRV_DBG_WARN(...) DUMMY_FUNCTION()
-#define MCDRV_DBG_ERROR(...) DUMMY_FUNCTION()
+#define MCDRV_DBG_VERBOSE(...) DUMMY_FUNCTION()
+#define MCDRV_DBG(...) DUMMY_FUNCTION()
+#define MCDRV_DBG_WARN(...) DUMMY_FUNCTION()
+#define MCDRV_DBG_ERROR(...) DUMMY_FUNCTION()
-#define MCDRV_ASSERT(...) DUMMY_FUNCTION()
+#define MCDRV_ASSERT(...) DUMMY_FUNCTION()
#else
#error "Define DEBUG or NDEBUG"
#endif /* [not] defined(DEBUG_MCMODULE) */
+#define assert(expr) MCDRV_ASSERT(expr)
-#define LOG_I MCDRV_DBG_VERBOSE
-#define LOG_W MCDRV_DBG_WARN
-#define LOG_E MCDRV_DBG_ERROR
-
-
-#define assert(expr) MCDRV_ASSERT(expr)
-
-#endif /* COMMON_H */
-
-/** @} */
+#endif /* _MC_KAPI_COMMON_H */
diff --git a/drivers/gud/mobicore_kernelapi/connection.c b/drivers/gud/mobicore_kernelapi/connection.c
index 9048ae8..5047349 100644
--- a/drivers/gud/mobicore_kernelapi/connection.c
+++ b/drivers/gud/mobicore_kernelapi/connection.c
@@ -1,10 +1,7 @@
-/** @addtogroup MCD_MCDIMPL_DAEMON_SRV
- * @{
- * @file
- *
+/*
* Connection data.
*
- * <!-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -26,37 +23,29 @@
/* Define the initial state of the Data Available Semaphore */
#define SEM_NO_DATA_AVAILABLE 0
-/*----------------------------------------------------------------------------*/
-struct connection *connection_new(
- void
-) {
- struct connection *conn = kzalloc(sizeof(struct connection),
- GFP_KERNEL);
+struct connection *connection_new(void)
+{
+ struct connection *conn;
+
+ conn = kzalloc(sizeof(*conn), GFP_KERNEL);
conn->sequence_magic = mcapi_unique_id();
mutex_init(&conn->data_lock);
- /* No data available */
sema_init(&conn->data_available_sem, SEM_NO_DATA_AVAILABLE);
mcapi_insert_connection(conn);
return conn;
}
-/*----------------------------------------------------------------------------*/
-struct connection *connection_create(
- int socket_descriptor,
- pid_t dest
-) {
+struct connection *connection_create(int socket_descriptor, pid_t dest)
+{
struct connection *conn = connection_new();
conn->peer_pid = dest;
return conn;
}
-
-/*----------------------------------------------------------------------------*/
-void connection_cleanup(
- struct connection *conn
-) {
+void connection_cleanup(struct connection *conn)
+{
if (!conn)
return;
@@ -66,26 +55,20 @@
kfree(conn);
}
-
-/*----------------------------------------------------------------------------*/
-bool connection_connect(
- struct connection *conn,
- pid_t dest
-) {
+bool connection_connect(struct connection *conn, pid_t dest)
+{
/* Nothing to connect */
conn->peer_pid = dest;
return true;
}
-/*----------------------------------------------------------------------------*/
-size_t connection_readDataMsg(
- struct connection *conn,
- void *buffer,
- uint32_t len
-) {
+size_t connection_read_data_msg(struct connection *conn, void *buffer,
+ uint32_t len)
+{
size_t ret = -1;
- MCDRV_DBG_VERBOSE("reading connection data %u, connection data left %u",
- len, conn->data_len);
+ MCDRV_DBG_VERBOSE(mc_kapi,
+ "reading connection data %u, connection data left %u",
+ len, conn->data_len);
/* trying to read more than the left data */
if (len > conn->data_len) {
ret = conn->data_len;
@@ -98,80 +81,75 @@
conn->data_start += len;
}
- if (conn->data_len == 0) {
+ if (conn->data_len == 0) {
conn->data_start = NULL;
kfree_skb(conn->skb);
conn->skb = NULL;
}
- MCDRV_DBG_VERBOSE("read %u", ret);
+ MCDRV_DBG_VERBOSE(mc_kapi, "read %u", ret);
return ret;
}
-/*----------------------------------------------------------------------------*/
-size_t connection_read_datablock(
- struct connection *conn,
- void *buffer,
- uint32_t len
-) {
+size_t connection_read_datablock(struct connection *conn, void *buffer,
+ uint32_t len)
+{
return connection_read_data(conn, buffer, len, -1);
}
-
-/*----------------------------------------------------------------------------*/
-size_t connection_read_data(
- struct connection *conn,
- void *buffer,
- uint32_t len,
- int32_t timeout
-) {
+size_t connection_read_data(struct connection *conn, void *buffer, uint32_t len,
+ int32_t timeout)
+{
size_t ret = 0;
MCDRV_ASSERT(buffer != NULL);
MCDRV_ASSERT(conn->socket_descriptor != NULL);
- MCDRV_DBG_VERBOSE("read data len = %u for PID = %u",
- len, conn->sequence_magic);
+ MCDRV_DBG_VERBOSE(mc_kapi, "read data len = %u for PID = %u",
+ len, conn->sequence_magic);
do {
- /* Wait until data is available or timeout
- msecs_to_jiffies(-1) -> wait forever for the sem */
+ /*
+ * Wait until data is available or timeout
+ * msecs_to_jiffies(-1) -> wait forever for the sem
+ */
if (down_timeout(&(conn->data_available_sem),
- msecs_to_jiffies(timeout))) {
- MCDRV_DBG_VERBOSE("Timeout reading the data sem");
+ msecs_to_jiffies(timeout))) {
+ MCDRV_DBG_VERBOSE(mc_kapi,
+ "Timeout reading the data sem");
ret = -2;
break;
}
if (mutex_lock_interruptible(&(conn->data_lock))) {
- MCDRV_DBG_ERROR("interrupted reading the data sem");
+ MCDRV_DBG_ERROR(mc_kapi,
+ "interrupted reading the data sem");
ret = -1;
break;
}
+
/* Have data, use it */
if (conn->data_len > 0)
- ret = connection_readDataMsg(conn, buffer, len);
+ ret = connection_read_data_msg(conn, buffer, len);
- mutex_unlock(&(conn->data_lock));
+ mutex_unlock(&(conn->data_lock));
/* There is still some data left */
if (conn->data_len > 0)
up(&conn->data_available_sem);
+
} while (0);
return ret;
}
-/*----------------------------------------------------------------------------*/
-size_t connection_write_data(
- struct connection *conn,
- void *buffer,
- uint32_t len
-) {
+size_t connection_write_data(struct connection *conn, void *buffer,
+ uint32_t len)
+{
struct sk_buff *skb = NULL;
struct nlmsghdr *nlh;
int ret = 0;
- MCDRV_DBG_VERBOSE("buffer length %u from pid %u\n",
- len, conn->sequence_magic);
+ MCDRV_DBG_VERBOSE(mc_kapi, "buffer length %u from pid %u\n",
+ len, conn->sequence_magic);
do {
skb = nlmsg_new(NLMSG_SPACE(len), GFP_KERNEL);
if (!skb) {
@@ -180,7 +158,7 @@
}
nlh = nlmsg_put(skb, 0, conn->sequence_magic, 2,
- NLMSG_LENGTH(len), NLM_F_REQUEST);
+ NLMSG_LENGTH(len), NLM_F_REQUEST);
if (!nlh) {
ret = -1;
break;
@@ -188,7 +166,7 @@
memcpy(NLMSG_DATA(nlh), buffer, len);
netlink_unicast(conn->socket_descriptor, skb,
- conn->peer_pid, MSG_DONTWAIT);
+ conn->peer_pid, MSG_DONTWAIT);
ret = len;
} while (0);
@@ -198,15 +176,13 @@
return ret;
}
-int connection_process(
- struct connection *conn,
- struct sk_buff *skb
-)
+int connection_process(struct connection *conn, struct sk_buff *skb)
{
int ret = 0;
do {
if (mutex_lock_interruptible(&(conn->data_lock))) {
- MCDRV_DBG_ERROR("Interrupted getting data semaphore!");
+ MCDRV_DBG_ERROR(mc_kapi,
+ "Interrupted getting data semaphore!");
ret = -1;
break;
}
@@ -226,4 +202,3 @@
} while (0);
return ret;
}
-/** @} */
diff --git a/drivers/gud/mobicore_kernelapi/connection.h b/drivers/gud/mobicore_kernelapi/connection.h
index 0b468e6..da99828 100644
--- a/drivers/gud/mobicore_kernelapi/connection.h
+++ b/drivers/gud/mobicore_kernelapi/connection.h
@@ -1,122 +1,57 @@
-/** @addtogroup MCD_MCDIMPL_DAEMON_SRV
- * @{
- * @file
- *
+/*
* Connection data.
*
- * <!-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#ifndef CONNECTION_H_
-#define CONNECTION_H_
+#ifndef _MC_KAPI_CONNECTION_H_
+#define _MC_KAPI_CONNECTION_H_
#include <linux/semaphore.h>
#include <stddef.h>
#include <stdbool.h>
-#define MAX_PAYLOAD_SIZE 128
-
struct connection {
- struct sock *socket_descriptor; /**< Netlink socket */
- uint32_t sequence_magic; /**< Random? magic to match requests/answers */
+ /* Netlink socket */
+ struct sock *socket_descriptor;
+ /* Random? magic to match requests/answers */
+ uint32_t sequence_magic;
- struct nlmsghdr *data_msg;
- uint32_t data_len; /**< How much connection data is left */
- void *data_start; /**< Start pointer of remaining data */
- struct sk_buff *skb;
+ struct nlmsghdr *data_msg;
+ /* How much connection data is left */
+ uint32_t data_len;
+ /* Start pointer of remaining data */
+ void *data_start;
+ struct sk_buff *skb;
- struct mutex data_lock; /**< Data protection lock */
- struct semaphore data_available_sem; /**< Data protection semaphore */
+ /* Data protection lock */
+ struct mutex data_lock;
+ /* Data protection semaphore */
+ struct semaphore data_available_sem;
- pid_t self_pid; /**< PID address used for local connection */
- pid_t peer_pid; /**< Remote PID for connection */
+ /* PID address used for local connection */
+ pid_t self_pid;
+ /* Remote PID for connection */
+ pid_t peer_pid;
- struct list_head list; /**< The list param for using the kernel lists*/
+ /* The list param for using the kernel lists */
+ struct list_head list;
};
-struct connection *connection_new(
- void
-);
+struct connection *connection_new(void);
+struct connection *connection_create(int socket_descriptor, pid_t dest);
+void connection_cleanup(struct connection *conn);
+bool connection_connect(struct connection *conn, pid_t dest);
+size_t connection_read_datablock(struct connection *conn, void *buffer,
+ uint32_t len);
+size_t connection_read_data(struct connection *conn, void *buffer,
+ uint32_t len, int32_t timeout);
+size_t connection_write_data(struct connection *conn, void *buffer,
+ uint32_t len);
+int connection_process(struct connection *conn, struct sk_buff *skb);
-struct connection *connection_create(
- int socket_descriptor,
- pid_t dest
-);
-
-void connection_cleanup(
- struct connection *conn
-);
-
-/**
- * Connect to destination.
- *
- * @param Destination pointer.
- * @return true on success.
- */
-bool connection_connect(
- struct connection *conn,
- pid_t dest
-);
-
-
-/**
- * Read bytes from the connection.
- *
- * @param buffer Pointer to destination buffer.
- * @param len Number of bytes to read.
- * @return Number of bytes read.
- */
-size_t connection_read_datablock(
- struct connection *conn,
- void *buffer,
- uint32_t len
-);
-/**
- * Read bytes from the connection.
- *
- * @param buffer Pointer to destination buffer.
- * @param len Number of bytes to read.
- * @param timeout Timeout in milliseconds
- * @return Number of bytes read.
- * @return -1 if select() failed (returned -1)
- * @return -2 if no data available, i.e. timeout
- */
-size_t connection_read_data(
- struct connection *conn,
- void *buffer,
- uint32_t len,
- int32_t timeout
-);
-
-/**
- * Write bytes to the connection.
- *
- * @param buffer Pointer to source buffer.
- * @param len Number of bytes to read.
- * @return Number of bytes written.
- */
-size_t connection_write_data(
- struct connection *conn,
- void *buffer,
- uint32_t len
-);
-
-/**
- * Write bytes to the connection.
- *
- * @param buffer Pointer to source buffer.
- * @param len Number of bytes to read.
- * @return Number of bytes written.
- */
-int connection_process(
- struct connection *conn,
- struct sk_buff *skb
-);
-
-#endif /* CONNECTION_H_ */
-
-/** @} */
+#endif /* _MC_KAPI_CONNECTION_H_ */
diff --git a/drivers/gud/mobicore_kernelapi/device.c b/drivers/gud/mobicore_kernelapi/device.c
index dbeee6a..e3eb41e 100644
--- a/drivers/gud/mobicore_kernelapi/device.c
+++ b/drivers/gud/mobicore_kernelapi/device.c
@@ -1,12 +1,9 @@
-/** @addtogroup MCD_IMPL_LIB
- * @{
- * @file
- *
- * Client library device management.
+/*
+ * MobiCore client library device management.
*
* Device and Trustlet Session management Funtions.
*
- * <!-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -14,21 +11,19 @@
*/
#include <linux/list.h>
#include <linux/slab.h>
+#include <linux/device.h>
#include "mc_kernel_api.h"
#include "public/mobicore_driver_api.h"
#include "device.h"
#include "common.h"
-/*----------------------------------------------------------------------------*/
-struct wsm *wsm_create(
- void *virt_addr,
- uint32_t len,
- uint32_t handle,
- void *phys_addr /*= NULL this may be unknown, so is can be omitted.*/
- )
+struct wsm *wsm_create(void *virt_addr, uint32_t len, uint32_t handle,
+ void *phys_addr)
{
- struct wsm *wsm = kzalloc(sizeof(struct wsm), GFP_KERNEL);
+ struct wsm *wsm;
+
+ wsm = kzalloc(sizeof(*wsm), GFP_KERNEL);
wsm->virt_addr = virt_addr;
wsm->len = len;
wsm->handle = handle;
@@ -36,14 +31,12 @@
return wsm;
}
+struct mcore_device_t *mcore_device_create(uint32_t device_id,
+ struct connection *connection)
+{
+ struct mcore_device_t *dev;
-/*----------------------------------------------------------------------------*/
-struct mcore_device_t *mcore_device_create(
- uint32_t device_id,
- struct connection *connection
-) {
- struct mcore_device_t *dev =
- kzalloc(sizeof(struct mcore_device_t), GFP_KERNEL);
+ dev = kzalloc(sizeof(*dev), GFP_KERNEL);
dev->device_id = device_id;
dev->connection = connection;
@@ -53,17 +46,16 @@
return dev;
}
-
-/*----------------------------------------------------------------------------*/
-void mcore_device_cleanup(
- struct mcore_device_t *dev
-) {
+void mcore_device_cleanup(struct mcore_device_t *dev)
+{
struct session *tmp;
struct wsm *wsm;
struct list_head *pos, *q;
- /* Delete all session objects. Usually this should not be needed
- * as closeDevice()requires that all sessions have been closed before.*/
+ /*
+ * Delete all session objects. Usually this should not be needed
+ * as close_device() requires that all sessions have been closed before.
+ */
list_for_each_safe(pos, q, &dev->session_vector) {
tmp = list_entry(pos, struct session, list);
list_del(pos);
@@ -73,7 +65,6 @@
/* Free all allocated WSM descriptors */
list_for_each_safe(pos, q, &dev->wsm_l2_vector) {
wsm = list_entry(pos, struct wsm, list);
- /* mcKMod_free(dev->instance, wsm->handle); */
list_del(pos);
kfree(wsm);
}
@@ -83,56 +74,41 @@
kfree(dev);
}
-
-/*----------------------------------------------------------------------------*/
-bool mcore_device_open(
- struct mcore_device_t *dev,
- const char *deviceName
-) {
+bool mcore_device_open(struct mcore_device_t *dev, const char *deviceName)
+{
dev->instance = mobicore_open();
return (dev->instance != NULL);
}
-
-/*----------------------------------------------------------------------------*/
-void mcore_device_close(
- struct mcore_device_t *dev
-) {
+void mcore_device_close(struct mcore_device_t *dev)
+{
mobicore_release(dev->instance);
}
-
-/*----------------------------------------------------------------------------*/
-bool mcore_device_has_sessions(
- struct mcore_device_t *dev
-) {
+bool mcore_device_has_sessions(struct mcore_device_t *dev)
+{
return !list_empty(&dev->session_vector);
}
-
-/*----------------------------------------------------------------------------*/
-bool mcore_device_create_new_session(
- struct mcore_device_t *dev,
- uint32_t session_id,
- struct connection *connection
-) {
+bool mcore_device_create_new_session(struct mcore_device_t *dev,
+ uint32_t session_id,
+ struct connection *connection)
+{
/* Check if session_id already exists */
if (mcore_device_resolve_session_id(dev, session_id)) {
- MCDRV_DBG_ERROR(" session %u already exists", session_id);
+ MCDRV_DBG_ERROR(mc_kapi,
+ " session %u already exists", session_id);
return false;
}
- struct session *session = session_create(session_id, dev->instance,
- connection);
+ struct session *session =
+ session_create(session_id, dev->instance, connection);
list_add_tail(&(session->list), &(dev->session_vector));
return true;
}
-
-/*----------------------------------------------------------------------------*/
-bool mcore_device_remove_session(
- struct mcore_device_t *dev,
- uint32_t session_id
-) {
+bool mcore_device_remove_session(struct mcore_device_t *dev,
+ uint32_t session_id)
+{
bool ret = false;
struct session *tmp;
struct list_head *pos, *q;
@@ -149,17 +125,13 @@
return ret;
}
-
-/*----------------------------------------------------------------------------*/
-struct session *mcore_device_resolve_session_id(
- struct mcore_device_t *dev,
- uint32_t session_id
-) {
- struct session *ret = NULL;
+struct session *mcore_device_resolve_session_id(struct mcore_device_t *dev,
+ uint32_t session_id)
+{
+ struct session *ret = NULL;
struct session *tmp;
struct list_head *pos;
-
/* Get session for session_id */
list_for_each(pos, &dev->session_vector) {
tmp = list_entry(pos, struct session, list);
@@ -171,26 +143,20 @@
return ret;
}
-
-/*----------------------------------------------------------------------------*/
-struct wsm *mcore_device_allocate_contiguous_wsm(
- struct mcore_device_t *dev,
- uint32_t len
-) {
+struct wsm *mcore_device_allocate_contiguous_wsm(struct mcore_device_t *dev,
+ uint32_t len)
+{
struct wsm *wsm = NULL;
do {
if (len == 0)
break;
/* Allocate shared memory */
- void *virt_addr;
- uint32_t handle;
- void *phys_addr;
- int ret = mobicore_allocate_wsm(dev->instance,
- len,
- &handle,
- &virt_addr,
- &phys_addr);
+ void *virt_addr;
+ uint32_t handle;
+ void *phys_addr;
+ int ret = mobicore_allocate_wsm(dev->instance, len, &handle,
+ &virt_addr, &phys_addr);
if (ret != 0)
break;
@@ -201,16 +167,12 @@
} while (0);
- /* Return pointer to the allocated memory */
return wsm;
}
-
-/*----------------------------------------------------------------------------*/
-bool mcore_device_free_contiguous_wsm(
- struct mcore_device_t *dev,
- struct wsm *wsm
-) {
+bool mcore_device_free_contiguous_wsm(struct mcore_device_t *dev,
+ struct wsm *wsm)
+{
bool ret = false;
struct wsm *tmp;
struct list_head *pos;
@@ -224,8 +186,9 @@
}
if (ret) {
- MCDRV_DBG_VERBOSE("freeWsm virt_addr=0x%p, handle=%d",
- wsm->virt_addr, wsm->handle);
+ MCDRV_DBG_VERBOSE(mc_kapi,
+ "freeWsm virt_addr=0x%p, handle=%d",
+ wsm->virt_addr, wsm->handle);
/* ignore return code */
mobicore_free(dev->instance, wsm->handle);
@@ -236,12 +199,9 @@
return ret;
}
-
-/*----------------------------------------------------------------------------*/
-struct wsm *mcore_device_find_contiguous_wsm(
- struct mcore_device_t *dev,
- void *virt_addr
-) {
+struct wsm *mcore_device_find_contiguous_wsm(struct mcore_device_t *dev,
+ void *virt_addr)
+{
struct wsm *wsm;
struct list_head *pos;
@@ -253,5 +213,3 @@
return NULL;
}
-
-/** @} */
diff --git a/drivers/gud/mobicore_kernelapi/device.h b/drivers/gud/mobicore_kernelapi/device.h
index f40d993..8a38b50 100644
--- a/drivers/gud/mobicore_kernelapi/device.h
+++ b/drivers/gud/mobicore_kernelapi/device.h
@@ -1,19 +1,16 @@
-/** @addtogroup MCD_IMPL_LIB
- * @{
- * @file
- *
- * Client library device management.
+/*
+ * MobiCore client library device management.
*
* Device and Trustlet Session management Functions.
*
- * <!-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#ifndef DEVICE_H_
-#define DEVICE_H_
+#ifndef _MC_KAPI_DEVICE_H_
+#define _MC_KAPI_DEVICE_H_
#include <linux/list.h>
@@ -21,119 +18,37 @@
#include "session.h"
#include "wsm.h"
-
struct mcore_device_t {
- struct list_head session_vector; /**< MobiCore Trustlet session
- associated with the device */
- struct list_head wsm_l2_vector; /**< WSM L2 Table */
+ /* MobiCore Trustlet session associated with the device */
+ struct list_head session_vector;
+ struct list_head wsm_l2_vector;
- uint32_t device_id; /**< Device identifier */
- struct connection *connection; /**< The device connection */
- struct mc_instance *instance; /**< MobiCore Driver instance */
+ uint32_t device_id; /* Device identifier */
+ struct connection *connection; /* The device connection */
+ struct mc_instance *instance; /* MobiCore Driver instance */
- struct list_head list; /**< The list param for using the kernel lists*/
+ /* The list param for using the kernel lists */
+ struct list_head list;
};
struct mcore_device_t *mcore_device_create(
- uint32_t device_id,
- struct connection *connection
-);
-
-void mcore_device_cleanup(
- struct mcore_device_t *dev
-);
-
-/**
- * Open the device.
- * @param deviceName Name of the kernel modules device file.
- * @return true if the device has been opened successfully
- */
-bool mcore_device_open(
- struct mcore_device_t *dev,
- const char *deviceName
-);
-
-/**
- * Closes the device.
- */
-void mcore_device_close(
- struct mcore_device_t *dev
-);
-
-/**
- * Check if the device has open sessions.
- * @return true if the device has one or more open sessions.
- */
-bool mcore_device_has_sessions(
- struct mcore_device_t *dev
-);
-
-/**
- * Add a session to the device.
- * @param session_id session ID
- * @param connection session connection
- */
+ uint32_t device_id, struct connection *connection);
+void mcore_device_cleanup(struct mcore_device_t *dev);
+bool mcore_device_open(struct mcore_device_t *dev, const char *deviceName);
+void mcore_device_close(struct mcore_device_t *dev);
+bool mcore_device_has_sessions(struct mcore_device_t *dev);
bool mcore_device_create_new_session(
- struct mcore_device_t *dev,
- uint32_t session_id,
- struct connection *connection
-);
-
-/**
- * Remove the specified session from the device.
- * The session object will be destroyed and all resources associated with it
- * will be freed.
- *
- * @param session_id Session of the session to remove.
- * @return true if a session has been found and removed.
- */
+ struct mcore_device_t *dev, uint32_t session_id,
+ struct connection *connection);
bool mcore_device_remove_session(
- struct mcore_device_t *dev,
- uint32_t session_id
-);
-
-/**
- * Get as session object for a given session ID.
- * @param session_id Identified of a previously opened session.
- * @return Session object if available or NULL if no session has been found.
- */
+ struct mcore_device_t *dev, uint32_t session_id);
struct session *mcore_device_resolve_session_id(
- struct mcore_device_t *dev,
- uint32_t session_id
-);
-
-/**
- * Allocate a block of contiguous WSM.
- * @param len The virtual address to be registered.
- * @return The virtual address of the allocated memory or NULL if no memory
- * is available.
- */
+ struct mcore_device_t *dev, uint32_t session_id);
struct wsm *mcore_device_allocate_contiguous_wsm(
- struct mcore_device_t *dev,
- uint32_t len
-);
-
-/**
- * Unregister a vaddr from a device.
- * @param vaddr The virtual address to be registered.
- * @param paddr The physical address to be registered.
- */
+ struct mcore_device_t *dev, uint32_t len);
bool mcore_device_free_contiguous_wsm(
- struct mcore_device_t *dev,
- struct wsm *wsm
-);
-
-/**
- * Get a WSM object for a given virtual address.
- * @param vaddr The virtual address which has been allocate with mc_malloc_wsm()
- * in advance.
- * @return the WSM object or NULL if no address has been found.
- */
+ struct mcore_device_t *dev, struct wsm *wsm);
struct wsm *mcore_device_find_contiguous_wsm(
- struct mcore_device_t *dev,
- void *virt_addr
-);
+ struct mcore_device_t *dev, void *virt_addr);
-#endif /* DEVICE_H_ */
-
-/** @} */
+#endif /* _MC_KAPI_DEVICE_H_ */
diff --git a/drivers/gud/mobicore_kernelapi/include/mcinq.h b/drivers/gud/mobicore_kernelapi/include/mcinq.h
index 3cb82be..85f037f 100644
--- a/drivers/gud/mobicore_kernelapi/include/mcinq.h
+++ b/drivers/gud/mobicore_kernelapi/include/mcinq.h
@@ -1,7 +1,7 @@
-/** @addtogroup NQ
- * @{
+/*
* Notifications inform the MobiCore runtime environment that information is
* pending in a WSM buffer.
+ *
* The Trustlet Connector (TLC) and the corresponding trustlet also utilize
* this buffer to notify each other about new data within the
* Trustlet Connector Interface (TCI).
@@ -16,10 +16,9 @@
* So if, e.g., the TLC in the normal world wants to notify his trustlet
* about new data in the TLC buffer
*
- * @file
* Notification queue declarations.
*
- * <!-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -45,81 +44,74 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef NQ_H_
-#define NQ_H_
+#ifndef _MCINQ_H_
+#define _MCINQ_H_
-/** \name NQ Size Defines
- * Minimum and maximum count of elements in the notification queue.
- * @{ */
-#define MIN_NQ_ELEM 1 /**< Minimum notification queue elements. */
-#define MAX_NQ_ELEM 64 /**< Maximum notification queue elements. */
-/** @} */
+/* Minimum and maximum count of elements in the notification queue */
+#define MIN_NQ_ELEM 1 /* Minimum notification queue elements. */
+#define MAX_NQ_ELEM 64 /* Maximum notification queue elements. */
-/** \name NQ Length Defines
- * Minimum and maximum notification queue length.
- * @{ */
-/**< Minimum notification length (in bytes). */
-#define MIN_NQ_LEN (MIN_NQ_ELEM * sizeof(notification))
-/**< Maximum notification length (in bytes). */
-#define MAX_NQ_LEN (MAX_NQ_ELEM * sizeof(notification))
-/** @} */
+/* Minimum notification length (in bytes). */
+#define MIN_NQ_LEN (MIN_NQ_ELEM * sizeof(notification))
-/** \name Session ID Defines
- * Standard Session IDs.
- * @{ */
-/**< MCP session ID is used when directly communicating with the MobiCore
- * (e.g. for starting and stopping of trustlets). */
-#define SID_MCP 0
-/**< Invalid session id is returned in case of an error. */
-#define SID_INVALID 0xffffffff
-/** @} */
+/* Maximum notification length (in bytes). */
+#define MAX_NQ_LEN (MAX_NQ_ELEM * sizeof(notification))
-/** Notification data structure. */
+/*
+ * MCP session ID is used when directly communicating with the MobiCore
+ * (e.g. for starting and stopping of trustlets).
+ */
+#define SID_MCP 0
+/* Invalid session id is returned in case of an error. */
+#define SID_INVALID 0xffffffff
+
+/* Notification data structure. */
struct notification {
- uint32_t session_id; /**< Session ID. */
- int32_t payload; /**< Additional notification information. */
+ uint32_t session_id; /* Session ID. */
+ int32_t payload; /* Additional notification info */
};
-/** Notification payload codes.
+/*
+ * Notification payload codes.
* 0 indicated a plain simple notification,
* a positive value is a termination reason from the task,
* a negative value is a termination reason from MobiCore.
* Possible negative values are given below.
*/
enum notification_payload {
- /**< task terminated, but exit code is invalid */
- ERR_INVALID_EXIT_CODE = -1,
- /**< task terminated due to session end, no exit code available */
- ERR_SESSION_CLOSE = -2,
- /**< task terminated due to invalid operation */
- ERR_INVALID_OPERATION = -3,
- /**< session ID is unknown */
- ERR_INVALID_SID = -4,
- /**< session is not active */
- ERR_SID_NOT_ACTIVE = -5
+ /* task terminated, but exit code is invalid */
+ ERR_INVALID_EXIT_CODE = -1,
+ /* task terminated due to session end, no exit code available */
+ ERR_SESSION_CLOSE = -2,
+ /* task terminated due to invalid operation */
+ ERR_INVALID_OPERATION = -3,
+ /* session ID is unknown */
+ ERR_INVALID_SID = -4,
+ /* session is not active */
+ ERR_SID_NOT_ACTIVE = -5
};
-/** Declaration of the notification queue header.
- * layout as specified in the data structure specification.
+/*
+ * Declaration of the notification queue header.
+ * Layout as specified in the data structure specification.
*/
struct notification_queue_header {
- uint32_t write_cnt; /**< Write counter. */
- uint32_t read_cnt; /**< Read counter. */
- uint32_t queue_size; /**< Queue size. */
+ uint32_t write_cnt; /* Write counter. */
+ uint32_t read_cnt; /* Read counter. */
+ uint32_t queue_size; /* Queue size. */
};
-/** Queue struct which defines a queue object.
+/*
+ * Queue struct which defines a queue object.
* The queue struct is accessed by the queue<operation> type of
* function. elementCnt must be a power of two and the power needs
* to be smaller than power of uint32_t (obviously 32).
*/
struct notification_queue {
- /**< Queue header. */
+ /* Queue header. */
struct notification_queue_header hdr;
- /**< Notification elements. */
+ /* Notification elements. */
struct notification notification[MIN_NQ_ELEM];
} ;
-#endif /** NQ_H_ */
-
-/** @} */
+#endif /* _MCINQ_H_ */
diff --git a/drivers/gud/mobicore_kernelapi/include/mcuuid.h b/drivers/gud/mobicore_kernelapi/include/mcuuid.h
index b72acb8..6da9437 100644
--- a/drivers/gud/mobicore_kernelapi/include/mcuuid.h
+++ b/drivers/gud/mobicore_kernelapi/include/mcuuid.h
@@ -1,7 +1,5 @@
-/**
- * @addtogroup MC_UUID mcUuid - Universally Unique Identifier.
- *
- * <!-- Copyright Giesecke & Devrient GmbH 2011-2012 -->
+/*
+ * <-- Copyright Giesecke & Devrient GmbH 2011-2012 -->
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,21 +25,19 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * @ingroup MC_DATA_TYPES
- * @{
*/
-#ifndef MC_UUID_H_
-#define MC_UUID_H_
+#ifndef _MCUUID_H_
+#define _MCUUID_H_
#define UUID_TYPE
-/** Universally Unique Identifier (UUID) according to ISO/IEC 11578. */
+/* Universally Unique Identifier (UUID) according to ISO/IEC 11578. */
struct mc_uuid_t {
- uint8_t value[16]; /**< Value of the UUID. */
+ uint8_t value[16]; /* Value of the UUID. */
};
-/** UUID value used as free marker in service provider containers. */
+/* UUID value used as free marker in service provider containers. */
#define MC_UUID_FREE_DEFINE \
{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, \
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
@@ -50,7 +46,7 @@
MC_UUID_FREE_DEFINE
};
-/** Reserved UUID. */
+/* Reserved UUID. */
#define MC_UUID_RESERVED_DEFINE \
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
@@ -59,7 +55,7 @@
MC_UUID_RESERVED_DEFINE
};
-/** UUID for system applications. */
+/* UUID for system applications. */
#define MC_UUID_SYSTEM_DEFINE \
{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, \
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE }
@@ -68,7 +64,4 @@
MC_UUID_SYSTEM_DEFINE
};
-#endif /* MC_UUID_H_ */
-
-/** @} */
-
+#endif /* _MCUUID_H_ */
diff --git a/drivers/gud/mobicore_kernelapi/main.c b/drivers/gud/mobicore_kernelapi/main.c
index 62997f7..53eb66d 100644
--- a/drivers/gud/mobicore_kernelapi/main.c
+++ b/drivers/gud/mobicore_kernelapi/main.c
@@ -1,7 +1,7 @@
-/**
+/*
* MobiCore KernelApi module
*
- * <!-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009-2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -14,6 +14,7 @@
#include <linux/sched.h>
#include <linux/netlink.h>
#include <linux/kthread.h>
+#include <linux/device.h>
#include <net/sock.h>
#include <linux/list.h>
@@ -29,23 +30,27 @@
atomic_t counter;
};
-struct mc_kernelapi_ctx *mod_ctx; /* = NULL; */
+struct mc_kernelapi_ctx *mod_ctx;
-/*----------------------------------------------------------------------------*/
+/* Define a MobiCore Kernel API device structure for use with dev_debug() etc */
+struct device_driver mc_kernel_api_name = {
+ .name = "mckernelapi"
+};
+
+struct device mc_kernel_api_subname = {
+ .init_name = "", /* Set to 'mcapi' at mcapi_init() time */
+ .driver = &mc_kernel_api_name
+};
+
+struct device *mc_kapi = &mc_kernel_api_subname;
+
/* get a unique ID */
-unsigned int mcapi_unique_id(
- void
-)
+unsigned int mcapi_unique_id(void)
{
- return (unsigned int)atomic_inc_return(
- &(mod_ctx->counter));
+ return (unsigned int)atomic_inc_return(&(mod_ctx->counter));
}
-
-/*----------------------------------------------------------------------------*/
-static struct connection *mcapi_find_connection(
- uint32_t seq
-)
+static struct connection *mcapi_find_connection(uint32_t seq)
{
struct connection *tmp;
struct list_head *pos;
@@ -60,24 +65,21 @@
return NULL;
}
-/*----------------------------------------------------------------------------*/
-void mcapi_insert_connection(
- struct connection *connection
-)
+void mcapi_insert_connection(struct connection *connection)
{
list_add_tail(&(connection->list), &(mod_ctx->peers));
connection->socket_descriptor = mod_ctx->sk;
}
-void mcapi_remove_connection(
- uint32_t seq
-)
+void mcapi_remove_connection(uint32_t seq)
{
struct connection *tmp;
struct list_head *pos, *q;
- /* Delete all session objects. Usually this should not be needed as
- closeDevice() requires that all sessions have been closed before.*/
+ /*
+ * Delete all session objects. Usually this should not be needed as
+ * closeDevice() requires that all sessions have been closed before.
+ */
list_for_each_safe(pos, q, &mod_ctx->peers) {
tmp = list_entry(pos, struct connection, list);
if (tmp->sequence_magic == seq) {
@@ -87,11 +89,7 @@
}
}
-/*----------------------------------------------------------------------------*/
-static int mcapi_process(
- struct sk_buff *skb,
- struct nlmsghdr *nlh
-)
+static int mcapi_process(struct sk_buff *skb, struct nlmsghdr *nlh)
{
struct connection *c;
int length;
@@ -102,13 +100,14 @@
pid = nlh->nlmsg_pid;
length = nlh->nlmsg_len;
seq = nlh->nlmsg_seq;
- MCDRV_DBG_VERBOSE("nlmsg len %d type %d pid 0x%X seq %d\n",
- length, nlh->nlmsg_type, pid, seq);
+ MCDRV_DBG_VERBOSE(mc_kapi, "nlmsg len %d type %d pid 0x%X seq %d\n",
+ length, nlh->nlmsg_type, pid, seq);
do {
c = mcapi_find_connection(seq);
if (!c) {
- MCDRV_ERROR("Invalid incomming connection - seq=%u!",
- seq);
+ MCDRV_ERROR(mc_kapi,
+ "Invalid incomming connection - seq=%u!",
+ seq);
ret = -1;
break;
}
@@ -121,10 +120,7 @@
return ret;
}
-/*----------------------------------------------------------------------------*/
-static void mcapi_callback(
- struct sk_buff *skb
-)
+static void mcapi_callback(struct sk_buff *skb)
{
struct nlmsghdr *nlh = nlmsg_hdr(skb);
int len = skb->len;
@@ -141,19 +137,20 @@
}
}
-/*----------------------------------------------------------------------------*/
static int __init mcapi_init(void)
{
- printk(KERN_INFO "Mobicore API module initialized!\n");
+ dev_set_name(mc_kapi, "mcapi");
+
+ dev_info(mc_kapi, "Mobicore API module initialized!\n");
mod_ctx = kzalloc(sizeof(struct mc_kernelapi_ctx), GFP_KERNEL);
/* start kernel thread */
mod_ctx->sk = netlink_kernel_create(&init_net, MC_DAEMON_NETLINK, 0,
- mcapi_callback, NULL, THIS_MODULE);
+ mcapi_callback, NULL, THIS_MODULE);
if (!mod_ctx->sk) {
- MCDRV_ERROR("register of recieve handler failed");
+ MCDRV_ERROR(mc_kapi, "register of recieve handler failed");
return -EFAULT;
}
@@ -163,7 +160,7 @@
static void __exit mcapi_exit(void)
{
- printk(KERN_INFO "Unloading Mobicore API module.\n");
+ dev_info(mc_kapi, "Unloading Mobicore API module.\n");
if (mod_ctx->sk != NULL) {
netlink_kernel_release(mod_ctx->sk);
diff --git a/drivers/gud/mobicore_kernelapi/public/mobicore_driver_api.h b/drivers/gud/mobicore_kernelapi/public/mobicore_driver_api.h
index ccfb2e5..112df1d 100644
--- a/drivers/gud/mobicore_kernelapi/public/mobicore_driver_api.h
+++ b/drivers/gud/mobicore_kernelapi/public/mobicore_driver_api.h
@@ -1,21 +1,10 @@
-/**
- * @defgroup MCD_API MobiCore Driver API
- * @addtogroup MCD_API
- * @{
- *
- * @if DOXYGEN_MCDRV_API
- * @mainpage MobiCore Driver API.
- * @endif
- *
+/*
* MobiCore Driver API.
*
* The MobiCore (MC) Driver API provides access functions to the MobiCore
* runtime environment and the contained Trustlets.
*
- * @image html DoxyOverviewDrvApi500x.png
- * @image latex DoxyOverviewDrvApi500x.png "MobiCore Overview" width=12cm
- *
- * <!-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -41,278 +30,272 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef MCDRIVER_H_
-#define MCDRIVER_H_
+#ifndef _MOBICORE_DRIVER_API_H_
+#define _MOBICORE_DRIVER_API_H_
#define __MC_CLIENT_LIB_API
#include "mcuuid.h"
-/**
+/*
* Return values of MobiCore driver functions.
*/
enum mc_result {
- /**< Function call succeeded. */
- MC_DRV_OK = 0,
- /**< No notification available. */
- MC_DRV_NO_NOTIFICATION = 1,
- /**< Error during notification on communication level. */
- MC_DRV_ERR_NOTIFICATION = 2,
- /**< Function not implemented. */
- MC_DRV_ERR_NOT_IMPLEMENTED = 3,
- /**< No more resources available. */
- MC_DRV_ERR_OUT_OF_RESOURCES = 4,
- /**< Driver initialization failed. */
- MC_DRV_ERR_INIT = 5,
- /**< Unknown error. */
- MC_DRV_ERR_UNKNOWN = 6,
- /**< The specified device is unknown. */
- MC_DRV_ERR_UNKNOWN_DEVICE = 7,
- /**< The specified session is unknown.*/
- MC_DRV_ERR_UNKNOWN_SESSION = 8,
- /**< The specified operation is not allowed. */
- MC_DRV_ERR_INVALID_OPERATION = 9,
- /**< The response header from the MC is invalid. */
- MC_DRV_ERR_INVALID_RESPONSE = 10,
- /**< Function call timed out. */
- MC_DRV_ERR_TIMEOUT = 11,
- /**< Can not allocate additional memory. */
- MC_DRV_ERR_NO_FREE_MEMORY = 12,
- /**< Free memory failed. */
- MC_DRV_ERR_FREE_MEMORY_FAILED = 13,
- /**< Still some open sessions pending. */
- MC_DRV_ERR_SESSION_PENDING = 14,
- /**< MC daemon not reachable */
- MC_DRV_ERR_DAEMON_UNREACHABLE = 15,
- /**< The device file of the kernel module could not be opened. */
- MC_DRV_ERR_INVALID_DEVICE_FILE = 16,
- /**< Invalid parameter. */
+ /* Function call succeeded. */
+ MC_DRV_OK = 0,
+ /* No notification available. */
+ MC_DRV_NO_NOTIFICATION = 1,
+ /* Error during notification on communication level. */
+ MC_DRV_ERR_NOTIFICATION = 2,
+ /* Function not implemented. */
+ MC_DRV_ERR_NOT_IMPLEMENTED = 3,
+ /* No more resources available. */
+ MC_DRV_ERR_OUT_OF_RESOURCES = 4,
+ /* Driver initialization failed. */
+ MC_DRV_ERR_INIT = 5,
+ /* Unknown error. */
+ MC_DRV_ERR_UNKNOWN = 6,
+ /* The specified device is unknown. */
+ MC_DRV_ERR_UNKNOWN_DEVICE = 7,
+ /* The specified session is unknown.*/
+ MC_DRV_ERR_UNKNOWN_SESSION = 8,
+ /* The specified operation is not allowed. */
+ MC_DRV_ERR_INVALID_OPERATION = 9,
+ /* The response header from the MC is invalid. */
+ MC_DRV_ERR_INVALID_RESPONSE = 10,
+ /* Function call timed out. */
+ MC_DRV_ERR_TIMEOUT = 11,
+ /* Can not allocate additional memory. */
+ MC_DRV_ERR_NO_FREE_MEMORY = 12,
+ /* Free memory failed. */
+ MC_DRV_ERR_FREE_MEMORY_FAILED = 13,
+ /* Still some open sessions pending. */
+ MC_DRV_ERR_SESSION_PENDING = 14,
+ /* MC daemon not reachable */
+ MC_DRV_ERR_DAEMON_UNREACHABLE = 15,
+ /* The device file of the kernel module could not be opened. */
+ MC_DRV_ERR_INVALID_DEVICE_FILE = 16,
+ /* Invalid parameter. */
MC_DRV_ERR_INVALID_PARAMETER = 17,
- /**< Unspecified error from Kernel Module*/
- MC_DRV_ERR_KERNEL_MODULE = 18,
- /**< Error during mapping of additional bulk memory to session. */
- MC_DRV_ERR_BULK_MAPPING = 19,
- /**< Error during unmapping of additional bulk memory to session. */
- MC_DRV_ERR_BULK_UNMAPPING = 20,
- /**< Notification received, exit code available. */
- MC_DRV_INFO_NOTIFICATION = 21,
- /**< Set up of NWd connection failed. */
- MC_DRV_ERR_NQ_FAILED = 22
+ /* Unspecified error from Kernel Module*/
+ MC_DRV_ERR_KERNEL_MODULE = 18,
+ /* Error during mapping of additional bulk memory to session. */
+ MC_DRV_ERR_BULK_MAPPING = 19,
+ /* Error during unmapping of additional bulk memory to session. */
+ MC_DRV_ERR_BULK_UNMAPPING = 20,
+ /* Notification received, exit code available. */
+ MC_DRV_INFO_NOTIFICATION = 21,
+ /* Set up of NWd connection failed. */
+ MC_DRV_ERR_NQ_FAILED = 22
};
-
-/**
+/*
* Driver control command.
*/
enum mc_driver_ctrl {
- MC_CTRL_GET_VERSION = 1 /**< Return the driver version */
+ /* Return the driver version */
+ MC_CTRL_GET_VERSION = 1
};
-
-/** Structure of Session Handle, includes the Session ID and the Device ID the
+/*
+ * Structure of Session Handle, includes the Session ID and the Device ID the
* Session belongs to.
* The session handle will be used for session-based MobiCore communication.
* It will be passed to calls which address a communication end point in the
* MobiCore environment.
*/
struct mc_session_handle {
- uint32_t session_id; /**< MobiCore session ID */
- uint32_t device_id; /**< Device ID the session belongs to */
+ uint32_t session_id; /* MobiCore session ID */
+ uint32_t device_id; /* Device ID the session belongs to */
};
-/** Information structure about additional mapped Bulk buffer between the
+/*
+ * Information structure about additional mapped Bulk buffer between the
* Trustlet Connector (Nwd) and the Trustlet (Swd). This structure is
* initialized from a Trustlet Connector by calling mc_map().
* In order to use the memory within a Trustlet the Trustlet Connector has to
* inform the Trustlet with the content of this structure via the TCI.
*/
struct mc_bulk_map {
- /**< The virtual address of the Bulk buffer regarding the address space
+ /* The virtual address of the Bulk buffer regarding the address space
* of the Trustlet, already includes a possible offset! */
void *secure_virt_addr;
- uint32_t secure_virt_len; /**< Length of the mapped Bulk buffer */
+ uint32_t secure_virt_len; /* Length of the mapped Bulk buffer */
};
-
-/**< The default device ID */
+/* The default device ID */
#define MC_DEVICE_ID_DEFAULT 0
-/**< Wait infinite for a response of the MC. */
+/* Wait infinite for a response of the MC. */
#define MC_INFINITE_TIMEOUT ((int32_t)(-1))
-/**< Do not wait for a response of the MC. */
+/* Do not wait for a response of the MC. */
#define MC_NO_TIMEOUT 0
-/**< TCI/DCI must not exceed 1MiB */
+/* TCI/DCI must not exceed 1MiB */
#define MC_MAX_TCI_LEN 0x100000
-
-
-/** Open a new connection to a MobiCore device.
+/**
+ * mc_open_device() - Open a new connection to a MobiCore device.
+ * @device_id: Identifier for the MobiCore device to be used.
+ * MC_DEVICE_ID_DEFAULT refers to the default device.
*
- * mc_open_device() initializes all device specific resources required to
- * communicate with an MobiCore instance located on the specified device in the
- * system. If the device does not exist the function will return
- * MC_DRV_ERR_UNKNOWN_DEVICE.
+ * Initializes all device specific resources required to communicate with a
+ * MobiCore instance located on the specified device in the system. If the
+ * device does not exist the function will return MC_DRV_ERR_UNKNOWN_DEVICE.
*
- * @param [in] device_id Identifier for the MobiCore device to be used.
- * MC_DEVICE_ID_DEFAULT refers to the default device.
- *
- * @return MC_DRV_OK if operation has been successfully completed.
- * @return MC_DRV_ERR_INVALID_OPERATION if device already opened.
- * @return MC_DRV_ERR_DAEMON_UNREACHABLE when problems with daemon occur.
- * @return MC_DRV_ERR_UNKNOWN_DEVICE when device_id is unknown.
- * @return MC_DRV_ERR_INVALID_DEVICE_FILE if kernel module under
- * /dev/mobicore cannot be opened
- *
- * Uses a Mutex.
+ * Return codes:
+ * MC_DRV_OK: operation completed successfully
+ * MC_DRV_ERR_INVALID_OPERATION: device already opened
+ * MC_DRV_ERR_DAEMON_UNREACHABLE: problems with daemon
+ * MC_DRV_ERR_UNKNOWN_DEVICE: device_id unknown
+ * MC_DRV_ERR_INVALID_DEVICE_FILE: kernel module under /dev/mobicore
+ * cannot be opened
*/
-__MC_CLIENT_LIB_API enum mc_result mc_open_device(
- uint32_t device_id
-);
+__MC_CLIENT_LIB_API enum mc_result mc_open_device(uint32_t device_id);
-/** Close the connection to a MobiCore device.
+/**
+ * mc_close_device() - Close the connection to a MobiCore device.
+ * @device_id: Identifier for the MobiCore device.
+ *
* When closing a device, active sessions have to be closed beforehand.
* Resources associated with the device will be released.
* The device may be opened again after it has been closed.
*
- * @param [in] device_id Identifier for the MobiCore device.
* MC_DEVICE_ID_DEFAULT refers to the default device.
*
- * @return MC_DRV_OK if operation has been successfully completed.
- * @return MC_DRV_ERR_UNKNOWN_DEVICE when device id is invalid.
- * @return MC_DRV_ERR_SESSION_PENDING when a session is still open.
- * @return MC_DRV_ERR_DAEMON_UNREACHABLE when problems with daemon occur.
- *
- * Uses a Mutex.
+ * Return codes:
+ * MC_DRV_OK: operation completed successfully
+ * MC_DRV_ERR_UNKNOWN_DEVICE: device id is invalid
+ * MC_DRV_ERR_SESSION_PENDING: a session is still open
+ * MC_DRV_ERR_DAEMON_UNREACHABLE: problems with daemon occur
*/
-__MC_CLIENT_LIB_API enum mc_result mc_close_device(
- uint32_t device_id
-);
+__MC_CLIENT_LIB_API enum mc_result mc_close_device(uint32_t device_id);
-/** Open a new session to a Trustlet. The trustlet with the given UUID has
- * to be available in the flash filesystem.
+/**
+ * mc_open_session() - Open a new session to a Trustlet.
+ * @session: On success, the session data will be returned
+ * @uuid: UUID of the Trustlet to be opened
+ * @tci: TCI buffer for communicating with the trustlet
+ * @tci_len: Length of the TCI buffer. Maximum allowed value
+ * is MC_MAX_TCI_LEN
+ *
+ * The trustlet with the given UUID has to be available in the flash filesystem.
*
* Write MCP open message to buffer and notify MobiCore about the availability
* of a new command.
+ *
* Waits till the MobiCore responses with the new session ID (stored in the MCP
* buffer).
*
- * @param [in,out] session On success, the session data will be returned.
* Note that session.device_id has to be the device id of an opened device.
- * @param [in] uuid UUID of the Trustlet to be opened.
- * @param [in] tci TCI buffer for communicating with the trustlet.
- * @param [in] tci_len Length of the TCI buffer. Maximum allowed value
- * is MC_MAX_TCI_LEN.
*
- * @return MC_DRV_OK if operation has been successfully completed.
- * @return MC_DRV_INVALID_PARAMETER if session parameter is invalid.
- * @return MC_DRV_ERR_UNKNOWN_DEVICE when device id is invalid.
- * @return MC_DRV_ERR_DAEMON_UNREACHABLE when problems with daemon socket occur.
- * @return MC_DRV_ERR_UNKNOWN_DEVICE when daemon returns an error.
- *
- * Uses a Mutex.
+ * Return codes:
+ * MC_DRV_OK: operation completed successfully
+ * MC_DRV_INVALID_PARAMETER: session parameter is invalid
+ * MC_DRV_ERR_UNKNOWN_DEVICE: device id is invalid
+ * MC_DRV_ERR_DAEMON_UNREACHABLE: problems with daemon socket occur
+ * MC_DRV_ERR_NQ_FAILED: daemon returns an error
*/
__MC_CLIENT_LIB_API enum mc_result mc_open_session(
- struct mc_session_handle *session,
- const struct mc_uuid_t *uuid,
- uint8_t *tci,
- uint32_t tci_len
-);
+ struct mc_session_handle *session, const struct mc_uuid_t *uuid,
+ uint8_t *tci, uint32_t tci_len);
-/** Close a Trustlet session.
+/**
+ * mc_close_session() - Close a Trustlet session.
+ * @session: Session to be closed.
*
* Closes the specified MobiCore session. The call will block until the
* session has been closed.
*
- * @pre Device device_id has to be opened in advance.
+ * Device device_id has to be opened in advance.
*
- * @param [in] session Session to be closed.
- *
- * @return MC_DRV_OK if operation has been successfully completed.
- * @return MC_DRV_INVALID_PARAMETER if session parameter is invalid.
- * @return MC_DRV_ERR_UNKNOWN_SESSION when session id is invalid.
- * @return MC_DRV_ERR_UNKNOWN_DEVICE when device id of session is invalid.
- * @return MC_DRV_ERR_DAEMON_UNREACHABLE when problems with daemon occur.
- * @return MC_DRV_ERR_INVALID_DEVICE_FILE when daemon cannot open trustlet file.
- *
- * Uses a Mutex.
+ * Return codes:
+ * MC_DRV_OK: operation completed successfully
+ * MC_DRV_INVALID_PARAMETER: session parameter is invalid
+ * MC_DRV_ERR_UNKNOWN_SESSION: session id is invalid
+ * MC_DRV_ERR_UNKNOWN_DEVICE: device id of session is invalid
+ * MC_DRV_ERR_DAEMON_UNREACHABLE: problems with daemon occur
+ * MC_DRV_ERR_INVALID_DEVICE_FILE: daemon cannot open trustlet file
*/
__MC_CLIENT_LIB_API enum mc_result mc_close_session(
- struct mc_session_handle *session
-);
+ struct mc_session_handle *session);
-/** Notify a session.
+/**
+ * mc_notify() - Notify a session.
+ * @session: The session to be notified.
+ *
* Notifies the session end point about available message data.
* If the session parameter is correct, notify will always succeed.
* Corresponding errors can only be received by mc_wait_notification().
- * @pre A session has to be opened in advance.
*
- * @param session The session to be notified.
+ * A session has to be opened in advance.
*
- * @return MC_DRV_OK if operation has been successfully completed.
- * @return MC_DRV_INVALID_PARAMETER if session parameter is invalid.
- * @return MC_DRV_ERR_UNKNOWN_SESSION when session id is invalid.
- * @return MC_DRV_ERR_UNKNOWN_DEVICE when device id of session is invalid.
+ * Return codes:
+ * MC_DRV_OK: operation completed successfully
+ * MC_DRV_INVALID_PARAMETER: session parameter is invalid
+ * MC_DRV_ERR_UNKNOWN_SESSION: session id is invalid
+ * MC_DRV_ERR_UNKNOWN_DEVICE: device id of session is invalid
*/
-__MC_CLIENT_LIB_API enum mc_result mc_notify(
- struct mc_session_handle *session
-);
+__MC_CLIENT_LIB_API enum mc_result mc_notify(struct mc_session_handle *session);
-/** Wait for a notification.
+/**
+ * mc_wait_notification() - Wait for a notification.
+ * @session: The session the notification should correspond to.
+ * @timeout: Time in milliseconds to wait
+ * (MC_NO_TIMEOUT : direct return, > 0 : milliseconds,
+ * MC_INFINITE_TIMEOUT : wait infinitely)
*
* Wait for a notification issued by the MobiCore for a specific session.
* The timeout parameter specifies the number of milliseconds the call will wait
* for a notification.
+ *
* If the caller passes 0 as timeout value the call will immediately return.
* If timeout value is below 0 the call will block until a notification for the
- session has been received.
+ * session has been received.
*
- * @attention if timeout is below 0, call will block:
+ * If timeout is below 0, call will block.
+ *
* Caller has to trust the other side to send a notification to wake him up
* again.
*
- * @param [in] session The session the notification should correspond to.
- * @param [in] timeout Time in milliseconds to wait
- * (MC_NO_TIMEOUT : direct return, > 0 : milliseconds,
- * MC_INFINITE_TIMEOUT : wait infinitely)
- *
- * @return MC_DRV_OK if notification is available.
- * @return MC_DRV_ERR_TIMEOUT if no notification arrived in time.
- * @return MC_DRV_INFO_NOTIFICATION if a problem with the session was
- * encountered. Get more details with mc_get_session_error_code().
- * @return MC_DRV_ERR_NOTIFICATION if a problem with the socket occurred.
- * @return MC_DRV_INVALID_PARAMETER if a parameter is invalid.
- * @return MC_DRV_ERR_UNKNOWN_SESSION when session id is invalid.
- * @return MC_DRV_ERR_UNKNOWN_DEVICE when device id of session is invalid.
+ * Return codes:
+ * MC_DRV_OK: operation completed successfully
+ * MC_DRV_ERR_TIMEOUT: no notification arrived in time
+ * MC_DRV_INFO_NOTIFICATION: a problem with the session was
+ * encountered. Get more details with
+ * mc_get_session_error_code()
+ * MC_DRV_ERR_NOTIFICATION: a problem with the socket occurred
+ * MC_DRV_INVALID_PARAMETER: a parameter is invalid
+ * MC_DRV_ERR_UNKNOWN_SESSION: session id is invalid
+ * MC_DRV_ERR_UNKNOWN_DEVICE: device id of session is invalid
*/
__MC_CLIENT_LIB_API enum mc_result mc_wait_notification(
- struct mc_session_handle *session,
- int32_t timeout
-);
+ struct mc_session_handle *session, int32_t timeout);
/**
- * Allocate a block of world shared memory (WSM).
+ * mc_malloc_wsm() - Allocate a block of world shared memory (WSM).
+ * @device_id: The ID of an opened device to retrieve the WSM from.
+ * @align: The alignment (number of pages) of the memory block
+ * (e.g. 0x00000001 for 4kb).
+ * @len: Length of the block in bytes.
+ * @wsm: Virtual address of the world shared memory block.
+ * @wsm_flags: Platform specific flags describing the memory to
+ * be allocated.
+ *
* The MC driver allocates a contiguous block of memory which can be used as
* WSM.
* This implicates that the allocated memory is aligned according to the
* alignment parameter.
+ *
* Always returns a buffer of size WSM_SIZE aligned to 4K.
*
- * @param [in] device_id The ID of an opened device to retrieve the WSM from.
- * @param [in] align The alignment (number of pages) of the memory block
- * (e.g. 0x00000001 for 4kb).
- * @param [in] len Length of the block in bytes.
- * @param [out] wsm Virtual address of the world shared memory block.
- * @param [in] wsm_flags Platform specific flags describing the memory to
- * be allocated.
+ * Align and wsm_flags are currently ignored
*
- * @attention: align and wsm_flags are currently ignored
- *
- * @return MC_DRV_OK if operation has been successfully completed.
- * @return MC_DRV_INVALID_PARAMETER if a parameter is invalid.
- * @return MC_DRV_ERR_UNKNOWN_DEVICE when device id is invalid.
- * @return MC_DRV_ERR_NO_FREE_MEMORY if no more contiguous memory is available
- * in this size or for this process.
- *
- * Uses a Mutex.
+ * Return codes:
+ * MC_DRV_OK: operation completed successfully
+ * MC_DRV_INVALID_PARAMETER: a parameter is invalid
+ * MC_DRV_ERR_UNKNOWN_DEVICE: device id is invalid
+ * MC_DRV_ERR_NO_FREE_MEMORY: no more contiguous memory is
+ * available in this size or for this
+ * process
*/
__MC_CLIENT_LIB_API enum mc_result mc_malloc_wsm(
uint32_t device_id,
@@ -323,161 +306,140 @@
);
/**
- * Free a block of world shared memory (WSM).
+ * mc_free_wsm() - Free a block of world shared memory (WSM).
+ * @device_id: The ID to which the given address belongs
+ * @wsm: Address of WSM block to be freed
+ *
* The MC driver will free a block of world shared memory (WSM) previously
* allocated with mc_malloc_wsm(). The caller has to assure that the address
* handed over to the driver is a valid WSM address.
*
- * @param [in] device_id The ID to which the given address belongs.
- * @param [in] wsm Address of WSM block to be freed.
- *
- * @return MC_DRV_OK if operation has been successfully completed.
- * @return MC_DRV_INVALID_PARAMETER if a parameter is invalid.
- * @return MC_DRV_ERR_UNKNOWN_DEVICE when device id is invalid.
- * @return MC_DRV_ERR_FREE_MEMORY_FAILED on failures.
- *
- * Uses a Mutex.
+ * Return codes:
+ * MC_DRV_OK: operation completed successfully
+ * MC_DRV_INVALID_PARAMETER: a parameter is invalid
+ * MC_DRV_ERR_UNKNOWN_DEVICE: when device id is invalid
+ * MC_DRV_ERR_FREE_MEMORY_FAILED: on failure
*/
-__MC_CLIENT_LIB_API enum mc_result mc_free_wsm(
- uint32_t device_id,
- uint8_t *wsm
-);
+__MC_CLIENT_LIB_API enum mc_result mc_free_wsm(uint32_t device_id,
+ uint8_t *wsm);
/**
- * Map additional bulk buffer between a Trustlet Connector (TLC) and
- * the Trustlet (TL) for a session.
+ *mc_map() - Map additional bulk buffer between a Trustlet Connector (TLC)
+ * and the Trustlet (TL) for a session
+ * @session: Session handle with information of the device_id and
+ * the session_id. The given buffer is mapped to the
+ * session specified in the sessionHandle
+ * @buf: Virtual address of a memory portion (relative to TLC)
+ * to be shared with the Trustlet, already includes a
+ * possible offset!
+ * @len: length of buffer block in bytes.
+ * @map_info: Information structure about the mapped Bulk buffer
+ * between the TLC (Nwd) and the TL (Swd).
+ *
* Memory allocated in user space of the TLC can be mapped as additional
* communication channel (besides TCI) to the Trustlet. Limitation of the
* Trustlet memory structure apply: only 6 chunks can be mapped with a maximum
* chunk size of 1 MiB each.
*
- * @attention It is up to the application layer (TLC) to inform the Trustlet
+ * It is up to the application layer (TLC) to inform the Trustlet
* about the additional mapped bulk memory.
*
- * @param [in] session Session handle with information of the device_id and
- * the session_id. The
- * given buffer is mapped to the session specified in the sessionHandle.
- * @param [in] buf Virtual address of a memory portion (relative to TLC)
- * to be shared with the Trustlet, already includes a possible offset!
- * @param [in] len length of buffer block in bytes.
- * @param [out] map_info Information structure about the mapped Bulk buffer
- * between the TLC (Nwd) and
- * the TL (Swd).
- *
- * @return MC_DRV_OK if operation has been successfully completed.
- * @return MC_DRV_INVALID_PARAMETER if a parameter is invalid.
- * @return MC_DRV_ERR_UNKNOWN_SESSION when session id is invalid.
- * @return MC_DRV_ERR_UNKNOWN_DEVICE when device id of session is invalid.
- * @return MC_DRV_ERR_DAEMON_UNREACHABLE when problems with daemon occur.
- * @return MC_DRV_ERR_BULK_MAPPING when buf is already uses as bulk buffer or
- * when registering the buffer failed.
- *
- * Uses a Mutex.
+ * Return codes:
+ * MC_DRV_OK: operation completed successfully
+ * MC_DRV_INVALID_PARAMETER: a parameter is invalid
+ * MC_DRV_ERR_UNKNOWN_SESSION: session id is invalid
+ * MC_DRV_ERR_UNKNOWN_DEVICE: device id of session is invalid
+ * MC_DRV_ERR_DAEMON_UNREACHABLE: problems with daemon occur
+ * MC_DRV_ERR_BULK_MAPPING: buf is already uses as bulk buffer or
+ * when registering the buffer failed
*/
__MC_CLIENT_LIB_API enum mc_result mc_map(
- struct mc_session_handle *session,
- void *buf,
- uint32_t len,
- struct mc_bulk_map *map_info
-);
+ struct mc_session_handle *session, void *buf, uint32_t len,
+ struct mc_bulk_map *map_info);
/**
- * Remove additional mapped bulk buffer between Trustlet Connector (TLC)
- * and the Trustlet (TL) for a session.
+ * mc_unmap() - Remove additional mapped bulk buffer between Trustlet Connector
+ * (TLC) and the Trustlet (TL) for a session
+ * @session: Session handle with information of the device_id and
+ * the session_id. The given buffer is unmapped from the
+ * session specified in the sessionHandle.
+ * @buf: Virtual address of a memory portion (relative to TLC)
+ * shared with the TL, already includes a possible offset!
+ * @map_info: Information structure about the mapped Bulk buffer
+ * between the TLC (Nwd) and the TL (Swd)
*
- * @attention The bulk buffer will immediately be unmapped from the session
- * context.
- * @attention The application layer (TLC) must inform the TL about unmapping
- * of the additional bulk memory before calling mc_unmap!
+ * The bulk buffer will immediately be unmapped from the session context.
*
- * @param [in] session Session handle with information of the device_id and
- * the session_id. The given buffer is unmapped from the session specified
- * in the sessionHandle.
- * @param [in] buf Virtual address of a memory portion (relative to TLC)
- * shared with the TL, already includes a possible offset!
- * @param [in] map_info Information structure about the mapped Bulk buffer
- * between the TLC (Nwd) and
- * the TL (Swd).
- * @attention The clientlib currently ignores the len field in map_info.
+ * The application layer (TLC) must inform the TL about unmapping of the
+ * additional bulk memory before calling mc_unmap!
*
- * @return MC_DRV_OK if operation has been successfully completed.
- * @return MC_DRV_INVALID_PARAMETER if a parameter is invalid.
- * @return MC_DRV_ERR_UNKNOWN_SESSION when session id is invalid.
- * @return MC_DRV_ERR_UNKNOWN_DEVICE when device id of session is invalid.
- * @return MC_DRV_ERR_DAEMON_UNREACHABLE when problems with daemon occur.
- * @return MC_DRV_ERR_BULK_UNMAPPING when buf was not registered earlier
- * or when unregistering failed.
+ * The clientlib currently ignores the len field in map_info.
*
- * Uses a Mutex.
+ * Return codes:
+ * MC_DRV_OK: operation completed successfully
+ * MC_DRV_INVALID_PARAMETER: a parameter is invalid
+ * MC_DRV_ERR_UNKNOWN_SESSION: session id is invalid
+ * MC_DRV_ERR_UNKNOWN_DEVICE: device id of session is invalid
+ * MC_DRV_ERR_DAEMON_UNREACHABLE: problems with daemon occur
+ * MC_DRV_ERR_BULK_UNMAPPING: buf was not registered earlier
+ * or when unregistering failed
*/
__MC_CLIENT_LIB_API enum mc_result mc_unmap(
- struct mc_session_handle *session,
- void *buf,
- struct mc_bulk_map *map_info
-);
-
+ struct mc_session_handle *session, void *buf,
+ struct mc_bulk_map *map_info);
/**
- * @attention: Not implemented.
- * Execute driver specific command.
- * mc_driver_ctrl() can be used to execute driver specific commands.
- * Besides the control command MC_CTRL_GET_VERSION commands are implementation
- * specific.
+ * mc_driver_ctrl() - Execute driver specific command.
+ * @param: Command ID of the command to be executed
+ * @data: Command data and response depending on command
+ * @len: Length of the data block
+ *
+ * Can be used to execute driver specific commands. Besides the control command
+ * MC_CTRL_GET_VERSION commands are implementation specific.
+ *
* Please refer to the corresponding specification of the driver manufacturer.
*
- * @param [in] param Command ID of the command to be executed.
- * @param [in, out] data Command data and response depending on command.
- * @param [in] len Length of the data block.
- *
- * @return MC_DRV_ERR_NOT_IMPLEMENTED.
+ * Return codes:
+ * MC_DRV_ERR_NOT_IMPLEMENTED.
*/
__MC_CLIENT_LIB_API enum mc_result mc_driver_ctrl(
- enum mc_driver_ctrl param,
- uint8_t *data,
- uint32_t len
-);
+ enum mc_driver_ctrl param, uint8_t *data, uint32_t len);
/**
- * @attention: Not implemented.
- * Execute application management command.
- * mc_manage() shall be used to exchange application management commands with
- * the MobiCore.
+ * mc_manage() - Execute application management command.
+ * @device_id: Identifier for the MobiCore device to be used.
+ * NULL refers to the default device.
+ * @data: Command data/response data depending on command
+ * @len: Length of the data block
+ *
+ * Shall be used to exchange application management commands with the MobiCore.
* The MobiCore Application Management Protocol is described in [MCAMP].
*
- * @param [in] device_id Identifier for the MobiCore device to be used.
- * NULL refers to the default device.
- * @param [in, out] data Command data/response data depending on command.
- * @param [in] len Length of the data block.
- *
- * @return MC_DRV_ERR_NOT_IMPLEMENTED.
+ * Return codes:
+ * MC_DRV_ERR_NOT_IMPLEMENTED.
*/
__MC_CLIENT_LIB_API enum mc_result mc_manage(
- uint32_t device_id,
- uint8_t *data,
- uint32_t len
-);
+ uint32_t device_id, uint8_t *data, uint32_t len);
/**
- * Get additional error information of the last error that occured on a session.
+ * mc_get_session_error_code() - Get additional error information of the last
+ * error that occured on a session.
+ * @session: Session handle with information of the device_id and
+ * the session_id
+ * @last_error: >0 Trustlet has terminated itself with this value,
+ * <0 Trustlet is dead because of an error within the
+ * MobiCore (e.g. Kernel exception). See also MCI
+ * definition.
+ *
* After the request the stored error code will be deleted.
*
- * @param [in] session Session handle with information of the device_id and
- * the session_id.
- * @param [out] last_error >0 Trustlet has terminated itself with this value,
- * <0 Trustlet is dead because of an error within the MobiCore
- * (e.g. Kernel exception).
- * See also MCI definition.
- *
- * @return MC_DRV_OK if operation has been successfully completed.
- * @return MC_DRV_INVALID_PARAMETER if a parameter is invalid.
- * @return MC_DRV_ERR_UNKNOWN_SESSION when session id is invalid.
- * @return MC_DRV_ERR_UNKNOWN_DEVICE when device id of session is invalid.
+ * Return codes:
+ * MC_DRV_OK: operation completed successfully
+ * MC_DRV_INVALID_PARAMETER: a parameter is invalid
+ * MC_DRV_ERR_UNKNOWN_SESSION: session id is invalid
+ * MC_DRV_ERR_UNKNOWN_DEVICE: device id of session is invalid
*/
__MC_CLIENT_LIB_API enum mc_result mc_get_session_error_code(
- struct mc_session_handle *session,
- int32_t *last_error
-);
+ struct mc_session_handle *session, int32_t *last_error);
-#endif /** MCDRIVER_H_ */
-
-/** @} */
+#endif /* _MOBICORE_DRIVER_API_H_ */
diff --git a/drivers/gud/mobicore_kernelapi/public/mobicore_driver_cmd.h b/drivers/gud/mobicore_kernelapi/public/mobicore_driver_cmd.h
index 9ff7989..3e62fdd 100644
--- a/drivers/gud/mobicore_kernelapi/public/mobicore_driver_cmd.h
+++ b/drivers/gud/mobicore_kernelapi/public/mobicore_driver_cmd.h
@@ -1,8 +1,5 @@
-/** @addtogroup MCD_MCDIMPL_DAEMON
- * @{
- * @file
- *
- * <!-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
+/*
+ * <-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -28,11 +25,8 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef MCDAEMON_H_
-#define MCDAEMON_H_
-
-
-
+#ifndef _MOBICORE_DRIVER_CMD_H_
+#define _MOBICORE_DRIVER_CMD_H_
#include "mcuuid.h"
@@ -64,19 +58,17 @@
struct mc_drv_command_header_t {
- uint32_t command_id;
+ uint32_t command_id;
};
struct mc_drv_response_header_t {
- uint32_t response_id;
+ uint32_t response_id;
};
-#define MC_DEVICE_ID_DEFAULT 0 /**< The default device ID */
+#define MC_DEVICE_ID_DEFAULT 0 /* The default device ID */
-
-/*****************************************************************************/
struct mc_drv_cmd_open_device_payload_t {
- uint32_t device_id;
+ uint32_t device_id;
};
struct mc_drv_cmd_open_device_t {
@@ -94,13 +86,13 @@
struct mc_drv_rsp_open_device_payload_t payload;
};
-
-/*****************************************************************************/
struct mc_drv_cmd_close_device_t {
struct mc_drv_command_header_t header;
- /* no payload here because close has none.
- If we use an empty struct, C++ will count it as 4 bytes.
- This will write too much into the socket at write(cmd,sizeof(cmd)) */
+ /*
+ * no payload here because close has none.
+ * If we use an empty struct, C++ will count it as 4 bytes.
+ * This will write too much into the socket at write(cmd,sizeof(cmd))
+ */
};
@@ -113,8 +105,6 @@
struct mc_drv_rsp_close_device_payload_t payload;
};
-
-/*****************************************************************************/
struct mc_drv_cmd_open_session_payload_t {
uint32_t device_id;
struct mc_uuid_t uuid;
@@ -141,8 +131,6 @@
struct mc_drv_rsp_open_session_payload_t payload;
};
-
-/*****************************************************************************/
struct mc_drv_cmd_close_session_payload_t {
uint32_t session_id;
};
@@ -162,8 +150,6 @@
struct mc_drv_rsp_close_session_payload_t payload;
};
-
-/*****************************************************************************/
struct mc_drv_cmd_notify_payload_t {
uint32_t session_id;
};
@@ -183,8 +169,6 @@
struct mc_drv_rsp_notify_payload_t payload;
};
-
-/*****************************************************************************/
struct mc_drv_cmd_map_bulk_mem_payload_t {
uint32_t session_id;
uint32_t phys_addr_l2;
@@ -209,8 +193,6 @@
struct mc_drv_rsp_map_bulk_mem_payload_t payload;
};
-
-/*****************************************************************************/
struct mc_drv_cmd_unmap_bulk_mem_payload_t {
uint32_t session_id;
uint32_t secure_virtual_adr;
@@ -234,8 +216,6 @@
struct mc_drv_rsp_unmap_bulk_mem_payload_t payload;
};
-
-/*****************************************************************************/
struct mc_drv_cmd_nqconnect_payload_t {
uint32_t device_id;
uint32_t session_id;
@@ -258,8 +238,6 @@
struct mc_drv_rsp_nqconnect_payload_t payload;
};
-
-/*****************************************************************************/
union mc_drv_command_t {
struct mc_drv_command_header_t header;
struct mc_drv_cmd_open_device_t mc_drv_cmd_open_device;
@@ -284,6 +262,4 @@
struct mc_drv_rsp_unmap_bulk_mem_t mc_drv_rsp_unmap_bulk_mem;
};
-#endif /* MCDAEMON_H_ */
-
-/** @} */
+#endif /* _MOBICORE_DRIVER_CMD_H_ */
diff --git a/drivers/gud/mobicore_kernelapi/session.c b/drivers/gud/mobicore_kernelapi/session.c
index e62b4b3..eb75289 100644
--- a/drivers/gud/mobicore_kernelapi/session.c
+++ b/drivers/gud/mobicore_kernelapi/session.c
@@ -1,7 +1,5 @@
-/** @addtogroup MCD_IMPL_LIB
- * @{
- * @file
- * <!-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
+/*
+ * <-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -9,39 +7,35 @@
*/
#include <linux/types.h>
#include <linux/slab.h>
+#include <linux/device.h>
#include "mc_kernel_api.h"
#include "public/mobicore_driver_api.h"
#include "session.h"
-/*****************************************************************************/
struct bulk_buffer_descriptor *bulk_buffer_descriptor_create(
- void *virt_addr,
- uint32_t len,
- uint32_t handle,
- void *phys_addr_wsm_l2
-) {
- struct bulk_buffer_descriptor *desc =
- kzalloc(sizeof(struct bulk_buffer_descriptor), GFP_KERNEL);
+ void *virt_addr, uint32_t len, uint32_t handle, void *phys_addr_wsm_l2)
+{
+ struct bulk_buffer_descriptor *desc;
+
+ desc = kzalloc(sizeof(*desc), GFP_KERNEL);
desc->virt_addr = virt_addr;
desc->len = len;
desc->handle = handle;
desc->phys_addr_wsm_l2 = phys_addr_wsm_l2;
+
return desc;
}
-/*****************************************************************************/
struct session *session_create(
- uint32_t session_id,
- void *instance,
- struct connection *connection
-) {
- struct session *session =
- kzalloc(sizeof(struct session), GFP_KERNEL);
+ uint32_t session_id, void *instance, struct connection *connection)
+{
+ struct session *session;
+
+ session = kzalloc(sizeof(*session), GFP_KERNEL);
session->session_id = session_id;
session->instance = instance;
session->notification_connection = connection;
-
session->session_info.last_error = SESSION_ERR_NO;
session->session_info.state = SESSION_STATE_INITIAL;
@@ -49,29 +43,31 @@
return session;
}
-
-/*****************************************************************************/
-void session_cleanup(
- struct session *session
-) {
- struct bulk_buffer_descriptor *bulk_buf_descr;
+void session_cleanup(struct session *session)
+{
+ struct bulk_buffer_descriptor *bulk_buf_descr;
struct list_head *pos, *q;
+ unsigned int phys_addr_wsm_l2;
/* Unmap still mapped buffers */
list_for_each_safe(pos, q, &session->bulk_buffer_descriptors) {
bulk_buf_descr =
list_entry(pos, struct bulk_buffer_descriptor, list);
- MCDRV_DBG_VERBOSE("Physical Address of L2 Table = 0x%X, "
- "handle= %d",
- (unsigned int)bulk_buf_descr->phys_addr_wsm_l2,
- bulk_buf_descr->handle);
+ phys_addr_wsm_l2 =
+ (unsigned int)bulk_buf_descr->phys_addr_wsm_l2;
+
+ MCDRV_DBG_VERBOSE(mc_kapi,
+ "Phys Addr of L2 Table = 0x%X, handle= %d",
+ phys_addr_wsm_l2,
+ bulk_buf_descr->handle);
/* ignore any error, as we cannot do anything in this case. */
int ret = mobicore_unmap_vmem(session->instance,
- bulk_buf_descr->handle);
+ bulk_buf_descr->handle);
if (ret != 0)
- MCDRV_DBG_ERROR("mobicore_unmap_vmem failed: %d", ret);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "mobicore_unmap_vmem failed: %d", ret);
list_del(pos);
kfree(bulk_buf_descr);
@@ -82,36 +78,27 @@
kfree(session);
}
-
-/*****************************************************************************/
-void session_set_error_info(
- struct session *session,
- int32_t err
-) {
+void session_set_error_info(struct session *session, int32_t err)
+{
session->session_info.last_error = err;
}
-
-/*****************************************************************************/
-int32_t session_get_last_err(
- struct session *session
-) {
+int32_t session_get_last_err(struct session *session)
+{
return session->session_info.last_error;
}
-
-/*****************************************************************************/
-struct bulk_buffer_descriptor *session_add_bulk_buf(
- struct session *session,
- void *buf,
- uint32_t len
-) {
+struct bulk_buffer_descriptor *session_add_bulk_buf(struct session *session,
+ void *buf, uint32_t len)
+{
struct bulk_buffer_descriptor *bulk_buf_descr = NULL;
- struct bulk_buffer_descriptor *tmp;
+ struct bulk_buffer_descriptor *tmp;
struct list_head *pos;
- /* Search bulk buffer descriptors for existing vAddr
- At the moment a virtual address can only be added one time */
+ /*
+ * Search bulk buffer descriptors for existing vAddr
+ * At the moment a virtual address can only be added one time
+ */
list_for_each(pos, &session->bulk_buffer_descriptors) {
tmp = list_entry(pos, struct bulk_buffer_descriptor, list);
if (tmp->virt_addr == buf)
@@ -119,55 +106,50 @@
}
do {
- /* Prepare the interface structure for memory registration in
- Kernel Module */
- void *l2_table_phys;
- uint32_t handle;
+ /*
+ * Prepare the interface structure for memory registration in
+ * Kernel Module
+ */
+ void *l2_table_phys;
+ uint32_t handle;
- int ret = mobicore_map_vmem(session->instance,
- buf,
- len,
- &handle,
- &l2_table_phys);
+ int ret = mobicore_map_vmem(session->instance, buf, len,
+ &handle, &l2_table_phys);
if (ret != 0) {
- MCDRV_DBG_ERROR("mobicore_map_vmem failed, ret=%d",
+ MCDRV_DBG_ERROR(mc_kapi,
+ "mobicore_map_vmem failed, ret=%d",
ret);
break;
}
- MCDRV_DBG_VERBOSE("Physical Address of L2 Table = 0x%X, "
- "handle=%d",
- (unsigned int)l2_table_phys,
- handle);
+ MCDRV_DBG_VERBOSE(mc_kapi,
+ "Phys Addr of L2 Table = 0x%X, handle=%d",
+ (unsigned int)l2_table_phys, handle);
/* Create new descriptor */
- bulk_buf_descr = bulk_buffer_descriptor_create(
- buf,
- len,
- handle,
- l2_table_phys);
+ bulk_buf_descr = bulk_buffer_descriptor_create(buf, len,
+ handle,
+ l2_table_phys);
/* Add to vector of descriptors */
list_add_tail(&(bulk_buf_descr->list),
- &(session->bulk_buffer_descriptors));
+ &(session->bulk_buffer_descriptors));
} while (0);
return bulk_buf_descr;
}
-
-/*****************************************************************************/
-bool session_remove_bulk_buf(
- struct session *session,
- void *virt_addr
-) {
+bool session_remove_bulk_buf(struct session *session, void *virt_addr)
+{
bool ret = true;
- struct bulk_buffer_descriptor *bulk_buf_descr = NULL;
- struct bulk_buffer_descriptor *tmp;
+ struct bulk_buffer_descriptor *bulk_buf_descr = NULL;
+ struct bulk_buffer_descriptor *tmp;
struct list_head *pos, *q;
+ unsigned int phys_addr_wsm_l2;
- MCDRV_DBG_VERBOSE("Virtual Address = 0x%X", (unsigned int) virt_addr);
+ MCDRV_DBG_VERBOSE(mc_kapi, "Virtual Address = 0x%X",
+ (unsigned int) virt_addr);
/* Search and remove bulk buffer descriptor */
list_for_each_safe(pos, q, &session->bulk_buffer_descriptors) {
@@ -180,23 +162,24 @@
}
if (bulk_buf_descr == NULL) {
- MCDRV_DBG_ERROR("Virtual Address not found");
+ MCDRV_DBG_ERROR(mc_kapi, "Virtual Address not found");
ret = false;
} else {
- MCDRV_DBG_VERBOSE("WsmL2 phys=0x%X, handle=%d",
- (unsigned int)bulk_buf_descr->phys_addr_wsm_l2,
- bulk_buf_descr->handle);
+ phys_addr_wsm_l2 =
+ (unsigned int)bulk_buf_descr->phys_addr_wsm_l2;
+
+ MCDRV_DBG_VERBOSE(mc_kapi, "WsmL2 phys=0x%X, handle=%d",
+ phys_addr_wsm_l2, bulk_buf_descr->handle);
/* ignore any error, as we cannot do anything */
int ret = mobicore_unmap_vmem(session->instance,
- bulk_buf_descr->handle);
+ bulk_buf_descr->handle);
if (ret != 0)
- MCDRV_DBG_ERROR("mobicore_unmap_vmem failed: %d", ret);
+ MCDRV_DBG_ERROR(mc_kapi,
+ "mobicore_unmap_vmem failed: %d", ret);
kfree(bulk_buf_descr);
}
return ret;
}
-
-/** @} */
diff --git a/drivers/gud/mobicore_kernelapi/session.h b/drivers/gud/mobicore_kernelapi/session.h
index 9a53740..430dd35 100644
--- a/drivers/gud/mobicore_kernelapi/session.h
+++ b/drivers/gud/mobicore_kernelapi/session.h
@@ -1,14 +1,12 @@
-/** @addtogroup MCD_IMPL_LIB
- * @{
- * @file
- * <!-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
+/*
+ * <-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#ifndef SESSION_H_
-#define SESSION_H_
+#ifndef _MC_KAPI_SESSION_H_
+#define _MC_KAPI_SESSION_H_
#include "common.h"
@@ -17,23 +15,27 @@
struct bulk_buffer_descriptor {
- void *virt_addr;/**< The virtual address of the Bulk buffer*/
- uint32_t len; /**< Length of the Bulk buffer*/
+ void *virt_addr; /* The VA of the Bulk buffer */
+ uint32_t len; /* Length of the Bulk buffer */
uint32_t handle;
- void *phys_addr_wsm_l2; /**< The physical address of the
- L2 table of the Bulk buffer*/
- struct list_head list; /**< The list param for using the kernel lists*/
+
+ /* The physical address of the L2 table of the Bulk buffer*/
+ void *phys_addr_wsm_l2;
+
+ /* The list param for using the kernel lists*/
+ struct list_head list;
};
struct bulk_buffer_descriptor *bulk_buffer_descriptor_create(
- void *virt_addr,
- uint32_t len,
- uint32_t handle,
- void *phys_addr_wsm_l2
+ void *virt_addr,
+ uint32_t len,
+ uint32_t handle,
+ void *phys_addr_wsm_l2
);
-/** Session states.
- * At the moment not used !!.
+/*
+ * Session states.
+ * At the moment not used !!
*/
enum session_state {
SESSION_STATE_INITIAL,
@@ -41,96 +43,89 @@
SESSION_STATE_TRUSTLET_DEAD
};
-#define SESSION_ERR_NO 0 /**< No session error */
+#define SESSION_ERR_NO 0 /* No session error */
-/** Session information structure.
+/*
+ * Session information structure.
* The information structure is used to hold the state of the session, which
* will limit further actions for the session.
* Also the last error code will be stored till it's read.
*/
struct session_information {
- enum session_state state; /**< Session state */
- int32_t last_error; /**< Last error of session */
+ enum session_state state; /* Session state */
+ int32_t last_error; /* Last error of session */
};
struct session {
struct mc_instance *instance;
- /**< Descriptors of additional bulk buffer of a session */
- struct list_head bulk_buffer_descriptors;
- /**< Informations about session */
- struct session_information session_info;
- uint32_t session_id;
- struct connection *notification_connection;
+ /* Descriptors of additional bulk buffer of a session */
+ struct list_head bulk_buffer_descriptors;
- /**< The list param for using the kernel lists*/
- struct list_head list;
+ /* Informations about session */
+ struct session_information session_info;
+
+ uint32_t session_id;
+ struct connection *notification_connection;
+
+ /* The list param for using the kernel lists */
+ struct list_head list;
};
struct session *session_create(
- uint32_t session_id,
- void *instance,
- struct connection *connection
+ uint32_t session_id,
+ void *instance,
+ struct connection *connection
);
-void session_cleanup(
- struct session *session
-);
+void session_cleanup(struct session *session);
/**
- * Add address information of additional bulk buffer memory to session and
- * register virtual memory in kernel module.
- *
- * @attention The virtual address can only be added one time. If the virtual
- * address already exist, NULL is returned.
- *
- * @param buf The virtual address of bulk buffer.
- * @param len Length of bulk buffer.
- *
- * @return On success the actual Bulk buffer descriptor with all address
- * information is retured, NULL if an error occurs.
- */
+ * session_add_bulk_buf() - Add address information of additional bulk
+ * buffer memory to session and register virtual
+ * memory in kernel module
+ * @session: Session information structure
+ * @buf: The virtual address of bulk buffer.
+ * @len: Length of bulk buffer.
+ *
+ * The virtual address can only be added one time. If the virtual
+ * address already exist, NULL is returned.
+ *
+ * On success the actual Bulk buffer descriptor with all address information
+ * is retured, NULL if an error occurs.
+ */
struct bulk_buffer_descriptor *session_add_bulk_buf(
- struct session *session,
- void *buf,
- uint32_t len
-);
+ struct session *session, void *buf, uint32_t len);
/**
- * Remove address information of additional bulk buffer memory from session and
- * unregister virtual memory in kernel module
- *
- * @param buf The virtual address of the bulk buffer.
- *
- * @return true on success.
- */
-bool session_remove_bulk_buf(
- struct session *session,
- void *buf
-);
+ * session_remove_bulk_buf() - Remove address information of additional bulk
+ * buffer memory from session and unregister
+ * virtual memory in kernel module
+ * @session: Session information structure
+ * @buf: The virtual address of the bulk buffer
+ *
+ * Returns true on success
+ */
+bool session_remove_bulk_buf(struct session *session, void *buf);
/**
- * Set additional error information of the last error that occured.
- *
- * @param errorCode The actual error.
- */
-void session_set_error_info(
- struct session *session,
- int32_t err
-);
+ * session_set_error_info() - Set additional error information of the last
+ * error that occured.
+ * @session: Session information structure
+ * @err: The actual error
+ */
+void session_set_error_info(struct session *session, int32_t err);
/**
- * Get additional error information of the last error that occured.
- *
- * @attention After request the information is set to SESSION_ERR_NO.
- *
- * @return Last stored error code or SESSION_ERR_NO.
- */
-int32_t session_get_last_err(
- struct session *session
-);
+ * session_get_last_err() - Get additional error information of the last
+ * error that occured.
+ * @session: Session information structure
+ *
+ * After request the information is set to SESSION_ERR_NO.
+ *
+ * Returns the last stored error code or SESSION_ERR_NO
+ */
+int32_t session_get_last_err(struct session *session);
-#endif /* SESSION_H_ */
-
-/** @} */
+#endif /* _MC_KAPI_SESSION_H_ */
diff --git a/drivers/gud/mobicore_kernelapi/wsm.h b/drivers/gud/mobicore_kernelapi/wsm.h
index 6877c53..f8a107c 100644
--- a/drivers/gud/mobicore_kernelapi/wsm.h
+++ b/drivers/gud/mobicore_kernelapi/wsm.h
@@ -1,35 +1,33 @@
-/** @addtogroup MCD_MCDIMPL_DAEMON_SRV
- * @{
- * @file
- *
+/*
* World shared memory definitions.
*
- * <!-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
+ * <-- Copyright Giesecke & Devrient GmbH 2009 - 2012 -->
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#ifndef WSM_H_
-#define WSM_H_
+#ifndef _MC_KAPI_WSM_H_
+#define _MC_KAPI_WSM_H_
#include "common.h"
#include <linux/list.h>
struct wsm {
- void *virt_addr;
- uint32_t len;
- uint32_t handle;
- void *phys_addr;
- struct list_head list;
+ void *virt_addr;
+ uint32_t len;
+ uint32_t handle;
+ void *phys_addr;
+ struct list_head list;
};
struct wsm *wsm_create(
- void *virt_addr,
- uint32_t len,
- uint32_t handle,
- void *phys_addr /*= NULL this may be unknown, so is can be omitted.*/
-);
-#endif /* WSM_H_ */
+ void *virt_addr,
+ uint32_t len,
+ uint32_t handle,
-/** @} */
+ /* NULL this may be unknown, so is can be omitted */
+ void *phys_addr
+);
+
+#endif /* _MC_KAPI_WSM_H_ */