From e6b3bb4e6b3d4013f83ba6d31c780947f16cf410 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Mon, 9 Apr 2018 17:39:11 -0700 Subject: gpu: nvgpu: Fixups for tmake build Mostly just including necessary includes to make sure that global function declarations actually match their implementations. Also work around pointer munging warning: /build/ddpx/linux/kernel/nvgpu/drivers/gpu/nvgpu/common/pmu/pmu.c: In function 'nvgpu_pmu_process_init_msg': /build/ddpx/linux/kernel/nvgpu/drivers/gpu/nvgpu/common/pmu/pmu.c:348:4: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing] (*(u32 *)gid_data.signature == PMU_SHA1_GID_SIGNATURE); Work around this warning by simply moving the type punning. This code is certainly dangerous - it assumes the endianness of the header data is the same as the machine this code is running on. Apparently it works, though, so this ignores the warning. JIRA NVGPU-525 Change-Id: Id704bae7805440bebfad51c8c8365e6d2b7a39eb Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/1692454 Reviewed-by: svc-mobile-coverity GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/pmu/pmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/common/pmu/pmu.c') diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c index aaae138c..c642a7bc 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu.c @@ -338,6 +338,7 @@ int nvgpu_pmu_process_init_msg(struct nvgpu_pmu *pmu, init = pv->get_pmu_msg_pmu_init_msg_ptr(&(msg->msg.init)); if (!pmu->gid_info.valid) { + u32 *gid_hdr_data = (u32 *)(gid_data.signature); nvgpu_flcn_copy_from_dmem(pmu->flcn, pv->get_pmu_init_msg_pmu_sw_mg_off(init), @@ -345,7 +346,7 @@ int nvgpu_pmu_process_init_msg(struct nvgpu_pmu *pmu, sizeof(struct pmu_sha1_gid_data), 0); pmu->gid_info.valid = - (*(u32 *)gid_data.signature == PMU_SHA1_GID_SIGNATURE); + (*gid_hdr_data == PMU_SHA1_GID_SIGNATURE); if (pmu->gid_info.valid) { -- cgit v1.2.2