Merge back new PM domains material for v5.15. (bc0d0b1d) · Commits · EulixOS / Software / Kernel

arch/arm64/boot/dts/qcom/sc7180.dtsi

+24 −0

Original line number	Diff line number	Diff line
		@@ -786,6 +786,8 @@
		<&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
		interconnect-names = "qup-core", "qup-config",
		"qup-memory";
		power-domains = <&rpmhpd SC7180_CX>;
		required-opps = <&rpmhpd_opp_low_svs>;
		status = "disabled";
		};

		@@ -838,6 +840,8 @@
		<&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
		interconnect-names = "qup-core", "qup-config",
		"qup-memory";
		power-domains = <&rpmhpd SC7180_CX>;
		required-opps = <&rpmhpd_opp_low_svs>;
		status = "disabled";
		};

		@@ -890,6 +894,8 @@
		<&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
		interconnect-names = "qup-core", "qup-config",
		"qup-memory";
		power-domains = <&rpmhpd SC7180_CX>;
		required-opps = <&rpmhpd_opp_low_svs>;
		status = "disabled";
		};

		@@ -924,6 +930,8 @@
		<&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
		interconnect-names = "qup-core", "qup-config",
		"qup-memory";
		power-domains = <&rpmhpd SC7180_CX>;
		required-opps = <&rpmhpd_opp_low_svs>;
		status = "disabled";
		};

		@@ -976,6 +984,8 @@
		<&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
		interconnect-names = "qup-core", "qup-config",
		"qup-memory";
		power-domains = <&rpmhpd SC7180_CX>;
		required-opps = <&rpmhpd_opp_low_svs>;
		status = "disabled";
		};

		@@ -1010,6 +1020,8 @@
		<&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
		interconnect-names = "qup-core", "qup-config",
		"qup-memory";
		power-domains = <&rpmhpd SC7180_CX>;
		required-opps = <&rpmhpd_opp_low_svs>;
		status = "disabled";
		};

		@@ -1075,6 +1087,8 @@
		<&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
		interconnect-names = "qup-core", "qup-config",
		"qup-memory";
		power-domains = <&rpmhpd SC7180_CX>;
		required-opps = <&rpmhpd_opp_low_svs>;
		status = "disabled";
		};

		@@ -1127,6 +1141,8 @@
		<&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
		interconnect-names = "qup-core", "qup-config",
		"qup-memory";
		power-domains = <&rpmhpd SC7180_CX>;
		required-opps = <&rpmhpd_opp_low_svs>;
		status = "disabled";
		};

		@@ -1161,6 +1177,8 @@
		<&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
		interconnect-names = "qup-core", "qup-config",
		"qup-memory";
		power-domains = <&rpmhpd SC7180_CX>;
		required-opps = <&rpmhpd_opp_low_svs>;
		status = "disabled";
		};

		@@ -1213,6 +1231,8 @@
		<&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
		interconnect-names = "qup-core", "qup-config",
		"qup-memory";
		power-domains = <&rpmhpd SC7180_CX>;
		required-opps = <&rpmhpd_opp_low_svs>;
		status = "disabled";
		};

		@@ -1247,6 +1267,8 @@
		<&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
		interconnect-names = "qup-core", "qup-config",
		"qup-memory";
		power-domains = <&rpmhpd SC7180_CX>;
		required-opps = <&rpmhpd_opp_low_svs>;
		status = "disabled";
		};

		@@ -1299,6 +1321,8 @@
		<&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
		interconnect-names = "qup-core", "qup-config",
		"qup-memory";
		power-domains = <&rpmhpd SC7180_CX>;
		required-opps = <&rpmhpd_opp_low_svs>;
		status = "disabled";
		};

drivers/base/power/domain.c

+28 −2

Original line number	Diff line number	Diff line
		@@ -2604,6 +2604,12 @@ static void genpd_dev_pm_detach(struct device *dev, bool power_off)

		dev_dbg(dev, "removing from PM domain %s\n", pd->name);

		/* Drop the default performance state */
		if (dev_gpd_data(dev)->default_pstate) {
		dev_pm_genpd_set_performance_state(dev, 0);
		dev_gpd_data(dev)->default_pstate = 0;
		}

		for (i = 1; i < GENPD_RETRY_MAX_MS; i <<= 1) {
		ret = genpd_remove_device(pd, dev);
		if (ret != -EAGAIN)
		@@ -2643,6 +2649,7 @@ static int __genpd_dev_pm_attach(struct device dev, struct device base_dev,
		{
		struct of_phandle_args pd_args;
		struct generic_pm_domain *pd;
		int pstate;
		int ret;

		ret = of_parse_phandle_with_args(dev->of_node, "power-domains",
		@@ -2681,10 +2688,29 @@ static int __genpd_dev_pm_attach(struct device dev, struct device base_dev,
		genpd_unlock(pd);
		}

		if (ret)
		if (ret) {
		genpd_remove_device(pd, dev);
		return -EPROBE_DEFER;
		}

		return ret ? -EPROBE_DEFER : 1;
		/* Set the default performance state */
		pstate = of_get_required_opp_performance_state(dev->of_node, index);
		if (pstate < 0 && pstate != -ENODEV && pstate != -EOPNOTSUPP) {
		ret = pstate;
		goto err;
		} else if (pstate > 0) {
		ret = dev_pm_genpd_set_performance_state(dev, pstate);
		if (ret)
		goto err;
		dev_gpd_data(dev)->default_pstate = pstate;
		}
		return 1;

		err:
		dev_err(dev, "failed to set required performance state for power-domain %s: %d\n",
		pd->name, ret);
		genpd_remove_device(pd, dev);
		return ret;
		}

		/**

drivers/opp/of.c

+2 −10

Original line number	Diff line number	Diff line
		@@ -95,15 +95,7 @@ static struct dev_pm_opp _find_opp_of_np(struct opp_table opp_table,
		static struct device_node of_parse_required_opp(struct device_node np,
		int index)
		{
		struct device_node *required_np;

		required_np = of_parse_phandle(np, "required-opps", index);
		if (unlikely(!required_np)) {
		pr_err("%s: Unable to parse required-opps: %pOF, index: %d\n",
		__func__, np, index);
		}

		return required_np;
		return of_parse_phandle(np, "required-opps", index);
		}

		/* The caller must call dev_pm_opp_put_opp_table() after the table is used */
		@@ -1328,7 +1320,7 @@ int of_get_required_opp_performance_state(struct device_node *np, int index)

		required_np = of_parse_required_opp(np, index);
		if (!required_np)
		return -EINVAL;
		return -ENODEV;

		opp_table = _find_table_of_opp_np(required_np);
		if (IS_ERR(opp_table)) {

include/linux/pm_domain.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -198,6 +198,7 @@ struct generic_pm_domain_data {
		struct notifier_block *power_nb;
		int cpu;
		unsigned int performance_state;
		unsigned int default_pstate;
		unsigned int rpm_pstate;
		ktime_t next_wakeup;
		void *data;