]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
projects / mirror_ubuntu-zesty-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a4f7bd3)
drm/nouveau/pmu: convert to new-style nvkm_subdev
authorBen Skeggs <bskeggs@redhat.com>
Thu, 20 Aug 2015 04:54:21 +0000 (14:54 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 28 Aug 2015 02:40:45 +0000 (12:40 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
24 files changed:
drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/Kbuild patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf110.fuc4 [deleted file] patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf110.fuc4.h [deleted file] patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4 [new file with mode: 0644] patch | blob
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h [new file with mode: 0644] patch | blob
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf100.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf110.c [deleted file] patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf119.c [new file with mode: 0644] patch | blob
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk110.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk208.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm107.c [new file with mode: 0644] patch | blob
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c patch | blob | blame | history
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h patch | blob | blame | history

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h
index 64b3a177bf88a5e2b304c38d2cdf08fafeb4f2a2..e61923d5e49cda1b9d82b07bd6bc89eab95afe2e 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h
@@ -3,6 +3,7 @@
 #include <core/subdev.h>
 
 struct nvkm_pmu {
+       const struct nvkm_pmu_func *func;
        struct nvkm_subdev subdev;
 
        struct {
@@ -20,24 +21,20 @@ struct nvkm_pmu {
                u32 message;
                u32 data[2];
        } recv;
-
-       int  (*message)(struct nvkm_pmu *, u32[2], u32, u32, u32, u32);
-       void (*pgob)(struct nvkm_pmu *, bool);
 };
 
-static inline struct nvkm_pmu *
-nvkm_pmu(void *obj)
-{
-       return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_PMU);
-}
-
-extern struct nvkm_oclass *gt215_pmu_oclass;
-extern struct nvkm_oclass *gf100_pmu_oclass;
-extern struct nvkm_oclass *gf110_pmu_oclass;
-extern struct nvkm_oclass *gk104_pmu_oclass;
-extern struct nvkm_oclass *gk110_pmu_oclass;
-extern struct nvkm_oclass *gk208_pmu_oclass;
-extern struct nvkm_oclass *gk20a_pmu_oclass;
+int nvkm_pmu_send(struct nvkm_pmu *, u32 reply[2], u32 process,
+                 u32 message, u32 data0, u32 data1);
+void nvkm_pmu_pgob(struct nvkm_pmu *, bool enable);
+
+int gt215_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);
+int gf100_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);
+int gf119_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);
+int gk104_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);
+int gk110_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);
+int gk208_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);
+int gk20a_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);
+int gm107_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);
 
 /* interface to MEMX process running on PMU */
 struct nvkm_memx;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 350daa3c630ce527d195b06894a5626cc6938765..8f201022377f240fce36ae0d2e5db262ffefa71a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -1111,7 +1111,7 @@ nva3_chipset = {
        .mc = g98_mc_new,
        .mmu = nv50_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gt215_pmu_new,
+       .pmu = gt215_pmu_new,
 //     .therm = gt215_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1144,7 +1144,7 @@ nva5_chipset = {
        .mc = g98_mc_new,
        .mmu = nv50_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gt215_pmu_new,
+       .pmu = gt215_pmu_new,
 //     .therm = gt215_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1176,7 +1176,7 @@ nva8_chipset = {
        .mc = g98_mc_new,
        .mmu = nv50_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gt215_pmu_new,
+       .pmu = gt215_pmu_new,
 //     .therm = gt215_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1270,7 +1270,7 @@ nvaf_chipset = {
        .mc = g98_mc_new,
        .mmu = nv50_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gt215_pmu_new,
+       .pmu = gt215_pmu_new,
 //     .therm = gt215_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1304,7 +1304,7 @@ nvc0_chipset = {
        .mc = gf100_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gf100_pmu_new,
+       .pmu = gf100_pmu_new,
 //     .therm = gt215_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1339,7 +1339,7 @@ nvc1_chipset = {
        .mc = gf106_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gf100_pmu_new,
+       .pmu = gf100_pmu_new,
 //     .therm = gt215_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1373,7 +1373,7 @@ nvc3_chipset = {
        .mc = gf106_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gf100_pmu_new,
+       .pmu = gf100_pmu_new,
 //     .therm = gt215_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1407,7 +1407,7 @@ nvc4_chipset = {
        .mc = gf100_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gf100_pmu_new,
+       .pmu = gf100_pmu_new,
 //     .therm = gt215_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1442,7 +1442,7 @@ nvc8_chipset = {
        .mc = gf100_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gf100_pmu_new,
+       .pmu = gf100_pmu_new,
 //     .therm = gt215_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1477,7 +1477,7 @@ nvce_chipset = {
        .mc = gf100_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gf100_pmu_new,
+       .pmu = gf100_pmu_new,
 //     .therm = gt215_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1512,7 +1512,7 @@ nvcf_chipset = {
        .mc = gf106_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gf100_pmu_new,
+       .pmu = gf100_pmu_new,
 //     .therm = gt215_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1578,7 +1578,7 @@ nvd9_chipset = {
        .mc = gf106_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gf110_pmu_new,
+       .pmu = gf119_pmu_new,
 //     .therm = gf110_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1612,7 +1612,7 @@ nve4_chipset = {
        .mc = gf106_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gk104_pmu_new,
+       .pmu = gk104_pmu_new,
 //     .therm = gf110_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1648,7 +1648,7 @@ nve6_chipset = {
        .mc = gf106_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gk104_pmu_new,
+       .pmu = gk104_pmu_new,
 //     .therm = gf110_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1684,7 +1684,7 @@ nve7_chipset = {
        .mc = gf106_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gf110_pmu_new,
+       .pmu = gf119_pmu_new,
 //     .therm = gf110_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1715,7 +1715,7 @@ nvea_chipset = {
        .ltc = gk104_ltc_new,
        .mc = gk20a_mc_new,
        .mmu = gf100_mmu_new,
-//     .pmu = gk20a_pmu_new,
+       .pmu = gk20a_pmu_new,
 //     .timer = gk20a_timer_new,
 //     .volt = gk20a_volt_new,
 //     .ce[2] = gk104_ce2_new,
@@ -1744,7 +1744,7 @@ nvf0_chipset = {
        .mc = gf106_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gk110_pmu_new,
+       .pmu = gk110_pmu_new,
 //     .therm = gf110_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1780,7 +1780,7 @@ nvf1_chipset = {
        .mc = gf106_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gk110_pmu_new,
+       .pmu = gk110_pmu_new,
 //     .therm = gf110_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1816,7 +1816,7 @@ nv106_chipset = {
        .mc = gk20a_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gk208_pmu_new,
+       .pmu = gk208_pmu_new,
 //     .therm = gf110_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1851,7 +1851,7 @@ nv108_chipset = {
        .mc = gk20a_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gk208_pmu_new,
+       .pmu = gk208_pmu_new,
 //     .therm = gf110_therm_new,
 //     .timer = nv04_timer_new,
 //     .volt = nv40_volt_new,
@@ -1886,7 +1886,7 @@ nv117_chipset = {
        .mc = gk20a_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gk208_pmu_new,
+       .pmu = gm107_pmu_new,
 //     .therm = gm107_therm_new,
 //     .timer = gk20a_timer_new,
 //     .ce[0] = gk104_ce0_new,
@@ -1915,7 +1915,7 @@ nv124_chipset = {
        .mc = gk20a_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gk208_pmu_new,
+       .pmu = gm107_pmu_new,
 //     .timer = gk20a_timer_new,
 //     .ce[0] = gm204_ce0_new,
 //     .ce[1] = gm204_ce1_new,
@@ -1944,7 +1944,7 @@ nv126_chipset = {
        .mc = gk20a_mc_new,
        .mmu = gf100_mmu_new,
        .mxm = nv50_mxm_new,
-//     .pmu = gk208_pmu_new,
+       .pmu = gm107_pmu_new,
 //     .timer = gk20a_timer_new,
 //     .ce[0] = gm204_ce0_new,
 //     .ce[1] = gm204_ce1_new,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c
index ef161ef6be557c9f98311a36ebaad229f9f38045..556447727342a5a8bf3e41473b81a2afc49b2a8a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c
@@ -30,7 +30,6 @@ gf100_identify(struct nvkm_device *device)
        case 0xc0:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
@@ -47,7 +46,6 @@ gf100_identify(struct nvkm_device *device)
        case 0xc4:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
@@ -64,7 +62,6 @@ gf100_identify(struct nvkm_device *device)
        case 0xc3:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
@@ -80,7 +77,6 @@ gf100_identify(struct nvkm_device *device)
        case 0xce:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
@@ -97,7 +93,6 @@ gf100_identify(struct nvkm_device *device)
        case 0xcf:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
@@ -113,7 +108,6 @@ gf100_identify(struct nvkm_device *device)
        case 0xc1:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
@@ -129,7 +123,6 @@ gf100_identify(struct nvkm_device *device)
        case 0xc8:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
@@ -146,7 +139,6 @@ gf100_identify(struct nvkm_device *device)
        case 0xd9:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gf110_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c
index e649e38a11b5f66fbe6530864bb2b322f4ff423f..9e05f8bbabc9ad4955046b7dddac1233340ddad9 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c
@@ -30,7 +30,6 @@ gk104_identify(struct nvkm_device *device)
        case 0xe4:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gk104_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gk104_fifo_oclass;
@@ -48,7 +47,6 @@ gk104_identify(struct nvkm_device *device)
        case 0xe7:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gf110_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gk104_fifo_oclass;
@@ -66,7 +64,6 @@ gk104_identify(struct nvkm_device *device)
        case 0xe6:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gk104_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gk104_fifo_oclass;
@@ -90,12 +87,10 @@ gk104_identify(struct nvkm_device *device)
                device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] = gk104_pm_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &gk20a_volt_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gk20a_pmu_oclass;
                break;
        case 0xf0:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gk110_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gk104_fifo_oclass;
@@ -113,7 +108,6 @@ gk104_identify(struct nvkm_device *device)
        case 0xf1:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gk110_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gk104_fifo_oclass;
@@ -131,7 +125,6 @@ gk104_identify(struct nvkm_device *device)
        case 0x106:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gk208_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gk208_fifo_oclass;
@@ -148,7 +141,6 @@ gk104_identify(struct nvkm_device *device)
        case 0x108:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gk208_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gk208_fifo_oclass;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
index e1dfea9764deafd969562f15b19d0e1d142302cd..76c6b104a99afb9414771feeb3daf2a80a52d9b5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
@@ -30,7 +30,6 @@ gm100_identify(struct nvkm_device *device)
        case 0x117:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gm107_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &gk20a_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gk208_pmu_oclass;
 
 #if 0
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
@@ -58,7 +57,6 @@ gm100_identify(struct nvkm_device *device)
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gm107_therm_oclass;
 #endif
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &gk20a_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gk208_pmu_oclass;
 #if 0
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
 #endif
@@ -83,7 +81,6 @@ gm100_identify(struct nvkm_device *device)
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gm107_therm_oclass;
 #endif
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &gk20a_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gk208_pmu_oclass;
 #if 0
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
 #endif
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
index fad8e6819dcaf7414e690a1e88ec91ba20e5b43c..f2956d45d32ee52a2e6aca63f9dfdf679ea829bf 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
@@ -177,7 +177,6 @@ nv50_identify(struct nvkm_device *device)
        case 0xa3:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gt215_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
@@ -194,7 +193,6 @@ nv50_identify(struct nvkm_device *device)
        case 0xa5:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gt215_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
@@ -210,7 +208,6 @@ nv50_identify(struct nvkm_device *device)
        case 0xa8:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gt215_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
@@ -226,7 +223,6 @@ nv50_identify(struct nvkm_device *device)
        case 0xaf:
                device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;
                device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
-               device->oclass[NVDEV_SUBDEV_PMU    ] =  gt215_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
index 956e5926afe5dfe91977add062363b88daf4dd74..efd5ebd1fa046385c014461bd855b2bbe7f61e34 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
@@ -185,15 +185,13 @@ gk104_gr_init(struct nvkm_object *object)
        struct gf100_gr_oclass *oclass = (void *)object->oclass;
        struct gf100_gr *gr = (void *)object;
        struct nvkm_device *device = gr->base.engine.subdev.device;
-       struct nvkm_pmu *pmu = device->pmu;
        const u32 magicgpc918 = DIV_ROUND_UP(0x00800000, gr->tpc_total);
        u32 data[TPC_MAX / 8] = {};
        u8  tpcnr[GPC_MAX];
        int gpc, tpc, rop;
        int ret, i;
 
-       if (pmu)
-               pmu->pgob(pmu, false);
+       nvkm_pmu_pgob(device->pmu, false);
 
        ret = nvkm_gr_init(&gr->base);
        if (ret)
@@ -315,9 +313,8 @@ gk104_gr_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
              struct nvkm_oclass *oclass, void *data, u32 size,
              struct nvkm_object **pobject)
 {
-       struct nvkm_pmu *pmu = nvkm_pmu(parent);
-       if (pmu)
-               pmu->pgob(pmu, false);
+       struct nvkm_device *device = (void *)parent;
+       nvkm_pmu_pgob(device->pmu, false);
        return gf100_gr_ctor(parent, engine, oclass, data, size, pobject);
 }
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/Kbuild
index 7081d6a9b95f635c9b36fce612ed7d17d885bd63..88b643b8664e5604971957e1e2a90f513bbca06f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/Kbuild
@@ -2,8 +2,9 @@ nvkm-y += nvkm/subdev/pmu/base.o
 nvkm-y += nvkm/subdev/pmu/memx.o
 nvkm-y += nvkm/subdev/pmu/gt215.o
 nvkm-y += nvkm/subdev/pmu/gf100.o
-nvkm-y += nvkm/subdev/pmu/gf110.o
+nvkm-y += nvkm/subdev/pmu/gf119.o
 nvkm-y += nvkm/subdev/pmu/gk104.o
 nvkm-y += nvkm/subdev/pmu/gk110.o
 nvkm-y += nvkm/subdev/pmu/gk208.o
 nvkm-y += nvkm/subdev/pmu/gk20a.o
+nvkm-y += nvkm/subdev/pmu/gm107.o
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c
index c700d3d956e81925a7b6d4ee8d766825a6bff93e..27a79c0c38886522d3b8d1d1df651e4cd054bcd4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c
@@ -28,12 +28,11 @@
 void
 nvkm_pmu_pgob(struct nvkm_pmu *pmu, bool enable)
 {
-       const struct nvkm_pmu_impl *impl = (void *)nv_oclass(pmu);
-       if (impl->pgob)
-               impl->pgob(pmu, enable);
+       if (pmu->func->pgob)
+               pmu->func->pgob(pmu, enable);
 }
 
-static int
+int
 nvkm_pmu_send(struct nvkm_pmu *pmu, u32 reply[2],
              u32 process, u32 message, u32 data0, u32 data1)
 {
@@ -144,7 +143,7 @@ nvkm_pmu_recv(struct work_struct *work)
 static void
 nvkm_pmu_intr(struct nvkm_subdev *subdev)
 {
-       struct nvkm_pmu *pmu = container_of(subdev, typeof(*pmu), subdev);
+       struct nvkm_pmu *pmu = nvkm_pmu(subdev);
        struct nvkm_device *device = pmu->subdev.device;
        u32 disp = nvkm_rd32(device, 0x10a01c);
        u32 intr = nvkm_rd32(device, 0x10a008) & disp & ~(disp >> 16);
@@ -180,33 +179,23 @@ nvkm_pmu_intr(struct nvkm_subdev *subdev)
        }
 }
 
-int
-_nvkm_pmu_fini(struct nvkm_object *object, bool suspend)
+static int
+nvkm_pmu_fini(struct nvkm_subdev *subdev, bool suspend)
 {
-       struct nvkm_pmu *pmu = (void *)object;
+       struct nvkm_pmu *pmu = nvkm_pmu(subdev);
        struct nvkm_device *device = pmu->subdev.device;
 
        nvkm_wr32(device, 0x10a014, 0x00000060);
        flush_work(&pmu->recv.work);
-
-       return nvkm_subdev_fini_old(&pmu->subdev, suspend);
+       return 0;
 }
 
-int
-_nvkm_pmu_init(struct nvkm_object *object)
+static int
+nvkm_pmu_init(struct nvkm_subdev *subdev)
 {
-       const struct nvkm_pmu_impl *impl = (void *)object->oclass;
-       struct nvkm_pmu *pmu = (void *)object;
+       struct nvkm_pmu *pmu = nvkm_pmu(subdev);
        struct nvkm_device *device = pmu->subdev.device;
-       int ret, i;
-
-       ret = nvkm_subdev_init_old(&pmu->subdev);
-       if (ret)
-               return ret;
-
-       nv_subdev(pmu)->intr = nvkm_pmu_intr;
-       pmu->message = nvkm_pmu_send;
-       pmu->pgob = nvkm_pmu_pgob;
+       int i;
 
        /* prevent previous ucode from running, wait for idle, reset */
        nvkm_wr32(device, 0x10a014, 0x0000ffff); /* INTR_EN_CLR = ALL */
@@ -224,15 +213,15 @@ _nvkm_pmu_init(struct nvkm_object *object)
 
        /* upload data segment */
        nvkm_wr32(device, 0x10a1c0, 0x01000000);
-       for (i = 0; i < impl->data.size / 4; i++)
-               nvkm_wr32(device, 0x10a1c4, impl->data.data[i]);
+       for (i = 0; i < pmu->func->data.size / 4; i++)
+               nvkm_wr32(device, 0x10a1c4, pmu->func->data.data[i]);
 
        /* upload code segment */
        nvkm_wr32(device, 0x10a180, 0x01000000);
-       for (i = 0; i < impl->code.size / 4; i++) {
+       for (i = 0; i < pmu->func->code.size / 4; i++) {
                if ((i & 0x3f) == 0)
                        nvkm_wr32(device, 0x10a188, i >> 6);
-               nvkm_wr32(device, 0x10a184, impl->code.data[i]);
+               nvkm_wr32(device, 0x10a184, pmu->func->code.data[i]);
        }
 
        /* start it running */
@@ -262,31 +251,30 @@ _nvkm_pmu_init(struct nvkm_object *object)
        return 0;
 }
 
-int
-nvkm_pmu_create_(struct nvkm_object *parent, struct nvkm_object *engine,
-                struct nvkm_oclass *oclass, int length, void **pobject)
+static void *
+nvkm_pmu_dtor(struct nvkm_subdev *subdev)
 {
-       struct nvkm_pmu *pmu;
-       int ret;
-
-       ret = nvkm_subdev_create_(parent, engine, oclass, 0, "PMU",
-                                 "pmu", length, pobject);
-       pmu = *pobject;
-       if (ret)
-               return ret;
-
-       INIT_WORK(&pmu->recv.work, nvkm_pmu_recv);
-       init_waitqueue_head(&pmu->recv.wait);
-       return 0;
+       return nvkm_pmu(subdev);
 }
 
+static const struct nvkm_subdev_func
+nvkm_pmu = {
+       .dtor = nvkm_pmu_dtor,
+       .init = nvkm_pmu_init,
+       .fini = nvkm_pmu_fini,
+       .intr = nvkm_pmu_intr,
+};
+
 int
-_nvkm_pmu_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-              struct nvkm_oclass *oclass, void *data, u32 size,
-              struct nvkm_object **pobject)
+nvkm_pmu_new_(const struct nvkm_pmu_func *func, struct nvkm_device *device,
+             int index, struct nvkm_pmu **ppmu)
 {
        struct nvkm_pmu *pmu;
-       int ret = nvkm_pmu_create(parent, engine, oclass, &pmu);
-       *pobject = nv_object(pmu);
-       return ret;
+       if (!(pmu = *ppmu = kzalloc(sizeof(*pmu), GFP_KERNEL)))
+               return -ENOMEM;
+       nvkm_subdev_ctor(&nvkm_pmu, device, index, 0, &pmu->subdev);
+       pmu->func = func;
+       INIT_WORK(&pmu->recv.work, nvkm_pmu_recv);
+       init_waitqueue_head(&pmu->recv.wait);
+       return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf110.fuc4 b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf110.fuc4
deleted file mode 100644 (file)
index ae9c3f1..0000000
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf110.fuc4
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2013 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Ben Skeggs
- */
-
-#define NVKM_PPWR_CHIPSET GF119
-#define HW_TICKS_PER_US 324
-
-//#define NVKM_FALCON_PC24
-#define NVKM_FALCON_UNSHIFTED_IO
-//#define NVKM_FALCON_MMIO_UAS
-//#define NVKM_FALCON_MMIO_TRAP
-
-#include "macros.fuc"
-
-.section #gf110_pmu_data
-#define INCLUDE_PROC
-#include "kernel.fuc"
-#include "arith.fuc"
-#include "host.fuc"
-#include "memx.fuc"
-#include "perf.fuc"
-#include "i2c_.fuc"
-#include "test.fuc"
-#include "idle.fuc"
-#undef INCLUDE_PROC
-
-#define INCLUDE_DATA
-#include "kernel.fuc"
-#include "arith.fuc"
-#include "host.fuc"
-#include "memx.fuc"
-#include "perf.fuc"
-#include "i2c_.fuc"
-#include "test.fuc"
-#include "idle.fuc"
-#undef INCLUDE_DATA
-.align 256
-
-.section #gf110_pmu_code
-#define INCLUDE_CODE
-#include "kernel.fuc"
-#include "arith.fuc"
-#include "host.fuc"
-#include "memx.fuc"
-#include "perf.fuc"
-#include "i2c_.fuc"
-#include "test.fuc"
-#include "idle.fuc"
-#undef INCLUDE_CODE
-.align 256
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf110.fuc4.h b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf110.fuc4.h
deleted file mode 100644 (file)
index a0c499e..0000000
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf110.fuc4.h
+++ /dev/null
@@ -1,1795 +0,0 @@
-uint32_t gf110_pmu_data[] = {
-/* 0x0000: proc_kern */
-       0x52544e49,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-/* 0x0058: proc_list_head */
-       0x54534f48,
-       0x0000049d,
-       0x00000446,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x584d454d,
-       0x0000068b,
-       0x0000067d,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x46524550,
-       0x0000068f,
-       0x0000068d,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x5f433249,
-       0x00000aaa,
-       0x0000094d,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x54534554,
-       0x00000acd,
-       0x00000aac,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x454c4449,
-       0x00000ad9,
-       0x00000ad7,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-/* 0x0268: proc_list_tail */
-/* 0x0268: time_prev */
-       0x00000000,
-/* 0x026c: time_next */
-       0x00000000,
-/* 0x0270: fifo_queue */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-/* 0x02f0: rfifo_queue */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-/* 0x0370: memx_func_head */
-       0x00000001,
-       0x00000000,
-       0x000004d3,
-/* 0x037c: memx_func_next */
-       0x00000002,
-       0x00000000,
-       0x00000554,
-       0x00000003,
-       0x00000002,
-       0x000005d8,
-       0x00040004,
-       0x00000000,
-       0x000005f4,
-       0x00010005,
-       0x00000000,
-       0x0000060e,
-       0x00010006,
-       0x00000000,
-       0x000005d3,
-       0x00000007,
-       0x00000000,
-       0x00000619,
-/* 0x03c4: memx_func_tail */
-/* 0x03c4: memx_ts_start */
-       0x00000000,
-/* 0x03c8: memx_ts_end */
-       0x00000000,
-/* 0x03cc: memx_data_head */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-/* 0x0bcc: memx_data_tail */
-/* 0x0bcc: memx_train_head */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-/* 0x0ccc: memx_train_tail */
-/* 0x0ccc: i2c_scl_map */
-       0x00000400,
-       0x00000800,
-       0x00001000,
-       0x00002000,
-       0x00004000,
-       0x00008000,
-       0x00010000,
-       0x00020000,
-       0x00040000,
-       0x00080000,
-/* 0x0cf4: i2c_sda_map */
-       0x00100000,
-       0x00200000,
-       0x00400000,
-       0x00800000,
-       0x01000000,
-       0x02000000,
-       0x04000000,
-       0x08000000,
-       0x10000000,
-       0x20000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-uint32_t gf110_pmu_code[] = {
-       0x034d0ef5,
-/* 0x0004: rd32 */
-       0x07a007f1,
-       0xbd000ed0,
-       0x01d7f004,
-       0xf101d3f0,
-       0xd007ac07,
-       0x04bd000d,
-/* 0x001c: rd32_wait */
-       0x07acd7f1,
-       0xf100ddcf,
-       0xf47000d4,
-       0xd7f1f51b,
-       0xddcf07a4,
-/* 0x0033: wr32 */
-       0xf100f800,
-       0xd007a007,
-       0x04bd000e,
-       0x07a407f1,
-       0xbd000dd0,
-       0x02d7f004,
-       0xf0f0d5f0,
-       0x07f101d3,
-       0x0dd007ac,
-/* 0x0057: wr32_wait */
-       0xf104bd00,
-       0xcf07acd7,
-       0xd4f100dd,
-       0x1bf47000,
-/* 0x0067: nsec */
-       0xf900f8f5,
-       0xf080f990,
-       0x88cf2c87,
-/* 0x0071: nsec_loop */
-       0x2c97f000,
-       0xbb0099cf,
-       0x9eb80298,
-       0xf41ef406,
-       0x90fc80fc,
-/* 0x0086: wait */
-       0x90f900f8,
-       0x87f080f9,
-       0x0088cf2c,
-/* 0x0090: wait_loop */
-       0xf402eeb9,
-       0xdab90421,
-       0x04adfd02,
-       0xf406acb8,
-       0x97f0120b,
-       0x0099cf2c,
-       0xb80298bb,
-       0x1ef4069b,
-/* 0x00b1: wait_done */
-       0xfc80fce2,
-/* 0x00b7: intr_watchdog */
-       0x9800f890,
-       0x96b003e9,
-       0x2a0bf400,
-       0xbb9a0a98,
-       0x1cf4029a,
-       0x01d7f00f,
-       0x028c21f5,
-       0x0ef494bd,
-/* 0x00d5: intr_watchdog_next_time */
-       0x9b0a9815,
-       0xf400a6b0,
-       0x9ab8090b,
-       0x061cf406,
-/* 0x00e4: intr_watchdog_next_time_set */
-/* 0x00e7: intr_watchdog_next_proc */
-       0x809b0980,
-       0xe0b603e9,
-       0x68e6b158,
-       0xc61bf402,
-/* 0x00f6: intr */
-       0x00f900f8,
-       0x80f904bd,
-       0xa0f990f9,
-       0xc0f9b0f9,
-       0xe0f9d0f9,
-       0xf7f0f0f9,
-       0x0188fe00,
-       0x87f180f9,
-       0x88cf05d0,
-       0x0180b600,
-       0x05d007f1,
-       0xbd0008d0,
-       0x0887f004,
-       0xc40088cf,
-       0x0bf40289,
-       0x9b008020,
-       0xf458e7f0,
-       0x0998b721,
-       0x0096b09b,
-       0xf00e0bf4,
-       0x09d03407,
-       0x8004bd00,
-/* 0x014e: intr_skip_watchdog */
-       0x89e49a09,
-       0x0bf40800,
-       0x8897f13c,
-       0x0099cf06,
-       0xf4029ac4,
-       0xc7f1260b,
-       0xcccf04c0,
-       0xf1c0f900,
-       0xf14f48e7,
-       0xf05453e3,
-       0x21f500d7,
-       0xc0fc02f1,
-       0x04c007f1,
-       0xbd000cd0,
-/* 0x0185: intr_subintr_skip_fifo */
-       0x8807f104,
-       0x0009d006,
-/* 0x018e: intr_skip_subintr */
-       0x89c404bd,
-       0x070bf420,
-       0xffbfa4f1,
-/* 0x0198: intr_skip_pause */
-       0xf44089c4,
-       0xa4f1070b,
-/* 0x01a2: intr_skip_user0 */
-       0x07f0ffbf,
-       0x0008d004,
-       0x80fc04bd,
-       0xfc0088fe,
-       0xfce0fcf0,
-       0xfcc0fcd0,
-       0xfca0fcb0,
-       0xfc80fc90,
-       0x0032f400,
-/* 0x01c6: ticks_from_ns */
-       0xc0f901f8,
-       0xd7f1b0f9,
-       0xd3f00144,
-       0xb321f500,
-       0xe8ccec03,
-       0x00b4b003,
-       0xec120bf4,
-       0xf103e8ee,
-       0xf00144d7,
-       0x21f500d3,
-/* 0x01ee: ticks_from_ns_quit */
-       0xceb903b3,
-       0xfcb0fc02,
-/* 0x01f7: ticks_from_us */
-       0xf900f8c0,
-       0xf1b0f9c0,
-       0xf00144d7,
-       0x21f500d3,
-       0xceb903b3,
-       0x00b4b002,
-       0xbd050bf4,
-/* 0x0211: ticks_from_us_quit */
-       0xfcb0fce4,
-/* 0x0217: ticks_to_us */
-       0xf100f8c0,
-       0xf00144d7,
-       0xedff00d3,
-/* 0x0223: timer */
-       0xf900f8ec,
-       0xf480f990,
-       0xf8981032,
-       0x0086b003,
-       0xbd531cf4,
-       0x3807f084,
-       0xbd0008d0,
-       0x3487f004,
-       0x980088cf,
-       0x98bb9a09,
-       0x00e9bb02,
-       0xf003fe80,
-       0x88cf0887,
-       0x0284f000,
-       0xf0201bf4,
-       0x88cf3487,
-       0x06e0b800,
-       0xb8090bf4,
-       0x1cf406e8,
-/* 0x026d: timer_reset */
-       0x3407f00e,
-       0xbd000ed0,
-       0x9a0e8004,
-/* 0x0278: timer_enable */
-       0xf00187f0,
-       0x08d03807,
-/* 0x0283: timer_done */
-       0xf404bd00,
-       0x80fc1031,
-       0x00f890fc,
-/* 0x028c: send_proc */
-       0x90f980f9,
-       0x9805e898,
-       0x86f004e9,
-       0x0689b804,
-       0xc42a0bf4,
-       0x88940398,
-       0x1880b604,
-       0x98008ebb,
-       0x8a8000fa,
-       0x018d8000,
-       0x80028c80,
-       0x90b6038b,
-       0x0794f001,
-       0xf404e980,
-/* 0x02c6: send_done */
-       0x90fc0231,
-       0x00f880fc,
-/* 0x02cc: find */
-       0x87f080f9,
-       0x0131f458,
-/* 0x02d4: find_loop */
-       0xb8008a98,
-       0x0bf406ae,
-       0x5880b610,
-       0x026886b1,
-       0xf4f01bf4,
-/* 0x02ea: find_done */
-       0x8eb90132,
-       0xf880fc02,
-/* 0x02f1: send */
-       0xcc21f500,
-       0x9701f402,
-/* 0x02fa: recv */
-       0x90f900f8,
-       0xe89880f9,
-       0x04e99805,
-       0xb80132f4,
-       0x0bf40689,
-       0x0389c43d,
-       0xf00180b6,
-       0xe8800784,
-       0x02ea9805,
-       0x8ffef0f9,
-       0xb9f0f901,
-       0x999402ef,
-       0x00e9bb04,
-       0x9818e0b6,
-       0xec9803eb,
-       0x01ed9802,
-       0xf900ee98,
-       0xfef0fca5,
-       0x31f400f8,
-/* 0x0347: recv_done */
-       0xfcf0fc01,
-       0xf890fc80,
-/* 0x034d: init */
-       0x0817f100,
-       0x0011cf01,
-       0x010911e7,
-       0xfe0814b6,
-       0x17f10014,
-       0x13f000e0,
-       0x1c07f000,
-       0xbd0001d0,
-       0xff17f004,
-       0xd01407f0,
-       0x04bd0001,
-       0xf10217f0,
-       0xf0080015,
-       0x01d01007,
-       0xf104bd00,
-       0xf000f617,
-       0x10fe0013,
-       0x1031f400,
-       0xf00117f0,
-       0x01d03807,
-       0xf004bd00,
-/* 0x03a2: init_proc */
-       0xf19858f7,
-       0x0016b001,
-       0xf9fa0bf4,
-       0x58f0b615,
-/* 0x03b3: mulu32_32_64 */
-       0xf9f20ef4,
-       0xf920f910,
-       0x9540f930,
-       0xd29510e1,
-       0xbdc4bd10,
-       0xc0edffb4,
-       0xb9301dff,
-       0x34f10234,
-       0x34b6ffff,
-       0x1045b610,
-       0xbb00c3bb,
-       0xe2ff01b4,
-       0x0234b930,
-       0xffff34f1,
-       0xb61034b6,
-       0xc3bb1045,
-       0x01b4bb00,
-       0xbb3012ff,
-       0x40fc00b3,
-       0x20fc30fc,
-       0x00f810fc,
-/* 0x0404: host_send */
-       0x04b017f1,
-       0xf10011cf,
-       0xcf04a027,
-       0x12b80022,
-       0x2f0bf406,
-       0x94071ec4,
-       0xe0b704ee,
-       0xeb980270,
-       0x02ec9803,
-       0x9801ed98,
-       0x21f500ee,
-       0x10b602f1,
-       0x0f1ec401,
-       0x04b007f1,
-       0xbd000ed0,
-       0xc30ef404,
-/* 0x0444: host_send_done */
-/* 0x0446: host_recv */
-       0x17f100f8,
-       0x13f14e49,
-       0xe1b85254,
-       0xb30bf406,
-/* 0x0454: host_recv_wait */
-       0x04cc17f1,
-       0xf10011cf,
-       0xcf04c827,
-       0x16f00022,
-       0x0612b808,
-       0xc4ec0bf4,
-       0x34b60723,
-       0xf030b704,
-       0x033b8002,
-       0x80023c80,
-       0x3e80013d,
-       0x0120b600,
-       0xf10f24f0,
-       0xd004c807,
-       0x04bd0002,
-       0xf04027f0,
-       0x02d00007,
-       0xf804bd00,
-/* 0x049d: host_init */
-       0x8017f100,
-       0x1014b600,
-       0x027015f1,
-       0x04d007f1,
-       0xbd0001d0,
-       0x8017f104,
-       0x1014b600,
-       0x02f015f1,
-       0x04dc07f1,
-       0xbd0001d0,
-       0x0117f004,
-       0x04c407f1,
-       0xbd0001d0,
-/* 0x04d3: memx_func_enter */
-       0xf100f804,
-       0xf1162067,
-       0xf1f55d77,
-       0xb9ffff73,
-       0x21f4026e,
-       0x02d8b904,
-       0xf90487fd,
-       0xfc80f960,
-       0xf4e0fcd0,
-       0x77f13321,
-       0x73f1fffe,
-       0x6eb9ffff,
-       0x0421f402,
-       0xfd02d8b9,
-       0x60f90487,
-       0xd0fc80f9,
-       0x21f4e0fc,
-       0xf067f133,
-       0x026eb926,
-       0xb90421f4,
-       0x87fd02d8,
-       0xf960f904,
-       0xfcd0fc80,
-       0x3321f4e0,
-       0xf10467f0,
-       0xd007e007,
-       0x04bd0006,
-/* 0x053c: memx_func_enter_wait */
-       0x07c067f1,
-       0xf00066cf,
-       0x0bf40464,
-       0x2c67f0f6,
-       0x800066cf,
-       0x00f8f106,
-/* 0x0554: memx_func_leave */
-       0xcf2c67f0,
-       0x06800066,
-       0x0467f0f2,
-       0x07e407f1,
-       0xbd0006d0,
-/* 0x0569: memx_func_leave_wait */
-       0xc067f104,
-       0x0066cf07,
-       0xf40464f0,
-       0x67f1f61b,
-       0x77f126f0,
-       0x73f00001,
-       0x026eb900,
-       0xb90421f4,
-       0x87fd02d8,
-       0xf960f905,
-       0xfcd0fc80,
-       0x3321f4e0,
-       0x162067f1,
-       0xf4026eb9,
-       0xd8b90421,
-       0x0587fd02,
-       0x80f960f9,
-       0xe0fcd0fc,
-       0xf13321f4,
-       0xf00aa277,
-       0x6eb90073,
-       0x0421f402,
-       0xfd02d8b9,
-       0x60f90587,
-       0xd0fc80f9,
-       0x21f4e0fc,
-/* 0x05d3: memx_func_wait_vblank */
-       0xb600f833,
-       0x00f80410,
-/* 0x05d8: memx_func_wr32 */
-       0x98001698,
-       0x10b60115,
-       0xf960f908,
-       0xfcd0fc50,
-       0x3321f4e0,
-       0xf40242b6,
-       0x00f8e91b,
-/* 0x05f4: memx_func_wait */
-       0xcf2c87f0,
-       0x1e980088,
-       0x011d9800,
-       0x98021c98,
-       0x10b6031b,
-       0x8621f410,
-/* 0x060e: memx_func_delay */
-       0x1e9800f8,
-       0x0410b600,
-       0xf86721f4,
-/* 0x0619: memx_func_train */
-/* 0x061b: memx_exec */
-       0xf900f800,
-       0xb9d0f9e0,
-       0xb2b902c1,
-/* 0x0625: memx_exec_next */
-       0x00139802,
-       0xe70410b6,
-       0xe701f034,
-       0xb601e033,
-       0x30f00132,
-       0xde35980c,
-       0x12b855f9,
-       0xe41ef406,
-       0x98f10b98,
-       0xcbbbf20c,
-       0xc4b7f102,
-       0x00bbcf07,
-       0xe0fcd0fc,
-       0x02f121f5,
-/* 0x065e: memx_info */
-       0xc67000f8,
-       0x0e0bf401,
-/* 0x0664: memx_info_data */
-       0x03ccc7f1,
-       0x0800b7f1,
-/* 0x066f: memx_info_train */
-       0xf10b0ef4,
-       0xf10bccc7,
-/* 0x0677: memx_info_send */
-       0xf50100b7,
-       0xf802f121,
-/* 0x067d: memx_recv */
-       0x01d6b000,
-       0xb09b0bf4,
-       0x0bf400d6,
-/* 0x068b: memx_init */
-       0xf800f8d8,
-/* 0x068d: perf_recv */
-/* 0x068f: perf_init */
-       0xf800f800,
-/* 0x0691: i2c_drive_scl */
-       0x0036b000,
-       0xf10e0bf4,
-       0xd007e007,
-       0x04bd0001,
-/* 0x06a2: i2c_drive_scl_lo */
-       0x07f100f8,
-       0x01d007e4,
-       0xf804bd00,
-/* 0x06ad: i2c_drive_sda */
-       0x0036b000,
-       0xf10e0bf4,
-       0xd007e007,
-       0x04bd0002,
-/* 0x06be: i2c_drive_sda_lo */
-       0x07f100f8,
-       0x02d007e4,
-       0xf804bd00,
-/* 0x06c9: i2c_sense_scl */
-       0x0132f400,
-       0x07c437f1,
-       0xfd0033cf,
-       0x0bf40431,
-       0x0131f406,
-/* 0x06dc: i2c_sense_scl_done */
-/* 0x06de: i2c_sense_sda */
-       0x32f400f8,
-       0xc437f101,
-       0x0033cf07,
-       0xf40432fd,
-       0x31f4060b,
-/* 0x06f1: i2c_sense_sda_done */
-/* 0x06f3: i2c_raise_scl */
-       0xf900f801,
-       0x9847f140,
-       0x0137f008,
-       0x069121f5,
-/* 0x0700: i2c_raise_scl_wait */
-       0x03e8e7f1,
-       0xf56721f4,
-       0xf406c921,
-       0x42b60901,
-       0xef1bf401,
-/* 0x0714: i2c_raise_scl_done */
-       0x00f840fc,
-/* 0x0718: i2c_start */
-       0x06c921f5,
-       0xf50d11f4,
-       0xf406de21,
-       0x0ef40611,
-/* 0x0729: i2c_start_rep */
-       0x0037f030,
-       0x069121f5,
-       0xf50137f0,
-       0xbb06ad21,
-       0x65b60076,
-       0x9450f904,
-       0x56bb0465,
-       0xfd50bd02,
-       0x50fc0475,
-       0x06f321f5,
-       0xf40464b6,
-/* 0x0756: i2c_start_send */
-       0x37f01f11,
-       0xad21f500,
-       0x88e7f106,
-       0x6721f413,
-       0xf50037f0,
-       0xf1069121,
-       0xf41388e7,
-/* 0x0772: i2c_start_out */
-       0x00f86721,
-/* 0x0774: i2c_stop */
-       0xf50037f0,
-       0xf0069121,
-       0x21f50037,
-       0xe7f106ad,
-       0x21f403e8,
-       0x0137f067,
-       0x069121f5,
-       0x1388e7f1,
-       0xf06721f4,
-       0x21f50137,
-       0xe7f106ad,
-       0x21f41388,
-/* 0x07a7: i2c_bitw */
-       0xf500f867,
-       0xf106ad21,
-       0xf403e8e7,
-       0x76bb6721,
-       0x0465b600,
-       0x659450f9,
-       0x0256bb04,
-       0x75fd50bd,
-       0xf550fc04,
-       0xb606f321,
-       0x11f40464,
-       0x88e7f118,
-       0x6721f413,
-       0xf50037f0,
-       0xf1069121,
-       0xf41388e7,
-/* 0x07e6: i2c_bitw_out */
-       0x00f86721,
-/* 0x07e8: i2c_bitr */
-       0xf50137f0,
-       0xf106ad21,
-       0xf403e8e7,
-       0x76bb6721,
-       0x0465b600,
-       0x659450f9,
-       0x0256bb04,
-       0x75fd50bd,
-       0xf550fc04,
-       0xb606f321,
-       0x11f40464,
-       0xde21f51b,
-       0x0037f006,
-       0x069121f5,
-       0x1388e7f1,
-       0xf06721f4,
-       0x31f4013c,
-/* 0x082d: i2c_bitr_done */
-/* 0x082f: i2c_get_byte */
-       0xf000f801,
-       0x47f00057,
-/* 0x0835: i2c_get_byte_next */
-       0x0154b608,
-       0xb60076bb,
-       0x50f90465,
-       0xbb046594,
-       0x50bd0256,
-       0xfc0475fd,
-       0xe821f550,
-       0x0464b607,
-       0xfd2b11f4,
-       0x42b60553,
-       0xd81bf401,
-       0xbb0137f0,
-       0x65b60076,
-       0x9450f904,
-       0x56bb0465,
-       0xfd50bd02,
-       0x50fc0475,
-       0x07a721f5,
-/* 0x087f: i2c_get_byte_done */
-       0xf80464b6,
-/* 0x0881: i2c_put_byte */
-       0x0847f000,
-/* 0x0884: i2c_put_byte_next */
-       0xff0142b6,
-       0x76bb3854,
-       0x0465b600,
-       0x659450f9,
-       0x0256bb04,
-       0x75fd50bd,
-       0xf550fc04,
-       0xb607a721,
-       0x11f40464,
-       0x0046b034,
-       0xbbd81bf4,
-       0x65b60076,
-       0x9450f904,
-       0x56bb0465,
-       0xfd50bd02,
-       0x50fc0475,
-       0x07e821f5,
-       0xf40464b6,
-       0x76bb0f11,
-       0x0136b000,
-       0xf4061bf4,
-/* 0x08da: i2c_put_byte_done */
-       0x00f80132,
-/* 0x08dc: i2c_addr */
-       0xb60076bb,
-       0x50f90465,
-       0xbb046594,
-       0x50bd0256,
-       0xfc0475fd,
-       0x1821f550,
-       0x0464b607,
-       0xe72911f4,
-       0xb6012ec3,
-       0x53fd0134,
-       0x0076bb05,
-       0xf90465b6,
-       0x04659450,
-       0xbd0256bb,
-       0x0475fd50,
-       0x21f550fc,
-       0x64b60881,
-/* 0x0921: i2c_addr_done */
-/* 0x0923: i2c_acquire_addr */
-       0xc700f804,
-       0xe4b6f8ce,
-       0x14e0b705,
-/* 0x092f: i2c_acquire */
-       0xf500f8d0,
-       0xf4092321,
-       0xd9f00421,
-       0x3321f403,
-/* 0x093e: i2c_release */
-       0x21f500f8,
-       0x21f40923,
-       0x03daf004,
-       0xf83321f4,
-/* 0x094d: i2c_recv */
-       0x0132f400,
-       0xb6f8c1c7,
-       0x16b00214,
-       0x3a1ff528,
-       0xf413a001,
-       0x0032980c,
-       0x0ccc13a0,
-       0xf4003198,
-       0xd0f90231,
-       0xd0f9e0f9,
-       0x000067f1,
-       0x100063f1,
-       0xbb016792,
-       0x65b60076,
-       0x9450f904,
-       0x56bb0465,
-       0xfd50bd02,
-       0x50fc0475,
-       0x092f21f5,
-       0xfc0464b6,
-       0x00d6b0d0,
-       0x00b31bf5,
-       0xbb0057f0,
-       0x65b60076,
-       0x9450f904,
-       0x56bb0465,
-       0xfd50bd02,
-       0x50fc0475,
-       0x08dc21f5,
-       0xf50464b6,
-       0xc700d011,
-       0x76bbe0c5,
-       0x0465b600,
-       0x659450f9,
-       0x0256bb04,
-       0x75fd50bd,
-       0xf550fc04,
-       0xb6088121,
-       0x11f50464,
-       0x57f000ad,
-       0x0076bb01,
-       0xf90465b6,
-       0x04659450,
-       0xbd0256bb,
-       0x0475fd50,
-       0x21f550fc,
-       0x64b608dc,
-       0x8a11f504,
-       0x0076bb00,
-       0xf90465b6,
-       0x04659450,
-       0xbd0256bb,
-       0x0475fd50,
-       0x21f550fc,
-       0x64b6082f,
-       0x6a11f404,
-       0xbbe05bcb,
-       0x65b60076,
-       0x9450f904,
-       0x56bb0465,
-       0xfd50bd02,
-       0x50fc0475,
-       0x077421f5,
-       0xb90464b6,
-       0x74bd025b,
-/* 0x0a53: i2c_recv_not_rd08 */
-       0xb0430ef4,
-       0x1bf401d6,
-       0x0057f03d,
-       0x08dc21f5,
-       0xc73311f4,
-       0x21f5e0c5,
-       0x11f40881,
-       0x0057f029,
-       0x08dc21f5,
-       0xc71f11f4,
-       0x21f5e0b5,
-       0x11f40881,
-       0x7421f515,
-       0xc774bd07,
-       0x1bf408c5,
-       0x0232f409,
-/* 0x0a93: i2c_recv_not_wr08 */
-/* 0x0a93: i2c_recv_done */
-       0xc7030ef4,
-       0x21f5f8ce,
-       0xe0fc093e,
-       0x12f4d0fc,
-       0x027cb90a,
-       0x02f121f5,
-/* 0x0aa8: i2c_recv_exit */
-/* 0x0aaa: i2c_init */
-       0x00f800f8,
-/* 0x0aac: test_recv */
-       0x05d817f1,
-       0xb60011cf,
-       0x07f10110,
-       0x01d005d8,
-       0xf104bd00,
-       0xf1d900e7,
-       0xf5134fe3,
-       0xf8022321,
-/* 0x0acd: test_init */
-       0x00e7f100,
-       0x2321f508,
-/* 0x0ad7: idle_recv */
-       0xf800f802,
-/* 0x0ad9: idle */
-       0x0031f400,
-       0x05d417f1,
-       0xb60011cf,
-       0x07f10110,
-       0x01d005d4,
-/* 0x0aef: idle_loop */
-       0xf004bd00,
-       0x32f45817,
-/* 0x0af5: idle_proc */
-/* 0x0af5: idle_proc_exec */
-       0xb910f902,
-       0x21f5021e,
-       0x10fc02fa,
-       0xf40911f4,
-       0x0ef40231,
-/* 0x0b09: idle_proc_next */
-       0x5810b6ef,
-       0xf4061fb8,
-       0x02f4e61b,
-       0x0028f4dd,
-       0x00c10ef4,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4 b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4
new file mode 100644 (file)
index 0000000..2f28c7e
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2013 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs
+ */
+
+#define NVKM_PPWR_CHIPSET GF119
+#define HW_TICKS_PER_US 324
+
+//#define NVKM_FALCON_PC24
+#define NVKM_FALCON_UNSHIFTED_IO
+//#define NVKM_FALCON_MMIO_UAS
+//#define NVKM_FALCON_MMIO_TRAP
+
+#include "macros.fuc"
+
+.section #gf119_pmu_data
+#define INCLUDE_PROC
+#include "kernel.fuc"
+#include "arith.fuc"
+#include "host.fuc"
+#include "memx.fuc"
+#include "perf.fuc"
+#include "i2c_.fuc"
+#include "test.fuc"
+#include "idle.fuc"
+#undef INCLUDE_PROC
+
+#define INCLUDE_DATA
+#include "kernel.fuc"
+#include "arith.fuc"
+#include "host.fuc"
+#include "memx.fuc"
+#include "perf.fuc"
+#include "i2c_.fuc"
+#include "test.fuc"
+#include "idle.fuc"
+#undef INCLUDE_DATA
+.align 256
+
+.section #gf119_pmu_code
+#define INCLUDE_CODE
+#include "kernel.fuc"
+#include "arith.fuc"
+#include "host.fuc"
+#include "memx.fuc"
+#include "perf.fuc"
+#include "i2c_.fuc"
+#include "test.fuc"
+#include "idle.fuc"
+#undef INCLUDE_CODE
+.align 256
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h
new file mode 100644 (file)
index 0000000..31552af
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h
@@ -0,0 +1,1795 @@
+uint32_t gf119_pmu_data[] = {
+/* 0x0000: proc_kern */
+       0x52544e49,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+/* 0x0058: proc_list_head */
+       0x54534f48,
+       0x0000049d,
+       0x00000446,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x584d454d,
+       0x0000068b,
+       0x0000067d,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x46524550,
+       0x0000068f,
+       0x0000068d,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x5f433249,
+       0x00000aaa,
+       0x0000094d,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x54534554,
+       0x00000acd,
+       0x00000aac,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x454c4449,
+       0x00000ad9,
+       0x00000ad7,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+/* 0x0268: proc_list_tail */
+/* 0x0268: time_prev */
+       0x00000000,
+/* 0x026c: time_next */
+       0x00000000,
+/* 0x0270: fifo_queue */
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+/* 0x02f0: rfifo_queue */
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+/* 0x0370: memx_func_head */
+       0x00000001,
+       0x00000000,
+       0x000004d3,
+/* 0x037c: memx_func_next */
+       0x00000002,
+       0x00000000,
+       0x00000554,
+       0x00000003,
+       0x00000002,
+       0x000005d8,
+       0x00040004,
+       0x00000000,
+       0x000005f4,
+       0x00010005,
+       0x00000000,
+       0x0000060e,
+       0x00010006,
+       0x00000000,
+       0x000005d3,
+       0x00000007,
+       0x00000000,
+       0x00000619,
+/* 0x03c4: memx_func_tail */
+/* 0x03c4: memx_ts_start */
+       0x00000000,
+/* 0x03c8: memx_ts_end */
+       0x00000000,
+/* 0x03cc: memx_data_head */
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+/* 0x0bcc: memx_data_tail */
+/* 0x0bcc: memx_train_head */
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+/* 0x0ccc: memx_train_tail */
+/* 0x0ccc: i2c_scl_map */
+       0x00000400,
+       0x00000800,
+       0x00001000,
+       0x00002000,
+       0x00004000,
+       0x00008000,
+       0x00010000,
+       0x00020000,
+       0x00040000,
+       0x00080000,
+/* 0x0cf4: i2c_sda_map */
+       0x00100000,
+       0x00200000,
+       0x00400000,
+       0x00800000,
+       0x01000000,
+       0x02000000,
+       0x04000000,
+       0x08000000,
+       0x10000000,
+       0x20000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+};
+
+uint32_t gf119_pmu_code[] = {
+       0x034d0ef5,
+/* 0x0004: rd32 */
+       0x07a007f1,
+       0xbd000ed0,
+       0x01d7f004,
+       0xf101d3f0,
+       0xd007ac07,
+       0x04bd000d,
+/* 0x001c: rd32_wait */
+       0x07acd7f1,
+       0xf100ddcf,
+       0xf47000d4,
+       0xd7f1f51b,
+       0xddcf07a4,
+/* 0x0033: wr32 */
+       0xf100f800,
+       0xd007a007,
+       0x04bd000e,
+       0x07a407f1,
+       0xbd000dd0,
+       0x02d7f004,
+       0xf0f0d5f0,
+       0x07f101d3,
+       0x0dd007ac,
+/* 0x0057: wr32_wait */
+       0xf104bd00,
+       0xcf07acd7,
+       0xd4f100dd,
+       0x1bf47000,
+/* 0x0067: nsec */
+       0xf900f8f5,
+       0xf080f990,
+       0x88cf2c87,
+/* 0x0071: nsec_loop */
+       0x2c97f000,
+       0xbb0099cf,
+       0x9eb80298,
+       0xf41ef406,
+       0x90fc80fc,
+/* 0x0086: wait */
+       0x90f900f8,
+       0x87f080f9,
+       0x0088cf2c,
+/* 0x0090: wait_loop */
+       0xf402eeb9,
+       0xdab90421,
+       0x04adfd02,
+       0xf406acb8,
+       0x97f0120b,
+       0x0099cf2c,
+       0xb80298bb,
+       0x1ef4069b,
+/* 0x00b1: wait_done */
+       0xfc80fce2,
+/* 0x00b7: intr_watchdog */
+       0x9800f890,
+       0x96b003e9,
+       0x2a0bf400,
+       0xbb9a0a98,
+       0x1cf4029a,
+       0x01d7f00f,
+       0x028c21f5,
+       0x0ef494bd,
+/* 0x00d5: intr_watchdog_next_time */
+       0x9b0a9815,
+       0xf400a6b0,
+       0x9ab8090b,
+       0x061cf406,
+/* 0x00e4: intr_watchdog_next_time_set */
+/* 0x00e7: intr_watchdog_next_proc */
+       0x809b0980,
+       0xe0b603e9,
+       0x68e6b158,
+       0xc61bf402,
+/* 0x00f6: intr */
+       0x00f900f8,
+       0x80f904bd,
+       0xa0f990f9,
+       0xc0f9b0f9,
+       0xe0f9d0f9,
+       0xf7f0f0f9,
+       0x0188fe00,
+       0x87f180f9,
+       0x88cf05d0,
+       0x0180b600,
+       0x05d007f1,
+       0xbd0008d0,
+       0x0887f004,
+       0xc40088cf,
+       0x0bf40289,
+       0x9b008020,
+       0xf458e7f0,
+       0x0998b721,
+       0x0096b09b,
+       0xf00e0bf4,
+       0x09d03407,
+       0x8004bd00,
+/* 0x014e: intr_skip_watchdog */
+       0x89e49a09,
+       0x0bf40800,
+       0x8897f13c,
+       0x0099cf06,
+       0xf4029ac4,
+       0xc7f1260b,
+       0xcccf04c0,
+       0xf1c0f900,
+       0xf14f48e7,
+       0xf05453e3,
+       0x21f500d7,
+       0xc0fc02f1,
+       0x04c007f1,
+       0xbd000cd0,
+/* 0x0185: intr_subintr_skip_fifo */
+       0x8807f104,
+       0x0009d006,
+/* 0x018e: intr_skip_subintr */
+       0x89c404bd,
+       0x070bf420,
+       0xffbfa4f1,
+/* 0x0198: intr_skip_pause */
+       0xf44089c4,
+       0xa4f1070b,
+/* 0x01a2: intr_skip_user0 */
+       0x07f0ffbf,
+       0x0008d004,
+       0x80fc04bd,
+       0xfc0088fe,
+       0xfce0fcf0,
+       0xfcc0fcd0,
+       0xfca0fcb0,
+       0xfc80fc90,
+       0x0032f400,
+/* 0x01c6: ticks_from_ns */
+       0xc0f901f8,
+       0xd7f1b0f9,
+       0xd3f00144,
+       0xb321f500,
+       0xe8ccec03,
+       0x00b4b003,
+       0xec120bf4,
+       0xf103e8ee,
+       0xf00144d7,
+       0x21f500d3,
+/* 0x01ee: ticks_from_ns_quit */
+       0xceb903b3,
+       0xfcb0fc02,
+/* 0x01f7: ticks_from_us */
+       0xf900f8c0,
+       0xf1b0f9c0,
+       0xf00144d7,
+       0x21f500d3,
+       0xceb903b3,
+       0x00b4b002,
+       0xbd050bf4,
+/* 0x0211: ticks_from_us_quit */
+       0xfcb0fce4,
+/* 0x0217: ticks_to_us */
+       0xf100f8c0,
+       0xf00144d7,
+       0xedff00d3,
+/* 0x0223: timer */
+       0xf900f8ec,
+       0xf480f990,
+       0xf8981032,
+       0x0086b003,
+       0xbd531cf4,
+       0x3807f084,
+       0xbd0008d0,
+       0x3487f004,
+       0x980088cf,
+       0x98bb9a09,
+       0x00e9bb02,
+       0xf003fe80,
+       0x88cf0887,
+       0x0284f000,
+       0xf0201bf4,
+       0x88cf3487,
+       0x06e0b800,
+       0xb8090bf4,
+       0x1cf406e8,
+/* 0x026d: timer_reset */
+       0x3407f00e,
+       0xbd000ed0,
+       0x9a0e8004,
+/* 0x0278: timer_enable */
+       0xf00187f0,
+       0x08d03807,
+/* 0x0283: timer_done */
+       0xf404bd00,
+       0x80fc1031,
+       0x00f890fc,
+/* 0x028c: send_proc */
+       0x90f980f9,
+       0x9805e898,
+       0x86f004e9,
+       0x0689b804,
+       0xc42a0bf4,
+       0x88940398,
+       0x1880b604,
+       0x98008ebb,
+       0x8a8000fa,
+       0x018d8000,
+       0x80028c80,
+       0x90b6038b,
+       0x0794f001,
+       0xf404e980,
+/* 0x02c6: send_done */
+       0x90fc0231,
+       0x00f880fc,
+/* 0x02cc: find */
+       0x87f080f9,
+       0x0131f458,
+/* 0x02d4: find_loop */
+       0xb8008a98,
+       0x0bf406ae,
+       0x5880b610,
+       0x026886b1,
+       0xf4f01bf4,
+/* 0x02ea: find_done */
+       0x8eb90132,
+       0xf880fc02,
+/* 0x02f1: send */
+       0xcc21f500,
+       0x9701f402,
+/* 0x02fa: recv */
+       0x90f900f8,
+       0xe89880f9,
+       0x04e99805,
+       0xb80132f4,
+       0x0bf40689,
+       0x0389c43d,
+       0xf00180b6,
+       0xe8800784,
+       0x02ea9805,
+       0x8ffef0f9,
+       0xb9f0f901,
+       0x999402ef,
+       0x00e9bb04,
+       0x9818e0b6,
+       0xec9803eb,
+       0x01ed9802,
+       0xf900ee98,
+       0xfef0fca5,
+       0x31f400f8,
+/* 0x0347: recv_done */
+       0xfcf0fc01,
+       0xf890fc80,
+/* 0x034d: init */
+       0x0817f100,
+       0x0011cf01,
+       0x010911e7,
+       0xfe0814b6,
+       0x17f10014,
+       0x13f000e0,
+       0x1c07f000,
+       0xbd0001d0,
+       0xff17f004,
+       0xd01407f0,
+       0x04bd0001,
+       0xf10217f0,
+       0xf0080015,
+       0x01d01007,
+       0xf104bd00,
+       0xf000f617,
+       0x10fe0013,
+       0x1031f400,
+       0xf00117f0,
+       0x01d03807,
+       0xf004bd00,
+/* 0x03a2: init_proc */
+       0xf19858f7,
+       0x0016b001,
+       0xf9fa0bf4,
+       0x58f0b615,
+/* 0x03b3: mulu32_32_64 */
+       0xf9f20ef4,
+       0xf920f910,
+       0x9540f930,
+       0xd29510e1,
+       0xbdc4bd10,
+       0xc0edffb4,
+       0xb9301dff,
+       0x34f10234,
+       0x34b6ffff,
+       0x1045b610,
+       0xbb00c3bb,
+       0xe2ff01b4,
+       0x0234b930,
+       0xffff34f1,
+       0xb61034b6,
+       0xc3bb1045,
+       0x01b4bb00,
+       0xbb3012ff,
+       0x40fc00b3,
+       0x20fc30fc,
+       0x00f810fc,
+/* 0x0404: host_send */
+       0x04b017f1,
+       0xf10011cf,
+       0xcf04a027,
+       0x12b80022,
+       0x2f0bf406,
+       0x94071ec4,
+       0xe0b704ee,
+       0xeb980270,
+       0x02ec9803,
+       0x9801ed98,
+       0x21f500ee,
+       0x10b602f1,
+       0x0f1ec401,
+       0x04b007f1,
+       0xbd000ed0,
+       0xc30ef404,
+/* 0x0444: host_send_done */
+/* 0x0446: host_recv */
+       0x17f100f8,
+       0x13f14e49,
+       0xe1b85254,
+       0xb30bf406,
+/* 0x0454: host_recv_wait */
+       0x04cc17f1,
+       0xf10011cf,
+       0xcf04c827,
+       0x16f00022,
+       0x0612b808,
+       0xc4ec0bf4,
+       0x34b60723,
+       0xf030b704,
+       0x033b8002,
+       0x80023c80,
+       0x3e80013d,
+       0x0120b600,
+       0xf10f24f0,
+       0xd004c807,
+       0x04bd0002,
+       0xf04027f0,
+       0x02d00007,
+       0xf804bd00,
+/* 0x049d: host_init */
+       0x8017f100,
+       0x1014b600,
+       0x027015f1,
+       0x04d007f1,
+       0xbd0001d0,
+       0x8017f104,
+       0x1014b600,
+       0x02f015f1,
+       0x04dc07f1,
+       0xbd0001d0,
+       0x0117f004,
+       0x04c407f1,
+       0xbd0001d0,
+/* 0x04d3: memx_func_enter */
+       0xf100f804,
+       0xf1162067,
+       0xf1f55d77,
+       0xb9ffff73,
+       0x21f4026e,
+       0x02d8b904,
+       0xf90487fd,
+       0xfc80f960,
+       0xf4e0fcd0,
+       0x77f13321,
+       0x73f1fffe,
+       0x6eb9ffff,
+       0x0421f402,
+       0xfd02d8b9,
+       0x60f90487,
+       0xd0fc80f9,
+       0x21f4e0fc,
+       0xf067f133,
+       0x026eb926,
+       0xb90421f4,
+       0x87fd02d8,
+       0xf960f904,
+       0xfcd0fc80,
+       0x3321f4e0,
+       0xf10467f0,
+       0xd007e007,
+       0x04bd0006,
+/* 0x053c: memx_func_enter_wait */
+       0x07c067f1,
+       0xf00066cf,
+       0x0bf40464,
+       0x2c67f0f6,
+       0x800066cf,
+       0x00f8f106,
+/* 0x0554: memx_func_leave */
+       0xcf2c67f0,
+       0x06800066,
+       0x0467f0f2,
+       0x07e407f1,
+       0xbd0006d0,
+/* 0x0569: memx_func_leave_wait */
+       0xc067f104,
+       0x0066cf07,
+       0xf40464f0,
+       0x67f1f61b,
+       0x77f126f0,
+       0x73f00001,
+       0x026eb900,
+       0xb90421f4,
+       0x87fd02d8,
+       0xf960f905,
+       0xfcd0fc80,
+       0x3321f4e0,
+       0x162067f1,
+       0xf4026eb9,
+       0xd8b90421,
+       0x0587fd02,
+       0x80f960f9,
+       0xe0fcd0fc,
+       0xf13321f4,
+       0xf00aa277,
+       0x6eb90073,
+       0x0421f402,
+       0xfd02d8b9,
+       0x60f90587,
+       0xd0fc80f9,
+       0x21f4e0fc,
+/* 0x05d3: memx_func_wait_vblank */
+       0xb600f833,
+       0x00f80410,
+/* 0x05d8: memx_func_wr32 */
+       0x98001698,
+       0x10b60115,
+       0xf960f908,
+       0xfcd0fc50,
+       0x3321f4e0,
+       0xf40242b6,
+       0x00f8e91b,
+/* 0x05f4: memx_func_wait */
+       0xcf2c87f0,
+       0x1e980088,
+       0x011d9800,
+       0x98021c98,
+       0x10b6031b,
+       0x8621f410,
+/* 0x060e: memx_func_delay */
+       0x1e9800f8,
+       0x0410b600,
+       0xf86721f4,
+/* 0x0619: memx_func_train */
+/* 0x061b: memx_exec */
+       0xf900f800,
+       0xb9d0f9e0,
+       0xb2b902c1,
+/* 0x0625: memx_exec_next */
+       0x00139802,
+       0xe70410b6,
+       0xe701f034,
+       0xb601e033,
+       0x30f00132,
+       0xde35980c,
+       0x12b855f9,
+       0xe41ef406,
+       0x98f10b98,
+       0xcbbbf20c,
+       0xc4b7f102,
+       0x00bbcf07,
+       0xe0fcd0fc,
+       0x02f121f5,
+/* 0x065e: memx_info */
+       0xc67000f8,
+       0x0e0bf401,
+/* 0x0664: memx_info_data */
+       0x03ccc7f1,
+       0x0800b7f1,
+/* 0x066f: memx_info_train */
+       0xf10b0ef4,
+       0xf10bccc7,
+/* 0x0677: memx_info_send */
+       0xf50100b7,
+       0xf802f121,
+/* 0x067d: memx_recv */
+       0x01d6b000,
+       0xb09b0bf4,
+       0x0bf400d6,
+/* 0x068b: memx_init */
+       0xf800f8d8,
+/* 0x068d: perf_recv */
+/* 0x068f: perf_init */
+       0xf800f800,
+/* 0x0691: i2c_drive_scl */
+       0x0036b000,
+       0xf10e0bf4,
+       0xd007e007,
+       0x04bd0001,
+/* 0x06a2: i2c_drive_scl_lo */
+       0x07f100f8,
+       0x01d007e4,
+       0xf804bd00,
+/* 0x06ad: i2c_drive_sda */
+       0x0036b000,
+       0xf10e0bf4,
+       0xd007e007,
+       0x04bd0002,
+/* 0x06be: i2c_drive_sda_lo */
+       0x07f100f8,
+       0x02d007e4,
+       0xf804bd00,
+/* 0x06c9: i2c_sense_scl */
+       0x0132f400,
+       0x07c437f1,
+       0xfd0033cf,
+       0x0bf40431,
+       0x0131f406,
+/* 0x06dc: i2c_sense_scl_done */
+/* 0x06de: i2c_sense_sda */
+       0x32f400f8,
+       0xc437f101,
+       0x0033cf07,
+       0xf40432fd,
+       0x31f4060b,
+/* 0x06f1: i2c_sense_sda_done */
+/* 0x06f3: i2c_raise_scl */
+       0xf900f801,
+       0x9847f140,
+       0x0137f008,
+       0x069121f5,
+/* 0x0700: i2c_raise_scl_wait */
+       0x03e8e7f1,
+       0xf56721f4,
+       0xf406c921,
+       0x42b60901,
+       0xef1bf401,
+/* 0x0714: i2c_raise_scl_done */
+       0x00f840fc,
+/* 0x0718: i2c_start */
+       0x06c921f5,
+       0xf50d11f4,
+       0xf406de21,
+       0x0ef40611,
+/* 0x0729: i2c_start_rep */
+       0x0037f030,
+       0x069121f5,
+       0xf50137f0,
+       0xbb06ad21,
+       0x65b60076,
+       0x9450f904,
+       0x56bb0465,
+       0xfd50bd02,
+       0x50fc0475,
+       0x06f321f5,
+       0xf40464b6,
+/* 0x0756: i2c_start_send */
+       0x37f01f11,
+       0xad21f500,
+       0x88e7f106,
+       0x6721f413,
+       0xf50037f0,
+       0xf1069121,
+       0xf41388e7,
+/* 0x0772: i2c_start_out */
+       0x00f86721,
+/* 0x0774: i2c_stop */
+       0xf50037f0,
+       0xf0069121,
+       0x21f50037,
+       0xe7f106ad,
+       0x21f403e8,
+       0x0137f067,
+       0x069121f5,
+       0x1388e7f1,
+       0xf06721f4,
+       0x21f50137,
+       0xe7f106ad,
+       0x21f41388,
+/* 0x07a7: i2c_bitw */
+       0xf500f867,
+       0xf106ad21,
+       0xf403e8e7,
+       0x76bb6721,
+       0x0465b600,
+       0x659450f9,
+       0x0256bb04,
+       0x75fd50bd,
+       0xf550fc04,
+       0xb606f321,
+       0x11f40464,
+       0x88e7f118,
+       0x6721f413,
+       0xf50037f0,
+       0xf1069121,
+       0xf41388e7,
+/* 0x07e6: i2c_bitw_out */
+       0x00f86721,
+/* 0x07e8: i2c_bitr */
+       0xf50137f0,
+       0xf106ad21,
+       0xf403e8e7,
+       0x76bb6721,
+       0x0465b600,
+       0x659450f9,
+       0x0256bb04,
+       0x75fd50bd,
+       0xf550fc04,
+       0xb606f321,
+       0x11f40464,
+       0xde21f51b,
+       0x0037f006,
+       0x069121f5,
+       0x1388e7f1,
+       0xf06721f4,
+       0x31f4013c,
+/* 0x082d: i2c_bitr_done */
+/* 0x082f: i2c_get_byte */
+       0xf000f801,
+       0x47f00057,
+/* 0x0835: i2c_get_byte_next */
+       0x0154b608,
+       0xb60076bb,
+       0x50f90465,
+       0xbb046594,
+       0x50bd0256,
+       0xfc0475fd,
+       0xe821f550,
+       0x0464b607,
+       0xfd2b11f4,
+       0x42b60553,
+       0xd81bf401,
+       0xbb0137f0,
+       0x65b60076,
+       0x9450f904,
+       0x56bb0465,
+       0xfd50bd02,
+       0x50fc0475,
+       0x07a721f5,
+/* 0x087f: i2c_get_byte_done */
+       0xf80464b6,
+/* 0x0881: i2c_put_byte */
+       0x0847f000,
+/* 0x0884: i2c_put_byte_next */
+       0xff0142b6,
+       0x76bb3854,
+       0x0465b600,
+       0x659450f9,
+       0x0256bb04,
+       0x75fd50bd,
+       0xf550fc04,
+       0xb607a721,
+       0x11f40464,
+       0x0046b034,
+       0xbbd81bf4,
+       0x65b60076,
+       0x9450f904,
+       0x56bb0465,
+       0xfd50bd02,
+       0x50fc0475,
+       0x07e821f5,
+       0xf40464b6,
+       0x76bb0f11,
+       0x0136b000,
+       0xf4061bf4,
+/* 0x08da: i2c_put_byte_done */
+       0x00f80132,
+/* 0x08dc: i2c_addr */
+       0xb60076bb,
+       0x50f90465,
+       0xbb046594,
+       0x50bd0256,
+       0xfc0475fd,
+       0x1821f550,
+       0x0464b607,
+       0xe72911f4,
+       0xb6012ec3,
+       0x53fd0134,
+       0x0076bb05,
+       0xf90465b6,
+       0x04659450,
+       0xbd0256bb,
+       0x0475fd50,
+       0x21f550fc,
+       0x64b60881,
+/* 0x0921: i2c_addr_done */
+/* 0x0923: i2c_acquire_addr */
+       0xc700f804,
+       0xe4b6f8ce,
+       0x14e0b705,
+/* 0x092f: i2c_acquire */
+       0xf500f8d0,
+       0xf4092321,
+       0xd9f00421,
+       0x3321f403,
+/* 0x093e: i2c_release */
+       0x21f500f8,
+       0x21f40923,
+       0x03daf004,
+       0xf83321f4,
+/* 0x094d: i2c_recv */
+       0x0132f400,
+       0xb6f8c1c7,
+       0x16b00214,
+       0x3a1ff528,
+       0xf413a001,
+       0x0032980c,
+       0x0ccc13a0,
+       0xf4003198,
+       0xd0f90231,
+       0xd0f9e0f9,
+       0x000067f1,
+       0x100063f1,
+       0xbb016792,
+       0x65b60076,
+       0x9450f904,
+       0x56bb0465,
+       0xfd50bd02,
+       0x50fc0475,
+       0x092f21f5,
+       0xfc0464b6,
+       0x00d6b0d0,
+       0x00b31bf5,
+       0xbb0057f0,
+       0x65b60076,
+       0x9450f904,
+       0x56bb0465,
+       0xfd50bd02,
+       0x50fc0475,
+       0x08dc21f5,
+       0xf50464b6,
+       0xc700d011,
+       0x76bbe0c5,
+       0x0465b600,
+       0x659450f9,
+       0x0256bb04,
+       0x75fd50bd,
+       0xf550fc04,
+       0xb6088121,
+       0x11f50464,
+       0x57f000ad,
+       0x0076bb01,
+       0xf90465b6,
+       0x04659450,
+       0xbd0256bb,
+       0x0475fd50,
+       0x21f550fc,
+       0x64b608dc,
+       0x8a11f504,
+       0x0076bb00,
+       0xf90465b6,
+       0x04659450,
+       0xbd0256bb,
+       0x0475fd50,
+       0x21f550fc,
+       0x64b6082f,
+       0x6a11f404,
+       0xbbe05bcb,
+       0x65b60076,
+       0x9450f904,
+       0x56bb0465,
+       0xfd50bd02,
+       0x50fc0475,
+       0x077421f5,
+       0xb90464b6,
+       0x74bd025b,
+/* 0x0a53: i2c_recv_not_rd08 */
+       0xb0430ef4,
+       0x1bf401d6,
+       0x0057f03d,
+       0x08dc21f5,
+       0xc73311f4,
+       0x21f5e0c5,
+       0x11f40881,
+       0x0057f029,
+       0x08dc21f5,
+       0xc71f11f4,
+       0x21f5e0b5,
+       0x11f40881,
+       0x7421f515,
+       0xc774bd07,
+       0x1bf408c5,
+       0x0232f409,
+/* 0x0a93: i2c_recv_not_wr08 */
+/* 0x0a93: i2c_recv_done */
+       0xc7030ef4,
+       0x21f5f8ce,
+       0xe0fc093e,
+       0x12f4d0fc,
+       0x027cb90a,
+       0x02f121f5,
+/* 0x0aa8: i2c_recv_exit */
+/* 0x0aaa: i2c_init */
+       0x00f800f8,
+/* 0x0aac: test_recv */
+       0x05d817f1,
+       0xb60011cf,
+       0x07f10110,
+       0x01d005d8,
+       0xf104bd00,
+       0xf1d900e7,
+       0xf5134fe3,
+       0xf8022321,
+/* 0x0acd: test_init */
+       0x00e7f100,
+       0x2321f508,
+/* 0x0ad7: idle_recv */
+       0xf800f802,
+/* 0x0ad9: idle */
+       0x0031f400,
+       0x05d417f1,
+       0xb60011cf,
+       0x07f10110,
+       0x01d005d4,
+/* 0x0aef: idle_loop */
+       0xf004bd00,
+       0x32f45817,
+/* 0x0af5: idle_proc */
+/* 0x0af5: idle_proc_exec */
+       0xb910f902,
+       0x21f5021e,
+       0x10fc02fa,
+       0xf40911f4,
+       0x0ef40231,
+/* 0x0b09: idle_proc_next */
+       0x5810b6ef,
+       0xf4061fb8,
+       0x02f4e61b,
+       0x0028f4dd,
+       0x00c10ef4,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+};
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf100.c
index 78a4ea0101f15eee4b83c89dce24646ec4181689..aeb8ccd891fc5aa4a190789e11ce5b380d101599 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf100.c
@@ -24,17 +24,16 @@
 #include "priv.h"
 #include "fuc/gf100.fuc3.h"
 
-struct nvkm_oclass *
-gf100_pmu_oclass = &(struct nvkm_pmu_impl) {
-       .base.handle = NV_SUBDEV(PMU, 0xc0),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = _nvkm_pmu_ctor,
-               .dtor = _nvkm_pmu_dtor,
-               .init = _nvkm_pmu_init,
-               .fini = _nvkm_pmu_fini,
-       },
+static const struct nvkm_pmu_func
+gf100_pmu = {
        .code.data = gf100_pmu_code,
        .code.size = sizeof(gf100_pmu_code),
        .data.data = gf100_pmu_data,
        .data.size = sizeof(gf100_pmu_data),
-}.base;
+};
+
+int
+gf100_pmu_new(struct nvkm_device *device, int index, struct nvkm_pmu **ppmu)
+{
+       return nvkm_pmu_new_(&gf100_pmu, device, index, ppmu);
+}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf110.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf110.c
deleted file mode 100644 (file)
index 6b3a238..0000000
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf110.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2013 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Ben Skeggs
- */
-#include "priv.h"
-#include "fuc/gf110.fuc4.h"
-
-struct nvkm_oclass *
-gf110_pmu_oclass = &(struct nvkm_pmu_impl) {
-       .base.handle = NV_SUBDEV(PMU, 0xd0),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = _nvkm_pmu_ctor,
-               .dtor = _nvkm_pmu_dtor,
-               .init = _nvkm_pmu_init,
-               .fini = _nvkm_pmu_fini,
-       },
-       .code.data = gf110_pmu_code,
-       .code.size = sizeof(gf110_pmu_code),
-       .data.data = gf110_pmu_data,
-       .data.size = sizeof(gf110_pmu_data),
-}.base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf119.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf119.c
new file mode 100644 (file)
index 0000000..fbc88d8
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf119.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2013 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs
+ */
+#include "priv.h"
+#include "fuc/gf119.fuc4.h"
+
+static const struct nvkm_pmu_func
+gf119_pmu = {
+       .code.data = gf119_pmu_code,
+       .code.size = sizeof(gf119_pmu_code),
+       .data.data = gf119_pmu_data,
+       .data.size = sizeof(gf119_pmu_data),
+};
+
+int
+gf119_pmu_new(struct nvkm_device *device, int index, struct nvkm_pmu **ppmu)
+{
+       return nvkm_pmu_new_(&gf119_pmu, device, index, ppmu);
+}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c
index bea2833142402f704e1fe016ad3b6fa28b02e292..584299737658ee9a5af0a4dfd8fa23b368a483de 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c
@@ -21,10 +21,10 @@
  *
  * Authors: Ben Skeggs
  */
-#define gf110_pmu_code gk104_pmu_code
-#define gf110_pmu_data gk104_pmu_data
+#define gf119_pmu_code gk104_pmu_code
+#define gf119_pmu_data gk104_pmu_data
 #include "priv.h"
-#include "fuc/gf110.fuc4.h"
+#include "fuc/gf119.fuc4.h"
 
 #include <core/device.h>
 #include <core/option.h>
@@ -103,18 +103,17 @@ gk104_pmu_pgob(struct nvkm_pmu *pmu, bool enable)
        }
 }
 
-struct nvkm_oclass *
-gk104_pmu_oclass = &(struct nvkm_pmu_impl) {
-       .base.handle = NV_SUBDEV(PMU, 0xe4),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = _nvkm_pmu_ctor,
-               .dtor = _nvkm_pmu_dtor,
-               .init = _nvkm_pmu_init,
-               .fini = _nvkm_pmu_fini,
-       },
+static const struct nvkm_pmu_func
+gk104_pmu = {
        .code.data = gk104_pmu_code,
        .code.size = sizeof(gk104_pmu_code),
        .data.data = gk104_pmu_data,
        .data.size = sizeof(gk104_pmu_data),
        .pgob = gk104_pmu_pgob,
-}.base;
+};
+
+int
+gk104_pmu_new(struct nvkm_device *device, int index, struct nvkm_pmu **ppmu)
+{
+       return nvkm_pmu_new_(&gk104_pmu, device, index, ppmu);
+}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk110.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk110.c
index 162c007d49c8ffdc8b7dfe2ef06f6005d62ca270..ae255247c9d13c7d17d67be0ceb3aa0067e4c2c0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk110.c
@@ -21,10 +21,10 @@
  *
  * Authors: Ben Skeggs
  */
-#define gf110_pmu_code gk110_pmu_code
-#define gf110_pmu_data gk110_pmu_data
+#define gf119_pmu_code gk110_pmu_code
+#define gf119_pmu_data gk110_pmu_data
 #include "priv.h"
-#include "fuc/gf110.fuc4.h"
+#include "fuc/gf119.fuc4.h"
 
 #include <subdev/timer.h>
 
@@ -82,18 +82,17 @@ gk110_pmu_pgob(struct nvkm_pmu *pmu, bool enable)
        nvkm_rd32(device, 0x000200);
 }
 
