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

Commit 40ea0b40 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: dcc_v2: Avoid dcc_sram_writel overstep"

parents 0c271d5f c5615aa1

drivers/soc/qcom/dcc_v2.c

+68 −18
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
#define dcc_readl(drvdata, off)						\

	__raw_readl(drvdata->base + off)



#define dcc_sram_writel(drvdata, val, off)				\

	__raw_writel((val), drvdata->ram_base + off)

#define dcc_sram_readl(drvdata, off)					\

	__raw_readl(drvdata->ram_base + off)
@@ -148,6 +146,17 @@ struct dcc_drvdata { 
	uint8_t			loopoff;

};



static int dcc_sram_writel(struct dcc_drvdata *drvdata,

					uint32_t val, uint32_t off)

{

	if (unlikely(off > (drvdata->ram_size - 4)))

		return -EINVAL;



	__raw_writel((val), drvdata->ram_base + off);



	return 0;

}



static bool dcc_ready(struct dcc_drvdata *drvdata)

{

	uint32_t val;
@@ -251,7 +260,10 @@ static int __dcc_ll_cfg(struct dcc_drvdata *drvdata, int curr_list) 
				/* write new offset = 1 to continue

				 * processing the list

				 */

				dcc_sram_writel(drvdata, link, sram_offset);

				ret = dcc_sram_writel(drvdata,

							link, sram_offset);

				if (ret)

					goto overstep;

				sram_offset += 4;

				/* Reset link and prev_off */

				addr = 0x00;
@@ -261,13 +273,21 @@ static int __dcc_ll_cfg(struct dcc_drvdata *drvdata, int curr_list) 
			}



			addr = DCC_RD_MOD_WR_DESCRIPTOR;

			dcc_sram_writel(drvdata, addr, sram_offset);

			ret = dcc_sram_writel(drvdata, addr, sram_offset);

			if (ret)

				goto overstep;

				sram_offset += 4;



			dcc_sram_writel(drvdata, entry->mask, sram_offset);

			ret = dcc_sram_writel(drvdata,

					entry->mask, sram_offset);

			if (ret)

				goto overstep;

				sram_offset += 4;



			dcc_sram_writel(drvdata, entry->write_val, sram_offset);

			ret = dcc_sram_writel(drvdata,

					entry->write_val, sram_offset);

			if (ret)

				goto overstep;

				sram_offset += 4;

			addr = 0;

			break;
@@ -277,7 +297,10 @@ static int __dcc_ll_cfg(struct dcc_drvdata *drvdata, int curr_list) 
		{

			/* Check if we need to write link of prev entry */

			if (link) {

				dcc_sram_writel(drvdata, link, sram_offset);

				ret = dcc_sram_writel(drvdata,

						link, sram_offset);

				if (ret)

					goto overstep;

				sram_offset += 4;

			}
@@ -288,7 +311,10 @@ static int __dcc_ll_cfg(struct dcc_drvdata *drvdata, int curr_list) 
				loop |= DCC_LOOP_DESCRIPTOR;

				total_len += (total_len - loop_len) * loop_cnt;



				dcc_sram_writel(drvdata, loop, sram_offset);

				ret = dcc_sram_writel(drvdata,

						loop, sram_offset);

				if (ret)

					goto overstep;

				sram_offset += 4;



				loop_start = false;
@@ -316,7 +342,10 @@ static int __dcc_ll_cfg(struct dcc_drvdata *drvdata, int curr_list) 
				/* write new offset = 1 to continue

				 * processing the list

				 */

				dcc_sram_writel(drvdata, link, sram_offset);

				ret = dcc_sram_writel(drvdata,

						link, sram_offset);

				if (ret)

					goto overstep;

				sram_offset += 4;

				/* Reset link and prev_off */

				addr = 0x00;
@@ -339,13 +368,20 @@ static int __dcc_ll_cfg(struct dcc_drvdata *drvdata, int curr_list) 
				addr |= DCC_ADDR_DESCRIPTOR | DCC_WRITE_IND

					| DCC_AHB_IND;



			dcc_sram_writel(drvdata, addr, sram_offset);

			ret = dcc_sram_writel(drvdata, addr, sram_offset);

			if (ret)

				goto overstep;

				sram_offset += 4;



			dcc_sram_writel(drvdata, link, sram_offset);

			ret = dcc_sram_writel(drvdata, link, sram_offset);

			if (ret)

				goto overstep;

				sram_offset += 4;



			dcc_sram_writel(drvdata, entry->write_val, sram_offset);

			ret = dcc_sram_writel(drvdata,

				entry->write_val, sram_offset);

			if (ret)

				goto overstep;

				sram_offset += 4;

			addr = 0x00;

			link = 0;
@@ -369,8 +405,10 @@ static int __dcc_ll_cfg(struct dcc_drvdata *drvdata, int curr_list) 
			if (!prev_addr || prev_addr != addr || prev_off > off) {

				/* Check if we need to write prev link entry */

				if (link) {

					dcc_sram_writel(drvdata,

					ret = dcc_sram_writel(drvdata,

							link, sram_offset);

					if (ret)

						goto overstep;

					sram_offset += 4;

				}

				dev_dbg(drvdata->dev,
@@ -378,7 +416,10 @@ static int __dcc_ll_cfg(struct dcc_drvdata *drvdata, int curr_list) 
					sram_offset);



				/* Write address */

				dcc_sram_writel(drvdata, addr, sram_offset);

				ret = dcc_sram_writel(drvdata,

						addr, sram_offset);

				if (ret)

					goto overstep;

				sram_offset += 4;



				/* Reset link and prev_off */
@@ -421,7 +462,10 @@ static int __dcc_ll_cfg(struct dcc_drvdata *drvdata, int curr_list) 
			link |= DCC_LINK_DESCRIPTOR;



			if (pos) {

				dcc_sram_writel(drvdata, link, sram_offset);

				ret = dcc_sram_writel(drvdata,

						link, sram_offset);

				if (ret)

					goto overstep;

				sram_offset += 4;

				link = 0;

			}
@@ -433,7 +477,9 @@ static int __dcc_ll_cfg(struct dcc_drvdata *drvdata, int curr_list) 
	}



	if (link) {

		dcc_sram_writel(drvdata, link, sram_offset);

		ret = dcc_sram_writel(drvdata, link, sram_offset);

		if (ret)

			goto overstep;

		sram_offset += 4;

	}
@@ -449,13 +495,17 @@ static int __dcc_ll_cfg(struct dcc_drvdata *drvdata, int curr_list) 
		addr = (0xC105E) & BM(0, 27);

		addr |= DCC_ADDR_DESCRIPTOR;



		dcc_sram_writel(drvdata, addr, sram_offset);

		ret = dcc_sram_writel(drvdata, addr, sram_offset);

		if (ret)

			goto overstep;

		sram_offset += 4;

	}



	/* Setting zero to indicate end of the list */

	link = DCC_LINK_DESCRIPTOR;

	dcc_sram_writel(drvdata, link, sram_offset);

	ret = dcc_sram_writel(drvdata, link, sram_offset);

	if (ret)

		goto overstep;

	sram_offset += 4;



	/* Update ram_cfg and check if the data will overstep */