Skip to content

L
linux
Commit 3b7f4bde authored by Ahmad Khalifa's avatar Ahmad Khalifa Committed by Guenter Roeck
Browse files
Options

hwmon: (nct6775) Increase and reorder ALARM/BEEP bits 

* Increase available bits, IN: 16 to 24, FAN: 8 to 12,
  TEMP: 6 to 12
* Reorder alarm/beep definitions to match in order to allow
  additional inputs in the future
* Remove comments about 'unused' bits as probe() is a better
  reference

Testing note:
* Tested on nct6799 with IN/FAN/TEMP, and changing min/max/high/hyst,
  that triggers the corresponding alarms correctly. Good confirmation
  on the original mapping of the registers and masks.
  As to be expected, only 4 fans and 2 temps (fixed) have limits
  currently on nct6799 on my board.
* Trouble with testing intrusion alarms and beeps, no way to confirm
  those. As I understand now, intrusion/caseopen is probably not
  connected on my board.
  And I haven't seen a buzzer on a board in ages.
Signed-off-by: default avatarAhmad Khalifa <ahmad@khalifa.ws>
Link: https://lore.kernel.org/r/20230717201050.1657809-1-ahmad@khalifa.wsSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent b3af14c4
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 99 deletions
drivers/hwmon/nct6775-core.c
View file @ 3b7f4bde
...@@ -98,31 +98,23 @@ static const u16 NCT6775_REG_IN[] = { ...@@ -98,31 +98,23 @@ static const u16 NCT6775_REG_IN[] = {
static const u16 NCT6775_REG_ALARM[NUM_REG_ALARM] = { 0x459, 0x45A, 0x45B }; static const u16 NCT6775_REG_ALARM[NUM_REG_ALARM] = { 0x459, 0x45A, 0x45B };
/* 0..15 voltages, 16..23 fans, 24..29 temperatures, 30..31 intrusion */ static const s8 NCT6775_ALARM_BITS[NUM_ALARM_BITS] = {
0, 1, 2, 3, 8, 21, 20, 16, 17, -1, -1, -1, /* in0-in11 */
static const s8 NCT6775_ALARM_BITS[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* in12-in23 */
0, 1, 2, 3, 8, 21, 20, 16, /* in0.. in7 */ 6, 7, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* fan1-fan12 */
17, -1, -1, -1, -1, -1, -1, /* in8..in14 */ 4, 5, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* temp1-temp12 */
-1, /* unused */ 12, -1, /* intr0-intr1 */
6, 7, 11, -1, -1, /* fan1..fan5 */ };
-1, -1, -1, /* unused */
4, 5, 13, -1, -1, -1, /* temp1..temp6 */
12, -1 }; /* intrusion0, intrusion1 */
static const u16 NCT6775_REG_BEEP[NUM_REG_BEEP] = { 0x56, 0x57, 0x453, 0x4e }; static const u16 NCT6775_REG_BEEP[NUM_REG_BEEP] = { 0x56, 0x57, 0x453, 0x4e };
/* static const s8 NCT6775_BEEP_BITS[NUM_BEEP_BITS] = {
* 0..14 voltages, 15 global beep enable, 16..23 fans, 24..29 temperatures, 0, 1, 2, 3, 8, 9, 10, 16, 17, -1, -1, -1, /* in0-in11 */
* 30..31 intrusion -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* in12-in23 */
*/ 6, 7, 11, 28, -1, -1, -1, -1, -1, -1, -1, -1, /* fan1-fan12 */
static const s8 NCT6775_BEEP_BITS[] = { 4, 5, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* temp1-temp12 */
0, 1, 2, 3, 8, 9, 10, 16, /* in0.. in7 */ 12, -1, 21 /* intr0-intr1, beep_en */
17, -1, -1, -1, -1, -1, -1, /* in8..in14 */ };
21, /* global beep enable */
6, 7, 11, 28, -1, /* fan1..fan5 */
-1, -1, -1, /* unused */
4, 5, 13, -1, -1, -1, /* temp1..temp6 */
12, -1 }; /* intrusion0, intrusion1 */
/* DC or PWM output fan configuration */ /* DC or PWM output fan configuration */
static const u8 NCT6775_REG_PWM_MODE[] = { 0x04, 0x04, 0x12 }; static const u8 NCT6775_REG_PWM_MODE[] = { 0x04, 0x04, 0x12 };
...@@ -256,25 +248,23 @@ static const u16 NCT6775_REG_TSI_TEMP[] = { 0x669 }; ...@@ -256,25 +248,23 @@ static const u16 NCT6775_REG_TSI_TEMP[] = { 0x669 };
#define NCT6776_REG_FAN_STEP_UP_TIME NCT6775_REG_FAN_STEP_DOWN_TIME #define NCT6776_REG_FAN_STEP_UP_TIME NCT6775_REG_FAN_STEP_DOWN_TIME
#define NCT6776_REG_FAN_STEP_DOWN_TIME NCT6775_REG_FAN_STEP_UP_TIME #define NCT6776_REG_FAN_STEP_DOWN_TIME NCT6775_REG_FAN_STEP_UP_TIME
static const s8 NCT6776_ALARM_BITS[] = { static const s8 NCT6776_ALARM_BITS[NUM_ALARM_BITS] = {
0, 1, 2, 3, 8, 21, 20, 16, /* in0.. in7 */ 0, 1, 2, 3, 8, 21, 20, 16, 17, -1, -1, -1, /* in0-in11 */
17, -1, -1, -1, -1, -1, -1, /* in8..in14 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* in12-in23 */
-1, /* unused */ 6, 7, 11, 10, 23, -1, -1, -1, -1, -1, -1, -1, /* fan1-fan12 */
6, 7, 11, 10, 23, /* fan1..fan5 */ 4, 5, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* temp1-temp12 */
-1, -1, -1, /* unused */ 12, 9, /* intr0-intr1 */
4, 5, 13, -1, -1, -1, /* temp1..temp6 */ };
12, 9 }; /* intrusion0, intrusion1 */
static const u16 NCT6776_REG_BEEP[NUM_REG_BEEP] = { 0xb2, 0xb3, 0xb4, 0xb5 }; static const u16 NCT6776_REG_BEEP[NUM_REG_BEEP] = { 0xb2, 0xb3, 0xb4, 0xb5 };
static const s8 NCT6776_BEEP_BITS[] = { static const s8 NCT6776_BEEP_BITS[NUM_BEEP_BITS] = {
0, 1, 2, 3, 4, 5, 6, 7, /* in0.. in7 */ 0, 1, 2, 3, 4, 5, 6, 7, 8, -1, -1, -1, /* in0-in11 */
8, -1, -1, -1, -1, -1, -1, /* in8..in14 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* in12-in23 */
24, /* global beep enable */ 25, 26, 27, 28, 29, -1, -1, -1, -1, -1, -1, -1, /* fan1-fan12 */
25, 26, 27, 28, 29, /* fan1..fan5 */ 16, 17, 18, 19, 20, 21, -1, -1, -1, -1, -1, -1, /* temp1-temp12 */
-1, -1, -1, /* unused */ 30, 31, 24 /* intr0-intr1, beep_en */
16, 17, 18, 19, 20, 21, /* temp1..temp6 */ };
30, 31 }; /* intrusion0, intrusion1 */
static const u16 NCT6776_REG_TOLERANCE_H[] = { static const u16 NCT6776_REG_TOLERANCE_H[] = {
0x10c, 0x20c, 0x30c, 0x80c, 0x90c, 0xa0c, 0xb0c }; 0x10c, 0x20c, 0x30c, 0x80c, 0x90c, 0xa0c, 0xb0c };
...@@ -345,23 +335,21 @@ static const u16 NCT6779_REG_IN[] = { ...@@ -345,23 +335,21 @@ static const u16 NCT6779_REG_IN[] = {
static const u16 NCT6779_REG_ALARM[NUM_REG_ALARM] = { static const u16 NCT6779_REG_ALARM[NUM_REG_ALARM] = {
0x459, 0x45A, 0x45B, 0x568 }; 0x459, 0x45A, 0x45B, 0x568 };
static const s8 NCT6779_ALARM_BITS[] = { static const s8 NCT6779_ALARM_BITS[NUM_ALARM_BITS] = {
0, 1, 2, 3, 8, 21, 20, 16, /* in0.. in7 */ 0, 1, 2, 3, 8, 21, 20, 16, 17, 24, 25, 26, /* in0-in11 */
17, 24, 25, 26, 27, 28, 29, /* in8..in14 */ 27, 28, 29, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* in12-in23 */
-1, /* unused */ 6, 7, 11, 10, 23, -1, -1, -1, -1, -1, -1, -1, /* fan1-fan12 */
6, 7, 11, 10, 23, /* fan1..fan5 */ 4, 5, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* temp1-temp12 */
-1, -1, -1, /* unused */ 12, 9, /* intr0-intr1 */
4, 5, 13, -1, -1, -1, /* temp1..temp6 */ };
12, 9 }; /* intrusion0, intrusion1 */
static const s8 NCT6779_BEEP_BITS[NUM_BEEP_BITS] = {
static const s8 NCT6779_BEEP_BITS[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, /* in0-in11 */
0, 1, 2, 3, 4, 5, 6, 7, /* in0.. in7 */ 12, 13, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* in12-in23 */
8, 9, 10, 11, 12, 13, 14, /* in8..in14 */ 25, 26, 27, 28, 29, -1, -1, -1, -1, -1, -1, -1, /* fan1-fan12 */
24, /* global beep enable */ 16, 17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* temp1-temp12 */
25, 26, 27, 28, 29, /* fan1..fan5 */ 30, 31, 24 /* intr0-intr1, beep_en */
-1, -1, -1, /* unused */ };
16, 17, -1, -1, -1, -1, /* temp1..temp6 */
30, 31 }; /* intrusion0, intrusion1 */
static const u16 NCT6779_REG_FAN[] = { static const u16 NCT6779_REG_FAN[] = {
0x4c0, 0x4c2, 0x4c4, 0x4c6, 0x4c8, 0x4ca, 0x4ce }; 0x4c0, 0x4c2, 0x4c4, 0x4c6, 0x4c8, 0x4ca, 0x4ce };
...@@ -449,14 +437,13 @@ static const u16 NCT6791_REG_WEIGHT_DUTY_BASE[NUM_FAN] = { 0, 0x23e }; ...@@ -449,14 +437,13 @@ static const u16 NCT6791_REG_WEIGHT_DUTY_BASE[NUM_FAN] = { 0, 0x23e };
static const u16 NCT6791_REG_ALARM[NUM_REG_ALARM] = { static const u16 NCT6791_REG_ALARM[NUM_REG_ALARM] = {
0x459, 0x45A, 0x45B, 0x568, 0x45D }; 0x459, 0x45A, 0x45B, 0x568, 0x45D };
static const s8 NCT6791_ALARM_BITS[] = { static const s8 NCT6791_ALARM_BITS[NUM_ALARM_BITS] = {
0, 1, 2, 3, 8, 21, 20, 16, /* in0.. in7 */ 0, 1, 2, 3, 8, 21, 20, 16, 17, 24, 25, 26, /* in0-in11 */
17, 24, 25, 26, 27, 28, 29, /* in8..in14 */ 27, 28, 29, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* in12-in23 */
-1, /* unused */ 6, 7, 11, 10, 23, 33, -1, -1, -1, -1, -1, -1, /* fan1-fan12 */
6, 7, 11, 10, 23, 33, /* fan1..fan6 */ 4, 5, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* temp1-temp12 */
-1, -1, /* unused */ 12, 9, /* intr0-intr1 */
4, 5, 13, -1, -1, -1, /* temp1..temp6 */ };
12, 9 }; /* intrusion0, intrusion1 */
/* NCT6792/NCT6793 specific data */ /* NCT6792/NCT6793 specific data */
...@@ -764,27 +751,23 @@ static const u16 NCT6106_REG_AUTO_PWM[] = { 0x164, 0x174, 0x184 }; ...@@ -764,27 +751,23 @@ static const u16 NCT6106_REG_AUTO_PWM[] = { 0x164, 0x174, 0x184 };
static const u16 NCT6106_REG_ALARM[NUM_REG_ALARM] = { static const u16 NCT6106_REG_ALARM[NUM_REG_ALARM] = {
0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d }; 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d };
static const s8 NCT6106_ALARM_BITS[] = { static const s8 NCT6106_ALARM_BITS[NUM_ALARM_BITS] = {
0, 1, 2, 3, 4, 5, 7, 8, /* in0.. in7 */ 0, 1, 2, 3, 4, 5, 7, 8, 9, -1, -1, -1, /* in0-in11 */
9, -1, -1, -1, -1, -1, -1, /* in8..in14 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* in12-in23 */
-1, /* unused */ 32, 33, 34, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* fan1-fan12 */
32, 33, 34, -1, -1, /* fan1..fan5 */ 16, 17, 18, 19, 20, 21, -1, -1, -1, -1, -1, -1, /* temp1-temp12 */
-1, -1, -1, /* unused */ 48, -1, /* intr0-intr1 */
16, 17, 18, 19, 20, 21, /* temp1..temp6 */
48, -1 /* intrusion0, intrusion1 */
}; };
static const u16 NCT6106_REG_BEEP[NUM_REG_BEEP] = { static const u16 NCT6106_REG_BEEP[NUM_REG_BEEP] = {
0x3c0, 0x3c1, 0x3c2, 0x3c3, 0x3c4 }; 0x3c0, 0x3c1, 0x3c2, 0x3c3, 0x3c4 };
static const s8 NCT6106_BEEP_BITS[] = { static const s8 NCT6106_BEEP_BITS[NUM_BEEP_BITS] = {
0, 1, 2, 3, 4, 5, 7, 8, /* in0.. in7 */ 0, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, /* in0-in11 */
9, 10, 11, 12, -1, -1, -1, /* in8..in14 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* in12-in23 */
32, /* global beep enable */ 24, 25, 26, 27, 28, -1, -1, -1, -1, -1, -1, -1, /* fan1-fan12 */
24, 25, 26, 27, 28, /* fan1..fan5 */ 16, 17, 18, 19, 20, 21, -1, -1, -1, -1, -1, -1, /* temp1-temp12 */
-1, -1, -1, /* unused */ 34, -1, 32 /* intr0-intr1, beep_en */
16, 17, 18, 19, 20, 21, /* temp1..temp6 */
34, -1 /* intrusion0, intrusion1 */
}; };
static const u16 NCT6106_REG_TEMP_ALTERNATE[32] = { static const u16 NCT6106_REG_TEMP_ALTERNATE[32] = {
...@@ -844,24 +827,20 @@ static const u16 NCT6116_REG_AUTO_TEMP[] = { ...@@ -844,24 +827,20 @@ static const u16 NCT6116_REG_AUTO_TEMP[] = {
static const u16 NCT6116_REG_AUTO_PWM[] = { static const u16 NCT6116_REG_AUTO_PWM[] = {
0x164, 0x174, 0x184, 0x1d4, 0x1e4 }; 0x164, 0x174, 0x184, 0x1d4, 0x1e4 };
static const s8 NCT6116_ALARM_BITS[] = { static const s8 NCT6116_ALARM_BITS[NUM_ALARM_BITS] = {
0, 1, 2, 3, 4, 5, 7, 8, /* in0.. in7 */ 0, 1, 2, 3, 4, 5, 7, 8, 9, -1, -1, -1, /* in0-in11 */
9, -1, -1, -1, -1, -1, -1, /* in8..in9 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* in12-in23 */
-1, /* unused */ 32, 33, 34, 35, 36, -1, -1, -1, -1, -1, -1, -1, /* fan1-fan12 */
32, 33, 34, 35, 36, /* fan1..fan5 */ 16, 17, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* temp1-temp12 */
-1, -1, -1, /* unused */ 48, -1, /* intr0-intr1 */
16, 17, 18, -1, -1, -1, /* temp1..temp6 */
48, -1 /* intrusion0, intrusion1 */
}; };
static const s8 NCT6116_BEEP_BITS[] = { static const s8 NCT6116_BEEP_BITS[NUM_BEEP_BITS] = {
0, 1, 2, 3, 4, 5, 7, 8, /* in0.. in7 */ 0, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, /* in0-in11 */
9, 10, 11, 12, -1, -1, -1, /* in8..in14 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* in12-in23 */
32, /* global beep enable */ 24, 25, 26, 27, 28, -1, -1, -1, -1, -1, -1, -1, /* fan1-fan12 */
24, 25, 26, 27, 28, /* fan1..fan5 */ 16, 17, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* temp1-temp12 */
-1, -1, -1, /* unused */ 34, -1, 32 /* intr0-intr1, beep_en */
16, 17, 18, -1, -1, -1, /* temp1..temp6 */
34, -1 /* intrusion0, intrusion1 */
}; };
static const u16 NCT6116_REG_TSI_TEMP[] = { 0x59, 0x5b }; static const u16 NCT6116_REG_TSI_TEMP[] = { 0x59, 0x5b };
......
drivers/hwmon/nct6775.h
View file @ 3b7f4bde
...@@ -239,10 +239,25 @@ nct6775_add_attr_group(struct nct6775_data *data, const struct attribute_group * ...@@ -239,10 +239,25 @@ nct6775_add_attr_group(struct nct6775_data *data, const struct attribute_group *
#define NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE 0x28 #define NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE 0x28
#define FAN_ALARM_BASE 16 /*
#define TEMP_ALARM_BASE 24 * ALARM_BITS and BEEP_BITS store bit-index for the mask of the registers
#define INTRUSION_ALARM_BASE 30 * loaded into data->alarm and data->beep.
#define BEEP_ENABLE_BASE 15 *
* Every input register (IN/TEMP/FAN) must have a corresponding
* ALARM/BEEP bit at the same index BITS[BASE + index]
* Set value to -1 to disable the visibility of that '*_alarm' attribute and
* to pad the bits until the next BASE
*
* Beep has an additional GLOBAL_BEEP_ENABLE bit
*/
#define VIN_ALARM_BASE 0
#define FAN_ALARM_BASE 24
#define TEMP_ALARM_BASE 36
#define INTRUSION_ALARM_BASE 48
#define BEEP_ENABLE_BASE 50
#define NUM_ALARM_BITS (INTRUSION_ALARM_BASE + 4)
#define NUM_BEEP_BITS (BEEP_ENABLE_BASE + 1)
/* /*
* Not currently used: * Not currently used:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7