Skip to content

Commit e660df0

Browse files
thierryredingthierryreding
committed
memory: tegra: Add SWGROUP names
Subsequent patches will add debugfs files that print the status of the SWGROUPs. Add a new names field and complement the SoC tables with the names of the individual SWGROUPs. Signed-off-by: Thierry Reding <[email protected]>
1 parent b787f68 commit e660df0

File tree

4 files changed

+56
-55
lines changed

4 files changed

+56
-55
lines changed

‎drivers/memory/tegra/tegra114.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -896,22 +896,22 @@ static const struct tegra_mc_client tegra114_mc_clients[] = {
896896
};
897897

898898
static const struct tegra_smmu_swgroup tegra114_swgroups[] = {
899-
{ .swgroup = TEGRA_SWGROUP_DC, .reg = 0x240 },
900-
{ .swgroup = TEGRA_SWGROUP_DCB, .reg = 0x244 },
901-
{ .swgroup = TEGRA_SWGROUP_EPP, .reg = 0x248 },
902-
{ .swgroup = TEGRA_SWGROUP_G2, .reg = 0x24c },
903-
{ .swgroup = TEGRA_SWGROUP_AVPC, .reg = 0x23c },
904-
{ .swgroup = TEGRA_SWGROUP_NV, .reg = 0x268 },
905-
{ .swgroup = TEGRA_SWGROUP_HDA, .reg = 0x254 },
906-
{ .swgroup = TEGRA_SWGROUP_HC, .reg = 0x250 },
907-
{ .swgroup = TEGRA_SWGROUP_MSENC, .reg = 0x264 },
908-
{ .swgroup = TEGRA_SWGROUP_PPCS, .reg = 0x270 },
909-
{ .swgroup = TEGRA_SWGROUP_VDE, .reg = 0x27c },
910-
{ .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 },
911-
{ .swgroup = TEGRA_SWGROUP_ISP, .reg = 0x258 },
912-
{ .swgroup = TEGRA_SWGROUP_XUSB_HOST, .reg = 0x288 },
913-
{ .swgroup = TEGRA_SWGROUP_XUSB_DEV, .reg = 0x28c },
914-
{ .swgroup = TEGRA_SWGROUP_TSEC, .reg = 0x294 },
899+
{ .name = "dc", .swgroup = TEGRA_SWGROUP_DC, .reg = 0x240 },
900+
{ .name = "dcb", .swgroup = TEGRA_SWGROUP_DCB, .reg = 0x244 },
901+
{ .name = "epp", .swgroup = TEGRA_SWGROUP_EPP, .reg = 0x248 },
902+
{ .name = "g2", .swgroup = TEGRA_SWGROUP_G2, .reg = 0x24c },
903+
{ .name = "avpc", .swgroup = TEGRA_SWGROUP_AVPC, .reg = 0x23c },
904+
{ .name = "nv", .swgroup = TEGRA_SWGROUP_NV, .reg = 0x268 },
905+
{ .name = "hda", .swgroup = TEGRA_SWGROUP_HDA, .reg = 0x254 },
906+
{ .name = "hc", .swgroup = TEGRA_SWGROUP_HC, .reg = 0x250 },
907+
{ .name = "msenc", .swgroup = TEGRA_SWGROUP_MSENC, .reg = 0x264 },
908+
{ .name = "ppcs", .swgroup = TEGRA_SWGROUP_PPCS, .reg = 0x270 },
909+
{ .name = "vde", .swgroup = TEGRA_SWGROUP_VDE, .reg = 0x27c },
910+
{ .name = "vi", .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 },
911+
{ .name = "isp", .swgroup = TEGRA_SWGROUP_ISP, .reg = 0x258 },
912+
{ .name = "xusb_host", .swgroup = TEGRA_SWGROUP_XUSB_HOST, .reg = 0x288 },
913+
{ .name = "xusb_dev", .swgroup = TEGRA_SWGROUP_XUSB_DEV, .reg = 0x28c },
914+
{ .name = "tsec", .swgroup = TEGRA_SWGROUP_TSEC, .reg = 0x294 },
915915
};
916916

