* [PATCH 2/3] therm: make sure the temperature settings are sane on nv84+
[not found] ` <1408914911-5022-1-git-send-email-martin.peres-GANU6spQydw@public.gmane.org>
@ 2014-08-24 21:15 ` Martin Peres
2014-08-24 21:15 ` [PATCH 3/3] therm/nv84+: do not expose non-calibrated internal temp sensor Martin Peres
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Martin Peres @ 2014-08-24 21:15 UTC (permalink / raw)
To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
One of my nv92 has a calibrated internal sensor but it displays 0°C
as the default values use sw calibration values to force the temperature
to 0.
Since we cannot read the temperature from the adt7473 present on this board,
let's re-enable the internal reading!
Signed-off-by: Martin Peres <martin.peres@free.fr>
---
nvkm/subdev/therm/nv84.c | 31 ++++++++++++++++++++++++++++++-
nvkm/subdev/therm/nva3.c | 2 ++
nvkm/subdev/therm/nvd0.c | 2 ++
nvkm/subdev/therm/priv.h | 1 +
4 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/nvkm/subdev/therm/nv84.c b/nvkm/subdev/therm/nv84.c
index 1d15c52..38b16d9 100644
--- a/nvkm/subdev/therm/nv84.c
+++ b/nvkm/subdev/therm/nv84.c
@@ -24,6 +24,7 @@
*/
#include "priv.h"
+#include <subdev/fuse.h>
struct nv84_therm_priv {
struct nouveau_therm_priv base;
@@ -35,6 +36,19 @@ nv84_temp_get(struct nouveau_therm *therm)
return nv_rd32(therm, 0x20400);
}
+void
+nv84_sensor_setup(struct nouveau_therm *therm)
+{
+ struct nouveau_fuse *fuse = nouveau_fuse(therm);
+
+ /* enable temperature reading for cards with insane defaults */
+ if (nv_ro32(fuse, 0x1a8) == 1) {
+ nv_mask(therm, 0x20008, 0x80008000, 0x80000000);
+ nv_mask(therm, 0x2000c, 0x80000003, 0x00000000);
+ mdelay(20); /* wait for the temperature to stabilize */
+ }
+}
+
static void
nv84_therm_program_alarms(struct nouveau_therm *therm)
{
@@ -171,6 +185,21 @@ nv84_therm_intr(struct nouveau_subdev *subdev)
}
static int
+nv84_therm_init(struct nouveau_object *object)
+{
+ struct nv84_therm_priv *priv = (void *)object;
+ int ret;
+
+ ret = nouveau_therm_init(&priv->base.base);
+ if (ret)
+ return ret;
+
+ nv84_sensor_setup(&priv->base.base);
+
+ return 0;
+}
+
+static int
nv84_therm_ctor(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
@@ -228,7 +257,7 @@ nv84_therm_oclass = {
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv84_therm_ctor,
.dtor = _nouveau_therm_dtor,
- .init = _nouveau_therm_init,
+ .init = nv84_therm_init,
.fini = nv84_therm_fini,
},
};
diff --git a/nvkm/subdev/therm/nva3.c b/nvkm/subdev/therm/nva3.c
index 0478b2e..7893357 100644
--- a/nvkm/subdev/therm/nva3.c
+++ b/nvkm/subdev/therm/nva3.c
@@ -51,6 +51,8 @@ nva3_therm_init(struct nouveau_object *object)
if (ret)
return ret;
+ nv84_sensor_setup(&priv->base.base);
+
/* enable fan tach, count revolutions per-second */
nv_mask(priv, 0x00e720, 0x00000003, 0x00000002);
if (tach->func != DCB_GPIO_UNUSED) {
diff --git a/nvkm/subdev/therm/nvd0.c b/nvkm/subdev/therm/nvd0.c
index 04bb84f..b70f7cc 100644
--- a/nvkm/subdev/therm/nvd0.c
+++ b/nvkm/subdev/therm/nvd0.c
@@ -150,6 +150,8 @@ nvd0_therm_ctor(struct nouveau_object *parent,
if (ret)
return ret;
+ nv84_sensor_setup(&priv->base.base);
+
priv->base.base.pwm_ctrl = nvd0_fan_pwm_ctrl;
priv->base.base.pwm_get = nvd0_fan_pwm_get;
priv->base.base.pwm_set = nvd0_fan_pwm_set;
diff --git a/nvkm/subdev/therm/priv.h b/nvkm/subdev/therm/priv.h
index 4262d1d..7dba8c2 100644
--- a/nvkm/subdev/therm/priv.h
+++ b/nvkm/subdev/therm/priv.h
@@ -145,6 +145,7 @@ int nv50_fan_pwm_get(struct nouveau_therm *, int, u32 *, u32 *);
int nv50_fan_pwm_set(struct nouveau_therm *, int, u32, u32);
int nv50_fan_pwm_clock(struct nouveau_therm *, int);
int nv84_temp_get(struct nouveau_therm *therm);
+void nv84_sensor_setup(struct nouveau_therm *therm);
int nv84_therm_fini(struct nouveau_object *object, bool suspend);
int nva3_therm_fan_sense(struct nouveau_therm *);
--
2.0.0
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/3] therm/nv84+: do not expose non-calibrated internal temp sensor
[not found] ` <1408914911-5022-1-git-send-email-martin.peres-GANU6spQydw@public.gmane.org>
2014-08-24 21:15 ` [PATCH 2/3] therm: make sure the temperature settings are sane on nv84+ Martin Peres
@ 2014-08-24 21:15 ` Martin Peres
[not found] ` <1408914911-5022-3-git-send-email-martin.peres-GANU6spQydw@public.gmane.org>
2014-08-24 22:27 ` [PATCH 1/3] subdev: add a pfuse subdev Christian Costa
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Martin Peres @ 2014-08-24 21:15 UTC (permalink / raw)
To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Signed-off-by: Martin Peres <martin.peres-GANU6spQydw@public.gmane.org>
---
nvkm/subdev/therm/nv84.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/nvkm/subdev/therm/nv84.c b/nvkm/subdev/therm/nv84.c
index 38b16d9..14e2e09 100644
--- a/nvkm/subdev/therm/nv84.c
+++ b/nvkm/subdev/therm/nv84.c
@@ -33,7 +33,12 @@ struct nv84_therm_priv {
int
nv84_temp_get(struct nouveau_therm *therm)
{
- return nv_rd32(therm, 0x20400);
+ struct nouveau_fuse *fuse = nouveau_fuse(therm);
+
+ if (nv_ro32(fuse, 0x1a8) == 1)
+ return nv_rd32(therm, 0x20400);
+ else
+ return -ENODEV;
}
void
--
2.0.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/3] subdev: add a pfuse subdev
[not found] ` <1408914911-5022-1-git-send-email-martin.peres-GANU6spQydw@public.gmane.org>
2014-08-24 21:15 ` [PATCH 2/3] therm: make sure the temperature settings are sane on nv84+ Martin Peres
2014-08-24 21:15 ` [PATCH 3/3] therm/nv84+: do not expose non-calibrated internal temp sensor Martin Peres
@ 2014-08-24 22:27 ` Christian Costa
[not found] ` <53FA66D3.8000703-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-08-24 23:35 ` Emil Velikov
2014-08-25 22:26 ` [PATCH] subdev: add a pfuse subdev v2 Martin Peres
4 siblings, 1 reply; 9+ messages in thread
From: Christian Costa @ 2014-08-24 22:27 UTC (permalink / raw)
To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Hi Martin,
I'm not very familiar with the function naming scheme but shouldn't
nouveau_fuse_rd32 use the same prefix as xxxx_fuse_ctor instead of nouveau?
Christian
Le 24/08/2014 23:15, Martin Peres a écrit :
> We will use this subdev to disable temperature reading on cards that did not
> get a sensor calibration in the factory.
>
> Signed-off-by: Martin Peres <martin.peres-GANU6spQydw@public.gmane.org>
> ---
> configure.ac | 1 +
> drm/Kbuild | 4 ++
> drm/core/include/subdev/fuse.h | 1 +
> drm/core/subdev/fuse/base.c | 1 +
> drm/core/subdev/fuse/g80.c | 1 +
> drm/core/subdev/fuse/gf100.c | 1 +
> drm/core/subdev/fuse/gm107.c | 1 +
> drm/core/subdev/fuse/priv.h | 1 +
> nvkm/engine/device/gm100.c | 2 +
> nvkm/engine/device/nv50.c | 15 ++++++++
> nvkm/engine/device/nvc0.c | 10 +++++
> nvkm/engine/device/nve0.c | 8 ++++
> nvkm/include/core/device.h | 1 +
> nvkm/include/subdev/fuse.h | 30 +++++++++++++++
> nvkm/subdev/Makefile.am | 3 +-
> nvkm/subdev/fuse/Makefile.am | 8 ++++
> nvkm/subdev/fuse/base.c | 62 +++++++++++++++++++++++++++++++
> nvkm/subdev/fuse/g80.c | 81 +++++++++++++++++++++++++++++++++++++++++
> nvkm/subdev/fuse/gf100.c | 83 ++++++++++++++++++++++++++++++++++++++++++
> nvkm/subdev/fuse/gm107.c | 66 +++++++++++++++++++++++++++++++++
> nvkm/subdev/fuse/priv.h | 9 +++++
> 21 files changed, 388 insertions(+), 1 deletion(-)
> create mode 120000 drm/core/include/subdev/fuse.h
> create mode 120000 drm/core/subdev/fuse/base.c
> create mode 120000 drm/core/subdev/fuse/g80.c
> create mode 120000 drm/core/subdev/fuse/gf100.c
> create mode 120000 drm/core/subdev/fuse/gm107.c
> create mode 120000 drm/core/subdev/fuse/priv.h
> create mode 100644 nvkm/include/subdev/fuse.h
> create mode 100644 nvkm/subdev/fuse/Makefile.am
> create mode 100644 nvkm/subdev/fuse/base.c
> create mode 100644 nvkm/subdev/fuse/g80.c
> create mode 100644 nvkm/subdev/fuse/gf100.c
> create mode 100644 nvkm/subdev/fuse/gm107.c
> create mode 100644 nvkm/subdev/fuse/priv.h
>
> diff --git a/configure.ac b/configure.ac
> index de27156..b4404a5 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -74,6 +74,7 @@ AC_OUTPUT( Makefile \
> nvkm/subdev/clock/Makefile \
> nvkm/subdev/devinit/Makefile \
> nvkm/subdev/fb/Makefile \
> + nvkm/subdev/fuse/Makefile \
> nvkm/subdev/gpio/Makefile \
> nvkm/subdev/i2c/Makefile \
> nvkm/subdev/ibus/Makefile \
> diff --git a/drm/Kbuild b/drm/Kbuild
> index c663181..37ab09b 100644
> --- a/drm/Kbuild
> +++ b/drm/Kbuild
> @@ -127,6 +127,10 @@ nouveau-y += core/subdev/fb/ramgk20a.o
> nouveau-y += core/subdev/fb/ramgm107.o
> nouveau-y += core/subdev/fb/sddr3.o
> nouveau-y += core/subdev/fb/gddr5.o
> +nouveau-y += core/subdev/fuse/base.o
> +nouveau-y += core/subdev/fuse/g80.o
> +nouveau-y += core/subdev/fuse/gf100.o
> +nouveau-y += core/subdev/fuse/gm107.o
> nouveau-y += core/subdev/gpio/base.o
> nouveau-y += core/subdev/gpio/nv10.o
> nouveau-y += core/subdev/gpio/nv50.o
> diff --git a/drm/core/include/subdev/fuse.h b/drm/core/include/subdev/fuse.h
> new file mode 120000
> index 0000000..421fdd7
> --- /dev/null
> +++ b/drm/core/include/subdev/fuse.h
> @@ -0,0 +1 @@
> +../../../../nvkm/include/subdev/fuse.h
> \ No newline at end of file
> diff --git a/drm/core/subdev/fuse/base.c b/drm/core/subdev/fuse/base.c
> new file mode 120000
> index 0000000..b218313
> --- /dev/null
> +++ b/drm/core/subdev/fuse/base.c
> @@ -0,0 +1 @@
> +../../../../nvkm/subdev/fuse/base.c
> \ No newline at end of file
> diff --git a/drm/core/subdev/fuse/g80.c b/drm/core/subdev/fuse/g80.c
> new file mode 120000
> index 0000000..c805b0d
> --- /dev/null
> +++ b/drm/core/subdev/fuse/g80.c
> @@ -0,0 +1 @@
> +../../../../nvkm/subdev/fuse/g80.c
> \ No newline at end of file
> diff --git a/drm/core/subdev/fuse/gf100.c b/drm/core/subdev/fuse/gf100.c
> new file mode 120000
> index 0000000..ad9411b
> --- /dev/null
> +++ b/drm/core/subdev/fuse/gf100.c
> @@ -0,0 +1 @@
> +../../../../nvkm/subdev/fuse/gf100.c
> \ No newline at end of file
> diff --git a/drm/core/subdev/fuse/gm107.c b/drm/core/subdev/fuse/gm107.c
> new file mode 120000
> index 0000000..947b11c
> --- /dev/null
> +++ b/drm/core/subdev/fuse/gm107.c
> @@ -0,0 +1 @@
> +../../../../nvkm/subdev/fuse/gm107.c
> \ No newline at end of file
> diff --git a/drm/core/subdev/fuse/priv.h b/drm/core/subdev/fuse/priv.h
> new file mode 120000
> index 0000000..b6dedaa
> --- /dev/null
> +++ b/drm/core/subdev/fuse/priv.h
> @@ -0,0 +1 @@
> +../../../../nvkm/subdev/fuse/priv.h
> \ No newline at end of file
> diff --git a/nvkm/engine/device/gm100.c b/nvkm/engine/device/gm100.c
> index 9e9f567..6295668 100644
> --- a/nvkm/engine/device/gm100.c
> +++ b/nvkm/engine/device/gm100.c
> @@ -26,6 +26,7 @@
> #include <subdev/bus.h>
> #include <subdev/gpio.h>
> #include <subdev/i2c.h>
> +#include <subdev/fuse.h>
> #include <subdev/clock.h>
> #include <subdev/therm.h>
> #include <subdev/mxm.h>
> @@ -62,6 +63,7 @@ gm100_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nvd0_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gm107_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &gm107_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> diff --git a/nvkm/engine/device/nv50.c b/nvkm/engine/device/nv50.c
> index 932f84f..ca265fe 100644
> --- a/nvkm/engine/device/nv50.c
> +++ b/nvkm/engine/device/nv50.c
> @@ -26,6 +26,7 @@
> #include <subdev/bus.h>
> #include <subdev/gpio.h>
> #include <subdev/i2c.h>
> +#include <subdev/fuse.h>
> #include <subdev/clock.h>
> #include <subdev/therm.h>
> #include <subdev/mxm.h>
> @@ -62,6 +63,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv50_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = nv50_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nv50_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -87,6 +89,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv50_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -115,6 +118,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv50_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -143,6 +147,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -171,6 +176,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -199,6 +205,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -227,6 +234,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -255,6 +263,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -283,6 +292,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = nvaa_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -311,6 +321,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = nvaa_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -339,6 +350,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nva3_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -369,6 +381,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nva3_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -398,6 +411,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nva3_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -427,6 +441,7 @@ nv50_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nva3_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> diff --git a/nvkm/engine/device/nvc0.c b/nvkm/engine/device/nvc0.c
> index b4a2917..89b9fd4 100644
> --- a/nvkm/engine/device/nvc0.c
> +++ b/nvkm/engine/device/nvc0.c
> @@ -26,6 +26,7 @@
> #include <subdev/bus.h>
> #include <subdev/gpio.h>
> #include <subdev/i2c.h>
> +#include <subdev/fuse.h>
> #include <subdev/clock.h>
> #include <subdev/therm.h>
> #include <subdev/mxm.h>
> @@ -62,6 +63,7 @@ nvc0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -94,6 +96,7 @@ nvc0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -126,6 +129,7 @@ nvc0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -157,6 +161,7 @@ nvc0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -189,6 +194,7 @@ nvc0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -221,6 +227,7 @@ nvc0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -252,6 +259,7 @@ nvc0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -284,6 +292,7 @@ nvc0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nvd0_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nvd0_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -315,6 +324,7 @@ nvc0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nvd0_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = gf117_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> diff --git a/nvkm/engine/device/nve0.c b/nvkm/engine/device/nve0.c
> index cdf9147..b1b2e48 100644
> --- a/nvkm/engine/device/nve0.c
> +++ b/nvkm/engine/device/nve0.c
> @@ -26,6 +26,7 @@
> #include <subdev/bus.h>
> #include <subdev/gpio.h>
> #include <subdev/i2c.h>
> +#include <subdev/fuse.h>
> #include <subdev/clock.h>
> #include <subdev/therm.h>
> #include <subdev/mxm.h>
> @@ -62,6 +63,7 @@ nve0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nve0_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -95,6 +97,7 @@ nve0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nve0_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -128,6 +131,7 @@ nve0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nve0_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -161,6 +165,7 @@ nve0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &gk20a_clock_oclass;
> device->oclass[NVDEV_SUBDEV_MC ] = gk20a_mc_oclass;
> device->oclass[NVDEV_SUBDEV_BUS ] = nvc0_bus_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_TIMER ] = &gk20a_timer_oclass;
> device->oclass[NVDEV_SUBDEV_FB ] = gk20a_fb_oclass;
> device->oclass[NVDEV_SUBDEV_LTC ] = gk104_ltc_oclass;
> @@ -180,6 +185,7 @@ nve0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nve0_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -213,6 +219,7 @@ nve0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nvd0_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> @@ -246,6 +253,7 @@ nve0_identify(struct nouveau_device *device)
> device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
> device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
> device->oclass[NVDEV_SUBDEV_I2C ] = nve0_i2c_oclass;
> + device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
> device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
> device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
> device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
> diff --git a/nvkm/include/core/device.h b/nvkm/include/core/device.h
> index 8743766..1d9d893 100644
> --- a/nvkm/include/core/device.h
> +++ b/nvkm/include/core/device.h
> @@ -24,6 +24,7 @@ enum nv_subdev_type {
> * been created, and are allowed to assume any subdevs in the
> * list above them exist and have been initialised.
> */
> + NVDEV_SUBDEV_FUSE,
> NVDEV_SUBDEV_MXM,
> NVDEV_SUBDEV_MC,
> NVDEV_SUBDEV_BUS,
> diff --git a/nvkm/include/subdev/fuse.h b/nvkm/include/subdev/fuse.h
> new file mode 100644
> index 0000000..2b1ddb2
> --- /dev/null
> +++ b/nvkm/include/subdev/fuse.h
> @@ -0,0 +1,30 @@
> +#ifndef __NOUVEAU_FUSE_H__
> +#define __NOUVEAU_FUSE_H__
> +
> +#include <core/subdev.h>
> +#include <core/device.h>
> +
> +struct nouveau_fuse {
> + struct nouveau_subdev base;
> +};
> +
> +static inline struct nouveau_fuse *
> +nouveau_fuse(void *obj)
> +{
> + return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_FUSE];
> +}
> +
> +#define nouveau_fuse_create(p, e, o, d) \
> + nouveau_fuse_create_((p), (e), (o), sizeof(**d), (void **)d)
> +
> +int nouveau_fuse_create_(struct nouveau_object *, struct nouveau_object *,
> + struct nouveau_oclass *, int, void **);
> +void _nouveau_fuse_dtor(struct nouveau_object *);
> +int _nouveau_fuse_init(struct nouveau_object *);
> +#define _nouveau_fuse_fini _nouveau_subdev_fini
> +
> +extern struct nouveau_oclass g80_fuse_oclass;
> +extern struct nouveau_oclass gf100_fuse_oclass;
> +extern struct nouveau_oclass gm107_fuse_oclass;
> +
> +#endif
> diff --git a/nvkm/subdev/Makefile.am b/nvkm/subdev/Makefile.am
> index c8eb147..5a48ddb 100644
> --- a/nvkm/subdev/Makefile.am
> +++ b/nvkm/subdev/Makefile.am
> @@ -1,4 +1,4 @@
> -SUBDIRS = bar bus bios clock devinit fb gpio i2c ibus instmem \
> +SUBDIRS = bar bus bios clock devinit fb fuse gpio i2c ibus instmem \
> ltc mc mxm pwr therm timer vm volt
>
> noinst_LTLIBRARIES = libsubdev.la
> @@ -10,6 +10,7 @@ libsubdev_la_LIBADD = bar/libbar.la \
> clock/libclock.la \
> devinit/libdevinit.la \
> fb/libfb.la \
> + fuse/libfuse.la \
> gpio/libgpio.la \
> i2c/libi2c.la \
> ibus/libibus.la \
> diff --git a/nvkm/subdev/fuse/Makefile.am b/nvkm/subdev/fuse/Makefile.am
> new file mode 100644
> index 0000000..5596d2c
> --- /dev/null
> +++ b/nvkm/subdev/fuse/Makefile.am
> @@ -0,0 +1,8 @@
> +noinst_LTLIBRARIES = libfuse.la
> +
> +libfuse_la_SOURCES = base.c \
> + g80.c \
> + gf100.c \
> + gm107.c
> +
> +include $(srcdir)/../Makefile.subdev
> diff --git a/nvkm/subdev/fuse/base.c b/nvkm/subdev/fuse/base.c
> new file mode 100644
> index 0000000..d249f2b
> --- /dev/null
> +++ b/nvkm/subdev/fuse/base.c
> @@ -0,0 +1,62 @@
> +/*
> + * Copyright 2014 Martin Peres
> + *
> + * 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: Martin Peres
> + */
> +
> +#include <subdev/fuse.h>
> +
> +int
> +_nouveau_fuse_init(struct nouveau_object *object)
> +{
> + struct nouveau_fuse *fuse = (void *)object;
> + int ret;
> +
> + ret = nouveau_subdev_init(&fuse->base);
> + if (ret)
> + return ret;
> +
> + return 0;
> +}
> +
> +void
> +_nouveau_fuse_dtor(struct nouveau_object *object)
> +{
> + struct nouveau_fuse *fuse = (void *)object;
> + nouveau_subdev_destroy(&fuse->base);
> +}
> +
> +int
> +nouveau_fuse_create_(struct nouveau_object *parent,
> + struct nouveau_object *engine,
> + struct nouveau_oclass *oclass, int length, void **pobject)
> +{
> + struct nouveau_fuse *fuse;
> + int ret;
> +
> + ret = nouveau_subdev_create_(parent, engine, oclass, 0, "FUSE",
> + "fuse", length, pobject);
> + fuse = *pobject;
> + if (ret)
> + return ret;
> +
> + return ret;
> +}
> diff --git a/nvkm/subdev/fuse/g80.c b/nvkm/subdev/fuse/g80.c
> new file mode 100644
> index 0000000..31ab5c7
> --- /dev/null
> +++ b/nvkm/subdev/fuse/g80.c
> @@ -0,0 +1,81 @@
> +/*
> + * Copyright 2014 Martin Peres
> + *
> + * 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: Martin Peres
> + */
> +
> +#include "priv.h"
> +
> +struct g80_fuse_priv {
> + struct nouveau_fuse base;
> +
> + spinlock_t fuse_enable_lock;
> +};
> +
> +static u32
> +nouveau_fuse_rd32(struct nouveau_object *object, u64 addr)
> +{
> + struct g80_fuse_priv *priv = (void *)object;
> + unsigned long flags;
> + u32 fuse_enable, val;
> +
> + spin_lock_irqsave(&priv->fuse_enable_lock, flags);
> +
> + /* racy if another part of nouveau start writing to this reg */
> + fuse_enable = nv_mask(priv, 0x1084, 0x800, 0x800);
> + val = nv_rd32(priv, 0x21000 + addr);
> + nv_wr32(priv, 0x1084, fuse_enable);
> +
> + spin_unlock_irqrestore(&priv->fuse_enable_lock, flags);
> +
> + return val;
> +}
> +
> +
> +static int
> +g80_fuse_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
> + struct nouveau_oclass *oclass, void *data, u32 size,
> + struct nouveau_object **pobject)
> +{
> + struct g80_fuse_priv *priv;
> + int ret;
> +
> + ret = nouveau_fuse_create(parent, engine, oclass, &priv);
> + *pobject = nv_object(priv);
> + if (ret)
> + return ret;
> +
> + spin_lock_init(&priv->fuse_enable_lock);
> +
> + return 0;
> +}
> +
> +struct nouveau_oclass
> +g80_fuse_oclass = {
> + .handle = NV_SUBDEV(FUSE, 0x50),
> + .ofuncs = &(struct nouveau_ofuncs) {
> + .ctor = g80_fuse_ctor,
> + .dtor = _nouveau_fuse_dtor,
> + .init = _nouveau_fuse_init,
> + .fini = _nouveau_fuse_fini,
> + .rd32 = nouveau_fuse_rd32,
> + },
> +};
> diff --git a/nvkm/subdev/fuse/gf100.c b/nvkm/subdev/fuse/gf100.c
> new file mode 100644
> index 0000000..8407453
> --- /dev/null
> +++ b/nvkm/subdev/fuse/gf100.c
> @@ -0,0 +1,83 @@
> +/*
> + * Copyright 2014 Martin Peres
> + *
> + * 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: Martin Peres
> + */
> +
> +#include "priv.h"
> +
> +struct gf100_fuse_priv {
> + struct nouveau_fuse base;
> +
> + spinlock_t fuse_enable_lock;
> +};
> +
> +static u32
> +nouveau_fuse_rd32(struct nouveau_object *object, u64 addr)
> +{
> + struct gf100_fuse_priv *priv = (void *)object;
> + unsigned long flags;
> + u32 fuse_enable, unk, val;
> +
> + spin_lock_irqsave(&priv->fuse_enable_lock, flags);
> +
> + /* racy if another part of nouveau start writing to these regs */
> + fuse_enable = nv_mask(priv, 0x22400, 0x800, 0x800);
> + unk = nv_mask(priv, 0x21000, 0x1, 0x1);
> + val = nv_rd32(priv, 0x21100 + addr);
> + nv_wr32(priv, 0x21000, unk);
> + nv_wr32(priv, 0x22400, fuse_enable);
> +
> + spin_unlock_irqrestore(&priv->fuse_enable_lock, flags);
> +
> + return val;
> +}
> +
> +
> +static int
> +gf100_fuse_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
> + struct nouveau_oclass *oclass, void *data, u32 size,
> + struct nouveau_object **pobject)
> +{
> + struct gf100_fuse_priv *priv;
> + int ret;
> +
> + ret = nouveau_fuse_create(parent, engine, oclass, &priv);
> + *pobject = nv_object(priv);
> + if (ret)
> + return ret;
> +
> + spin_lock_init(&priv->fuse_enable_lock);
> +
> + return 0;
> +}
> +
> +struct nouveau_oclass
> +gf100_fuse_oclass = {
> + .handle = NV_SUBDEV(FUSE, 0xC0),
> + .ofuncs = &(struct nouveau_ofuncs) {
> + .ctor = gf100_fuse_ctor,
> + .dtor = _nouveau_fuse_dtor,
> + .init = _nouveau_fuse_init,
> + .fini = _nouveau_fuse_fini,
> + .rd32 = nouveau_fuse_rd32,
> + },
> +};
> diff --git a/nvkm/subdev/fuse/gm107.c b/nvkm/subdev/fuse/gm107.c
> new file mode 100644
> index 0000000..4ade700
> --- /dev/null
> +++ b/nvkm/subdev/fuse/gm107.c
> @@ -0,0 +1,66 @@
> +/*
> + * Copyright 2014 Martin Peres
> + *
> + * 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: Martin Peres
> + */
> +
> +#include "priv.h"
> +
> +struct gm107_fuse_priv {
> + struct nouveau_fuse base;
> +};
> +
> +static u32
> +nouveau_fuse_rd32(struct nouveau_object *object, u64 addr)
> +{
> + struct gf100_fuse_priv *priv = (void *)object;
> +
> + return nv_rd32(priv, 0x21100 + addr);
> +}
> +
> +
> +static int
> +gm107_fuse_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
> + struct nouveau_oclass *oclass, void *data, u32 size,
> + struct nouveau_object **pobject)
> +{
> + struct gm107_fuse_priv *priv;
> + int ret;
> +
> + ret = nouveau_fuse_create(parent, engine, oclass, &priv);
> + *pobject = nv_object(priv);
> + if (ret)
> + return ret;
> +
> + return 0;
> +}
> +
> +struct nouveau_oclass
> +gm107_fuse_oclass = {
> + .handle = NV_SUBDEV(FUSE, 0x117),
> + .ofuncs = &(struct nouveau_ofuncs) {
> + .ctor = gm107_fuse_ctor,
> + .dtor = _nouveau_fuse_dtor,
> + .init = _nouveau_fuse_init,
> + .fini = _nouveau_fuse_fini,
> + .rd32 = nouveau_fuse_rd32,
> + },
> +};
> diff --git a/nvkm/subdev/fuse/priv.h b/nvkm/subdev/fuse/priv.h
> new file mode 100644
> index 0000000..d208541
> --- /dev/null
> +++ b/nvkm/subdev/fuse/priv.h
> @@ -0,0 +1,9 @@
> +#ifndef __NVKM_FUSE_PRIV_H__
> +#define __NVKM_FUSE_PRIV_H__
> +
> +#include <subdev/fuse.h>
> +
> +int _nouveau_fuse_init(struct nouveau_object *object);
> +void _nouveau_fuse_dtor(struct nouveau_object *object);
> +
> +#endif
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/3] subdev: add a pfuse subdev
[not found] ` <1408914911-5022-1-git-send-email-martin.peres-GANU6spQydw@public.gmane.org>
` (2 preceding siblings ...)
2014-08-24 22:27 ` [PATCH 1/3] subdev: add a pfuse subdev Christian Costa
@ 2014-08-24 23:35 ` Emil Velikov
[not found] ` <53FA76A7.4090803-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-08-25 22:26 ` [PATCH] subdev: add a pfuse subdev v2 Martin Peres
4 siblings, 1 reply; 9+ messages in thread
From: Emil Velikov @ 2014-08-24 23:35 UTC (permalink / raw)
To: Martin Peres, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: emil.l.velikov-Re5JQEeQqe8AvxtiuMwx3w
On 24/08/14 22:15, Martin Peres wrote:
> We will use this subdev to disable temperature reading on cards that did not
> get a sensor calibration in the factory.
>
> Signed-off-by: Martin Peres <martin.peres-GANU6spQydw@public.gmane.org>
> ---
> configure.ac | 1 +
> drm/Kbuild | 4 ++
> drm/core/include/subdev/fuse.h | 1 +
> drm/core/subdev/fuse/base.c | 1 +
> drm/core/subdev/fuse/g80.c | 1 +
> drm/core/subdev/fuse/gf100.c | 1 +
> drm/core/subdev/fuse/gm107.c | 1 +
> drm/core/subdev/fuse/priv.h | 1 +
> nvkm/engine/device/gm100.c | 2 +
> nvkm/engine/device/nv50.c | 15 ++++++++
> nvkm/engine/device/nvc0.c | 10 +++++
> nvkm/engine/device/nve0.c | 8 ++++
> nvkm/include/core/device.h | 1 +
> nvkm/include/subdev/fuse.h | 30 +++++++++++++++
> nvkm/subdev/Makefile.am | 3 +-
> nvkm/subdev/fuse/Makefile.am | 8 ++++
> nvkm/subdev/fuse/base.c | 62 +++++++++++++++++++++++++++++++
> nvkm/subdev/fuse/g80.c | 81 +++++++++++++++++++++++++++++++++++++++++
> nvkm/subdev/fuse/gf100.c | 83 ++++++++++++++++++++++++++++++++++++++++++
> nvkm/subdev/fuse/gm107.c | 66 +++++++++++++++++++++++++++++++++
> nvkm/subdev/fuse/priv.h | 9 +++++
> 21 files changed, 388 insertions(+), 1 deletion(-)
> create mode 120000 drm/core/include/subdev/fuse.h
> create mode 120000 drm/core/subdev/fuse/base.c
> create mode 120000 drm/core/subdev/fuse/g80.c
> create mode 120000 drm/core/subdev/fuse/gf100.c
> create mode 120000 drm/core/subdev/fuse/gm107.c
> create mode 120000 drm/core/subdev/fuse/priv.h
> create mode 100644 nvkm/include/subdev/fuse.h
> create mode 100644 nvkm/subdev/fuse/Makefile.am
> create mode 100644 nvkm/subdev/fuse/base.c
> create mode 100644 nvkm/subdev/fuse/g80.c
> create mode 100644 nvkm/subdev/fuse/gf100.c
> create mode 100644 nvkm/subdev/fuse/gm107.c
> create mode 100644 nvkm/subdev/fuse/priv.h
>
[snip]
> diff --git a/nvkm/subdev/fuse/base.c b/nvkm/subdev/fuse/base.c
> new file mode 100644
> index 0000000..d249f2b
> --- /dev/null
> +++ b/nvkm/subdev/fuse/base.c
> @@ -0,0 +1,62 @@
> +/*
> + * Copyright 2014 Martin Peres
> + *
> + * 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: Martin Peres
> + */
> +
> +#include <subdev/fuse.h>
> +
> +int
> +_nouveau_fuse_init(struct nouveau_object *object)
> +{
> + struct nouveau_fuse *fuse = (void *)object;
> + int ret;
> +
> + ret = nouveau_subdev_init(&fuse->base);
> + if (ret)
> + return ret;
> +
If you want you can drop the check the extra variable.
> + return 0;
> +}
> +
> +void
> +_nouveau_fuse_dtor(struct nouveau_object *object)
> +{
> + struct nouveau_fuse *fuse = (void *)object;
> + nouveau_subdev_destroy(&fuse->base);
> +}
> +
> +int
> +nouveau_fuse_create_(struct nouveau_object *parent,
> + struct nouveau_object *engine,
> + struct nouveau_oclass *oclass, int length, void **pobject)
> +{
> + struct nouveau_fuse *fuse;
> + int ret;
> +
> + ret = nouveau_subdev_create_(parent, engine, oclass, 0, "FUSE",
> + "fuse", length, pobject);
^^^^^^^
I think you want to use &fuse here ?
> + fuse = *pobject;
Swap the assignment order and move it past the conditional ?
> + if (ret)
> + return ret;
> +
+ *pobject = fuse;
And perhaps return 0, to make it obvious and consistent with the second case
below.
> + return ret;
> +}
[snip]
> diff --git a/nvkm/subdev/fuse/gm107.c b/nvkm/subdev/fuse/gm107.c
> new file mode 100644
> index 0000000..4ade700
> --- /dev/null
> +++ b/nvkm/subdev/fuse/gm107.c
> @@ -0,0 +1,66 @@
[snip]
> +static int
> +gm107_fuse_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
> + struct nouveau_oclass *oclass, void *data, u32 size,
> + struct nouveau_object **pobject)
> +{
> + struct gm107_fuse_priv *priv;
> + int ret;
> +
> + ret = nouveau_fuse_create(parent, engine, oclass, &priv);
> + *pobject = nv_object(priv);
Believe the above assignment should go after the check ?
Nice job :)
-Emil
> + if (ret)
> + return ret;
> +
> + return 0;
> +}
> +
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH] subdev: add a pfuse subdev v2
[not found] ` <1408914911-5022-1-git-send-email-martin.peres-GANU6spQydw@public.gmane.org>
` (3 preceding siblings ...)
2014-08-24 23:35 ` Emil Velikov
@ 2014-08-25 22:26 ` Martin Peres
4 siblings, 0 replies; 9+ messages in thread
From: Martin Peres @ 2014-08-25 22:26 UTC (permalink / raw)
To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
We will use this subdev to disable temperature reading on cards that did not
get a sensor calibration in the factory.
v2:
- rename "nouveau_fuse_rd32" to "gxXXX_fuse_rd32" as adviced by Christian Costa
- fold the code a little as adviced by Emil Velikov
Signed-off-by: Martin Peres <martin.peres-GANU6spQydw@public.gmane.org>
---
configure.ac | 1 +
drm/Kbuild | 4 ++
drm/core/include/subdev/fuse.h | 1 +
drm/core/subdev/fuse/base.c | 1 +
drm/core/subdev/fuse/g80.c | 1 +
drm/core/subdev/fuse/gf100.c | 1 +
drm/core/subdev/fuse/gm107.c | 1 +
drm/core/subdev/fuse/priv.h | 1 +
nvkm/engine/device/gm100.c | 2 +
nvkm/engine/device/nv50.c | 15 ++++++++
nvkm/engine/device/nvc0.c | 10 +++++
nvkm/engine/device/nve0.c | 8 ++++
nvkm/include/core/device.h | 1 +
nvkm/include/subdev/fuse.h | 30 +++++++++++++++
nvkm/subdev/Makefile.am | 3 +-
nvkm/subdev/fuse/Makefile.am | 8 ++++
nvkm/subdev/fuse/base.c | 54 +++++++++++++++++++++++++++
nvkm/subdev/fuse/g80.c | 81 +++++++++++++++++++++++++++++++++++++++++
nvkm/subdev/fuse/gf100.c | 83 ++++++++++++++++++++++++++++++++++++++++++
nvkm/subdev/fuse/gm107.c | 66 +++++++++++++++++++++++++++++++++
nvkm/subdev/fuse/priv.h | 9 +++++
21 files changed, 380 insertions(+), 1 deletion(-)
create mode 120000 drm/core/include/subdev/fuse.h
create mode 120000 drm/core/subdev/fuse/base.c
create mode 120000 drm/core/subdev/fuse/g80.c
create mode 120000 drm/core/subdev/fuse/gf100.c
create mode 120000 drm/core/subdev/fuse/gm107.c
create mode 120000 drm/core/subdev/fuse/priv.h
create mode 100644 nvkm/include/subdev/fuse.h
create mode 100644 nvkm/subdev/fuse/Makefile.am
create mode 100644 nvkm/subdev/fuse/base.c
create mode 100644 nvkm/subdev/fuse/g80.c
create mode 100644 nvkm/subdev/fuse/gf100.c
create mode 100644 nvkm/subdev/fuse/gm107.c
create mode 100644 nvkm/subdev/fuse/priv.h
diff --git a/configure.ac b/configure.ac
index de27156..b4404a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,7 @@ AC_OUTPUT( Makefile \
nvkm/subdev/clock/Makefile \
nvkm/subdev/devinit/Makefile \
nvkm/subdev/fb/Makefile \
+ nvkm/subdev/fuse/Makefile \
nvkm/subdev/gpio/Makefile \
nvkm/subdev/i2c/Makefile \
nvkm/subdev/ibus/Makefile \
diff --git a/drm/Kbuild b/drm/Kbuild
index c663181..37ab09b 100644
--- a/drm/Kbuild
+++ b/drm/Kbuild
@@ -127,6 +127,10 @@ nouveau-y += core/subdev/fb/ramgk20a.o
nouveau-y += core/subdev/fb/ramgm107.o
nouveau-y += core/subdev/fb/sddr3.o
nouveau-y += core/subdev/fb/gddr5.o
+nouveau-y += core/subdev/fuse/base.o
+nouveau-y += core/subdev/fuse/g80.o
+nouveau-y += core/subdev/fuse/gf100.o
+nouveau-y += core/subdev/fuse/gm107.o
nouveau-y += core/subdev/gpio/base.o
nouveau-y += core/subdev/gpio/nv10.o
nouveau-y += core/subdev/gpio/nv50.o
diff --git a/drm/core/include/subdev/fuse.h b/drm/core/include/subdev/fuse.h
new file mode 120000
index 0000000..421fdd7
--- /dev/null
+++ b/drm/core/include/subdev/fuse.h
@@ -0,0 +1 @@
+../../../../nvkm/include/subdev/fuse.h
\ No newline at end of file
diff --git a/drm/core/subdev/fuse/base.c b/drm/core/subdev/fuse/base.c
new file mode 120000
index 0000000..b218313
--- /dev/null
+++ b/drm/core/subdev/fuse/base.c
@@ -0,0 +1 @@
+../../../../nvkm/subdev/fuse/base.c
\ No newline at end of file
diff --git a/drm/core/subdev/fuse/g80.c b/drm/core/subdev/fuse/g80.c
new file mode 120000
index 0000000..c805b0d
--- /dev/null
+++ b/drm/core/subdev/fuse/g80.c
@@ -0,0 +1 @@
+../../../../nvkm/subdev/fuse/g80.c
\ No newline at end of file
diff --git a/drm/core/subdev/fuse/gf100.c b/drm/core/subdev/fuse/gf100.c
new file mode 120000
index 0000000..ad9411b
--- /dev/null
+++ b/drm/core/subdev/fuse/gf100.c
@@ -0,0 +1 @@
+../../../../nvkm/subdev/fuse/gf100.c
\ No newline at end of file
diff --git a/drm/core/subdev/fuse/gm107.c b/drm/core/subdev/fuse/gm107.c
new file mode 120000
index 0000000..947b11c
--- /dev/null
+++ b/drm/core/subdev/fuse/gm107.c
@@ -0,0 +1 @@
+../../../../nvkm/subdev/fuse/gm107.c
\ No newline at end of file
diff --git a/drm/core/subdev/fuse/priv.h b/drm/core/subdev/fuse/priv.h
new file mode 120000
index 0000000..b6dedaa
--- /dev/null
+++ b/drm/core/subdev/fuse/priv.h
@@ -0,0 +1 @@
+../../../../nvkm/subdev/fuse/priv.h
\ No newline at end of file
diff --git a/nvkm/engine/device/gm100.c b/nvkm/engine/device/gm100.c
index 9e9f567..6295668 100644
--- a/nvkm/engine/device/gm100.c
+++ b/nvkm/engine/device/gm100.c
@@ -26,6 +26,7 @@
#include <subdev/bus.h>
#include <subdev/gpio.h>
#include <subdev/i2c.h>
+#include <subdev/fuse.h>
#include <subdev/clock.h>
#include <subdev/therm.h>
#include <subdev/mxm.h>
@@ -62,6 +63,7 @@ gm100_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nvd0_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gm107_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &gm107_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
diff --git a/nvkm/engine/device/nv50.c b/nvkm/engine/device/nv50.c
index 932f84f..ca265fe 100644
--- a/nvkm/engine/device/nv50.c
+++ b/nvkm/engine/device/nv50.c
@@ -26,6 +26,7 @@
#include <subdev/bus.h>
#include <subdev/gpio.h>
#include <subdev/i2c.h>
+#include <subdev/fuse.h>
#include <subdev/clock.h>
#include <subdev/therm.h>
#include <subdev/mxm.h>
@@ -62,6 +63,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv50_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = nv50_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nv50_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -87,6 +89,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv50_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -115,6 +118,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv50_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -143,6 +147,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -171,6 +176,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -199,6 +205,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -227,6 +234,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -255,6 +263,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = nv84_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -283,6 +292,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = nvaa_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -311,6 +321,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = nvaa_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nv84_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -339,6 +350,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nva3_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -369,6 +381,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nva3_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -398,6 +411,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nva3_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -427,6 +441,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &g80_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nva3_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
diff --git a/nvkm/engine/device/nvc0.c b/nvkm/engine/device/nvc0.c
index b4a2917..89b9fd4 100644
--- a/nvkm/engine/device/nvc0.c
+++ b/nvkm/engine/device/nvc0.c
@@ -26,6 +26,7 @@
#include <subdev/bus.h>
#include <subdev/gpio.h>
#include <subdev/i2c.h>
+#include <subdev/fuse.h>
#include <subdev/clock.h>
#include <subdev/therm.h>
#include <subdev/mxm.h>
@@ -62,6 +63,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -94,6 +96,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -126,6 +129,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -157,6 +161,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -189,6 +194,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -221,6 +227,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -252,6 +259,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nv92_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nv94_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nva3_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -284,6 +292,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nvd0_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nvd0_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -315,6 +324,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nvd0_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = gf117_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nvc0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
diff --git a/nvkm/engine/device/nve0.c b/nvkm/engine/device/nve0.c
index cdf9147..b1b2e48 100644
--- a/nvkm/engine/device/nve0.c
+++ b/nvkm/engine/device/nve0.c
@@ -26,6 +26,7 @@
#include <subdev/bus.h>
#include <subdev/gpio.h>
#include <subdev/i2c.h>
+#include <subdev/fuse.h>
#include <subdev/clock.h>
#include <subdev/therm.h>
#include <subdev/mxm.h>
@@ -62,6 +63,7 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nve0_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -95,6 +97,7 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nve0_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -128,6 +131,7 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nve0_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -161,6 +165,7 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_CLOCK ] = &gk20a_clock_oclass;
device->oclass[NVDEV_SUBDEV_MC ] = gk20a_mc_oclass;
device->oclass[NVDEV_SUBDEV_BUS ] = nvc0_bus_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_TIMER ] = &gk20a_timer_oclass;
device->oclass[NVDEV_SUBDEV_FB ] = gk20a_fb_oclass;
device->oclass[NVDEV_SUBDEV_LTC ] = gk104_ltc_oclass;
@@ -180,6 +185,7 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nve0_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -213,6 +219,7 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nvd0_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
@@ -246,6 +253,7 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_SUBDEV_VBIOS ] = &nouveau_bios_oclass;
device->oclass[NVDEV_SUBDEV_GPIO ] = nve0_gpio_oclass;
device->oclass[NVDEV_SUBDEV_I2C ] = nve0_i2c_oclass;
+ device->oclass[NVDEV_SUBDEV_FUSE ] = &gf100_fuse_oclass;
device->oclass[NVDEV_SUBDEV_CLOCK ] = &nve0_clock_oclass;
device->oclass[NVDEV_SUBDEV_THERM ] = &nvd0_therm_oclass;
device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass;
diff --git a/nvkm/include/core/device.h b/nvkm/include/core/device.h
index 8743766..1d9d893 100644
--- a/nvkm/include/core/device.h
+++ b/nvkm/include/core/device.h
@@ -24,6 +24,7 @@ enum nv_subdev_type {
* been created, and are allowed to assume any subdevs in the
* list above them exist and have been initialised.
*/
+ NVDEV_SUBDEV_FUSE,
NVDEV_SUBDEV_MXM,
NVDEV_SUBDEV_MC,
NVDEV_SUBDEV_BUS,
diff --git a/nvkm/include/subdev/fuse.h b/nvkm/include/subdev/fuse.h
new file mode 100644
index 0000000..2b1ddb2
--- /dev/null
+++ b/nvkm/include/subdev/fuse.h
@@ -0,0 +1,30 @@
+#ifndef __NOUVEAU_FUSE_H__
+#define __NOUVEAU_FUSE_H__
+
+#include <core/subdev.h>
+#include <core/device.h>
+
+struct nouveau_fuse {
+ struct nouveau_subdev base;
+};
+
+static inline struct nouveau_fuse *
+nouveau_fuse(void *obj)
+{
+ return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_FUSE];
+}
+
+#define nouveau_fuse_create(p, e, o, d) \
+ nouveau_fuse_create_((p), (e), (o), sizeof(**d), (void **)d)
+
+int nouveau_fuse_create_(struct nouveau_object *, struct nouveau_object *,
+ struct nouveau_oclass *, int, void **);
+void _nouveau_fuse_dtor(struct nouveau_object *);
+int _nouveau_fuse_init(struct nouveau_object *);
+#define _nouveau_fuse_fini _nouveau_subdev_fini
+
+extern struct nouveau_oclass g80_fuse_oclass;
+extern struct nouveau_oclass gf100_fuse_oclass;
+extern struct nouveau_oclass gm107_fuse_oclass;
+
+#endif
diff --git a/nvkm/subdev/Makefile.am b/nvkm/subdev/Makefile.am
index c8eb147..5a48ddb 100644
--- a/nvkm/subdev/Makefile.am
+++ b/nvkm/subdev/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = bar bus bios clock devinit fb gpio i2c ibus instmem \
+SUBDIRS = bar bus bios clock devinit fb fuse gpio i2c ibus instmem \
ltc mc mxm pwr therm timer vm volt
noinst_LTLIBRARIES = libsubdev.la
@@ -10,6 +10,7 @@ libsubdev_la_LIBADD = bar/libbar.la \
clock/libclock.la \
devinit/libdevinit.la \
fb/libfb.la \
+ fuse/libfuse.la \
gpio/libgpio.la \
i2c/libi2c.la \
ibus/libibus.la \
diff --git a/nvkm/subdev/fuse/Makefile.am b/nvkm/subdev/fuse/Makefile.am
new file mode 100644
index 0000000..5596d2c
--- /dev/null
+++ b/nvkm/subdev/fuse/Makefile.am
@@ -0,0 +1,8 @@
+noinst_LTLIBRARIES = libfuse.la
+
+libfuse_la_SOURCES = base.c \
+ g80.c \
+ gf100.c \
+ gm107.c
+
+include $(srcdir)/../Makefile.subdev
diff --git a/nvkm/subdev/fuse/base.c b/nvkm/subdev/fuse/base.c
new file mode 100644
index 0000000..9e8e921
--- /dev/null
+++ b/nvkm/subdev/fuse/base.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014 Martin Peres
+ *
+ * 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: Martin Peres
+ */
+
+#include <subdev/fuse.h>
+
+int
+_nouveau_fuse_init(struct nouveau_object *object)
+{
+ struct nouveau_fuse *fuse = (void *)object;
+ return nouveau_subdev_init(&fuse->base);
+}
+
+void
+_nouveau_fuse_dtor(struct nouveau_object *object)
+{
+ struct nouveau_fuse *fuse = (void *)object;
+ nouveau_subdev_destroy(&fuse->base);
+}
+
+int
+nouveau_fuse_create_(struct nouveau_object *parent,
+ struct nouveau_object *engine,
+ struct nouveau_oclass *oclass, int length, void **pobject)
+{
+ struct nouveau_fuse *fuse;
+ int ret;
+
+ ret = nouveau_subdev_create_(parent, engine, oclass, 0, "FUSE",
+ "fuse", length, pobject);
+ fuse = *pobject;
+
+ return ret;
+}
diff --git a/nvkm/subdev/fuse/g80.c b/nvkm/subdev/fuse/g80.c
new file mode 100644
index 0000000..a374ade
--- /dev/null
+++ b/nvkm/subdev/fuse/g80.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2014 Martin Peres
+ *
+ * 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: Martin Peres
+ */
+
+#include "priv.h"
+
+struct g80_fuse_priv {
+ struct nouveau_fuse base;
+
+ spinlock_t fuse_enable_lock;
+};
+
+static u32
+g80_fuse_rd32(struct nouveau_object *object, u64 addr)
+{
+ struct g80_fuse_priv *priv = (void *)object;
+ unsigned long flags;
+ u32 fuse_enable, val;
+
+ spin_lock_irqsave(&priv->fuse_enable_lock, flags);
+
+ /* racy if another part of nouveau start writing to this reg */
+ fuse_enable = nv_mask(priv, 0x1084, 0x800, 0x800);
+ val = nv_rd32(priv, 0x21000 + addr);
+ nv_wr32(priv, 0x1084, fuse_enable);
+
+ spin_unlock_irqrestore(&priv->fuse_enable_lock, flags);
+
+ return val;
+}
+
+
+static int
+g80_fuse_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
+ struct nouveau_oclass *oclass, void *data, u32 size,
+ struct nouveau_object **pobject)
+{
+ struct g80_fuse_priv *priv;
+ int ret;
+
+ ret = nouveau_fuse_create(parent, engine, oclass, &priv);
+ *pobject = nv_object(priv);
+ if (ret)
+ return ret;
+
+ spin_lock_init(&priv->fuse_enable_lock);
+
+ return 0;
+}
+
+struct nouveau_oclass
+g80_fuse_oclass = {
+ .handle = NV_SUBDEV(FUSE, 0x50),
+ .ofuncs = &(struct nouveau_ofuncs) {
+ .ctor = g80_fuse_ctor,
+ .dtor = _nouveau_fuse_dtor,
+ .init = _nouveau_fuse_init,
+ .fini = _nouveau_fuse_fini,
+ .rd32 = g80_fuse_rd32,
+ },
+};
diff --git a/nvkm/subdev/fuse/gf100.c b/nvkm/subdev/fuse/gf100.c
new file mode 100644
index 0000000..5ed03f5
--- /dev/null
+++ b/nvkm/subdev/fuse/gf100.c
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2014 Martin Peres
+ *
+ * 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: Martin Peres
+ */
+
+#include "priv.h"
+
+struct gf100_fuse_priv {
+ struct nouveau_fuse base;
+
+ spinlock_t fuse_enable_lock;
+};
+
+static u32
+gf100_fuse_rd32(struct nouveau_object *object, u64 addr)
+{
+ struct gf100_fuse_priv *priv = (void *)object;
+ unsigned long flags;
+ u32 fuse_enable, unk, val;
+
+ spin_lock_irqsave(&priv->fuse_enable_lock, flags);
+
+ /* racy if another part of nouveau start writing to these regs */
+ fuse_enable = nv_mask(priv, 0x22400, 0x800, 0x800);
+ unk = nv_mask(priv, 0x21000, 0x1, 0x1);
+ val = nv_rd32(priv, 0x21100 + addr);
+ nv_wr32(priv, 0x21000, unk);
+ nv_wr32(priv, 0x22400, fuse_enable);
+
+ spin_unlock_irqrestore(&priv->fuse_enable_lock, flags);
+
+ return val;
+}
+
+
+static int
+gf100_fuse_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
+ struct nouveau_oclass *oclass, void *data, u32 size,
+ struct nouveau_object **pobject)
+{
+ struct gf100_fuse_priv *priv;
+ int ret;
+
+ ret = nouveau_fuse_create(parent, engine, oclass, &priv);
+ *pobject = nv_object(priv);
+ if (ret)
+ return ret;
+
+ spin_lock_init(&priv->fuse_enable_lock);
+
+ return 0;
+}
+
+struct nouveau_oclass
+gf100_fuse_oclass = {
+ .handle = NV_SUBDEV(FUSE, 0xC0),
+ .ofuncs = &(struct nouveau_ofuncs) {
+ .ctor = gf100_fuse_ctor,
+ .dtor = _nouveau_fuse_dtor,
+ .init = _nouveau_fuse_init,
+ .fini = _nouveau_fuse_fini,
+ .rd32 = gf100_fuse_rd32,
+ },
+};
diff --git a/nvkm/subdev/fuse/gm107.c b/nvkm/subdev/fuse/gm107.c
new file mode 100644
index 0000000..4f1a636
--- /dev/null
+++ b/nvkm/subdev/fuse/gm107.c
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2014 Martin Peres
+ *
+ * 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: Martin Peres
+ */
+
+#include "priv.h"
+
+struct gm107_fuse_priv {
+ struct nouveau_fuse base;
+};
+
+static u32
+gm107_fuse_rd32(struct nouveau_object *object, u64 addr)
+{
+ struct gf100_fuse_priv *priv = (void *)object;
+
+ return nv_rd32(priv, 0x21100 + addr);
+}
+
+
+static int
+gm107_fuse_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
+ struct nouveau_oclass *oclass, void *data, u32 size,
+ struct nouveau_object **pobject)
+{
+ struct gm107_fuse_priv *priv;
+ int ret;
+
+ ret = nouveau_fuse_create(parent, engine, oclass, &priv);
+ *pobject = nv_object(priv);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+struct nouveau_oclass
+gm107_fuse_oclass = {
+ .handle = NV_SUBDEV(FUSE, 0x117),
+ .ofuncs = &(struct nouveau_ofuncs) {
+ .ctor = gm107_fuse_ctor,
+ .dtor = _nouveau_fuse_dtor,
+ .init = _nouveau_fuse_init,
+ .fini = _nouveau_fuse_fini,
+ .rd32 = gm107_fuse_rd32,
+ },
+};
diff --git a/nvkm/subdev/fuse/priv.h b/nvkm/subdev/fuse/priv.h
new file mode 100644
index 0000000..d208541
--- /dev/null
+++ b/nvkm/subdev/fuse/priv.h
@@ -0,0 +1,9 @@
+#ifndef __NVKM_FUSE_PRIV_H__
+#define __NVKM_FUSE_PRIV_H__
+
+#include <subdev/fuse.h>
+
+int _nouveau_fuse_init(struct nouveau_object *object);
+void _nouveau_fuse_dtor(struct nouveau_object *object);
+
+#endif
--
2.0.0
^ permalink raw reply related [flat|nested] 9+ messages in thread