| Message ID | 20250127-msm8226-modem-v3-4-67e968787eef@lucaweiss.eu (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Modem support for MSM8226 | expand |
On Mon, Jan 27, 2025 at 11:45:36PM +0100, Luca Weiss wrote: > For example MSM8974 has mx voltage rail exposed as regulator and only cx > voltage rail is exposed as power domain. This power domain (cx) is > attached internally in power domain and cannot be attached in this driver. > > Fixes: 8750cf392394 ("remoteproc: qcom_q6v5_mss: Allow replacing regulators with power domains") > Co-developed-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> > Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> > Signed-off-by: Luca Weiss <luca@lucaweiss.eu> Reviewed-by: Stephan Gerhold <stephan.gerhold@linaro.org> > --- > drivers/remoteproc/qcom_q6v5_mss.c | 20 +++++++++++++++++--- > 1 file changed, 17 insertions(+), 3 deletions(-) > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c > index e78bd986dc3f256effce4470222c0a5faeea86ec..0e1b0934ceedd13d5790b798afc95d68a8314c75 100644 > --- a/drivers/remoteproc/qcom_q6v5_mss.c > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > @@ -1831,6 +1831,13 @@ static int q6v5_pds_attach(struct device *dev, struct device **devs, > while (pd_names[num_pds]) > num_pds++; > > + /* Handle single power domain */ > + if (num_pds == 1 && dev->pm_domain) { > + devs[0] = dev; > + pm_runtime_enable(dev); > + return 1; > + } > + > for (i = 0; i < num_pds; i++) { > devs[i] = dev_pm_domain_attach_by_name(dev, pd_names[i]); > if (IS_ERR_OR_NULL(devs[i])) { > @@ -1851,8 +1858,15 @@ static int q6v5_pds_attach(struct device *dev, struct device **devs, > static void q6v5_pds_detach(struct q6v5 *qproc, struct device **pds, > size_t pd_count) > { > + struct device *dev = qproc->dev; > int i; > > + /* Handle single power domain */ > + if (pd_count == 1 && dev->pm_domain) { > + pm_runtime_disable(dev); > + return; > + } > + > for (i = 0; i < pd_count; i++) > dev_pm_domain_detach(pds[i], false); > } > @@ -2449,13 +2463,13 @@ static const struct rproc_hexagon_res msm8974_mss = { > .supply = "pll", > .uA = 100000, > }, > - {} > - }, > - .fallback_proxy_supply = (struct qcom_mss_reg_res[]) { > { > .supply = "mx", > .uV = 1050000, > }, > + {} > + }, > + .fallback_proxy_supply = (struct qcom_mss_reg_res[]) { > { > .supply = "cx", > .uA = 100000, > > -- > 2.48.1 >
On 27.01.2025 11:45 PM, Luca Weiss wrote: > For example MSM8974 has mx voltage rail exposed as regulator and only cx > voltage rail is exposed as power domain. This power domain (cx) is > attached internally in power domain and cannot be attached in this driver. > > Fixes: 8750cf392394 ("remoteproc: qcom_q6v5_mss: Allow replacing regulators with power domains") > Co-developed-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> > Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> > Signed-off-by: Luca Weiss <luca@lucaweiss.eu> > --- > drivers/remoteproc/qcom_q6v5_mss.c | 20 +++++++++++++++++--- > 1 file changed, 17 insertions(+), 3 deletions(-) > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c > index e78bd986dc3f256effce4470222c0a5faeea86ec..0e1b0934ceedd13d5790b798afc95d68a8314c75 100644 > --- a/drivers/remoteproc/qcom_q6v5_mss.c > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > @@ -1831,6 +1831,13 @@ static int q6v5_pds_attach(struct device *dev, struct device **devs, > while (pd_names[num_pds]) > num_pds++; > > + /* Handle single power domain */ > + if (num_pds == 1 && dev->pm_domain) { > + devs[0] = dev; > + pm_runtime_enable(dev); This call can fail Konrad
On Tue, Jan 28, 2025 at 11:45:51AM +0100, Konrad Dybcio wrote: > On 27.01.2025 11:45 PM, Luca Weiss wrote: > > For example MSM8974 has mx voltage rail exposed as regulator and only cx > > voltage rail is exposed as power domain. This power domain (cx) is > > attached internally in power domain and cannot be attached in this driver. > > > > Fixes: 8750cf392394 ("remoteproc: qcom_q6v5_mss: Allow replacing regulators with power domains") > > Co-developed-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> > > Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> > > Signed-off-by: Luca Weiss <luca@lucaweiss.eu> > > --- > > drivers/remoteproc/qcom_q6v5_mss.c | 20 +++++++++++++++++--- > > 1 file changed, 17 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c > > index e78bd986dc3f256effce4470222c0a5faeea86ec..0e1b0934ceedd13d5790b798afc95d68a8314c75 100644 > > --- a/drivers/remoteproc/qcom_q6v5_mss.c > > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > > @@ -1831,6 +1831,13 @@ static int q6v5_pds_attach(struct device *dev, struct device **devs, > > while (pd_names[num_pds]) > > num_pds++; > > > > + /* Handle single power domain */ > > + if (num_pds == 1 && dev->pm_domain) { > > + devs[0] = dev; > > + pm_runtime_enable(dev); > > This call can fail > It returns void though? :D void pm_runtime_enable(struct device *dev); Stephan
On 28.01.2025 11:55 AM, Stephan Gerhold wrote: > On Tue, Jan 28, 2025 at 11:45:51AM +0100, Konrad Dybcio wrote: >> On 27.01.2025 11:45 PM, Luca Weiss wrote: >>> For example MSM8974 has mx voltage rail exposed as regulator and only cx >>> voltage rail is exposed as power domain. This power domain (cx) is >>> attached internally in power domain and cannot be attached in this driver. >>> >>> Fixes: 8750cf392394 ("remoteproc: qcom_q6v5_mss: Allow replacing regulators with power domains") >>> Co-developed-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> >>> Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> >>> Signed-off-by: Luca Weiss <luca@lucaweiss.eu> >>> --- >>> drivers/remoteproc/qcom_q6v5_mss.c | 20 +++++++++++++++++--- >>> 1 file changed, 17 insertions(+), 3 deletions(-) >>> >>> diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c >>> index e78bd986dc3f256effce4470222c0a5faeea86ec..0e1b0934ceedd13d5790b798afc95d68a8314c75 100644 >>> --- a/drivers/remoteproc/qcom_q6v5_mss.c >>> +++ b/drivers/remoteproc/qcom_q6v5_mss.c >>> @@ -1831,6 +1831,13 @@ static int q6v5_pds_attach(struct device *dev, struct device **devs, >>> while (pd_names[num_pds]) >>> num_pds++; >>> >>> + /* Handle single power domain */ >>> + if (num_pds == 1 && dev->pm_domain) { >>> + devs[0] = dev; >>> + pm_runtime_enable(dev); >> >> This call can fail >> > > It returns void though? :D > > void pm_runtime_enable(struct device *dev); *wipes glasses very hard* oh.. Konrad
diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index e78bd986dc3f256effce4470222c0a5faeea86ec..0e1b0934ceedd13d5790b798afc95d68a8314c75 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -1831,6 +1831,13 @@ static int q6v5_pds_attach(struct device *dev, struct device **devs, while (pd_names[num_pds]) num_pds++; + /* Handle single power domain */ + if (num_pds == 1 && dev->pm_domain) { + devs[0] = dev; + pm_runtime_enable(dev); + return 1; + } + for (i = 0; i < num_pds; i++) { devs[i] = dev_pm_domain_attach_by_name(dev, pd_names[i]); if (IS_ERR_OR_NULL(devs[i])) { @@ -1851,8 +1858,15 @@ static int q6v5_pds_attach(struct device *dev, struct device **devs, static void q6v5_pds_detach(struct q6v5 *qproc, struct device **pds, size_t pd_count) { + struct device *dev = qproc->dev; int i; + /* Handle single power domain */ + if (pd_count == 1 && dev->pm_domain) { + pm_runtime_disable(dev); + return; + } + for (i = 0; i < pd_count; i++) dev_pm_domain_detach(pds[i], false); } @@ -2449,13 +2463,13 @@ static const struct rproc_hexagon_res msm8974_mss = { .supply = "pll", .uA = 100000, }, - {} - }, - .fallback_proxy_supply = (struct qcom_mss_reg_res[]) { { .supply = "mx", .uV = 1050000, }, + {} + }, + .fallback_proxy_supply = (struct qcom_mss_reg_res[]) { { .supply = "cx", .uA = 100000,
For example MSM8974 has mx voltage rail exposed as regulator and only cx voltage rail is exposed as power domain. This power domain (cx) is attached internally in power domain and cannot be attached in this driver. Fixes: 8750cf392394 ("remoteproc: qcom_q6v5_mss: Allow replacing regulators with power domains") Co-developed-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> Signed-off-by: Luca Weiss <luca@lucaweiss.eu> --- drivers/remoteproc/qcom_q6v5_mss.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)