diff mbox series

[v2] hwmon: (nct6775) Add support for 18 IN readings for nct6799

Message ID 20230718182912.1746384-1-ahmad@khalifa.ws (mailing list archive)
State Changes Requested
Headers show
Series [v2] hwmon: (nct6775) Add support for 18 IN readings for nct6799 | expand

Commit Message

Ahmad Khalifa July 18, 2023, 6:29 p.m. UTC 
* Add additional VIN/IN_MIN/IN_MAX register values
* Separate ALARM/BEEP bits for nct6799
* Separate scaling factors for nct6799

Registers/alarms match for NCT6796D-S and NCT6799D-R
Tested on NCT6799D-R for new IN/MIN/MAX and ALARMS

Signed-off-by: Ahmad Khalifa <ahmad@khalifa.ws>
---

Notes:
    v2 changes:
    * Rebase after increased BITS with same registers
    * Assign missing ALARM_BITS and add BEEP_BITS
    * Add separate scaling_in and pass it through data as they were
      missing in v1 and the factors differ with other chips
    
    Additional IN/MIN/MAX results (sensors.conf labels, but no compute)
    nct6799-isa-0290
    Adapter: ISA adapter
     0 CPUVC:                 400.00 mV (min =  +0.00 V, max =  +1.74 V)
     1 VIN1:                  992.00 mV (min =  +0.00 V, max =  +0.00 V)  ALARM
     2 AVSB:                    3.39 V  (min =  +0.00 V, max =  +0.00 V)  ALARM
     3 3VCC:                    3.30 V  (min =  +0.00 V, max =  +0.00 V)  ALARM
     4 VIN0:                    1.01 V  (min =  +0.00 V, max =  +1.20 V)
     5 VIN8:                    1.02 V  (min =  +0.00 V, max =  +0.00 V)
     6 VIN4:                  664.00 mV (min =  +0.00 V, max =  +0.00 V)  ALARM
     7 3VSB:                    3.39 V  (min =  +0.00 V, max =  +3.60 V)
     8 VBAT:                    3.31 V  (min =  +0.00 V, max =  +3.50 V)
     9 VTT:                     3.30 V  (min =  +0.00 V, max =  +3.60 V)
    10 VIN5:                    1.10 V  (min =  +0.90 V, max =  +1.20 V)
    11 VIN6:                    1.10 V  (min =  +0.90 V, max =  +1.20 V)
    12 VIN2:                    1.02 V  (min =  +0.90 V, max =  +1.20 V)
    13 VIN3:                  224.00 mV (min =  +0.10 V, max =  +0.60 V)
    14 VIN7:                  1000.00 mV (min =  +0.80 V, max =  +1.20 V)
    15 VIN9:                  864.00 mV (min =  +0.60 V, max =  +1.08 V)
    16 VHIF:                    3.39 V  (min =  +3.10 V, max =  +3.60 V)
    17 VIN10:                   1.02 V  (min =  +0.80 V, max =  +1.20 V)

 drivers/hwmon/nct6775-core.c | 68 ++++++++++++++++++++++++++++++------
 drivers/hwmon/nct6775.h      |  6 ++--
 2 files changed, 61 insertions(+), 13 deletions(-)


base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
prerequisite-patch-id: 36e3467bd9ea72cb3ad2bef638a8389a9537d111
prerequisite-patch-id: 716ba83170c6c7a969faead5189f4b336097fcb5
prerequisite-patch-id: 57e03c9561d046b45ce1fd2cafa4061add8c68a0

Comments

Guenter Roeck July 19, 2023, 2:49 a.m. UTC | #1 
On Tue, Jul 18, 2023 at 07:29:12PM +0100, Ahmad Khalifa wrote:
> * Add additional VIN/IN_MIN/IN_MAX register values
> * Separate ALARM/BEEP bits for nct6799
> * Separate scaling factors for nct6799
> 
> Registers/alarms match for NCT6796D-S and NCT6799D-R
> Tested on NCT6799D-R for new IN/MIN/MAX and ALARMS
> 
> Signed-off-by: Ahmad Khalifa <ahmad@khalifa.ws>
> ---
> 
> Notes:
>     v2 changes:
>     * Rebase after increased BITS with same registers
>     * Assign missing ALARM_BITS and add BEEP_BITS
>     * Add separate scaling_in and pass it through data as they were
>       missing in v1 and the factors differ with other chips

