hikey960: Support packed structure in host/dsp XAF
Support packed structure in host/dsp XAF
Change-Id: I9c162b523da086331671d7fcde55a1e6893451c5
Signed-off-by: Niranjan Yadla <nyadla@cadence.com>
diff --git a/hifi/firmware/hifi-hikey960.img b/hifi/firmware/hifi-hikey960.img
index 0a731bf..b8c2516 100644
--- a/hifi/firmware/hifi-hikey960.img
+++ b/hifi/firmware/hifi-hikey960.img
Binary files differ
diff --git a/hifi/xaf/hifi-dpf/include/sys/xt-shmem/board-hikey/dsp_driver_mailbox.h b/hifi/xaf/hifi-dpf/include/sys/xt-shmem/board-hikey/dsp_driver_mailbox.h
index 8730df2..5fdcca9 100644
--- a/hifi/xaf/hifi-dpf/include/sys/xt-shmem/board-hikey/dsp_driver_mailbox.h
+++ b/hifi/xaf/hifi-dpf/include/sys/xt-shmem/board-hikey/dsp_driver_mailbox.h
@@ -132,8 +132,9 @@
/* ...length of attached buffer */
uint32_t length;
- /* ...shared logical address of message buffer */
+ /* ...physical address of message buffer */
uint64_t address;
+ uint64_t v_address;
} __attribute__((__packed__)) xf_proxy_msg_t;
diff --git a/hifi/xaf/hifi-dpf/include/xf-proxy.h b/hifi/xaf/hifi-dpf/include/xf-proxy.h
index 298b782..0260749 100644
--- a/hifi/xaf/hifi-dpf/include/xf-proxy.h
+++ b/hifi/xaf/hifi-dpf/include/xf-proxy.h
@@ -39,16 +39,17 @@
typedef struct xf_proxy_message
{
/* ...session ID */
- u32 session_id;
+ uint32_t session_id;
/* ...proxy API command/reponse code */
- u32 opcode;
+ uint32_t opcode;
/* ...length of attached buffer */
- u32 length;
+ uint32_t length;
/* ...physical address of message buffer */
- u32 address;
+ uint64_t address;
+ uint64_t v_address;
} __attribute__((__packed__)) xf_proxy_message_t;
#else
@@ -68,7 +69,7 @@
uint64_t address;
uint64_t v_address;
-}/* __attribute__((__packed__)) */xf_proxy_message_t;
+} __attribute__((__packed__)) xf_proxy_message_t;
#endif
/*******************************************************************************
* Ring buffer support
diff --git a/hifi/xaf/host-apf/include/xf-proxy.h b/hifi/xaf/host-apf/include/xf-proxy.h
index ab8bd23..90d7079 100644
--- a/hifi/xaf/host-apf/include/xf-proxy.h
+++ b/hifi/xaf/host-apf/include/xf-proxy.h
@@ -48,19 +48,19 @@
struct xf_proxy_msg
{
/* ...session-id field */
- u32 id;
+ uint32_t id;
/* ...message opcode */
- u32 opcode;
+ uint32_t opcode;
/* ...buffer length */
- u32 length;
+ uint32_t length;
/* ...buffer pointer */
- u32 address;
-uint64_t v_address;
+ uint64_t address;
+ uint64_t v_address;
-}/* __attribute__((__packed__))*/;
+} __attribute__((__packed__));
typedef struct xf_proxy_msg_driv
{
@@ -77,7 +77,7 @@
uint64_t address;
uint64_t v_address;
-}xf_proxy_message_driv_t;
+}__attribute__((__packed__)) xf_proxy_message_driv_t;
/*******************************************************************************
* Buffer pools
******************************************************************************/
