interconnect: qcom: qcs404: Mark AP-owned nodes as such

When driver was upstreamed it seems ap_owned nodes were not available,
bring them now.

Signed-off-by: Adam Skladowski <a39.skl@gmail.com>
Link: https://lore.kernel.org/r/20240709102728.15349-6-a39.skl@gmail.com
Signed-off-by: Georgi Djakov <djakov@kernel.org>

diff --git a/drivers/interconnect/qcom/qcs404.c b/drivers/interconnect/qcom/qcs404.c
index 11b49a89c03d14149dd22637f0ad898bb083139e..91b2ccc56a339d8f229c51b0c994e93e636bfed7 100644 (file)
--- a/drivers/interconnect/qcom/qcs404.c
+++ b/drivers/interconnect/qcom/qcs404.c
@@ -101,6 +101,11 @@ static struct qcom_icc_node mas_apps_proc = {
        .buswidth = 8,
        .mas_rpm_id = 0,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_FIXED,
+       .qos.areq_prio = 0,
+       .qos.prio_level = 0,
+       .qos.qos_port = 0,
        .num_links = ARRAY_SIZE(mas_apps_proc_links),
        .links = mas_apps_proc_links,
 };
@@ -116,6 +121,11 @@ static struct qcom_icc_node mas_oxili = {
        .buswidth = 8,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_FIXED,
+       .qos.areq_prio = 0,
+       .qos.prio_level = 0,
+       .qos.qos_port = 2,
        .num_links = ARRAY_SIZE(mas_oxili_links),
        .links = mas_oxili_links,
 };
@@ -131,6 +141,11 @@ static struct qcom_icc_node mas_mdp = {
        .buswidth = 8,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_FIXED,
+       .qos.areq_prio = 0,
+       .qos.prio_level = 1,
+       .qos.qos_port = 4,
        .num_links = ARRAY_SIZE(mas_mdp_links),
        .links = mas_mdp_links,
 };
@@ -145,6 +160,10 @@ static struct qcom_icc_node mas_snoc_bimc_1 = {
        .buswidth = 8,
        .mas_rpm_id = 76,
        .slv_rpm_id = -1,
+       .qos.qos_mode = NOC_QOS_MODE_BYPASS,
+       .qos.areq_prio = 0,
+       .qos.prio_level = 0,
+       .qos.qos_port = 5,
        .num_links = ARRAY_SIZE(mas_snoc_bimc_1_links),
        .links = mas_snoc_bimc_1_links,
 };
@@ -160,6 +179,11 @@ static struct qcom_icc_node mas_tcu_0 = {
        .buswidth = 8,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_FIXED,
+       .qos.areq_prio = 0,
+       .qos.prio_level = 2,
+       .qos.qos_port = 6,
        .num_links = ARRAY_SIZE(mas_tcu_0_links),
        .links = mas_tcu_0_links,
 };
@@ -174,6 +198,8 @@ static struct qcom_icc_node mas_spdm = {
        .buswidth = 4,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_INVALID,
        .num_links = ARRAY_SIZE(mas_spdm_links),
        .links = mas_spdm_links,
 };
@@ -231,6 +257,11 @@ static struct qcom_icc_node mas_crypto = {
        .buswidth = 8,
        .mas_rpm_id = 23,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_FIXED,
+       .qos.areq_prio = 1,
+       .qos.prio_level = 1,
+       .qos.qos_port = 0,
        .num_links = ARRAY_SIZE(mas_crypto_links),
        .links = mas_crypto_links,
 };
@@ -287,6 +318,11 @@ static struct qcom_icc_node mas_qpic = {
        .buswidth = 4,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_FIXED,
+       .qos.areq_prio = 1,
+       .qos.prio_level = 1,
+       .qos.qos_port = 14,
        .num_links = ARRAY_SIZE(mas_qpic_links),
        .links = mas_qpic_links,
 };
@@ -301,6 +337,11 @@ static struct qcom_icc_node mas_qdss_bam = {
        .buswidth = 4,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_FIXED,
+       .qos.areq_prio = 1,
+       .qos.prio_level = 1,
+       .qos.qos_port = 1,
        .num_links = ARRAY_SIZE(mas_qdss_bam_links),
        .links = mas_qdss_bam_links,
 };
