Skip to content

Commit 0cb2fc0

Browse files
author
CKI KWF Bot
committed
Merge: memory: tegra: Correct DLA client names
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6526 JIRA: https://issues.redhat.com/browse/RHEL-26426 ## Summary of Changes The following series populates interconnect and BPMP information for the DLA (deep learning accelerator) on NVIDIA Tegra234 devices. This is needed for enabling memory frequency scaling for the DLA clients. Signed-off-by: Marcin Juszkiewicz <mjuszkiewicz@redhat.com> Approved-by: Lenny Szubowicz <lszubowi@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: John W. Linville <linville@redhat.com> Approved-by: Jason Sowers <jsowers@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 40bb755 + b6faae1 commit 0cb2fc0

File tree

1 file changed

+39
-9
lines changed

1 file changed

+39
-9
lines changed

‎drivers/memory/tegra/tegra234.c‎

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
9292
}, {
9393
.id = TEGRA234_MEMORY_CLIENT_DLA0RDB,
9494
.name = "dla0rdb",
95+
.bpmp_id = TEGRA_ICC_BPMP_DLA_0,
96+
.type = TEGRA_ICC_NISO,
9597
.sid = TEGRA234_SID_NVDLA0,
9698
.regs = {
9799
.sid = {
@@ -102,6 +104,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
102104
}, {
103105
.id = TEGRA234_MEMORY_CLIENT_DLA0RDB1,
104106
.name = "dla0rdb1",
107+
.bpmp_id = TEGRA_ICC_BPMP_DLA_0,
108+
.type = TEGRA_ICC_NISO,
105109
.sid = TEGRA234_SID_NVDLA0,
106110
.regs = {
107111
.sid = {
@@ -112,6 +116,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
112116
}, {
113117
.id = TEGRA234_MEMORY_CLIENT_DLA0WRB,
114118
.name = "dla0wrb",
119+
.bpmp_id = TEGRA_ICC_BPMP_DLA_0,
120+
.type = TEGRA_ICC_NISO,
115121
.sid = TEGRA234_SID_NVDLA0,
116122
.regs = {
117123
.sid = {
@@ -121,7 +127,9 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
121127
},
122128
}, {
123129
.id = TEGRA234_MEMORY_CLIENT_DLA1RDB,
124-
.name = "dla0rdb",
130+
.name = "dla1rdb",
131+
.bpmp_id = TEGRA_ICC_BPMP_DLA_1,
132+
.type = TEGRA_ICC_NISO,
125133
.sid = TEGRA234_SID_NVDLA1,
126134
.regs = {
127135
.sid = {
@@ -407,7 +415,9 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
407415
},
408416
}, {
409417
.id = TEGRA234_MEMORY_CLIENT_DLA1RDB1,
410-
.name = "dla0rdb1",
418+
.name = "dla1rdb1",
419+
.bpmp_id = TEGRA_ICC_BPMP_DLA_1,
420+
.type = TEGRA_ICC_NISO,
411421
.sid = TEGRA234_SID_NVDLA1,
412422
.regs = {
413423
.sid = {
@@ -417,7 +427,9 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
417427
},
418428
}, {
419429
.id = TEGRA234_MEMORY_CLIENT_DLA1WRB,
420-
.name = "dla0wrb",
430+
.name = "dla1wrb",
431+
.bpmp_id = TEGRA_ICC_BPMP_DLA_1,
432+
.type = TEGRA_ICC_NISO,
421433
.sid = TEGRA234_SID_NVDLA1,
422434
.regs = {
423435
.sid = {
@@ -539,7 +551,7 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
539551
.bpmp_id = TEGRA_ICC_BPMP_NVJPG_0,
540552
.type = TEGRA_ICC_NISO,
541553
.sid = TEGRA234_SID_NVJPG,
542-
.regs = {
554+
.regs = {
543555
.sid = {
544556
.override = 0x3f8,
545557
.security = 0x3fc,
@@ -660,6 +672,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
660672
}, {
661673
.id = TEGRA234_MEMORY_CLIENT_DLA0RDA,
662674
.name = "dla0rda",
675+
.bpmp_id = TEGRA_ICC_BPMP_DLA_0,
676+
.type = TEGRA_ICC_NISO,
663677
.sid = TEGRA234_SID_NVDLA0,
664678
.regs = {
665679
.sid = {
@@ -670,6 +684,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
670684
}, {
671685
.id = TEGRA234_MEMORY_CLIENT_DLA0FALRDB,
672686
.name = "dla0falrdb",
687+
.bpmp_id = TEGRA_ICC_BPMP_DLA_0,
688+
.type = TEGRA_ICC_NISO,
673689
.sid = TEGRA234_SID_NVDLA0,
674690
.regs = {
675691
.sid = {
@@ -680,6 +696,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
680696
}, {
681697
.id = TEGRA234_MEMORY_CLIENT_DLA0WRA,
682698
.name = "dla0wra",
699+
.bpmp_id = TEGRA_ICC_BPMP_DLA_0,
700+
.type = TEGRA_ICC_NISO,
683701
.sid = TEGRA234_SID_NVDLA0,
684702
.regs = {
685703
.sid = {
@@ -690,6 +708,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
690708
}, {
691709
.id = TEGRA234_MEMORY_CLIENT_DLA0FALWRB,
692710
.name = "dla0falwrb",
711+
.bpmp_id = TEGRA_ICC_BPMP_DLA_0,
712+
.type = TEGRA_ICC_NISO,
693713
.sid = TEGRA234_SID_NVDLA0,
694714
.regs = {
695715
.sid = {
@@ -699,7 +719,9 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
699719
},
700720
}, {
701721
.id = TEGRA234_MEMORY_CLIENT_DLA1RDA,
702-
.name = "dla0rda",
722+
.name = "dla1rda",
723+
.bpmp_id = TEGRA_ICC_BPMP_DLA_1,
724+
.type = TEGRA_ICC_NISO,
703725
.sid = TEGRA234_SID_NVDLA1,
704726
.regs = {
705727
.sid = {
@@ -709,7 +731,9 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
709731
},
710732
}, {
711733
.id = TEGRA234_MEMORY_CLIENT_DLA1FALRDB,
712-
.name = "dla0falrdb",
734+
.name = "dla1falrdb",
735+
.bpmp_id = TEGRA_ICC_BPMP_DLA_1,
736+
.type = TEGRA_ICC_NISO,
713737
.sid = TEGRA234_SID_NVDLA1,
714738
.regs = {
715739
.sid = {
@@ -719,7 +743,9 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
719743
},
720744
}, {
721745
.id = TEGRA234_MEMORY_CLIENT_DLA1WRA,
722-
.name = "dla0wra",
746+
.name = "dla1wra",
747+
.bpmp_id = TEGRA_ICC_BPMP_DLA_1,
748+
.type = TEGRA_ICC_NISO,
723749
.sid = TEGRA234_SID_NVDLA1,
724750
.regs = {
725751
.sid = {
@@ -729,7 +755,9 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
729755
},
730756
}, {
731757
.id = TEGRA234_MEMORY_CLIENT_DLA1FALWRB,
732-
.name = "dla0falwrb",
758+
.name = "dla1falwrb",
759+
.bpmp_id = TEGRA_ICC_BPMP_DLA_1,
760+
.type = TEGRA_ICC_NISO,
733761
.sid = TEGRA234_SID_NVDLA1,
734762
.regs = {
735763
.sid = {
@@ -908,6 +936,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
908936
}, {
909937
.id = TEGRA234_MEMORY_CLIENT_DLA0RDA1,
910938
.name = "dla0rda1",
939+
.bpmp_id = TEGRA_ICC_BPMP_DLA_0,
940+
.type = TEGRA_ICC_NISO,
911941
.sid = TEGRA234_SID_NVDLA0,
912942
.regs = {
913943
.sid = {
@@ -917,7 +947,7 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
917947
},
918948
}, {
919949
.id = TEGRA234_MEMORY_CLIENT_DLA1RDA1,
920-
.name = "dla0rda1",
950+
.name = "dla1rda1",
921951
.sid = TEGRA234_SID_NVDLA1,
922952
.regs = {
923953
.sid = {

0 commit comments

Comments
 (0)