-struct nvkm_oclass *
-gk110_pmu_oclass = &(struct nvkm_pmu_impl) {
-       .base.handle = NV_SUBDEV(PMU, 0xf0),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = _nvkm_pmu_ctor,
-               .dtor = _nvkm_pmu_dtor,
-               .init = _nvkm_pmu_init,
-               .fini = _nvkm_pmu_fini,
-       },
+static const struct nvkm_pmu_func
+gk110_pmu = {
        .code.data = gk110_pmu_code,
        .code.size = sizeof(gk110_pmu_code),
        .data.data = gk110_pmu_data,
        .data.size = sizeof(gk110_pmu_data),
        .pgob = gk110_pmu_pgob,
-}.base;
+};
+
+int
+gk110_pmu_new(struct nvkm_device *device, int index, struct nvkm_pmu **ppmu)
+{
+       return nvkm_pmu_new_(&gk110_pmu, device, index, ppmu);
+}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk208.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk208.c
index b14134ef9ea52455465ebda40703e4d15004ec5b..3b4917637902398cbaf152fbd7e7dd24c9aadf61 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk208.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk208.c
@@ -24,18 +24,17 @@
 #include "priv.h"
 #include "fuc/gk208.fuc5.h"
 
-struct nvkm_oclass *
-gk208_pmu_oclass = &(struct nvkm_pmu_impl) {
-       .base.handle = NV_SUBDEV(PMU, 0x00),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = _nvkm_pmu_ctor,
-               .dtor = _nvkm_pmu_dtor,
-               .init = _nvkm_pmu_init,
-               .fini = _nvkm_pmu_fini,
-       },
+static const struct nvkm_pmu_func
+gk208_pmu = {
        .code.data = gk208_pmu_code,
        .code.size = sizeof(gk208_pmu_code),
        .data.data = gk208_pmu_data,
        .data.size = sizeof(gk208_pmu_data),
        .pgob = gk110_pmu_pgob,
-}.base;
+};
+
+int
+gk208_pmu_new(struct nvkm_device *device, int index, struct nvkm_pmu **ppmu)
+{
+       return nvkm_pmu_new_(&gk208_pmu, device, index, ppmu);
+}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
index bf3c53851352c3d3a8b94ca8b3e3b049462a8cbf..860c8bc2b422073a6115856114293fb25444c8f2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#define gk20a_pmu(p) container_of((p), struct gk20a_pmu, base.subdev)
 #include "priv.h"
 
 #include <subdev/clk.h>
