From nobody Sun Feb 22 04:06:52 2026 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 4fJVmY16kBz6StM9 for ; Sun, 22 Feb 2026 04:06: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJVmX6Lvdz3WpJ for ; Sun, 22 Feb 2026 04:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771733212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c6SVp2jjQ7ubFD7zQ5+thqoDK/X6kxovn2JaetbgEGg=; b=YRiYxOkgzBtOaTHEFhB2etKM1ZR67qrE+UD2czNJpjV2owDwAn9bXq6Yz42A5iQDOCBIuh IDvcK0pH9W+YgSbgWUQ6zUmBLVcqGELkR/ZH92iM1O3JOJVKcoMwERwgoW5ugfbnsHKl2L kebNYaSm2klFZROoo0Y7ox7OBtWsRcQ7YOLE77hMv3HwmmvAMTwtr4tel6Uggo3z6nx/N3 zqCi5xw5dgYVJILJfPeFngYnvECtm9tIFOCCbCibaQS3trLENkKNQZGKIDqejlKjCGuTuj yqd231R/Cn49YTON7lzxsQQLTtEqGrigQOtAafJtbGCobXXWTIiIvV87WqxpGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771733212; a=rsa-sha256; cv=none; b=gOZzXs/PWWALea88yKe8vSbBgJvha/GeY7adQVUCFUXUpGwhoWg6Ar3la9ju8xQmDngVRD u2mnZhPfg7yn934hlPhhVUyFFKPGF8tRg2QuUgQYumGaXF3cjPB6+UvUs731GcGRZDRlEq CelBhMzx5hhUJnRDVkRIo05VxCFyhfQqP4kZNnhwBBiN3qo+df2bIczrzvVPmUzEddV8k5 SRdIU9nR4SHWmQcXcsfR29i5kYjtERqENCz4dh/d+YPljoHuyNgNovc055J0/AenW9YG6j bFuHKYh8zT01lFT7rh8ZQZjH48Gpp+kajgnyRjPYG64gsb3MH9kPu00ZmW/5tQ== 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=1771733212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c6SVp2jjQ7ubFD7zQ5+thqoDK/X6kxovn2JaetbgEGg=; b=c4jrwh2XTrEKBFyJC6x8e9XOnAjLiT/tKSq5rl+bZR/rjhV/MpEn+DzZW1AViaMktx+t0x 3fl2TQ1/LHLP+mQX0I9KDa3QjSWOJMH/jaMpJep16Erl2E9ELXLj2IJJXUaibY6eK8SK5Y xY1iGvgij99W9g4zstzWKQ6VjP9+DO+fmPVbH/Kro9Bd7JQfFHYdfIsCADLBiz++V/q8d2 Ob+U1Pc0UppRaeX0lhPskHMbeipjTJgrSV5anMREKomdw+i171TuWSKC8ds2Gg1YBqFwg+ Vy1mkKUZ1hsn6k7iVeFm8r0ttp4tx0ndMY87XH/Rosm75axoR2JhijwNSFUdfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVmX5s0qzCr0 for ; Sun, 22 Feb 2026 04:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24183 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:06:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Enji Cooper Subject: git: 75045de2ba9c - stable/14 - asmc: Add support for MacBookPro11,5 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 75045de2ba9ceb5a0aac534f477e5e9fc49d3e2b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:06:52 +0000 Message-Id: <699a80dc.24183.22dfd22f@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=75045de2ba9ceb5a0aac534f477e5e9fc49d3e2b commit 75045de2ba9ceb5a0aac534f477e5e9fc49d3e2b Author: Abdelkader Boudih AuthorDate: 2026-01-14 03:13:46 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:04:50 +0000 asmc: Add support for MacBookPro11,5 Add support for the MacBookPro11,5 (Mid 2015, 15-inch with AMD Radeon R9 M370X GPU) to the Apple SMC driver. Debug testing revealed this model lacks several SMC keys present on MacBookPro11,4 (IBLC, ICMC, IC2C), that model-specific sensor definitions. Differential Revision: https://reviews.freebsd.org/D54665 Reviewed by: adrian (cherry picked from commit c498eaa2f9090d7bdc6456181d8bf74869288bbb) --- sys/dev/asmc/asmc.c | 7 +++++++ sys/dev/asmc/asmcvar.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index aabbc3fbd0b0..c0fb342709a1 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -286,6 +286,13 @@ static const struct asmc_model asmc_models[] = { ASMC_MBP114_TEMPS, ASMC_MBP114_TEMPNAMES, ASMC_MBP114_TEMPDESCS }, + { + "MacBookPro11,5", + "Apple SMC MacBook Pro Retina Core i7 (mid 2015, 15-inch, AMD GPU)", + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS, + ASMC_MBP115_TEMPS, ASMC_MBP115_TEMPNAMES, ASMC_MBP115_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 b2fa62f8b6af..c5ef84519742 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -467,6 +467,41 @@ struct asmc_softc { "Pbus", "Ambient Light", "Leftside", "Rightside", "CPU Package Core", \ "CPU Package GPU", "CPU Package Total", "System Total", "DC In" } +/* MacBookPro11,5 - same as 11,4 but without IBLC, ICMC, and IC2C keys */ +#define ASMC_MBP115_TEMPS { "IC0C", "ID0R", "IHDC", "IPBR", "IC0R", \ + "IO3R", "IO5R", "IM0C", "IC1C", \ + "IC3C", "ILDC", "IAPC", "IHSC", \ + "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_MBP115_TEMPNAMES { "IC0C", "ID0R", "IHDC", "IPBR", "IC0R", \ + "IO3R", "IO5R", "IM0C", "IC1C", \ + "IC3C", "ILDC", "IAPC", "IHSC", \ + "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_MBP115_TEMPDESCS { "CPU High (CPU, I/O)", "DC In", "SSD", "Charger (BMON)", "CPU", \ + "Other 3.3V", "Other 5V", "Memory", "Platform Controller Hub Core", \ + "CPU DDR", "LCD Panel", "Airport", "Thunderbolt", \ + "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", \