From nobody Wed May 18 21:27:24 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 BC4BF1B303F0; Wed, 18 May 2022 21:27:25 +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 4L3R0F2lFvz4Z2L; Wed, 18 May 2022 21:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652909245; 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=ajXA0xxLdTyhLZf/ppZBTOPGBq6LMIS0xip/nBVjOlw=; b=DSS48DSDnDr14AIG7jBvFDhV3PNSa2F+FEj7FI8usePHsWN+IaOoBCxjxSMTbTxM8jLtqB DdBo3U++g7dxt446s3Ar0Qj7ZiAJlH2393sOqCCOlruVXpf112RdJpPnv2yMP3L2lmfTGP 5B8yW5LssjzeidiXYmu+QPKd9KcX/RWX6yq0Mk1n0JXYvksjQuWbRz05M5HF/nK8cqjN6f MUctTGPIrVEzIsTrmduvxvDufdmCWFKZrxrg8ccpL0KKkoJ2NUPgAv+MAokSV1ZME7+jxq Kfy0blv2xBpW2RMJGKidw2rmPTTOw9vcdpQCcC2NcaNOkTv+5zNCWEIUCQ1Sfw== 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 0BFD3108FB; Wed, 18 May 2022 21:27:25 +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 24ILROE9079429; Wed, 18 May 2022 21:27:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24ILROTF079428; Wed, 18 May 2022 21:27:24 GMT (envelope-from git) Date: Wed, 18 May 2022 21:27:24 GMT Message-Id: <202205182127.24ILROTF079428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4bb64770b30c - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4bb64770b30c006cdf609e1a2d99699f304ff7fa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652909245; 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=ajXA0xxLdTyhLZf/ppZBTOPGBq6LMIS0xip/nBVjOlw=; b=kX0S4zVI/0SxaHDZRKAwpQyyBYwatL06WtWE+r1gwRdi+tAP9UqmGm1xBf5g2RUOP5C+YF zY2XF4lbDhvkjiWkipt9TDSPzBxbHMRAxllNcIznARVRnzUVdY6QeY9NA1PMIqnLTRDp8Z impFS77qAlmKt+07nvf0Fh9PQOCUzXdQudP5yJFzq44fTdJCtCxpGJ3WzMMsU39sEcq2V+ SaMEftxA18PqwWpSyg8uXtt2gW3po0TlX8gr3CE+EY015OpLsOibuBh2gsM7eYVTzjkdf+ h2HZM3p1SAF1NghyozQ2tYrJ7bqqdY6UIU4myrDuIvOXKph4n3/xYcwOF4VxLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652909245; a=rsa-sha256; cv=none; b=DddKzUKfcF37deU0/niTFnaYgjqcs5fOEJlY+hjPj73UuqiTBYHWeM/RuizJF1WTmZ8roT 3KSqVAw5CUwnEjqL6ZoeZ1LhN1UKfZE/KPy/DccS82nxW5oBEvQuFdRPpULadCnYixs9A2 r56ayGRWMBcM7I53oANrZzFF2pQvNlaDkTokYlsOArTNCKs1DG7wt2WyfSyspoOBQ4pdbW FYOdGWDShM14qy8hbq7wuj1BMb6fXDCb0kQYd6rYoCThcCvyyLInhAFYFmnwOBSOg6xtmV u+Bnqsumka9d8ILnU7nOcMNFrmSHL9caD8Y7yb9RVv+JfOPb0ulYlB6TGkMJSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4bb64770b30c006cdf609e1a2d99699f304ff7fa commit 4bb64770b30c006cdf609e1a2d99699f304ff7fa Author: Daniel W. Delâtre AuthorDate: 2022-05-04 14:51:18 +0000 Commit: Mark Johnston CommitDate: 2022-05-18 21:15:53 +0000 asmc: Add support for MacBook Pro 9,1 (mid 2012) PR: 261981 (cherry picked from commit 79291c9baf7d5a3f97cbd87894137df4ef157cc7) --- 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 7695b05a4ae1..c70479b47822 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", \