diff options
author | Doug Gilbert <dgilbert@us.ibm.com> | 2012-11-21 17:36:02 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-12-14 10:46:50 -0600 |
commit | 468f784bbdb2176387a4f1f9ad3f0b10d15ad918 (patch) | |
tree | 7bfe554931935f1c0fe74914d1a44f229097afe5 /src/include/sys | |
parent | df8e246c1afd3c5e63a7cead8db40b7b0fc0837a (diff) | |
download | talos-hostboot-468f784bbdb2176387a4f1f9ad3f0b10d15ad918.tar.gz talos-hostboot-468f784bbdb2176387a4f1f9ad3f0b10d15ad918.zip |
Switch Interrupt Presenter to get ICPBAR value from an attribute
Change-Id: I5d95f3e3e2d803f07c7d8f3bf2d8ee522e1b4519
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2406
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include/sys')
-rw-r--r-- | src/include/sys/interrupt.h | 41 | ||||
-rw-r--r-- | src/include/sys/msg.h | 60 | ||||
-rw-r--r-- | src/include/sys/vfs.h | 46 |
3 files changed, 59 insertions, 88 deletions
diff --git a/src/include/sys/interrupt.h b/src/include/sys/interrupt.h deleted file mode 100644 index 40e0e2bf8..000000000 --- a/src/include/sys/interrupt.h +++ /dev/null @@ -1,41 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/include/sys/interrupt.h $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2011-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ -#ifndef __INTERRUPT_H -#define __INTERRUPT_H - - -extern const char* INTR_MSGQ; - -/** - * INTR constants - */ -enum -{ - ICPBAR_EN = 30, // BIT 30 - ICPBAR_SCOM_ADDR = 0x020109ca, //!< for P8, P7 = 0x02011C09 - // This BAR value agrees with simics (for now) - ICPBAR_VAL = 0x3FFFF800, //!< ICPBAR value bits[0:29]>>34 -}; - -#endif diff --git a/src/include/sys/msg.h b/src/include/sys/msg.h index 129d0c36b..9fadd8b70 100644 --- a/src/include/sys/msg.h +++ b/src/include/sys/msg.h @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/include/sys/msg.h $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2010-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/sys/msg.h $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2010,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __SYS_MSG_H #define __SYS_MSG_H @@ -141,10 +140,23 @@ void msg_q_destroy( msg_q_t q ); * @param[in] q - handle of message queue to name * @param[in] name - name * - * @return Result of msg_sendrecv where zero indicates success + * @return Result of the syscall where zero indicates success */ int msg_q_register(msg_q_t q, const char* name); +/** @fn msg_intr_q_register + * @brief Register the interrupt message queue + * + * @param[in] q - handle of message queue to register + * @param[in] i_ipc_base_addr Is the base MMIO address of the + * IPC register set + * + * @return Result of the syscall where zero indicates success + * < 0 is the ERRNO + */ +int msg_intr_q_register(msg_q_t q, + uint64_t i_ipc_base_addr); + /** @fn msg_q_remove * @brief Remove a message queue from the registry * diff --git a/src/include/sys/vfs.h b/src/include/sys/vfs.h index b4b7da594..224422ffa 100644 --- a/src/include/sys/vfs.h +++ b/src/include/sys/vfs.h @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/include/sys/vfs.h $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2010-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/sys/vfs.h $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2010,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __SYS_VFS_H #define __SYS_VFS_H @@ -64,6 +63,7 @@ extern const char* VFS_ROOT_BIN; extern const char* VFS_ROOT_DATA; extern const char* VFS_ROOT_MSG; extern const char* VFS_ROOT_MSG_VFS; +extern const char* VFS_ROOT_MSG_INTR; enum VfsMessages { |