Module Name: src
Committed By: jruoho
Date: Tue Aug 14 14:36:43 UTC 2012
Modified Files:
src/sys/arch/x86/x86: coretemp.c
src/sys/dev/acpi: acpi_bat.c aibs_acpi.c hpacel_acpi.c thinkpad_acpi.c
src/sys/dev/isa: aps.c
Log Message:
Collect rnd(9) entropy from coretemp(4), acpibat(4), aibs(4), hpacel(4),
thinkpad(4), and aps(4).
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/x86/x86/coretemp.c
cvs rdiff -u -r1.111 -r1.112 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/aibs_acpi.c \
src/sys/dev/acpi/hpacel_acpi.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/acpi/thinkpad_acpi.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/isa/aps.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/coretemp.c
diff -u src/sys/arch/x86/x86/coretemp.c:1.28 src/sys/arch/x86/x86/coretemp.c:1.29
--- src/sys/arch/x86/x86/coretemp.c:1.28 Thu Oct 6 14:05:26 2011
+++ src/sys/arch/x86/x86/coretemp.c Tue Aug 14 14:36:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.28 2011/10/06 14:05:26 jruoho Exp $ */
+/* $NetBSD: coretemp.c,v 1.29 2012/08/14 14:36:43 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.28 2011/10/06 14:05:26 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.29 2012/08/14 14:36:43 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -171,8 +171,8 @@ coretemp_attach(device_t parent, device_
aprint_normal(": thermal sensor, %u C resolution\n", (uint32_t)msr);
sc->sc_sensor.units = ENVSYS_STEMP;
- sc->sc_sensor.flags = ENVSYS_FMONCRITICAL;
sc->sc_sensor.state = ENVSYS_SINVALID;
+ sc->sc_sensor.flags = ENVSYS_FMONCRITICAL | ENVSYS_FHAS_ENTROPY;
(void)pmf_device_register(self, NULL, NULL);
(void)snprintf(sc->sc_sensor.desc, sizeof(sc->sc_sensor.desc),
Index: src/sys/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.111 src/sys/dev/acpi/acpi_bat.c:1.112
--- src/sys/dev/acpi/acpi_bat.c:1.111 Wed Jul 13 09:58:53 2011
+++ src/sys/dev/acpi/acpi_bat.c Tue Aug 14 14:36:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.111 2011/07/13 09:58:53 jruoho Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.112 2012/08/14 14:36:43 jruoho Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.111 2011/07/13 09:58:53 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.112 2012/08/14 14:36:43 jruoho Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -746,6 +746,10 @@ acpibat_init_envsys(device_t dv)
sc->sc_sensor[ACPIBAT_LFCCAPACITY].flags = ENVSYS_FMONNOTSUPP;
sc->sc_sensor[ACPIBAT_DVOLTAGE].flags = ENVSYS_FMONNOTSUPP;
+ /* Attach rnd(9) to the (dis)charge rates. */
+ sc->sc_sensor[ACPIBAT_CHARGERATE].flags |= ENVSYS_FHAS_ENTROPY;
+ sc->sc_sensor[ACPIBAT_DISCHARGERATE].flags |= ENVSYS_FHAS_ENTROPY;
+
sc->sc_sme = sysmon_envsys_create();
for (i = 0; i < ACPIBAT_COUNT; i++) {
Index: src/sys/dev/acpi/aibs_acpi.c
diff -u src/sys/dev/acpi/aibs_acpi.c:1.3 src/sys/dev/acpi/aibs_acpi.c:1.4
--- src/sys/dev/acpi/aibs_acpi.c:1.3 Sat Aug 6 05:03:56 2011
+++ src/sys/dev/acpi/aibs_acpi.c Tue Aug 14 14:36:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: aibs_acpi.c,v 1.3 2011/08/06 05:03:56 jruoho Exp $ */
+/* $NetBSD: aibs_acpi.c,v 1.4 2012/08/14 14:36:43 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aibs_acpi.c,v 1.3 2011/08/06 05:03:56 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aibs_acpi.c,v 1.4 2012/08/14 14:36:43 jruoho Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -478,21 +478,23 @@ aibs_sensor_add(device_t self, ACPI_OBJE
if (sc->sc_model != false)
as->as_limh += as->as_liml; /* A range in the new model. */
+ as->as_sensor.state = ENVSYS_SINVALID;
+
switch (AIBS_TYPE(as->as_type)) {
case AIBS_TYPE_FAN:
as->as_sensor.units = ENVSYS_SFANRPM;
- as->as_sensor.flags |= ENVSYS_FMONLIMITS;
+ as->as_sensor.flags = ENVSYS_FMONLIMITS | ENVSYS_FHAS_ENTROPY;
break;
case AIBS_TYPE_TEMP:
as->as_sensor.units = ENVSYS_STEMP;
- as->as_sensor.flags |= ENVSYS_FMONLIMITS;
+ as->as_sensor.flags = ENVSYS_FMONLIMITS | ENVSYS_FHAS_ENTROPY;
break;
case AIBS_TYPE_VOLT:
as->as_sensor.units = ENVSYS_SVOLTS_DC;
- as->as_sensor.flags |= ENVSYS_FMONLIMITS;
+ as->as_sensor.flags = ENVSYS_FMONLIMITS | ENVSYS_FHAS_ENTROPY;
break;
default:
@@ -501,7 +503,6 @@ aibs_sensor_add(device_t self, ACPI_OBJE
}
(void)strlcpy(as->as_sensor.desc, name, sizeof(as->as_sensor.desc));
- as->as_sensor.state = ENVSYS_SINVALID;
if (sysmon_envsys_sensor_attach(sc->sc_sme, &as->as_sensor) != 0) {
rv = AE_AML_INTERNAL;
Index: src/sys/dev/acpi/hpacel_acpi.c
diff -u src/sys/dev/acpi/hpacel_acpi.c:1.3 src/sys/dev/acpi/hpacel_acpi.c:1.4
--- src/sys/dev/acpi/hpacel_acpi.c:1.3 Wed Sep 7 08:43:20 2011
+++ src/sys/dev/acpi/hpacel_acpi.c Tue Aug 14 14:36:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: hpacel_acpi.c,v 1.3 2011/09/07 08:43:20 cegger Exp $ */
+/* $NetBSD: hpacel_acpi.c,v 1.4 2012/08/14 14:36:43 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpacel_acpi.c,v 1.3 2011/09/07 08:43:20 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpacel_acpi.c,v 1.4 2012/08/14 14:36:43 jruoho Exp $");
#include <sys/param.h>
#include <sys/module.h>
@@ -516,6 +516,7 @@ hpacel_sensor_init(device_t self)
sc->sc_sensor[i].units = ENVSYS_INTEGER;
sc->sc_sensor[i].state = ENVSYS_SINVALID;
+ sc->sc_sensor[i].flags = ENVSYS_FHAS_ENTROPY;
(void)snprintf(sc->sc_sensor[i].desc,
ENVSYS_DESCLEN, "%c-acceleration", zyx[i]);
Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.40 src/sys/dev/acpi/thinkpad_acpi.c:1.41
--- src/sys/dev/acpi/thinkpad_acpi.c:1.40 Sun Jul 15 11:52:01 2012
+++ src/sys/dev/acpi/thinkpad_acpi.c Tue Aug 14 14:36:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.40 2012/07/15 11:52:01 spz Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.41 2012/08/14 14:36:43 jruoho Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.40 2012/07/15 11:52:01 spz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.41 2012/08/14 14:36:43 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -476,6 +476,7 @@ thinkpad_sensors_init(thinkpad_softc_t *
sc->sc_sensor[i].units = ENVSYS_STEMP;
sc->sc_sensor[i].state = ENVSYS_SINVALID;
+ sc->sc_sensor[i].flags = ENVSYS_FHAS_ENTROPY;
(void)snprintf(sc->sc_sensor[i].desc,
sizeof(sc->sc_sensor[i].desc), "temperature %d", i);
@@ -489,6 +490,7 @@ thinkpad_sensors_init(thinkpad_softc_t *
sc->sc_sensor[i].units = ENVSYS_SFANRPM;
sc->sc_sensor[i].state = ENVSYS_SINVALID;
+ sc->sc_sensor[i].flags = ENVSYS_FHAS_ENTROPY;
(void)snprintf(sc->sc_sensor[i].desc,
sizeof(sc->sc_sensor[i].desc), "fan speed %d", j);
Index: src/sys/dev/isa/aps.c
diff -u src/sys/dev/isa/aps.c:1.14 src/sys/dev/isa/aps.c:1.15
--- src/sys/dev/isa/aps.c:1.14 Wed Feb 16 10:08:05 2011
+++ src/sys/dev/isa/aps.c Tue Aug 14 14:36:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: aps.c,v 1.14 2011/02/16 10:08:05 jruoho Exp $ */
+/* $NetBSD: aps.c,v 1.15 2012/08/14 14:36:43 jruoho Exp $ */
/* $OpenBSD: aps.c,v 1.15 2007/05/19 19:14:11 tedu Exp $ */
/* $OpenBSD: aps.c,v 1.17 2008/06/27 06:08:43 canacar Exp $ */
/*
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.14 2011/02/16 10:08:05 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.15 2012/08/14 14:36:43 jruoho Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -337,10 +337,16 @@ aps_attach(device_t parent, device_t sel
INITDATA(APS_SENSOR_LIDOPEN, ENVSYS_INDICATOR, "lid open");
sc->sc_sme = sysmon_envsys_create();
+
for (i = 0; i < APS_NUM_SENSORS; i++) {
+
sc->sc_sensor[i].state = ENVSYS_SVALID;
+
+ if (sc->sc_sensor[i].units == ENVSYS_INTEGER)
+ sc->sc_sensor[i].flags = ENVSYS_FHAS_ENTROPY;
+
if (sysmon_envsys_sensor_attach(sc->sc_sme,
- &sc->sc_sensor[i])) {
+ &sc->sc_sensor[i])) {
sysmon_envsys_destroy(sc->sc_sme);
goto out;
}
