Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a8102df authored by Thierry Reding's avatar Thierry Reding
Browse files

memory: tegra: Create SMMU display groups 



Create SMMU display groups for Tegra30, Tegra114, Tegra124 and Tegra210.
This allows the display controllers on these devices to share the same
IOMMU domain using the standard IOMMU group mechanism.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 02b0cc52

drivers/memory/tegra/tegra114.c

+15 −0
Original line number Diff line number Diff line
@@ -912,11 +912,26 @@ static const struct tegra_smmu_swgroup tegra114_swgroups[] = { 
	{ .name = "tsec",      .swgroup = TEGRA_SWGROUP_TSEC,      .reg = 0x294 },

};



static const unsigned int tegra114_group_display[] = {

	TEGRA_SWGROUP_DC,

	TEGRA_SWGROUP_DCB,

};



static const struct tegra_smmu_group_soc tegra114_groups[] = {

	{

		.name = "display",

		.swgroups = tegra114_group_display,

		.num_swgroups = ARRAY_SIZE(tegra114_group_display),

	},

};



static const struct tegra_smmu_soc tegra114_smmu_soc = {

	.clients = tegra114_mc_clients,

	.num_clients = ARRAY_SIZE(tegra114_mc_clients),

	.swgroups = tegra114_swgroups,

	.num_swgroups = ARRAY_SIZE(tegra114_swgroups),

	.groups = tegra114_groups,

	.num_groups = ARRAY_SIZE(tegra114_groups),

	.supports_round_robin_arbitration = false,

	.supports_request_limit = false,

	.num_tlb_lines = 32,

drivers/memory/tegra/tegra124.c

+17 −0
Original line number Diff line number Diff line
@@ -999,12 +999,27 @@ static const struct tegra_smmu_swgroup tegra124_swgroups[] = { 
	{ .name = "vi",        .swgroup = TEGRA_SWGROUP_VI,        .reg = 0x280 },

};



static const unsigned int tegra124_group_display[] = {

	TEGRA_SWGROUP_DC,

	TEGRA_SWGROUP_DCB,

};



static const struct tegra_smmu_group_soc tegra124_groups[] = {

	{

		.name = "display",

		.swgroups = tegra124_group_display,

		.num_swgroups = ARRAY_SIZE(tegra124_group_display),

	},

};



#ifdef CONFIG_ARCH_TEGRA_124_SOC

static const struct tegra_smmu_soc tegra124_smmu_soc = {

	.clients = tegra124_mc_clients,

	.num_clients = ARRAY_SIZE(tegra124_mc_clients),

	.swgroups = tegra124_swgroups,

	.num_swgroups = ARRAY_SIZE(tegra124_swgroups),

	.groups = tegra124_groups,

	.num_groups = ARRAY_SIZE(tegra124_groups),

	.supports_round_robin_arbitration = true,

	.supports_request_limit = true,

	.num_tlb_lines = 32,
@@ -1029,6 +1044,8 @@ static const struct tegra_smmu_soc tegra132_smmu_soc = { 
	.num_clients = ARRAY_SIZE(tegra124_mc_clients),

	.swgroups = tegra124_swgroups,

	.num_swgroups = ARRAY_SIZE(tegra124_swgroups),

	.groups = tegra124_groups,

	.num_groups = ARRAY_SIZE(tegra124_groups),

	.supports_round_robin_arbitration = true,

	.supports_request_limit = true,

	.num_tlb_lines = 32,

drivers/memory/tegra/tegra210.c

+15 −0
Original line number Diff line number Diff line
@@ -1059,11 +1059,26 @@ static const struct tegra_smmu_swgroup tegra210_swgroups[] = { 
	{ .name = "tsecb",     .swgroup = TEGRA_SWGROUP_TSECB,     .reg = 0xad4 },

};



static const unsigned int tegra210_group_display[] = {

	TEGRA_SWGROUP_DC,

	TEGRA_SWGROUP_DCB,

};



static const struct tegra_smmu_group_soc tegra210_groups[] = {

	{

		.name = "display",

		.swgroups = tegra210_group_display,

		.num_swgroups = ARRAY_SIZE(tegra210_group_display),

	},

};



static const struct tegra_smmu_soc tegra210_smmu_soc = {

	.clients = tegra210_mc_clients,

	.num_clients = ARRAY_SIZE(tegra210_mc_clients),

	.swgroups = tegra210_swgroups,

	.num_swgroups = ARRAY_SIZE(tegra210_swgroups),

	.groups = tegra210_groups,

	.num_groups = ARRAY_SIZE(tegra210_groups),

	.supports_round_robin_arbitration = true,

	.supports_request_limit = true,

	.num_tlb_lines = 32,

drivers/memory/tegra/tegra30.c

+15 −0
Original line number Diff line number Diff line
@@ -934,11 +934,26 @@ static const struct tegra_smmu_swgroup tegra30_swgroups[] = { 
	{ .name = "isp",  .swgroup = TEGRA_SWGROUP_ISP,  .reg = 0x258 },

};



static const unsigned int tegra30_group_display[] = {

	TEGRA_SWGROUP_DC,

	TEGRA_SWGROUP_DCB,

};



static const struct tegra_smmu_group_soc tegra30_groups[] = {

	{

		.name = "display",

		.swgroups = tegra30_group_display,

		.num_swgroups = ARRAY_SIZE(tegra30_group_display),

	},

};



static const struct tegra_smmu_soc tegra30_smmu_soc = {

	.clients = tegra30_mc_clients,

	.num_clients = ARRAY_SIZE(tegra30_mc_clients),

	.swgroups = tegra30_swgroups,

	.num_swgroups = ARRAY_SIZE(tegra30_swgroups),

	.groups = tegra30_groups,

	.num_groups = ARRAY_SIZE(tegra30_groups),

	.supports_round_robin_arbitration = false,

	.supports_request_limit = false,

	.num_tlb_lines = 16,

include/soc/tegra/mc.h

+9 −0
Original line number Diff line number Diff line
@@ -51,6 +51,12 @@ struct tegra_smmu_swgroup { 
	unsigned int reg;

};



struct tegra_smmu_group_soc {

	const char *name;

	const unsigned int *swgroups;

	unsigned int num_swgroups;

};



struct tegra_smmu_soc {

	const struct tegra_mc_client *clients;

	unsigned int num_clients;
@@ -58,6 +64,9 @@ struct tegra_smmu_soc { 
	const struct tegra_smmu_swgroup *swgroups;

	unsigned int num_swgroups;



	const struct tegra_smmu_group_soc *groups;

	unsigned int num_groups;



	bool supports_round_robin_arbitration;

	bool supports_request_limit;