Skip to content

Commit 16e5d50

Browse files
KiciukGeorgi Djakov
Kiciuk
authored and
Georgi Djakov
committed
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>
1 parent 755acd3 commit 16e5d50

1 file changed

Lines changed: 85 additions & 0 deletions

File tree

‎drivers/interconnect/qcom/qcs404.c‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ static struct qcom_icc_node mas_apps_proc = {
101101
.buswidth = 8,
102102
.mas_rpm_id = 0,
103103
.slv_rpm_id = -1,
104+
.qos.ap_owned = true,
105+
.qos.qos_mode = NOC_QOS_MODE_FIXED,
106+
.qos.areq_prio = 0,
107+
.qos.prio_level = 0,
108+
.qos.qos_port = 0,
104109
.num_links = ARRAY_SIZE(mas_apps_proc_links),
105110
.links = mas_apps_proc_links,
106111
};
@@ -116,6 +121,11 @@ static struct qcom_icc_node mas_oxili = {
116121
.buswidth = 8,
117122
.mas_rpm_id = -1,
118123
.slv_rpm_id = -1,
124+
.qos.ap_owned = true,
125+
.qos.qos_mode = NOC_QOS_MODE_FIXED,
126+
.qos.areq_prio = 0,
127+
.qos.prio_level = 0,
128+
.qos.qos_port = 2,
119129
.num_links = ARRAY_SIZE(mas_oxili_links),
120130
.links = mas_oxili_links,
121131
};
@@ -131,6 +141,11 @@ static struct qcom_icc_node mas_mdp = {
131141
.buswidth = 8,
132142
.mas_rpm_id = -1,
133143
.slv_rpm_id = -1,
144+
.qos.ap_owned = true,
145+
.qos.qos_mode = NOC_QOS_MODE_FIXED,
146+
.qos.areq_prio = 0,
147+
.qos.prio_level = 1,
148+
.qos.qos_port = 4,
134149
.num_links = ARRAY_SIZE(mas_mdp_links),
135150
.links = mas_mdp_links,
136151
};
@@ -145,6 +160,10 @@ static struct qcom_icc_node mas_snoc_bimc_1 = {
145160
.buswidth = 8,
146161
.mas_rpm_id = 76,
147162
.slv_rpm_id = -1,
163+
.qos.qos_mode = NOC_QOS_MODE_BYPASS,
164+
.qos.areq_prio = 0,
165+
.qos.prio_level = 0,
166+
.qos.qos_port = 5,
148167
.num_links = ARRAY_SIZE(mas_snoc_bimc_1_links),
149168
.links = mas_snoc_bimc_1_links,
150169
};
@@ -160,6 +179,11 @@ static struct qcom_icc_node mas_tcu_0 = {
160179
.buswidth = 8,
161180
.mas_rpm_id = -1,
162181
.slv_rpm_id = -1,
182+
.qos.ap_owned = true,
183+
.qos.qos_mode = NOC_QOS_MODE_FIXED,
184+
.qos.areq_prio = 0,
185+
.qos.prio_level = 2,
186+
.qos.qos_port = 6,
163187
.num_links = ARRAY_SIZE(mas_tcu_0_links),
164188
.links = mas_tcu_0_links,
165189
};
@@ -174,6 +198,8 @@ static struct qcom_icc_node mas_spdm = {
174198
.buswidth = 4,
175199
.mas_rpm_id = -1,
176200
.slv_rpm_id = -1,
201+
.qos.ap_owned = true,
202+
.qos.qos_mode = NOC_QOS_MODE_INVALID,
177203
.num_links = ARRAY_SIZE(mas_spdm_links),
178204
.links = mas_spdm_links,
179205
};
@@ -231,6 +257,11 @@ static struct qcom_icc_node mas_crypto = {
231257
.buswidth = 8,
232258
.mas_rpm_id = 23,
233259
.slv_rpm_id = -1,
260+
.qos.ap_owned = true,
261+
.qos.qos_mode = NOC_QOS_MODE_FIXED,
262+
.qos.areq_prio = 1,
263+
.qos.prio_level = 1,
264+
.qos.qos_port = 0,
234265
.num_links = ARRAY_SIZE(mas_crypto_links),
235266
.links = mas_crypto_links,
236267
};
@@ -287,6 +318,11 @@ static struct qcom_icc_node mas_qpic = {
287318
.buswidth = 4,
288319
.mas_rpm_id = -1,
289320
.slv_rpm_id = -1,
321+
.qos.ap_owned = true,
322+
.qos.qos_mode = NOC_QOS_MODE_FIXED,
323+
.qos.areq_prio = 1,
324+
.qos.prio_level = 1,
325+
.qos.qos_port = 14,
290326
.num_links = ARRAY_SIZE(mas_qpic_links),
291327
.links = mas_qpic_links,
292328
};
@@ -301,6 +337,11 @@ static struct qcom_icc_node mas_qdss_bam = {
301337
.buswidth = 4,
302338
.mas_rpm_id = -1,
303339
.slv_rpm_id = -1,
340+
.qos.ap_owned = true,
341+
.qos.qos_mode = NOC_QOS_MODE_FIXED,
342+
.qos.areq_prio = 1,
343+
.qos.prio_level = 1,
344+
.qos.qos_port = 1,
304345
.num_links = ARRAY_SIZE(mas_qdss_bam_links),
305346
.links = mas_qdss_bam_links,
306347
};
@@ -348,6 +389,11 @@ static struct qcom_icc_node mas_qdss_etr = {
348389
.buswidth = 8,
349390
.mas_rpm_id = -1,
350391
.slv_rpm_id = -1,
392+
.qos.ap_owned = true,
393+
.qos.qos_mode = NOC_QOS_MODE_FIXED,
394+
.qos.areq_prio = 1,
395+
.qos.prio_level = 1,
396+
.qos.qos_port = 0,
351397
.num_links = ARRAY_SIZE(mas_qdss_etr_links),
352398
.links = mas_qdss_etr_links,
353399
};
@@ -363,6 +409,11 @@ static struct qcom_icc_node mas_emac = {
363409
.buswidth = 8,
364410
.mas_rpm_id = -1,
365411
.slv_rpm_id = -1,
412+
.qos.ap_owned = true,
413+
.qos.qos_mode = NOC_QOS_MODE_FIXED,
414+
.qos.areq_prio = 1,
415+
.qos.prio_level = 1,
416+
.qos.qos_port = 17,
366417
.num_links = ARRAY_SIZE(mas_emac_links),
367418
.links = mas_emac_links,
368419
};
@@ -378,6 +429,11 @@ static struct qcom_icc_node mas_pcie = {
378429
.buswidth = 8,
379430
.mas_rpm_id = -1,
380431
.slv_rpm_id = -1,
432+
.qos.ap_owned = true,
433+
.qos.qos_mode = NOC_QOS_MODE_FIXED,
434+
.qos.areq_prio = 1,
435+
.qos.prio_level = 1,
436+
.qos.qos_port = 8,
381437
.num_links = ARRAY_SIZE(mas_pcie_links),
382438
.links = mas_pcie_links,
383439
};
@@ -393,6 +449,11 @@ static struct qcom_icc_node mas_usb3 = {
393449
.buswidth = 8,
394450
.mas_rpm_id = -1,
395451
.slv_rpm_id = -1,
452+
.qos.ap_owned = true,
453+
.qos.qos_mode = NOC_QOS_MODE_FIXED,
454+
.qos.areq_prio = 1,
455+
.qos.prio_level = 1,
456+
.qos.qos_port = 16,
396457
.num_links = ARRAY_SIZE(mas_usb3_links),
397458
.links = mas_usb3_links,
398459
};
@@ -491,6 +552,8 @@ static struct qcom_icc_node pcnoc_s_2 = {
491552
.buswidth = 4,
492553
.mas_rpm_id = -1,
493554
.slv_rpm_id = -1,
555+
.qos.ap_owned = true,
556+
.qos.qos_mode = NOC_QOS_MODE_INVALID,
494557
.num_links = ARRAY_SIZE(pcnoc_s_2_links),
495558
.links = pcnoc_s_2_links,
496559
};
@@ -626,6 +689,8 @@ static struct qcom_icc_node qdss_int = {
626689
.buswidth = 8,
627690
.mas_rpm_id = -1,
628691
.slv_rpm_id = -1,
692+
.qos.ap_owned = true,
693+
.qos.qos_mode = NOC_QOS_MODE_INVALID,
629694
.num_links = ARRAY_SIZE(qdss_int_links),
630695
.links = qdss_int_links,
631696
};
@@ -704,6 +769,8 @@ static struct qcom_icc_node slv_spdm = {
704769
.buswidth = 4,
705770
.mas_rpm_id = -1,
706771
.slv_rpm_id = -1,
772+
.qos.ap_owned = true,
773+
.qos.qos_mode = NOC_QOS_MODE_INVALID,
707774
};
708775

