ARM: tegra: mcerr: Update client arrays
Alex Waterman [Mon, 7 Oct 2013 20:44:21 +0000 (13:44 -0700)]
Use a script to generate the client arrays. Also modifies the
usge of the name field in the client and adds a swgid field.
Before 'name' was really the swgid, but now name holds to true
client name instead of the swgid. This allow for more detail
in the error messages printed by mcerr.

Change-Id: I2a7a912524a1d06b121d9567d32d29bc0b5a1282
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/288592
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>

arch/arm/mach-tegra/mcerr-t11.c
arch/arm/mach-tegra/mcerr-t12.c
arch/arm/mach-tegra/mcerr-t14.c
arch/arm/mach-tegra/mcerr-t3.c
arch/arm/mach-tegra/mcerr.h

index e5eca1c..0d05dde 100644 (file)
 
 #include "mcerr.h"
 
-#define dummy_client   client("dummy")
+/*** Auto generated by `mcp.pl'. Do not modify! ***/
+
+#define dummy_client   client("dummy", "dummy")
 
 struct mc_client mc_clients[] = {
-       client("ptc"),
-       client("display0_wina"),        client("display1_wina"),
-       client("display0_winb"),        client("display1_winb"),
-       client("display0_winc"),        client("display1_winc"),
-       dummy_client,                   dummy_client,
-       client("epp"),
-       client("gr2d_pat"),             client("gr2d_src"),
-       dummy_client,                   dummy_client,
-       dummy_client,                   client("avp"),
-       client("display0_cursor"),      client("display1_cursor"),
-       client("gr3d_fdc0"),            client("gr3d_fdc1"),
-       client("gr2d_dst"),
-       client("hda"),
-       client("host1x_dma"),           client("host1x_generic"),
-       client("gr3d0_idx"),            dummy_client,
-       dummy_client,                   dummy_client,
-       client("msenc"),
-       client("ahb_dma"),              client("ahb_slave"),
-       dummy_client,                   client("gr3d0_tex"),
-       dummy_client,
-       client("vde_bsev"),             client("vde_mbe"),
-       client("vde_mce"),              client("vde_tpe"),
-       client("cpu_lp"),               client("cpu"),
-       client("epp_u"),
-       client("epp_v"),
-       client("epp_y"),
-       client("msenc"),
-       client("vi_sb"),                client("vi_u"),
-       client("vi_v"),                 client("vi_y"),
-       client("gr2d_dst"),
-       dummy_client,
-       client("avp"),
-       client("gr3d_fdc0"),            client("gr3d_fdc1"),
-       client("hda"),
-       client("host1x"),
-       client("isp"),
-       client("cpu_lp"),               client("cpu"),
-       dummy_client,
-       client("ahb_dma"),              client("ahb_slave"),
-       dummy_client,
-       client("vde_bsev"),             client("vde_dbg"),
-       client("vde_mbe"),              client("vde_tpm"),
-       dummy_client,                   dummy_client,
-       dummy_client,                   dummy_client,
-       dummy_client,                   dummy_client,
-       dummy_client,                   dummy_client,
-       client("xusb_host"),            client("xusb_host"),
-       client("xusb_dev"),             client("xusb_dev"),
-       client("gr3d_fdc2"),            client("gr3d_fdc2"),
-       client("gr3d_fdc3"),            client("gr3d_fdc3"),
-       client("emucif"),               client("emucif"),
-       client("tsec"),                 client("tsec"),
-       client("unknown"),
+       client("ptc", "csr_ptcr"),
+       client("dc", "csr_display0a"),
+       client("dcb", "csr_display0ab"),
+       client("dc", "csr_display0b"),
+       client("dcb", "csr_display0bb"),
+       client("dc", "csr_display0c"),
+       client("dcb", "csr_display0cb"),
+       dummy_client,
+       dummy_client,
+       client("epp", "cbr_eppup"),
+       client("g2", "cbr_g2pr"),
+       client("g2", "cbr_g2sr"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("avpc", "csr_avpcarm7r"),
+       client("dc", "csr_displayhc"),
+       client("dcb", "csr_displayhcb"),
+       client("nv", "csr_fdcdrd"),
+       client("nv", "csr_fdcdrd2"),
+       client("g2", "csr_g2dr"),
+       client("hda", "csr_hdar"),
+       client("hc", "csr_host1xdmar"),
+       client("hc", "csr_host1xr"),
+       client("nv", "csr_idxsrd"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("msenc", "csr_msencsrd"),
+       client("ppcs", "csr_ppcsahbdmar"),
+       client("ppcs", "csr_ppcsahbslvr"),
+       dummy_client,
+       client("nv", "csr_texl2srd"),
+       dummy_client,
+       client("vde", "csr_vdebsevr"),
+       client("vde", "csr_vdember"),
+       client("vde", "csr_vdemcer"),
+       client("vde", "csr_vdetper"),
+       client("mpcorelp", "csr_mpcorelpr"),
+       client("mpcore", "csr_mpcorer"),
+       client("epp", "cbw_eppu"),
+       client("epp", "cbw_eppv"),
+       client("epp", "cbw_eppy"),
+       client("msenc", "csw_msencswr"),
+       client("vi", "cbw_viwsb"),
+       client("vi", "cbw_viwu"),
+       client("vi", "cbw_viwv"),
+       client("vi", "cbw_viwy"),
+       client("g2", "ccw_g2dw"),
+       dummy_client,
+       client("avpc", "csw_avpcarm7w"),
+       client("nv", "csw_fdcdwr"),
+       client("nv", "csw_fdcdwr2"),
+       client("hda", "csw_hdaw"),
+       client("hc", "csw_host1xw"),
+       client("isp", "csw_ispw"),
+       client("mpcorelp", "csw_mpcorelpw"),
+       client("mpcore", "csw_mpcorew"),
+       dummy_client,
+       client("ppcs", "csw_ppcsahbdmaw"),
+       client("ppcs", "csw_ppcsahbslvw"),
+       dummy_client,
+       client("vde", "csw_vdebsevw"),
+       client("vde", "csw_vdedbgw"),
+       client("vde", "csw_vdembew"),
+       client("vde", "csw_vdetpmw"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("xusb_host", "csr_xusb_hostr"),
+       client("xusb_host", "csw_xusb_hostw"),
+       client("xusb_dev", "csr_xusb_devr"),
+       client("xusb_dev", "csw_xusb_devw"),
+       client("nv", "csw_fdcdwr3"),
+       client("nv", "csr_fdcdrd3"),
+       client("nv", "csw_fdcdwr4"),
+       client("nv", "csr_fdcdrd4"),
+       client("emucif", "csr_emucifr"),
+       client("emucif", "csw_emucifw"),
+       client("tsec", "csr_tsecsrd"),
+       client("tsec", "csw_tsecswr"),
 };
-
 int mc_client_last = ARRAY_SIZE(mc_clients) - 1;
+/*** Done. ***/
 
 static void mcerr_t11x_info_update(struct mc_client *c, u32 stat)
 {
index 307c2b0..141f8ec 100644 (file)
@@ -3,7 +3,7 @@
  *
  * Tegra 12x SoC-specific mcerr code.
  *
- * Copyright (c) 2012, NVIDIA Corporation. All rights reserved.
+ * Copyright (c) 2012-2013, NVIDIA Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 
 #include "mcerr.h"
 
-#define dummy_client   client("dummy")
+/*** Auto generated by `mcp.pl'. Do not modify! ***/
+
+#define dummy_client   client("dummy", "dummy")
 
 struct mc_client mc_clients[] = {
-       client("ptc"),
-       client("display0_wina"),        client("display1_wina"),
-       client("display0_winb"),        client("display1_winb"),
-       client("display0_winc"),        client("display1_winc"),
-       dummy_client,                   dummy_client,
-       dummy_client,                   dummy_client,
-       dummy_client,                   dummy_client,
-       dummy_client,
-       client("afi"),
-       client("avpc"),
-       client("display0_cursor"),      client("display1_cursor"),
-       dummy_client,                   dummy_client,
-       dummy_client,
-       client("hda"),                  client("host1x_dma"),
-       client("host1x_generic"),
-       dummy_client,                   dummy_client,
-       dummy_client,                   dummy_client,
-       client("msenc"),
-       client("ahb_dma"),              client("ahb_slave"),
-       client("sata"),
-       dummy_client,                   dummy_client,
-       client("vde_bsev"),             client("vde_mbe"),
-       client("vde_mce"),              client("vde_tpe"),
-       client("cpu_lp"),               client("cpu"),
-       dummy_client,                   dummy_client,
-       dummy_client,                   client("msenc"),
-       dummy_client,                   dummy_client,
-       dummy_client,                   dummy_client,
-       dummy_client,
-       client("afi"),                  client("avpc"),
-       dummy_client,                   dummy_client,
-       client("hda"),                  client("host1x"),
-       dummy_client,
-       client("cpu_lp"),               client("cpu"),
-       dummy_client,
-       client("ahb_dma_wr"),           client("ahb_slave_wr"),
-       client("sata"),                 client("vde_bsev"),
-       client("vde_dbg"),              client("vde_mbe"),
-       client("vde_tpe"),
-       dummy_client,                   dummy_client,
-       client("isp2_a"),
-       dummy_client,
-       client("isp2_a"),               client("isp2_b"),
-       dummy_client,                   dummy_client,
-       client("xusb_host"),            client("xusb_host"),
-       client("xusb_dev"),             client("xusb_dev"),
-       client("isp2_a"),
-       dummy_client,
-       client("isp2_a"),               client("isp2_b"),
-       dummy_client,                   dummy_client,
-       client("tsec"),                 client("tsec"),
-       client("cpu_lp"),               client("cpu"),
-       client("gpu"),                  client("gpu"),
-       client("display0_wint"),
-       dummy_client,
-       dummy_client,                   dummy_client,
-       dummy_client,                   dummy_client,
-       client("sdmmc1a"),              client("sdmmc2a"),
-       client("sdmmc3a"),              client("sdmmc4a"),
-       client("sdmmc1a"),              client("sdmmc2a"),
-       client("sdmmc3a"),              client("sdmmc4a"),
-       dummy_client,                   dummy_client,
-       dummy_client,                   dummy_client,
-       client("vic"),                  client("vic"),
-       dummy_client,                   dummy_client,
-       dummy_client,                   dummy_client,
-       client("vi"),
-       client("display0_wind"),
-       client("unknown"),
+       client("ptc", "csr_ptcr"),
+       client("dc", "csr_display0a"),
+       client("dcb", "csr_display0ab"),
+       client("dc", "csr_display0b"),
+       client("dcb", "csr_display0bb"),
+       client("dc", "csr_display0c"),
+       client("dcb", "csr_display0cb"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("afi", "csr_afir"),
+       client("avpc", "csr_avpcarm7r"),
+       client("dc", "csr_displayhc"),
+       client("dcb", "csr_displayhcb"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("hda", "csr_hdar"),
+       client("hc", "csr_host1xdmar"),
+       client("hc", "csr_host1xr"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("msenc", "csr_msencsrd"),
+       client("ppcs", "csr_ppcsahbdmar"),
+       client("ppcs", "csr_ppcsahbslvr"),
+       client("sata", "csr_satar"),
+       dummy_client,
+       dummy_client,
+       client("vde", "csr_vdebsevr"),
+       client("vde", "csr_vdember"),
+       client("vde", "csr_vdemcer"),
+       client("vde", "csr_vdetper"),
+       client("mpcorelp", "csr_mpcorelpr"),
+       client("mpcore", "csr_mpcorer"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("msenc", "csw_msencswr"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("afi", "csw_afiw"),
+       client("avpc", "csw_avpcarm7w"),
+       dummy_client,
+       dummy_client,
+       client("hda", "csw_hdaw"),
+       client("hc", "csw_host1xw"),
+       dummy_client,
+       client("mpcorelp", "csw_mpcorelpw"),
+       client("mpcore", "csw_mpcorew"),
+       dummy_client,
+       client("ppcs", "csw_ppcsahbdmaw"),
+       client("ppcs", "csw_ppcsahbslvw"),
+       client("sata", "csw_sataw"),
+       client("vde", "csw_vdebsevw"),
+       client("vde", "csw_vdedbgw"),
+       client("vde", "csw_vdembew"),
+       client("vde", "csw_vdetpmw"),
+       dummy_client,
+       dummy_client,
+       client("isp2", "csr_ispra"),
+       dummy_client,
+       client("isp2", "csw_ispwa"),
+       client("isp2", "csw_ispwb"),
+       dummy_client,
+       dummy_client,
+       client("xusb_host", "csr_xusb_hostr"),
+       client("xusb_host", "csw_xusb_hostw"),
+       client("xusb_dev", "csr_xusb_devr"),
+       client("xusb_dev", "csw_xusb_devw"),
+       client("isp2b", "csr_isprab"),
+       dummy_client,
+       client("isp2b", "csw_ispwab"),
+       client("isp2b", "csw_ispwbb"),
+       dummy_client,
+       dummy_client,
+       client("tsec", "csr_tsecsrd"),
+       client("tsec", "csw_tsecswr"),
+       client("a9avp", "csr_a9avpscr"),
+       client("a9avp", "csw_a9avpscw"),
+       client("gpu", "csr_gpusrd"),
+       client("gpu", "csw_gpuswr"),
+       client("dc", "csr_displayt"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("sdmmc1a", "csr_sdmmcra"),
+       client("sdmmc2a", "csr_sdmmcraa"),
+       client("sdmmc3a", "csr_sdmmcr"),
+       client("sdmmc4a", "csr_sdmmcrab"),
+       client("sdmmc1a", "csw_sdmmcwa"),
+       client("sdmmc2a", "csw_sdmmcwaa"),
+       client("sdmmc3a", "csw_sdmmcw"),
+       client("sdmmc4a", "csw_sdmmcwab"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("vic", "csr_vicsrd"),
+       client("vic", "csw_vicswr"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("vi", "csw_viw"),
+       client("dc", "csr_displayd"),
 };
-
 int mc_client_last = ARRAY_SIZE(mc_clients) - 1;
+/*** Done. ***/
 
 static void mcerr_t12x_info_update(struct mc_client *c, u32 stat)
 {
index d201f92..8ca8231 100644 (file)
 
 #include "mcerr.h"
 
-#define dummy_client   client("dummy")
+/*** Auto generated by `mcp.pl'. Do not modify! ***/
+
+#define dummy_client   client("dummy", "dummy")
 
 struct mc_client mc_clients[] = {
-       client("ptc"),
-       client("display0_wina"),        client("display1_wina"),
-       client("display0_winb"),        client("display1_winb"),
-       client("display0_winc"),        client("display1_winc"),
-       dummy_client,                   dummy_client,
-       client("epp"),
-       client("gr2d_pat"), /* 10 */    client("gr2d_src"),
-       dummy_client,                   dummy_client,
-       dummy_client,                   client("avp"),
-       client("display0_cursor"),      client("display1_cursor"),
-       client("gr3d_fdc0"),            client("gr3d_fdc1"),
-       client("gr2d_dst"), /* 20 */
-       client("hda"),
-       client("host1x_dma"),           client("host1x_generic"),
-       client("gr3d0_idx"),            dummy_client,
-       dummy_client,                   dummy_client,
-       client("msenc"),
-       client("ahb_dma"),              client("ahb_slave_r"), /* 30 */
-       dummy_client,                   client("gr3d0_tex"),
-       dummy_client,
-       client("vde_bsev"),             client("vde_mbe"),
-       client("vde_mce"),              client("vde_tpe"),
-       client("cpu_lp"),               client("cpu"),
-       client("epp_u"), /* 40 */
-       client("epp_v"),
-       client("epp_y"),
-       client("msenc"),
-       client("vi_sb"),                client("vi_u"),
-       client("vi_v"),                 client("vi_y"),
-       client("gr2d_dst"),
-       dummy_client,
-       client("avp"), /* 50 */
-       client("gr3d_fdc0"),            client("gr3d_fdc1"),
-       client("hda"),
-       client("host1x"),
-       client("isp"),
-       client("cpu_lp"),               client("cpu"),
-       dummy_client,
-       client("ahb_dma"),              client("ahb_slave_w"), /* 60 */
-       dummy_client,
-       client("vde_bsev"),             client("vde_dbg"),
-       client("vde_mbe"),              client("vde_tpm"),
-       dummy_client,                   dummy_client,
-       client("ve_ispra"),             dummy_client,
-       client("ve_ispwa"), /* 70 */    client("ve_ispwb"),
-       dummy_client,                   dummy_client,
-       dummy_client,                   dummy_client,
-       dummy_client,                   dummy_client,
-       dummy_client,                   dummy_client,
-       dummy_client, /* 80 */          dummy_client,
-       client("emucif"),               client("emucif"),
-       client("tsec"),                 client("tsec"),
-       client("viw"),                  client("bbcr"),
-       client("bbcw"),                 client("bbcllr"),
-       client("disp_t"), /* 90 */      dummy_client,
-       client("disp_d"),
+       client("ptc", "csr_ptcr"),
+       client("dc", "csr_display0a"),
+       client("dcb", "cbr_display0ab"),
+       client("dc", "csr_display0b"),
+       client("dcb", "csr_display0bb"),
+       client("dc", "csr_display0c"),
+       client("dcb", "cbr_display0cb"),
+       dummy_client,
+       dummy_client,
+       client("epp", "cbr_eppup"),
+       client("g2", "cbr_g2pr"),
+       client("g2", "cbr_g2sr"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("avpc", "csr_avpcarm7r"),
+       client("dc", "csr_displayhc"),
+       client("dcb", "csr_displayhcb"),
+       client("nv", "csr_fdcdrd"),
+       client("nv", "csr_fdcdrd2"),
+       client("g2", "csr_g2dr"),
+       client("hda", "csr_hdar"),
+       client("hc", "csr_host1xdmar"),
+       client("hc", "csr_host1xr"),
+       client("nv", "csr_idxsrd"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("msenc", "csr_msencsrd"),
+       client("ppcs", "csr_ppcsahbdmar"),
+       client("ppcs", "csr_ppcsahbslvr"),
+       dummy_client,
+       client("nv", "csr_texl2srd"),
+       dummy_client,
+       client("vde", "csr_vdebsevr"),
+       client("vde", "csr_vdember"),
+       client("vde", "csr_vdemcer"),
+       client("vde", "csr_vdetper"),
+       client("mpcorelp", "csr_mpcorelpr"),
+       client("mpcore", "csr_mpcorer"),
+       client("epp", "cbw_eppu"),
+       client("epp", "cbw_eppv"),
+       client("epp", "cbw_eppy"),
+       client("msenc", "csw_msencswr"),
+       client("vi", "cbw_viwsb"),
+       client("vi", "cbw_viwu"),
+       client("vi", "cbw_viwv"),
+       client("vi", "cbw_viwy"),
+       client("g2", "ccw_g2dw"),
+       dummy_client,
+       client("avpc", "csw_avpcarm7w"),
+       client("nv", "csw_fdcdwr"),
+       client("nv", "csw_fdcdwr2"),
+       client("hda", "csw_hdaw"),
+       client("hc", "csw_host1xw"),
+       client("isp", "csw_ispw"),
+       client("mpcorelp", "csw_mpcorelpw"),
+       client("mpcore", "csw_mpcorew"),
+       dummy_client,
+       client("ppcs", "csw_ppcsahbdmaw"),
+       client("ppcs", "csw_ppcsahbslvw"),
+       dummy_client,
+       client("vde", "csw_vdebsevw"),
+       client("vde", "csw_vdedbgw"),
+       client("vde", "csw_vdembew"),
+       client("vde", "csw_vdetpmw"),
+       dummy_client,
+       dummy_client,
+       client("isp", "csr_ispra"),
+       dummy_client,
+       client("isp", "csw_ispwa"),
+       client("isp", "csw_ispwb"),
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       dummy_client,
+       client("emucif", "csr_emucifr"),
+       client("emucif", "csw_emucifw"),
+       client("tsec", "csr_tsecsrd"),
+       client("tsec", "csw_tsecswr"),
+       client("vi", "csw_viw"),
+       client("bbmci", "csr_bbcr"),
+       client("bbmci", "csw_bbcw"),
+       client("bbmcill", "csr_bbcllr"),
+       client("dc", "csr_displayt"),
+       dummy_client,
+       client("dc", "csr_displayd"),
 };
-
 int mc_client_last = ARRAY_SIZE(mc_clients) - 1;
+/*** Done. ***/
 
 static void mcerr_t14x_info_update(struct mc_client *c, u32 stat)
 {
index 88631bc..b283d79 100644 (file)
@@ -3,7 +3,7 @@
  *
  * Tegra 3 SoC-specific mcerr code.
  *
- * Copyright (c) 2010-2012, NVIDIA Corporation. All rights reserved.
+ * Copyright (c) 2010-2013, NVIDIA Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 
 #include "mcerr.h"
 
+/*** Auto generated by `mcp.pl'. Do not modify! ***/
+
+#define dummy_client   client("dummy", "dummy")
+
 struct mc_client mc_clients[] = {
-       client("ptc"),
-       client("display0_wina"), client("display1_wina"),
-       client("display0_winb"), client("display1_winb"),
-       client("display0_winc"), client("display1_winc"),
-       client("display0_winb_vfilter"),
-       client("display1_winb_vfilter"),
-       client("epp"), client("gr2d_pat"),
-       client("gr2d_src"), client("mpe_unified"),
-       client("vi_chroma_filter"), client("pcie"),
-       client("avp"),
-       client("display0_cursor"), client("display1_cursor"),
-       client("gr3d0_fdc"), client("gr3d1_fdc"),
-       client("gr2d_dst"), client("hda"),
-       client("host1x_dma"), client("host1x_generic"),
-       client("gr3d0_idx"), client("gr3d1_idx"),
-       client("mpe_intrapred"), client("mpe_mpea"),
-       client("mpe_mpec"), client("ahb_dma"),
-       client("ahb_slave"), client("sata"),
-       client("gr3d0_tex"), client("gr3d1_tex"),
-       client("vde_bsev"), client("vde_mbe"),
-       client("vde_mce"), client("vde_tpe"),
-       client("cpu_lp"), client("cpu"),
-       client("epp_u"), client("epp_v"),
-       client("epp_y"), client("mpe_unified"),
-       client("vi_sb"), client("vi_u"),
-       client("vi_v"), client("vi_y"),
-       client("gr2d_dst"), client("pcie"),
-       client("avp"), client("gr3d0_fdc"),
-       client("gr3d1_fdc"), client("hda"),
-       client("host1x"),       client("isp"),
-       client("cpu_lp"),       client("cpu"),
-       client("mpe_mpec"), client("ahb_dma"),
-       client("ahb_slave"), client("sata"),
-       client("vde_bsev"), client("vde_dbg"),
-       client("vde_mbe"), client("vde_tpm"),
-       client("unknown"),
+       client("ptc", "csr_ptcr"),
+       client("dc", "cbr_display0a"),
+       client("dcb", "cbr_display0ab"),
+       client("dc", "cbr_display0b"),
+       client("dcb", "cbr_display0bb"),
+       client("dc", "cbr_display0c"),
+       client("dcb", "cbr_display0cb"),
+       client("dc", "cbr_display1b"),
+       client("dcb", "cbr_display1bb"),
+       client("epp", "cbr_eppup"),
+       client("g2", "cbr_g2pr"),
+       client("g2", "cbr_g2sr"),
+       client("mpe", "cbr_mpeunifbr"),
+       client("vi", "cbr_viruv"),
+       client("afi", "csr_afir"),
+       client("avpc", "csr_avpcarm7r"),
+       client("dc", "csr_displayhc"),
+       client("dcb", "csr_displayhcb"),
+       client("nv", "csr_fdcdrd"),
+       client("nv2", "csr_fdcdrd2"),
+       client("g2", "csr_g2dr"),
+       client("hda", "csr_hdar"),
+       client("hc", "csr_host1xdmar"),
+       client("hc", "csr_host1xr"),
+       client("nv", "csr_idxsrd"),
+       client("nv2", "csr_idxsrd2"),
+       client("mpe", "csr_mpe_ipred"),
+       client("mpe", "csr_mpeamemrd"),
+       client("mpe", "csr_mpecsrd"),
+       client("ppcs", "csr_ppcsahbdmar"),
+       client("ppcs", "csr_ppcsahbslvr"),
+       client("sata", "csr_satar"),
+       client("nv", "csr_texsrd"),
+       client("nv2", "csr_texsrd2"),
+       client("vde", "csr_vdebsevr"),
+       client("vde", "csr_vdember"),
+       client("vde", "csr_vdemcer"),
+       client("vde", "csr_vdetper"),
+       client("mpcorelp", "csr_mpcorelpr"),
+       client("mpcore", "csr_mpcorer"),
+       client("epp", "cbw_eppu"),
+       client("epp", "cbw_eppv"),
+       client("epp", "cbw_eppy"),
+       client("mpe", "cbw_mpeunifbw"),
+       client("vi", "cbw_viwsb"),
+       client("vi", "cbw_viwu"),
+       client("vi", "cbw_viwv"),
+       client("vi", "cbw_viwy"),
+       client("g2", "ccw_g2dw"),
+       client("afi", "csw_afiw"),
+       client("avpc", "csw_avpcarm7w"),
+       client("nv", "csw_fdcdwr"),
+       client("nv2", "csw_fdcdwr2"),
+       client("hda", "csw_hdaw"),
+       client("hc", "csw_host1xw"),
+       client("isp", "csw_ispw"),
+       client("mpcorelp", "csw_mpcorelpw"),
+       client("mpcore", "csw_mpcorew"),
+       client("mpe", "csw_mpecswr"),
+       client("ppcs", "csw_ppcsahbdmaw"),
+       client("ppcs", "csw_ppcsahbslvw"),
+       client("sata", "csw_sataw"),
+       client("vde", "csw_vdebsevw"),
+       client("vde", "csw_vdedbgw"),
+       client("vde", "csw_vdembew"),
+       client("vde", "csw_vdetpmw"),
 };
-
 int mc_client_last = ARRAY_SIZE(mc_clients) - 1;
+/*** Done. ***/
 
 /*
  * Defaults work for T30.
index fabded7..f86ebec 100644 (file)
@@ -133,6 +133,7 @@ extern void __iomem *mc;
 
 struct mc_client {
        const char *name;
+       const char *swgid;
        unsigned int intr_counts[INTR_COUNT];
 };
 
@@ -195,13 +196,13 @@ struct mcerr_chip_specific {
         * Show the statistics for each client. This is called from a debugfs
         * context - that means you can sleep and do general kernel stuff here.
         */
-       int              (*mcerr_debugfs_show)(struct seq_file *s, void *v);
+       int (*mcerr_debugfs_show)(struct seq_file *s, void *v);
 
        /* Numeric fields that must be set by the different architectures. */
        unsigned int     nr_clients;
 };
 
-#define client(_name) { .name = _name }
+#define client(_swgid, _name) { .swgid = _swgid, .name = _name }
 #define MC_ERR(_sig, _msg, _flags, _stat_reg, _addr_reg)               \
        { .sig = _sig, .msg = _msg, .flags = _flags,                    \
                        .stat_reg = _stat_reg, .addr_reg = _addr_reg }