Merge tag 'cpufreq-arm-updates-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm

Pull CPUFreq Arm updates for 7.3 from Viresh Kumar: "- Minor fixes / cleanups in cpufreq drivers (Dan Carpenter, Guru Das Srinagesh, Haoxiang Li, Karl Mehltretter, Sasha Finkelstein, and Pan Chuang). - Fix cpufreq table creation and bios_limits() callback in the Rust bindings (Priya Bala Govindasamy). - Add IPQ5210 support to qcom-nvmem driver (Varadarajan Narayanan)." * tag 'cpufreq-arm-updates-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm: cpufreq: imx6q: fix out-of-bounds write when probed more than once cpufreq: imx6q: fix devres accumulation across driver rebind rust: cpufreq: Fix temporary write in Registration::bios_limit_callback rust: cpufreq: Add CPUFREQ_TABLE_END as last table entry in TableBuilder::to_table cpufreq: apple-soc: Calculate frequency as a 64-bit value cpufreq: spear: Fix an IS_ERR() vs NULL bug in spear1340_set_cpu_rate() cpufreq: brcmstb-avs: Remove redundant dev_err() rust: rcpufreq_dt: use vertical import style cpufreq: apple-soc: Fix OPP table cleanup cpufreq: qcom-nvmem: Add IPQ5210 support

Rafael J. Wysocki committed 3 months ago

Commit f4fa4b72 parents eb49643 8c3afcf8 files · +58 −41Browse files

Unified · Split

8 files

drivers/cpufreq/apple-soc-cpufreq.c +15 −23
drivers/cpufreq/brcmstb-avs-cpufreq.c +1 −4
drivers/cpufreq/cpufreq-dt-platdev.c +1 −0
drivers/cpufreq/imx6q-cpufreq.c +4 −2
drivers/cpufreq/qcom-cpufreq-nvmem.c +8 −0
drivers/cpufreq/rcpufreq_dt.rs +10 −3
drivers/cpufreq/spear-cpufreq.c +2 −2
rust/kernel/cpufreq.rs +17 −7

drivers/cpufreq/apple-soc-cpufreq.c+15−23

 		return -ENODEV;
 	}
-	ret = dev_pm_opp_of_add_table(cpu_dev);
+	priv = kzalloc_obj(*priv);
-	if (ret < 0) {
+	if (!priv)
-		dev_err(cpu_dev, "%s: failed to add OPP table: %d\n", __func__, ret);
+		return -ENOMEM;
-		return ret;
-	}
 	ret = apple_soc_cpufreq_find_cluster(policy, &reg_base, &info);
 	if (ret) {
 		dev_err(cpu_dev, "%s: failed to get cluster info: %d\n", __func__, ret);
-		return ret;
+		goto out_free_priv;
 	}
-	ret = dev_pm_opp_set_sharing_cpus(cpu_dev, policy->cpus);
+	ret = dev_pm_opp_of_cpumask_add_table(policy->cpus);
-	if (ret) {
+	if (ret < 0) {
-		dev_err(cpu_dev, "%s: failed to mark OPPs as shared: %d\n", __func__, ret);
+		dev_err(cpu_dev, "%s: failed to add OPP table: %d\n", __func__, ret);
 		goto out_iounmap;
 	}
 	if (ret <= 0) {
 		dev_dbg(cpu_dev, "OPP table is not ready, deferring probe\n");
 		ret = -EPROBE_DEFER;
-		goto out_free_opp;
+		goto out_free_table;
-	}
-	priv = kzalloc_obj(*priv);
-	if (!priv) {
-		ret = -ENOMEM;
-		goto out_free_opp;
 	}
 	ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table);
 	if (ret) {
 		dev_err(cpu_dev, "failed to init cpufreq table: %d\n", ret);
-		goto out_free_priv;
+		goto out_free_table;
 	}
 	/* Get OPP levels (p-state indexes) and stash them in driver_data */
 	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-		unsigned long rate = freq_table[i].frequency * 1000 + 999;
+		unsigned long rate = freq_table[i].frequency * 1000UL + 999;
 		struct dev_pm_opp *opp = dev_pm_opp_find_freq_floor(cpu_dev, &rate);
 		if (IS_ERR(opp)) {
 out_free_cpufreq_table:
 	dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table);
-out_free_priv:
+out_free_table:
-	kfree(priv);
+	dev_pm_opp_of_cpumask_remove_table(policy->cpus);
-out_free_opp:
-	dev_pm_opp_remove_all_dynamic(cpu_dev);
 out_iounmap:
 	iounmap(reg_base);
