From 3f4539fcdae673a584ceb70314e02b4e9b242391 Mon Sep 17 00:00:00 2001 From: Sumit Gupta Date: Thu, 11 Jan 2024 11:53:07 +0530 Subject: [PATCH] NVIDIA: SAUCE: soc: tegra: cbb: skip checking slave_map if missing Skip checking for slave_map to print timedout slave info if the slave_map is missing. http://nvbugs/4136792 Signed-off-by: Sumit Gupta Signed-off-by: Laxman Dewangan Acked-by: Noah Wager Acked-by: Jacob Martin Signed-off-by: Noah Wager --- drivers/soc/tegra/cbb/tegra234-cbb.c | 30 +--------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/drivers/soc/tegra/cbb/tegra234-cbb.c b/drivers/soc/tegra/cbb/tegra234-cbb.c index 50c331693d93..83f531e241d5 100644 --- a/drivers/soc/tegra/cbb/tegra234-cbb.c +++ b/drivers/soc/tegra/cbb/tegra234-cbb.c @@ -473,7 +473,7 @@ static void print_errlog_err(struct seq_file *file, struct tegra234_cbb *cbb) tegra_cbb_print_err(file, "\t GRPSEC\t\t: %#x\n", grpsec); tegra_cbb_print_err(file, "\t FALCONSEC\t\t: %#x\n", falconsec); - if (cbb->fabric->fab_list[fab_id].is_skip) + if (cbb->fabric->fab_list[fab_id].is_skip || !cbb->fabric->max_slaves) return; if (slave_id >= cbb->fabric->max_slaves) { @@ -1212,17 +1212,10 @@ static const char * const tegra264_master_id[] = { [0x3f] = "CBB_RSVD" }; -/* To be filled later when address map is more stabilized */ -static const struct tegra234_slave_lookup tegra264_top0_cbb_slave_map[] = { - { "DUMMY", 0x0 }, -}; - static const struct tegra234_cbb_fabric tegra264_top0_cbb_fabric = { .fab_id = T264_TOP_CBB_FABRIC_ID, .fab_list = tegra264_cbb_fabrics, .master_id = tegra264_master_id, - .slave_map = tegra264_top0_cbb_slave_map, - .max_slaves = ARRAY_SIZE(tegra264_top0_cbb_slave_map), .errors = tegra241_cbb_errors, .max_errors = ARRAY_SIZE(tegra241_cbb_errors), .err_intr_enbl = 0x7, @@ -1234,17 +1227,10 @@ static const struct tegra234_cbb_fabric tegra264_top0_cbb_fabric = { .firewall_wr_ctl = 0x5a8, }; -/* To be filled later when address map is more stabilized */ -static const struct tegra234_slave_lookup tegra264_sys_cbb_slave_map[] = { - { "DUMMY", 0x0 }, -}; - static const struct tegra234_cbb_fabric tegra264_sys_cbb_fabric = { .fab_id = T264_SYSTEM_CBB_FABRIC_ID, .fab_list = tegra264_cbb_fabrics, .master_id = tegra264_master_id, - .slave_map = tegra264_sys_cbb_slave_map, - .max_slaves = ARRAY_SIZE(tegra264_sys_cbb_slave_map), .errors = tegra241_cbb_errors, .max_errors = ARRAY_SIZE(tegra241_cbb_errors), .err_intr_enbl = 0xf, @@ -1255,17 +1241,10 @@ static const struct tegra234_cbb_fabric tegra264_sys_cbb_fabric = { .firewall_wr_ctl = 0x168, }; -/* To be filled later when address map is more stabilized */ -static const struct tegra234_slave_lookup tegra264_uphy0_cbb_slave_map[] = { - { "DUMMY", 0x0 }, -}; - static const struct tegra234_cbb_fabric tegra264_uphy0_cbb_fabric = { .fab_id = T264_UPHY0_CBB_FABRIC_ID, .fab_list = tegra264_cbb_fabrics, .master_id = tegra264_master_id, - .slave_map = tegra264_uphy0_cbb_slave_map, - .max_slaves = ARRAY_SIZE(tegra264_uphy0_cbb_slave_map), .errors = tegra241_cbb_errors, .max_errors = ARRAY_SIZE(tegra241_cbb_errors), .err_intr_enbl = 0x1, @@ -1276,17 +1255,10 @@ static const struct tegra234_cbb_fabric tegra264_uphy0_cbb_fabric = { .firewall_wr_ctl = 0x588, }; -/* To be filled later when address map is more stabilized */ -static const struct tegra234_slave_lookup tegra264_vision_cbb_slave_map[] = { - { "DUMMY", 0x0 }, -}; - static const struct tegra234_cbb_fabric tegra264_vision_cbb_fabric = { .fab_id = T264_VISION_CBB_FABRIC_ID, .fab_list = tegra264_cbb_fabrics, .master_id = tegra264_master_id, - .slave_map = tegra264_vision_cbb_slave_map, - .max_slaves = ARRAY_SIZE(tegra264_vision_cbb_slave_map), .errors = tegra241_cbb_errors, .max_errors = ARRAY_SIZE(tegra241_cbb_errors), .err_intr_enbl = 0x1,