Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1676d21 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Use the common CX debug register access functions"

parents 602e61d5 9fdc1d27

drivers/gpu/msm/adreno_a6xx_snapshot.c

+40 −89
Original line number Diff line number Diff line
@@ -437,7 +437,6 @@ static const struct adreno_debugbus_block a6xx_vbif_debugbus_blocks = { 
	A6XX_DBGBUS_VBIF, 0x100,

};



static void __iomem *a6xx_cx_dbgc;

static const struct adreno_debugbus_block a6xx_cx_dbgc_debugbus_blocks[] = {

	{ A6XX_DBGBUS_GMU_CX, 0x100, },

	{ A6XX_DBGBUS_CX, 0x100, },
@@ -1254,46 +1253,6 @@ static size_t a6xx_snapshot_vbif_debugbus_block(struct kgsl_device *device, 
	return size;

}



static void _cx_dbgc_regread(unsigned int offsetwords, unsigned int *value)

{

	void __iomem *reg;



	if (WARN((offsetwords < A6XX_CX_DBGC_CFG_DBGBUS_SEL_A) ||

		(offsetwords > A6XX_CX_DBGC_CFG_DBGBUS_TRACE_BUF2),

		"Read beyond CX_DBGC block: 0x%x\n", offsetwords))

		return;



	reg = a6xx_cx_dbgc +

		((offsetwords - A6XX_CX_DBGC_CFG_DBGBUS_SEL_A) << 2);

	*value = __raw_readl(reg);



	/*

	 * ensure this read finishes before the next one.

	 * i.e. act like normal readl()

	 */

	rmb();

}



static void _cx_dbgc_regwrite(unsigned int offsetwords, unsigned int value)

{

	void __iomem *reg;



	if (WARN((offsetwords < A6XX_CX_DBGC_CFG_DBGBUS_SEL_A) ||

		(offsetwords > A6XX_CX_DBGC_CFG_DBGBUS_TRACE_BUF2),

		"Write beyond CX_DBGC block: 0x%x\n", offsetwords))

		return;



	reg = a6xx_cx_dbgc +

		((offsetwords - A6XX_CX_DBGC_CFG_DBGBUS_SEL_A) << 2);



	/*

	 * ensure previous writes post before this one,

	 * i.e. act like normal writel()

	 */

	wmb();

	__raw_writel(value, reg);

}



/* a6xx_cx_dbgc_debug_bus_read() - Read data from trace bus */

static void a6xx_cx_debug_bus_read(struct kgsl_device *device,

	unsigned int block_id, unsigned int index, unsigned int *val)
@@ -1303,10 +1262,10 @@ static void a6xx_cx_debug_bus_read(struct kgsl_device *device, 
	reg = (block_id << A6XX_CX_DBGC_CFG_DBGBUS_SEL_PING_BLK_SEL_SHIFT) |

			(index << A6XX_CX_DBGC_CFG_DBGBUS_SEL_PING_INDEX_SHIFT);



	_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_SEL_A, reg);

	_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_SEL_B, reg);

	_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_SEL_C, reg);

	_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_SEL_D, reg);

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_SEL_A, reg);

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_SEL_B, reg);

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_SEL_C, reg);

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_SEL_D, reg);



	/*

	 * There needs to be a delay of 1 us to ensure enough time for correct
@@ -1314,9 +1273,9 @@ static void a6xx_cx_debug_bus_read(struct kgsl_device *device, 
	 */

	udelay(1);



	_cx_dbgc_regread(A6XX_CX_DBGC_CFG_DBGBUS_TRACE_BUF2, val);

	adreno_cx_dbgc_regread(device, A6XX_CX_DBGC_CFG_DBGBUS_TRACE_BUF2, val);

	val++;

	_cx_dbgc_regread(A6XX_CX_DBGC_CFG_DBGBUS_TRACE_BUF1, val);

	adreno_cx_dbgc_regread(device, A6XX_CX_DBGC_CFG_DBGBUS_TRACE_BUF1, val);

}



