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

Commit daac5407 authored by Lynus Vaz's avatar Lynus Vaz
Browse files

msm: kgsl: Dump the A6XX VBIF debugbus correctly 



The VBIF debugbus data requires a different procedure from other
GPU blocks. Dump it correctly.

Change-Id: If525336c0deb315b1370c904db232821bef4b6fd
Signed-off-by: default avatarLynus Vaz <lvaz@codeaurora.org>
parent 106f4889

drivers/gpu/msm/a6xx_reg.h

+15 −0
Original line number Diff line number Diff line
@@ -720,10 +720,25 @@ 


/* VBIF registers */

#define A6XX_VBIF_VERSION                       0x3000

#define A6XX_VBIF_CLKON                         0x3001

#define A6XX_VBIF_CLKON_FORCE_ON_TESTBUS_MASK   0x1

#define A6XX_VBIF_CLKON_FORCE_ON_TESTBUS_SHIFT  0x1

#define A6XX_VBIF_GATE_OFF_WRREQ_EN             0x302A

#define A6XX_VBIF_XIN_HALT_CTRL0                0x3080

#define A6XX_VBIF_XIN_HALT_CTRL0_MASK           0xF

#define A6XX_VBIF_XIN_HALT_CTRL1                0x3081

#define A6XX_VBIF_TEST_BUS_OUT_CTRL             0x3084

#define A6XX_VBIF_TEST_BUS_OUT_CTRL_EN_MASK     0x1

#define A6XX_VBIF_TEST_BUS_OUT_CTRL_EN_SHIFT    0x0

#define A6XX_VBIF_TEST_BUS1_CTRL0               0x3085

#define A6XX_VBIF_TEST_BUS1_CTRL1               0x3086

#define A6XX_VBIF_TEST_BUS1_CTRL1_DATA_SEL_MASK 0xF

#define A6XX_VBIF_TEST_BUS1_CTRL1_DATA_SEL_SHIFT 0x0

#define A6XX_VBIF_TEST_BUS2_CTRL0               0x3087

#define A6XX_VBIF_TEST_BUS2_CTRL1               0x3088

#define A6XX_VBIF_TEST_BUS2_CTRL1_DATA_SEL_MASK 0x1FF

#define A6XX_VBIF_TEST_BUS2_CTRL1_DATA_SEL_SHIFT 0x0

#define A6XX_VBIF_TEST_BUS_OUT                  0x308C

#define A6XX_VBIF_PERF_CNT_SEL0                 0x30d0

#define A6XX_VBIF_PERF_CNT_SEL1                 0x30d1

#define A6XX_VBIF_PERF_CNT_SEL2                 0x30d2

drivers/gpu/msm/adreno_a6xx_snapshot.c

+95 −2
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
#include "kgsl_gmu.h"



#define A6XX_NUM_CTXTS 2

#define A6XX_NUM_AXI_ARB_BLOCKS 2

#define A6XX_NUM_XIN_AXI_BLOCKS 5

#define A6XX_NUM_XIN_CORE_BLOCKS 4



static const unsigned int a6xx_gras_cluster[] = {

	0x8000, 0x8006, 0x8010, 0x8092, 0x8094, 0x809D, 0x80A0, 0x80A6,
@@ -393,9 +396,12 @@ static const struct adreno_debugbus_block a6xx_dbgc_debugbus_blocks[] = { 
	{ A6XX_DBGBUS_TPL1_3, 0x100, },

};



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_VBIF, 0x100, },

	{ A6XX_DBGBUS_GMU_CX, 0x100, },

	{ A6XX_DBGBUS_CX, 0x100, },

};
@@ -1076,7 +1082,7 @@ static void a6xx_dbgc_debug_bus_read(struct kgsl_device *device, 
	kgsl_regread(device, A6XX_DBGC_CFG_DBGBUS_TRACE_BUF1, val);

}



/* a6xx_snapshot_cbgc_debugbus_block() - Capture debug data for a gpu block */

/* a6xx_snapshot_dbgc_debugbus_block() - Capture debug data for a gpu block */

static size_t a6xx_snapshot_dbgc_debugbus_block(struct kgsl_device *device,

	u8 *buf, size_t remain, void *priv)

