drm/nouveau/core: xtensa engine base class implementation

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
index 78f9aa2..b59cfd7 100644 (file)
--- a/drivers/gpu/drm/nouveau/Makefile
+++ b/drivers/gpu/drm/nouveau/Makefile
@@ -142,6 +142,7 @@ nouveau-y += core/subdev/vm/nv50.o
 nouveau-y += core/subdev/vm/nvc0.o
 
 nouveau-y += core/engine/falcon.o
+nouveau-y += core/engine/xtensa.o
 nouveau-y += core/engine/dmaobj/base.o
 nouveau-y += core/engine/dmaobj/nv04.o
 nouveau-y += core/engine/dmaobj/nv50.o

diff --git a/drivers/gpu/drm/nouveau/core/engine/xtensa.c b/drivers/gpu/drm/nouveau/core/engine/xtensa.c
new file mode 100644 (file)
index 0000000..0639bc5
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/core/engine/xtensa.c
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2013 Ilia Mirkin
+ *
+ * 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.
+ */
+
+#include <engine/xtensa.h>
+
+u32
+_nouveau_xtensa_rd32(struct nouveau_object *object, u64 addr)
+{
+       struct nouveau_xtensa *xtensa = (void *)object;
+       return nv_rd32(xtensa, xtensa->addr + addr);
+}
+
+void
+_nouveau_xtensa_wr32(struct nouveau_object *object, u64 addr, u32 data)
+{
+       struct nouveau_xtensa *xtensa = (void *)object;
+       nv_wr32(xtensa, xtensa->addr + addr, data);
+}
+
+int
+_nouveau_xtensa_engctx_ctor(struct nouveau_object *parent,
+                           struct nouveau_object *engine,
+                           struct nouveau_oclass *oclass, void *data, u32 size,
+                           struct nouveau_object **pobject)
+{
+       struct nouveau_engctx *engctx;
+       int ret;
+
+       ret = nouveau_engctx_create(parent, engine, oclass, NULL,
+                                   0x10000, 0x1000,
+                                   NVOBJ_FLAG_ZERO_ALLOC, &engctx);
+       *pobject = nv_object(engctx);
+       return ret;
+}
+
+void
+_nouveau_xtensa_intr(struct nouveau_subdev *subdev)
+{
+       struct nouveau_xtensa *xtensa = (void *)subdev;
+       u32 unk104 = nv_ro32(xtensa, 0xd04);
+       u32 intr = nv_ro32(xtensa, 0xc20);
+       u32 chan = nv_ro32(xtensa, 0xc28);
+       u32 unk10c = nv_ro32(xtensa, 0xd0c);
+
+       if (intr & 0x10)
+               nv_warn(xtensa, "Watchdog interrupt, engine hung.\n");
+       nv_wo32(xtensa, 0xc20, intr);
+       intr = nv_ro32(xtensa, 0xc20);
+       if (unk104 == 0x10001 && unk10c == 0x200 && chan && !intr) {
+               nv_debug(xtensa, "Enabling FIFO_CTRL\n");
+               nv_mask(xtensa, xtensa->addr + 0xd94, 0, xtensa->fifo_val);
+       }
+}
+
+int
+nouveau_xtensa_create_(struct nouveau_object *parent,
+                      struct nouveau_object *engine,
+                      struct nouveau_oclass *oclass, u32 addr, bool enable,
+                      const char *iname, const char *fname,
+                      int length, void **pobject)
+{
+       struct nouveau_xtensa *xtensa;
+       int ret;
+
+       ret = nouveau_engine_create_(parent, engine, oclass, enable, iname,
+                                    fname, length, pobject);
+       xtensa = *pobject;
+       if (ret)
+               return ret;
+
+       nv_subdev(xtensa)->intr = _nouveau_xtensa_intr;
+
+       xtensa->addr = addr;
+
+       return 0;
+}
+
+int
+_nouveau_xtensa_init(struct nouveau_object *object)
+{
+       struct nouveau_device *device = nv_device(object);
+       struct nouveau_xtensa *xtensa = (void *)object;
+       const struct firmware *fw;
+       char name[32];
+       int i, ret;
+       u32 tmp;
+
+       ret = nouveau_engine_init(&xtensa->base);
+       if (ret)
+               return ret;
+
+       if (!xtensa->gpu_fw) {
+               snprintf(name, sizeof(name), "nouveau/nv84_xuc%03x",
+                        xtensa->addr >> 12);
+
+               ret = request_firmware(&fw, name, &device->pdev->dev);
+               if (ret) {
+                       nv_warn(xtensa, "unable to load firmware %s\n", name);
+                       return ret;
+               }
+
+               ret = nouveau_gpuobj_new(object, NULL, fw->size, 0x1000, 0,
+                                        &xtensa->gpu_fw);
+               if (ret) {
+                       release_firmware(fw);
+                       return ret;
+               }
+
+               nv_debug(xtensa, "Loading firmware to address: 0x%llx\n",
+                        xtensa->gpu_fw->addr);
+
+               for (i = 0; i < fw->size / 4; i++)
+                       nv_wo32(xtensa->gpu_fw, i * 4, *((u32 *)fw->data + i));
+               release_firmware(fw);
+       }
+
+       nv_wo32(xtensa, 0xd10, 0x1fffffff); /* ?? */
+       nv_wo32(xtensa, 0xd08, 0x0fffffff); /* ?? */
+
+       nv_wo32(xtensa, 0xd28, xtensa->unkd28); /* ?? */
+       nv_wo32(xtensa, 0xc20, 0x3f); /* INTR */
+       nv_wo32(xtensa, 0xd84, 0x3f); /* INTR_EN */
+
+       nv_wo32(xtensa, 0xcc0, xtensa->gpu_fw->addr >> 8); /* XT_REGION_BASE */
+       nv_wo32(xtensa, 0xcc4, 0x1c); /* XT_REGION_SETUP */
+       nv_wo32(xtensa, 0xcc8, xtensa->gpu_fw->size >> 8); /* XT_REGION_LIMIT */
+
+       tmp = nv_rd32(xtensa, 0x0);
+       nv_wo32(xtensa, 0xde0, tmp); /* SCRATCH_H2X */
+
+       nv_wo32(xtensa, 0xce8, 0xf); /* XT_REGION_SETUP */
+
+       nv_wo32(xtensa, 0xc20, 0x3f); /* INTR */
+       nv_wo32(xtensa, 0xd84, 0x3f); /* INTR_EN */
+
+       return 0;
+}
+
+int
+_nouveau_xtensa_fini(struct nouveau_object *object, bool suspend)
+{
+       struct nouveau_xtensa *xtensa = (void *)object;
+
+       nv_wo32(xtensa, 0xd84, 0); /* INTR_EN */
+       nv_wo32(xtensa, 0xd94, 0); /* FIFO_CTRL */
+
+       if (!suspend)
+               nouveau_gpuobj_ref(NULL, &xtensa->gpu_fw);
+
+       return nouveau_engine_fini(&xtensa->base, suspend);
+}