@@ -165,27 +166,24 @@ resched:
 }
 
 static int
-gk20a_pmu_fini(struct nvkm_object *object, bool suspend)
+gk20a_pmu_fini(struct nvkm_subdev *subdev, bool suspend)
 {
-       struct gk20a_pmu *pmu = (void *)object;
-
+       struct gk20a_pmu *pmu = gk20a_pmu(subdev);
        nvkm_timer_alarm_cancel(pmu, &pmu->alarm);
+       return 0;
+}
 
-       return nvkm_subdev_fini_old(&pmu->base.subdev, suspend);
+static void *
+gk20a_pmu_dtor(struct nvkm_subdev *subdev)
+{
+       return gk20a_pmu(subdev);
 }
 
 static int
-gk20a_pmu_init(struct nvkm_object *object)
+gk20a_pmu_init(struct nvkm_subdev *subdev)
 {
-       struct gk20a_pmu *pmu = (void *)object;
+       struct gk20a_pmu *pmu = gk20a_pmu(subdev);
        struct nvkm_device *device = pmu->base.subdev.device;
-       int ret;
-
-       ret = nvkm_subdev_init_old(&pmu->base.subdev);
-       if (ret)
-               return ret;
-
-       pmu->base.pgob = nvkm_pmu_pgob;
 
        /* init pwr perf counter */
        nvkm_wr32(device, 0x10a504 + (BUSY_SLOT * 0x10), 0x00200001);
@@ -193,7 +191,7 @@ gk20a_pmu_init(struct nvkm_object *object)
        nvkm_wr32(device, 0x10a50c + (CLK_SLOT * 0x10), 0x00000003);
 
        nvkm_timer_alarm(pmu, 2000000000, &pmu->alarm);
-       return ret;
+       return 0;
 }
 
 static struct gk20a_pmu_dvfs_data
