Tegra194: memctrl: remove streamid override cfg registers

The stream ID override configuration is saved during System Suspend
as part MB1 bct. This change removes the same support from the Tegra194
platform code as a result.

Change-Id: I4c19dc0d8b29190908673fb5ed7ed892af8906ab
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>

diff --git a/plat/nvidia/tegra/soc/t194/plat_memctrl.c b/plat/nvidia/tegra/soc/t194/plat_memctrl.c
index 078c72ab96c3ca609cc58f4895dbaf2e04f6af03..f92d40a60db9f2cadf12220479074fb777c8b694 100644 (file)
--- a/plat/nvidia/tegra/soc/t194/plat_memctrl.c
+++ b/plat/nvidia/tegra/soc/t194/plat_memctrl.c
@@ -160,254 +160,6 @@ const static mc_streamid_security_cfg_t tegra194_streamid_sec_cfgs[] = {
  ******************************************************************************/
 static __attribute__((aligned(16))) mc_regs_t tegra194_mc_context[] = {
        _START_OF_TABLE_,
-       mc_make_sid_security_cfg(HDAR),
-       mc_make_sid_security_cfg(HOST1XDMAR),
-       mc_make_sid_security_cfg(NVENCSRD),
-       mc_make_sid_security_cfg(SATAR),
-       mc_make_sid_security_cfg(NVENCSWR),
-       mc_make_sid_security_cfg(HDAW),
-       mc_make_sid_security_cfg(SATAW),
-       mc_make_sid_security_cfg(ISPRA),
-       mc_make_sid_security_cfg(ISPFALR),
-       mc_make_sid_security_cfg(ISPWA),
-       mc_make_sid_security_cfg(ISPWB),
-       mc_make_sid_security_cfg(XUSB_HOSTR),
-       mc_make_sid_security_cfg(XUSB_HOSTW),
-       mc_make_sid_security_cfg(XUSB_DEVR),
-       mc_make_sid_security_cfg(XUSB_DEVW),
-       mc_make_sid_security_cfg(TSECSRD),
-       mc_make_sid_security_cfg(TSECSWR),
-       mc_make_sid_security_cfg(SDMMCRA),
-       mc_make_sid_security_cfg(SDMMCR),
-       mc_make_sid_security_cfg(SDMMCRAB),
-       mc_make_sid_security_cfg(SDMMCWA),
-       mc_make_sid_security_cfg(SDMMCW),
-       mc_make_sid_security_cfg(SDMMCWAB),
-       mc_make_sid_security_cfg(VICSRD),
-       mc_make_sid_security_cfg(VICSWR),
-       mc_make_sid_security_cfg(VIW),
-       mc_make_sid_security_cfg(NVDECSRD),
-       mc_make_sid_security_cfg(NVDECSWR),
-       mc_make_sid_security_cfg(APER),
-       mc_make_sid_security_cfg(APEW),
-       mc_make_sid_security_cfg(NVJPGSRD),
-       mc_make_sid_security_cfg(NVJPGSWR),
-       mc_make_sid_security_cfg(SESRD),
-       mc_make_sid_security_cfg(SESWR),
-       mc_make_sid_security_cfg(AXIAPR),
-       mc_make_sid_security_cfg(AXIAPW),
-       mc_make_sid_security_cfg(ETRR),
-       mc_make_sid_security_cfg(ETRW),
-       mc_make_sid_security_cfg(TSECSRDB),
-       mc_make_sid_security_cfg(TSECSWRB),
-       mc_make_sid_security_cfg(AXISR),
-       mc_make_sid_security_cfg(AXISW),
-       mc_make_sid_security_cfg(EQOSR),
-       mc_make_sid_security_cfg(EQOSW),
-       mc_make_sid_security_cfg(UFSHCR),
-       mc_make_sid_security_cfg(UFSHCW),
-       mc_make_sid_security_cfg(NVDISPLAYR),
-       mc_make_sid_security_cfg(BPMPR),
-       mc_make_sid_security_cfg(BPMPW),
-       mc_make_sid_security_cfg(BPMPDMAR),
-       mc_make_sid_security_cfg(BPMPDMAW),
-       mc_make_sid_security_cfg(AONR),
-       mc_make_sid_security_cfg(AONW),
-       mc_make_sid_security_cfg(AONDMAR),
-       mc_make_sid_security_cfg(AONDMAW),
-       mc_make_sid_security_cfg(SCER),
-       mc_make_sid_security_cfg(SCEW),
-       mc_make_sid_security_cfg(SCEDMAR),
-       mc_make_sid_security_cfg(SCEDMAW),
-       mc_make_sid_security_cfg(APEDMAR),
-       mc_make_sid_security_cfg(APEDMAW),
-       mc_make_sid_security_cfg(NVDISPLAYR1),
-       mc_make_sid_security_cfg(VICSRD1),
-       mc_make_sid_security_cfg(NVDECSRD1),
-       mc_make_sid_security_cfg(VIFALR),
-       mc_make_sid_security_cfg(VIFALW),
-       mc_make_sid_security_cfg(DLA0RDA),
-       mc_make_sid_security_cfg(DLA0FALRDB),
-       mc_make_sid_security_cfg(DLA0WRA),
-       mc_make_sid_security_cfg(DLA0FALWRB),
-       mc_make_sid_security_cfg(DLA1RDA),
-       mc_make_sid_security_cfg(DLA1FALRDB),
-       mc_make_sid_security_cfg(DLA1WRA),
-       mc_make_sid_security_cfg(DLA1FALWRB),
-       mc_make_sid_security_cfg(PVA0RDA),
-       mc_make_sid_security_cfg(PVA0RDB),
-       mc_make_sid_security_cfg(PVA0RDC),
-       mc_make_sid_security_cfg(PVA0WRA),
-       mc_make_sid_security_cfg(PVA0WRB),
-       mc_make_sid_security_cfg(PVA0WRC),
-       mc_make_sid_security_cfg(PVA1RDA),
-       mc_make_sid_security_cfg(PVA1RDB),
-       mc_make_sid_security_cfg(PVA1RDC),
-       mc_make_sid_security_cfg(PVA1WRA),
-       mc_make_sid_security_cfg(PVA1WRB),
-       mc_make_sid_security_cfg(PVA1WRC),
-       mc_make_sid_security_cfg(RCER),
-       mc_make_sid_security_cfg(RCEW),
-       mc_make_sid_security_cfg(RCEDMAR),
-       mc_make_sid_security_cfg(RCEDMAW),
-       mc_make_sid_security_cfg(NVENC1SRD),
-       mc_make_sid_security_cfg(NVENC1SWR),
-       mc_make_sid_security_cfg(PCIE0R),
-       mc_make_sid_security_cfg(PCIE0W),
-       mc_make_sid_security_cfg(PCIE1R),
-       mc_make_sid_security_cfg(PCIE1W),
-       mc_make_sid_security_cfg(PCIE2AR),
-       mc_make_sid_security_cfg(PCIE2AW),
-       mc_make_sid_security_cfg(PCIE3R),
-       mc_make_sid_security_cfg(PCIE3W),
-       mc_make_sid_security_cfg(PCIE4R),
-       mc_make_sid_security_cfg(PCIE4W),
-       mc_make_sid_security_cfg(PCIE5R),
-       mc_make_sid_security_cfg(PCIE5W),
-       mc_make_sid_security_cfg(ISPFALW),
-       mc_make_sid_security_cfg(DLA0RDA1),
-       mc_make_sid_security_cfg(DLA1RDA1),
-       mc_make_sid_security_cfg(PVA0RDA1),
-       mc_make_sid_security_cfg(PVA0RDB1),
-       mc_make_sid_security_cfg(PVA1RDA1),
-       mc_make_sid_security_cfg(PVA1RDB1),
-       mc_make_sid_security_cfg(PCIE5R1),
-       mc_make_sid_security_cfg(NVENCSRD1),
-       mc_make_sid_security_cfg(NVENC1SRD1),
-       mc_make_sid_security_cfg(ISPRA1),
-       mc_make_sid_security_cfg(PCIE0R1),
-       mc_make_sid_security_cfg(MIU0R),
-       mc_make_sid_security_cfg(MIU0W),
-       mc_make_sid_security_cfg(MIU1R),
-       mc_make_sid_security_cfg(MIU1W),
-       mc_make_sid_security_cfg(MIU2R),
-       mc_make_sid_security_cfg(MIU2W),
-       mc_make_sid_security_cfg(MIU3R),
-       mc_make_sid_security_cfg(MIU3W),
-       mc_make_sid_override_cfg(HDAR),
-       mc_make_sid_override_cfg(HOST1XDMAR),
-       mc_make_sid_override_cfg(NVENCSRD),
-       mc_make_sid_override_cfg(SATAR),
-       mc_make_sid_override_cfg(NVENCSWR),
-       mc_make_sid_override_cfg(HDAW),
-       mc_make_sid_override_cfg(SATAW),
-       mc_make_sid_override_cfg(ISPRA),
-       mc_make_sid_override_cfg(ISPFALR),
-       mc_make_sid_override_cfg(ISPWA),
-       mc_make_sid_override_cfg(ISPWB),
-       mc_make_sid_override_cfg(XUSB_HOSTR),
-       mc_make_sid_override_cfg(XUSB_HOSTW),
-       mc_make_sid_override_cfg(XUSB_DEVR),
-       mc_make_sid_override_cfg(XUSB_DEVW),
-       mc_make_sid_override_cfg(TSECSRD),
-       mc_make_sid_override_cfg(TSECSWR),
-       mc_make_sid_override_cfg(SDMMCRA),
-       mc_make_sid_override_cfg(SDMMCR),
-       mc_make_sid_override_cfg(SDMMCRAB),
-       mc_make_sid_override_cfg(SDMMCWA),
-       mc_make_sid_override_cfg(SDMMCW),
-       mc_make_sid_override_cfg(SDMMCWAB),
-       mc_make_sid_override_cfg(VICSRD),
-       mc_make_sid_override_cfg(VICSWR),
-       mc_make_sid_override_cfg(VIW),
-       mc_make_sid_override_cfg(NVDECSRD),
-       mc_make_sid_override_cfg(NVDECSWR),
-       mc_make_sid_override_cfg(APER),
-       mc_make_sid_override_cfg(APEW),
-       mc_make_sid_override_cfg(NVJPGSRD),
-       mc_make_sid_override_cfg(NVJPGSWR),
-       mc_make_sid_override_cfg(SESRD),
-       mc_make_sid_override_cfg(SESWR),
-       mc_make_sid_override_cfg(AXIAPR),
-       mc_make_sid_override_cfg(AXIAPW),
-       mc_make_sid_override_cfg(ETRR),
-       mc_make_sid_override_cfg(ETRW),
-       mc_make_sid_override_cfg(TSECSRDB),
-       mc_make_sid_override_cfg(TSECSWRB),
-       mc_make_sid_override_cfg(AXISR),
-       mc_make_sid_override_cfg(AXISW),
-       mc_make_sid_override_cfg(EQOSR),
-       mc_make_sid_override_cfg(EQOSW),
-       mc_make_sid_override_cfg(UFSHCR),
-       mc_make_sid_override_cfg(UFSHCW),
-       mc_make_sid_override_cfg(NVDISPLAYR),
-       mc_make_sid_override_cfg(BPMPR),
-       mc_make_sid_override_cfg(BPMPW),
-       mc_make_sid_override_cfg(BPMPDMAR),
-       mc_make_sid_override_cfg(BPMPDMAW),
-       mc_make_sid_override_cfg(AONR),
-       mc_make_sid_override_cfg(AONW),
-       mc_make_sid_override_cfg(AONDMAR),
-       mc_make_sid_override_cfg(AONDMAW),
-       mc_make_sid_override_cfg(SCER),
-       mc_make_sid_override_cfg(SCEW),
-       mc_make_sid_override_cfg(SCEDMAR),
-       mc_make_sid_override_cfg(SCEDMAW),
-       mc_make_sid_override_cfg(APEDMAR),
-       mc_make_sid_override_cfg(APEDMAW),
-       mc_make_sid_override_cfg(NVDISPLAYR1),
-       mc_make_sid_override_cfg(VICSRD1),
-       mc_make_sid_override_cfg(NVDECSRD1),
-       mc_make_sid_override_cfg(VIFALR),
-       mc_make_sid_override_cfg(VIFALW),
-       mc_make_sid_override_cfg(DLA0RDA),
-       mc_make_sid_override_cfg(DLA0FALRDB),
-       mc_make_sid_override_cfg(DLA0WRA),
-       mc_make_sid_override_cfg(DLA0FALWRB),
-       mc_make_sid_override_cfg(DLA1RDA),
-       mc_make_sid_override_cfg(DLA1FALRDB),
-       mc_make_sid_override_cfg(DLA1WRA),
-       mc_make_sid_override_cfg(DLA1FALWRB),
-       mc_make_sid_override_cfg(PVA0RDA),
-       mc_make_sid_override_cfg(PVA0RDB),
-       mc_make_sid_override_cfg(PVA0RDC),
-       mc_make_sid_override_cfg(PVA0WRA),
-       mc_make_sid_override_cfg(PVA0WRB),
-       mc_make_sid_override_cfg(PVA0WRC),
-       mc_make_sid_override_cfg(PVA1RDA),
-       mc_make_sid_override_cfg(PVA1RDB),
-       mc_make_sid_override_cfg(PVA1RDC),
-       mc_make_sid_override_cfg(PVA1WRA),
-       mc_make_sid_override_cfg(PVA1WRB),
-       mc_make_sid_override_cfg(PVA1WRC),
-       mc_make_sid_override_cfg(RCER),
-       mc_make_sid_override_cfg(RCEW),
-       mc_make_sid_override_cfg(RCEDMAR),
-       mc_make_sid_override_cfg(RCEDMAW),
-       mc_make_sid_override_cfg(NVENC1SRD),
-       mc_make_sid_override_cfg(NVENC1SWR),
-       mc_make_sid_override_cfg(PCIE0R),
-       mc_make_sid_override_cfg(PCIE0W),
-       mc_make_sid_override_cfg(PCIE1R),
-       mc_make_sid_override_cfg(PCIE1W),
-       mc_make_sid_override_cfg(PCIE2AR),
-       mc_make_sid_override_cfg(PCIE2AW),
-       mc_make_sid_override_cfg(PCIE3R),
-       mc_make_sid_override_cfg(PCIE3W),
-       mc_make_sid_override_cfg(PCIE4R),
-       mc_make_sid_override_cfg(PCIE4W),
-       mc_make_sid_override_cfg(PCIE5R),
-       mc_make_sid_override_cfg(PCIE5W),
-       mc_make_sid_override_cfg(ISPFALW),
-       mc_make_sid_override_cfg(DLA0RDA1),
-       mc_make_sid_override_cfg(DLA1RDA1),
-       mc_make_sid_override_cfg(PVA0RDA1),
-       mc_make_sid_override_cfg(PVA0RDB1),
-       mc_make_sid_override_cfg(PVA1RDA1),
-       mc_make_sid_override_cfg(PVA1RDB1),
-       mc_make_sid_override_cfg(PCIE5R1),
-       mc_make_sid_override_cfg(NVENCSRD1),
-       mc_make_sid_override_cfg(NVENC1SRD1),
-       mc_make_sid_override_cfg(ISPRA1),
-       mc_make_sid_override_cfg(PCIE0R1),
-       mc_make_sid_override_cfg(MIU0R),
-       mc_make_sid_override_cfg(MIU0W),
-       mc_make_sid_override_cfg(MIU1R),
-       mc_make_sid_override_cfg(MIU1W),
-       mc_make_sid_override_cfg(MIU2R),
-       mc_make_sid_override_cfg(MIU2W),
-       mc_make_sid_override_cfg(MIU3R),
-       mc_make_sid_override_cfg(MIU3W),
        mc_smmu_bypass_cfg,     /* TBU settings */
        _END_OF_TABLE_,
 };