From c6b9177cfff8a41c3c3c78f5c47c7df677ced58c Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Mon, 6 Nov 2017 05:44:23 -0800 Subject: gpu: nvgpu: define error_notifiers in common code All the linux specific error_notifier codes are defined in linux specific header file and used in all the common driver But since they are defined in linux specific file, we need to move all the uses of those error_notifiers in linux specific code only Hence define new error_notifiers in include/nvgpu/error_notifier.h and use them in the common code Add new API nvgpu_error_notifier_to_channel_notifier() to convert common error_notifier of the form NVGPU_ERR_NOTIFIER_* to linux specific error notifier of the form NVGPU_CHANNEL_* Any future additions to error notifiers requires update to both the form of error notifiers Move all error notifier related metadata from channel_gk20a (common code) to linux specific structure nvgpu_channel_linux Update all accesses to this data from new structure instead of channel_gk20a Move and rename below APIs to linux specific file and declare them in error_notifier.h nvgpu_set_error_notifier_locked() nvgpu_set_error_notifier() nvgpu_is_error_notifier_set() Add below new API and use it in fifo_vgpu.c nvgpu_set_error_notifier_if_empty() Include wherever new error_notifier codes are used NVGPU-426 Change-Id: Iaa5bfc150e6e9ec17d797d445c2d6407afe9f4bd Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/1593361 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/error_notifier.h | 49 ++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 drivers/gpu/nvgpu/include/nvgpu/error_notifier.h (limited to 'drivers/gpu/nvgpu/include') diff --git a/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h b/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h new file mode 100644 index 00000000..3e70c379 --- /dev/null +++ b/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2017, 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"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef __NVGPU_ERROR_NOTIFIER_H__ +#define __NVGPU_ERROR_NOTIFIER_H__ + +#include + +struct channel_gk20a; + +enum { + NVGPU_ERR_NOTIFIER_FIFO_ERROR_IDLE_TIMEOUT = 0, + NVGPU_ERR_NOTIFIER_GR_ERROR_SW_METHOD, + NVGPU_ERR_NOTIFIER_GR_ERROR_SW_NOTIFY, + NVGPU_ERR_NOTIFIER_GR_EXCEPTION, + NVGPU_ERR_NOTIFIER_GR_SEMAPHORE_TIMEOUT, + NVGPU_ERR_NOTIFIER_GR_ILLEGAL_NOTIFY, + NVGPU_ERR_NOTIFIER_FIFO_ERROR_MMU_ERR_FLT, + NVGPU_ERR_NOTIFIER_PBDMA_ERROR, + NVGPU_ERR_NOTIFIER_FECS_ERR_UNIMP_FIRMWARE_METHOD, + NVGPU_ERR_NOTIFIER_RESETCHANNEL_VERIF_ERROR, + NVGPU_ERR_NOTIFIER_PBDMA_PUSHBUFFER_CRC_MISMATCH, +}; + +void nvgpu_set_error_notifier_locked(struct channel_gk20a *ch, u32 error); +void nvgpu_set_error_notifier(struct channel_gk20a *ch, u32 error); +void nvgpu_set_error_notifier_if_empty(struct channel_gk20a *ch, u32 error); +bool nvgpu_is_error_notifier_set(struct channel_gk20a *ch, u32 error_notifier); + +#endif /* __NVGPU_ERROR_NOTIFIER_H__ */ -- cgit v1.2.2