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

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

Merge "msm: npu: Enable system cache"

parents b7ac88f1 91bd39dc

drivers/media/platform/msm/npu/npu_common.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -117,7 +117,6 @@ struct npu_debugfs_ctx { 
	uint32_t log_read_index;

	uint32_t log_read_index;

	uint32_t log_write_index;

	uint32_t log_write_index;

	uint32_t log_buf_size;

	uint32_t log_buf_size;

	bool sys_cache_disable;

};

};





struct npu_mbox {

struct npu_mbox {

drivers/media/platform/msm/npu/npu_debugfs.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -408,7 +408,6 @@ int npu_debugfs_init(struct npu_device *npu_dev) 
	struct npu_pwrctrl *pwr = &npu_dev->pwrctrl;

	struct npu_pwrctrl *pwr = &npu_dev->pwrctrl;





	g_npu_dev = npu_dev;

	g_npu_dev = npu_dev;

	debugfs->sys_cache_disable = 1;





	debugfs->root = debugfs_create_dir("npu", NULL);

	debugfs->root = debugfs_create_dir("npu", NULL);

	if (IS_ERR_OR_NULL(debugfs->root)) {

	if (IS_ERR_OR_NULL(debugfs->root)) {
@@ -442,7 +441,7 @@ int npu_debugfs_init(struct npu_device *npu_dev) 
	}

	}





	if (!debugfs_create_bool("sys_cache_disable", 0644,

	if (!debugfs_create_bool("sys_cache_disable", 0644,

		debugfs->root, &debugfs->sys_cache_disable)) {

		debugfs->root, &(host_ctx->sys_cache_disable))) {

		pr_err("debugfs_creat_bool fail for sys cache\n");

		pr_err("debugfs_creat_bool fail for sys cache\n");

		goto err;

		goto err;

	}

	}

drivers/media/platform/msm/npu/npu_dev.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -702,7 +702,7 @@ int npu_enable_sys_cache(struct npu_device *npu_dev) 
	int rc = 0;

	int rc = 0;

	uint32_t reg_val = 0;

	uint32_t reg_val = 0;





	if (!npu_dev->debugfs_ctx.sys_cache_disable) {

	if (!npu_dev->host_ctx.sys_cache_disable) {

		npu_dev->sys_cache = llcc_slice_getd(&(npu_dev->pdev->dev),

		npu_dev->sys_cache = llcc_slice_getd(&(npu_dev->pdev->dev),

			"npu");

			"npu");

		if (IS_ERR_OR_NULL(npu_dev->sys_cache)) {

		if (IS_ERR_OR_NULL(npu_dev->sys_cache)) {
@@ -735,7 +735,7 @@ void npu_disable_sys_cache(struct npu_device *npu_dev) 
{

{

	int rc = 0;

	int rc = 0;





	if (!npu_dev->debugfs_ctx.sys_cache_disable) {

	if (!npu_dev->host_ctx.sys_cache_disable) {

		if (npu_dev->sys_cache) {

		if (npu_dev->sys_cache) {

			rc = llcc_slice_deactivate(npu_dev->sys_cache);

			rc = llcc_slice_deactivate(npu_dev->sys_cache);

			if (rc) {

			if (rc) {

drivers/media/platform/msm/npu/npu_hw_access.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -304,7 +304,7 @@ uint8_t npu_hw_clk_gating_enabled(void) 




uint8_t npu_hw_log_enabled(void)

uint8_t npu_hw_log_enabled(void)

{

{

	return 0;

	return 1;

}

}





/* -------------------------------------------------------------------------

/* -------------------------------------------------------------------------

drivers/media/platform/msm/npu/npu_mgr.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,6 @@ int fw_init(struct npu_device *npu_dev) 
	 * during FW bootup initialization

	 * during FW bootup initialization

	 */

	 */

	reg_val = REGR(npu_dev, REG_NPU_HOST_CTRL_STATUS);

	reg_val = REGR(npu_dev, REG_NPU_HOST_CTRL_STATUS);

	reg_val |= HOST_CTRL_STATUS_BOOT_ENABLE_LOGGING_VAL;





	/* Enable clock gating only if the HW access platform allows it */

	/* Enable clock gating only if the HW access platform allows it */

	if (npu_hw_clk_gating_enabled())

	if (npu_hw_clk_gating_enabled())
@@ -160,6 +159,8 @@ int npu_host_init(struct npu_device *npu_dev) 
	init_completion(&host_ctx->load_done);

	init_completion(&host_ctx->load_done);

	init_completion(&host_ctx->unload_done);

	init_completion(&host_ctx->unload_done);





	host_ctx->sys_cache_disable = 0;



	host_ctx->wq = npu_create_wq(host_ctx, "irq_hdl", host_irq_wq,

	host_ctx->wq = npu_create_wq(host_ctx, "irq_hdl", host_irq_wq,

		&host_ctx->irq_work);

		&host_ctx->irq_work);

	if (!host_ctx->wq)

	if (!host_ctx->wq)