[v4,19/37] volt: add gf100 subdev with speedo

Submitted by Karol Herbst on April 18, 2016, 7:13 p.m.

Details

Message ID 1461006851-5007-20-git-send-email-nouveau@karolherbst.de
State New
Headers show
Series "Volting/Clocking improvements for Fermi and newer" ( rev: 4 ) in Nouveau

Not browsing as part of any series.

Commit Message

Karol Herbst April 18, 2016, 7:13 p.m.
Signed-off-by: Karol Herbst <nouveau@karolherbst.de>
---
 drm/nouveau/include/nvkm/subdev/volt.h |  1 +
 drm/nouveau/nvkm/engine/device/base.c  | 17 +++++-----
 drm/nouveau/nvkm/subdev/volt/Kbuild    |  1 +
 drm/nouveau/nvkm/subdev/volt/gf100.c   | 59 ++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 8 deletions(-)
 create mode 100644 drm/nouveau/nvkm/subdev/volt/gf100.c

Patch hide | download patch | download mbox

diff --git a/drm/nouveau/include/nvkm/subdev/volt.h b/drm/nouveau/include/nvkm/subdev/volt.h
index 4cb0292..25588c7 100644
--- a/drm/nouveau/include/nvkm/subdev/volt.h
+++ b/drm/nouveau/include/nvkm/subdev/volt.h
@@ -30,6 +30,7 @@  int nvkm_volt_get(struct nvkm_volt *);
 int nvkm_volt_set_id(struct nvkm_volt *, u8 id, u8 min_id, int condition);
 
 int nv40_volt_new(struct nvkm_device *, int, struct nvkm_volt **);
+int gf100_volt_new(struct nvkm_device *, int, struct nvkm_volt **);
 int gk104_volt_new(struct nvkm_device *, int, struct nvkm_volt **);
 int gk20a_volt_new(struct nvkm_device *, int, struct nvkm_volt **);
 int gm20b_volt_new(struct nvkm_device *, int, struct nvkm_volt **);