@@ -348,6 +389,11 @@ static struct qcom_icc_node mas_qdss_etr = {
        .buswidth = 8,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_FIXED,
+       .qos.areq_prio = 1,
+       .qos.prio_level = 1,
+       .qos.qos_port = 0,
        .num_links = ARRAY_SIZE(mas_qdss_etr_links),
        .links = mas_qdss_etr_links,
 };
@@ -363,6 +409,11 @@ static struct qcom_icc_node mas_emac = {
        .buswidth = 8,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_FIXED,
+       .qos.areq_prio = 1,
+       .qos.prio_level = 1,
+       .qos.qos_port = 17,
        .num_links = ARRAY_SIZE(mas_emac_links),
        .links = mas_emac_links,
 };
@@ -378,6 +429,11 @@ static struct qcom_icc_node mas_pcie = {
        .buswidth = 8,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_FIXED,
+       .qos.areq_prio = 1,
+       .qos.prio_level = 1,
+       .qos.qos_port = 8,
        .num_links = ARRAY_SIZE(mas_pcie_links),
        .links = mas_pcie_links,
 };
@@ -393,6 +449,11 @@ static struct qcom_icc_node mas_usb3 = {
        .buswidth = 8,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_FIXED,
+       .qos.areq_prio = 1,
+       .qos.prio_level = 1,
+       .qos.qos_port = 16,
        .num_links = ARRAY_SIZE(mas_usb3_links),
        .links = mas_usb3_links,
 };
@@ -491,6 +552,8 @@ static struct qcom_icc_node pcnoc_s_2 = {
        .buswidth = 4,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_INVALID,
        .num_links = ARRAY_SIZE(pcnoc_s_2_links),
        .links = pcnoc_s_2_links,
 };
@@ -626,6 +689,8 @@ static struct qcom_icc_node qdss_int = {
        .buswidth = 8,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_INVALID,
        .num_links = ARRAY_SIZE(qdss_int_links),
        .links = qdss_int_links,
 };
@@ -704,6 +769,8 @@ static struct qcom_icc_node slv_spdm = {
        .buswidth = 4,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_INVALID,
 };
 
 static struct qcom_icc_node slv_pdm = {
@@ -752,6 +819,8 @@ static struct qcom_icc_node slv_disp_ss_cfg = {
        .buswidth = 4,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_INVALID,
 };
 
 static struct qcom_icc_node slv_gpu_cfg = {
@@ -760,6 +829,8 @@ static struct qcom_icc_node slv_gpu_cfg = {
        .buswidth = 4,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_INVALID,
 };
 
 static struct qcom_icc_node slv_blsp_1 = {
@@ -784,6 +855,8 @@ static struct qcom_icc_node slv_pcie = {
        .buswidth = 4,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_INVALID,
 };
 
 static struct qcom_icc_node slv_ethernet = {
@@ -792,6 +865,8 @@ static struct qcom_icc_node slv_ethernet = {
        .buswidth = 4,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_INVALID,
 };
 
 static struct qcom_icc_node slv_blsp_2 = {
@@ -816,6 +891,8 @@ static struct qcom_icc_node slv_tcu = {
        .buswidth = 8,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_INVALID,
 };
 
 static struct qcom_icc_node slv_pmic_arb = {
@@ -894,6 +971,8 @@ static struct qcom_icc_node slv_kpss_ahb = {
        .buswidth = 4,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_INVALID,
 };
 
 static struct qcom_icc_node slv_wcss = {
@@ -954,6 +1033,8 @@ static struct qcom_icc_node slv_cats_0 = {
        .buswidth = 16,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_INVALID,
 };
 
 static struct qcom_icc_node slv_cats_1 = {
@@ -962,6 +1043,8 @@ static struct qcom_icc_node slv_cats_1 = {
        .buswidth = 8,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_INVALID,
 };
 
 static struct qcom_icc_node slv_lpass = {
@@ -970,6 +1053,8 @@ static struct qcom_icc_node slv_lpass = {
        .buswidth = 4,
        .mas_rpm_id = -1,
        .slv_rpm_id = -1,
+       .qos.ap_owned = true,
+       .qos.qos_mode = NOC_QOS_MODE_INVALID,
 };
 
 static struct qcom_icc_node * const qcs404_bimc_nodes[] = {