917917
static void tegra114_flush_dcache(struct page *page, unsigned long offset,

‎drivers/memory/tegra/tegra124.c

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -934,29 +934,29 @@ static const struct tegra_mc_client tegra124_mc_clients[] = {
934934
};
935935

936936
static const struct tegra_smmu_swgroup tegra124_swgroups[] = {
937-
{ .swgroup = TEGRA_SWGROUP_DC, .reg = 0x240 },
938-
{ .swgroup = TEGRA_SWGROUP_DCB, .reg = 0x244 },
939-
{ .swgroup = TEGRA_SWGROUP_AFI, .reg = 0x238 },
940-
{ .swgroup = TEGRA_SWGROUP_AVPC, .reg = 0x23c },
941-
{ .swgroup = TEGRA_SWGROUP_HDA, .reg = 0x254 },
942-
{ .swgroup = TEGRA_SWGROUP_HC, .reg = 0x250 },
943-
{ .swgroup = TEGRA_SWGROUP_MSENC, .reg = 0x264 },
944-
{ .swgroup = TEGRA_SWGROUP_PPCS, .reg = 0x270 },
945-
{ .swgroup = TEGRA_SWGROUP_SATA, .reg = 0x274 },
946-
{ .swgroup = TEGRA_SWGROUP_VDE, .reg = 0x27c },
947-
{ .swgroup = TEGRA_SWGROUP_ISP2, .reg = 0x258 },
948-
{ .swgroup = TEGRA_SWGROUP_XUSB_HOST, .reg = 0x288 },
949-
{ .swgroup = TEGRA_SWGROUP_XUSB_DEV, .reg = 0x28c },
950-
{ .swgroup = TEGRA_SWGROUP_ISP2B, .reg = 0xaa4 },
951-
{ .swgroup = TEGRA_SWGROUP_TSEC, .reg = 0x294 },
952-
{ .swgroup = TEGRA_SWGROUP_A9AVP, .reg = 0x290 },
953-
{ .swgroup = TEGRA_SWGROUP_GPU, .reg = 0xaac },
954-
{ .swgroup = TEGRA_SWGROUP_SDMMC1A, .reg = 0xa94 },
955-
{ .swgroup = TEGRA_SWGROUP_SDMMC2A, .reg = 0xa98 },
956-
{ .swgroup = TEGRA_SWGROUP_SDMMC3A, .reg = 0xa9c },
957-
{ .swgroup = TEGRA_SWGROUP_SDMMC4A, .reg = 0xaa0 },
958-
{ .swgroup = TEGRA_SWGROUP_VIC, .reg = 0x284 },
959-
{ .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 },
937+
{ .name = "dc", .swgroup = TEGRA_SWGROUP_DC, .reg = 0x240 },
938+
{ .name = "dcb", .swgroup = TEGRA_SWGROUP_DCB, .reg = 0x244 },
939+
{ .name = "afi", .swgroup = TEGRA_SWGROUP_AFI, .reg = 0x238 },
940+
{ .name = "avpc", .swgroup = TEGRA_SWGROUP_AVPC, .reg = 0x23c },
941+
{ .name = "hda", .swgroup = TEGRA_SWGROUP_HDA, .reg = 0x254 },
942+
{ .name = "hc", .swgroup = TEGRA_SWGROUP_HC, .reg = 0x250 },
943+
{ .name = "msenc", .swgroup = TEGRA_SWGROUP_MSENC, .reg = 0x264 },
944+
{ .name = "ppcs", .swgroup = TEGRA_SWGROUP_PPCS, .reg = 0x270 },
945+
{ .name = "sata", .swgroup = TEGRA_SWGROUP_SATA, .reg = 0x274 },
946+
{ .name = "vde", .swgroup = TEGRA_SWGROUP_VDE, .reg = 0x27c },
947+
{ .name = "isp2", .swgroup = TEGRA_SWGROUP_ISP2, .reg = 0x258 },
948+
{ .name = "xusb_host", .swgroup = TEGRA_SWGROUP_XUSB_HOST, .reg = 0x288 },
949+
{ .name = "xusb_dev", .swgroup = TEGRA_SWGROUP_XUSB_DEV, .reg = 0x28c },
950+
{ .name = "isp2b", .swgroup = TEGRA_SWGROUP_ISP2B, .reg = 0xaa4 },
951+
{ .name = "tsec", .swgroup = TEGRA_SWGROUP_TSEC, .reg = 0x294 },
952+
{ .name = "a9avp", .swgroup = TEGRA_SWGROUP_A9AVP, .reg = 0x290 },
953+
{ .name = "gpu", .swgroup = TEGRA_SWGROUP_GPU, .reg = 0xaac },
954+
{ .name = "sdmmc1a", .swgroup = TEGRA_SWGROUP_SDMMC1A, .reg = 0xa94 },
955+
{ .name = "sdmmc2a", .swgroup = TEGRA_SWGROUP_SDMMC2A, .reg = 0xa98 },
956+
{ .name = "sdmmc3a", .swgroup = TEGRA_SWGROUP_SDMMC3A, .reg = 0xa9c },
957+
{ .name = "sdmmc4a", .swgroup = TEGRA_SWGROUP_SDMMC4A, .reg = 0xaa0 },
958+
{ .name = "vic", .swgroup = TEGRA_SWGROUP_VIC, .reg = 0x284 },
959+
{ .name = "vi", .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 },
960960
};
961961

962962
#ifdef CONFIG_ARCH_TEGRA_124_SOC

‎drivers/memory/tegra/tegra30.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -918,22 +918,22 @@ static const struct tegra_mc_client tegra30_mc_clients[] = {
918918
};
919919

920920
static const struct tegra_smmu_swgroup tegra30_swgroups[] = {
921-
{ .swgroup = TEGRA_SWGROUP_DC, .reg = 0x240 },
922-
{ .swgroup = TEGRA_SWGROUP_DCB, .reg = 0x244 },
923-
{ .swgroup = TEGRA_SWGROUP_EPP, .reg = 0x248 },
924-
{ .swgroup = TEGRA_SWGROUP_G2, .reg = 0x24c },
925-
{ .swgroup = TEGRA_SWGROUP_MPE, .reg = 0x264 },
926-
{ .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 },
927-
{ .swgroup = TEGRA_SWGROUP_AFI, .reg = 0x238 },
928-
{ .swgroup = TEGRA_SWGROUP_AVPC, .reg = 0x23c },
929-
{ .swgroup = TEGRA_SWGROUP_NV, .reg = 0x268 },
930-
{ .swgroup = TEGRA_SWGROUP_NV2, .reg = 0x26c },
931-
{ .swgroup = TEGRA_SWGROUP_HDA, .reg = 0x254 },
932-
{ .swgroup = TEGRA_SWGROUP_HC, .reg = 0x250 },
933-
{ .swgroup = TEGRA_SWGROUP_PPCS, .reg = 0x270 },
934-
{ .swgroup = TEGRA_SWGROUP_SATA, .reg = 0x278 },
935-
{ .swgroup = TEGRA_SWGROUP_VDE, .reg = 0x27c },
936-
{ .swgroup = TEGRA_SWGROUP_ISP, .reg = 0x258 },
921+
{ .name = "dc", .swgroup = TEGRA_SWGROUP_DC, .reg = 0x240 },
922+
{ .name = "dcb", .swgroup = TEGRA_SWGROUP_DCB, .reg = 0x244 },
923+
{ .name = "epp", .swgroup = TEGRA_SWGROUP_EPP, .reg = 0x248 },
924+
{ .name = "g2", .swgroup = TEGRA_SWGROUP_G2, .reg = 0x24c },
925+
{ .name = "mpe", .swgroup = TEGRA_SWGROUP_MPE, .reg = 0x264 },
926+
{ .name = "vi", .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 },
927+
{ .name = "afi", .swgroup = TEGRA_SWGROUP_AFI, .reg = 0x238 },
928+
{ .name = "avpc", .swgroup = TEGRA_SWGROUP_AVPC, .reg = 0x23c },
929+
{ .name = "nv", .swgroup = TEGRA_SWGROUP_NV, .reg = 0x268 },
930+
{ .name = "nv2", .swgroup = TEGRA_SWGROUP_NV2, .reg = 0x26c },
931+
{ .name = "hda", .swgroup = TEGRA_SWGROUP_HDA, .reg = 0x254 },
932+
{ .name = "hc", .swgroup = TEGRA_SWGROUP_HC, .reg = 0x250 },
933+
{ .name = "ppcs", .swgroup = TEGRA_SWGROUP_PPCS, .reg = 0x270 },
934+
{ .name = "sata", .swgroup = TEGRA_SWGROUP_SATA, .reg = 0x278 },
935+
{ .name = "vde", .swgroup = TEGRA_SWGROUP_VDE, .reg = 0x27c },
936+
{ .name = "isp", .swgroup = TEGRA_SWGROUP_ISP, .reg = 0x258 },
937937
};
938938

939939
static void tegra30_flush_dcache(struct page *page, unsigned long offset,

‎include/soc/tegra/mc.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ struct tegra_mc_client {
4040
};
4141

4242
struct tegra_smmu_swgroup {
43+
const char *name;
4344
unsigned int swgroup;
4445
unsigned int reg;
4546
};

0 commit comments

Comments
 (0)