From nobody Fri Sep 20 11:39:54 2024 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 4X99RG3pXYz5Wf69; Fri, 20 Sep 2024 11:39:54 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X99RG2zX8z4lZX; Fri, 20 Sep 2024 11:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726832394; 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=NVjCYLxyi/q2UGyfYDGaVjMOLpGIABpy8CnLJRsAOu4=; b=lCAYs4LXhwy2+9v+nR/TMfcwrm8wKKTGdjUjD+59RvEZI4xMETcPCWv8JUriLZknDWa5l4 cmIMk04qoT6F1srVO7kgL3BXUb4R4z418/9fFiRQh6RF9dRrxP8m/tsmVWJBA3loZWtg4i 7mTFLFP3j7FLSqwfmAnPoJYJJqkl5dgx6IV9i0Yi0u5dt9IEm/XxPx8At84wDHST9F7Zhb iiBPBe5qZdYavKO7H/hGvGMhI4y7SsyprIJWXL9LD9cj/Eka98FGxjCjNMH5Ac8yZF479D TBzngf5bTnTn571gL+ximsKVY4GIbCpnVkZvVTcXa6fhueyl90RpilG0Aj+nPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726832394; a=rsa-sha256; cv=none; b=SMu8lbgqMKUyz5h7s/r4BQaxFcSdHVfGJqt+tWL1m9IKsQ44boq+g1TXUGYuLWosm6jiTP ZOaSiLsTOrXOsf6Y4Irkb2p81iY1jFzL1mqt0GvXbVioluVHMT/xWnaV0cplUo5kJ5/SFT dcm6PYhouxqkOEEUd8rUUx7Bp6DM4eYYOxTUR+Uwhr1Wg+3wYhSTCvrhhfdFMG2sdFvTfs SUKlkFr8h+MYlToC0D+ozh3rL6ptZ/1E0sWy2DfqqujcNLEgzCxtZpHdxspx5WJBDFC7vY /JFGkUxAIzdq/7vF0xgGnoablk6fLsm5pqRtM9MO7P28yWaHHRz+P083FSFYPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726832394; 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=NVjCYLxyi/q2UGyfYDGaVjMOLpGIABpy8CnLJRsAOu4=; b=u4dW3Obq8ekaOyd7gMMuBkzJKkazINcDDiDnn0LguK67Nd8u7WseQe00cVcOqarZ5BgB3x wiGYveOazQwrHthGmjl5dRJP91pDkGHACEBqHbi+amLRuftG+vD/UV6C4CzvMQBcmGMPqb KdEgGKan5Ozw2cXybUym6ypCuSLUb+We9h/QH3bDsLNWpueJ9oKJ8y1hzVqc7VnHI8IcXM Wd12nKIagPWQuranElm4l9+PZYPjjlVihJWb1Drvtwd+hOVcI95mysQXwr0YC19fJNGgbZ A7mhRFNzcLZphwvnxIjN2VWqUPheHJW8KAkn8A6nhmanNeRYnm9431Lc+iYRRg== 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 4X99RG2Zwtznpq; Fri, 20 Sep 2024 11:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48KBdsB1004251; Fri, 20 Sep 2024 11:39:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KBds63004248; Fri, 20 Sep 2024 11:39:54 GMT (envelope-from git) Date: Fri, 20 Sep 2024 11:39:54 GMT Message-Id: <202409201139.48KBds63004248@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: 9512710ddf33 - stable/14 - asmc: Add support for MacbookPro11,4 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 9512710ddf33c49dd0f9c387393866306225efc3 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9512710ddf33c49dd0f9c387393866306225efc3 commit 9512710ddf33c49dd0f9c387393866306225efc3 Author: Joshua Rogers AuthorDate: 2024-06-11 19:51:51 +0000 Commit: Mark Johnston CommitDate: 2024-09-20 11:39:16 +0000 asmc: Add support for MacbookPro11,4 Signed-off-by: Joshua Rogers MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1366 (cherry picked from commit 49a5fe1a017fc179c79b74f409440e070511a0ab) --- sys/dev/asmc/asmc.c | 6 ++++++ sys/dev/asmc/asmcvar.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index cd13fba72e98..3c63e959fc9f 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -279,6 +279,12 @@ static const struct asmc_model asmc_models[] = { ASMC_MBP113_TEMPS, ASMC_MBP113_TEMPNAMES, ASMC_MBP113_TEMPDESCS }, + { + "MacBookPro11,4", "Apple SMC MacBook Pro Retina Core i7 (mid 2015, 15-inch)", + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, + ASMC_MBP114_TEMPS, ASMC_MBP114_TEMPNAMES, ASMC_MBP114_TEMPDESCS + }, + /* The Mac Mini has no SMS */ { "Macmini1,1", "Apple SMC Mac Mini", diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 42e3120ff4ff..73a8fc449c2c 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -432,6 +432,40 @@ struct asmc_softc { "TM0S", "TP0P", "TPCD", "TW0P", "Ta0P", \ "TaSP", "Th1H", "Th2H", "Ts0P", "Ts0S", \ "Ts1S" } + +#define ASMC_MBP114_TEMPS { "IC0C", "ID0R", "IHDC", "IPBR", "IC0R", \ + "IO3R", "IO5R", "IM0C", "IC1C", "IC2C", \ + "IC3C", "ILDC", "IBLC", "IAPC", "IHSC", \ + "ICMC", "TC0P", "TP0P", "TM0P", \ + "Ta0P", "Th2H", "Th1H", "TW0P", "Ts0P", \ + "Ts1P", "TB0T", "TB1T", "TB2T", "TH0A", "TH0B", \ + "TC1C", "TC2C", "TC3C", "TC4C", "TCXC", \ + "TCGC", "TPCD", "TCSA", "VC0C", "VD0R", \ + "VP0R", "ALSL", "F0Ac", "F1Ac", "PCPC", \ + "PCPG", "PCPT", "PSTR", "PDTR", NULL } + +#define ASMC_MBP114_TEMPNAMES { "IC0C", "ID0R", "IHDC", "IPBR", "IC0R", \ + "IO3R", "IO5R", "IM0C", "IC1C", "IC2C", \ + "IC3C", "ILDC", "IBLC", "IAPC", "IHSC", \ + "ICMC", "TC0P", "TP0P", "TM0P", \ + "Ta0P", "Th2H", "Th1H", "TW0P", "Ts0P", \ + "Ts1P", "TB0T", "TB1T", "TB2T", "TH0A", "TH0B", \ + "TC1C", "TC2C", "TC3C", "TC4C", "TCXC", \ + "TCGC", "TPCD", "TCSA", "VC0C", "VD0R", \ + "VP0R", "ALSL", "F0Ac", "F1Ac", "PCPC", \ + "PCPG", "PCPT", "PSTR", "PDTR" } + +#define ASMC_MBP114_TEMPDESCS { "CPU High (CPU, I/O)", "DC In", "SSD", "Charger (BMON)", "CPU", \ + "Other 3.3V", "Other 5V", "Memory", "Platform Controller Hub Core", "CPU Load Current Monitor", \ + "CPU DDR", "LCD Panel", "LCD Backlight", "Airport", "Thunderbolt", \ + "S2", "CPU Proximity", "Platform Controller Hub", "Memory Proximity", "Air Flow Proximity", \ + "Left Fin Stack", "Right Fin Stack", "Airport Proximity", "Palm Rest", "Palm Rest Actuator", \ + "Battery Max", "Battery Sensor 1", "Battery Sensor 2", "SSD A", "SSD B", \ + "CPU Core 1", "CPU Core 2", "CPU Core 3", "CPU Core 4", "CPU PECI Die", \ + "Intel GPU", "Platform Controller Hub PECI", "CPU System Agent Core", "CPU VCore", "DC In", \ + "Pbus", "Ambient Light", "Leftside", "Rightside", "CPU Package Core", \ + "CPU Package GPU", "CPU Package Total", "System Total", "DC In" } + #define ASMC_MM_TEMPS { "TN0P", "TN1P", NULL } #define ASMC_MM_TEMPNAMES { "northbridge1", "northbridge2" } #define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \