Support for Tegra264 and Tegra254 in CBB driver
Subsystems (2)
v2 cover Support for Tegra264 and Tegra254 in CBB driver
This patch series adds support for Tegra264 and Tegra254 SoCs in the Tegra CBB driver. It also includes a fix and some improvements to make the driver more generic to add new SoC support.
The patches can be applied in sequence. Patch info:
- Patch 1: Fix.
- Patch 2: Change lingo from 'Master/Slave' to 'Initiator/Target'.
- Patch 3 & 4: Improvements.
- Patch 5: New feature for HW lookup.
- Patch 6 & 7: Tegra264 SoC support.
- Patch 8: Tegra254 SoC support.
---
v1[1] -> v2:
- patch 8: change name from GB10 to Tegra254.
- patch 6: added ACK from Krzysztof
Sumit Gupta (8):
soc: tegra: cbb: clear err force register with err status
soc: tegra: cbb: change master-slave to initiator-target
soc: tegra: cbb: make error interrupt enable and status per SoC
soc: tegra: cbb: improve handling for per SoC fabric data
soc: tegra: cbb: support hw lookup to get timed out target address
dt-bindings: arm: tegra: Add NVIDIA Tegra264 CBB 2.0 binding
soc: tegra: cbb: add support for cbb fabrics in Tegra264
soc: tegra: cbb: add support for cbb fabrics in T254
.../arm/tegra/nvidia,tegra234-cbb.yaml | 4 + drivers/soc/tegra/cbb/tegra194-cbb.c | 34 +- drivers/soc/tegra/cbb/tegra234-cbb.c | 758 ++++++++++++++---- 3 files changed, 606 insertions(+), 190 deletions(-)
[1] https://lore.kernel.org/lkml/[email protected]/
Signature · 1 line
2.34.1
PATCH v2 1/8 soc: tegra: cbb: clear err force register with err status
When error is injected with the ERR_FORCE register, then this register is not auto cleared on clearing the ERR_STATUS register. This causes repeated interrupts on error injection. To fix, set the ERR_FORCE to zero along with clearing the ERR_STATUS register after handling error.
--- drivers/soc/tegra/cbb/tegra234-cbb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/soc/tegra/cbb/tegra234-cbb.c +2 -0
@@ -185,6 +185,8 @@ static void tegra234_cbb_error_clear(struct tegra_cbb *cbb) {struct tegra234_cbb *priv =to_tegra234_cbb (cbb); +writel (0 , priv->mon +FABRIC_MN_MASTER_ERR_FORCE_0 ); +writel (0x3f , priv->mon +FABRIC_MN_MASTER_ERR_STATUS_0 );dsb (sy); }
Signature · 1 line
2.34.1
PATCH v2 2/8 soc: tegra: cbb: change master-slave to initiator-target
In reply to Sumit GuptaChange usage of 'Master/Slave' to 'Initiator/Target' as per the new convention.
--- drivers/soc/tegra/cbb/tegra194-cbb.c | 34 ++--- drivers/soc/tegra/cbb/tegra234-cbb.c | 205 ++++++++++++++------------- 2 files changed, 120 insertions(+), 119 deletions(-)
drivers/soc/tegra/cbb/tegra194-cbb.c +17 -17
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2021-2022, NVIDIA CORPORATION. All rights reserved +* Copyright (c) 2021-2025, NVIDIA CORPORATION. All rights reserved * * The driver handles Error's from Control Backbone(CBB) generated due to * illegal accesses. When an error is reported from a NOC within CBB,
@@ -138,7 +138,7 @@ struct tegra194_cbb_userbits {struct tegra194_cbb_noc_data {const char *name;bool erd_mask_inband_err; -const char *const *master_id; +const char *const *initiator_id;unsigned int max_aperture;const struct tegra194_cbb_aperture *noc_aperture;const char *const *routeid_initflow;
@@ -216,7 +216,7 @@ static const char * const tegra194_axi2apb_error[] = {"CH2RFIFOF - Ch2 Request FIFO Full interrupt" }; -static const char *const tegra194_master_id[] = { +static const char *const tegra194_initiator_id[] = { [0x0 ] ="CCPLEX" , [0x1 ] ="CCPLEX_DPMU" , [0x2 ] ="BPMP" ,
@@ -238,7 +238,7 @@ static const struct tegra_cbb_error tegra194_cbb_errors[] = { { .code = "SLV", .source = "Target", - .desc ="Target error detected by CBB slave" + .desc ="Target error detected by CBB target" }, { .code = "DEC", .source = "Initiator NIU",
@@ -1774,8 +1774,8 @@ static void print_errlog5(struct seq_file *file, struct tegra194_cbb *cbb)tegra_cbb_print_err (file,"\t AXI ID\t\t: %#x\n" , userbits.axi_id); } -tegra_cbb_print_err (file,"\t Master ID\t\t: %s\n" , - cbb->noc->master_id[userbits.mstr_id]); +tegra_cbb_print_err (file,"\t Initiator ID\t\t: %s\n" , + cbb->noc->initiator_id[userbits.mstr_id]);tegra_cbb_print_err (file,"\t Security Group(GRPSEC): %#x\n" , userbits.grpsec);tegra_cbb_print_cache (file, userbits.axcache);tegra_cbb_print_prot (file, userbits.axprot);
@@ -1837,14 +1837,14 @@ print_errlog1_2(struct seq_file *file, struct tegra194_cbb *cbb,/* * Print transcation type, error code and description from ErrLog0 for all -* errors. For NOC slave errors, all relevant error info is printed using +* errors. For NOC target errors, all relevant error info is printed using * ErrLog0 only. But additional information is printed for errors from -* APB slaves because for them: -* - All errors are logged as SLV(slave) errors due to APB having only single +* APB targets because for them: +* - All errors are logged as SLV(target) errors due to APB having only single * bit pslverr to report all errors. * - Exact cause is printed by reading DMAAPB_X_RAW_INTERRUPT_STATUS register. * - The driver prints information showing AXI2APB bridge and exact error -* only if there is error in any AXI2APB slave. +* only if there is error in any AXI2APB target. * - There is still no way to disambiguate a DEC error from SLV error type. */ static bool print_errlog0 (struct seq_file *file,struct tegra194_cbb *cbb)
@@ -1884,8 +1884,8 @@ static bool print_errlog0(struct seq_file *file, struct tegra194_cbb *cbb)/* For all SLV errors, read DMAAPB_X_RAW_INTERRUPT_STATUS * register to get error status for all AXI2APB bridges. * Print bridge details if a bit is set in a bridge's -* status register due to error in a APB slave connected -* to that bridge. For other NOC slaves, none of the status +* status register due to error in a APB target connected +* to that bridge. For other NOC targets, none of the status * register will be set. */
@@ -2118,7 +2118,7 @@ static const struct tegra_cbb_ops tegra194_cbb_ops = {static struct tegra194_cbb_noc_data tegra194_cbb_central_noc_data = { .name ="cbb-noc" , .erd_mask_inband_err = true, - .master_id = tegra194_master_id, + .initiator_id = tegra194_initiator_id, .noc_aperture = tegra194_cbbcentralnoc_apert_lookup, .max_aperture =ARRAY_SIZE (tegra194_cbbcentralnoc_apert_lookup), .routeid_initflow = tegra194_cbbcentralnoc_routeid_initflow,
@@ -2130,7 +2130,7 @@ static struct tegra194_cbb_noc_data tegra194_cbb_central_noc_data = {static struct tegra194_cbb_noc_data tegra194_aon_noc_data = { .name ="aon-noc" , .erd_mask_inband_err = false, - .master_id = tegra194_master_id, + .initiator_id = tegra194_initiator_id, .noc_aperture = tegra194_aonnoc_aperture_lookup, .max_aperture =ARRAY_SIZE (tegra194_aonnoc_aperture_lookup), .routeid_initflow = tegra194_aonnoc_routeid_initflow,
@@ -2142,7 +2142,7 @@ static struct tegra194_cbb_noc_data tegra194_aon_noc_data = {static struct tegra194_cbb_noc_data tegra194_bpmp_noc_data = { .name ="bpmp-noc" , .erd_mask_inband_err = false, - .master_id = tegra194_master_id, + .initiator_id = tegra194_initiator_id, .noc_aperture = tegra194_bpmpnoc_apert_lookup, .max_aperture =ARRAY_SIZE (tegra194_bpmpnoc_apert_lookup), .routeid_initflow = tegra194_bpmpnoc_routeid_initflow,
@@ -2154,7 +2154,7 @@ static struct tegra194_cbb_noc_data tegra194_bpmp_noc_data = {static struct tegra194_cbb_noc_data tegra194_rce_noc_data = { .name ="rce-noc" , .erd_mask_inband_err = false, - .master_id = tegra194_master_id, + .initiator_id = tegra194_initiator_id, .noc_aperture = tegra194_scenoc_apert_lookup, .max_aperture =ARRAY_SIZE (tegra194_scenoc_apert_lookup), .routeid_initflow = tegra194_scenoc_routeid_initflow,
@@ -2166,7 +2166,7 @@ static struct tegra194_cbb_noc_data tegra194_rce_noc_data = {static struct tegra194_cbb_noc_data tegra194_sce_noc_data = { .name ="sce-noc" , .erd_mask_inband_err = false, - .master_id = tegra194_master_id, + .initiator_id = tegra194_initiator_id, .noc_aperture = tegra194_scenoc_apert_lookup, .max_aperture =ARRAY_SIZE (tegra194_scenoc_apert_lookup), .routeid_initflow = tegra194_scenoc_routeid_initflow,
drivers/soc/tegra/cbb/tegra234-cbb.c +103 -102
507 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 3/8 soc: tegra: cbb: make error interrupt enable and status per SoC
In reply to Sumit GuptaMake the error interrupt enable and error status fields as per SoC. Both these fields can change for different SoC's. Moving them to per SoC data helps to set or clear the required bits only for a SoC.
--- drivers/soc/tegra/cbb/tegra234-cbb.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
drivers/soc/tegra/cbb/tegra234-cbb.c +20 -2
@@ -102,6 +102,8 @@ struct tegra234_cbb_fabric {const int max_errors;const struct tegra234_target_lookup *target_map;const int max_targets; +const u32 err_intr_enbl; +const u32 err_status_clr; };struct tegra234_cbb {
@@ -177,7 +179,7 @@ static void tegra234_cbb_fault_enable(struct tegra_cbb *cbb)void __iomem *addr; addr = priv->regs + priv->fabric->notifier_offset; -writel (0x1ff , addr +FABRIC_EN_CFG_INTERRUPT_ENABLE_0_0 ); +writel (priv->fabric->err_intr_enbl, addr +FABRIC_EN_CFG_INTERRUPT_ENABLE_0_0 );dsb (sy); }
@@ -187,7 +189,7 @@ static void tegra234_cbb_error_clear(struct tegra_cbb *cbb)writel (0 , priv->mon +FABRIC_MN_INITIATOR_ERR_FORCE_0 ); -writel (0x3f , priv->mon +FABRIC_MN_INITIATOR_ERR_STATUS_0 ); +writel (priv->fabric->err_status_clr, priv->mon +FABRIC_MN_INITIATOR_ERR_STATUS_0 );dsb (sy); }
@@ -709,6 +711,8 @@ static const struct tegra234_cbb_fabric tegra234_aon_fabric = { .max_targets = ARRAY_SIZE(tegra234_aon_target_map), .errors = tegra234_cbb_errors, .max_errors = ARRAY_SIZE(tegra234_cbb_errors), + .err_intr_enbl = 0x7, + .err_status_clr = 0x3f, .notifier_offset = 0x17000, .firewall_base = 0x30000, .firewall_ctl = 0x8d0,
@@ -730,6 +734,8 @@ static const struct tegra234_cbb_fabric tegra234_bpmp_fabric = { .max_targets = ARRAY_SIZE(tegra234_bpmp_target_map), .errors = tegra234_cbb_errors, .max_errors = ARRAY_SIZE(tegra234_cbb_errors), + .err_intr_enbl = 0xf, + .err_status_clr = 0x3f, .notifier_offset = 0x19000, .firewall_base = 0x30000, .firewall_ctl = 0x8f0,
@@ -807,6 +813,8 @@ static const struct tegra234_cbb_fabric tegra234_cbb_fabric = { .max_targets = ARRAY_SIZE(tegra234_cbb_target_map), .errors = tegra234_cbb_errors, .max_errors = ARRAY_SIZE(tegra234_cbb_errors), + .err_intr_enbl = 0x7f, + .err_status_clr = 0x3f, .notifier_offset = 0x60000, .off_mask_erd = 0x3a004, .firewall_base = 0x10000,
@@ -830,6 +838,8 @@ static const struct tegra234_cbb_fabric tegra234_dce_fabric = { .max_targets = ARRAY_SIZE(tegra234_common_target_map), .errors = tegra234_cbb_errors, .max_errors = ARRAY_SIZE(tegra234_cbb_errors), + .err_intr_enbl = 0xf, + .err_status_clr = 0x3f, .notifier_offset = 0x19000, .firewall_base = 0x30000, .firewall_ctl = 0x290,
@@ -843,6 +853,8 @@ static const struct tegra234_cbb_fabric tegra234_rce_fabric = { .max_targets = ARRAY_SIZE(tegra234_common_target_map), .errors = tegra234_cbb_errors, .max_errors = ARRAY_SIZE(tegra234_cbb_errors), + .err_intr_enbl = 0xf, + .err_status_clr = 0x3f, .notifier_offset = 0x19000, .firewall_base = 0x30000, .firewall_ctl = 0x290,
@@ -856,6 +868,8 @@ static const struct tegra234_cbb_fabric tegra234_sce_fabric = { .max_targets = ARRAY_SIZE(tegra234_common_target_map), .errors = tegra234_cbb_errors, .max_errors = ARRAY_SIZE(tegra234_cbb_errors), + .err_intr_enbl = 0xf, + .err_status_clr = 0x3f, .notifier_offset = 0x19000, .firewall_base = 0x30000, .firewall_ctl = 0x290,
@@ -1040,6 +1054,8 @@ static const struct tegra234_cbb_fabric tegra241_cbb_fabric = { .max_targets = ARRAY_SIZE(tegra241_cbb_target_map), .errors = tegra241_cbb_errors, .max_errors = ARRAY_SIZE(tegra241_cbb_errors), + .err_intr_enbl = 0x7, + .err_status_clr = 0x1ff007f, .notifier_offset = 0x60000, .off_mask_erd = 0x40004, .firewall_base = 0x20000,
@@ -1065,6 +1081,8 @@ static const struct tegra234_cbb_fabric tegra241_bpmp_fabric = { .max_targets = ARRAY_SIZE(tegra241_bpmp_target_map), .errors = tegra241_cbb_errors, .max_errors = ARRAY_SIZE(tegra241_cbb_errors), + .err_intr_enbl = 0xf, + .err_status_clr = 0x1ff007f, .notifier_offset = 0x19000, .firewall_base = 0x30000, .firewall_ctl = 0x8f0,
Signature · 1 line
2.34.1
PATCH v2 4/8 soc: tegra: cbb: improve handling for per SoC fabric data
In reply to Sumit GuptaImprove handling for the per soc fabrics and targets.
The below changes make them more flexible and ready for future SoC's.
- Added SoC prefix to Fabric_ID enums.
- Rename *lookup_target_timeout() to *sw_lookup_target_timeout() to make it separate from HW based lookup function to be added later.
- Moved target_map within fabric_lookup table to make it easy to check whether SW vs HW lookup is supported and handle accordingly.
- Slight improvements to some error prints.
--- drivers/soc/tegra/cbb/tegra234-cbb.c | 239 +++++++++++++++------------ 1 file changed, 131 insertions(+), 108 deletions(-)
drivers/soc/tegra/cbb/tegra234-cbb.c +131 -108
@@ -74,15 +74,15 @@#define WEN 0x20000enum tegra234_cbb_fabric_ids { -CBB_FAB_ID , -SCE_FAB_ID , -RCE_FAB_ID , -DCE_FAB_ID , -AON_FAB_ID , -PSC_FAB_ID , -BPMP_FAB_ID , -FSI_FAB_ID , -MAX_FAB_ID , +T234_CBB_FABRIC_ID , +T234_SCE_FABRIC_ID , +T234_RCE_FABRIC_ID , +T234_DCE_FABRIC_ID , +T234_AON_FABRIC_ID , +T234_PSC_FABRIC_ID , +T234_BPMP_FABRIC_ID , +T234_FSI_FABRIC_ID , +T234_MAX_FABRIC_ID , };struct tegra234_target_lookup {
@@ -90,8 +90,15 @@ struct tegra234_target_lookup {unsigned int offset; }; -struct tegra234_cbb_fabric { +struct tegra234_fabric_lookup {const char *name; +bool is_lookup; +const struct tegra234_target_lookup *target_map; +const int max_targets; +}; + +struct tegra234_cbb_fabric { +int fab_id;phys_addr_t off_mask_erd;phys_addr_t firewall_base;unsigned int firewall_ctl;
@@ -100,8 +107,7 @@ struct tegra234_cbb_fabric {unsigned int notifier_offset;const struct tegra_cbb_error *errors;const int max_errors; -const struct tegra234_target_lookup *target_map; -const int max_targets; +const struct tegra234_fabric_lookup *fab_list;const u32 err_intr_enbl;const u32 err_status_clr; };
@@ -266,12 +272,17 @@ static void tegra234_cbb_lookup_apbslv(struct seq_file *file, const char *target } } -static void tegra234_lookup_target_timeout (struct seq_file *file,struct tegra234_cbb *cbb, -u8 target_id,u8 fab_id) +static void tegra234_sw_lookup_target_timeout (struct seq_file *file,struct tegra234_cbb *cbb, +u8 target_id,u8 fab_id) { -const struct tegra234_target_lookup *map = cbb->fabric->target_map; +const struct tegra234_target_lookup *map = cbb->fabric->fab_list[fab_id].target_map;void __iomem *addr; +if (target_id >= cbb->fabric->fab_list[fab_id].max_targets) { +tegra_cbb_print_err (file,"\t Invalid target_id:%d\n" , target_id); +return ; + } +/* * 1) Get target node name and address mapping using target_id. * 2) Check if the timed out target node is APB or AXI.
@@ -354,7 +365,6 @@ static void print_errlog_err(struct seq_file *file, struct tegra234_cbb *cbb) {u8 cache_type, prot_type, burst_length, mstr_id, grpsec, vqc, falconsec, beat_size;u8 access_type, access_id, requester_socket_id, local_socket_id, target_id, fab_id; -char fabric_name[20 ];bool is_numa = false;u8 burst_type;
@@ -399,21 +409,18 @@ static void print_errlog_err(struct seq_file *file, struct tegra234_cbb *cbb)else tegra_cbb_print_err (file,"\t Wrong type index:%u\n" , cbb->type); -tegra_cbb_print_err (file,"\t Initiator_Id\t\t: %s\n" , cbb->fabric->initiator_id[mstr_id]); +tegra_cbb_print_err (file,"\t Initiator_Id\t\t: %#x\n" , mstr_id); +if (cbb->fabric->initiator_id) +tegra_cbb_print_err (file,"\t Initiator\t\t: %s\n" , + cbb->fabric->initiator_id[mstr_id]); +tegra_cbb_print_err (file,"\t Address\t\t: %#llx\n" , cbb->access);tegra_cbb_print_cache (file, cache_type);tegra_cbb_print_prot (file, prot_type);tegra_cbb_print_err (file,"\t Access_Type\t\t: %s" , (access_type) ?"Write\n" :"Read\n" ); -tegra_cbb_print_err (file,"\t Access_ID\t\t: %#x" , access_id); - -if (fab_id ==PSC_FAB_ID ) -strcpy (fabric_name,"psc-fabric" ); -else if (fab_id ==FSI_FAB_ID ) -strcpy (fabric_name,"fsi-fabric" ); -else -strcpy (fabric_name, cbb->fabric->name); +tegra_cbb_print_err (file,"\t Access_ID\t\t: %#x\n" , access_id);if (is_numa) { tegra_cbb_print_err(file, "\t Requester_Socket_Id\t: %#x\n",
@@ -424,7 +431,9 @@ static void print_errlog_err(struct seq_file *file, struct tegra234_cbb *cbb) num_possible_nodes()); } -tegra_cbb_print_err (file,"\t Fabric\t\t: %s\n" , fabric_name); +tegra_cbb_print_err (file,"\t Fabric\t\t: %s (id:%#x)\n" , + cbb->fabric->fab_list[fab_id].name, fab_id); +tegra_cbb_print_err (file,"\t Target_Id\t\t: %#x\n" , target_id);tegra_cbb_print_err (file,"\t Burst_length\t\t: %#x\n" , burst_length);tegra_cbb_print_err (file,"\t Burst_type\t\t: %#x\n" , burst_type);
@@ -433,21 +442,13 @@ 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 ((fab_id ==PSC_FAB_ID ) || (fab_id ==FSI_FAB_ID )) +if (!cbb->fabric->fab_list[fab_id].is_lookup)return ; -if (target_id >= cbb->fabric->max_targets) { -tegra_cbb_print_err (file,"\t Invalid target_id:%d\n" , target_id); -return ; - } - -if (!strcmp (cbb->fabric->errors[cbb->type].code,"TIMEOUT_ERR" )) { -tegra234_lookup_target_timeout (file, cbb, target_id, fab_id); -return ; - } +if (!strcmp (cbb->fabric->errors[cbb->type].code,"TIMEOUT_ERR" )) +tegra234_sw_lookup_target_timeout (file, cbb, target_id, fab_id); -tegra_cbb_print_err (file,"\t Target\t\t\t: %s\n" , - cbb->fabric->target_map[target_id].name); +return ; }static int print_errmonX_info (struct seq_file *file,struct tegra234_cbb *cbb)
@@ -508,7 +509,7 @@ static int print_err_notifier(struct seq_file *file, struct tegra234_cbb *cbb, upr_crit ("**************************************\n" );pr_crit ("CPU:%d, Error:%s, Errmon:%d\n" ,smp_processor_id (), - cbb->fabric->name, status); + cbb->fabric->fab_list[cbb->fabric->fab_id].name, status);while (status) {if (status &BIT (0 )) {
@@ -531,13 +532,13 @@ static int print_err_notifier(struct seq_file *file, struct tegra234_cbb *cbb, utegra234_cbb_error_clear (&cbb->base);if (err)return err; +tegra_cbb_print_err (file,"\t**************************************\n" ); } status >>=1 ; index++; } -tegra_cbb_print_err (file,"\t**************************************\n" );return 0 ; }
@@ -586,7 +587,8 @@ static irqreturn_t tegra234_cbb_isr(int irq, void *data)if (status && (irq == priv->sec_irq)) {tegra_cbb_print_err (NULL ,"CPU:%d, Error: %s@0x%llx, irq=%d\n" , -smp_processor_id (), priv->fabric->name, +smp_processor_id (), + priv->fabric->fab_list[priv->fabric->fab_id].name, priv->res->start, irq); err =print_err_notifier (NULL , priv, status);
@@ -704,21 +706,6 @@ static const struct tegra234_target_lookup tegra234_aon_target_map[] = { { "CPU", 0x16000 }, }; -static const struct tegra234_cbb_fabric tegra234_aon_fabric = { - .name ="aon-fabric" , - .initiator_id = tegra234_initiator_id, - .target_map = tegra234_aon_target_map, - .max_targets =ARRAY_SIZE (tegra234_aon_target_map), - .errors = tegra234_cbb_errors, - .max_errors =ARRAY_SIZE (tegra234_cbb_errors), - .err_intr_enbl =0x7 , - .err_status_clr =0x3f , - .notifier_offset =0x17000 , - .firewall_base =0x30000 , - .firewall_ctl =0x8d0 , - .firewall_wr_ctl =0x8c8 , -}; -static const struct tegra234_target_lookup tegra234_bpmp_target_map[] = { {"AXI2APB" ,0x00000 }, { "AST0", 0x15000 },
@@ -727,19 +714,13 @@ static const struct tegra234_target_lookup tegra234_bpmp_target_map[] = { { "CPU", 0x18000 }, }; -static const struct tegra234_cbb_fabric tegra234_bpmp_fabric = { - .name ="bpmp-fabric" , - .initiator_id = tegra234_initiator_id, - .target_map = tegra234_bpmp_target_map, - .max_targets =ARRAY_SIZE (tegra234_bpmp_target_map), - .errors = tegra234_cbb_errors, - .max_errors =ARRAY_SIZE (tegra234_cbb_errors), - .err_intr_enbl =0xf , - .err_status_clr =0x3f , - .notifier_offset =0x19000 , - .firewall_base =0x30000 , - .firewall_ctl =0x8f0 , - .firewall_wr_ctl =0x8e8 , +static const struct tegra234_target_lookup tegra234_common_target_map[] = { + {"AXI2APB" ,0x00000 }, + {"AST0" ,0x15000 }, + {"AST1" ,0x16000 }, + {"CBB" ,0x17000 }, + {"RSVD" ,0x00000 }, + {"CPU" ,0x18000 }, }; static const struct tegra234_target_lookup tegra234_cbb_target_map[] = {
@@ -806,11 +787,61 @@ static const struct tegra234_target_lookup tegra234_cbb_target_map[] = { { "AXI2APB_3", 0x91000 }, }; +static const struct tegra234_fabric_lookup tegra234_cbb_fab_list[] = { + [T234_CBB_FABRIC_ID ] = {"cbb-fabric" , true, + tegra234_cbb_target_map, +ARRAY_SIZE (tegra234_cbb_target_map) }, + [T234_SCE_FABRIC_ID ] = {"sce-fabric" , true, + tegra234_common_target_map, +ARRAY_SIZE (tegra234_common_target_map) }, + [T234_RCE_FABRIC_ID ] = {"rce-fabric" , true, + tegra234_common_target_map, +ARRAY_SIZE (tegra234_common_target_map) }, + [T234_DCE_FABRIC_ID ] = {"dce-fabric" , true, + tegra234_common_target_map, +ARRAY_SIZE (tegra234_common_target_map) }, + [T234_AON_FABRIC_ID ] = {"aon-fabric" , true, + tegra234_aon_target_map, +ARRAY_SIZE (tegra234_bpmp_target_map) }, + [T234_PSC_FABRIC_ID ] = {"psc-fabric" }, + [T234_BPMP_FABRIC_ID ] = {"bpmp-fabric" , true, + tegra234_bpmp_target_map, +ARRAY_SIZE (tegra234_bpmp_target_map) }, + [T234_FSI_FABRIC_ID ] = {"fsi-fabric" }, +}; + +static const struct tegra234_cbb_fabric tegra234_aon_fabric = { + .fab_id =T234_AON_FABRIC_ID , + .fab_list = tegra234_cbb_fab_list, + .initiator_id = tegra234_initiator_id, + .errors = tegra234_cbb_errors, + .max_errors =ARRAY_SIZE (tegra234_cbb_errors), + .err_intr_enbl =0x7 , + .err_status_clr =0x3f , + .notifier_offset =0x17000 , + .firewall_base =0x30000 , + .firewall_ctl =0x8d0 , + .firewall_wr_ctl =0x8c8 , +}; + +static const struct tegra234_cbb_fabric tegra234_bpmp_fabric = { + .fab_id =T234_BPMP_FABRIC_ID , + .fab_list = tegra234_cbb_fab_list, + .initiator_id = tegra234_initiator_id, + .errors = tegra234_cbb_errors, + .max_errors =ARRAY_SIZE (tegra234_cbb_errors), + .err_intr_enbl =0xf , + .err_status_clr =0x3f , + .notifier_offset =0x19000 , + .firewall_base =0x30000 , + .firewall_ctl =0x8f0 , + .firewall_wr_ctl =0x8e8 , +}; +static const struct tegra234_cbb_fabric tegra234_cbb_fabric = { - .name ="cbb-fabric" , + .fab_id =T234_CBB_FABRIC_ID , + .fab_list = tegra234_cbb_fab_list, .initiator_id = tegra234_initiator_id, - .target_map = tegra234_cbb_target_map, - .max_targets =ARRAY_SIZE (tegra234_cbb_target_map), .errors = tegra234_cbb_errors, .max_errors =ARRAY_SIZE (tegra234_cbb_errors), .err_intr_enbl = 0x7f,
@@ -822,20 +853,10 @@ static const struct tegra234_cbb_fabric tegra234_cbb_fabric = { .firewall_wr_ctl = 0x23e8, }; -static const struct tegra234_target_lookup tegra234_common_target_map[] = { - {"AXI2APB" ,0x00000 }, - {"AST0" ,0x15000 }, - {"AST1" ,0x16000 }, - {"CBB" ,0x17000 }, - {"RSVD" ,0x00000 }, - {"CPU" ,0x18000 }, -}; -static const struct tegra234_cbb_fabric tegra234_dce_fabric = { - .name ="dce-fabric" , + .fab_id =T234_DCE_FABRIC_ID , + .fab_list = tegra234_cbb_fab_list, .initiator_id = tegra234_initiator_id, - .target_map = tegra234_common_target_map, - .max_targets =ARRAY_SIZE (tegra234_common_target_map), .errors = tegra234_cbb_errors, .max_errors =ARRAY_SIZE (tegra234_cbb_errors), .err_intr_enbl =0xf ,
@@ -847,10 +868,9 @@ static const struct tegra234_cbb_fabric tegra234_dce_fabric = { };static const struct tegra234_cbb_fabric tegra234_rce_fabric = { - .name ="rce-fabric" , + .fab_id =T234_RCE_FABRIC_ID , + .fab_list = tegra234_cbb_fab_list, .initiator_id = tegra234_initiator_id, - .target_map = tegra234_common_target_map, - .max_targets =ARRAY_SIZE (tegra234_common_target_map), .errors = tegra234_cbb_errors, .max_errors =ARRAY_SIZE (tegra234_cbb_errors), .err_intr_enbl =0xf ,
@@ -862,10 +882,9 @@ static const struct tegra234_cbb_fabric tegra234_rce_fabric = { };static const struct tegra234_cbb_fabric tegra234_sce_fabric = { - .name ="sce-fabric" , + .fab_id =T234_SCE_FABRIC_ID , + .fab_list = tegra234_cbb_fab_list, .initiator_id = tegra234_initiator_id, - .target_map = tegra234_common_target_map, - .max_targets =ARRAY_SIZE (tegra234_common_target_map), .errors = tegra234_cbb_errors, .max_errors =ARRAY_SIZE (tegra234_cbb_errors), .err_intr_enbl =0xf ,
@@ -985,6 +1004,17 @@ static const struct tegra_cbb_error tegra241_cbb_errors[] = { }, }; +static const struct tegra234_target_lookup tegra241_bpmp_target_map[] = { + {"RSVD" ,0x00000 }, + {"RSVD" ,0x00000 }, + {"RSVD" ,0x00000 }, + {"CBB" ,0x15000 }, + {"CPU" ,0x16000 }, + {"AXI2APB" ,0x00000 }, + {"DBB0" ,0x17000 }, + {"DBB1" ,0x18000 }, +}; +static const struct tegra234_target_lookup tegra241_cbb_target_map[] = { {"RSVD" ,0x00000 }, {"PCIE_C8" ,0x51000 },
@@ -1047,11 +1077,16 @@ static const struct tegra234_target_lookup tegra241_cbb_target_map[] = { { "AXI2APB_32", 0x8F000 }, }; +static const struct tegra234_fabric_lookup tegra241_cbb_fab_list[] = { + [T234_CBB_FABRIC_ID ] = {"cbb-fabric" , true, + tegra241_cbb_target_map,ARRAY_SIZE (tegra241_cbb_target_map) }, + [T234_BPMP_FABRIC_ID ] = {"bpmp-fabric" , true, + tegra241_bpmp_target_map,ARRAY_SIZE (tegra241_cbb_target_map) }, +};static const struct tegra234_cbb_fabric tegra241_cbb_fabric = { - .name ="cbb-fabric" , + .fab_id =T234_CBB_FABRIC_ID , + .fab_list = tegra241_cbb_fab_list, .initiator_id = tegra241_initiator_id, - .target_map = tegra241_cbb_target_map, - .max_targets =ARRAY_SIZE (tegra241_cbb_target_map), .errors = tegra241_cbb_errors, .max_errors =ARRAY_SIZE (tegra241_cbb_errors), .err_intr_enbl = 0x7,
@@ -1063,22 +1098,10 @@ static const struct tegra234_cbb_fabric tegra241_cbb_fabric = { .firewall_wr_ctl = 0x2368, }; -static const struct tegra234_target_lookup tegra241_bpmp_target_map[] = { - {"RSVD" ,0x00000 }, - {"RSVD" ,0x00000 }, - {"RSVD" ,0x00000 }, - {"CBB" ,0x15000 }, - {"CPU" ,0x16000 }, - {"AXI2APB" ,0x00000 }, - {"DBB0" ,0x17000 }, - {"DBB1" ,0x18000 }, -}; -static const struct tegra234_cbb_fabric tegra241_bpmp_fabric = { - .name ="bpmp-fabric" , + .fab_id =T234_BPMP_FABRIC_ID , + .fab_list = tegra241_cbb_fab_list, .initiator_id = tegra241_initiator_id, - .target_map = tegra241_bpmp_target_map, - .max_targets =ARRAY_SIZE (tegra241_bpmp_target_map), .errors = tegra241_cbb_errors, .max_errors =ARRAY_SIZE (tegra241_cbb_errors), .err_intr_enbl =0xf ,
@@ -1197,7 +1220,7 @@ static int __maybe_unused tegra234_cbb_resume_noirq(struct device *dev)tegra234_cbb_error_enable (&cbb->base); -dev_dbg (dev,"%s resumed\n" , cbb->fabric->name); +dev_dbg (dev,"%s resumed\n" , cbb->fabric->fab_list[cbb->fabric->fab_id].name);return 0 ; }
Signature · 1 line
2.34.1
PATCH v2 5/8 soc: tegra: cbb: support hw lookup to get timed out target address
In reply to Sumit GuptaAdd support for hardware based lookup to get address of timed out target node. This features is added in upcoming SoCs and avoids need of creating per fabric target_map tables in driver.
--- drivers/soc/tegra/cbb/tegra234-cbb.c | 41 ++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 5 deletions(-)
drivers/soc/tegra/cbb/tegra234-cbb.c +36 -5
@@ -30,13 +30,17 @@#define FABRIC_EN_CFG_ADDR_LOW_0 0x80#define FABRIC_EN_CFG_ADDR_HI_0 0x84 +#define FABRIC_EN_CFG_TARGET_NODE_ADDR_INDEX_0_0 0x100 +#define FABRIC_EN_CFG_TARGET_NODE_ADDR_LOW_0 0x140 +#define FABRIC_EN_CFG_TARGET_NODE_ADDR_HI_0 0x144 +#define FABRIC_MN_INITIATOR_ERR_EN_0 0x200#define FABRIC_MN_INITIATOR_ERR_FORCE_0 0x204 -#define FABRIC_MN_INITIATOR_ERR_STATUS_0 0x208 -#define FABRIC_MN_INITIATOR_ERR_OVERFLOW_STATUS_0 0x20c +#define FABRIC_MN_INITIATOR_ERR_STATUS_0 0x208 +#define FABRIC_MN_INITIATOR_ERR_OVERFLOW_STATUS_0 0x20c#define FABRIC_MN_INITIATOR_LOG_ERR_STATUS_0 0x300 -#define FABRIC_MN_INITIATOR_LOG_ADDR_LOW_0 0x304 +#define FABRIC_MN_INITIATOR_LOG_ADDR_LOW_0 0x304#define FABRIC_MN_INITIATOR_LOG_ADDR_HIGH_0 0x308#define FABRIC_MN_INITIATOR_LOG_ATTRIBUTES0_0 0x30c#define FABRIC_MN_INITIATOR_LOG_ATTRIBUTES1_0 0x310
@@ -320,6 +324,23 @@ static void tegra234_sw_lookup_target_timeout(struct seq_file *file, struct tegr } } +static void tegra234_hw_lookup_target_timeout (struct seq_file *file,struct tegra234_cbb *cbb, +u8 target_id,u8 fab_id) +{ +unsigned int notifier = cbb->fabric->notifier_offset; +u32 hi, lo; +u64 addr; + +writel (target_id, cbb->regs + notifier +FABRIC_EN_CFG_TARGET_NODE_ADDR_INDEX_0_0 ); + + hi =readl (cbb->regs + notifier +FABRIC_EN_CFG_TARGET_NODE_ADDR_HI_0 ); + lo =readl (cbb->regs + notifier +FABRIC_EN_CFG_TARGET_NODE_ADDR_LOW_0 ); + + addr = (u64 )hi <<32 | lo; + +tegra_cbb_print_err (file,"\t Target Node Addr : %#llx\n" , addr); +} +static void tegra234_cbb_print_error (struct seq_file *file,struct tegra234_cbb *cbb,u32 status,u32 overflow) {
@@ -445,8 +466,18 @@ static void print_errlog_err(struct seq_file *file, struct tegra234_cbb *cbb)if (!cbb->fabric->fab_list[fab_id].is_lookup)return ; -if (!strcmp (cbb->fabric->errors[cbb->type].code,"TIMEOUT_ERR" )) -tegra234_sw_lookup_target_timeout (file, cbb, target_id, fab_id); +/* +* If is_lookup field is set in fabric_lookup table of soc data, it +* means that address lookup of target is supported for Timeout errors. +* If is_lookup is set and the target_map is not populated making +* max_targets as zero, then it means HW lookup is to be performed. +*/ +if (!strcmp (cbb->fabric->errors[cbb->type].code,"TIMEOUT_ERR" )) { +if (cbb->fabric->fab_list[fab_id].max_targets) +tegra234_sw_lookup_target_timeout (file, cbb, target_id, fab_id); +else +tegra234_hw_lookup_target_timeout (file, cbb, target_id, fab_id); + }return ; }
Signature · 1 line
2.34.1
PATCH v2 6/8 dt-bindings: arm: tegra: Add NVIDIA Tegra264 CBB 2.0 binding
In reply to Sumit GuptaUpdate device-tree bindings documentation to represent the Control Backbone (CBB) 2.0 based fabrics used in Tegra264 SoC. Fabrics reporting errors are: SYSTEM, TOP, UPHY, VISION.
--- .../devicetree/bindings/arm/tegra/nvidia,tegra234-cbb.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/arm/tegra/nvidia,tegra234-cbb.yaml +4 -0
@@ -48,6 +48,10 @@ properties: - nvidia,tegra234-dce-fabric - nvidia,tegra234-rce-fabric - nvidia,tegra234-sce-fabric + - nvidia,tegra264-sys-cbb-fabric + - nvidia,tegra264-top0-cbb-fabric + - nvidia,tegra264-uphy0-cbb-fabric + - nvidia,tegra264-vision-cbb-fabric reg: maxItems: 1
Signature · 1 line
2.34.1
PATCH v2 7/8 soc: tegra: cbb: add support for cbb fabrics in Tegra264
In reply to Sumit GuptaAdd support for CBB 2.0 based fabrics in Tegra264 SoC using DT. Fabrics reporting errors are: SYSTEM, TOP0, UPHY0, VISION.
--- drivers/soc/tegra/cbb/tegra234-cbb.c | 279 +++++++++++++++++++++++++++ 1 file changed, 279 insertions(+)
drivers/soc/tegra/cbb/tegra234-cbb.c +279 -0
@@ -89,6 +89,34 @@ enum tegra234_cbb_fabric_ids { T234_MAX_FABRIC_ID, }; +enum tegra264_cbb_fabric_ids { +T264_SYSTEM_CBB_FABRIC_ID , +T264_TOP_0_CBB_FABRIC_ID , +T264_VISION_CBB_FABRIC_ID , +T264_DISP_USB_CBB_FABRIC_ID , +T264_UPHY0_CBB_FABRIC_ID , +T264_RSVD0_FABRIC_ID , +T264_RSVD1_FABRIC_ID , +T264_RSVD2_FABRIC_ID , +T264_RSVD3_FABRIC_ID , +T264_RSVD4_FABRIC_ID , +T264_RSVD5_FABRIC_ID , +T264_AON_FABRIC_ID , +T264_PSC_FABRIC_ID , +T264_OESP_FABRIC_ID , +T264_APE_FABRIC_ID , +T264_BPMP_FABRIC_ID , +T264_RCE_0_FABRIC_ID , +T264_RCE_1_FABRIC_ID , +T264_RSVD6_FABRIC_ID , +T264_DCE_FABRIC_ID , +T264_FSI_FABRIC_ID , +T264_ISC_FABRIC_ID , +T264_SB_FABRIC_ID , +T264_ISC_CPU_FABRIC_ID , +T264_RSVD7_FABRIC_ID , +}; +struct tegra234_target_lookup {const char *name;unsigned int offset;
@@ -455,6 +483,17 @@ static void print_errlog_err(struct seq_file *file, struct tegra234_cbb *cbb)tegra_cbb_print_err (file,"\t Fabric\t\t: %s (id:%#x)\n" , cbb->fabric->fab_list[fab_id].name, fab_id); +if (of_machine_is_compatible ("nvidia,tegra264" ) && fab_id ==T264_UPHY0_CBB_FABRIC_ID ) { +/* +* In T264, AON Fabric ID value is incorrectly same as UPHY0 fabric ID. +* For 'ID = 0x4', we must check for the address which caused the error +* to find the correct fabric which returned error. +*/ +tegra_cbb_print_err (file,"\t or Fabric\t\t: %s\n" , + cbb->fabric->fab_list[T264_AON_FABRIC_ID ].name); +tegra_cbb_print_err (file,"\t Please use Address to determine correct fabric.\n" ); + } +tegra_cbb_print_err (file,"\t Target_Id\t\t: %#x\n" , target_id);tegra_cbb_print_err (file,"\t Burst_length\t\t: %#x\n" , burst_length);tegra_cbb_print_err (file,"\t Burst_type\t\t: %#x\n" , burst_type);
@@ -1143,6 +1182,242 @@ static const struct tegra234_cbb_fabric tegra241_bpmp_fabric = { .firewall_wr_ctl = 0x8e8, }; +static const char *const tegra264_initiator_id[] = { + [0x0 ] ="TZ" , + [0x1 ] ="CCPLEX" , + [0x2 ] ="ISC" , + [0x3 ] ="BPMP_FW" , + [0x4 ] ="AON" , + [0x5 ] ="MSS_SEQ" , + [0x6 ] ="GPCDMA_P" , + [0x7 ] ="TSECA_NONSECURE" , + [0x8 ] ="TSECA_LIGHTSECURE" , + [0x9 ] ="TSECA_HEAVYSECURE" , + [0xa ] ="CORESIGHT" , + [0xb ] ="APE_0" , + [0xc ] ="APE_1" , + [0xd ] ="PEATRANS" , + [0xe ] ="JTAGM_DFT" , + [0xf ] ="RCE" , + [0x10 ] ="DCE" , + [0x11 ] ="PSC_FW_USER" , + [0x12 ] ="PSC_FW_SUPERVISOR" , + [0x13 ] ="PSC_FW_MACHINE" , + [0x14 ] ="PSC_BOOT" , + [0x15 ] ="BPMP_BOOT" , + [0x16 ] ="GPU_0" , + [0x17 ] ="GPU_1" , + [0x18 ] ="GPU_2" , + [0x19 ] ="GPU_3" , + [0x1a ] ="GPU_4" , + [0x1b ] ="PSC_EXT_BOOT" , + [0x1c ] ="PSC_EXT_RUNTIME" , + [0x1d ] ="OESP_EXT" , + [0x1e ] ="SB_EXT" , + [0x1f ] ="FSI_SAFETY_0" , + [0x20 ] ="FSI_SAFETY_1" , + [0x21 ] ="FSI_SAFETY_2" , + [0x22 ] ="FSI_SAFETY_3" , + [0x23 ] ="FSI_CHSM" , + [0x24 ] ="RCE_1" , + [0x25 ] ="BPMP_OEM_FW" , + [0x26 ...0x3d ] ="RSVD" , + [0x3e ] ="CBB_SMN" , + [0x3f ] ="CBB_RSVD" +}; + +static const struct tegra234_target_lookup tegra264_top0_cbb_target_map[] = { + {"RSVD" ,0x000000 }, + {"CBB_CENTRAL" ,0xC020000 }, + {"AXI2APB_1" ,0x80000 }, + {"AXI2APB_10" ,0x81000 }, + {"AXI2APB_11" ,0x82000 }, + {"RSVD" ,0x00000 }, + {"RSVD" ,0x00000 }, + {"AXI2APB_14" ,0x83000 }, + {"AXI2APB_15" ,0x84000 }, + {"AXI2APB_16" ,0x85000 }, + {"AXI2APB_17" ,0x86000 }, + {"AXI2APB_2" ,0x87000 }, + {"AXI2APB_3" ,0x88000 }, + {"RSVD" ,0x00000 }, + {"AXI2APB_5" ,0x8A000 }, + {"AXI2APB_6" ,0x8B000 }, + {"AXI2APB_7" ,0x8C000 }, + {"AXI2APB_8" ,0x8D000 }, + {"AXI2APB_9" ,0x8E000 }, + {"FSI_SLAVE" ,0x64000 }, + {"DISP_USB_CBB_T" ,0x65000 }, + {"SYSTEM_CBB_T" ,0x66000 }, + {"UPHY0_CBB_T" ,0x67000 }, + {"VISION_CBB_T" ,0x68000 }, + {"CCPLEX_SLAVE" ,0x69000 }, + {"PCIE_C0" ,0x6A000 }, + {"SMN_UCF_RX_0" ,0x6B000 }, + {"SMN_UCF_RX_1" ,0x6C000 }, + {"AXI2APB_4" ,0x89000 }, +}; + +static const struct tegra234_target_lookup tegra264_sys_cbb_target_map[] = { + {"RSVD" ,0x00000 }, + {"AXI2APB_1" ,0xE1000 }, + {"RSVD" ,0x00000 }, + {"AON_SLAVE" ,0x79000 }, + {"APE_SLAVE" ,0x73000 }, + {"BPMP_SLAVE" ,0x74000 }, + {"OESP_SLAVE" ,0x75000 }, + {"PSC_SLAVE" ,0x76000 }, + {"SB_SLAVE" ,0x7A000 }, + {"SMN_SYSTEM_RX" ,0x7B000 }, + {"STM" ,0x77000 }, + {"RSVD" ,0x00000 }, + {"AXI2APB_3" ,0xE3000 }, + {"TOP_CBB_T" ,0x7C000 }, + {"AXI2APB_2" ,0xE4000 }, + {"AXI2APB_4" ,0xE5000 }, + {"AXI2APB_5" ,0xE6000 }, +}; + +static const struct tegra234_target_lookup tegra264_uphy0_cbb_target_map[] = { + [0 ...20 ] = {"RSVD" ,0x00000 }, + {"AXI2APB_1" ,0x71000 }, + {"RSVD" ,0x00000 }, + {"AXI2APB_3" ,0x75000 }, + {"SMN_UPHY0_RX" ,0x53000 }, + {"RSVD" ,0x00000 }, + {"RSVD" ,0x00000 }, + {"RSVD" ,0x00000 }, + {"RSVD" ,0x00000 }, + {"PCIE_C4" ,0x4B000 }, + {"AXI2APB_2" ,0x74000 }, + {"AXI2APB_4" ,0x76000 }, + {"AXI2APB_5" ,0x77000 }, + {"RSVD" ,0x00000 }, + {"AXI2APB_7" ,0x79000 }, + {"PCIE_C2" ,0x56000 }, + {"RSVD" ,0x00000 }, + {"RSVD" ,0x00000 }, + {"PCIE_C1" ,0x55000 }, + {"RSVD" ,0x00000 }, + {"AXI2APB_10" ,0x72000 }, + {"AXI2APB_11" ,0x7C000 }, + {"AXI2APB_8" ,0x7A000 }, + {"AXI2APB_9" ,0x7B000 }, + {"RSVD" ,0x00000 }, + {"RSVD" ,0x00000 }, + {"PCIE_C5" ,0x4E000 }, + {"PCIE_C3" ,0x58000 }, + {"RSVD" ,0x00000 }, + {"ISC_SLAVE" ,0x54000 }, + {"TOP_CBB_T" ,0x57000 }, + {"AXI2APB_12" ,0x7D000 }, + {"AXI2APB_13" ,0x70000 }, + {"AXI2APB_6" ,0x7E000 }, +}; + +static const struct tegra234_target_lookup tegra264_vision_cbb_target_map[] = { + [0 ...5 ] = {"RSVD" ,0x0 }, + {"HOST1X" ,0x45000 }, + {"RSVD" ,0x00000 }, + {"RSVD" ,0x00000 }, + {"AXI2APB_2" ,0x71000 }, + {"RSVD" ,0x00000 }, + {"RSVD" ,0x00000 }, + {"SMN_VISION_RX" ,0x47000 }, + [13 ...19 ] = {"RSVD" ,0x0 }, + {"RCE_0_SLAVE" ,0x4B000 }, + {"RCE_1_SLAVE" ,0x4C000 }, + {"AXI2APB_1" ,0x72000 }, + {"AXI2APB_3" ,0x73000 }, + {"TOP_CBB_T" ,0x4D000 }, + +}; + +static const struct tegra234_fabric_lookup tegra264_cbb_fab_list[] = { + [T264_SYSTEM_CBB_FABRIC_ID ] = {"system-cbb-fabric" , true, + tegra264_sys_cbb_target_map, +ARRAY_SIZE (tegra264_sys_cbb_target_map) }, + [T264_TOP_0_CBB_FABRIC_ID ] = {"top0-cbb-fabric" , true, + tegra264_top0_cbb_target_map, +ARRAY_SIZE (tegra264_top0_cbb_target_map) }, + [T264_VISION_CBB_FABRIC_ID ] = {"vision-cbb-fabric" , true, + tegra264_vision_cbb_target_map, +ARRAY_SIZE (tegra264_vision_cbb_target_map) }, + [T264_DISP_USB_CBB_FABRIC_ID ] = {"disp-usb-cbb-fabric" }, + [T264_UPHY0_CBB_FABRIC_ID ] = {"uphy0-cbb-fabric" , true, + tegra264_uphy0_cbb_target_map, +ARRAY_SIZE (tegra264_uphy0_cbb_target_map) }, + [T264_AON_FABRIC_ID ] = {"aon-fabric" }, + [T264_PSC_FABRIC_ID ] = {"psc-fabric" }, + [T264_OESP_FABRIC_ID ] = {"oesp-fabric" }, + [T264_APE_FABRIC_ID ] = {"ape-fabirc" }, + [T264_BPMP_FABRIC_ID ] = {"bpmp-fabric" }, + [T264_RCE_0_FABRIC_ID ] = {"rce0-fabric" }, + [T264_RCE_1_FABRIC_ID ] = {"rce1-fabric" }, + [T264_DCE_FABRIC_ID ] = {"dce-fabric" }, + [T264_FSI_FABRIC_ID ] = {"fsi-fabric" }, + [T264_ISC_FABRIC_ID ] = {"isc-fabric" }, + [T264_SB_FABRIC_ID ] = {"sb-fabric" }, + [T264_ISC_CPU_FABRIC_ID ] = {"isc-cpu-fabric" }, +}; + +static const struct tegra234_cbb_fabric tegra264_top0_cbb_fabric = { + .fab_id =T264_TOP_0_CBB_FABRIC_ID , + .fab_list = tegra264_cbb_fab_list, + .initiator_id = tegra264_initiator_id, + .errors = tegra241_cbb_errors, + .max_errors =ARRAY_SIZE (tegra241_cbb_errors), + .err_intr_enbl =0x7 , + .err_status_clr =0x1ff007f , + .notifier_offset =0x90000 , + .off_mask_erd =0x4a004 , + .firewall_base =0x3c0000 , + .firewall_ctl =0x5b0 , + .firewall_wr_ctl =0x5a8 , +}; + +static const struct tegra234_cbb_fabric tegra264_sys_cbb_fabric = { + .fab_id =T264_SYSTEM_CBB_FABRIC_ID , + .fab_list = tegra264_cbb_fab_list, + .initiator_id = tegra264_initiator_id, + .errors = tegra241_cbb_errors, + .max_errors =ARRAY_SIZE (tegra241_cbb_errors), + .err_intr_enbl =0xf , + .err_status_clr =0x1ff007f , + .notifier_offset =0x40000 , + .firewall_base =0x29c000 , + .firewall_ctl =0x170 , + .firewall_wr_ctl =0x168 , +}; + +static const struct tegra234_cbb_fabric tegra264_uphy0_cbb_fabric = { + .fab_id =T264_UPHY0_CBB_FABRIC_ID , + .fab_list = tegra264_cbb_fab_list, + .initiator_id = tegra264_initiator_id, + .errors = tegra241_cbb_errors, + .max_errors =ARRAY_SIZE (tegra241_cbb_errors), + .err_intr_enbl =0x1 , + .err_status_clr =0x1ff007f , + .notifier_offset =0x80000 , + .firewall_base =0x360000 , + .firewall_ctl =0x590 , + .firewall_wr_ctl =0x588 , +}; + +static const struct tegra234_cbb_fabric tegra264_vision_cbb_fabric = { + .fab_id =T264_VISION_CBB_FABRIC_ID , + .fab_list = tegra264_cbb_fab_list, + .initiator_id = tegra264_initiator_id, + .errors = tegra241_cbb_errors, + .max_errors =ARRAY_SIZE (tegra241_cbb_errors), + .err_intr_enbl =0x1 , + .err_status_clr =0x1ff007f , + .notifier_offset =0x80000 , + .firewall_base =0x290000 , + .firewall_ctl =0x5d0 , + .firewall_wr_ctl =0x5c8 , +}; +static const struct of_device_id tegra234_cbb_dt_ids[] = { { .compatible ="nvidia,tegra234-cbb-fabric" , .data = &tegra234_cbb_fabric }, { .compatible ="nvidia,tegra234-aon-fabric" , .data = &tegra234_aon_fabric },
@@ -1150,6 +1425,10 @@ static const struct of_device_id tegra234_cbb_dt_ids[] = { { .compatible = "nvidia,tegra234-dce-fabric", .data = &tegra234_dce_fabric }, { .compatible = "nvidia,tegra234-rce-fabric", .data = &tegra234_rce_fabric }, { .compatible = "nvidia,tegra234-sce-fabric", .data = &tegra234_sce_fabric }, + { .compatible = "nvidia,tegra264-sys-cbb-fabric", .data = &tegra264_sys_cbb_fabric }, + { .compatible = "nvidia,tegra264-top0-cbb-fabric", .data = &tegra264_top0_cbb_fabric }, + { .compatible = "nvidia,tegra264-uphy0-cbb-fabric", .data = &tegra264_uphy0_cbb_fabric }, + { .compatible = "nvidia,tegra264-vision-cbb-fabric", .data = &tegra264_vision_cbb_fabric }, { /* sentinel */ }, };MODULE_DEVICE_TABLE (of, tegra234_cbb_dt_ids);
Signature · 1 line
2.34.1
PATCH v2 8/8 soc: tegra: cbb: add support for cbb fabrics in Tegra254
In reply to Sumit GuptaAdd support for CBB 2.0 based fabrics in Tegra254 SoC using ACPI. Fabrics reporting errors are: C2C, GPU, Display_Cluster. Tegra254 is using hardware based lookup to get target node address. So, the target_map tables for each fabric are not needed now.
--- drivers/soc/tegra/cbb/tegra234-cbb.c | 58 ++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)
drivers/soc/tegra/cbb/tegra234-cbb.c +58 -0
@@ -117,6 +117,15 @@ enum tegra264_cbb_fabric_ids { T264_RSVD7_FABRIC_ID, }; +enum t254_cbb_fabric_ids { +T254_DCE_FABRIC_ID =19 , +T254_DISP_CLUSTER_FABRIC_ID =25 , +T254_C2C_FABRIC_ID =26 , +T254_GPU_FABRIC_ID =27 , +T254_DISP_CLUSTER_1_FABRIC_ID =28 , +T254_MAX_FABRIC_ID , +}; +struct tegra234_target_lookup {const char *name;unsigned int offset;
@@ -1418,6 +1427,52 @@ static const struct tegra234_cbb_fabric tegra264_vision_cbb_fabric = { .firewall_wr_ctl = 0x5c8, }; +static const struct tegra234_fabric_lookup t254_cbb_fab_list[] = { + [T254_C2C_FABRIC_ID ] = {"c2c-fabric" , true }, + [T254_DISP_CLUSTER_FABRIC_ID ] = {"display-cluster-fabric" , true }, + [T254_GPU_FABRIC_ID ] = {"gpu-fabric" , true }, +}; + +static const struct tegra234_cbb_fabric t254_c2c_fabric = { + .fab_id =T254_C2C_FABRIC_ID , + .fab_list = t254_cbb_fab_list, + .errors = tegra241_cbb_errors, + .max_errors =ARRAY_SIZE (tegra241_cbb_errors), + .err_intr_enbl =0xf , + .err_status_clr =0x1ff007f , + .notifier_offset =0x50000 , + .off_mask_erd =0x14004 , + .firewall_base =0x40000 , + .firewall_ctl =0x9b0 , + .firewall_wr_ctl =0x9a8 , +}; + +static const struct tegra234_cbb_fabric t254_disp_fabric = { + .fab_id =T254_DISP_CLUSTER_FABRIC_ID , + .fab_list = t254_cbb_fab_list, + .errors = tegra241_cbb_errors, + .max_errors =ARRAY_SIZE (tegra241_cbb_errors), + .err_intr_enbl =0x1 , + .err_status_clr =0x1ff007f , + .notifier_offset =0x50000 , + .firewall_base =0x30000 , + .firewall_ctl =0x810 , + .firewall_wr_ctl =0x808 , +}; + +static const struct tegra234_cbb_fabric t254_gpu_fabric = { + .fab_id =T254_GPU_FABRIC_ID , + .fab_list = t254_cbb_fab_list, + .errors = tegra241_cbb_errors, + .max_errors =ARRAY_SIZE (tegra241_cbb_errors), + .err_intr_enbl =0x1f , + .err_status_clr =0x1ff007f , + .notifier_offset =0x50000 , + .firewall_base =0x30000 , + .firewall_ctl =0x930 , + .firewall_wr_ctl =0x928 , +}; +static const struct of_device_id tegra234_cbb_dt_ids[] = { { .compatible ="nvidia,tegra234-cbb-fabric" , .data = &tegra234_cbb_fabric }, { .compatible ="nvidia,tegra234-aon-fabric" , .data = &tegra234_aon_fabric },
@@ -1442,6 +1497,9 @@ struct tegra234_cbb_acpi_uid {static const struct tegra234_cbb_acpi_uid tegra234_cbb_acpi_uids[] = { {"NVDA1070" ,"1" , &tegra241_cbb_fabric }, {"NVDA1070" ,"2" , &tegra241_bpmp_fabric }, + {"NVDA1070" ,"3" , &t254_c2c_fabric }, + {"NVDA1070" ,"4" , &t254_disp_fabric }, + {"NVDA1070" ,"5" , &t254_gpu_fabric }, { }, };
Signature · 1 line
2.34.1
Quoted 27 lines · Sumit Gupta
This patch series adds support for Tegra264 and Tegra254 SoCs in the Tegra CBB driver. It also includes a fix and some improvements to make the driver more generic to add new SoC support.
The patches can be applied in sequence. Patch info:
- Patch 1: Fix.
- Patch 2: Change lingo from 'Master/Slave' to 'Initiator/Target'.
- Patch 3 & 4: Improvements.
- Patch 5: New feature for HW lookup.
- Patch 6 & 7: Tegra264 SoC support.
- Patch 8: Tegra254 SoC support.---
v1[1] -> v2:
- patch 8: change name from GB10 to Tegra254.
- patch 6: added ACK from KrzysztofSumit Gupta (8):
soc: tegra: cbb: clear err force register with err status
soc: tegra: cbb: change master-slave to initiator-target
soc: tegra: cbb: make error interrupt enable and status per SoC
soc: tegra: cbb: improve handling for per SoC fabric data
soc: tegra: cbb: support hw lookup to get timed out target address
dt-bindings: arm: tegra: Add NVIDIA Tegra264 CBB 2.0 binding
soc: tegra: cbb: add support for cbb fabrics in Tegra264
soc: tegra: cbb: add support for cbb fabrics in T254
Quoted 4 lines
.../arm/tegra/nvidia,tegra234-cbb.yaml | 4 + drivers/soc/tegra/cbb/tegra194-cbb.c | 34 +- drivers/soc/tegra/cbb/tegra234-cbb.c | 758 ++++++++++++++---- 3 files changed, 606 insertions(+), 190 deletions(-)
Applied with a few fixups to the subject lines and commit messages.
Thanks,
Thierry
Rob Herring
maintainerQuoted 29 lines · Thierry Reding
Quoted 27 lines · Sumit Gupta
This patch series adds support for Tegra264 and Tegra254 SoCs in the Tegra CBB driver. It also includes a fix and some improvements to make the driver more generic to add new SoC support.
The patches can be applied in sequence. Patch info:
- Patch 1: Fix.
- Patch 2: Change lingo from 'Master/Slave' to 'Initiator/Target'.
- Patch 3 & 4: Improvements.
- Patch 5: New feature for HW lookup.
- Patch 6 & 7: Tegra264 SoC support.
- Patch 8: Tegra254 SoC support.---
v1[1] -> v2:
- patch 8: change name from GB10 to Tegra254.
- patch 6: added ACK from KrzysztofSumit Gupta (8):
soc: tegra: cbb: clear err force register with err status
soc: tegra: cbb: change master-slave to initiator-target
soc: tegra: cbb: make error interrupt enable and status per SoC
soc: tegra: cbb: improve handling for per SoC fabric data
soc: tegra: cbb: support hw lookup to get timed out target address
dt-bindings: arm: tegra: Add NVIDIA Tegra264 CBB 2.0 binding
soc: tegra: cbb: add support for cbb fabrics in Tegra264
soc: tegra: cbb: add support for cbb fabrics in T254
Quoted 6 lines
Quoted 4 lines
.../arm/tegra/nvidia,tegra234-cbb.yaml | 4 + drivers/soc/tegra/cbb/tegra194-cbb.c | 34 +- drivers/soc/tegra/cbb/tegra234-cbb.c | 758 ++++++++++++++---- 3 files changed, 606 insertions(+), 190 deletions(-)Applied with a few fixups to the subject lines and commit messages.
It looks like you missed the binding patch. These compatibles are not documented in linux-next:
nvidia,tegra264-sys-cbb-fabric
nvidia,tegra264-top0-cbb-fabric
nvidia,tegra264-uphy0-cbb-fabric
nvidia,tegra264-vision-cbb-fabric
Rob