All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/3] Expose power budget cap via hwmon
@ 2016-11-12 10:55 Karol Herbst
       [not found] ` <20161112105532.5030-1-karolherbst-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
  0 siblings, 1 reply; 6+ messages in thread
From: Karol Herbst @ 2016-11-12 10:55 UTC (permalink / raw)
  To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

There is an optinal header field in the power budget table we can use to
read out the power cap of the GPU.

We should have this in the kernel before actually using it to catch errors
and see how reliable this is, but as it seems it works on all GPUs as
expected on Kepler und Maxwells with the power cap field set in the vbios.

This series keeps things really simple for now until we figure out more
about the power budget table.

Karol Herbst (3):
  nvbios/power_budget: Add basic power budget parsing
  subdev/iccsense: Parse max and crit power level
  hwmon: expose power_max and power_crit

 .../include/nvkm/subdev/bios/power_budget.h        |  24 ++++
 drm/nouveau/include/nvkm/subdev/iccsense.h         |   3 +
 drm/nouveau/nouveau_hwmon.c                        |  44 ++++++++
 drm/nouveau/nvkm/subdev/bios/Kbuild                |   1 +
 drm/nouveau/nvkm/subdev/bios/power_budget.c        | 122 +++++++++++++++++++++
 drm/nouveau/nvkm/subdev/iccsense/base.c            |  20 +++-
 6 files changed, 212 insertions(+), 2 deletions(-)
 create mode 100644 drm/nouveau/include/nvkm/subdev/bios/power_budget.h
 create mode 100644 drm/nouveau/nvkm/subdev/bios/power_budget.c

-- 
2.10.2

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH 1/3] nvbios/power_budget: Add basic power budget parsing
       [not found] ` <20161112105532.5030-1-karolherbst-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2016-11-12 10:55   ` Karol Herbst
       [not found]     ` <20161112105532.5030-2-karolherbst-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
  2016-11-12 10:55   ` [PATCH 2/3] subdev/iccsense: Parse max and crit power level Karol Herbst
  2016-11-12 10:55   ` [PATCH 3/3] hwmon: expose power_max and power_crit Karol Herbst
  2 siblings, 1 reply; 6+ messages in thread
From: Karol Herbst @ 2016-11-12 10:55 UTC (permalink / raw)
  To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

v2: Set entry to 0xff if not found
    Add cap entry for ver 0x30 tables
    Rework to fix memory leak

Signed-off-by: Karol Herbst <karolherbst@gmail.com>
---
 .../include/nvkm/subdev/bios/power_budget.h        |  24 ++++
 drm/nouveau/nvkm/subdev/bios/Kbuild                |   1 +
 drm/nouveau/nvkm/subdev/bios/power_budget.c        | 122 +++++++++++++++++++++
 3 files changed, 147 insertions(+)
 create mode 100644 drm/nouveau/include/nvkm/subdev/bios/power_budget.h
 create mode 100644 drm/nouveau/nvkm/subdev/bios/power_budget.c

diff --git a/drm/nouveau/include/nvkm/subdev/bios/power_budget.h b/drm/nouveau/include/nvkm/subdev/bios/power_budget.h
new file mode 100644
index 0000000..f295cc7
--- /dev/null
+++ b/drm/nouveau/include/nvkm/subdev/bios/power_budget.h
@@ -0,0 +1,24 @@
+#ifndef __NVBIOS_POWER_BUDGET_H__
+#define __NVBIOS_POWER_BUDGET_H__
+
+#include <nvkm/subdev/bios.h>
+
+struct nvbios_power_budget_entry {
+	u32 min_w;
+	u32 avg_w;
+	u32 max_w;
+};
+
+struct nvbios_power_budget {
+	u32 offset;
+	u8  header_len;
+	u8  entry_len;
+	u8  entry_count;
+	u8  cap_entry;
+};
+
+int nvbios_power_budget_header(struct nvkm_bios *, struct nvbios_power_budget *);
+int nvbios_power_budget_entry(struct nvkm_bios *, struct nvbios_power_budget *,
+                              u8 idx, struct nvbios_power_budget_entry *);
+
+#endif
diff --git a/drm/nouveau/nvkm/subdev/bios/Kbuild b/drm/nouveau/nvkm/subdev/bios/Kbuild
index be57220..6b4f1e0 100644
--- a/drm/nouveau/nvkm/subdev/bios/Kbuild
+++ b/drm/nouveau/nvkm/subdev/bios/Kbuild
@@ -19,6 +19,7 @@ nvkm-y += nvkm/subdev/bios/pcir.o
 nvkm-y += nvkm/subdev/bios/perf.o
 nvkm-y += nvkm/subdev/bios/pll.o
 nvkm-y += nvkm/subdev/bios/pmu.o
