Merge "dcc_v2: Don't set the default value to sram when dcc is enabled" (6e60c74e) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/soc/qcom/dcc_v2.c

+22 −18

Original line number	Diff line number	Diff line
		@@ -576,13 +576,15 @@ static int dcc_valid_list(struct dcc_drvdata *drvdata, int curr_list)
		return -EINVAL;

		if (drvdata->enable[curr_list]) {
		dev_err(drvdata->dev, "DCC is already enabled\n");
		dev_err(drvdata->dev, "List %d is already enabled\n",
		curr_list);
		return -EINVAL;
		}

		lock_reg = dcc_readl(drvdata, DCC_LL_LOCK(curr_list));
		if (lock_reg & 0x1) {
		dev_err(drvdata->dev, "DCC is already enabled\n");
		dev_err(drvdata->dev, "List %d is already locked\n",
		curr_list);
		return -EINVAL;
		}

		@@ -590,6 +592,21 @@ static int dcc_valid_list(struct dcc_drvdata *drvdata, int curr_list)
		return 0;
		}

		static bool is_dcc_enabled(struct dcc_drvdata *drvdata)
		{
		bool dcc_enable = false;
		int list;

		for (list = 0; list < DCC_MAX_LINK_LIST; list++) {
		if (drvdata->enable[list]) {
		dcc_enable = true;
		break;
		}
		}

		return dcc_enable;
		}

		static int dcc_enable(struct dcc_drvdata *drvdata)
		{
		int ret = 0;
		@@ -598,7 +615,9 @@ static int dcc_enable(struct dcc_drvdata *drvdata)

		mutex_lock(&drvdata->mutex);

		if (!is_dcc_enabled(drvdata)) {
		memset_io(drvdata->ram_base, 0xDE, drvdata->ram_size);
		}

		for (list = 0; list < DCC_MAX_LINK_LIST; list++) {

		@@ -680,21 +699,6 @@ static void dcc_disable(struct dcc_drvdata *drvdata)
		mutex_unlock(&drvdata->mutex);
		}

		static bool is_dcc_enabled(struct dcc_drvdata *drvdata)
		{
		bool dcc_enable = false;
		int list;

		for (list = 0; list < DCC_MAX_LINK_LIST; list++) {
		if (drvdata->enable[list]) {
		dcc_enable = true;
		break;
		}
		}

		return dcc_enable;
		}

		static ssize_t dcc_show_curr_list(struct device *dev,
		struct device_attribute attr, char buf)
		{