Changes in this patch set:
* Define the DMI matching table for board specific settings during the
chip initialisation and move the only current board specific setting
to this new table.
* Export the table for use by udev.
v2: updates following comments:
* Converted to use callback function.
* Moved call to callback funtion to sio_data into it87_find in line
with other settings for sio_data. This requires dmi_data also passed
to access additional data.
* Added macro for defining entries in DMI table to simplify future
additions.
* Note dmi_data is defined in sm_it87_init to simplify tests and for
future additions.
Signed-off-by: Frank Crawford <frank@xxxxxxxxxxxxxxxxxx>
---
drivers/hwmon/it87.c | 79 ++++++++++++++++++++++++++++++++------------
1 file changed, 58 insertions(+), 21 deletions(-)
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 73ed21ab325b..4314bbca2c22 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -567,6 +567,14 @@ struct it87_data {
s8 auto_temp[NUM_AUTO_PWM][5]; /* [nr][0] is point1_temp_hyst */
};
+/* Board specific settings from DMI matching */
+struct it87_dmi_data {
+ u8 skip_pwm; /* pwm channels to skip for this board */
+ /* Callback for option setting */
+ void (*apply_cb)(struct it87_sio_data *sio_data,
+ struct it87_dmi_data *dmi_data);
+};
+
static int adc_lsb(const struct it87_data *data, int nr)
{
int lsb;
@@ -2389,11 +2397,11 @@ static const struct attribute_group it87_group_auto_pwm = {
/* SuperIO detection - will change isa_address if a chip is found */
static int __init it87_find(int sioaddr, unsigned short *address,
- struct it87_sio_data *sio_data)
+ struct it87_sio_data *sio_data,
+ struct it87_dmi_data *dmi_data)
{
int err;
u16 chip_type;
- const char *board_vendor, *board_name;
const struct it87_devices *config;
err = superio_enter(sioaddr);
@@ -2812,24 +2820,9 @@ static int __init it87_find(int sioaddr, unsigned short *address,
if (sio_data->beep_pin)
pr_info("Beeping is supported\n");
- /* Disable specific features based on DMI strings */
- board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
- board_name = dmi_get_system_info(DMI_BOARD_NAME);
- if (board_vendor && board_name) {
- if (strcmp(board_vendor, "nVIDIA") == 0 &&
- strcmp(board_name, "FN68PT") == 0) {
- /*
- * On the Shuttle SN68PT, FAN_CTL2 is apparently not
- * connected to a fan, but to something else. One user
- * has reported instant system power-off when changing
- * the PWM2 duty cycle, so we disable it.
- * I use the board name string as the trigger in case
- * the same board is ever used in other systems.
- */
- pr_info("Disabling pwm2 due to hardware constraints\n");
- sio_data->skip_pwm = BIT(1);
- }
- }
+ /* Set values based on DMI matches */
+ if (dmi_data && dmi_data->apply_cb)
+ dmi_data->apply_cb(sio_data, dmi_data);
exit:
superio_exit(sioaddr);
@@ -3307,14 +3300,57 @@ static int __init it87_device_add(int index, unsigned short address,
return err;
}
+static void it87_dmi_cb_apply_data(struct it87_sio_data *sio_data,
+ struct it87_dmi_data *dmi_data)
+{
+ if (dmi_data->skip_pwm) {
+ pr_info("Disabling pwm2 due to hardware constraints\n");
+ sio_data->skip_pwm |= dmi_data->skip_pwm;
+ }
+}
+
+/*
+ * On the Shuttle SN68PT, FAN_CTL2 is apparently not
+ * connected to a fan, but to something else. One user
+ * has reported instant system power-off when changing
+ * the PWM2 duty cycle, so we disable it.
+ * I use the board name string as the trigger in case
+ * the same board is ever used in other systems.
+ */
+static struct it87_dmi_data nvidia_fn68pt = {
+ .skip_pwm = BIT(1),
+ .apply_cb = it87_dmi_cb_apply_data,
+};
+
+#define IT87_DMI_MATCH_VND(vendor, name, data) \
+ { \
+ .matches = { \
+ DMI_EXACT_MATCH(DMI_BOARD_VENDOR, vendor), \
+ DMI_EXACT_MATCH(DMI_BOARD_NAME, name), \
+ }, \
+ .driver_data = data, \
+ }
+
+static const struct dmi_system_id it87_dmi_table[] __initconst = {
+ IT87_DMI_MATCH_VND("nVIDIA", "FN68PT", &nvidia_fn68pt),
+ { }
+
+};
+MODULE_DEVICE_TABLE(dmi, it87_dmi_table);
+
static int __init sm_it87_init(void)
{
+ const struct dmi_system_id *dmi = dmi_first_match(it87_dmi_table);
+ struct it87_dmi_data *dmi_data = NULL;
int sioaddr[2] = { REG_2E, REG_4E };
struct it87_sio_data sio_data;
unsigned short isa_address[2];
bool found = false;
int i, err;
+ if (dmi)
+ dmi_data = dmi->driver_data;
+
err = platform_driver_register(&it87_driver);
if (err)
return err;
@@ -3322,7 +3358,8 @@ static int __init sm_it87_init(void)
for (i = 0; i < ARRAY_SIZE(sioaddr); i++) {
memset(&sio_data, 0, sizeof(struct it87_sio_data));
isa_address[i] = 0;
- err = it87_find(sioaddr[i], &isa_address[i], &sio_data);
+ err = it87_find(sioaddr[i], &isa_address[i], &sio_data,
+ dmi_data);
if (err || isa_address[i] == 0)
continue;
/*
--
2.37.3
