Message ID | 20231012104909.48518-1-jonathanh@nvidia.com |
---|---|
State | Handled Elsewhere |
Headers | show |
Series | memory: tegra: Add Tegra234 clients for RCE and VI | expand |
On Thu, Oct 12, 2023 at 11:49:09AM +0100, Jon Hunter wrote: > Add the Tegra234 memory client entries for the Real-time Camera Engine > (RCE) and Video Input (VI) devices. > > Signed-off-by: Jon Hunter <jonathanh@nvidia.com> > --- > drivers/memory/tegra/tegra234.c | 60 +++++++++++++++++++++++++++++++++ > 1 file changed, 60 insertions(+) Krzysztof, again, let me know how you want to handle this. I can pick it up into the Tegra tree along with Sumit's 2-patch series, or you can take these if you prefer, in which case: Acked-by: Thierry Reding <treding@nvidia.com> > > diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c > index 9e5b5dbd9c8d..42c79f9a70af 100644 > --- a/drivers/memory/tegra/tegra234.c > +++ b/drivers/memory/tegra/tegra234.c > @@ -449,6 +449,18 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { > .security = 0x38c, > }, > }, > + }, { > + .id = TEGRA234_MEMORY_CLIENT_VIW, > + .name = "viw", > + .bpmp_id = TEGRA_ICC_BPMP_VI, > + .type = TEGRA_ICC_ISO_VI, > + .sid = TEGRA234_SID_ISO_VI, > + .regs = { > + .sid = { > + .override = 0x390, > + .security = 0x394, > + }, > + }, > }, { > .id = TEGRA234_MEMORY_CLIENT_NVDECSRD, > .name = "nvdecsrd", > @@ -621,6 +633,30 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { > .security = 0x50c, > }, > }, > + }, { > + .id = TEGRA234_MEMORY_CLIENT_VIFALR, > + .name = "vifalr", > + .bpmp_id = TEGRA_ICC_BPMP_VIFAL, > + .type = TEGRA_ICC_ISO_VIFAL, > + .sid = TEGRA234_SID_ISO_VIFALC, > + .regs = { > + .sid = { > + .override = 0x5e0, > + .security = 0x5e4, > + }, > + }, > + }, { > + .id = TEGRA234_MEMORY_CLIENT_VIFALW, > + .name = "vifalw", > + .bpmp_id = TEGRA_ICC_BPMP_VIFAL, > + .type = TEGRA_ICC_ISO_VIFAL, > + .sid = TEGRA234_SID_ISO_VIFALC, > + .regs = { > + .sid = { > + .override = 0x5e8, > + .security = 0x5ec, > + }, > + }, > }, { > .id = TEGRA234_MEMORY_CLIENT_DLA0RDA, > .name = "dla0rda", > @@ -701,6 +737,30 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { > .security = 0x62c, > }, > }, > + }, { > + .id = TEGRA234_MEMORY_CLIENT_RCER, > + .name = "rcer", > + .bpmp_id = TEGRA_ICC_BPMP_RCE, > + .type = TEGRA_ICC_NISO, > + .sid = TEGRA234_SID_RCE, > + .regs = { > + .sid = { > + .override = 0x690, > + .security = 0x694, > + }, > + }, > + }, { > + .id = TEGRA234_MEMORY_CLIENT_RCEW, > + .name = "rcew", > + .bpmp_id = TEGRA_ICC_BPMP_RCE, > + .type = TEGRA_ICC_NISO, > + .sid = TEGRA234_SID_RCE, > + .regs = { > + .sid = { > + .override = 0x698, > + .security = 0x69c, > + }, > + }, > }, { > .id = TEGRA234_MEMORY_CLIENT_PCIE0R, > .name = "pcie0r", > -- > 2.34.1 >
On 12/10/2023 13:03, Thierry Reding wrote: > On Thu, Oct 12, 2023 at 11:49:09AM +0100, Jon Hunter wrote: >> Add the Tegra234 memory client entries for the Real-time Camera Engine >> (RCE) and Video Input (VI) devices. >> >> Signed-off-by: Jon Hunter <jonathanh@nvidia.com> >> --- >> drivers/memory/tegra/tegra234.c | 60 +++++++++++++++++++++++++++++++++ >> 1 file changed, 60 insertions(+) > > Krzysztof, > > again, let me know how you want to handle this. I can pick it up into > the Tegra tree along with Sumit's 2-patch series, or you can take these > if you prefer, in which case: > > Acked-by: Thierry Reding <treding@nvidia.com> I think there are no conflicts with the second patchset, so I just grabbed it. Thanks. Best regards, Krzysztof
On Thu, 12 Oct 2023 11:49:09 +0100, Jon Hunter wrote: > Add the Tegra234 memory client entries for the Real-time Camera Engine > (RCE) and Video Input (VI) devices. > > Applied, thanks! [1/1] memory: tegra: Add Tegra234 clients for RCE and VI https://git.kernel.org/krzk/linux-mem-ctrl/c/9def28f3b8634e4f1fa92a77ccb65fbd2d03af34 Best regards,
diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c index 9e5b5dbd9c8d..42c79f9a70af 100644 --- a/drivers/memory/tegra/tegra234.c +++ b/drivers/memory/tegra/tegra234.c @@ -449,6 +449,18 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { .security = 0x38c, }, }, + }, { + .id = TEGRA234_MEMORY_CLIENT_VIW, + .name = "viw", + .bpmp_id = TEGRA_ICC_BPMP_VI, + .type = TEGRA_ICC_ISO_VI, + .sid = TEGRA234_SID_ISO_VI, + .regs = { + .sid = { + .override = 0x390, + .security = 0x394, + }, + }, }, { .id = TEGRA234_MEMORY_CLIENT_NVDECSRD, .name = "nvdecsrd", @@ -621,6 +633,30 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { .security = 0x50c, }, }, + }, { + .id = TEGRA234_MEMORY_CLIENT_VIFALR, + .name = "vifalr", + .bpmp_id = TEGRA_ICC_BPMP_VIFAL, + .type = TEGRA_ICC_ISO_VIFAL, + .sid = TEGRA234_SID_ISO_VIFALC, + .regs = { + .sid = { + .override = 0x5e0, + .security = 0x5e4, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_VIFALW, + .name = "vifalw", + .bpmp_id = TEGRA_ICC_BPMP_VIFAL, + .type = TEGRA_ICC_ISO_VIFAL, + .sid = TEGRA234_SID_ISO_VIFALC, + .regs = { + .sid = { + .override = 0x5e8, + .security = 0x5ec, + }, + }, }, { .id = TEGRA234_MEMORY_CLIENT_DLA0RDA, .name = "dla0rda", @@ -701,6 +737,30 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { .security = 0x62c, }, }, + }, { + .id = TEGRA234_MEMORY_CLIENT_RCER, + .name = "rcer", + .bpmp_id = TEGRA_ICC_BPMP_RCE, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_RCE, + .regs = { + .sid = { + .override = 0x690, + .security = 0x694, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_RCEW, + .name = "rcew", + .bpmp_id = TEGRA_ICC_BPMP_RCE, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_RCE, + .regs = { + .sid = { + .override = 0x698, + .security = 0x69c, + }, + }, }, { .id = TEGRA234_MEMORY_CLIENT_PCIE0R, .name = "pcie0r",
Add the Tegra234 memory client entries for the Real-time Camera Engine (RCE) and Video Input (VI) devices. Signed-off-by: Jon Hunter <jonathanh@nvidia.com> --- drivers/memory/tegra/tegra234.c | 60 +++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+)