* [PATCH v2 0/2] Clean up MSM8939 interconnect driver
@ 2021-02-05 1:52 Benjamin Li
2021-02-05 1:52 ` [PATCH v2 1/2] interconnect: qcom: icc-rpm: record slave RPM id in error log Benjamin Li
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Benjamin Li @ 2021-02-05 1:52 UTC (permalink / raw)
To: Georgi Djakov, Jun Nie
Cc: kernel, Benjamin Li, Andy Gross, Bjorn Andersson, Georgi Djakov,
linux-arm-msm, linux-pm, linux-kernel
Following up on a review comment on commit 6c6fe5d3dc5e ("interconnect: qcom:
Add MSM8939 interconnect provider driver") to clean up some log pollution.
This is based on icc-next (which appears to contain a refactor commonizing
functions into icc-rpm.c).
v2:
- Update commit message to add a full explanation, rather than referencing a
previous commit.
Benjamin Li (2):
interconnect: qcom: icc-rpm: record slave RPM id in error log
interconnect: qcom: msm8939: remove rpm-ids from non-RPM nodes
drivers/interconnect/qcom/icc-rpm.c | 4 ++--
drivers/interconnect/qcom/msm8939.c | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/2] interconnect: qcom: icc-rpm: record slave RPM id in error log
2021-02-05 1:52 [PATCH v2 0/2] Clean up MSM8939 interconnect driver Benjamin Li
@ 2021-02-05 1:52 ` Benjamin Li
2021-02-05 1:52 ` [PATCH v2 2/2] interconnect: qcom: msm8939: remove rpm-ids from non-RPM nodes Benjamin Li
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Benjamin Li @ 2021-02-05 1:52 UTC (permalink / raw)
To: Georgi Djakov, Jun Nie
Cc: kernel, Benjamin Li, Andy Gross, Bjorn Andersson, Georgi Djakov,
linux-arm-msm, linux-pm, linux-kernel
Add slave RPM ID to assist with identifying incorrect RPM config.
Signed-off-by: Benjamin Li <benl@squareup.com>
---
drivers/interconnect/qcom/icc-rpm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c
index cc6095492cbe..54de49ca7808 100644
--- a/drivers/interconnect/qcom/icc-rpm.c
+++ b/drivers/interconnect/qcom/icc-rpm.c
@@ -59,8 +59,8 @@ static int qcom_icc_set(struct icc_node *src, struct icc_node *dst)
qn->slv_rpm_id,
sum_bw);
if (ret) {
- pr_err("qcom_icc_rpm_smd_send slv error %d\n",
- ret);
+ pr_err("qcom_icc_rpm_smd_send slv %d error %d\n",
+ qn->slv_rpm_id, ret);
return ret;
}
}
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] interconnect: qcom: msm8939: remove rpm-ids from non-RPM nodes
2021-02-05 1:52 [PATCH v2 0/2] Clean up MSM8939 interconnect driver Benjamin Li
2021-02-05 1:52 ` [PATCH v2 1/2] interconnect: qcom: icc-rpm: record slave RPM id in error log Benjamin Li
@ 2021-02-05 1:52 ` Benjamin Li
2021-02-05 3:03 ` [PATCH v2 0/2] Clean up MSM8939 interconnect driver Jun Nie
2021-05-26 19:03 ` patchwork-bot+linux-arm-msm
3 siblings, 0 replies; 5+ messages in thread
From: Benjamin Li @ 2021-02-05 1:52 UTC (permalink / raw)
To: Georgi Djakov, Jun Nie
Cc: kernel, Benjamin Li, Andy Gross, Bjorn Andersson, Georgi Djakov,
linux-arm-msm, linux-pm, linux-kernel
Some nodes are incorrectly marked as RPM-controlled (they have RPM
master and slave ids assigned), but are actually controlled by the
application CPU instead. The RPM complains when we send requests for
resources that it can't control. Let's fix this by replacing the IDs,
with the default "-1" in which case no requests are sent.
See commit c497f9322af9 ("interconnect: qcom: msm8916: Remove rpm-ids
from non-RPM nodes") where this was done for msm8916.
Signed-off-by: Benjamin Li <benl@squareup.com>
---
drivers/interconnect/qcom/msm8939.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/interconnect/qcom/msm8939.c b/drivers/interconnect/qcom/msm8939.c
index dfbec30ed149..20f31a1b4192 100644
--- a/drivers/interconnect/qcom/msm8939.c
+++ b/drivers/interconnect/qcom/msm8939.c
@@ -131,7 +131,7 @@ DEFINE_QNODE(mas_pcnoc_sdcc_1, MSM8939_MASTER_SDCC_1, 8, -1, -1, MSM8939_PNOC_IN
DEFINE_QNODE(mas_pcnoc_sdcc_2, MSM8939_MASTER_SDCC_2, 8, -1, -1, MSM8939_PNOC_INT_1);
DEFINE_QNODE(mas_qdss_bam, MSM8939_MASTER_QDSS_BAM, 8, -1, -1, MSM8939_SNOC_QDSS_INT);
DEFINE_QNODE(mas_qdss_etr, MSM8939_MASTER_QDSS_ETR, 8, -1, -1, MSM8939_SNOC_QDSS_INT);
-DEFINE_QNODE(mas_snoc_cfg, MSM8939_MASTER_SNOC_CFG, 4, 20, -1, MSM8939_SLAVE_SRVC_SNOC);
+DEFINE_QNODE(mas_snoc_cfg, MSM8939_MASTER_SNOC_CFG, 4, -1, -1, MSM8939_SLAVE_SRVC_SNOC);
DEFINE_QNODE(mas_spdm, MSM8939_MASTER_SPDM, 4, -1, -1, MSM8939_PNOC_MAS_0);
DEFINE_QNODE(mas_tcu0, MSM8939_MASTER_TCU0, 16, -1, -1, MSM8939_SLAVE_EBI_CH0, MSM8939_BIMC_SNOC_MAS, MSM8939_SLAVE_AMPSS_L2);
DEFINE_QNODE(mas_usb_hs1, MSM8939_MASTER_USB_HS1, 4, -1, -1, MSM8939_PNOC_MAS_1);
@@ -156,14 +156,14 @@ DEFINE_QNODE(pcnoc_snoc_mas, MSM8939_PNOC_SNOC_MAS, 8, 29, -1, MSM8939_PNOC_SNOC
DEFINE_QNODE(pcnoc_snoc_slv, MSM8939_PNOC_SNOC_SLV, 8, -1, 45, MSM8939_SNOC_INT_0, MSM8939_SNOC_INT_BIMC, MSM8939_SNOC_INT_1);
DEFINE_QNODE(qdss_int, MSM8939_SNOC_QDSS_INT, 8, -1, -1, MSM8939_SNOC_INT_0, MSM8939_SNOC_INT_BIMC);
DEFINE_QNODE(slv_apps_l2, MSM8939_SLAVE_AMPSS_L2, 16, -1, -1, 0);
-DEFINE_QNODE(slv_apss, MSM8939_SLAVE_APSS, 4, -1, 20, 0);
+DEFINE_QNODE(slv_apss, MSM8939_SLAVE_APSS, 4, -1, -1, 0);
DEFINE_QNODE(slv_audio, MSM8939_SLAVE_LPASS, 4, -1, -1, 0);
DEFINE_QNODE(slv_bimc_cfg, MSM8939_SLAVE_BIMC_CFG, 4, -1, -1, 0);
DEFINE_QNODE(slv_blsp_1, MSM8939_SLAVE_BLSP_1, 4, -1, -1, 0);
DEFINE_QNODE(slv_boot_rom, MSM8939_SLAVE_BOOT_ROM, 4, -1, -1, 0);
DEFINE_QNODE(slv_camera_cfg, MSM8939_SLAVE_CAMERA_CFG, 4, -1, -1, 0);
-DEFINE_QNODE(slv_cats_0, MSM8939_SLAVE_CATS_128, 16, -1, 106, 0);
-DEFINE_QNODE(slv_cats_1, MSM8939_SLAVE_OCMEM_64, 8, -1, 107, 0);
+DEFINE_QNODE(slv_cats_0, MSM8939_SLAVE_CATS_128, 16, -1, -1, 0);
+DEFINE_QNODE(slv_cats_1, MSM8939_SLAVE_OCMEM_64, 8, -1, -1, 0);
DEFINE_QNODE(slv_clk_ctl, MSM8939_SLAVE_CLK_CTL, 4, -1, -1, 0);
DEFINE_QNODE(slv_crypto_0_cfg, MSM8939_SLAVE_CRYPTO_0_CFG, 4, -1, -1, 0);
DEFINE_QNODE(slv_dehr_cfg, MSM8939_SLAVE_DEHR_CFG, 4, -1, -1, 0);
@@ -187,20 +187,20 @@ DEFINE_QNODE(slv_sdcc_2, MSM8939_SLAVE_SDCC_2, 4, -1, -1, 0);
DEFINE_QNODE(slv_security, MSM8939_SLAVE_SECURITY, 4, -1, -1, 0);
DEFINE_QNODE(slv_snoc_cfg, MSM8939_SLAVE_SNOC_CFG, 4, -1, -1, 0);
DEFINE_QNODE(slv_spdm, MSM8939_SLAVE_SPDM, 4, -1, -1, 0);
-DEFINE_QNODE(slv_srvc_snoc, MSM8939_SLAVE_SRVC_SNOC, 8, -1, 29, 0);
+DEFINE_QNODE(slv_srvc_snoc, MSM8939_SLAVE_SRVC_SNOC, 8, -1, -1, 0);
DEFINE_QNODE(slv_tcsr, MSM8939_SLAVE_TCSR, 4, -1, -1, 0);
DEFINE_QNODE(slv_tlmm, MSM8939_SLAVE_TLMM, 4, -1, -1, 0);
DEFINE_QNODE(slv_usb_hs1, MSM8939_SLAVE_USB_HS1, 4, -1, -1, 0);
DEFINE_QNODE(slv_usb_hs2, MSM8939_SLAVE_USB_HS2, 4, -1, -1, 0);
DEFINE_QNODE(slv_venus_cfg, MSM8939_SLAVE_VENUS_CFG, 4, -1, -1, 0);
-DEFINE_QNODE(snoc_bimc_0_mas, MSM8939_SNOC_BIMC_0_MAS, 16, 3, -1, MSM8939_SNOC_BIMC_0_SLV);
-DEFINE_QNODE(snoc_bimc_0_slv, MSM8939_SNOC_BIMC_0_SLV, 16, -1, 24, MSM8939_SLAVE_EBI_CH0);
+DEFINE_QNODE(snoc_bimc_0_mas, MSM8939_SNOC_BIMC_0_MAS, 16, -1, -1, MSM8939_SNOC_BIMC_0_SLV);
+DEFINE_QNODE(snoc_bimc_0_slv, MSM8939_SNOC_BIMC_0_SLV, 16, -1, -1, MSM8939_SLAVE_EBI_CH0);
DEFINE_QNODE(snoc_bimc_1_mas, MSM8939_SNOC_BIMC_1_MAS, 16, 76, -1, MSM8939_SNOC_BIMC_1_SLV);
DEFINE_QNODE(snoc_bimc_1_slv, MSM8939_SNOC_BIMC_1_SLV, 16, -1, 104, MSM8939_SLAVE_EBI_CH0);
DEFINE_QNODE(snoc_bimc_2_mas, MSM8939_SNOC_BIMC_2_MAS, 16, -1, -1, MSM8939_SNOC_BIMC_2_SLV);
DEFINE_QNODE(snoc_bimc_2_slv, MSM8939_SNOC_BIMC_2_SLV, 16, -1, -1, MSM8939_SLAVE_EBI_CH0);
DEFINE_QNODE(snoc_int_0, MSM8939_SNOC_INT_0, 8, 99, 130, MSM8939_SLAVE_QDSS_STM, MSM8939_SLAVE_IMEM, MSM8939_SNOC_PNOC_MAS);
-DEFINE_QNODE(snoc_int_1, MSM8939_SNOC_INT_1, 8, 100, 131, MSM8939_SLAVE_APSS, MSM8939_SLAVE_CATS_128, MSM8939_SLAVE_OCMEM_64);
+DEFINE_QNODE(snoc_int_1, MSM8939_SNOC_INT_1, 8, -1, -1, MSM8939_SLAVE_APSS, MSM8939_SLAVE_CATS_128, MSM8939_SLAVE_OCMEM_64);
DEFINE_QNODE(snoc_int_bimc, MSM8939_SNOC_INT_BIMC, 8, 101, 132, MSM8939_SNOC_BIMC_1_MAS);
DEFINE_QNODE(snoc_pcnoc_mas, MSM8939_SNOC_PNOC_MAS, 8, -1, -1, MSM8939_SNOC_PNOC_SLV);
DEFINE_QNODE(snoc_pcnoc_slv, MSM8939_SNOC_PNOC_SLV, 8, -1, -1, MSM8939_PNOC_INT_0);
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 0/2] Clean up MSM8939 interconnect driver
2021-02-05 1:52 [PATCH v2 0/2] Clean up MSM8939 interconnect driver Benjamin Li
2021-02-05 1:52 ` [PATCH v2 1/2] interconnect: qcom: icc-rpm: record slave RPM id in error log Benjamin Li
2021-02-05 1:52 ` [PATCH v2 2/2] interconnect: qcom: msm8939: remove rpm-ids from non-RPM nodes Benjamin Li
@ 2021-02-05 3:03 ` Jun Nie
2021-05-26 19:03 ` patchwork-bot+linux-arm-msm
3 siblings, 0 replies; 5+ messages in thread
From: Jun Nie @ 2021-02-05 3:03 UTC (permalink / raw)
To: Benjamin Li
Cc: Georgi Djakov, kernel, Andy Gross, Bjorn Andersson,
Georgi Djakov, linux-arm-msm, linux-pm,
Linux Kernel Mailing List
Benjamin Li <benl@squareup.com> 于2021年2月5日周五 上午9:52写道:
>
> Following up on a review comment on commit 6c6fe5d3dc5e ("interconnect: qcom:
> Add MSM8939 interconnect provider driver") to clean up some log pollution.
>
> This is based on icc-next (which appears to contain a refactor commonizing
> functions into icc-rpm.c).
>
> v2:
> - Update commit message to add a full explanation, rather than referencing a
> previous commit.
>
> Benjamin Li (2):
> interconnect: qcom: icc-rpm: record slave RPM id in error log
> interconnect: qcom: msm8939: remove rpm-ids from non-RPM nodes
>
> drivers/interconnect/qcom/icc-rpm.c | 4 ++--
> drivers/interconnect/qcom/msm8939.c | 16 ++++++++--------
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> --
> 2.17.1
>
For 2 patches:
Reviewed-by: Jun Nie <jun.nie@linaro.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 0/2] Clean up MSM8939 interconnect driver
2021-02-05 1:52 [PATCH v2 0/2] Clean up MSM8939 interconnect driver Benjamin Li
` (2 preceding siblings ...)
2021-02-05 3:03 ` [PATCH v2 0/2] Clean up MSM8939 interconnect driver Jun Nie
@ 2021-05-26 19:03 ` patchwork-bot+linux-arm-msm
3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+linux-arm-msm @ 2021-05-26 19:03 UTC (permalink / raw)
To: Benjamin Li; +Cc: linux-arm-msm
Hello:
This series was applied to qcom/linux.git (refs/heads/for-next):
On Thu, 4 Feb 2021 17:52:03 -0800 you wrote:
> Following up on a review comment on commit 6c6fe5d3dc5e ("interconnect: qcom:
> Add MSM8939 interconnect provider driver") to clean up some log pollution.
>
> This is based on icc-next (which appears to contain a refactor commonizing
> functions into icc-rpm.c).
>
> v2:
> - Update commit message to add a full explanation, rather than referencing a
> previous commit.
>
> [...]
Here is the summary with links:
- [v2,1/2] interconnect: qcom: icc-rpm: record slave RPM id in error log
https://git.kernel.org/qcom/c/9b4ab638c49e
- [v2,2/2] interconnect: qcom: msm8939: remove rpm-ids from non-RPM nodes
https://git.kernel.org/qcom/c/7c911f9de7ab
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-26 19:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-05 1:52 [PATCH v2 0/2] Clean up MSM8939 interconnect driver Benjamin Li
2021-02-05 1:52 ` [PATCH v2 1/2] interconnect: qcom: icc-rpm: record slave RPM id in error log Benjamin Li
2021-02-05 1:52 ` [PATCH v2 2/2] interconnect: qcom: msm8939: remove rpm-ids from non-RPM nodes Benjamin Li
2021-02-05 3:03 ` [PATCH v2 0/2] Clean up MSM8939 interconnect driver Jun Nie
2021-05-26 19:03 ` patchwork-bot+linux-arm-msm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).