The scaling change is really a bug fix; it should be a separate patch
marked as Fixes:. It also affects NCT6798D.

Please split the patch into two so I can apply the bug fix for v6.5.

Thanks,
Guenter
Ahmad Khalifa July 19, 2023, 7:41 p.m. UTC | #2 
On 19/07/2023 03:49, Guenter Roeck wrote:
> On Tue, Jul 18, 2023 at 07:29:12PM +0100, Ahmad Khalifa wrote:
>>      * Add separate scaling_in and pass it through data as they were
>>        missing in v1 and the factors differ with other chips
> The scaling change is really a bug fix; it should be a separate patch
> marked as Fixes:. It also affects NCT6798D.

Missed checking 6798 voltage, thought it was only temps missing.
But now that I checked, I can see the 17th voltage and it's the
same as 6799.

Not sure if to add that with the 6799 or leave it safely with 15
as it is. Adding it alone, too risky, I can't test that.
Guenter Roeck July 19, 2023, 7:54 p.m. UTC | #3 
On 7/19/23 12:41, Ahmad Khalifa wrote:
> On 19/07/2023 03:49, Guenter Roeck wrote:
>> On Tue, Jul 18, 2023 at 07:29:12PM +0100, Ahmad Khalifa wrote:
>>>      * Add separate scaling_in and pass it through data as they were
>>>        missing in v1 and the factors differ with other chips
>> The scaling change is really a bug fix; it should be a separate patch
>> marked as Fixes:. It also affects NCT6798D.
> 
> Missed checking 6798 voltage, thought it was only temps missing.
> But now that I checked, I can see the 17th voltage and it's the
> same as 6799.
> 
> Not sure if to add that with the 6799 or leave it safely with 15
> as it is. Adding it alone, too risky, I can't test that.
> 

Leave it. We can always add it later if/when someone can test it.
The documentation is inconsistent anyway. The summary and chapter 8.1 both
say that there are 16 voltages. Then 8.6.2 suddenly says that there is also
VHIF, and the registers for VHIF are widely listed. We would need someone
to confirm that it actually works.

Thanks,
Guenter
diff mbox series

Patch

diff --git a/drivers/hwmon/nct6775-core.c b/drivers/hwmon/nct6775-core.c
index 1664d2a1e6c3..831726fcaf8b 100644
--- a/drivers/hwmon/nct6775-core.c
+++ b/drivers/hwmon/nct6775-core.c
@@ -80,14 +80,17 @@  static const char * const nct6775_device_names[] = {
 
 /* Common and NCT6775 specific data */
 
-/* Voltage min/max registers for nr=7..14 are in bank 5 */
+/*
+ * Voltage min/max registers for nr=7..14 are in bank 5
+ * min/max: 15-17 for NCT6799 only
+ */
 
 static const u16 NCT6775_REG_IN_MAX[] = {
 	0x2b, 0x2d, 0x2f, 0x31, 0x33, 0x35, 0x37, 0x554, 0x556, 0x558, 0x55a,
-	0x55c, 0x55e, 0x560, 0x562 };
+	0x55c, 0x55e, 0x560, 0x562, 0x564, 0x570, 0x572 };
 static const u16 NCT6775_REG_IN_MIN[] = {
 	0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x555, 0x557, 0x559, 0x55b,
-	0x55d, 0x55f, 0x561, 0x563 };
+	0x55d, 0x55f, 0x561, 0x563, 0x565, 0x571, 0x573 };
 static const u16 NCT6775_REG_IN[] = {
 	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x550, 0x551, 0x552
 };
@@ -256,7 +259,8 @@  static const s8 NCT6776_ALARM_BITS[NUM_ALARM_BITS] = {
 	12,  9,						  /* intr0-intr1  */
 };
 
