summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/pmu/pmu.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2018-04-09 20:39:11 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-05-07 07:41:22 -0400
commite6b3bb4e6b3d4013f83ba6d31c780947f16cf410 (patch)
treea6620cd552fc05e8d31de3e076f1f7656821ed25 /drivers/gpu/nvgpu/common/pmu/pmu.c
parentb0cf5804147efbf50ad80d900248e2eeefb4eb2c (diff)
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 <alexw@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1692454 Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/pmu/pmu.c')
-rw-r--r--drivers/gpu/nvgpu/common/pmu/pmu.c3
1 files changed, 2 insertions, 1 deletions
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,
338 338
339 init = pv->get_pmu_msg_pmu_init_msg_ptr(&(msg->msg.init)); 339 init = pv->get_pmu_msg_pmu_init_msg_ptr(&(msg->msg.init));
340 if (!pmu->gid_info.valid) { 340 if (!pmu->gid_info.valid) {
341 u32 *gid_hdr_data = (u32 *)(gid_data.signature);
341 342
342 nvgpu_flcn_copy_from_dmem(pmu->flcn, 343 nvgpu_flcn_copy_from_dmem(pmu->flcn,
343 pv->get_pmu_init_msg_pmu_sw_mg_off(init), 344 pv->get_pmu_init_msg_pmu_sw_mg_off(init),
@@ -345,7 +346,7 @@ int nvgpu_pmu_process_init_msg(struct nvgpu_pmu *pmu,
345 sizeof(struct pmu_sha1_gid_data), 0); 346 sizeof(struct pmu_sha1_gid_data), 0);
346 347
347 pmu->gid_info.valid = 348 pmu->gid_info.valid =
348 (*(u32 *)gid_data.signature == PMU_SHA1_GID_SIGNATURE); 349 (*gid_hdr_data == PMU_SHA1_GID_SIGNATURE);
349 350
350 if (pmu->gid_info.valid) { 351 if (pmu->gid_info.valid) {
351 352