Clean up MSM8939 interconnect driver
Subsystems (2)
cover Clean up MSM8939 interconnect driver
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).
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(-)
Signature · 1 line
2.17.1
PATCH 1/2 interconnect: qcom: icc-rpm: record slave RPM id in error log
Add slave RPM ID to assist with identifying incorrect RPM config.
Signed-off-by Benjamin Li <[email protected]>
--- drivers/interconnect/qcom/icc-rpm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/interconnect/qcom/icc-rpm.c +2 -2
@@ -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; } }
Signature · 1 line
2.17.1
PATCH 2/2 interconnect: qcom: msm8939: remove rpm-ids from non-RPM nodes
In reply to Benjamin LiChanges corresponding to commit c497f9322af9 ("interconnect: qcom: msm8916:
Remove rpm-ids from non-RPM nodes") to remove this log spam on 8939:
[ 1.901376] qcom_icc_rpm_smd_send slv 24 error -6 [ 2.005977] qcom_icc_rpm_smd_send mas 20 error -6 [ 2.010250] qcom_icc_rpm_smd_send slv 20 error -6 [ 2.014684] qcom_icc_rpm_smd_send slv 106 error -6 [ 2.019338] qcom_icc_rpm_smd_send slv 107 error -6 [ 2.024615] qcom_icc_rpm_smd_send slv 29 error -6 [ 2.028782] qcom_icc_rpm_smd_send mas 3 error -6 [ 2.034657] qcom_icc_rpm_smd_send mas 100 error -6
(plus another slv 131 that's hidden by the mas 100 failure)
Signed-off-by Benjamin Li <[email protected]>
--- drivers/interconnect/qcom/msm8939.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/interconnect/qcom/msm8939.c +8 -8
@@ -131,7 +131,7 @@ DEFINE_QNODE(mas_pcnoc_sdcc_1, MSM8939_MASTER_SDCC_1, 8, -1, -1, MSM8939_PNOC_INDEFINE_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_SNOCDEFINE_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 );
Signature · 1 line
2.17.1
Re: [PATCH 2/2] interconnect: qcom: msm8939: remove rpm-ids from non-RPM nodes
Quoted 12 lines · 'Benjamin Li' via square <[email protected]> 于2021年2月4日周四 上午12:34写道：
Changes corresponding to commit
c497f9322af9("interconnect: qcom: msm8916:
Remove rpm-ids from non-RPM nodes") to remove this log spam on 8939:[ 1.901376] qcom_icc_rpm_smd_send slv 24 error -6 [ 2.005977] qcom_icc_rpm_smd_send mas 20 error -6 [ 2.010250] qcom_icc_rpm_smd_send slv 20 error -6 [ 2.014684] qcom_icc_rpm_smd_send slv 106 error -6 [ 2.019338] qcom_icc_rpm_smd_send slv 107 error -6 [ 2.024615] qcom_icc_rpm_smd_send slv 29 error -6 [ 2.028782] qcom_icc_rpm_smd_send mas 3 error -6 [ 2.034657] qcom_icc_rpm_smd_send mas 100 error -6
Quoted 4 lines
(plus another slv 131 that's hidden by the mas 100 failure)
Signed-off-by Benjamin Li <[email protected]>---
Ben,
Suggest to add comments to address the issue you fixed as commit c497f9322af does, at least a short version. So that people do not have to look into c497f9322af again.
Regards,
Jun