drm/nouveau/fault/gp100: implement replayable fault buffer initialisation

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fault.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fault.h
index 6ba9c179aa09bd75a0759e57e3c3cd93be34c798..8ca66e57277961ebf37f35197475bc6147c465e1 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fault.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fault.h
@@ -11,4 +11,6 @@ struct nvkm_fault {
 
        struct nvkm_event event;
 };
+
+int gp100_fault_new(struct nvkm_device *, int, struct nvkm_fault **);
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 70f3cc0844c9bc069d231799a8170a5a1b3b7074..379e701962a7b07c3deb014b89141fb9bf646d1d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -2161,6 +2161,7 @@ nv130_chipset = {
        .bios = nvkm_bios_new,
        .bus = gf100_bus_new,
        .devinit = gm200_devinit_new,
+       .fault = gp100_fault_new,
        .fb = gp100_fb_new,
        .fuse = gm107_fuse_new,
        .gpio = gk104_gpio_new,
@@ -2196,6 +2197,7 @@ nv132_chipset = {
        .bios = nvkm_bios_new,
        .bus = gf100_bus_new,
        .devinit = gm200_devinit_new,
+       .fault = gp100_fault_new,
        .fb = gp102_fb_new,
        .fuse = gm107_fuse_new,
        .gpio = gk104_gpio_new,
@@ -2231,6 +2233,7 @@ nv134_chipset = {
        .bios = nvkm_bios_new,
        .bus = gf100_bus_new,
        .devinit = gm200_devinit_new,
+       .fault = gp100_fault_new,
        .fb = gp102_fb_new,
        .fuse = gm107_fuse_new,
        .gpio = gk104_gpio_new,
@@ -2266,6 +2269,7 @@ nv136_chipset = {
        .bios = nvkm_bios_new,
        .bus = gf100_bus_new,
        .devinit = gm200_devinit_new,
+       .fault = gp100_fault_new,
        .fb = gp102_fb_new,
        .fuse = gm107_fuse_new,
        .gpio = gk104_gpio_new,
@@ -2301,6 +2305,7 @@ nv137_chipset = {
        .bios = nvkm_bios_new,
        .bus = gf100_bus_new,
        .devinit = gm200_devinit_new,
+       .fault = gp100_fault_new,
        .fb = gp102_fb_new,
        .fuse = gm107_fuse_new,
        .gpio = gk104_gpio_new,
@@ -2336,6 +2341,7 @@ nv138_chipset = {
        .bios = nvkm_bios_new,
        .bus = gf100_bus_new,
        .devinit = gm200_devinit_new,
+       .fault = gp100_fault_new,
        .fb = gp102_fb_new,
        .fuse = gm107_fuse_new,
        .gpio = gk104_gpio_new,
@@ -2369,6 +2375,7 @@ nv13b_chipset = {
        .name = "GP10B",
        .bar = gm20b_bar_new,
        .bus = gf100_bus_new,
+       .fault = gp100_fault_new,
        .fb = gp10b_fb_new,
        .fuse = gm107_fuse_new,
        .ibus = gp10b_ibus_new,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild
index 2e4c226634a1afa15063495cb40d36b55f01db33..807ea402a162e4bad91202f38358d0ce6d778eda 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild
@@ -1 +1,2 @@
 nvkm-y += nvkm/subdev/fault/base.o
+nvkm-y += nvkm/subdev/fault/gp100.o

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fault/gp100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fault/gp100.c
new file mode 100644 (file)
index 0000000..5e71db2
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fault/gp100.c
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2018 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.
+ */
+#include "priv.h"
+
+#include <subdev/mmu.h>
+
+static void
+gp100_fault_buffer_fini(struct nvkm_fault_buffer *buffer)
+{
+       struct nvkm_device *device = buffer->fault->subdev.device;
+       nvkm_mask(device, 0x002a70, 0x00000001, 0x00000000);
+}
+
+static void
+gp100_fault_buffer_init(struct nvkm_fault_buffer *buffer)
+{
+       struct nvkm_device *device = buffer->fault->subdev.device;
+       nvkm_wr32(device, 0x002a74, upper_32_bits(buffer->vma->addr));
+       nvkm_wr32(device, 0x002a70, lower_32_bits(buffer->vma->addr));
+       nvkm_mask(device, 0x002a70, 0x00000001, 0x00000001);
+}
+
+static u32
+gp100_fault_buffer_entries(struct nvkm_fault_buffer *buffer)
+{
+       return nvkm_rd32(buffer->fault->subdev.device, 0x002a78);
+}
+
+static void
+gp100_fault_intr(struct nvkm_fault *fault)
+{
+       nvkm_event_send(&fault->event, 1, 0, NULL, 0);
+}
+
+static const struct nvkm_fault_func
+gp100_fault = {
+       .intr = gp100_fault_intr,
+       .buffer.nr = 1,
+       .buffer.entry_size = 32,
+       .buffer.entries = gp100_fault_buffer_entries,
+       .buffer.init = gp100_fault_buffer_init,
+       .buffer.fini = gp100_fault_buffer_fini,
+};
+
+int
+gp100_fault_new(struct nvkm_device *device, int index,
+               struct nvkm_fault **pfault)
+{
+       return nvkm_fault_new_(&gp100_fault, device, index, pfault);
+}