@@ -203,32 +201,26 @@ gk20a_dvfs_data= {
        .p_smooth = 1,
 };
 
-static int
-gk20a_pmu_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-              struct nvkm_oclass *oclass, void *data, u32 size,
-              struct nvkm_object **pobject)
+static const struct nvkm_subdev_func
+gk20a_pmu = {
+       .init = gk20a_pmu_init,
+       .fini = gk20a_pmu_fini,
+       .dtor = gk20a_pmu_dtor,
+};
+
+int
+gk20a_pmu_new(struct nvkm_device *device, int index, struct nvkm_pmu **ppmu)
 {
+       static const struct nvkm_pmu_func func = {};
        struct gk20a_pmu *pmu;
-       int ret;
 
-       ret = nvkm_pmu_create(parent, engine, oclass, &pmu);
-       *pobject = nv_object(pmu);
-       if (ret)
-               return ret;
+       if (!(pmu = kzalloc(sizeof(*pmu), GFP_KERNEL)))
+               return -ENOMEM;
+       pmu->base.func = &func;
+       *ppmu = &pmu->base;
 
+       nvkm_subdev_ctor(&gk20a_pmu, device, index, 0, &pmu->base.subdev);
        pmu->data = &gk20a_dvfs_data;
-
        nvkm_alarm_init(&pmu->alarm, gk20a_pmu_dvfs_work);
        return 0;
 }
