diff options
Diffstat (limited to 'drivers/gpu/drm/v3d/v3d_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/v3d/v3d_debugfs.c | 170 | 
1 files changed, 97 insertions, 73 deletions
diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c index 330669f51fa7..f843a50d5dce 100644 --- a/drivers/gpu/drm/v3d/v3d_debugfs.c +++ b/drivers/gpu/drm/v3d/v3d_debugfs.c @@ -12,69 +12,83 @@  #include "v3d_drv.h"  #include "v3d_regs.h" -#define REGDEF(reg) { reg, #reg } +#define REGDEF(min_ver, max_ver, reg) { min_ver, max_ver, reg, #reg }  struct v3d_reg_def { +	u32 min_ver; +	u32 max_ver;  	u32 reg;  	const char *name;  };  static const struct v3d_reg_def v3d_hub_reg_defs[] = { -	REGDEF(V3D_HUB_AXICFG), -	REGDEF(V3D_HUB_UIFCFG), -	REGDEF(V3D_HUB_IDENT0), -	REGDEF(V3D_HUB_IDENT1), -	REGDEF(V3D_HUB_IDENT2), -	REGDEF(V3D_HUB_IDENT3), -	REGDEF(V3D_HUB_INT_STS), -	REGDEF(V3D_HUB_INT_MSK_STS), +	REGDEF(33, 42, V3D_HUB_AXICFG), +	REGDEF(33, 71, V3D_HUB_UIFCFG), +	REGDEF(33, 71, V3D_HUB_IDENT0), +	REGDEF(33, 71, V3D_HUB_IDENT1), +	REGDEF(33, 71, V3D_HUB_IDENT2), +	REGDEF(33, 71, V3D_HUB_IDENT3), +	REGDEF(33, 71, V3D_HUB_INT_STS), +	REGDEF(33, 71, V3D_HUB_INT_MSK_STS), -	REGDEF(V3D_MMU_CTL), -	REGDEF(V3D_MMU_VIO_ADDR), -	REGDEF(V3D_MMU_VIO_ID), -	REGDEF(V3D_MMU_DEBUG_INFO), +	REGDEF(33, 71, V3D_MMU_CTL), +	REGDEF(33, 71, V3D_MMU_VIO_ADDR), +	REGDEF(33, 71, V3D_MMU_VIO_ID), +	REGDEF(33, 71, V3D_MMU_DEBUG_INFO), + +	REGDEF(71, 71, V3D_GMP_STATUS(71)), +	REGDEF(71, 71, V3D_GMP_CFG(71)), +	REGDEF(71, 71, V3D_GMP_VIO_ADDR(71)),  };  static const struct v3d_reg_def v3d_gca_reg_defs[] = { -	REGDEF(V3D_GCA_SAFE_SHUTDOWN), -	REGDEF(V3D_GCA_SAFE_SHUTDOWN_ACK), +	REGDEF(33, 33, V3D_GCA_SAFE_SHUTDOWN), +	REGDEF(33, 33, V3D_GCA_SAFE_SHUTDOWN_ACK),  };  static const struct v3d_reg_def v3d_core_reg_defs[] = { -	REGDEF(V3D_CTL_IDENT0), -	REGDEF(V3D_CTL_IDENT1), -	REGDEF(V3D_CTL_IDENT2), -	REGDEF(V3D_CTL_MISCCFG), -	REGDEF(V3D_CTL_INT_STS), -	REGDEF(V3D_CTL_INT_MSK_STS), -	REGDEF(V3D_CLE_CT0CS), -	REGDEF(V3D_CLE_CT0CA), -	REGDEF(V3D_CLE_CT0EA), -	REGDEF(V3D_CLE_CT1CS), -	REGDEF(V3D_CLE_CT1CA), -	REGDEF(V3D_CLE_CT1EA), +	REGDEF(33, 71, V3D_CTL_IDENT0), +	REGDEF(33, 71, V3D_CTL_IDENT1), +	REGDEF(33, 71, V3D_CTL_IDENT2), +	REGDEF(33, 71, V3D_CTL_MISCCFG), +	REGDEF(33, 71, V3D_CTL_INT_STS), +	REGDEF(33, 71, V3D_CTL_INT_MSK_STS), +	REGDEF(33, 71, V3D_CLE_CT0CS), +	REGDEF(33, 71, V3D_CLE_CT0CA), +	REGDEF(33, 71, V3D_CLE_CT0EA), +	REGDEF(33, 71, V3D_CLE_CT1CS), +	REGDEF(33, 71, V3D_CLE_CT1CA), +	REGDEF(33, 71, V3D_CLE_CT1EA), -	REGDEF(V3D_PTB_BPCA), -	REGDEF(V3D_PTB_BPCS), +	REGDEF(33, 71, V3D_PTB_BPCA), +	REGDEF(33, 71, V3D_PTB_BPCS), -	REGDEF(V3D_GMP_STATUS), -	REGDEF(V3D_GMP_CFG), -	REGDEF(V3D_GMP_VIO_ADDR), +	REGDEF(33, 41, V3D_GMP_STATUS(33)), +	REGDEF(33, 41, V3D_GMP_CFG(33)), +	REGDEF(33, 41, V3D_GMP_VIO_ADDR(33)), -	REGDEF(V3D_ERR_FDBGO), -	REGDEF(V3D_ERR_FDBGB), -	REGDEF(V3D_ERR_FDBGS), -	REGDEF(V3D_ERR_STAT), +	REGDEF(33, 71, V3D_ERR_FDBGO), +	REGDEF(33, 71, V3D_ERR_FDBGB), +	REGDEF(33, 71, V3D_ERR_FDBGS), +	REGDEF(33, 71, V3D_ERR_STAT),  };  static const struct v3d_reg_def v3d_csd_reg_defs[] = { -	REGDEF(V3D_CSD_STATUS), -	REGDEF(V3D_CSD_CURRENT_CFG0), -	REGDEF(V3D_CSD_CURRENT_CFG1), -	REGDEF(V3D_CSD_CURRENT_CFG2), -	REGDEF(V3D_CSD_CURRENT_CFG3), -	REGDEF(V3D_CSD_CURRENT_CFG4), -	REGDEF(V3D_CSD_CURRENT_CFG5), -	REGDEF(V3D_CSD_CURRENT_CFG6), +	REGDEF(41, 71, V3D_CSD_STATUS), +	REGDEF(41, 41, V3D_CSD_CURRENT_CFG0(41)), +	REGDEF(41, 41, V3D_CSD_CURRENT_CFG1(41)), +	REGDEF(41, 41, V3D_CSD_CURRENT_CFG2(41)), +	REGDEF(41, 41, V3D_CSD_CURRENT_CFG3(41)), +	REGDEF(41, 41, V3D_CSD_CURRENT_CFG4(41)), +	REGDEF(41, 41, V3D_CSD_CURRENT_CFG5(41)), +	REGDEF(41, 41, V3D_CSD_CURRENT_CFG6(41)), +	REGDEF(71, 71, V3D_CSD_CURRENT_CFG0(71)), +	REGDEF(71, 71, V3D_CSD_CURRENT_CFG1(71)), +	REGDEF(71, 71, V3D_CSD_CURRENT_CFG2(71)), +	REGDEF(71, 71, V3D_CSD_CURRENT_CFG3(71)), +	REGDEF(71, 71, V3D_CSD_CURRENT_CFG4(71)), +	REGDEF(71, 71, V3D_CSD_CURRENT_CFG5(71)), +	REGDEF(71, 71, V3D_CSD_CURRENT_CFG6(71)), +	REGDEF(71, 71, V3D_V7_CSD_CURRENT_CFG7),  };  static int v3d_v3d_debugfs_regs(struct seq_file *m, void *unused) @@ -85,38 +99,41 @@ static int v3d_v3d_debugfs_regs(struct seq_file *m, void *unused)  	int i, core;  	for (i = 0; i < ARRAY_SIZE(v3d_hub_reg_defs); i++) { -		seq_printf(m, "%s (0x%04x): 0x%08x\n", -			   v3d_hub_reg_defs[i].name, v3d_hub_reg_defs[i].reg, -			   V3D_READ(v3d_hub_reg_defs[i].reg)); +		const struct v3d_reg_def *def = &v3d_hub_reg_defs[i]; + +		if (v3d->ver >= def->min_ver && v3d->ver <= def->max_ver) { +			seq_printf(m, "%s (0x%04x): 0x%08x\n", +				   def->name, def->reg, V3D_READ(def->reg)); +		}  	} -	if (v3d->ver < 41) { -		for (i = 0; i < ARRAY_SIZE(v3d_gca_reg_defs); i++) { +	for (i = 0; i < ARRAY_SIZE(v3d_gca_reg_defs); i++) { +		const struct v3d_reg_def *def = &v3d_gca_reg_defs[i]; + +		if (v3d->ver >= def->min_ver && v3d->ver <= def->max_ver) {  			seq_printf(m, "%s (0x%04x): 0x%08x\n", -				   v3d_gca_reg_defs[i].name, -				   v3d_gca_reg_defs[i].reg, -				   V3D_GCA_READ(v3d_gca_reg_defs[i].reg)); +				   def->name, def->reg, V3D_GCA_READ(def->reg));  		}  	}  	for (core = 0; core < v3d->cores; core++) {  		for (i = 0; i < ARRAY_SIZE(v3d_core_reg_defs); i++) { -			seq_printf(m, "core %d %s (0x%04x): 0x%08x\n", -				   core, -				   v3d_core_reg_defs[i].name, -				   v3d_core_reg_defs[i].reg, -				   V3D_CORE_READ(core, -						 v3d_core_reg_defs[i].reg)); +			const struct v3d_reg_def *def = &v3d_core_reg_defs[i]; + +			if (v3d->ver >= def->min_ver && v3d->ver <= def->max_ver) { +				seq_printf(m, "core %d %s (0x%04x): 0x%08x\n", +					   core, def->name, def->reg, +					   V3D_CORE_READ(core, def->reg)); +			}  		} -		if (v3d_has_csd(v3d)) { -			for (i = 0; i < ARRAY_SIZE(v3d_csd_reg_defs); i++) { +		for (i = 0; i < ARRAY_SIZE(v3d_csd_reg_defs); i++) { +			const struct v3d_reg_def *def = &v3d_csd_reg_defs[i]; + +			if (v3d->ver >= def->min_ver && v3d->ver <= def->max_ver) {  				seq_printf(m, "core %d %s (0x%04x): 0x%08x\n", -					   core, -					   v3d_csd_reg_defs[i].name, -					   v3d_csd_reg_defs[i].reg, -					   V3D_CORE_READ(core, -							 v3d_csd_reg_defs[i].reg)); +					   core, def->name, def->reg, +					   V3D_CORE_READ(core, def->reg));  			}  		}  	} @@ -147,8 +164,10 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused)  		   str_yes_no(ident2 & V3D_HUB_IDENT2_WITH_MMU));  	seq_printf(m, "TFU:        %s\n",  		   str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_TFU)); -	seq_printf(m, "TSY:        %s\n", -		   str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_TSY)); +	if (v3d->ver <= 42) { +		seq_printf(m, "TSY:        %s\n", +			   str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_TSY)); +	}  	seq_printf(m, "MSO:        %s\n",  		   str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_MSO));  	seq_printf(m, "L3C:        %s (%dkb)\n", @@ -177,10 +196,14 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused)  		seq_printf(m, "  QPUs:         %d\n", nslc * qups);  		seq_printf(m, "  Semaphores:   %d\n",  			   V3D_GET_FIELD(ident1, V3D_IDENT1_NSEM)); -		seq_printf(m, "  BCG int:      %d\n", -			   (ident2 & V3D_IDENT2_BCG_INT) != 0); -		seq_printf(m, "  Override TMU: %d\n", -			   (misccfg & V3D_MISCCFG_OVRTMUOUT) != 0); +		if (v3d->ver <= 42) { +			seq_printf(m, "  BCG int:      %d\n", +				   (ident2 & V3D_IDENT2_BCG_INT) != 0); +		} +		if (v3d->ver < 40) { +			seq_printf(m, "  Override TMU: %d\n", +				   (misccfg & V3D_MISCCFG_OVRTMUOUT) != 0); +		}  	}  	return 0; @@ -212,14 +235,15 @@ static int v3d_measure_clock(struct seq_file *m, void *unused)  	int measure_ms = 1000;  	if (v3d->ver >= 40) { +		int cycle_count_reg = V3D_PCTR_CYCLE_COUNT(v3d->ver);  		V3D_CORE_WRITE(core, V3D_V4_PCTR_0_SRC_0_3, -			       V3D_SET_FIELD(V3D_PCTR_CYCLE_COUNT, +			       V3D_SET_FIELD(cycle_count_reg,  					     V3D_PCTR_S0));  		V3D_CORE_WRITE(core, V3D_V4_PCTR_0_CLR, 1);  		V3D_CORE_WRITE(core, V3D_V4_PCTR_0_EN, 1);  	} else {  		V3D_CORE_WRITE(core, V3D_V3_PCTR_0_PCTRS0, -			       V3D_PCTR_CYCLE_COUNT); +			       V3D_PCTR_CYCLE_COUNT(v3d->ver));  		V3D_CORE_WRITE(core, V3D_V3_PCTR_0_CLR, 1);  		V3D_CORE_WRITE(core, V3D_V3_PCTR_0_EN,  			       V3D_V3_PCTR_0_EN_ENABLE |  | 
