nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 09:57:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: NVGPU abstraction for ACCESS_ONCE

Browse Source 
Construct a wrapper macro NV_ACCESS_ONCE(x) which uses OS specific
versions of ACCESS_ONCE. e.g for linux, ACCESS_ONCE(x) is used.

Jira NVGPU-125

Change-Id: Ia5c67baae111c1a7978c530bf279715fc808287d
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1549928
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Debarshi Dutta
2017-09-01 10:14:59 +05:30
committed by mobile promotions
parent 081dc658cb
commit 2dcfd29861
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpu/nvgpu/clk/clk_arb.c
View File

@@ -705,7 +705,7 @@ static int nvgpu_clk_arb_update_vf_table(struct nvgpu_clk_arb *arb)
struct clk_set_info *p5_info, *p0_info; struct clk_set_info *p5_info, *p0_info;
table = ACCESS_ONCE(arb->current_vf_table); table = NV_ACCESS_ONCE(arb->current_vf_table);
/* make flag visible when all data has resolved in the tables */ /* make flag visible when all data has resolved in the tables */
nvgpu_smp_rmb(); nvgpu_smp_rmb();
@@ -1073,7 +1073,7 @@ static void nvgpu_clk_arb_run_arbiter_cb(struct work_struct *work)
if (!session->zombie) { if (!session->zombie) {
mclk_set = false; mclk_set = false;
gpc2clk_set = false; gpc2clk_set = false;
target = ACCESS_ONCE(session->target) == target = NV_ACCESS_ONCE(session->target) ==
&session->target_pool[0] ? &session->target_pool[0] ?
&session->target_pool[1] : &session->target_pool[1] :
&session->target_pool[0]; &session->target_pool[0];
@@ -1221,7 +1221,7 @@ static void nvgpu_clk_arb_run_arbiter_cb(struct work_struct *work)
goto exit_arb; goto exit_arb;
} }
actual = ACCESS_ONCE(arb->actual) == &arb->actual_pool[0] ? actual = NV_ACCESS_ONCE(arb->actual) == &arb->actual_pool[0] ?
&arb->actual_pool[1] : &arb->actual_pool[0]; &arb->actual_pool[1] : &arb->actual_pool[0];
/* do not reorder this pointer */ /* do not reorder this pointer */
@@ -1374,7 +1374,7 @@ static u32 nvgpu_clk_arb_notify(struct nvgpu_clk_dev *dev,
notification = &arb->notification_queue. notification = &arb->notification_queue.
notifications[(index+1) % size]; notifications[(index+1) % size];
alarm_detected = alarm_detected =
ACCESS_ONCE(notification->notification); NV_ACCESS_ONCE(notification->notification);
if (!(enabled_mask & alarm_detected)) if (!(enabled_mask & alarm_detected))
continue; continue;
@@ -1382,7 +1382,7 @@ static u32 nvgpu_clk_arb_notify(struct nvgpu_clk_dev *dev,
queue_index++; queue_index++;
dev->queue.notifications[ dev->queue.notifications[
queue_index % dev->queue.size].timestamp = queue_index % dev->queue.size].timestamp =
ACCESS_ONCE(notification->timestamp); NV_ACCESS_ONCE(notification->timestamp);
dev->queue.notifications[ dev->queue.notifications[
queue_index % dev->queue.size].notification = queue_index % dev->queue.size].notification =
@@ -1686,7 +1686,7 @@ int nvgpu_clk_arb_get_session_target_mhz(struct nvgpu_clk_session *session,
struct nvgpu_clk_arb_target *target; struct nvgpu_clk_arb_target *target;
do { do {
target = ACCESS_ONCE(session->target); target = NV_ACCESS_ONCE(session->target);
/* no reordering of this pointer */ /* no reordering of this pointer */
nvgpu_smp_rmb(); nvgpu_smp_rmb();
@@ -1703,7 +1703,7 @@ int nvgpu_clk_arb_get_session_target_mhz(struct nvgpu_clk_session *session,
*freq_mhz = 0; *freq_mhz = 0;
err = -EINVAL; err = -EINVAL;
} }
} while (target != ACCESS_ONCE(session->target)); } while (target != NV_ACCESS_ONCE(session->target));
return err; return err;
} }
@@ -1715,7 +1715,7 @@ int nvgpu_clk_arb_get_arbiter_actual_mhz(struct gk20a *g,
struct nvgpu_clk_arb_target *actual; struct nvgpu_clk_arb_target *actual;
do { do {
actual = ACCESS_ONCE(arb->actual); actual = NV_ACCESS_ONCE(arb->actual);
/* no reordering of this pointer */ /* no reordering of this pointer */
nvgpu_smp_rmb(); nvgpu_smp_rmb();
@@ -1732,7 +1732,7 @@ int nvgpu_clk_arb_get_arbiter_actual_mhz(struct gk20a *g,
*freq_mhz = 0; *freq_mhz = 0;
err = -EINVAL; err = -EINVAL;
} }
} while (actual != ACCESS_ONCE(arb->actual)); } while (actual != NV_ACCESS_ONCE(arb->actual));
return err; return err;
} }
@@ -1853,7 +1853,7 @@ static u8 nvgpu_clk_arb_find_vf_point(struct nvgpu_clk_arb *arb,
mclk_voltuv = 0; mclk_voltuv = 0;
mclk_voltuv_sram = 0; mclk_voltuv_sram = 0;
table = ACCESS_ONCE(arb->current_vf_table); table = NV_ACCESS_ONCE(arb->current_vf_table);
/* pointer to table can be updated by callback */ /* pointer to table can be updated by callback */
nvgpu_smp_rmb(); nvgpu_smp_rmb();
@@ -1943,7 +1943,7 @@ recalculate_vf_point:
mclk_voltuv_sram = mclk_vf->uvolt_sram; mclk_voltuv_sram = mclk_vf->uvolt_sram;
} while (!table || } while (!table ||
(ACCESS_ONCE(arb->current_vf_table) != table)); (NV_ACCESS_ONCE(arb->current_vf_table) != table));
find_exit: find_exit:
*voltuv = gpc2clk_voltuv > mclk_voltuv ? gpc2clk_voltuv : mclk_voltuv; *voltuv = gpc2clk_voltuv > mclk_voltuv ? gpc2clk_voltuv : mclk_voltuv;
@@ -1961,7 +1961,7 @@ find_exit:
* arbiter must be blocked before calling this function */ * arbiter must be blocked before calling this function */
int nvgpu_clk_arb_get_current_pstate(struct gk20a *g) int nvgpu_clk_arb_get_current_pstate(struct gk20a *g)
{ {
return ACCESS_ONCE(g->clk_arb->actual->pstate); return NV_ACCESS_ONCE(g->clk_arb->actual->pstate);
} }
static int nvgpu_clk_arb_change_vf_point(struct gk20a *g, u16 gpc2clk_target, static int nvgpu_clk_arb_change_vf_point(struct gk20a *g, u16 gpc2clk_target,
@@ -2038,7 +2038,7 @@ static int nvgpu_clk_arb_stats_show(struct seq_file *s, void *unused)
u64 num; u64 num;
s64 tmp, avg, std, max, min; s64 tmp, avg, std, max, min;
debug = ACCESS_ONCE(arb->debug); debug = NV_ACCESS_ONCE(arb->debug);
/* Make copy of structure and ensure no reordering */ /* Make copy of structure and ensure no reordering */
nvgpu_smp_rmb(); nvgpu_smp_rmb();
if (!debug) if (!debug)

10
drivers/gpu/nvgpu/common/mm/lockless_allocator.c
View File

@@ -60,9 +60,9 @@ static u64 nvgpu_lockless_alloc(struct nvgpu_allocator *a, u64 len)
if (len != pa->blk_size) if (len != pa->blk_size)
return 0; return 0;
head = ACCESS_ONCE(pa->head); head = NV_ACCESS_ONCE(pa->head);
while (head >= 0) { while (head >= 0) {
new_head = ACCESS_ONCE(pa->next[head]); new_head = NV_ACCESS_ONCE(pa->next[head]);
ret = cmpxchg(&pa->head, head, new_head); ret = cmpxchg(&pa->head, head, new_head);
if (ret == head) { if (ret == head) {
addr = pa->base + head * pa->blk_size; addr = pa->base + head * pa->blk_size;
@@ -71,7 +71,7 @@ static u64 nvgpu_lockless_alloc(struct nvgpu_allocator *a, u64 len)
addr); addr);
break; break;
} }
head = ACCESS_ONCE(pa->head); head = NV_ACCESS_ONCE(pa->head);
} }
if (addr) if (addr)
@@ -93,8 +93,8 @@ static void nvgpu_lockless_free(struct nvgpu_allocator *a, u64 addr)
alloc_dbg(a, "Free node # %llu @ addr 0x%llx\n", cur_idx, addr); alloc_dbg(a, "Free node # %llu @ addr 0x%llx\n", cur_idx, addr);
while (1) { while (1) {
head = ACCESS_ONCE(pa->head); head = NV_ACCESS_ONCE(pa->head);
ACCESS_ONCE(pa->next[cur_idx]) = head; NV_ACCESS_ONCE(pa->next[cur_idx]) = head;
ret = cmpxchg(&pa->head, head, cur_idx); ret = cmpxchg(&pa->head, head, cur_idx);
if (ret == head) { if (ret == head) {
nvgpu_atomic_dec(&pa->nr_allocs); nvgpu_atomic_dec(&pa->nr_allocs);

2
drivers/gpu/nvgpu/common/pmu/pmu.c
View File

@@ -413,7 +413,7 @@ static int nvgpu_pg_init_task(void *arg)
(pg_init->state_change == true), 0); (pg_init->state_change == true), 0);
pmu->pg_init.state_change = false; pmu->pg_init.state_change = false;
pmu_state = ACCESS_ONCE(pmu->pmu_state); pmu_state = NV_ACCESS_ONCE(pmu->pmu_state);
if (pmu_state == PMU_STATE_EXIT) { if (pmu_state == PMU_STATE_EXIT) {
nvgpu_pmu_dbg(g, "pmu state exit"); nvgpu_pmu_dbg(g, "pmu state exit");

2
drivers/gpu/nvgpu/include/nvgpu/barrier.h
View File

@@ -37,4 +37,6 @@
#define nvgpu_read_barrier_depends() __nvgpu_read_barrier_depends() #define nvgpu_read_barrier_depends() __nvgpu_read_barrier_depends()
#define nvgpu_smp_read_barrier_depends() __nvgpu_smp_read_barrier_depends() #define nvgpu_smp_read_barrier_depends() __nvgpu_smp_read_barrier_depends()
#define NV_ACCESS_ONCE(x) __NV_ACCESS_ONCE(x)
#endif /* __NVGPU_BARRIER_H__ */ #endif /* __NVGPU_BARRIER_H__ */

2
drivers/gpu/nvgpu/include/nvgpu/linux/barrier.h
View File

@@ -30,4 +30,6 @@
#define __nvgpu_read_barrier_depends() read_barrier_depends() #define __nvgpu_read_barrier_depends() read_barrier_depends()
#define __nvgpu_smp_read_barrier_depends() smp_read_barrier_depends() #define __nvgpu_smp_read_barrier_depends() smp_read_barrier_depends()
#define __NV_ACCESS_ONCE(x) ACCESS_ONCE(x)
#endif /* __NVGPU_BARRIER_LINUX_H__ */ #endif /* __NVGPU_BARRIER_LINUX_H__ */