diff --git a/drm/nouveau/nvkm/engine/device/base.c b/drm/nouveau/nvkm/engine/device/base.c
index a364efe..528780c 100644
--- a/drm/nouveau/nvkm/engine/device/base.c
+++ b/drm/nouveau/nvkm/engine/device/base.c
@@ -1357,7 +1357,7 @@  nvc0_chipset = {
 	.pmu = gf100_pmu_new,
 	.therm = gt215_therm_new,
 	.timer = nv41_timer_new,
-	.volt = nv40_volt_new,
+	.volt = gf100_volt_new,
 	.ce[0] = gf100_ce_new,
 	.ce[1] = gf100_ce_new,
 	.disp = gt215_disp_new,
@@ -1394,7 +1394,7 @@  nvc1_chipset = {
 	.pmu = gf100_pmu_new,
 	.therm = gt215_therm_new,
 	.timer = nv41_timer_new,
-	.volt = nv40_volt_new,
+	.volt = gf100_volt_new,
 	.ce[0] = gf100_ce_new,
 	.disp = gt215_disp_new,
 	.dma = gf100_dma_new,
@@ -1430,7 +1430,7 @@  nvc3_chipset = {
 	.pmu = gf100_pmu_new,
 	.therm = gt215_therm_new,
 	.timer = nv41_timer_new,
-	.volt = nv40_volt_new,
+	.volt = gf100_volt_new,
 	.ce[0] = gf100_ce_new,
 	.disp = gt215_disp_new,
 	.dma = gf100_dma_new,
@@ -1466,7 +1466,7 @@  nvc4_chipset = {
 	.pmu = gf100_pmu_new,
 	.therm = gt215_therm_new,
 	.timer = nv41_timer_new,
-	.volt = nv40_volt_new,
+	.volt = gf100_volt_new,
 	.ce[0] = gf100_ce_new,
 	.ce[1] = gf100_ce_new,
 	.disp = gt215_disp_new,
@@ -1503,7 +1503,7 @@  nvc8_chipset = {
 	.pmu = gf100_pmu_new,
 	.therm = gt215_therm_new,
 	.timer = nv41_timer_new,
-	.volt = nv40_volt_new,
+	.volt = gf100_volt_new,
 	.ce[0] = gf100_ce_new,
 	.ce[1] = gf100_ce_new,
 	.disp = gt215_disp_new,
@@ -1540,7 +1540,7 @@  nvce_chipset = {
 	.pmu = gf100_pmu_new,
 	.therm = gt215_therm_new,
 	.timer = nv41_timer_new,
-	.volt = nv40_volt_new,
+	.volt = gf100_volt_new,
 	.ce[0] = gf100_ce_new,
 	.ce[1] = gf100_ce_new,
 	.disp = gt215_disp_new,
@@ -1577,7 +1577,7 @@  nvcf_chipset = {
 	.pmu = gf100_pmu_new,
 	.therm = gt215_therm_new,
 	.timer = nv41_timer_new,
-	.volt = nv40_volt_new,
+	.volt = gf100_volt_new,
 	.ce[0] = gf100_ce_new,
 	.disp = gt215_disp_new,
 	.dma = gf100_dma_new,
@@ -1612,6 +1612,7 @@  nvd7_chipset = {
 	.pci = gf106_pci_new,
 	.therm = gf119_therm_new,
 	.timer = nv41_timer_new,
+	.volt = gf100_volt_new,
 	.ce[0] = gf100_ce_new,
 	.disp = gf119_disp_new,
 	.dma = gf119_dma_new,
@@ -1647,7 +1648,7 @@  nvd9_chipset = {
 	.pmu = gf119_pmu_new,
 	.therm = gf119_therm_new,
 	.timer = nv41_timer_new,
-	.volt = nv40_volt_new,
+	.volt = gf100_volt_new,
 	.ce[0] = gf100_ce_new,
 	.disp = gf119_disp_new,
 	.dma = gf119_dma_new,
diff --git a/drm/nouveau/nvkm/subdev/volt/Kbuild b/drm/nouveau/nvkm/subdev/volt/Kbuild
index c340762..bcd179b 100644
--- a/drm/nouveau/nvkm/subdev/volt/Kbuild
+++ b/drm/nouveau/nvkm/subdev/volt/Kbuild
@@ -1,6 +1,7 @@ 
 nvkm-y += nvkm/subdev/volt/base.o
 nvkm-y += nvkm/subdev/volt/gpio.o
 nvkm-y += nvkm/subdev/volt/nv40.o
+nvkm-y += nvkm/subdev/volt/gf100.o
 nvkm-y += nvkm/subdev/volt/gk104.o
 nvkm-y += nvkm/subdev/volt/gk20a.o
 nvkm-y += nvkm/subdev/volt/gm20b.o
diff --git a/drm/nouveau/nvkm/subdev/volt/gf100.c b/drm/nouveau/nvkm/subdev/volt/gf100.c
new file mode 100644
index 0000000..16dc0f1
--- /dev/null
+++ b/drm/nouveau/nvkm/subdev/volt/gf100.c
@@ -0,0 +1,59 @@ 
+/*
+ * Copyright 2016 Karol Herbst
+ *
+ * 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: Karol Herbst
+ */
+#include "priv.h"
+
+#include <subdev/fuse.h>
+
+static int
+gf100_volt_speedo_read(struct nvkm_volt *volt)
+{
+	struct nvkm_device *device = volt->subdev.device;
+	struct nvkm_fuse *fuse = device->fuse;
+
+	if (!fuse)
+		return -EINVAL;
+
+	return nvkm_fuse_read(fuse, 0x1cc);
+}
+
+static const struct nvkm_volt_func
+gf100_volt = {
+	.vid_get = nvkm_voltgpio_get,
+	.vid_set = nvkm_voltgpio_set,
+	.speedo_read = gf100_volt_speedo_read,
+};
+
+int
+gf100_volt_new(struct nvkm_device *device, int index, struct nvkm_volt **pvolt)
+{
+	struct nvkm_volt *volt;
+	int ret;
+
+	ret = nvkm_volt_new_(&gf100_volt, device, index, &volt);
+	*pvolt = volt;
+	if (ret)
+		return ret;
+
+	return nvkm_voltgpio_init(volt);
+}

Comments

On 18/04/16 22:13, Karol Herbst wrote:
> Signed-off-by: Karol Herbst <nouveau@karolherbst.de>
> ---
>   drm/nouveau/include/nvkm/subdev/volt.h |  1 +
>   drm/nouveau/nvkm/engine/device/base.c  | 17 +++++-----
>   drm/nouveau/nvkm/subdev/volt/Kbuild    |  1 +
>   drm/nouveau/nvkm/subdev/volt/gf100.c   | 59 ++++++++++++++++++++++++++++++++++
>   4 files changed, 70 insertions(+), 8 deletions(-)
>   create mode 100644 drm/nouveau/nvkm/subdev/volt/gf100.c
>
> diff --git a/drm/nouveau/include/nvkm/subdev/volt.h b/drm/nouveau/include/nvkm/subdev/volt.h
> index 4cb0292..25588c7 100644
> --- a/drm/nouveau/include/nvkm/subdev/volt.h
> +++ b/drm/nouveau/include/nvkm/subdev/volt.h
> @@ -30,6 +30,7 @@ int nvkm_volt_get(struct nvkm_volt *);
>   int nvkm_volt_set_id(struct nvkm_volt *, u8 id, u8 min_id, int condition);
>   
>   int nv40_volt_new(struct nvkm_device *, int, struct nvkm_volt **);
> +int gf100_volt_new(struct nvkm_device *, int, struct nvkm_volt **);
>   int gk104_volt_new(struct nvkm_device *, int, struct nvkm_volt **);
>   int gk20a_volt_new(struct nvkm_device *, int, struct nvkm_volt **);
>   int gm20b_volt_new(struct nvkm_device *, int, struct nvkm_volt **);
> diff --git a/drm/nouveau/nvkm/engine/device/base.c b/drm/nouveau/nvkm/engine/device/base.c
> index a364efe..528780c 100644
> --- a/drm/nouveau/nvkm/engine/device/base.c
> +++ b/drm/nouveau/nvkm/engine/device/base.c
> @@ -1357,7 +1357,7 @@ nvc0_chipset = {
>   	.pmu = gf100_pmu_new,
>   	.therm = gt215_therm_new,
>   	.timer = nv41_timer_new,
> -	.volt = nv40_volt_new,
> +	.volt = gf100_volt_new,
>   	.ce[0] = gf100_ce_new,
>   	.ce[1] = gf100_ce_new,
>   	.disp = gt215_disp_new,
> @@ -1394,7 +1394,7 @@ nvc1_chipset = {
>   	.pmu = gf100_pmu_new,
>   	.therm = gt215_therm_new,
>   	.timer = nv41_timer_new,
> -	.volt = nv40_volt_new,
> +	.volt = gf100_volt_new,
>   	.ce[0] = gf100_ce_new,
>   	.disp = gt215_disp_new,
>   	.dma = gf100_dma_new,
> @@ -1430,7 +1430,7 @@ nvc3_chipset = {
>   	.pmu = gf100_pmu_new,
>   	.therm = gt215_therm_new,
>   	.timer = nv41_timer_new,
> -	.volt = nv40_volt_new,
> +	.volt = gf100_volt_new,
>   	.ce[0] = gf100_ce_new,
>   	.disp = gt215_disp_new,
>   	.dma = gf100_dma_new,
> @@ -1466,7 +1466,7 @@ nvc4_chipset = {
>   	.pmu = gf100_pmu_new,
>   	.therm = gt215_therm_new,
>   	.timer = nv41_timer_new,
> -	.volt = nv40_volt_new,
> +	.volt = gf100_volt_new,
>   	.ce[0] = gf100_ce_new,
>   	.ce[1] = gf100_ce_new,
>   	.disp = gt215_disp_new,
> @@ -1503,7 +1503,7 @@ nvc8_chipset = {
>   	.pmu = gf100_pmu_new,
>   	.therm = gt215_therm_new,
>   	.timer = nv41_timer_new,
> -	.volt = nv40_volt_new,
> +	.volt = gf100_volt_new,
>   	.ce[0] = gf100_ce_new,
>   	.ce[1] = gf100_ce_new,
>   	.disp = gt215_disp_new,
> @@ -1540,7 +1540,7 @@ nvce_chipset = {
>   	.pmu = gf100_pmu_new,
>   	.therm = gt215_therm_new,
>   	.timer = nv41_timer_new,
> -	.volt = nv40_volt_new,
> +	.volt = gf100_volt_new,
>   	.ce[0] = gf100_ce_new,
>   	.ce[1] = gf100_ce_new,
>   	.disp = gt215_disp_new,
> @@ -1577,7 +1577,7 @@ nvcf_chipset = {
>   	.pmu = gf100_pmu_new,
>   	.therm = gt215_therm_new,
>   	.timer = nv41_timer_new,
> -	.volt = nv40_volt_new,
> +	.volt = gf100_volt_new,
>   	.ce[0] = gf100_ce_new,
>   	.disp = gt215_disp_new,
>   	.dma = gf100_dma_new,
> @@ -1612,6 +1612,7 @@ nvd7_chipset = {
>   	.pci = gf106_pci_new,
>   	.therm = gf119_therm_new,
>   	.timer = nv41_timer_new,
> +	.volt = gf100_volt_new,
>   	.ce[0] = gf100_ce_new,
>   	.disp = gf119_disp_new,
>   	.dma = gf119_dma_new,
> @@ -1647,7 +1648,7 @@ nvd9_chipset = {
>   	.pmu = gf119_pmu_new,
>   	.therm = gf119_therm_new,
>   	.timer = nv41_timer_new,
> -	.volt = nv40_volt_new,
> +	.volt = gf100_volt_new,
>   	.ce[0] = gf100_ce_new,
>   	.disp = gf119_disp_new,
>   	.dma = gf119_dma_new,
> diff --git a/drm/nouveau/nvkm/subdev/volt/Kbuild b/drm/nouveau/nvkm/subdev/volt/Kbuild
> index c340762..bcd179b 100644
> --- a/drm/nouveau/nvkm/subdev/volt/Kbuild
> +++ b/drm/nouveau/nvkm/subdev/volt/Kbuild
> @@ -1,6 +1,7 @@
>   nvkm-y += nvkm/subdev/volt/base.o
>   nvkm-y += nvkm/subdev/volt/gpio.o
>   nvkm-y += nvkm/subdev/volt/nv40.o
> +nvkm-y += nvkm/subdev/volt/gf100.o
>   nvkm-y += nvkm/subdev/volt/gk104.o
>   nvkm-y += nvkm/subdev/volt/gk20a.o
>   nvkm-y += nvkm/subdev/volt/gm20b.o
> diff --git a/drm/nouveau/nvkm/subdev/volt/gf100.c b/drm/nouveau/nvkm/subdev/volt/gf100.c
> new file mode 100644
> index 0000000..16dc0f1
> --- /dev/null
> +++ b/drm/nouveau/nvkm/subdev/volt/gf100.c
> @@ -0,0 +1,59 @@
> +/*
> + * Copyright 2016 Karol Herbst
> + *
> + * 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: Karol Herbst
> + */
> +#include "priv.h"
> +
> +#include <subdev/fuse.h>
> +
> +static int
> +gf100_volt_speedo_read(struct nvkm_volt *volt)
> +{
> +	struct nvkm_device *device = volt->subdev.device;
> +	struct nvkm_fuse *fuse = device->fuse;
> +
> +	if (!fuse)
> +		return -EINVAL;
> +
> +	return nvkm_fuse_read(fuse, 0x1cc);
> +}
> +
> +static const struct nvkm_volt_func
> +gf100_volt = {
> +	.vid_get = nvkm_voltgpio_get,
> +	.vid_set = nvkm_voltgpio_set,
> +	.speedo_read = gf100_volt_speedo_read,
> +};
> +
> +int
> +gf100_volt_new(struct nvkm_device *device, int index, struct nvkm_volt **pvolt)
> +{
> +	struct nvkm_volt *volt;
> +	int ret;
> +
> +	ret = nvkm_volt_new_(&gf100_volt, device, index, &volt);
> +	*pvolt = volt;
> +	if (ret)
> +		return ret;
> +
> +	return nvkm_voltgpio_init(volt);
> +}

This is OK because fuse is initialized before volt 
(drm/nouveau/include/nvkm/core/device.h). This is:

Reviewed-by: Martin Peres <martin.peres@free.fr>