From nobody Wed May 04 15:33:53 2022 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 E81A21AB5B90; Wed, 4 May 2022 15:33:53 +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 4Ktgpn3WMqz3vlJ; Wed, 4 May 2022 15:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651678433; 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=qbP2Sx0ZgGL4j8K5DsyxQiJNm8b8SgpcVwMUwgVhBpY=; b=FuobgRFv3RB/qE/W288CwHex+RFkbwwYxmcyEamBzOoexmjw9rd19fbqHwzLuTlWFEXh6C +s87MMe55tQNIP9GxCm8XEkdIS7BFMR8iy0B2D7s1otrVo12Ktw42/b6G1W0ocGikM8tjz nOgjqDXAQNjaklNJA4EOz5d3l6q1YPXXU8sV0w8Cr1kKf9WHJZ4IDA07lxNe0+cAPSWjLQ 3JnP0mY3MqGQpftkouBQFYqY4+Zu5nC9kF72YhfpVl3l4PNF687tvxPKTEOC/YU8FKWXLZ DbgkMjFVMOM52SU7PChHHf3ArKYW218Crd9c2jW9L6leMy5mxuK0qjh4rxvgGA== 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 3FB1115877; Wed, 4 May 2022 15:33:53 +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 244FXr30046302; Wed, 4 May 2022 15:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 244FXrdf046301; Wed, 4 May 2022 15:33:53 GMT (envelope-from git) Date: Wed, 4 May 2022 15:33:53 GMT Message-Id: <202205041533.244FXrdf046301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 79291c9baf7d - main - asmc: Add support for MacBook Pro 9,1 (mid 2012) 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79291c9baf7d5a3f97cbd87894137df4ef157cc7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651678433; 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=qbP2Sx0ZgGL4j8K5DsyxQiJNm8b8SgpcVwMUwgVhBpY=; b=MUAdOuuUXsRt30tAazchHac6IKzoaHaHFsfr8tJk9XztZBQFzx/9Cz4LLcigZTvgJ9821D dC4ew4HHO4wlj4pc3Jt01AOkIaS32bR+4OP7szQviNgN1mk51l6fdVl0fRPKkxA4E8cuUy zchRY8wcY/xO9zOzGGz5nelMdXWcKpXPg/3G9QFqqo93M78tG5Bqzp/v+GVIPM7d0QPd+8 4/nfFFuhvl/EV+tXoC42OczDiitV/CA7KPaDOuSMhkfdwc/6/dmim+SVIqhxGdDsM15xjf mcpuEeEDD56SwaHlJ9Cqe+zaBS5qXstGDKgxSicBO94D24CezZ7NYUnj0ekweg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651678433; a=rsa-sha256; cv=none; b=v4X25KpOR14e0KySi+lMPnqA0J3TRQkv6S7pii4l7e9gPUjbViJ1kHVddvU27Ov4ZJCFyd vCp0u1L9UmN3nFojwMM47x2Knlw9jLr8j49N4J4vKapg8KfH5+1eG4P39lJOrQ693zdL6i WuroFFI99YWKkzbg7HK/j/yGDCy9QpcOh/4QMstGE/sXMNx4GoEMTRymRacRVI67aQbHy8 ljOZNPLma6s/G2Fr6BHgXDbNvIH7zorbFDew6PyqEEyc9u7JS6OdbS9pCrwAtFNGi8ZrJZ PeCuI5qlLUnDGivdkrSwyY9TLHxASHQAMANHP72FRobDN9nz4QpIIahUCa9Xdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=79291c9baf7d5a3f97cbd87894137df4ef157cc7 commit 79291c9baf7d5a3f97cbd87894137df4ef157cc7 Author: Daniel W. Delâtre AuthorDate: 2022-05-04 14:51:18 +0000 Commit: Mark Johnston CommitDate: 2022-05-04 15:31:01 +0000 asmc: Add support for MacBook Pro 9,1 (mid 2012) PR: 261981 MFC after: 2 weeks --- sys/dev/asmc/asmc.c | 10 ++++++++-- sys/dev/asmc/asmcvar.h | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 912e8b3a0a64..60c04a566088 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -239,9 +239,15 @@ static const struct asmc_model asmc_models[] = { }, { - "MacBookPro9,2", "Apple SMC MacBook Pro (mid 2012)", + "MacBookPro9,1", "Apple SMC MacBook Pro (mid 2012, 15-inch)", ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, - ASMC_MBP9_TEMPS, ASMC_MBP9_TEMPNAMES, ASMC_MBP9_TEMPDESCS + ASMC_MBP91_TEMPS, ASMC_MBP91_TEMPNAMES, ASMC_MBP91_TEMPDESCS + }, + + { + "MacBookPro9,2", "Apple SMC MacBook Pro (mid 2012, 13-inch)", + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, + ASMC_MBP92_TEMPS, ASMC_MBP92_TEMPNAMES, ASMC_MBP92_TEMPDESCS }, { diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index d55259122132..47550fb7691e 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -271,19 +271,49 @@ struct asmc_softc { "TMBS", "TP0P", "TPCD", "TW0P", "Th1H", \ "Th2H", "Tm0P", "Ts0P", "Ts0S" } -#define ASMC_MBP9_TEMPS { "Ts0P", "Ts0S", "TA0P", "TB1T", "TB2T", \ +#define ASMC_MBP91_TEMPS { "TA0P", "TB0T", "TB1T", "TB2T", "TC0E", \ + "TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \ + "TC4C", "TCGC", "TCSA", "TCXC", "TG0D", \ + "TG0P", "TG1D", "TG1F", "TG1d", "TGTC", \ + "TGTD", "TM0P", "TM0S", "TP0P", "TPCD", \ + "Th1H", "Th2H", "Ts0P", "Ts0S", "Tsqf", NULL } + +#define ASMC_MBP91_TEMPNAMES { "ambient", "enclosure_bottom_1", "enclosure_bottom_2", \ + "enclosure_bottom_3", "cpu_die_peci_0", "cpu_die_peci_1", \ + "cpu_proximity", "cpu_core_1", "cpu_core_2", "cpu_core_3", \ + "cpu_core_4", "intel_gpu", "cpu_sys_agent", \ + "cpu_core_peci", "gpu_analog", \ + "gpu_proximity", "geforce_gpu_digital", "tg1f", \ + "gpu_2_die", "tgtc", "tgtd", "memory_proximity", \ + "mem_bank_a1", "platform_ctrl_hub", "pch_digital", \ + "main_heatsink_r", "main_heatsink_l", "palm_rest", \ + "bottom_skin", "tsqf" } + +#define ASMC_MBP91_TEMPDESCS { "Ambient", "Enclosure Bottom 1", "Enclosure Bottom 2", \ + "Enclosure Bottom 3", "CPU Die PECI 0", "CPU Die PECI 1", \ + "CPU Proximity", "CPU Core 1", "CPU Core 2", \ + "CPU Core 3", "CPU Core 4", "Intel GPU", \ + "CPU System Agent Core", "CPU Core - PECI", \ + "GPU Die - Analog", "GPU Proximity", \ + "GeForce GPU Die - Digital", "TG1F", "GPU 2 Die" \ + "TGTC", "TGTD", "Memory Proximity", \ + "Memory Bank A1", "Platform Controller Hub", "PCH Die - Digital", \ + "Main Heatsink Right", "Main Heatsink Left", "Palm Rest", \ + "Bottom Skin", "Tsqf" } + +#define ASMC_MBP92_TEMPS { "Ts0P", "Ts0S", "TA0P", "TB1T", "TB2T", \ "TB0T", "TC1C", "TC2C", "TC0E", "TC0F", \ "TC0J", "TC0P", "TCFC", "TCGC", "TCSA", \ "TCTD", "TCXC", "TG1D", "TM0P", "TM0S", \ "TPCD", NULL } -#define ASMC_MBP9_TEMPNAMES { "Ts0P", "Ts0S", "TA0P", "TB1T", "TB2T", \ +#define ASMC_MBP92_TEMPNAMES { "Ts0P", "Ts0S", "TA0P", "TB1T", "TB2T", \ "TB0T", "TC1C", "TC2C", "TC0E", "TC0F", \ "TC0J", "TC0P", "TCFC", "TCGC", "TCSA", \ "TCTD", "TCXC", "TG1D", "TM0P", "TM0S", \ "TPCD" } -#define ASMC_MBP9_TEMPDESCS { "Palm Rest", "Memory Proximity", "Airflow 1", \ +#define ASMC_MBP92_TEMPDESCS { "Palm Rest", "Memory Proximity", "Airflow 1", \ "Battery 1", "Battery 2", "Battery TS_MAX", \ "CPU Core 1", "CPU Core 2", "CPU1", "CPU1", \ "TC0J", "CPU 1 Proximity", "TCFC", \