gpu: nvgpu: Fold T19x code back to main code paths

Lots of code paths were split to T19x specific code paths and structs
due to split repository. Now that repositories are merged, fold all of
them back to main code paths and structs and remove the T19x specific
Kconfig flag.

Change-Id: Id0d17a5f0610fc0b49f51ab6664e716dc8b222b6
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1640606
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 0 insertions, 66 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/ecc_gv11b.h b/drivers/gpu/nvgpu/gv11b/ecc_gv11b.h
deleted file mode 100644
index ebce46ce..00000000
--- a/drivers/gpu/nvgpu/gv11b/ecc_gv11b.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * GV11B GPU ECC
- *
- * Copyright (c) 2016-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_ECC_GV11B_H_
-#define _NVGPU_ECC_GV11B_H_
-
-struct ecc_gr_t19x {
-        struct gk20a_ecc_stat sm_l1_tag_corrected_err_count;
-        struct gk20a_ecc_stat sm_l1_tag_uncorrected_err_count;
-        struct gk20a_ecc_stat sm_cbu_corrected_err_count;
-        struct gk20a_ecc_stat sm_cbu_uncorrected_err_count;
-        struct gk20a_ecc_stat sm_l1_data_corrected_err_count;
-        struct gk20a_ecc_stat sm_l1_data_uncorrected_err_count;
-        struct gk20a_ecc_stat sm_icache_corrected_err_count;
-        struct gk20a_ecc_stat sm_icache_uncorrected_err_count;
-        struct gk20a_ecc_stat gcc_l15_corrected_err_count;
-        struct gk20a_ecc_stat gcc_l15_uncorrected_err_count;
-        struct gk20a_ecc_stat fecs_corrected_err_count;
-        struct gk20a_ecc_stat fecs_uncorrected_err_count;
-        struct gk20a_ecc_stat gpccs_corrected_err_count;
-        struct gk20a_ecc_stat gpccs_uncorrected_err_count;
-        struct gk20a_ecc_stat mmu_l1tlb_corrected_err_count;
-        struct gk20a_ecc_stat mmu_l1tlb_uncorrected_err_count;
-};
-
-struct ecc_ltc_t19x {
-        struct gk20a_ecc_stat l2_cache_corrected_err_count;
-        struct gk20a_ecc_stat l2_cache_uncorrected_err_count;
-};
-
-/* TODO: PMU and FB ECC features are still under embargo */
-struct ecc_eng_t19x {
-        /* FB */
-        struct gk20a_ecc_stat mmu_l2tlb_corrected_err_count;
-        struct gk20a_ecc_stat mmu_l2tlb_uncorrected_err_count;
-        struct gk20a_ecc_stat mmu_hubtlb_corrected_err_count;
-        struct gk20a_ecc_stat mmu_hubtlb_uncorrected_err_count;
-        struct gk20a_ecc_stat mmu_fillunit_corrected_err_count;
-        struct gk20a_ecc_stat mmu_fillunit_uncorrected_err_count;
-        /* PMU */
-        struct gk20a_ecc_stat pmu_corrected_err_count;
-        struct gk20a_ecc_stat pmu_uncorrected_err_count;
-};
-
-#endif