-static const u16 NCT6776_REG_BEEP[NUM_REG_BEEP] = { 0xb2, 0xb3, 0xb4, 0xb5 };
+/* 0xbf: nct6799 only */
+static const u16 NCT6776_REG_BEEP[NUM_REG_BEEP] = { 0xb2, 0xb3, 0xb4, 0xb5, 0xbf };
 
 static const s8 NCT6776_BEEP_BITS[NUM_BEEP_BITS] = {
 	 0,  1,  2,  3,  4,  5,  6,  7,  8, -1, -1, -1,	  /* in0-in11     */
@@ -328,9 +332,16 @@  static const u16 NCT6776_REG_TSI_TEMP[] = {
 
 /* NCT6779 specific data */
 
+/*
+ * 15-17 for NCT6799 only, register labels are:
+ *      CPUVC,  VIN1,  AVSB,  3VCC,  VIN0,  VIN8,  VIN4, 3VSB
+ *       VBAT,   VTT,  VIN5,  VIN6,  VIN2,  VIN3,  VIN7, VIN9
+ *       VHIF, VIN10
+ */
 static const u16 NCT6779_REG_IN[] = {
 	0x480, 0x481, 0x482, 0x483, 0x484, 0x485, 0x486, 0x487,
-	0x488, 0x489, 0x48a, 0x48b, 0x48c, 0x48d, 0x48e };
+	0x488, 0x489, 0x48a, 0x48b, 0x48c, 0x48d, 0x48e, 0x48f,
+	0x470, 0x471};
 
 static const u16 NCT6779_REG_ALARM[NUM_REG_ALARM] = {
 	0x459, 0x45A, 0x45B, 0x568 };
@@ -644,6 +655,22 @@  static const char *const nct6798_temp_label[] = {
 #define NCT6798_TEMP_MASK	0xbfff0ffe
 #define NCT6798_VIRT_TEMP_MASK	0x80000c00
 
+static const s8 NCT6799_ALARM_BITS[NUM_ALARM_BITS] = {
+	 0,  1,  2,  3,  8, -1, 20, 16, 17, 24, 25, 26,	  /* in0-in11     */
+	27, 28, 29, 30, 31, -1, -1, -1, -1, -1, -1, -1,	  /* in12-in23    */
+	 6,  7, 11, 10, 23, 33, -1, -1, -1, -1, -1, -1,	  /* fan1-fan12   */
+	 4,  5, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1,	  /* temp1-temp12 */
+	12,  9,						  /* intr0-intr1  */
+};
+
+static const s8 NCT6799_BEEP_BITS[NUM_BEEP_BITS] = {
+	 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,	  /* in0-in11     */
+	12, 13, 14, 15, 34, 35, -1, -1, -1, -1, -1, -1,	  /* in12-in23    */
+	25, 26, 27, 28, 29, -1, -1, -1, -1, -1, -1, -1,	  /* fan1-fan12   */
+	16, 17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,	  /* temp1-temp12 */
+	30, 31, 24					  /* intr0-intr1, beep_en */
+};
+
 static const char *const nct6799_temp_label[] = {
 	"",
 	"SYSTIN",
@@ -935,14 +962,24 @@  static const u16 scale_in[15] = {
 	800, 800
 };
 
-static inline long in_from_reg(u8 reg, u8 nr)
+/*
+ * NCT6799 scaling:
+ *    CPUVC, IN1, AVSB, 3VCC, IN0, IN8, IN4, 3VSB, VBAT,  VTT,  IN5,  IN6, IN2,
+ *      IN3, IN7,  IN9, VHIF, IN10
+ */
+static const u16 scale_in_6799[NUM_IN] = {
+	800, 800, 1600, 1600, 800, 800, 800, 1600, 1600, 1600, 1600, 1600, 800,
+	800, 800,  800, 1600, 800
+};
+
+static inline long in_from_reg(u8 reg, u8 nr, const u16 *scales)
 {
-	return DIV_ROUND_CLOSEST(reg * scale_in[nr], 100);
+	return DIV_ROUND_CLOSEST(reg * scales[nr], 100);
 }
 
-static inline u8 in_to_reg(u32 val, u8 nr)
+static inline u8 in_to_reg(u32 val, u8 nr, const u16 *scales)
 {
-	return clamp_val(DIV_ROUND_CLOSEST(val * 100, scale_in[nr]), 0, 255);
+	return clamp_val(DIV_ROUND_CLOSEST(val * 100, scales[nr]), 0, 255);
 }
 
 /* TSI temperatures are in 8.3 format */
@@ -1653,7 +1690,8 @@  show_in_reg(struct device *dev, struct device_attribute *attr, char *buf)
 	if (IS_ERR(data))
 		return PTR_ERR(data);
 
-	return sprintf(buf, "%ld\n", in_from_reg(data->in[nr][index], nr));
+	return sprintf(buf, "%ld\n",
+		       in_from_reg(data->in[nr][index], nr, data->scale_in));
 }
 
 static ssize_t
@@ -1671,7 +1709,7 @@  store_in_reg(struct device *dev, struct device_attribute *attr, const char *buf,
 	if (err < 0)
 		return err;
 	mutex_lock(&data->update_lock);
-	data->in[nr][index] = in_to_reg(val, nr);
+	data->in[nr][index] = in_to_reg(val, nr, data->scale_in);
 	err = nct6775_write_value(data, data->REG_IN_MINMAX[index - 1][nr], data->in[nr][index]);
 	mutex_unlock(&data->update_lock);
 	return err ? : count;
@@ -3442,6 +3480,7 @@  int nct6775_probe(struct device *dev, struct nct6775_data *data,
 	mutex_init(&data->update_lock);
 	data->name = nct6775_device_names[data->kind];
 	data->bank = 0xff;		/* Force initial bank selection */
+	data->scale_in = scale_in;
 
 	switch (data->kind) {
 	case nct6106:
@@ -3948,7 +3987,14 @@  int nct6775_probe(struct device *dev, struct nct6775_data *data,
 		case nct6796:
 		case nct6797:
 		case nct6798:
+			data->REG_TSI_TEMP = NCT6796_REG_TSI_TEMP;
+			num_reg_tsi_temp = ARRAY_SIZE(NCT6796_REG_TSI_TEMP);
+			break;
 		case nct6799:
+			data->in_num = 18;
+			data->scale_in = scale_in_6799;
+			data->ALARM_BITS = NCT6799_ALARM_BITS;
+			data->BEEP_BITS = NCT6799_BEEP_BITS;
 			data->REG_TSI_TEMP = NCT6796_REG_TSI_TEMP;
 			num_reg_tsi_temp = ARRAY_SIZE(NCT6796_REG_TSI_TEMP);
 			break;
diff --git a/drivers/hwmon/nct6775.h b/drivers/hwmon/nct6775.h
index e8cc4f0544b8..4c0658638ff9 100644
--- a/drivers/hwmon/nct6775.h
+++ b/drivers/hwmon/nct6775.h
@@ -16,6 +16,7 @@  enum pwm_enable { off, manual, thermal_cruise, speed_cruise, sf3, sf4 };
 #define NUM_REG_BEEP	5	/* Max number of beep registers */
 
 #define NUM_FAN		7
+#define NUM_IN		18
 
 struct nct6775_data {
 	int addr;	/* IO base of hw monitor block */
@@ -97,7 +98,8 @@  struct nct6775_data {
 	/* Register values */
 	u8 bank;		/* current register bank */
 	u8 in_num;		/* number of in inputs we have */
-	u8 in[15][3];		/* [0]=in, [1]=in_max, [2]=in_min */
+	u8 in[NUM_IN][3];	/* [0]=in, [1]=in_max, [2]=in_min */
+	const u16 *scale_in;	/* internal scaling factors for each in */
 	unsigned int rpm[NUM_FAN];
 	u16 fan_min[NUM_FAN];
 	u8 fan_pulses[NUM_FAN];
@@ -165,7 +167,7 @@  struct nct6775_data {
 	u16 have_temp;
 	u16 have_temp_fixed;
 	u16 have_tsi_temp;
-	u16 have_in;
+	u32 have_in;
 
 	/* Remember extra register values over suspend/resume */
 	u8 vbat;