diff --git a/drivers/gpu/drm/nouveau/core/include/engine/xtensa.h b/drivers/gpu/drm/nouveau/core/include/engine/xtensa.h
new file mode 100644 (file)
index 0000000..306100f
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/core/include/engine/xtensa.h
@@ -0,0 +1,38 @@
+#ifndef __NOUVEAU_XTENSA_H__
+#define __NOUVEAU_XTENSA_H__
+
+#include <core/engine.h>
+#include <core/engctx.h>
+#include <core/gpuobj.h>
+
+struct nouveau_xtensa {
+       struct nouveau_engine base;
+
+       u32 addr;
+       struct nouveau_gpuobj *gpu_fw;
+       u32 fifo_val;
+       u32 unkd28;
+};
+
+#define nouveau_xtensa_create(p,e,c,b,d,i,f,r)                         \
+       nouveau_xtensa_create_((p), (e), (c), (b), (d), (i), (f),       \
+                              sizeof(**r),(void **)r)
+
+int _nouveau_xtensa_engctx_ctor(struct nouveau_object *,
+                               struct nouveau_object *,
+                               struct nouveau_oclass *, void *, u32,
+                               struct nouveau_object **);
+
+void _nouveau_xtensa_intr(struct nouveau_subdev *);
+int nouveau_xtensa_create_(struct nouveau_object *,
+                          struct nouveau_object *,
+                          struct nouveau_oclass *, u32, bool,
+                          const char *, const char *,
+                          int, void **);
+#define _nouveau_xtensa_dtor _nouveau_engine_dtor
+int _nouveau_xtensa_init(struct nouveau_object *);
+int _nouveau_xtensa_fini(struct nouveau_object *, bool);
+u32  _nouveau_xtensa_rd32(struct nouveau_object *, u64);
+void _nouveau_xtensa_wr32(struct nouveau_object *, u64, u32);
+
+#endif