Commit b6afa265 authored by Samuel Pitoiset's avatar Samuel Pitoiset Committed by Ben Skeggs

drm/nouveau/ibus/gf100: increase wait timeout to avoid read faults

Increase clock timeout of some unknown engines in order to avoid failure
at high gpcclk rate.

This fixes IBUS read faults on my GF119 when reclocking is manually
enabled. Note that memory reclocking is completely broken and NvMemExec
has to be disabled to allow core clock reclocking only.
Signed-off-by: default avatarSamuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 24580d1c
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include <core/subdev.h> #include <core/subdev.h>
int gf100_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **); int gf100_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);
int gf117_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);
int gk104_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **); int gk104_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);
int gk20a_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **); int gk20a_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);
#endif #endif
...@@ -1595,7 +1595,7 @@ nvd7_chipset = { ...@@ -1595,7 +1595,7 @@ nvd7_chipset = {
.fuse = gf100_fuse_new, .fuse = gf100_fuse_new,
.gpio = gf119_gpio_new, .gpio = gf119_gpio_new,
.i2c = gf117_i2c_new, .i2c = gf117_i2c_new,
.ibus = gf100_ibus_new, .ibus = gf117_ibus_new,
.imem = nv50_instmem_new, .imem = nv50_instmem_new,
.ltc = gf100_ltc_new, .ltc = gf100_ltc_new,
.mc = gf100_mc_new, .mc = gf100_mc_new,
...@@ -1628,7 +1628,7 @@ nvd9_chipset = { ...@@ -1628,7 +1628,7 @@ nvd9_chipset = {
.fuse = gf100_fuse_new, .fuse = gf100_fuse_new,
.gpio = gf119_gpio_new, .gpio = gf119_gpio_new,
.i2c = gf119_i2c_new, .i2c = gf119_i2c_new,
.ibus = gf100_ibus_new, .ibus = gf117_ibus_new,
.imem = nv50_instmem_new, .imem = nv50_instmem_new,
.ltc = gf100_ltc_new, .ltc = gf100_ltc_new,
.mc = gf100_mc_new, .mc = gf100_mc_new,
......
nvkm-y += nvkm/subdev/ibus/gf100.o nvkm-y += nvkm/subdev/ibus/gf100.o
nvkm-y += nvkm/subdev/ibus/gf117.o
nvkm-y += nvkm/subdev/ibus/gk104.o nvkm-y += nvkm/subdev/ibus/gk104.o
nvkm-y += nvkm/subdev/ibus/gk20a.o nvkm-y += nvkm/subdev/ibus/gk20a.o
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
* *
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include <subdev/ibus.h> #include "priv.h"
static void static void
gf100_ibus_intr_hub(struct nvkm_subdev *ibus, int i) gf100_ibus_intr_hub(struct nvkm_subdev *ibus, int i)
...@@ -56,7 +56,7 @@ gf100_ibus_intr_gpc(struct nvkm_subdev *ibus, int i) ...@@ -56,7 +56,7 @@ gf100_ibus_intr_gpc(struct nvkm_subdev *ibus, int i)
nvkm_mask(device, 0x128128 + (i * 0x0400), 0x00000200, 0x00000000); nvkm_mask(device, 0x128128 + (i * 0x0400), 0x00000200, 0x00000000);
} }
static void void
gf100_ibus_intr(struct nvkm_subdev *ibus) gf100_ibus_intr(struct nvkm_subdev *ibus)
{ {
struct nvkm_device *device = ibus->device; struct nvkm_device *device = ibus->device;
...@@ -92,8 +92,21 @@ gf100_ibus_intr(struct nvkm_subdev *ibus) ...@@ -92,8 +92,21 @@ gf100_ibus_intr(struct nvkm_subdev *ibus)
} }
} }
static int
gf100_ibus_init(struct nvkm_subdev *ibus)
{
struct nvkm_device *device = ibus->device;
nvkm_mask(device, 0x122310, 0x0003ffff, 0x00000800);
nvkm_wr32(device, 0x12232c, 0x00100064);
nvkm_wr32(device, 0x122330, 0x00100064);
nvkm_wr32(device, 0x122334, 0x00100064);
nvkm_mask(device, 0x122348, 0x0003ffff, 0x00000100);
return 0;
}
static const struct nvkm_subdev_func static const struct nvkm_subdev_func
gf100_ibus = { gf100_ibus = {
.init = gf100_ibus_init,
.intr = gf100_ibus_intr, .intr = gf100_ibus_intr,
}; };
......
/*
* Copyright 2015 Samuel Pitosiet
*
* 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: Samuel Pitoiset
*/
#include "priv.h"
static int
gf117_ibus_init(struct nvkm_subdev *ibus)
{
struct nvkm_device *device = ibus->device;
nvkm_mask(device, 0x122310, 0x0003ffff, 0x00000800);
nvkm_mask(device, 0x122348, 0x0003ffff, 0x00000100);
nvkm_mask(device, 0x1223b0, 0x0003ffff, 0x00000fff);
return 0;
}
static const struct nvkm_subdev_func
gf117_ibus = {
.init = gf117_ibus_init,
.intr = gf100_ibus_intr,
};
int
gf117_ibus_new(struct nvkm_device *device, int index,
struct nvkm_subdev **pibus)
{
struct nvkm_subdev *ibus;
if (!(ibus = *pibus = kzalloc(sizeof(*ibus), GFP_KERNEL)))
return -ENOMEM;
nvkm_subdev_ctor(&gf117_ibus, device, index, 0, ibus);
return 0;
}
#ifndef __NVKM_IBUS_PRIV_H__
#define __NVKM_IBUS_PRIV_H__
#include <subdev/ibus.h>
void gf100_ibus_intr(struct nvkm_subdev *);
#endif
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