{
@@ -1115,6 +1121,89 @@ static size_t a6xx_snapshot_dbgc_debugbus_block(struct kgsl_device *device, 
	return size;

}



/* a6xx_snapshot_vbif_debugbus_block() - Capture debug data for VBIF block */

static size_t a6xx_snapshot_vbif_debugbus_block(struct kgsl_device *device,

			u8 *buf, size_t remain, void *priv)

{

	struct kgsl_snapshot_debugbus *header =

		(struct kgsl_snapshot_debugbus *)buf;

	struct adreno_debugbus_block *block = priv;

	int i, j;

	/*

	 * Total number of VBIF data words considering 3 sections:

	 * 2 arbiter blocks of 16 words

	 * 5 AXI XIN blocks of 18 dwords each

	 * 4 core clock side XIN blocks of 12 dwords each

	 */

	unsigned int dwords = (16 * A6XX_NUM_AXI_ARB_BLOCKS) +

			(18 * A6XX_NUM_XIN_AXI_BLOCKS) +

			(12 * A6XX_NUM_XIN_CORE_BLOCKS);

	unsigned int *data = (unsigned int *)(buf + sizeof(*header));

	size_t size;

	unsigned int reg_clk;



	size = (dwords * sizeof(unsigned int)) + sizeof(*header);



	if (remain < size) {

		SNAPSHOT_ERR_NOMEM(device, "DEBUGBUS");

		return 0;

	}

	header->id = block->block_id;

	header->count = dwords;



	kgsl_regread(device, A6XX_VBIF_CLKON, &reg_clk);

	kgsl_regwrite(device, A6XX_VBIF_CLKON, reg_clk |

			(A6XX_VBIF_CLKON_FORCE_ON_TESTBUS_MASK <<

			A6XX_VBIF_CLKON_FORCE_ON_TESTBUS_SHIFT));

	kgsl_regwrite(device, A6XX_VBIF_TEST_BUS1_CTRL0, 0);

	kgsl_regwrite(device, A6XX_VBIF_TEST_BUS_OUT_CTRL,

			(A6XX_VBIF_TEST_BUS_OUT_CTRL_EN_MASK <<

			A6XX_VBIF_TEST_BUS_OUT_CTRL_EN_SHIFT));



	for (i = 0; i < A6XX_NUM_AXI_ARB_BLOCKS; i++) {

		kgsl_regwrite(device, A6XX_VBIF_TEST_BUS2_CTRL0,

			(1 << (i + 16)));

		for (j = 0; j < 16; j++) {

			kgsl_regwrite(device, A6XX_VBIF_TEST_BUS2_CTRL1,

				((j & A6XX_VBIF_TEST_BUS2_CTRL1_DATA_SEL_MASK)

				<< A6XX_VBIF_TEST_BUS2_CTRL1_DATA_SEL_SHIFT));

			kgsl_regread(device, A6XX_VBIF_TEST_BUS_OUT,

					data);

			data++;

		}

	}



	/* XIN blocks AXI side */

	for (i = 0; i < A6XX_NUM_XIN_AXI_BLOCKS; i++) {

		kgsl_regwrite(device, A6XX_VBIF_TEST_BUS2_CTRL0, 1 << i);

		for (j = 0; j < 18; j++) {

			kgsl_regwrite(device, A6XX_VBIF_TEST_BUS2_CTRL1,

				((j & A6XX_VBIF_TEST_BUS2_CTRL1_DATA_SEL_MASK)

				<< A6XX_VBIF_TEST_BUS2_CTRL1_DATA_SEL_SHIFT));

			kgsl_regread(device, A6XX_VBIF_TEST_BUS_OUT,

				data);

			data++;

		}

	}

	kgsl_regwrite(device, A6XX_VBIF_TEST_BUS2_CTRL0, 0);



	/* XIN blocks core clock side */

	for (i = 0; i < A6XX_NUM_XIN_CORE_BLOCKS; i++) {

		kgsl_regwrite(device, A6XX_VBIF_TEST_BUS1_CTRL0, 1 << i);

		for (j = 0; j < 12; j++) {

			kgsl_regwrite(device, A6XX_VBIF_TEST_BUS1_CTRL1,

				((j & A6XX_VBIF_TEST_BUS1_CTRL1_DATA_SEL_MASK)

				<< A6XX_VBIF_TEST_BUS1_CTRL1_DATA_SEL_SHIFT));

			kgsl_regread(device, A6XX_VBIF_TEST_BUS_OUT,

				data);

			data++;

		}

	}

	/* restore the clock of VBIF */

	kgsl_regwrite(device, A6XX_VBIF_CLKON, reg_clk);

	return size;

}



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

{

	void __iomem *reg;
@@ -1310,6 +1399,10 @@ static void a6xx_snapshot_debugbus(struct kgsl_device *device, 
			(void *) &a6xx_dbgc_debugbus_blocks[i]);

	}



	kgsl_snapshot_add_section(device, KGSL_SNAPSHOT_SECTION_DEBUGBUS,

			snapshot, a6xx_snapshot_vbif_debugbus_block,

			(void *) &a6xx_vbif_debugbus_blocks);



	if (a6xx_cx_dbgc) {

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

			kgsl_snapshot_add_section(device,