Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/nouveau/i2c: Enable i2c pads & busses during preinit

It turns out that while disabling i2c bus access from software when the
GPU is suspended was a step in the right direction with:

commit 342406e4fbba ("drm/nouveau/i2c: Disable i2c bus access after
->fini()")

We also ended up accidentally breaking the vbios init scripts on some
older Tesla GPUs, as apparently said scripts can actually use the i2c
bus. Since these scripts are executed before initializing any
subdevices, we end up failing to acquire access to the i2c bus which has
left a number of cards with their fan controllers uninitialized. Luckily
this doesn't break hardware - it just means the fan gets stuck at 100%.

This also means that we've always been using our i2c busses before
initializing them during the init scripts for older GPUs, we just didn't
notice it until we started preventing them from being used until init.
It's pretty impressive this never caused us any issues before!

So, fix this by initializing our i2c pad and busses during subdev
pre-init. We skip initializing aux busses during pre-init, as those are
guaranteed to only ever be used by nouveau for DP aux transactions.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Tested-by: Marc Meledandri <m.meledandri@gmail.com>
Fixes: 342406e4fbba ("drm/nouveau/i2c: Disable i2c bus access after ->fini()")
Cc: stable@vger.kernel.org
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

authored by

Lyude Paul and committed by
Ben Skeggs
7cb95eee 3485b7b5

+20
+20
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
··· 185 185 } 186 186 187 187 static int 188 + nvkm_i2c_preinit(struct nvkm_subdev *subdev) 189 + { 190 + struct nvkm_i2c *i2c = nvkm_i2c(subdev); 191 + struct nvkm_i2c_bus *bus; 192 + struct nvkm_i2c_pad *pad; 193 + 194 + /* 195 + * We init our i2c busses as early as possible, since they may be 196 + * needed by the vbios init scripts on some cards 197 + */ 198 + list_for_each_entry(pad, &i2c->pad, head) 199 + nvkm_i2c_pad_init(pad); 200 + list_for_each_entry(bus, &i2c->bus, head) 201 + nvkm_i2c_bus_init(bus); 202 + 203 + return 0; 204 + } 205 + 206 + static int 188 207 nvkm_i2c_init(struct nvkm_subdev *subdev) 189 208 { 190 209 struct nvkm_i2c *i2c = nvkm_i2c(subdev); ··· 257 238 static const struct nvkm_subdev_func 258 239 nvkm_i2c = { 259 240 .dtor = nvkm_i2c_dtor, 241 + .preinit = nvkm_i2c_preinit, 260 242 .init = nvkm_i2c_init, 261 243 .fini = nvkm_i2c_fini, 262 244 .intr = nvkm_i2c_intr,