Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b71c0892 authored by Karol Herbst's avatar Karol Herbst Committed by Ben Skeggs
Browse files

drm/nouveau/iccsense: implement for ina209, ina219 and ina3221 



based on Martins initial work

v3: fix ina2x9 calculations
v4: don't kmalloc(0), fix the lsb/pga stuff
v5: add a field to tell if the power reading may be invalid
    add nkvm_iccsense_read_all function
    check for the device on the i2c bus

Signed-off-by: default avatarKarol Herbst <nouveau@karolherbst.de>
Reviewed-by: default avatarMartin Peres <martin.peres@free.fr>
parent 39b7e6e5

drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/extdev.h

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ enum nvbios_extdev_type { 
	NVBIOS_EXTDEV_VT1103M		= 0x40,

	NVBIOS_EXTDEV_PX3540		= 0x41,

	NVBIOS_EXTDEV_VT1105M		= 0x42, /* or close enough... */

	NVBIOS_EXTDEV_INA219		= 0x4c,

	NVBIOS_EXTDEV_INA209		= 0x4d,

	NVBIOS_EXTDEV_INA3221		= 0x4e,

	NVBIOS_EXTDEV_ADT7473		= 0x70, /* can also be a LM64 */

	NVBIOS_EXTDEV_HDCP_EEPROM	= 0x90,

	NVBIOS_EXTDEV_NONE		= 0xff,

drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h

+31 −0
Original line number Diff line number Diff line
@@ -107,6 +107,22 @@ nvkm_rdi2cr(struct i2c_adapter *adap, u8 addr, u8 reg) 
	return val;

}



static inline int

nv_rd16i2cr(struct i2c_adapter *adap, u8 addr, u8 reg)

{

	u8 val[2];

	struct i2c_msg msgs[] = {

		{ .addr = addr, .flags = 0, .len = 1, .buf = &reg },

		{ .addr = addr, .flags = I2C_M_RD, .len = 2, .buf = val },

	};



	int ret = i2c_transfer(adap, msgs, ARRAY_SIZE(msgs));

	if (ret != 2)

		return -EIO;



	return val[0] << 8 | val[1];

}



static inline int

nvkm_wri2cr(struct i2c_adapter *adap, u8 addr, u8 reg, u8 val)

{
@@ -122,6 +138,21 @@ nvkm_wri2cr(struct i2c_adapter *adap, u8 addr, u8 reg, u8 val) 
	return 0;

}



static inline int

nv_wr16i2cr(struct i2c_adapter *adap, u8 addr, u8 reg, u16 val)

{

	u8 buf[3] = { reg, val >> 8, val & 0xff};

	struct i2c_msg msgs[] = {

		{ .addr = addr, .flags = 0, .len = 3, .buf = buf },

	};



	int ret = i2c_transfer(adap, msgs, ARRAY_SIZE(msgs));

	if (ret != 1)

		return -EIO;



	return 0;

}



static inline bool

nvkm_probe_i2c(struct i2c_adapter *adap, u8 addr)

