Commit 9e3911e5 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/sec: switch to subdev printk macros

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 476901ff
......@@ -10,7 +10,6 @@ struct nvkm_enum {
};
const struct nvkm_enum *nvkm_enum_find(const struct nvkm_enum *, u32 value);
const struct nvkm_enum *nvkm_enum_print(const struct nvkm_enum *, u32 value);
struct nvkm_bitfield {
u32 mask;
......
......@@ -38,17 +38,6 @@ nvkm_enum_find(const struct nvkm_enum *en, u32 value)
return NULL;
}
const struct nvkm_enum *
nvkm_enum_print(const struct nvkm_enum *en, u32 value)
{
en = nvkm_enum_find(en, value);
if (en)
pr_cont("%s", en->name);
else
pr_cont("(unknown enum 0x%08x)", value);
return en;
}
void
nvkm_snprintbf(char *data, int size, const struct nvkm_bitfield *bf, u32 value)
{
......
......@@ -84,23 +84,25 @@ g98_sec_intr(struct nvkm_subdev *subdev)
u32 mthd = (addr & 0x07ff) << 2;
u32 subc = (addr & 0x3800) >> 11;
u32 data = nvkm_rd32(device, 0x087044);
const struct nvkm_enum *en;
int chid;
engctx = nvkm_engctx_get(engine, inst);
chid = fifo->chid(fifo, engctx);
if (stat & 0x00000040) {
nv_error(sec, "DISPATCH_ERROR [");
nvkm_enum_print(g98_sec_isr_error_name, ssta);
pr_cont("] ch %d [0x%010llx %s] subc %d mthd 0x%04x data 0x%08x\n",
chid, (u64)inst << 12, nvkm_client_name(engctx),
subc, mthd, data);
en = nvkm_enum_find(g98_sec_isr_error_name, ssta);
nvkm_error(subdev, "DISPATCH_ERROR %04x [%s] "
"ch %d [%010llx %s] subc %d "
"mthd %04x data %08x\n", ssta,
en ? en->name : "", chid, (u64)inst << 12,
nvkm_client_name(engctx), subc, mthd, data);
nvkm_wr32(device, 0x087004, 0x00000040);
stat &= ~0x00000040;
}
if (stat) {
nv_error(sec, "unhandled intr 0x%08x\n", stat);
nvkm_error(subdev, "intr %08x\n", stat);
nvkm_wr32(device, 0x087004, stat);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment