From fc0faf10ad011da518042ec8691bf37172407df8 Mon Sep 17 00:00:00 2001 From: Viswanath L Date: Wed, 14 Jul 2021 23:09:07 +0530 Subject: [PATCH] nvadsp: Set alignment for shared structs Shared structures nvadsp_app_shared_msg_pool and nvadsp_shared_mem are aligned using #pragma pack(8) in order to match the alignment on ADSP side. Bug 200729844 Change-Id: I541a8a26894e9c5e78f56fa687ca59b905342f23 Signed-off-by: Viswanath L Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2559105 Reviewed-by: svcacv Reviewed-by: svc_kernel_abi Reviewed-by: Niranjan Dighe Reviewed-by: Sharad Gupta Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/platform/tegra/nvadsp/adsp_shared_struct.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/platform/tegra/nvadsp/adsp_shared_struct.h b/drivers/platform/tegra/nvadsp/adsp_shared_struct.h index 7a08b8c0..629e3b8d 100644 --- a/drivers/platform/tegra/nvadsp/adsp_shared_struct.h +++ b/drivers/platform/tegra/nvadsp/adsp_shared_struct.h @@ -117,10 +117,12 @@ union app_loader_msgq { }; /* ADSP APP shared message pool */ +#pragma pack(8) struct nvadsp_app_shared_msg_pool { union app_loader_msgq app_loader_send_message; union app_loader_msgq app_loader_recv_message; -} __packed; +}; +#pragma pack() /*ADSP shated OS args */ struct nvadsp_os_args { @@ -168,12 +170,14 @@ struct nvadsp_os_info { } __packed; /* ADSP OS shared memory */ +#pragma pack(8) struct nvadsp_shared_mem { struct nvadsp_app_shared_msg_pool app_shared_msg_pool; struct nvadsp_os_args os_args; struct nvadsp_os_info os_info; struct nvadsp_exception_context exception_context; -} __packed; +}; +#pragma pack() #endif /* __ADSP_SHARED_STRUCT */