+nvkm-y += nvkm/subdev/bios/power_budget.o
 nvkm-y += nvkm/subdev/bios/ramcfg.o
 nvkm-y += nvkm/subdev/bios/rammap.o
 nvkm-y += nvkm/subdev/bios/shadow.o
diff --git a/drm/nouveau/nvkm/subdev/bios/power_budget.c b/drm/nouveau/nvkm/subdev/bios/power_budget.c
new file mode 100644
index 0000000..ed9760e
--- /dev/null
+++ b/drm/nouveau/nvkm/subdev/bios/power_budget.c
@@ -0,0 +1,122 @@
+/*
+ * 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 <subdev/bios.h>
+#include <subdev/bios/bit.h>
+#include <subdev/bios/power_budget.h>
+
+static u32
+nvbios_power_budget_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt,
+			  u8 *len)
+{
+	struct bit_entry bit_P;
+	u32 power_budget;
+
+	if (bit_entry(bios, 'P', &bit_P) || bit_P.version != 2 ||
+	    bit_P.length < 0x2c)
+		return 0;
+
+	power_budget = nvbios_rd32(bios, bit_P.offset + 0x2c);
+	if (!power_budget)
+		return 0;
+
+	*ver = nvbios_rd08(bios, power_budget);
+	switch (*ver) {
+	case 0x10:
+	case 0x20:
+	case 0x30:
+		*hdr = nvbios_rd08(bios, power_budget + 0x1);
+		*len = nvbios_rd08(bios, power_budget + 0x2);
+		*cnt = nvbios_rd08(bios, power_budget + 0x3);
+		return power_budget;
+	default:
+		break;
+	}
+
+	return 0;
+}
+
+int
+nvbios_power_budget_header(struct nvkm_bios *bios,
+                           struct nvbios_power_budget *budget)
+{
+	struct nvkm_subdev *subdev = &bios->subdev;
+	u8 ver, hdr, cnt, len, cap_entry;
+	u32 header;
+
+	header = nvbios_power_budget_table(bios, &ver, &hdr, &cnt, &len);
+	if (!header || !cnt)
+		return -ENODEV;
+
+	budget->offset = header;
+	budget->header_len = hdr;
+	budget->entry_len = len;
+	budget->entry_count = cnt;
+
+	switch (ver) {
+	case 0x20:
+		cap_entry = nvbios_rd08(bios, header + 0x9);
+		break;
+	case 0x30:
+		cap_entry = nvbios_rd08(bios, header + 0xa);
+		break;
+	default:
+		cap_entry = 0xff;
+	}
+
+	if (cap_entry < cnt)
+		budget->cap_entry = cap_entry;
+	else {
+		if (cap_entry != 0xff)
+			nvkm_warn(subdev,
+			          "invalid cap_entry in power budget table "
+			          "found\n");
+		budget->cap_entry = 0xff;
+	}
+	return 0;
+}
+
+int
+nvbios_power_budget_entry(struct nvkm_bios *bios,
+                          struct nvbios_power_budget *budget,
+                          u8 idx, struct nvbios_power_budget_entry *entry)
+{
+	u32 entry_offset;
+
+	if (!budget || !budget->offset || idx >= budget->entry_count || !entry)
+		return -EINVAL;
+
+	entry_offset = budget->offset + budget->header_len + idx * budget->entry_len;
+
+	if (budget->entry_len >= 0xe) {
+		entry->min_w = nvbios_rd32(bios, entry_offset + 0x2);
+		entry->avg_w = nvbios_rd32(bios, entry_offset + 0x6);
+		entry->max_w = nvbios_rd32(bios, entry_offset + 0xa);
+	} else {
+		entry->min_w = 0;
+		entry->max_w = nvbios_rd32(bios, entry_offset + 0x2);
+		entry->avg_w = entry->max_w;
+	}
+
+	return 0;
+}
-- 
2.10.2

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 2/3] subdev/iccsense: Parse max and crit power level
       [not found] ` <20161112105532.5030-1-karolherbst-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
  2016-11-12 10:55   ` [PATCH 1/3] nvbios/power_budget: Add basic power budget parsing Karol Herbst
@ 2016-11-12 10:55   ` Karol Herbst
  2016-11-12 10:55   ` [PATCH 3/3] hwmon: expose power_max and power_crit Karol Herbst
  2 siblings, 0 replies; 6+ messages in thread
From: Karol Herbst @ 2016-11-12 10:55 UTC (permalink / raw)
  To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

Signed-off-by: Karol Herbst <karolherbst@gmail.com>
---
 drm/nouveau/include/nvkm/subdev/iccsense.h |  3 +++
 drm/nouveau/nvkm/subdev/iccsense/base.c    | 20 ++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/drm/nouveau/include/nvkm/subdev/iccsense.h b/drm/nouveau/include/nvkm/subdev/iccsense.h
index 3c2ddd9..b7a9b04 100644
--- a/drm/nouveau/include/nvkm/subdev/iccsense.h
+++ b/drm/nouveau/include/nvkm/subdev/iccsense.h
@@ -8,6 +8,9 @@ struct nvkm_iccsense {
 	bool data_valid;
 	struct list_head sensors;
 	struct list_head rails;
+
+	u32 power_w_max;
+	u32 power_w_crit;
 };
 
 int gf100_iccsense_new(struct nvkm_device *, int index, struct nvkm_iccsense **);
diff --git a/drm/nouveau/nvkm/subdev/iccsense/base.c b/drm/nouveau/nvkm/subdev/iccsense/base.c
index f0af2a3..fecfa6a 100644
--- a/drm/nouveau/nvkm/subdev/iccsense/base.c
+++ b/drm/nouveau/nvkm/subdev/iccsense/base.c
@@ -26,6 +26,7 @@
 #include <subdev/bios.h>
 #include <subdev/bios/extdev.h>
 #include <subdev/bios/iccsense.h>
+#include <subdev/bios/power_budget.h>
 #include <subdev/i2c.h>
 
 static bool
@@ -216,10 +217,25 @@ nvkm_iccsense_oneinit(struct nvkm_subdev *subdev)
 {
 	struct nvkm_iccsense *iccsense = nvkm_iccsense(subdev);
 	struct nvkm_bios *bios = subdev->device->bios;
+	struct nvbios_power_budget budget;
 	struct nvbios_iccsense stbl;
-	int i;
+	int i, ret;
 
-	if (!bios || nvbios_iccsense_parse(bios, &stbl) || !stbl.nr_entry)
+	if (!bios)
+		return 0;
+
+	ret = nvbios_power_budget_header(bios, &budget);
+	if (!ret && budget.cap_entry != 0xff) {
+		struct nvbios_power_budget_entry entry;
+		ret = nvbios_power_budget_entry(bios, &budget,
+		                                budget.cap_entry, &entry);
+		if (!ret) {
+			iccsense->power_w_max  = entry.avg_w;
+			iccsense->power_w_crit = entry.max_w;
+		}
+	}
+
+	if (nvbios_iccsense_parse(bios, &stbl) || !stbl.nr_entry)
 		return 0;
 
 	iccsense->data_valid = true;
-- 
2.10.2

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 3/3] hwmon: expose power_max and power_crit
       [not found] ` <20161112105532.5030-1-karolherbst-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
  2016-11-12 10:55   ` [PATCH 1/3] nvbios/power_budget: Add basic power budget parsing Karol Herbst
  2016-11-12 10:55   ` [PATCH 2/3] subdev/iccsense: Parse max and crit power level Karol Herbst
@ 2016-11-12 10:55   ` Karol Herbst
  2 siblings, 0 replies; 6+ messages in thread
From: Karol Herbst @ 2016-11-12 10:55 UTC (permalink / raw)
  To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

Signed-off-by: Karol Herbst <karolherbst@gmail.com>
---
 drm/nouveau/nouveau_hwmon.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/drm/nouveau/nouveau_hwmon.c b/drm/nouveau/nouveau_hwmon.c
index 71f764b..3d4672a 100644
--- a/drm/nouveau/nouveau_hwmon.c
+++ b/drm/nouveau/nouveau_hwmon.c
@@ -596,6 +596,32 @@ nouveau_hwmon_get_power1_input(struct device *d, struct device_attribute *a,
 static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO,
 			  nouveau_hwmon_get_power1_input, NULL, 0);
 
+static ssize_t
+nouveau_hwmon_get_power1_max(struct device *d, struct device_attribute *a,
+			     char *buf)
+{
+	struct drm_device *dev = dev_get_drvdata(d);
+	struct nouveau_drm *drm = nouveau_drm(dev);
+	struct nvkm_iccsense *iccsense = nvxx_iccsense(&drm->device);
+	return sprintf(buf, "%i\n", iccsense->power_w_max);
+}
+
+static SENSOR_DEVICE_ATTR(power1_max, S_IRUGO,
+			  nouveau_hwmon_get_power1_max, NULL, 0);
+
+static ssize_t
+nouveau_hwmon_get_power1_crit(struct device *d, struct device_attribute *a,
+			      char *buf)
+{
+	struct drm_device *dev = dev_get_drvdata(d);
+	struct nouveau_drm *drm = nouveau_drm(dev);
+	struct nvkm_iccsense *iccsense = nvxx_iccsense(&drm->device);
+	return sprintf(buf, "%i\n", iccsense->power_w_crit);
+}
+
+static SENSOR_DEVICE_ATTR(power1_crit, S_IRUGO,
+			  nouveau_hwmon_get_power1_crit, NULL, 0);
+
 static struct attribute *hwmon_default_attributes[] = {
 	&sensor_dev_attr_name.dev_attr.attr,
 	&sensor_dev_attr_update_rate.dev_attr.attr,
@@ -639,6 +665,12 @@ static struct attribute *hwmon_power_attributes[] = {
 	NULL
 };
 
+static struct attribute *hwmon_power_caps_attributes[] = {
+	&sensor_dev_attr_power1_max.dev_attr.attr,
+	&sensor_dev_attr_power1_crit.dev_attr.attr,
+	NULL
+};
+
 static const struct attribute_group hwmon_default_attrgroup = {
 	.attrs = hwmon_default_attributes,
 };
@@ -657,6 +689,9 @@ static const struct attribute_group hwmon_in0_attrgroup = {
 static const struct attribute_group hwmon_power_attrgroup = {
 	.attrs = hwmon_power_attributes,
 };
+static const struct attribute_group hwmon_power_caps_attrgroup = {
+	.attrs = hwmon_power_caps_attributes,
+};
 #endif
 
 int
@@ -728,8 +763,16 @@ nouveau_hwmon_init(struct drm_device *dev)
 	if (iccsense && iccsense->data_valid && !list_empty(&iccsense->rails)) {
 		ret = sysfs_create_group(&hwmon_dev->kobj,
 					 &hwmon_power_attrgroup);
+
 		if (ret)
 			goto error;
+
+		if (iccsense->power_w_max && iccsense->power_w_crit) {
+			ret = sysfs_create_group(&hwmon_dev->kobj,
+						 &hwmon_power_caps_attrgroup);
+			if (ret)
+				goto error;
+		}
 	}
 
 	hwmon->hwmon = hwmon_dev;
@@ -759,6 +802,7 @@ nouveau_hwmon_fini(struct drm_device *dev)
 		sysfs_remove_group(&hwmon->hwmon->kobj, &hwmon_fan_rpm_attrgroup);
 		sysfs_remove_group(&hwmon->hwmon->kobj, &hwmon_in0_attrgroup);
 		sysfs_remove_group(&hwmon->hwmon->kobj, &hwmon_power_attrgroup);
+		sysfs_remove_group(&hwmon->hwmon->kobj, &hwmon_power_caps_attrgroup);
 
 		hwmon_device_unregister(hwmon->hwmon);
 	}
-- 
2.10.2

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] nvbios/power_budget: Add basic power budget parsing
       [not found]     ` <20161112105532.5030-2-karolherbst-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2016-11-12 11:58       ` Pierre Moreau
       [not found]         ` <20161112115805.jzhmo23bexc723ca-WLoDKDh+7sdAfugRpC6u6w@public.gmane.org>
  0 siblings, 1 reply; 6+ messages in thread
From: Pierre Moreau @ 2016-11-12 11:58 UTC (permalink / raw)
  To: Karol Herbst; +Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW


[-- Attachment #1.1: Type: text/plain, Size: 6744 bytes --]

On 11:55 am - Nov 12 2016, Karol Herbst wrote:
> v2: Set entry to 0xff if not found
>     Add cap entry for ver 0x30 tables
>     Rework to fix memory leak
> 
> Signed-off-by: Karol Herbst <karolherbst-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  .../include/nvkm/subdev/bios/power_budget.h        |  24 ++++
>  drm/nouveau/nvkm/subdev/bios/Kbuild                |   1 +
>  drm/nouveau/nvkm/subdev/bios/power_budget.c        | 122 +++++++++++++++++++++
>  3 files changed, 147 insertions(+)
>  create mode 100644 drm/nouveau/include/nvkm/subdev/bios/power_budget.h
>  create mode 100644 drm/nouveau/nvkm/subdev/bios/power_budget.c
> 
> diff --git a/drm/nouveau/include/nvkm/subdev/bios/power_budget.h b/drm/nouveau/include/nvkm/subdev/bios/power_budget.h
> new file mode 100644
> index 0000000..f295cc7
> --- /dev/null
> +++ b/drm/nouveau/include/nvkm/subdev/bios/power_budget.h
> @@ -0,0 +1,24 @@
> +#ifndef __NVBIOS_POWER_BUDGET_H__
> +#define __NVBIOS_POWER_BUDGET_H__
> +
> +#include <nvkm/subdev/bios.h>
> +
> +struct nvbios_power_budget_entry {
> +	u32 min_w;
> +	u32 avg_w;
> +	u32 max_w;
> +};
> +
> +struct nvbios_power_budget {
> +	u32 offset;
> +	u8  header_len;
> +	u8  entry_len;
> +	u8  entry_count;
> +	u8  cap_entry;
> +};
> +
> +int nvbios_power_budget_header(struct nvkm_bios *, struct nvbios_power_budget *);
> +int nvbios_power_budget_entry(struct nvkm_bios *, struct nvbios_power_budget *,
> +                              u8 idx, struct nvbios_power_budget_entry *);
> +
> +#endif
> diff --git a/drm/nouveau/nvkm/subdev/bios/Kbuild b/drm/nouveau/nvkm/subdev/bios/Kbuild
> index be57220..6b4f1e0 100644
> --- a/drm/nouveau/nvkm/subdev/bios/Kbuild
> +++ b/drm/nouveau/nvkm/subdev/bios/Kbuild
> @@ -19,6 +19,7 @@ nvkm-y += nvkm/subdev/bios/pcir.o
>  nvkm-y += nvkm/subdev/bios/perf.o
>  nvkm-y += nvkm/subdev/bios/pll.o
>  nvkm-y += nvkm/subdev/bios/pmu.o
> +nvkm-y += nvkm/subdev/bios/power_budget.o
>  nvkm-y += nvkm/subdev/bios/ramcfg.o
>  nvkm-y += nvkm/subdev/bios/rammap.o
>  nvkm-y += nvkm/subdev/bios/shadow.o
> diff --git a/drm/nouveau/nvkm/subdev/bios/power_budget.c b/drm/nouveau/nvkm/subdev/bios/power_budget.c
> new file mode 100644
> index 0000000..ed9760e
> --- /dev/null
> +++ b/drm/nouveau/nvkm/subdev/bios/power_budget.c
> @@ -0,0 +1,122 @@
> +/*
> + * 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 <subdev/bios.h>
> +#include <subdev/bios/bit.h>
> +#include <subdev/bios/power_budget.h>
> +
> +static u32
> +nvbios_power_budget_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt,
> +			  u8 *len)
> +{
> +	struct bit_entry bit_P;
> +	u32 power_budget;
> +
> +	if (bit_entry(bios, 'P', &bit_P) || bit_P.version != 2 ||
> +	    bit_P.length < 0x2c)
> +		return 0;
> +
> +	power_budget = nvbios_rd32(bios, bit_P.offset + 0x2c);
> +	if (!power_budget)
> +		return 0;
> +
> +	*ver = nvbios_rd08(bios, power_budget);
> +	switch (*ver) {
> +	case 0x10:
> +	case 0x20:
> +	case 0x30:
> +		*hdr = nvbios_rd08(bios, power_budget + 0x1);
> +		*len = nvbios_rd08(bios, power_budget + 0x2);
> +		*cnt = nvbios_rd08(bios, power_budget + 0x3);
> +		return power_budget;
> +	default:
> +		break;
> +	}
> +
> +	return 0;
> +}
> +
> +int
> +nvbios_power_budget_header(struct nvkm_bios *bios,
> +                           struct nvbios_power_budget *budget)
> +{
> +	struct nvkm_subdev *subdev = &bios->subdev;
> +	u8 ver, hdr, cnt, len, cap_entry;
> +	u32 header;
> +
> +	header = nvbios_power_budget_table(bios, &ver, &hdr, &cnt, &len);
> +	if (!header || !cnt)

Should there be a check for `budget` being `NULL` here, similarly to
`nvbios_power_budger_entry()`? (I haven’t looked at the other patches yet.)

> +		return -ENODEV;
> +
> +	budget->offset = header;
> +	budget->header_len = hdr;
> +	budget->entry_len = len;
> +	budget->entry_count = cnt;
> +
> +	switch (ver) {
> +	case 0x20:
> +		cap_entry = nvbios_rd08(bios, header + 0x9);
> +		break;
> +	case 0x30:
> +		cap_entry = nvbios_rd08(bios, header + 0xa);
> +		break;
> +	default:
> +		cap_entry = 0xff;
> +	}
> +
> +	if (cap_entry < cnt)
> +		budget->cap_entry = cap_entry;
> +	else {
> +		if (cap_entry != 0xff)
> +			nvkm_warn(subdev,
> +			          "invalid cap_entry in power budget table "
> +			          "found\n");

Printed messages should not be splitted, as it makes it harder to grep for
them.

Pierre


> +		budget->cap_entry = 0xff;
> +	}
> +	return 0;
> +}
> +
> +int
> +nvbios_power_budget_entry(struct nvkm_bios *bios,
> +                          struct nvbios_power_budget *budget,
> +                          u8 idx, struct nvbios_power_budget_entry *entry)
> +{
> +	u32 entry_offset;
> +
> +	if (!budget || !budget->offset || idx >= budget->entry_count || !entry)
> +		return -EINVAL;
> +
> +	entry_offset = budget->offset + budget->header_len + idx * budget->entry_len;
> +
> +	if (budget->entry_len >= 0xe) {
> +		entry->min_w = nvbios_rd32(bios, entry_offset + 0x2);
> +		entry->avg_w = nvbios_rd32(bios, entry_offset + 0x6);
> +		entry->max_w = nvbios_rd32(bios, entry_offset + 0xa);
> +	} else {
> +		entry->min_w = 0;
> +		entry->max_w = nvbios_rd32(bios, entry_offset + 0x2);
> +		entry->avg_w = entry->max_w;
> +	}
> +
> +	return 0;
> +}
> -- 
> 2.10.2
> 
> _______________________________________________
> Nouveau mailing list
> Nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] nvbios/power_budget: Add basic power budget parsing
       [not found]         ` <20161112115805.jzhmo23bexc723ca-WLoDKDh+7sdAfugRpC6u6w@public.gmane.org>
@ 2016-11-12 12:34           ` Karol Herbst
  0 siblings, 0 replies; 6+ messages in thread
From: Karol Herbst @ 2016-11-12 12:34 UTC (permalink / raw)
  To: Karol Herbst, ML nouveau

2016-11-12 12:58 GMT+01:00 Pierre Moreau <pierre.morrow@free.fr>:
> On 11:55 am - Nov 12 2016, Karol Herbst wrote:
>> v2: Set entry to 0xff if not found
>>     Add cap entry for ver 0x30 tables
>>     Rework to fix memory leak
>>
>> Signed-off-by: Karol Herbst <karolherbst@gmail.com>
>> ---
>>  .../include/nvkm/subdev/bios/power_budget.h        |  24 ++++
>>  drm/nouveau/nvkm/subdev/bios/Kbuild                |   1 +
>>  drm/nouveau/nvkm/subdev/bios/power_budget.c        | 122 +++++++++++++++++++++
>>  3 files changed, 147 insertions(+)
>>  create mode 100644 drm/nouveau/include/nvkm/subdev/bios/power_budget.h
>>  create mode 100644 drm/nouveau/nvkm/subdev/bios/power_budget.c
>>
>> diff --git a/drm/nouveau/include/nvkm/subdev/bios/power_budget.h b/drm/nouveau/include/nvkm/subdev/bios/power_budget.h
>> new file mode 100644
>> index 0000000..f295cc7
>> --- /dev/null
>> +++ b/drm/nouveau/include/nvkm/subdev/bios/power_budget.h
>> @@ -0,0 +1,24 @@
>> +#ifndef __NVBIOS_POWER_BUDGET_H__
>> +#define __NVBIOS_POWER_BUDGET_H__
>> +
>> +#include <nvkm/subdev/bios.h>
>> +
>> +struct nvbios_power_budget_entry {
>> +     u32 min_w;
>> +     u32 avg_w;
>> +     u32 max_w;
>> +};
>> +
>> +struct nvbios_power_budget {
>> +     u32 offset;
>> +     u8  header_len;
>> +     u8  entry_len;
>> +     u8  entry_count;
>> +     u8  cap_entry;
>> +};
>> +
>> +int nvbios_power_budget_header(struct nvkm_bios *, struct nvbios_power_budget *);
>> +int nvbios_power_budget_entry(struct nvkm_bios *, struct nvbios_power_budget *,
>> +                              u8 idx, struct nvbios_power_budget_entry *);
>> +
>> +#endif
>> diff --git a/drm/nouveau/nvkm/subdev/bios/Kbuild b/drm/nouveau/nvkm/subdev/bios/Kbuild
>> index be57220..6b4f1e0 100644
>> --- a/drm/nouveau/nvkm/subdev/bios/Kbuild
>> +++ b/drm/nouveau/nvkm/subdev/bios/Kbuild
>> @@ -19,6 +19,7 @@ nvkm-y += nvkm/subdev/bios/pcir.o
>>  nvkm-y += nvkm/subdev/bios/perf.o
>>  nvkm-y += nvkm/subdev/bios/pll.o
>>  nvkm-y += nvkm/subdev/bios/pmu.o
>> +nvkm-y += nvkm/subdev/bios/power_budget.o
>>  nvkm-y += nvkm/subdev/bios/ramcfg.o
>>  nvkm-y += nvkm/subdev/bios/rammap.o
>>  nvkm-y += nvkm/subdev/bios/shadow.o
>> diff --git a/drm/nouveau/nvkm/subdev/bios/power_budget.c b/drm/nouveau/nvkm/subdev/bios/power_budget.c
>> new file mode 100644
>> index 0000000..ed9760e
>> --- /dev/null
>> +++ b/drm/nouveau/nvkm/subdev/bios/power_budget.c
>> @@ -0,0 +1,122 @@
>> +/*
>> + * 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 <subdev/bios.h>
>> +#include <subdev/bios/bit.h>
>> +#include <subdev/bios/power_budget.h>
>> +
>> +static u32
>> +nvbios_power_budget_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt,
>> +                       u8 *len)
>> +{
>> +     struct bit_entry bit_P;
>> +     u32 power_budget;
>> +
>> +     if (bit_entry(bios, 'P', &bit_P) || bit_P.version != 2 ||
>> +         bit_P.length < 0x2c)
>> +             return 0;
>> +
>> +     power_budget = nvbios_rd32(bios, bit_P.offset + 0x2c);
>> +     if (!power_budget)
>> +             return 0;
>> +
>> +     *ver = nvbios_rd08(bios, power_budget);
>> +     switch (*ver) {
>> +     case 0x10:
>> +     case 0x20:
>> +     case 0x30:
>> +             *hdr = nvbios_rd08(bios, power_budget + 0x1);
>> +             *len = nvbios_rd08(bios, power_budget + 0x2);
>> +             *cnt = nvbios_rd08(bios, power_budget + 0x3);
>> +             return power_budget;
>> +     default:
>> +             break;
>> +     }
>> +
>> +     return 0;
>> +}
>> +
>> +int
>> +nvbios_power_budget_header(struct nvkm_bios *bios,
>> +                           struct nvbios_power_budget *budget)
>> +{
>> +     struct nvkm_subdev *subdev = &bios->subdev;
>> +     u8 ver, hdr, cnt, len, cap_entry;
>> +     u32 header;
>> +
>> +     header = nvbios_power_budget_table(bios, &ver, &hdr, &cnt, &len);
>> +     if (!header || !cnt)
>
> Should there be a check for `budget` being `NULL` here, similarly to
> `nvbios_power_budger_entry()`? (I haven’t looked at the other patches yet.)
>

right, we should error check more often and "performance" is a silly
reason not to do it here.

>> +             return -ENODEV;
>> +
>> +     budget->offset = header;
>> +     budget->header_len = hdr;
>> +     budget->entry_len = len;
>> +     budget->entry_count = cnt;
>> +
>> +     switch (ver) {
>> +     case 0x20:
>> +             cap_entry = nvbios_rd08(bios, header + 0x9);
>> +             break;
>> +     case 0x30:
>> +             cap_entry = nvbios_rd08(bios, header + 0xa);
>> +             break;
>> +     default:
>> +             cap_entry = 0xff;
>> +     }
>> +
>> +     if (cap_entry < cnt)
>> +             budget->cap_entry = cap_entry;
>> +     else {
>> +             if (cap_entry != 0xff)
>> +                     nvkm_warn(subdev,
>> +                               "invalid cap_entry in power budget table "
>> +                               "found\n");
>
> Printed messages should not be splitted, as it makes it harder to grep for
> them.
>

right.. silly 80 char line length.

> Pierre
>
>
>> +             budget->cap_entry = 0xff;
>> +     }
>> +     return 0;
>> +}
>> +
>> +int
>> +nvbios_power_budget_entry(struct nvkm_bios *bios,
>> +                          struct nvbios_power_budget *budget,
>> +                          u8 idx, struct nvbios_power_budget_entry *entry)
>> +{
>> +     u32 entry_offset;
>> +
>> +     if (!budget || !budget->offset || idx >= budget->entry_count || !entry)
>> +             return -EINVAL;
>> +
>> +     entry_offset = budget->offset + budget->header_len + idx * budget->entry_len;
>> +
>> +     if (budget->entry_len >= 0xe) {
>> +             entry->min_w = nvbios_rd32(bios, entry_offset + 0x2);
>> +             entry->avg_w = nvbios_rd32(bios, entry_offset + 0x6);
>> +             entry->max_w = nvbios_rd32(bios, entry_offset + 0xa);
>> +     } else {
>> +             entry->min_w = 0;
>> +             entry->max_w = nvbios_rd32(bios, entry_offset + 0x2);
>> +             entry->avg_w = entry->max_w;
>> +     }
>> +
>> +     return 0;
>> +}
>> --
>> 2.10.2
>>
>> _______________________________________________
>> Nouveau mailing list
>> Nouveau@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/nouveau
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-11-12 12:34 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-12 10:55 [PATCH 0/3] Expose power budget cap via hwmon Karol Herbst
     [not found] ` <20161112105532.5030-1-karolherbst-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-11-12 10:55   ` [PATCH 1/3] nvbios/power_budget: Add basic power budget parsing Karol Herbst
     [not found]     ` <20161112105532.5030-2-karolherbst-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-11-12 11:58       ` Pierre Moreau
     [not found]         ` <20161112115805.jzhmo23bexc723ca-WLoDKDh+7sdAfugRpC6u6w@public.gmane.org>
2016-11-12 12:34           ` Karol Herbst
2016-11-12 10:55   ` [PATCH 2/3] subdev/iccsense: Parse max and crit power level Karol Herbst
2016-11-12 10:55   ` [PATCH 3/3] hwmon: expose power_max and power_crit Karol Herbst

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.