{

drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h

+7 −0
Original line number Diff line number Diff line
@@ -3,8 +3,15 @@ 


#include <core/subdev.h>



struct nkvm_iccsense_rail;

struct nvkm_iccsense {

	struct nvkm_subdev subdev;

	u8 rail_count;

	bool data_valid;

	struct nvkm_iccsense_rail *rails;

};



int gf100_iccsense_new(struct nvkm_device *, int index, struct nvkm_iccsense **);

int nvkm_iccsense_read(struct nvkm_iccsense *iccsense, u8 idx);

int nvkm_iccsense_read_all(struct nvkm_iccsense *iccsense);

#endif

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+20 −0
Original line number Diff line number Diff line
@@ -1347,6 +1347,7 @@ nvc0_chipset = { 
	.gpio = g94_gpio_new,

	.i2c = g94_i2c_new,

	.ibus = gf100_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gf100_ltc_new,

	.mc = gf100_mc_new,
@@ -1383,6 +1384,7 @@ nvc1_chipset = { 
	.gpio = g94_gpio_new,

	.i2c = g94_i2c_new,

	.ibus = gf100_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gf100_ltc_new,

	.mc = gf100_mc_new,
@@ -1418,6 +1420,7 @@ nvc3_chipset = { 
	.gpio = g94_gpio_new,

	.i2c = g94_i2c_new,

	.ibus = gf100_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gf100_ltc_new,

	.mc = gf100_mc_new,
@@ -1453,6 +1456,7 @@ nvc4_chipset = { 
	.gpio = g94_gpio_new,

	.i2c = g94_i2c_new,

	.ibus = gf100_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gf100_ltc_new,

	.mc = gf100_mc_new,
@@ -1489,6 +1493,7 @@ nvc8_chipset = { 
	.gpio = g94_gpio_new,

	.i2c = g94_i2c_new,

	.ibus = gf100_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gf100_ltc_new,

	.mc = gf100_mc_new,
@@ -1525,6 +1530,7 @@ nvce_chipset = { 
	.gpio = g94_gpio_new,

	.i2c = g94_i2c_new,

	.ibus = gf100_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gf100_ltc_new,

	.mc = gf100_mc_new,
@@ -1561,6 +1567,7 @@ nvcf_chipset = { 
	.gpio = g94_gpio_new,

	.i2c = g94_i2c_new,

	.ibus = gf100_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gf100_ltc_new,

	.mc = gf100_mc_new,
@@ -1596,6 +1603,7 @@ nvd7_chipset = { 
	.gpio = gf119_gpio_new,

	.i2c = gf117_i2c_new,

	.ibus = gf117_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gf100_ltc_new,

	.mc = gf100_mc_new,
@@ -1629,6 +1637,7 @@ nvd9_chipset = { 
	.gpio = gf119_gpio_new,

	.i2c = gf119_i2c_new,

	.ibus = gf117_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gf100_ltc_new,

	.mc = gf100_mc_new,
@@ -1664,6 +1673,7 @@ nve4_chipset = { 
	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gf100_mc_new,
@@ -1701,6 +1711,7 @@ nve6_chipset = { 
	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gf100_mc_new,
@@ -1738,6 +1749,7 @@ nve7_chipset = { 
	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gf100_mc_new,
@@ -1799,6 +1811,7 @@ nvf0_chipset = { 
	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gf100_mc_new,
@@ -1835,6 +1848,7 @@ nvf1_chipset = { 
	.gpio = gk104_gpio_new,

	.i2c = gf119_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gf100_mc_new,
@@ -1871,6 +1885,7 @@ nv106_chipset = { 
	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gk20a_mc_new,
@@ -1907,6 +1922,7 @@ nv108_chipset = { 
	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gk20a_mc_new,
@@ -1943,6 +1959,7 @@ nv117_chipset = { 
	.gpio = gk104_gpio_new,

	.i2c = gf119_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gm107_ltc_new,

	.mc = gk20a_mc_new,
@@ -1974,6 +1991,7 @@ nv120_chipset = { 
	.gpio = gk104_gpio_new,

	.i2c = gm200_i2c_new,

	.ibus = gm200_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gm200_ltc_new,

	.mc = gk20a_mc_new,
@@ -2006,6 +2024,7 @@ nv124_chipset = { 
	.gpio = gk104_gpio_new,

	.i2c = gm200_i2c_new,

	.ibus = gm200_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gm200_ltc_new,

	.mc = gk20a_mc_new,
@@ -2038,6 +2057,7 @@ nv126_chipset = { 
	.gpio = gk104_gpio_new,

	.i2c = gm200_i2c_new,

	.ibus = gm200_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

	.ltc = gm200_ltc_new,

	.mc = gk20a_mc_new,

drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/Kbuild

+1 −0
Original line number Diff line number Diff line 
nvkm-y += nvkm/subdev/iccsense/base.o

nvkm-y += nvkm/subdev/iccsense/gf100.o