Hi Colin,
Thanks for doing that! I have attached a similar patch I submitted for
review 4 days ago. Jean is on vacation right now and will probably
look at both patches when he gets back. (I don't know exactly when
that is.) How would you feel about downloading and testing the patch I
have. One of the significant improvements is that it only reports 9
voltage inputs, where your patch reports 10. The 627DHG only has 9
inputs. In the patch I'm sending you, there's an update to
linux/Documentation/hwmon/w83627ehf, which describes a lot of the
relevant information about the 627DHG.
Anyway, I'd love to work with you to get 627DHG support in the kernel.
David
On 12/14/06, Con Kolivas <kernel at kolivas.org> wrote:
> Hi all
>
> Browsing the past archives I saw that the W83627DHG chip was a lot like the
> w83627ehf driver and support shouldn't be too hard to add. So I probed my own
> hardware to see what it returned and added a small patch to try to make it
> work. The output of sensors after that seems accurate apart from AUX Temp
> which seems to jump around a bit. The cpu and system temperature, fan speeds
> and voltages that I have all seem pretty close too.
>
> Here is a patch that I created for the 2.6.19 kernel that gave me the output I
> required. I doubt very much that this is the correct and final approach so it
> may blow up your machine etc etc so for those who are desparate and want to
> try it all the usual warnings apply and so on... :D
>
> ---
> Hack for W83627DHG support from W83627EHF hwmon driver.
>
> Signed-off-by: Con Kolivas <kernel at kolivas.org>
>
> ---
> drivers/hwmon/w83627ehf.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> Index: linux-2.6.19-ck2/drivers/hwmon/w83627ehf.c
> ===================================================================
> --- linux-2.6.19-ck2.orig/drivers/hwmon/w83627ehf.c 2006-12-15 13:07:54.000000000 +1100
> +++ linux-2.6.19-ck2/drivers/hwmon/w83627ehf.c 2006-12-15 13:18:23.000000000 +1100
> @@ -66,6 +66,7 @@ static int VAL; /* The value to read/wr
> #define SIO_REG_ADDR 0x60 /* Logical device address (2 bytes) */
>
> #define SIO_W83627EHF_ID 0x8840
> +#define SIO_W83627DHG_ID 0xA000
> #define SIO_ID_MASK 0xFFC0
>
> static inline void
> @@ -1340,9 +1341,10 @@ static int __init w83627ehf_find(int sio
>
> val = (superio_inb(SIO_REG_DEVID) << 8)
> | superio_inb(SIO_REG_DEVID + 1);
> - if ((val & SIO_ID_MASK) != SIO_W83627EHF_ID) {
> - superio_exit();
> - return -ENODEV;
> + if (((val & SIO_ID_MASK) != SIO_W83627EHF_ID) &&
> + ((val & SIO_ID_MASK) != SIO_W83627DHG_ID)) {
> + superio_exit();
> + return -ENODEV;
> }
>
> superio_select(W83627EHF_LD_HWM);
>
>
> --
> -ck
-------------- next part --------------
This patch adds support for the w83627dhg chip.
Also includes an update to Rudolf Marek's email address.
The plan for the w83627ehf driver development from here is:
1. Add support for the 627DHG chip.
2. Convert the driver to a platform driver and remove three global variables.
3. Work on a cleaner super-io implementation including super-io locking.
--- linux-2.6.19-rc6/drivers/hwmon/w83627ehf.c 2006-12-10 14:44:32.000000000 -0800
+++ linux-2.6.19-rc6/drivers/hwmon/w83627ehf.c 2006-12-10 16:14:39.000000000 -0800
@@ -3,7 +3,7 @@
the Winbond W83627EHF Super-I/O chip
Copyright (C) 2005 Jean Delvare <khali at linux-fr.org>
Copyright (C) 2006 Yuan Mu (Winbond),
- Rudolf Marek <r.marek at sh.cvut.cz>
+ Rudolf Marek <r.marek at assembler.cz>
David Hubbard <david.c.hubbard at gmail.com>
Shamelessly ripped from the w83627hf driver
@@ -32,8 +32,10 @@
Supports the following chips:
- Chip #vin #fan #pwm #temp chip_id man_id
- w83627ehf 10 5 4 3 0x88,0xa1 0x5ca3
+ Chip #vin #fan #pwm #temp chip IDs mfg ID
+ w83627ehf 10 5 4 3 0x8853 0x88 0x5ca3
+ 0x8863 0xa1
+ w83627dhg 9 5 4 3 0xa020 0xc1 0x5ca3
*/
#include <linux/module.h>
@@ -55,8 +57,18 @@
* Super-I/O constants and functions
*/
+/*
+ * The three following globals are initialized in w83627ehf_find(), before
+ * the i2c-isa device is created. Otherwise, they could be stored in
+ * w83627ehf_data. This is ugly, but necessary. and when the driver is next
+ * updated to become a platform driver, the globals will disappear.
+ */
static int REG; /* The register to read/write */
static int VAL; /* The value to read/write */
+/* The w83627ehf/ehg have 10 voltage inputs, but the w83627dhg has 9. This
+ * value is also used in w83627ehf_detect() to export a device name in sysfs
+ * (e.g. w83627ehf or w83627dhg) */
+static int w83627ehf_num_in;
#define W83627EHF_LD_HWM 0x0b
@@ -65,8 +77,10 @@
#define SIO_REG_ENABLE 0x30 /* Logical device enable */
#define SIO_REG_ADDR 0x60 /* Logical device address (2 bytes) */
-#define SIO_W83627EHF_ID 0x8840
-#define SIO_ID_MASK 0xFFC0
+#define SIO_W83627EHF_ID 0x8850
+#define SIO_W83627EHG_ID 0x8860
+#define SIO_W83627DHG_ID 0xa020
+#define SIO_ID_MASK 0xFFF0
static inline void
superio_outb(int reg, int val)
@@ -115,8 +129,10 @@
#define W83627EHF_REG_BANK 0x4E
#define W83627EHF_REG_CONFIG 0x40
-#define W83627EHF_REG_CHIP_ID 0x49
+
+/* Not currently used. REG_MAN_ID == 0x5ca3. REG_CHIP_ID == 0x88/0xa1/0xc1 */
#define W83627EHF_REG_MAN_ID 0x4F
+#define W83627EHF_REG_CHIP_ID 0x58
static const u16 W83627EHF_REG_FAN[] = { 0x28, 0x29, 0x2a, 0x3f, 0x553 };
static const u16 W83627EHF_REG_FAN_MIN[] = { 0x3b, 0x3c, 0x3d, 0x3e, 0x55c };
@@ -429,7 +445,7 @@
}
/* Measured voltages and limits */
- for (i = 0; i < 10; i++) {
+ for (i = 0; i < w83627ehf_num_in; i++) {
data->in[i] = w83627ehf_read_value(client,
W83627EHF_REG_IN(i));
data->in_min[i] = w83627ehf_read_value(client,
@@ -1121,7 +1137,7 @@
device_remove_file(dev, &sda_sf3_arrays[i].dev_attr);
for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays_fan4); i++)
device_remove_file(dev, &sda_sf3_arrays_fan4[i].dev_attr);
- for (i = 0; i < 10; i++) {
+ for (i = 0; i < w83627ehf_num_in; i++) {
device_remove_file(dev, &sda_in_input[i].dev_attr);
device_remove_file(dev, &sda_in_alarm[i].dev_attr);
device_remove_file(dev, &sda_in_min[i].dev_attr);
@@ -1196,7 +1212,11 @@
client->flags = 0;
dev = &client->dev;
- strlcpy(client->name, "w83627ehf", I2C_NAME_SIZE);
+ if (w83627ehf_num_in == 9)
+ strlcpy(client->name, "w83627dhg", I2C_NAME_SIZE);
+ else /* just say ehf. 627EHG is 627EHF in lead-free packaging. */
+ strlcpy(client->name, "w83627ehf", I2C_NAME_SIZE);
+
data->valid = 0;
mutex_init(&data->update_lock);
@@ -1246,7 +1266,7 @@
goto exit_remove;
}
- for (i = 0; i < 10; i++)
+ for (i = 0; i < w83627ehf_num_in; i++)
if ((err = device_create_file(dev, &sda_in_input[i].dev_attr))
|| (err = device_create_file(dev,
&sda_in_alarm[i].dev_attr))
@@ -1340,7 +1360,17 @@
val = (superio_inb(SIO_REG_DEVID) << 8)
| superio_inb(SIO_REG_DEVID + 1);
- if ((val & SIO_ID_MASK) != SIO_W83627EHF_ID) {
+ switch (val & SIO_ID_MASK) {
+ case SIO_W83627DHG_ID:
+ w83627ehf_num_in = 9;
+ break;
+ case SIO_W83627EHF_ID:
+ case SIO_W83627EHG_ID:
+ w83627ehf_num_in = 10;
+ break;
+ default:
+ printk(KERN_WARNING "w83627ehf: unknown ID: 0x%04x "
+ "(is this really a w83627?)\n", val);
superio_exit();
return -ENODEV;
}
--- linux-2.6.19-rc6/Documentation/hwmon/w83627ehf 2006-12-10 16:09:12.000000000 -0800
+++ linux-2.6.19-rc6/Documentation/hwmon/w83627ehf 2006-12-10 16:23:42.000000000 -0800
@@ -2,26 +2,29 @@
=======================
Supported chips:
- * Winbond W83627EHF/EHG (ISA access ONLY)
+ * Winbond W83627EHF/EHG/DHG (ISA access ONLY)
Prefix: 'w83627ehf'
Addresses scanned: ISA address retrieved from Super I/O registers
- Datasheet: http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83627EHF_%20W83627EHGb.pdf
+ Datasheet:
+ http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83627EHF_%20W83627EHGb.pdf
+ DHG datasheet confidential.
Authors:
Jean Delvare <khali at linux-fr.org>
Yuan Mu (Winbond)
- Rudolf Marek <r.marek at sh.cvut.cz>
+ Rudolf Marek <r.marek at assembler.cz>
+ David Hubbard <david.c.hubbard at gmail.com>
Description
-----------
-This driver implements support for the Winbond W83627EHF and W83627EHG
-super I/O chips. We will refer to them collectively as Winbond chips.
+This driver implements support for the Winbond W83627EHF, W83627EHG, and
+W83627DHG super I/O chips. We will refer to them collectively as Winbond chips.
The chips implement three temperature sensors, five fan rotation
-speed sensors, ten analog voltage sensors, alarms with beep warnings (control
-unimplemented), and some automatic fan regulation strategies (plus manual
-fan control mode).
+speed sensors, ten analog voltage sensors (only nine for the 627DHG), alarms
+with beep warnings (control unimplemented), and some automatic fan regulation
+strategies (plus manual fan control mode).
Temperatures are measured in degrees Celsius and measurement resolution is 1
degC for temp1 and 0.5 degC for temp2 and temp3. An alarm is triggered when
@@ -55,6 +58,9 @@
/sys files
----------
+name - this is a standard hwmon device entry. For the W83627EHF and W83627EHG,
+ it is set to "w83627ehf" and for the W83627DHG it is set to "w83627dhg."
+
pwm[1-4] - this file stores PWM duty cycle or DC value (fan speed) in range:
0 (stop) to 255 (full)
@@ -83,3 +89,36 @@
Note: last two functions are influenced by other control bits, not yet exported
by the driver, so a change might not have any effect.
+
+Implementation Details
+----------------------
+Future driver development should bear in mind that the following registers have
+different functions on the 627EHF and the 627DHG. Some registers also have
+different power-on default values, but BIOS should already be loading
+appropriate defaults. Note that bank selection must be performed as is currently
+done in the driver for all register addresses.
+
+0x49: only on DHG, selects temperature source for AUX fan, CPU fan0
+0x4a: not completely documented for the EHF and the DHG documentation assigns
+ different behavior to bits 7 and 6, including extending the temperature
+ input selection to SmartFan I, not just SmartFan III. Testing on the EHF
+ will reveal whether they are compatible or not.
+
+0x58: Chip ID: 0xa1=EHF 0xc1=DHG
+0x5e: only on DHG, has bits to enable "current mode" temperature detection and
+ critical temperature protection
+0x45b: only on EHF, bit 3, vin4 alarm (EHF supports 10 inputs, only 9 on DHG)
+0x552: only on EHF, vin4
+0x558: only on EHF, vin4 high limit
+0x559: only on EHF, vin4 low limit
+0x6b: only on DHG, SYS fan critical temperature
+0x6c: only on DHG, CPU fan0 critical temperature
+0x6d: only on DHG, AUX fan critical temperature
+0x6e: only on DHG, CPU fan1 critical temperature
+
+0x50-0x55 and 0x650-0x657 are marked "Test Register" for the EHF, but "Reserved
+ Register" for the DHG
+
+The DHG also supports PECI, where the DHG queries Intel CPU temperatures, and
+the ICH8 southbridge gets that data via PECI from the DHG, so that the
+southbridge drives the fans. And the DHG supports SST, a one-wire serial bus.