+out_free_priv:
+	kfree(priv);
 	return ret;
 }
 	struct apple_cpu_priv *priv = policy->driver_data;
 	dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
-	dev_pm_opp_remove_all_dynamic(priv->cpu_dev);
+	dev_pm_opp_of_cpumask_remove_table(policy->cpus);
 	iounmap(priv->reg_base);
 	kfree(priv);
 }

drivers/cpufreq/brcmstb-avs-cpufreq.c+1−4

 	ret = devm_request_irq(dev, priv->host_irq, irq_handler,
 			       IRQF_TRIGGER_RISING,
 			       BRCM_AVS_HOST_INTR, priv);
-	if (ret && priv->host_irq >= 0) {
+	if (ret && priv->host_irq >= 0)
-		dev_err(dev, "IRQ request failed: %s (%d) -- %d\n",
-			BRCM_AVS_HOST_INTR, priv->host_irq, ret);
 		goto unmap_intr_base;
-	}
 	if (brcm_avs_is_firmware_loaded(priv))
 		return 0;

drivers/cpufreq/cpufreq-dt-platdev.c+1−0

@@ -200,6 +200,7 @@ static const struct of_device_id blocklist[] __initconst = { · 199 unmodified lines
200	{ .compatible = "ti,am62l3", },	200	{ .compatible = "ti,am62l3", },
201	{ .compatible = "ti,am62p5", },	201	{ .compatible = "ti,am62p5", },
202		202
		203	{ .compatible = "qcom,ipq5210", },
203	{ .compatible = "qcom,ipq5332", },	204	{ .compatible = "qcom,ipq5332", },
204	{ .compatible = "qcom,ipq5424", },	205	{ .compatible = "qcom,ipq5424", },
205	{ .compatible = "qcom,ipq6018", },	206	{ .compatible = "qcom,ipq6018", },

drivers/cpufreq/imx6q-cpufreq.c+4−2

 static unsigned int transition_latency;
 static u32 *imx6_soc_volt;
-static u32 soc_opp_count;
 static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)
 {
 	const struct property *prop;
 	const __be32 *val;
 	u32 nr, i, j;
+	u32 soc_opp_count = 0;
 	cpu_dev = get_cpu_device(0);
 	if (!cpu_dev) {
 	}
 	/* Make imx6_soc_volt array's size same as arm opp number */
-	imx6_soc_volt = devm_kcalloc(cpu_dev, num, sizeof(*imx6_soc_volt),
+	imx6_soc_volt = devm_kcalloc(&pdev->dev, num, sizeof(*imx6_soc_volt),
 				     GFP_KERNEL);
 	if (imx6_soc_volt == NULL) {
 		ret = -ENOMEM;
 	return 0;
 free_freq_table:
+	imx6_soc_volt = NULL;
 	dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table);
 out_free_opp:
 	dev_pm_opp_of_remove_table(cpu_dev);
 static void imx6q_cpufreq_remove(struct platform_device *pdev)
 {
 	cpufreq_unregister_driver(&imx6q_cpufreq_driver);
+	imx6_soc_volt = NULL;
 	dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table);
 	dev_pm_opp_of_remove_table(cpu_dev);
 	regulator_put(arm_reg);

drivers/cpufreq/qcom-cpufreq-nvmem.c+8−0

 	case QCOM_ID_IPQ9574:
 		drv->versions = 1 << (unsigned int)(*speedbin);
 		break;
+	case QCOM_ID_IPQ5200:
+	case QCOM_ID_IPQ5210:
+	case QCOM_ID_QCF2200:
+	case QCOM_ID_QCF3200:
+	case QCOM_ID_QCF3210:
+		drv->versions = (*speedbin == 0xcd) ? BIT(1) : BIT(0);
+		break;
 	case QCOM_ID_IPQ5424:
 	case QCOM_ID_IPQ5404:
 		drv->versions = (*speedbin == 0x3b) ? BIT(1) : BIT(0);
 	{ .compatible = "qcom,msm8909", .data = &match_data_msm8909 },
 	{ .compatible = "qcom,msm8996", .data = &match_data_kryo },
 	{ .compatible = "qcom,qcs404", .data = &match_data_qcs404 },
+	{ .compatible = "qcom,ipq5210", .data = &match_data_kryo },
 	{ .compatible = "qcom,ipq5332", .data = &match_data_kryo },
 	{ .compatible = "qcom,ipq5424", .data = &match_data_kryo },
 	{ .compatible = "qcom,ipq6018", .data = &match_data_ipq6018 },

drivers/cpufreq/rcpufreq_dt.rs+10−3

 use kernel::{
     clk::Clk,
-    cpu, cpufreq,
+    cpu,
+    cpufreq, //
     cpumask::CpumaskVar,
-    device::{Core, Device},
+    device::{
+        Core,
+        Device, //
+    },
     error::code::*,
     macros::vtable,
-    module_platform_driver, of, opp, platform,
+    module_platform_driver,
+    of,
+    opp,
+    platform, //
     prelude::*,
     str::CString,
     sync::Arc,

drivers/cpufreq/spear-cpufreq.c+2−2

@@ -79,9 +79,9 @@ static int spear1340_set_cpu_rate(struct clk *sys_pclk, unsigned long newfreq) · 78 unmodified lines
79	int ret = 0;	79	int ret = 0;
80		80
81	sys_clk = clk_get_parent(spear_cpufreq.clk);	81	sys_clk = clk_get_parent(spear_cpufreq.clk);
82	if (IS_ERR(sys_clk)) {	82	if (!sys_clk) {
83	pr_err("failed to get cpu's parent (sys) clock\n");	83	pr_err("failed to get cpu's parent (sys) clock\n");
84	return PTR_ERR(sys_clk);	84	return -EINVAL;
85	}	85	}
86		86
87	/* Set the rate of the source clock before changing the parent */	87	/* Set the rate of the source clock before changing the parent */

rust/kernel/cpufreq.rs+17−7

@@ -361,23 +361,28 @@ impl TableBuilder { · 360 unmodified lines
361	}	361	}
362	}	362	}
363		363
364	/// Adds a new entry to the table.	364	/// Adds a raw frequency-table entry.
365	pub fn add(&mut self, freq: Hertz, flags: u32, driver_data: u32) -> Result {	365	fn push(&mut self, frequency: u32, flags: u32, driver_data: u32) -> Result {
366	// Adds the new entry at the end of the vector.	366	// Adds the new entry at the end of the vector.
367	Ok(self.entries.push(	367	Ok(self.entries.push(
368	bindings::cpufreq_frequency_table {	368	bindings::cpufreq_frequency_table {
369	flags,	369	flags,
370	driver_data,	370	driver_data,
371	frequency: freq.as_khz() as u32,	371	frequency,
372	},	372	},
373	GFP_KERNEL,	373	GFP_KERNEL,
374	)?)	374	)?)
375	}	375	}
376		376
		377	/// Adds a new entry to the table.
		378	pub fn add(&mut self, freq: Hertz, flags: u32, driver_data: u32) -> Result {
		379	self.push(freq.as_khz() as u32, flags, driver_data)
		380	}
		381
