From laffer1 at midnightbsd.org Thu Oct 17 19:03:22 2019 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Thu, 17 Oct 2019 19:03:22 -0400 (EDT) Subject: [Midnightbsd-cvs] src [12268] stable/1.2/: Create stable branch for 1.2 Message-ID: <201910172303.x9HN3MGj024126@stargazer.midnightbsd.org> Revision: 12268 http://svnweb.midnightbsd.org/src/?rev=12268 Author: laffer1 Date: 2019-10-17 19:03:21 -0400 (Thu, 17 Oct 2019) Log Message: ----------- Create stable branch for 1.2 Added Paths: ----------- stable/1.2/ From laffer1 at midnightbsd.org Thu Oct 17 19:05:45 2019 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Thu, 17 Oct 2019 19:05:45 -0400 (EDT) Subject: [Midnightbsd-cvs] src [12269] trunk/sys/sys/param.h: update param version Message-ID: <201910172305.x9HN5jBt025006@stargazer.midnightbsd.org> Revision: 12269 http://svnweb.midnightbsd.org/src/?rev=12269 Author: laffer1 Date: 2019-10-17 19:05:44 -0400 (Thu, 17 Oct 2019) Log Message: ----------- update param version Modified Paths: -------------- trunk/sys/sys/param.h Modified: trunk/sys/sys/param.h =================================================================== --- trunk/sys/sys/param.h 2019-10-17 23:03:21 UTC (rev 12268) +++ trunk/sys/sys/param.h 2019-10-17 23:05:44 UTC (rev 12269) @@ -51,7 +51,7 @@ * or r is 5-9 in stable after 1.0 is released. */ #undef __MidnightBSD_version -#define __MidnightBSD_version 102000 /* Master, propagated to newvers */ +#define __MidnightBSD_version 103000 /* Master, propagated to newvers */ /* Version of FreeBSD we're compatible with */ #undef __FreeBSD_version From laffer1 at midnightbsd.org Thu Oct 17 19:05:58 2019 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Thu, 17 Oct 2019 19:05:58 -0400 (EDT) Subject: [Midnightbsd-cvs] src [12270] trunk/sys/conf/newvers.sh: bump version Message-ID: <201910172305.x9HN5wHA025067@stargazer.midnightbsd.org> Revision: 12270 http://svnweb.midnightbsd.org/src/?rev=12270 Author: laffer1 Date: 2019-10-17 19:05:57 -0400 (Thu, 17 Oct 2019) Log Message: ----------- bump version Modified Paths: -------------- trunk/sys/conf/newvers.sh Modified: trunk/sys/conf/newvers.sh =================================================================== --- trunk/sys/conf/newvers.sh 2019-10-17 23:05:44 UTC (rev 12269) +++ trunk/sys/conf/newvers.sh 2019-10-17 23:05:57 UTC (rev 12270) @@ -32,7 +32,7 @@ # $MidnightBSD$ TYPE="MidnightBSD" -REVISION="1.2" +REVISION="1.3" RELEASE="${REVISION}" VERSION="${TYPE} ${RELEASE}" From laffer1 at midnightbsd.org Fri Oct 18 12:13:38 2019 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Fri, 18 Oct 2019 12:13:38 -0400 (EDT) Subject: [Midnightbsd-cvs] src [12271] stable/1.1/etc/rc.d/mdnsd: fix a write bug with updating nsswitch.conf Message-ID: <201910181613.x9IGDc8v050443@stargazer.midnightbsd.org> Revision: 12271 http://svnweb.midnightbsd.org/src/?rev=12271 Author: laffer1 Date: 2019-10-18 12:13:38 -0400 (Fri, 18 Oct 2019) Log Message: ----------- fix a write bug with updating nsswitch.conf Modified Paths: -------------- stable/1.1/etc/rc.d/mdnsd Modified: stable/1.1/etc/rc.d/mdnsd =================================================================== --- stable/1.1/etc/rc.d/mdnsd 2019-10-17 23:05:57 UTC (rev 12270) +++ stable/1.1/etc/rc.d/mdnsd 2019-10-18 16:13:38 UTC (rev 12271) @@ -19,11 +19,11 @@ if grep -q mdns "/etc/nsswitch.conf"; then return else - if [ ! -w /etc/nswitch.conf ]; then + if [ -w /etc/nswitch.conf ]; then echo ' /etc/nswitch.conf is not writable, update failed.' return fi - sed 's|^\(hosts.*\)files dns|\1files mdns dns|g' /etc/nsswitch.conf + sed -i.bak -e 's|^\(hosts.*\)files dns|\1files mdns dns|g' /etc/nsswitch.conf fi } From laffer1 at midnightbsd.org Fri Oct 18 12:16:05 2019 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Fri, 18 Oct 2019 12:16:05 -0400 (EDT) Subject: [Midnightbsd-cvs] src [12272] stable/1.1/sys/dev/acpi_support/acpi_ibm.c: update acpi_ibm compatibiility Message-ID: <201910181616.x9IGG5dM051266@stargazer.midnightbsd.org> Revision: 12272 http://svnweb.midnightbsd.org/src/?rev=12272 Author: laffer1 Date: 2019-10-18 12:16:05 -0400 (Fri, 18 Oct 2019) Log Message: ----------- update acpi_ibm compatibiility Modified Paths: -------------- stable/1.1/sys/dev/acpi_support/acpi_ibm.c Modified: stable/1.1/sys/dev/acpi_support/acpi_ibm.c =================================================================== --- stable/1.1/sys/dev/acpi_support/acpi_ibm.c 2019-10-18 16:13:38 UTC (rev 12271) +++ stable/1.1/sys/dev/acpi_support/acpi_ibm.c 2019-10-18 16:16:05 UTC (rev 12272) @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: stable/10/sys/dev/acpi_support/acpi_ibm.c 273847 2014-10-30 08:04:48Z hselasky $"); +__FBSDID("$FreeBSD: stable/11/sys/dev/acpi_support/acpi_ibm.c 300421 2016-05-22 13:58:32Z loos $"); /* * Driver for extra ACPI-controlled gadgets found on IBM ThinkPad laptops. @@ -40,6 +40,7 @@ #include "opt_acpi.h" #include +#include #include #include #include @@ -262,6 +263,37 @@ { NULL, 0, NULL, 0 } }; +/* + * Per-model default list of event mask. + */ +#define ACPI_IBM_HKEY_RFKILL_MASK (1 << 4) +#define ACPI_IBM_HKEY_DSWITCH_MASK (1 << 6) +#define ACPI_IBM_HKEY_BRIGHTNESS_UP_MASK (1 << 15) +#define ACPI_IBM_HKEY_BRIGHTNESS_DOWN_MASK (1 << 16) +#define ACPI_IBM_HKEY_SEARCH_MASK (1 << 18) +#define ACPI_IBM_HKEY_MICMUTE_MASK (1 << 26) +#define ACPI_IBM_HKEY_SETTINGS_MASK (1 << 28) +#define ACPI_IBM_HKEY_VIEWOPEN_MASK (1 << 30) +#define ACPI_IBM_HKEY_VIEWALL_MASK (1 << 31) + +struct acpi_ibm_models { + const char *maker; + const char *product; + uint32_t eventmask; +} acpi_ibm_models[] = { + { "LENOVO", "20BSCTO1WW", + ACPI_IBM_HKEY_RFKILL_MASK | + ACPI_IBM_HKEY_DSWITCH_MASK | + ACPI_IBM_HKEY_BRIGHTNESS_UP_MASK | + ACPI_IBM_HKEY_BRIGHTNESS_DOWN_MASK | + ACPI_IBM_HKEY_SEARCH_MASK | + ACPI_IBM_HKEY_MICMUTE_MASK | + ACPI_IBM_HKEY_SETTINGS_MASK | + ACPI_IBM_HKEY_VIEWOPEN_MASK | + ACPI_IBM_HKEY_VIEWALL_MASK + } +}; + ACPI_SERIAL_DECL(ibm, "ACPI IBM extras"); static int acpi_ibm_probe(device_t dev); @@ -355,7 +387,9 @@ static int acpi_ibm_attach(device_t dev) { + int i; struct acpi_ibm_softc *sc; + char *maker, *product; devclass_t ec_devclass; ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); @@ -446,8 +480,35 @@ /* Hook up light to led(4) */ if (sc->light_set_supported) - sc->led_dev = led_create_state(ibm_led, sc, "thinklight", sc->light_val); + sc->led_dev = led_create_state(ibm_led, sc, "thinklight", + (sc->light_val ? 1 : 0)); + /* Enable per-model events. */ + maker = getenv("smbios.system.maker"); + product = getenv("smbios.system.product"); + if (maker == NULL || product == NULL) + goto nosmbios; + + for (i = 0; i < nitems(acpi_ibm_models); i++) { + if (strcmp(maker, acpi_ibm_models[i].maker) == 0 && + strcmp(product, acpi_ibm_models[i].product) == 0) { + ACPI_SERIAL_BEGIN(ibm); + acpi_ibm_sysctl_set(sc, ACPI_IBM_METHOD_EVENTMASK, + acpi_ibm_models[i].eventmask); + ACPI_SERIAL_END(ibm); + } + } + +nosmbios: + freeenv(maker); + freeenv(product); + + /* Enable events by default. */ + ACPI_SERIAL_BEGIN(ibm); + acpi_ibm_sysctl_set(sc, ACPI_IBM_METHOD_EVENTS, 1); + ACPI_SERIAL_END(ibm); + + return (0); } @@ -531,7 +592,7 @@ int error = 0; int function; int method; - + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_ibm_softc *)oidp->oid_arg1; @@ -770,7 +831,6 @@ switch (method) { case ACPI_IBM_METHOD_EVENTS: - /* Events are disabled by default */ return (TRUE); case ACPI_IBM_METHOD_EVENTMASK: @@ -780,7 +840,7 @@ case ACPI_IBM_METHOD_BRIGHTNESS: case ACPI_IBM_METHOD_VOLUME: case ACPI_IBM_METHOD_MUTE: - /* EC is required here, which was aready checked before */ + /* EC is required here, which was already checked before */ return (TRUE); case ACPI_IBM_METHOD_THINKLIGHT: @@ -824,7 +884,7 @@ return (FALSE); case ACPI_IBM_METHOD_FANSPEED: - /* + /* * Some models report the fan speed in levels from 0-7 * Newer models report it contiguously */ @@ -835,7 +895,7 @@ case ACPI_IBM_METHOD_FANLEVEL: case ACPI_IBM_METHOD_FANSTATUS: - /* + /* * Fan status is only supported on those models, * which report fan RPM contiguously, not in levels */ @@ -872,10 +932,10 @@ for (int i = 0; i < 8; ++i) { temp_cmd[3] = '0' + i; - - /* + + /* * The TMPx methods seem to return +/- 128 or 0 - * when the respecting sensor is not available + * when the respecting sensor is not available */ if (ACPI_FAILURE(acpi_GetInteger(sc->ec_handle, temp_cmd, &temp[i])) || ABS(temp[i]) == 128 || temp[i] == 0) @@ -882,7 +942,7 @@ temp[i] = -1; else if (sc->thermal_updt_supported) /* Temperature is reported in tenth of Kelvin */ - temp[i] = (temp[i] - 2732 + 5) / 10; + temp[i] = (temp[i] - 2731 + 5) / 10; } error = sysctl_handle_opaque(oidp, &temp, 8*sizeof(int), req); @@ -1229,7 +1289,6 @@ for (;;) { acpi_GetInteger(acpi_get_handle(dev), IBM_NAME_EVENTS_GET, &event); - if (event == 0) break; From laffer1 at midnightbsd.org Fri Oct 18 12:18:49 2019 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Fri, 18 Oct 2019 12:18:49 -0400 (EDT) Subject: [Midnightbsd-cvs] src [12273] stable/1.1/UPDATING: document some improvements Message-ID: <201910181618.x9IGInHe051494@stargazer.midnightbsd.org> Revision: 12273 http://svnweb.midnightbsd.org/src/?rev=12273 Author: laffer1 Date: 2019-10-18 12:18:49 -0400 (Fri, 18 Oct 2019) Log Message: ----------- document some improvements Modified Paths: -------------- stable/1.1/UPDATING Modified: stable/1.1/UPDATING =================================================================== --- stable/1.1/UPDATING 2019-10-18 16:16:05 UTC (rev 12272) +++ stable/1.1/UPDATING 2019-10-18 16:18:49 UTC (rev 12273) @@ -1,5 +1,12 @@ Updating Information for MidnightBSD users. +20191018: + Update acpi ibm module to support some newer thinkpads. + + Fix a write error when running mdnsd on startup. We now + backup the nsswitch.conf file as nsswitch.conf.bak after modifying as well + in case there is an issue on the users system with it enabled. + 20190822: The kernel driver for /dev/midistat implements a handler for read(2). This handler is not thread-safe, and a multi-threaded program can From laffer1 at midnightbsd.org Fri Oct 18 12:19:58 2019 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Fri, 18 Oct 2019 12:19:58 -0400 (EDT) Subject: [Midnightbsd-cvs] src [12274] stable/1.1/sys/conf/newvers.sh: Bump MidnightBSD version to 1.1.3 Message-ID: <201910181619.x9IGJwSp051622@stargazer.midnightbsd.org> Revision: 12274 http://svnweb.midnightbsd.org/src/?rev=12274 Author: laffer1 Date: 2019-10-18 12:19:58 -0400 (Fri, 18 Oct 2019) Log Message: ----------- Bump MidnightBSD version to 1.1.3 Modified Paths: -------------- stable/1.1/sys/conf/newvers.sh Modified: stable/1.1/sys/conf/newvers.sh =================================================================== --- stable/1.1/sys/conf/newvers.sh 2019-10-18 16:18:49 UTC (rev 12273) +++ stable/1.1/sys/conf/newvers.sh 2019-10-18 16:19:58 UTC (rev 12274) @@ -32,7 +32,7 @@ # $MidnightBSD$ TYPE="MidnightBSD" -REVISION="1.1.2" +REVISION="1.1.3" RELEASE="${REVISION}" VERSION="${TYPE} ${RELEASE}" From laffer1 at midnightbsd.org Fri Oct 18 12:22:39 2019 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Fri, 18 Oct 2019 12:22:39 -0400 (EDT) Subject: [Midnightbsd-cvs] src [12275] release/1.1.3/: MidnightBSD 1.1.3 release Message-ID: <201910181622.x9IGMd8K052486@stargazer.midnightbsd.org> Revision: 12275 http://svnweb.midnightbsd.org/src/?rev=12275 Author: laffer1 Date: 2019-10-18 12:22:39 -0400 (Fri, 18 Oct 2019) Log Message: ----------- MidnightBSD 1.1.3 release Added Paths: ----------- release/1.1.3/ From laffer1 at midnightbsd.org Fri Oct 18 12:25:39 2019 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Fri, 18 Oct 2019 12:25:39 -0400 (EDT) Subject: [Midnightbsd-cvs] src [12276] release/1.1.2/: 1.1.2 Message-ID: <201910181625.x9IGPdFc053384@stargazer.midnightbsd.org> Revision: 12276 http://svnweb.midnightbsd.org/src/?rev=12276 Author: laffer1 Date: 2019-10-18 12:25:38 -0400 (Fri, 18 Oct 2019) Log Message: ----------- 1.1.2 Added Paths: ----------- release/1.1.2/ From laffer1 at midnightbsd.org Fri Oct 18 18:08:03 2019 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Fri, 18 Oct 2019 18:08:03 -0400 (EDT) Subject: [Midnightbsd-cvs] src [12277] stable/1.2/sys: remove debug stuff Message-ID: <201910182208.x9IM831f018728@stargazer.midnightbsd.org> Revision: 12277 http://svnweb.midnightbsd.org/src/?rev=12277 Author: laffer1 Date: 2019-10-18 18:08:02 -0400 (Fri, 18 Oct 2019) Log Message: ----------- remove debug stuff Modified Paths: -------------- stable/1.2/sys/amd64/conf/GENERIC stable/1.2/sys/i386/conf/GENERIC Modified: stable/1.2/sys/amd64/conf/GENERIC =================================================================== --- stable/1.2/sys/amd64/conf/GENERIC 2019-10-18 16:25:38 UTC (rev 12276) +++ stable/1.2/sys/amd64/conf/GENERIC 2019-10-18 22:08:02 UTC (rev 12277) @@ -71,15 +71,6 @@ # Debugging support. Always need this: options KDB # Enable kernel debugger support. #options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use this instead: -options DDB # Support DDB. -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel Modified: stable/1.2/sys/i386/conf/GENERIC =================================================================== --- stable/1.2/sys/i386/conf/GENERIC 2019-10-18 16:25:38 UTC (rev 12276) +++ stable/1.2/sys/i386/conf/GENERIC 2019-10-18 22:08:02 UTC (rev 12277) @@ -69,15 +69,6 @@ # Debugging support. Always need this: options KDB # Enable kernel debugger support. #options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use this instead: -options DDB # Support DDB. -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones # To make an SMP kernel, the next two lines are needed options SMP # Symmetric MultiProcessor Kernel