From nobody Sat Jan 21 04:43:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NzNzp0K4dz30yw2; Sat, 21 Jan 2023 04:43:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NzNzn6Q5Pz3DD8; Sat, 21 Jan 2023 04:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674276229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56DF2E2BN0TxLyCZX5AYJLZahMUI8qzkEMOX0FnUQnM=; b=b1q50SznWUYnZgEj6ZQ6swtlUFmnbxLKfVcnpTh3MI30i63wDDH+yKNoix08QypHIBI83K lzMR4HlL68SuJpZc9jn1DswQVTu++sSXxQTuHABsWaRA9Xg7twUIm1eVAEq++DZxj4EUTD WukjGc45TsSDHQRVlYgWornVhugEVeiTnJIrLptfFwERkZeVO5P1Y9AcBgxGPl2TfZCAOY dcgfVEr8cin5rHYwGnUKBb5U1W81jslobj9eHFwbbJZHhDmmy6YXdPpnMojr0j+5DEzAlY IvkK4Lvy//aGcH5rTvXecrnnsX/cD3rjewRlFhz8+wIEMoEmnbSMQc18/9/C8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674276229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56DF2E2BN0TxLyCZX5AYJLZahMUI8qzkEMOX0FnUQnM=; b=YoXlVURgSHkgj6AbF5zFiO6Cz3zMrzoASa6h+fKw5kKtp+1aBiiA3QjrKAx0mFxTBZBwe2 g54zE12xctKVJ30RhU/8JVenY7CXwpEmBzSBVJdI5IXn8Cox+l8KfmgGZMhWrMtFWD8K6U VZ50FkcaDtniV9eXZhhmisyFgsdHFEkLlIH7Rjz6sKMVhatn2CWzZ98spLjLk/n7QwkDzC /sNhKAt2khiXqTatGSMPcKp9h27pU3GyakvtcpxTN/Gt9qcYO7wu/Bahe0hBU8+KkTD2zV Am5mHeEN9yNORMNn5dAZBEI2UcApUFwxMMCe9OjGbTDGRqyRKQ7vbzz/+a3kiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674276229; a=rsa-sha256; cv=none; b=kte8tDm4LQ67BxpUxsM1cx5BlkEKdM6YZo+AQa/a7RfkOIAC2vCjwpC1MWQmZntGUVEJbY OGlWMmcLMqRgqzkdzIXopf7dMQtHyreXja31yfhdIQUWrsFsZ6k/30GIEcOMlD0/20eD4y 63QWf2VcPxz5L0NmNguuoYhOyJ49wx5OTGBMWEdoq0u9lA4UEvJ7CxnIS3IvutVuwcwVQP w0CB3avFK482iIfPu3w8PFKCk9lTFw7s7vWDb3ywtqfMLsyF4/ar3skU22ibEKk0jzi7fd a2SHCd6mavMiwsvaWSAhVR+Ab0rym6mh7DATelVUmjardkWfaScy/t3jFE4dRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NzNzn5TD3zxmp; Sat, 21 Jan 2023 04:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30L4hntg015212; Sat, 21 Jan 2023 04:43:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30L4hnw4015211; Sat, 21 Jan 2023 04:43:49 GMT (envelope-from git) Date: Sat, 21 Jan 2023 04:43:49 GMT Message-Id: <202301210443.30L4hnw4015211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: ffc58e2ca365 - main - asmc: Add MacbookAir6,2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffc58e2ca36546d866bb6bd36a3aa8f762a01663 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=ffc58e2ca36546d866bb6bd36a3aa8f762a01663 commit ffc58e2ca36546d866bb6bd36a3aa8f762a01663 Author: Adrian Chadd AuthorDate: 2023-01-21 04:34:31 +0000 Commit: Adrian Chadd CommitDate: 2023-01-21 04:34:31 +0000 asmc: Add MacbookAir6,2 Add in the zones for my MacbookAir6,2, a 2013 Macbook Air. Tested - said Macbook Air 2013. Thermal Zones and keyboard backlight control works fine. Differential Revision: https://reviews.freebsd.org/D38073 Approved by: jrtc27 --- sys/dev/asmc/asmc.c | 9 +++++++-- sys/dev/asmc/asmcvar.h | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index bec0054e2dd7..337f641e4513 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -427,7 +427,13 @@ static const struct asmc_model asmc_models[] = { ASMC_LIGHT_FUNCS, ASMC_MBA5_TEMPS, ASMC_MBA5_TEMPNAMES, ASMC_MBA5_TEMPDESCS }, - + { + "MacBookAir6,2", "Apple SMC MacBook Air 13-inch (Early 2013)", + ASMC_SMS_FUNCS_DISABLED, + ASMC_FAN_FUNCS2, + ASMC_LIGHT_FUNCS, + ASMC_MBA6_TEMPS, ASMC_MBA6_TEMPNAMES, ASMC_MBA6_TEMPDESCS + }, { "MacBookAir7,1", "Apple SMC MacBook Air 11-inch (Early 2015)", ASMC_SMS_FUNCS_DISABLED, @@ -435,7 +441,6 @@ static const struct asmc_model asmc_models[] = { ASMC_LIGHT_FUNCS, ASMC_MBA7_TEMPS, ASMC_MBA7_TEMPNAMES, ASMC_MBA7_TEMPDESCS }, - { "MacBookAir7,2", "Apple SMC MacBook Air 13-inch (Early 2015)", ASMC_SMS_FUNCS_DISABLED, diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index a594710f1cbe..9db544a1450d 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -773,6 +773,31 @@ struct asmc_softc { "Ta0P", "Heatpipe", "Mainboard Proximity 1", "Mainboard Proximity 2", \ "Palm Rest", "Memory Proximity" } +/* + * TODO: validate the temp zones for MBA 6.x ! + */ +#define ASMC_MBA6_TEMPS { "TB0T", "TB1T", "TB2T", \ + "TC0E", "TC0F", "TC0P", \ + "TC1C", "TC2C", "TCGC", "TCSA", \ + "TCXC", "THSP", "TM0P", "TPCD", \ + "Ta0P", "Th1H", "Tm0P", \ + "Ts0P", "Ts0S", NULL } + +#define ASMC_MBA6_TEMPNAMES { "enclosure1", "enclosure2", "enclosure3", \ + "cputemp1", "cputemp2", "cpuproximity", \ + "cpucore1", "cpucore2", "cpupeci", "pecisa", \ + "TCXC", "THSP", "memorybank", "pchdie", \ + "Ta0P", "heatpipe", "mainboardproximity1", \ + "palmrest", "memoryproximity" } + +#define ASMC_MBA6_TEMPDESCS { "Enclosure Bottom 1", "Enclosure Bottom 2", "Enclosure Bottom 3", \ + "CPU Temp 1", "CPU Temp 2", "CPU Proximity", \ + "CPU Core 1", "CPU Core 2", "CPU Peci Core", "PECI SA", \ + "TCXC", "THSP", "Memory Bank A", "PCH Die", \ + "Ta0P", "Heatpipe", "Mainboard Proximity 1", \ + "Palm Rest", "Memory Proximity" } + + #define ASMC_MBA7_TEMPS { "TB0T", "TB1T", "TB2T", \ "TC0E", "TC0F", "TC0P", \ "TC1C", "TC2C", \