Hello all. Here is a patch that allows for me to work on other things. :) Basically, it makes OS choose fan mode instead of firmware. Main feature here is enabling of "disengadged" mode when temperature goes critical, picking 80C as a "red line". Now I can fully load CPU on my X201i - say, "make -j 4" - and it still works instead of being powering off by acpitz(4).
All information was taken from Linux's thinkpad_acpi.c: http://lxr.free-electrons.com/source/drivers/platform/x86/thinkpad_acpi.c (look at "2f" register). I also fixed a few style nits here and there. -- Best wishes, Vadim Zhukov A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing in e-mail? Index: acpithinkpad.c =================================================================== RCS file: /cvs/src/sys/dev/acpi/acpithinkpad.c,v retrieving revision 1.26 diff -u -p -r1.26 acpithinkpad.c --- acpithinkpad.c 27 Apr 2011 20:55:42 -0000 1.26 +++ acpithinkpad.c 12 May 2011 12:09:49 -0000 @@ -71,11 +71,21 @@ #define THINKPAD_POWER_CHANGED 0x6030 #define THINKPAD_SWITCH_WIRELESS 0x7000 -#define THINKPAD_NSENSORS 9 -#define THINKPAD_NTEMPSENSORS 8 +#define THINKPAD_NSENSORS 10 +#define THINKPAD_NTEMPSENSORS 8 + +#define THINKPAD_SENSOR_FANRPM (THINKPAD_NTEMPSENSORS + 0) +#define THINKPAD_SENSOR_FANMODE (THINKPAD_NTEMPSENSORS + 1) #define THINKPAD_ECOFFSET_FANLO 0x84 #define THINKPAD_ECOFFSET_FANHI 0x85 +#define THINKPAD_ECOFFSET_FANMODE 0x2f + +#define THINKPAD_FANMODE_MODEMASK 0x3f +#define THINKPAD_FANMODE_MIN 0x00 +#define THINKPAD_FANMODE_MAX 0x07 +#define THINKPAD_FANMODE_AUTO 0x80 +#define THINKPAD_FANMODE_DISENGADGED 0x40 struct acpithinkpad_softc { struct device sc_dev; @@ -103,8 +113,9 @@ int thinkpad_volume_mute(struct acpithin int thinkpad_brightness_up(struct acpithinkpad_softc *); int thinkpad_brightness_down(struct acpithinkpad_softc *); -void thinkpad_sensor_attach(struct acpithinkpad_softc *sc); +void thinkpad_sensor_attach(struct acpithinkpad_softc *); void thinkpad_sensor_refresh(void *); +u_int8_t thinkpad_choose_fan_mode(int64_t, char const **); struct cfattach acpithinkpad_ca = { sizeof(struct acpithinkpad_softc), thinkpad_match, thinkpad_attach @@ -156,8 +167,12 @@ thinkpad_sensor_attach(struct acpithinkp } /* Add fan probe */ - sc->sc_sens[i].type = SENSOR_FANRPM; - sensor_attach(&sc->sc_sensdev, &sc->sc_sens[i]); + sc->sc_sens[THINKPAD_SENSOR_FANRPM].type = SENSOR_FANRPM; + sensor_attach(&sc->sc_sensdev, &sc->sc_sens[THINKPAD_SENSOR_FANRPM]); + + /* Add fan mode indicator */ + sc->sc_sens[THINKPAD_SENSOR_FANMODE].type = SENSOR_INTEGER; + sensor_attach(&sc->sc_sensdev, &sc->sc_sens[THINKPAD_SENSOR_FANMODE]); sensordev_install(&sc->sc_sensdev); } @@ -166,9 +181,10 @@ void thinkpad_sensor_refresh(void *arg) { struct acpithinkpad_softc *sc = arg; - u_int8_t lo, hi, i; - int64_t tmp; + u_int8_t lo, hi, i, mode; + int64_t tmp, maxtmp = -127; char sname[5]; + const char *desc; /* Refresh sensor readings */ for (i=0; i<THINKPAD_NTEMPSENSORS; i++) { @@ -178,12 +194,49 @@ thinkpad_sensor_refresh(void *arg) sc->sc_sens[i].value = (tmp * 1000000) + 273150000; if (tmp > 127 || tmp < -127) sc->sc_sens[i].flags = SENSOR_FINVALID; + else if (tmp > maxtmp && + (sc->sc_sens[i].flags & SENSOR_FINVALID) != SENSOR_FINVALID) + maxtmp = tmp; } /* Read fan RPM */ acpiec_read(sc->sc_ec, THINKPAD_ECOFFSET_FANLO, 1, &lo); acpiec_read(sc->sc_ec, THINKPAD_ECOFFSET_FANHI, 1, &hi); - sc->sc_sens[i].value = ((hi << 8L) + lo); + sc->sc_sens[THINKPAD_SENSOR_FANRPM].value = ((hi << 8L) + lo); + + /* Update fan mode based on max temperature seen */ + mode = thinkpad_choose_fan_mode(maxtmp, &desc); + acpiec_write(sc->sc_ec, THINKPAD_ECOFFSET_FANMODE, 1, &mode); + sc->sc_sens[THINKPAD_SENSOR_FANMODE].value = mode; + snprintf(sc->sc_sens[THINKPAD_SENSOR_FANMODE].desc, + sizeof(sc->sc_sens[THINKPAD_SENSOR_FANMODE]), + "fan mode: %s", desc); +} + +/* Almost randomly choosed values */ +#define THINKPAD_TEMP_NORMAL_MIN 25 +#define THINKPAD_TEMP_NORMAL_MAX 45 +#define THINKPAD_TEMP_OUCH 80 + +u_int8_t +thinkpad_choose_fan_mode(int64_t temp, char const **desc) { + u_int8_t mode; + + if (temp > THINKPAD_TEMP_OUCH) { + /* It's better if cooler will be destroyed than CPU */ + mode = THINKPAD_FANMODE_DISENGADGED; + *desc = "disengadged"; + } else if (temp > THINKPAD_TEMP_NORMAL_MAX) { + mode = THINKPAD_FANMODE_MAX; + *desc = "max"; + } else if (temp > THINKPAD_TEMP_NORMAL_MIN) { + mode = THINKPAD_FANMODE_AUTO; + *desc = "auto"; + } else { + mode = THINKPAD_FANMODE_MIN; + *desc = "min/off"; + } + return mode; } void
