From ad503f60fdbf6bacfa8647df0f8c232f7cfc8f36 Mon Sep 17 00:00:00 2001 From: Antony Clince Alex Date: Tue, 7 Apr 2020 20:52:09 +0530 Subject: [PATCH] gpu: nvgpu: gv11b: add missing hw macros Add following missing hw macros for gv11b: - pri_ringstation_gpc_gpc0_priv_error_info_priv_level_v - pri_ringstation_gpc_gpc0_priv_error_info_subid_v - pri_ringstation_sys_priv_error_info_priv_level_v - pri_ringstation_sys_priv_error_info_subid_v Bug 200604892 Change-Id: I37fa33580b689a496ed0a74855a58291d626e341 Signed-off-by: Antony Clince Alex Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2325347 Reviewed-by: Seema Khowala Reviewed-by: automaticguardword Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Vinod Gopalakrishnakurup Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- .../include/nvgpu/hw/gv11b/hw_pri_ringstation_gpc_gv11b.h | 6 +++++- .../include/nvgpu/hw/gv11b/hw_pri_ringstation_sys_gv11b.h | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringstation_gpc_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringstation_gpc_gv11b.h index a65216ef7..8acef04a5 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringstation_gpc_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringstation_gpc_gv11b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2020, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -64,5 +64,9 @@ #define pri_ringstation_gpc_gpc0_priv_error_adr_r() (0x00128120U) #define pri_ringstation_gpc_gpc0_priv_error_wrdat_r() (0x00128124U) #define pri_ringstation_gpc_gpc0_priv_error_info_r() (0x00128128U) +#define pri_ringstation_gpc_gpc0_priv_error_info_subid_v(r)\ + (((r) >> 24U) & 0x3fU) +#define pri_ringstation_gpc_gpc0_priv_error_info_priv_level_v(r)\ + (((r) >> 20U) & 0x3U) #define pri_ringstation_gpc_gpc0_priv_error_code_r() (0x0012812cU) #endif diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringstation_sys_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringstation_sys_gv11b.h index afea72e71..58b5a7e9f 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringstation_sys_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringstation_sys_gv11b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2020, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -68,5 +68,8 @@ #define pri_ringstation_sys_priv_error_adr_r() (0x00122120U) #define pri_ringstation_sys_priv_error_wrdat_r() (0x00122124U) #define pri_ringstation_sys_priv_error_info_r() (0x00122128U) +#define pri_ringstation_sys_priv_error_info_subid_v(r) (((r) >> 24U) & 0x3fU) +#define pri_ringstation_sys_priv_error_info_priv_level_v(r)\ + (((r) >> 20U) & 0x3U) #define pri_ringstation_sys_priv_error_code_r() (0x0012212cU) #endif