nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: add assert in nvgpu_writel_check

Browse Source 
nvgpu_writel_check outputs dbg message if updated read value
does not match with requested write value. Change dbg message to
error message.
Use BUG_ON for write mismatch as failure to update h/w register
is a bug and tells s/w to either add fixed delay or use timeout
to check for updated register value.

JIRA NVGPU-5490

Change-Id: Ib11b7862d2990a56259d2f8c10d75c12c84bae5d
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2338004
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Seema Khowala
2020-05-01 22:10:31 -07:00
committed by Alex Waterman
parent e5b23f33b9
commit cfc5bac059
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/nvgpu/common/io/io.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2018-2020, NVIDIA CORPORATION. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -22,6 +22,7 @@
#include <nvgpu/io.h> #include <nvgpu/io.h>
#include <nvgpu/types.h> #include <nvgpu/types.h>
#include <nvgpu/bug.h>
#include <nvgpu/gk20a.h> #include <nvgpu/gk20a.h>
void nvgpu_writel_check(struct gk20a *g, u32 r, u32 v) void nvgpu_writel_check(struct gk20a *g, u32 r, u32 v)
@@ -31,7 +32,8 @@ void nvgpu_writel_check(struct gk20a *g, u32 r, u32 v)
nvgpu_writel(g, r, v); nvgpu_writel(g, r, v);
read_val = nvgpu_readl(g, r); read_val = nvgpu_readl(g, r);
if (v != read_val) { if (v != read_val) {
nvgpu_log(g, gpu_dbg_reg, "r=0x%x rd=0x%x wr=0x%x (mismatch)", nvgpu_err(g, "r=0x%x rd=0x%x wr=0x%x (mismatch)",
r, read_val, v); r, read_val, v);
BUG_ON(1);
} }
} }

3
userspace/units/io/common_io.c
View File

@@ -26,6 +26,7 @@
#include <include/nvgpu/posix/io.h> #include <include/nvgpu/posix/io.h>
#include <nvgpu/types.h> #include <nvgpu/types.h>
#include <nvgpu/io.h> #include <nvgpu/io.h>
#include <nvgpu/bug.h>
#include "common_io.h" #include "common_io.h"
@@ -56,7 +57,7 @@ int test_writel_check(struct unit_module *m, struct gk20a *g, void *args)
/* Value 0 will force to fail readback call as read API returns /* Value 0 will force to fail readback call as read API returns
* NVGPU_READ_VAL. */ * NVGPU_READ_VAL. */
nvgpu_writel_check(g, USER_MODE_BASE, 0); EXPECT_BUG(nvgpu_writel_check(g, USER_MODE_BASE, 0));
/* Value NVGPU_READ_VAL will pass the readback call as read API returns /* Value NVGPU_READ_VAL will pass the readback call as read API returns
* NVGPU_READ_VAL. */ * NVGPU_READ_VAL. */