-
-struct nvkm_oclass *
-gk20a_pmu_oclass = &(struct nvkm_pmu_impl) {
-       .base.handle = NV_SUBDEV(PMU, 0xea),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = gk20a_pmu_ctor,
-               .dtor = _nvkm_pmu_dtor,
-               .init = gk20a_pmu_init,
-               .fini = gk20a_pmu_fini,
-       },
-}.base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm107.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm107.c
new file mode 100644 (file)
index 0000000..31b8692
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm107.c
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2013 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs
+ */
+#include "priv.h"
+#define gk208_pmu_code gm107_pmu_code
+#define gk208_pmu_data gm107_pmu_data
+#include "fuc/gk208.fuc5.h"
+
+static const struct nvkm_pmu_func
+gm107_pmu = {
+       .code.data = gm107_pmu_code,
+       .code.size = sizeof(gm107_pmu_code),
+       .data.data = gm107_pmu_data,
+       .data.size = sizeof(gm107_pmu_data),
+};
+
+int
+gm107_pmu_new(struct nvkm_device *device, int index, struct nvkm_pmu **ppmu)
+{
+       return nvkm_pmu_new_(&gm107_pmu, device, index, ppmu);
+}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c
index 223f9fb9f44f5179663537ddfc682a8249f33dbd..8ba7fa4ca75bdaeec4026156da21bb0a9f279fa1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c
@@ -24,27 +24,25 @@
 #include "priv.h"
 #include "fuc/gt215.fuc3.h"
 