/*
@@ -1398,26 +1357,20 @@ static void a6xx_snapshot_debugbus(struct kgsl_device *device, 
	kgsl_regwrite(device, A6XX_DBGC_CFG_DBGBUS_MASKL_2, 0);

	kgsl_regwrite(device, A6XX_DBGC_CFG_DBGBUS_MASKL_3, 0);



	a6xx_cx_dbgc = ioremap(device->reg_phys +

			(A6XX_CX_DBGC_CFG_DBGBUS_SEL_A << 2),

			(A6XX_CX_DBGC_CFG_DBGBUS_TRACE_BUF2 -

				A6XX_CX_DBGC_CFG_DBGBUS_SEL_A + 1) << 2);



	if (a6xx_cx_dbgc) {

		_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_CNTLT,

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_CNTLT,

		(0xf << A6XX_DBGC_CFG_DBGBUS_CNTLT_SEGT_SHIFT) |

		(0x0 << A6XX_DBGC_CFG_DBGBUS_CNTLT_GRANU_SHIFT) |

		(0x0 << A6XX_DBGC_CFG_DBGBUS_CNTLT_TRACEEN_SHIFT));



		_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_CNTLM,

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_CNTLM,

		0xf << A6XX_CX_DBGC_CFG_DBGBUS_CNTLM_ENABLE_SHIFT);



		_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_IVTL_0, 0);

		_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_IVTL_1, 0);

		_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_IVTL_2, 0);

		_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_IVTL_3, 0);

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_IVTL_0, 0);

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_IVTL_1, 0);

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_IVTL_2, 0);

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_IVTL_3, 0);



		_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0,

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0,

		(0 << A6XX_CX_DBGC_CFG_DBGBUS_BYTEL0_SHIFT) |

		(1 << A6XX_CX_DBGC_CFG_DBGBUS_BYTEL1_SHIFT) |

		(2 << A6XX_CX_DBGC_CFG_DBGBUS_BYTEL2_SHIFT) |
@@ -1426,7 +1379,7 @@ static void a6xx_snapshot_debugbus(struct kgsl_device *device, 
		(5 << A6XX_CX_DBGC_CFG_DBGBUS_BYTEL5_SHIFT) |

		(6 << A6XX_CX_DBGC_CFG_DBGBUS_BYTEL6_SHIFT) |

		(7 << A6XX_CX_DBGC_CFG_DBGBUS_BYTEL7_SHIFT));

		_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1,

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1,

		(8 << A6XX_CX_DBGC_CFG_DBGBUS_BYTEL8_SHIFT) |

		(9 << A6XX_CX_DBGC_CFG_DBGBUS_BYTEL9_SHIFT) |

		(10 << A6XX_CX_DBGC_CFG_DBGBUS_BYTEL10_SHIFT) |
@@ -1436,12 +1389,10 @@ static void a6xx_snapshot_debugbus(struct kgsl_device *device, 
		(14 << A6XX_CX_DBGC_CFG_DBGBUS_BYTEL14_SHIFT) |

		(15 << A6XX_CX_DBGC_CFG_DBGBUS_BYTEL15_SHIFT));



		_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_MASKL_0, 0);

		_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_MASKL_1, 0);

		_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_MASKL_2, 0);

		_cx_dbgc_regwrite(A6XX_CX_DBGC_CFG_DBGBUS_MASKL_3, 0);

	} else

		KGSL_DRV_ERR(device, "Unable to ioremap CX_DBGC_CFG block\n");

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_MASKL_0, 0);

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_MASKL_1, 0);

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_MASKL_2, 0);

	adreno_cx_dbgc_regwrite(device, A6XX_CX_DBGC_CFG_DBGBUS_MASKL_3, 0);



	for (i = 0; i < ARRAY_SIZE(a6xx_dbgc_debugbus_blocks); i++) {

		kgsl_snapshot_add_section(device,
@@ -1457,14 +1408,14 @@ static void a6xx_snapshot_debugbus(struct kgsl_device *device, 
				snapshot, a6xx_snapshot_vbif_debugbus_block,

				(void *) &a6xx_vbif_debugbus_blocks);



	if (a6xx_cx_dbgc) {

	/* Dump the CX debugbus data if the block exists */

	if (adreno_is_cx_dbgc_register(device, A6XX_CX_DBGC_CFG_DBGBUS_SEL_A)) {

		for (i = 0; i < ARRAY_SIZE(a6xx_cx_dbgc_debugbus_blocks); i++) {

			kgsl_snapshot_add_section(device,

				KGSL_SNAPSHOT_SECTION_DEBUGBUS,

				snapshot, a6xx_snapshot_cx_dbgc_debugbus_block,

				(void *) &a6xx_cx_dbgc_debugbus_blocks[i]);

		}

		iounmap(a6xx_cx_dbgc);

	}

}