377	/// Consumes the [`TableBuilder`] and returns [`TableBox`].	382	/// Consumes the [`TableBuilder`] and returns [`TableBox`].
378	pub fn to_table(mut self) -> Result<TableBox> {	383	pub fn to_table(mut self) -> Result<TableBox> {
379	// Add last entry to the table.	384	// Add last entry to the table.
380	self.add(Hertz(c_ulong::MAX), 0, 0)?;	385	self.push(bindings::CPUFREQ_TABLE_END as u32, 0, 0)?;
381		386
382	TableBox::new(self.entries)	387	TableBox::new(self.entries)
383	}	388	}
@@ -823,7 +828,9 @@ pub trait Driver { · 439 unmodified lines
823	}	828	}
824		829
825	/// Driver's `bios_limit` callback.	830	/// Driver's `bios_limit` callback.
826	fn bios_limit(_policy: &mut Policy, _limit: &mut u32) -> Result {	831	///
		832	/// Returns HW/BIOS max frequency limitations for the CPU.
		833	fn bios_limit(_policy: &mut Policy) -> Result<u32> {
827	build_error!(VTABLE_DEFAULT_ERROR)	834	build_error!(VTABLE_DEFAULT_ERROR)
828	}	835	}
829		836
@@ -1359,9 +1366,12 @@ impl<T: Driver> Registration<T> { · 529 unmodified lines
1359		1366
1360	from_result(\|\| {	1367	from_result(\|\| {
1361	let mut policy = PolicyCpu::from_cpu(cpu_id)?;	1368	let mut policy = PolicyCpu::from_cpu(cpu_id)?;
1362		1369	let val = T::bios_limit(&mut policy)?;
1363	// SAFETY: `limit` is guaranteed by the C code to be valid.	1370	// SAFETY: `limit` is guaranteed by the C code to be valid.
1364	T::bios_limit(&mut policy, &mut (unsafe { *limit })).map(\|()\| 0)	1371	unsafe {
		1372	*limit = val;
		1373	}
		1374	Ok(0)
1365	})	1375	})
1366	}	1376	}
1367		1377

Merge tag 'cpufreq-arm-updates-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code