Looking good. It would be nice to have some defines/enums for the different modes. Some comments about t0, t1 and t2 would be nice. I saw you are using t0 in patch 16, but I have no idea why use t0 rather than t1 or t2.
Otherwise,
Acked-by: Pierre Moreau <pierre.mor...@free.fr>
On 2017-09-15 — 17:11, Karol Herbst wrote:
> Signed-off-by: Karol Herbst <karolher...@gmail.com>
> ---
> .../include/nvkm/subdev/bios/thermal_policies.h | 27 ++++++++
> drm/nouveau/nvkm/subdev/bios/Kbuild | 1 +
> drm/nouveau/nvkm/subdev/bios/thermal_policies.c | 81
> ++++++++++++++++++++++
> 3 files changed, 109 insertions(+)
> create mode 100644 drm/nouveau/include/nvkm/subdev/bios/thermal_policies.h
> create mode 100644 drm/nouveau/nvkm/subdev/bios/thermal_policies.c
>
> diff --git a/drm/nouveau/include/nvkm/subdev/bios/thermal_policies.h
> b/drm/nouveau/include/nvkm/subdev/bios/thermal_policies.h
> new file mode 100644
> index 00000000..c9215fdd
> --- /dev/null
> +++ b/drm/nouveau/include/nvkm/subdev/bios/thermal_policies.h
> @@ -0,0 +1,27 @@
> +#ifndef __NVBIOS_THERMAL_POLICIES_H__
> +#define __NVBIOS_THERMAL_POLICIES_H__
> +
> +struct nvbios_thermal_policies_header {
> + u32 offset;
> +
> + u8 version;
> + u8 hlen;
> + u8 ecount;
> + u8 elen;
> +};
> +struct nvbios_thermal_policies_entry {
> + u8 mode;
> + u16 t0;
> + u16 t1;
> + u16 t2;
> + s16 down_offset;
> + s16 up_offset;
> +};
> +
> +int nvbios_thermal_policies_parse(struct nvkm_bios *,
> + struct nvbios_thermal_policies_header *);
> +int nvbios_thermal_policies_entry(struct nvkm_bios *,
> + struct nvbios_thermal_policies_header *,
> + u8 idx,
> + struct nvbios_thermal_policies_entry *);
> +#endif
> diff --git a/drm/nouveau/nvkm/subdev/bios/Kbuild
> b/drm/nouveau/nvkm/subdev/bios/Kbuild
> index 6b4f1e06..38f31dd0 100644
> --- a/drm/nouveau/nvkm/subdev/bios/Kbuild
> +++ b/drm/nouveau/nvkm/subdev/bios/Kbuild
> @@ -30,6 +30,7 @@ nvkm-y += nvkm/subdev/bios/shadowramin.o
> nvkm-y += nvkm/subdev/bios/shadowrom.o
> nvkm-y += nvkm/subdev/bios/timing.o
> nvkm-y += nvkm/subdev/bios/therm.o
> +nvkm-y += nvkm/subdev/bios/thermal_policies.o
> nvkm-y += nvkm/subdev/bios/vmap.o
> nvkm-y += nvkm/subdev/bios/volt.o
> nvkm-y += nvkm/subdev/bios/vpstate.o
> diff --git a/drm/nouveau/nvkm/subdev/bios/thermal_policies.c
> b/drm/nouveau/nvkm/subdev/bios/thermal_policies.c
> new file mode 100644
> index 00000000..5105194e
> --- /dev/null
> +++ b/drm/nouveau/nvkm/subdev/bios/thermal_policies.c
> @@ -0,0 +1,81 @@
> +/*
> + * Copyright 2017 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/thermal_policies.h>
> +
> +static u32
> +nvbios_thermal_policies_offset(struct nvkm_bios *b)
> +{
> + struct bit_entry bit_P;
> +
> + if (!bit_entry(b, 'P', &bit_P)) {
> + if (bit_P.version == 2 && bit_P.length >= 0x50)
> + return nvbios_rd32(b, bit_P.offset + 0x50);
> + }
> +
> + return 0;
> +}
> +
> +int
> +nvbios_thermal_policies_parse(struct nvkm_bios *b, struct
> nvbios_thermal_policies_header *h)
> +{
> + if (!h)
> + return -EINVAL;
> +
> + h->offset = nvbios_thermal_policies_offset(b);
> + if (!h->offset)
> + return -ENODEV;
> +
> + h->version = nvbios_rd08(b, h->offset);
> + switch (h->version) {
> + case 0x10:
> + h->hlen = nvbios_rd08(b, h->offset + 0x1);
> + h->elen = nvbios_rd08(b, h->offset + 0x2);
> + h->ecount = nvbios_rd08(b, h->offset + 0x3);
> + return 0;
> + default:
> + return -EINVAL;
> + }
> +}
> +
> +int
> +nvbios_thermal_policies_entry(struct nvkm_bios *b, struct
> nvbios_thermal_policies_header *h,
> + u8 idx, struct nvbios_thermal_policies_entry *e)
> +{
> + u32 offset;
> +
> + if (!e || !h || idx > h->ecount)
> + return -EINVAL;
> +
> + offset = h->offset + h->hlen + idx * h->elen;
> + e->mode = nvbios_rd08(b, offset);
> + e->t0 = nvbios_rd16(b, offset + 0x2);
> + e->t1 = nvbios_rd16(b, offset + 0x4);
> + e->t2 = nvbios_rd16(b, offset + 0x6);
> + e->down_offset = nvbios_rd16(b, offset + 0x12);
> + e->up_offset = nvbios_rd16(b, offset + 0x14);
> +
> + return 0;
> +}
> --
> 2.14.1
>
> _______________________________________________
> Nouveau mailing list
> Nouveau@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau
signature.asc
Description: PGP signature
_______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/nouveau