-static int
-gt215_pmu_init(struct nvkm_object *object)
+static void
+gt215_pmu_reset(struct nvkm_pmu *pmu)
 {
-       struct nvkm_pmu *pmu = (void *)object;
        struct nvkm_device *device = pmu->subdev.device;
        nvkm_mask(device, 0x022210, 0x00000001, 0x00000000);
        nvkm_mask(device, 0x022210, 0x00000001, 0x00000001);
-       return nvkm_pmu_init(pmu);
 }
 
-struct nvkm_oclass *
-gt215_pmu_oclass = &(struct nvkm_pmu_impl) {
-       .base.handle = NV_SUBDEV(PMU, 0xa3),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = _nvkm_pmu_ctor,
-               .dtor = _nvkm_pmu_dtor,
-               .init = gt215_pmu_init,
-               .fini = _nvkm_pmu_fini,
-       },
+static const struct nvkm_pmu_func
+gt215_pmu = {
+       .reset = gt215_pmu_reset,
        .code.data = gt215_pmu_code,
        .code.size = sizeof(gt215_pmu_code),
        .data.data = gt215_pmu_data,
        .data.size = sizeof(gt215_pmu_data),
-}.base;
+};
+
+int
+gt215_pmu_new(struct nvkm_device *device, int index, struct nvkm_pmu **ppmu)
+{
+       return nvkm_pmu_new_(&gt215_pmu, device, index, ppmu);
+}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
index 556aefe3614f13407e77bd79df3c2589e5d1d80d..e6f74168238c72ecc426471f061f676d66cc0829 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
@@ -47,8 +47,8 @@ nvkm_memx_init(struct nvkm_pmu *pmu, struct nvkm_memx **pmemx)
        u32 reply[2];
        int ret;
 
