platform: tegra: cbb: mask SError due to CBB error

Mask SError for illegal accesses from CCPLEX master.
Interrupts will be generated for access from CCPLEX and
error info will be printed within the interrupt handler
instead of SError callback. Also, call BUG() to crash
the system if illegal access is from CCPLEX master.
For illegal accesses from other masters, interrupt is
already getting generated instead of SError.

Bug 3191922

Change-Id: Ie03f4f0f0ca58fb695a54183456861dd98931855
Signed-off-by: Sumit Gupta <sumitg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2118672
(cherry picked from commit ef8df45ba078e6d9ab2d648c4c122e38b600c77d)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2458251
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/include/linux/platform/tegra/tegra_cbb.h b/include/linux/platform/tegra/tegra_cbb.h
index 690c99555..767c8ec71 100644
--- a/include/linux/platform/tegra/tegra_cbb.h
+++ b/include/linux/platform/tegra/tegra_cbb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -158,6 +158,8 @@ struct tegra_cbb_noc_data {
         char            **tegra_cbb_master_id;
         bool            is_ax2apb_bridge_connected;
         bool            is_clk_rst;
+        bool            erd_mask_inband_err;
+        u64             off_erd_err_config;
         int             (*is_cluster_probed)(void);
         int             (*is_clk_enabled)(void);
         int             (*tegra_noc_en_clk_rpm)(void);