709776
static struct qcom_icc_node slv_pdm = {
@@ -752,6 +819,8 @@ static struct qcom_icc_node slv_disp_ss_cfg = {
752819
.buswidth = 4,
753820
.mas_rpm_id = -1,
754821
.slv_rpm_id = -1,
822+
.qos.ap_owned = true,
823+
.qos.qos_mode = NOC_QOS_MODE_INVALID,
755824
};
756825

757826
static struct qcom_icc_node slv_gpu_cfg = {
@@ -760,6 +829,8 @@ static struct qcom_icc_node slv_gpu_cfg = {
760829
.buswidth = 4,
761830
.mas_rpm_id = -1,
762831
.slv_rpm_id = -1,
832+
.qos.ap_owned = true,
833+
.qos.qos_mode = NOC_QOS_MODE_INVALID,
763834
};
764835

765836
static struct qcom_icc_node slv_blsp_1 = {
@@ -784,6 +855,8 @@ static struct qcom_icc_node slv_pcie = {
784855
.buswidth = 4,
785856
.mas_rpm_id = -1,
786857
.slv_rpm_id = -1,
858+
.qos.ap_owned = true,
859+
.qos.qos_mode = NOC_QOS_MODE_INVALID,
787860
};
788861

789862
static struct qcom_icc_node slv_ethernet = {
@@ -792,6 +865,8 @@ static struct qcom_icc_node slv_ethernet = {
792865
.buswidth = 4,
793866
.mas_rpm_id = -1,
794867
.slv_rpm_id = -1,
868+
.qos.ap_owned = true,
869+
.qos.qos_mode = NOC_QOS_MODE_INVALID,
795870
};
796871

797872
static struct qcom_icc_node slv_blsp_2 = {
@@ -816,6 +891,8 @@ static struct qcom_icc_node slv_tcu = {
816891
.buswidth = 8,
817892
.mas_rpm_id = -1,
818893
.slv_rpm_id = -1,
894+
.qos.ap_owned = true,
895+
.qos.qos_mode = NOC_QOS_MODE_INVALID,
819896
};
820897

821898
static struct qcom_icc_node slv_pmic_arb = {
@@ -894,6 +971,8 @@ static struct qcom_icc_node slv_kpss_ahb = {
894971
.buswidth = 4,
895972
.mas_rpm_id = -1,
896973
.slv_rpm_id = -1,
974+
.qos.ap_owned = true,
975+
.qos.qos_mode = NOC_QOS_MODE_INVALID,
897976
};
898977

899978
static struct qcom_icc_node slv_wcss = {
@@ -954,6 +1033,8 @@ static struct qcom_icc_node slv_cats_0 = {
9541033
.buswidth = 16,
9551034
.mas_rpm_id = -1,
9561035
.slv_rpm_id = -1,
1036+
.qos.ap_owned = true,
1037+
.qos.qos_mode = NOC_QOS_MODE_INVALID,
9571038
};
9581039

9591040
static struct qcom_icc_node slv_cats_1 = {
@@ -962,6 +1043,8 @@ static struct qcom_icc_node slv_cats_1 = {
9621043
.buswidth = 8,
9631044
.mas_rpm_id = -1,
9641045
.slv_rpm_id = -1,
1046+
.qos.ap_owned = true,
1047+
.qos.qos_mode = NOC_QOS_MODE_INVALID,
9651048
};
9661049

9671050
static struct qcom_icc_node slv_lpass = {
@@ -970,6 +1053,8 @@ static struct qcom_icc_node slv_lpass = {
9701053
.buswidth = 4,
9711054
.mas_rpm_id = -1,
9721055
.slv_rpm_id = -1,
1056+
.qos.ap_owned = true,
1057+
.qos.qos_mode = NOC_QOS_MODE_INVALID,
9731058
};
9741059

9751060
static struct qcom_icc_node * const qcs404_bimc_nodes[] = {

0 commit comments

Comments
 (0)