-       ret = pmu->message(pmu, reply, PROC_MEMX, MEMX_MSG_INFO,
-                          MEMX_INFO_DATA, 0);
+       ret = nvkm_pmu_send(pmu, reply, PROC_MEMX, MEMX_MSG_INFO,
+                           MEMX_INFO_DATA, 0);
        if (ret)
                return ret;
 
@@ -85,8 +85,8 @@ nvkm_memx_fini(struct nvkm_memx **pmemx, bool exec)
 
        /* call MEMX process to execute the script, and wait for reply */
        if (exec) {
-               pmu->message(pmu, reply, PROC_MEMX, MEMX_MSG_EXEC,
-                            memx->base, finish);
+               nvkm_pmu_send(pmu, reply, PROC_MEMX, MEMX_MSG_EXEC,
+                             memx->base, finish);
        }
 
        nvkm_debug(subdev, "Exec took %uns, PMU_IN %08x\n",
@@ -168,8 +168,8 @@ nvkm_memx_train_result(struct nvkm_pmu *pmu, u32 *res, int rsize)
        u32 reply[2], base, size, i;
        int ret;
 
-       ret = pmu->message(pmu, reply, PROC_MEMX, MEMX_MSG_INFO,
-                          MEMX_INFO_TRAIN, 0);
+       ret = nvkm_pmu_send(pmu, reply, PROC_MEMX, MEMX_MSG_INFO,
+                           MEMX_INFO_TRAIN, 0);
        if (ret)
                return ret;
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h
index 799e7c8b88f50cc163b45f06731652e5e8a3cd2b..f38c88fae3d6fb44f2347961f6e514953bee7410 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h
@@ -1,38 +1,20 @@
 #ifndef __NVKM_PMU_PRIV_H__
 #define __NVKM_PMU_PRIV_H__
+#define nvkm_pmu(p) container_of((p), struct nvkm_pmu, subdev)
 #include <subdev/pmu.h>
 #include <subdev/pmu/fuc/os.h>
 
-#define nvkm_pmu_create(p, e, o, d)                                         \
-       nvkm_pmu_create_((p), (e), (o), sizeof(**d), (void **)d)
-#define nvkm_pmu_destroy(p)                                                 \
-       nvkm_subdev_destroy(&(p)->base)
-#define nvkm_pmu_init(p) ({                                                 \
-       struct nvkm_pmu *_pmu = (p);                                       \
-       _nvkm_pmu_init(nv_object(_pmu));                                   \
-})
-#define nvkm_pmu_fini(p,s) ({                                               \
-       struct nvkm_pmu *_pmu = (p);                                       \
-       _nvkm_pmu_fini(nv_object(_pmu), (s));                              \
-})
+int nvkm_pmu_new_(const struct nvkm_pmu_func *, struct nvkm_device *,
+                 int index, struct nvkm_pmu **);
 
-int nvkm_pmu_create_(struct nvkm_object *, struct nvkm_object *,
-                       struct nvkm_oclass *, int, void **);
+struct nvkm_pmu_func {
+       void (*reset)(struct nvkm_pmu *);
 
-int _nvkm_pmu_ctor(struct nvkm_object *, struct nvkm_object *,
-                     struct nvkm_oclass *, void *, u32,
-                     struct nvkm_object **);
-#define _nvkm_pmu_dtor _nvkm_subdev_dtor
-int _nvkm_pmu_init(struct nvkm_object *);
-int _nvkm_pmu_fini(struct nvkm_object *, bool);
-void nvkm_pmu_pgob(struct nvkm_pmu *pmu, bool enable);
-
-struct nvkm_pmu_impl {
-       struct nvkm_oclass base;
        struct {
                u32 *data;
                u32  size;
        } code;
+
        struct {
                u32 *data;
                u32  size;
ubuntu-zesty-kernel mirror