Commit 20df0961 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "These fix some issues and clean up code in ARM cpufreq drivers.

  Specifics:

   - Fix module loading in the Tegra124 cpufreq driver (Jon Hunter)

   - Fix memory leak and update to read-only region in the qcom cpufreq
     driver (Fabien Parent)

   - Miscellaneous minor cleanups to cpufreq drivers (Fabien Parent,
     Yang Yingliang)"

* tag 'pm-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: sun50i: Switch to use dev_err_probe() helper
  cpufreq: qcom-nvmem: Switch to use dev_err_probe() helper
  cpufreq: imx6q: Switch to use dev_err_probe() helper
  cpufreq: dt: Switch to use dev_err_probe() helper
  cpufreq: qcom: remove unused parameter in function definition
  cpufreq: qcom: fix writes in read-only memory region
  cpufreq: qcom: fix memory leak in error path
  cpufreq: tegra194: Fix module loading
parents 9d6e681d a6991d62

drivers/cpufreq/cpufreq-dt.c

+2 −4
Original line number Diff line number Diff line
@@ -222,10 +222,8 @@ static int dt_cpufreq_early_init(struct device *dev, int cpu) 
	if (reg_name[0]) {

		priv->opp_token = dev_pm_opp_set_regulators(cpu_dev, reg_name);

		if (priv->opp_token < 0) {

			ret = priv->opp_token;

			if (ret != -EPROBE_DEFER)

				dev_err(cpu_dev, "failed to set regulators: %d\n",

					ret);

			ret = dev_err_probe(cpu_dev, priv->opp_token,

					    "failed to set regulators\n");

			goto free_cpumask;

		}

	}

drivers/cpufreq/imx6q-cpufreq.c

+1 −3
Original line number Diff line number Diff line
@@ -396,9 +396,7 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) 
		ret = imx6q_opp_check_speed_grading(cpu_dev);

	}

	if (ret) {

		if (ret != -EPROBE_DEFER)

			dev_err(cpu_dev, "failed to read ocotp: %d\n",

				ret);

		dev_err_probe(cpu_dev, ret, "failed to read ocotp\n");

		goto out_free_opp;

	}

drivers/cpufreq/qcom-cpufreq-nvmem.c

+13 −12
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static struct platform_device *cpufreq_dt_pdev, *cpufreq_pdev; 


static void get_krait_bin_format_a(struct device *cpu_dev,

					  int *speed, int *pvs, int *pvs_ver,

					  struct nvmem_cell *pvs_nvmem, u8 *buf)

					  u8 *buf)

{

	u32 pte_efuse;
@@ -95,7 +95,7 @@ static void get_krait_bin_format_a(struct device *cpu_dev, 


static void get_krait_bin_format_b(struct device *cpu_dev,

					  int *speed, int *pvs, int *pvs_ver,

					  struct nvmem_cell *pvs_nvmem, u8 *buf)

					  u8 *buf)

{

	u32 pte_efuse, redundant_sel;
@@ -213,6 +213,7 @@ static int qcom_cpufreq_krait_name_version(struct device *cpu_dev, 
	int speed = 0, pvs = 0, pvs_ver = 0;

	u8 *speedbin;

	size_t len;

	int ret = 0;



	speedbin = nvmem_cell_read(speedbin_nvmem, &len);
@@ -222,15 +223,16 @@ static int qcom_cpufreq_krait_name_version(struct device *cpu_dev, 
	switch (len) {

	case 4:

		get_krait_bin_format_a(cpu_dev, &speed, &pvs, &pvs_ver,

				       speedbin_nvmem, speedbin);

				       speedbin);

		break;

	case 8:

		get_krait_bin_format_b(cpu_dev, &speed, &pvs, &pvs_ver,

				       speedbin_nvmem, speedbin);

				       speedbin);

		break;

	default:

		dev_err(cpu_dev, "Unable to read nvmem data. Defaulting to 0!\n");

		return -ENODEV;

		ret = -ENODEV;

		goto len_error;

	}



	snprintf(*pvs_name, sizeof("speedXX-pvsXX-vXX"), "speed%d-pvs%d-v%d",
@@ -238,8 +240,9 @@ static int qcom_cpufreq_krait_name_version(struct device *cpu_dev, 


	drv->versions = (1 << speed);



len_error:

	kfree(speedbin);

	return 0;

	return ret;

}



static const struct qcom_cpufreq_match_data match_data_kryo = {
@@ -262,7 +265,8 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) 
	struct nvmem_cell *speedbin_nvmem;

	struct device_node *np;

	struct device *cpu_dev;

	char *pvs_name = "speedXX-pvsXX-vXX";

	char pvs_name_buffer[] = "speedXX-pvsXX-vXX";

	char *pvs_name = pvs_name_buffer;

	unsigned cpu;

	const struct of_device_id *match;

	int ret;
@@ -295,11 +299,8 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) 
	if (drv->data->get_version) {

		speedbin_nvmem = of_nvmem_cell_get(np, NULL);

		if (IS_ERR(speedbin_nvmem)) {

			if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER)

				dev_err(cpu_dev,

					"Could not get nvmem cell: %ld\n",

					PTR_ERR(speedbin_nvmem));

			ret = PTR_ERR(speedbin_nvmem);

			ret = dev_err_probe(cpu_dev, PTR_ERR(speedbin_nvmem),

					    "Could not get nvmem cell\n");

			goto free_drv;

		}

drivers/cpufreq/sun50i-cpufreq-nvmem.c

+3 −6
Original line number Diff line number Diff line
@@ -56,12 +56,9 @@ static int sun50i_cpufreq_get_efuse(u32 *versions) 


	speedbin_nvmem = of_nvmem_cell_get(np, NULL);

	of_node_put(np);

	if (IS_ERR(speedbin_nvmem)) {

		if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER)

			pr_err("Could not get nvmem cell: %ld\n",

			       PTR_ERR(speedbin_nvmem));

		return PTR_ERR(speedbin_nvmem);

	}

	if (IS_ERR(speedbin_nvmem))

		return dev_err_probe(cpu_dev, PTR_ERR(speedbin_nvmem),

				     "Could not get nvmem cell\n");



	speedbin = nvmem_cell_read(speedbin_nvmem, &len);

	nvmem_cell_put(speedbin_nvmem);

drivers/cpufreq/tegra194-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -589,6 +589,7 @@ static const struct of_device_id tegra194_cpufreq_of_match[] = { 
	{ .compatible = "nvidia,tegra239-ccplex-cluster", .data = &tegra239_cpufreq_soc },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, tegra194_cpufreq_of_match);



static struct platform_driver tegra194_ccplex_driver = {

	.driver = {