From nobody Sat Apr 25 16:29:54 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 4g2wKG3n0yz6bm1T for ; Sat, 25 Apr 2026 16:29: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2wKG1kFDz44NZ for ; Sat, 25 Apr 2026 16:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777134594; 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=Ujbyd6wc6FLran1GQMaF0PauL7FD8dfls6NoHoFJH/w=; b=EqozO7cBt3be6h7gkDjVi6HT7eWWErOZXkjldNpFti/vUSbArA2cac1mOEmVVdaM8/mP+s Z2pBts/Z/7R6cIZvq1NcWQNXHZxVST/FksJWUkAvwsksoPbudlqkHMogv3RzGyVn5VVpr0 zh7FGdcT3w7Wvy+lNJyhfZFDY3/o9Nvoye0Scl7f88d69E+Gqxpd828MhuJ6aEkCeZ9Exx 3rhKeYLhaqa/lUAxIfqw1TR4aLSeiDQv7+OoShczK/OYo+mbc+5Ty5VsossyEDiyY/CpYl m+kpg1U9e14Dr8Ea5jib/qguIxxj2y1Zy5x5r0xsB3W9/6FPce4XJDPdYucRlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777134594; a=rsa-sha256; cv=none; b=N1ey3Mm0EVduwxPpJCU0rMWToMgxylIPnTvzl1xzcZAeKCYXdSO5TkQfWAlQYcW2ayxt4m iI3Pon8sGAElm3aQGPBE4znsSbSmZgBjqxcGAmJ40nkJgXlP2RNRi2wmulJmlYclsU98sc KN7sxkJU1zyw0s4ApgEWdnDatfI7b67/CtVYzCKOFotOZYtnx8QrzW7lbzybg8n+L8py01 HHrwJjeKqsQEJ+ntAIylUUlTISIlkxLGb9Jhose0nc9uSrm8o7eWWLHUp/VoOK5rY+3ZNt SblwIJELe8nuegoqzF5Oy4v+Xp2lJOzsE40+qQkyXur516APksVn0Zth+E2eyw== 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=1777134594; 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=Ujbyd6wc6FLran1GQMaF0PauL7FD8dfls6NoHoFJH/w=; b=sH3tMbdOPvF6cGzyzySnQIOvvDuAlss72o/9NTilXg3G8xk13/eS6O0lD+jd5VpQZ77+/x OSeMRlWjtRSPMdNDlXpoV3opdMonts3W+D55kzp7S20FNJJsYZ8GoCW3KPMfp3xH4AhAbj /8DCGLz/TbSvcx6No1OM80gPYiz0/deIzHDTucd1Oor3Nl4vShwXmmzd89shr9Hw+tlYvu YmQAwxdV076hNAv6lgyoUpYvpZhveKGA9UFWUOvFTsdEewsyO3VuXjeY13occXqm0qirin Lru5WkzZE6oDOQcLCayfr1ZfGYvJoI+XTJhGXXpoh5B1xjuKi4YxkSumKUkUMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2wKG1KS8zhZW for ; Sat, 25 Apr 2026 16:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 433dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 16:29:54 +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: 3c4d1f5f81e8 - stable/15 - asmc: Add MacPro3,1 temperature sensor support 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/15 X-Git-Reftype: branch X-Git-Commit: 3c4d1f5f81e82b641413af58dc88cf2c47378b30 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 16:29:54 +0000 Message-Id: <69ecec02.433dd.6cf28e4@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=3c4d1f5f81e82b641413af58dc88cf2c47378b30 commit 3c4d1f5f81e82b641413af58dc88cf2c47378b30 Author: Abdelkader Boudih AuthorDate: 2026-02-15 01:44:50 +0000 Commit: Enji Cooper CommitDate: 2026-04-25 16:29:40 +0000 asmc: Add MacPro3,1 temperature sensor support Test and verified with Sonicblue7 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D54952 (cherry picked from commit 90d79dd549461dac053b34d47ae32968afb2834c) --- sys/dev/asmc/asmc.c | 9 +++++++ sys/dev/asmc/asmcvar.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index a2357f873ccc..be5b4b9ca911 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -417,6 +417,15 @@ static const struct asmc_model asmc_models[] = { ASMC_MP1_TEMPS, ASMC_MP1_TEMPNAMES, ASMC_MP1_TEMPDESCS }, + /* Idem for the Mac Pro (Early 2008) */ + { + "MacPro3,1", "Apple SMC Mac Pro (Early 2008)", + NULL, NULL, NULL, + ASMC_FAN_FUNCS, + NULL, NULL, NULL, + ASMC_MP31_TEMPS, ASMC_MP31_TEMPNAMES, ASMC_MP31_TEMPDESCS + }, + /* Idem for the Mac Pro (8-core) */ { "MacPro2", "Apple SMC Mac Pro (8-core)", diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index d216fd1416e4..5afc1012849c 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -764,6 +764,75 @@ struct asmc_softc { "Power Supply, Location 2", \ "Tv0S", "Tv1S", } +#define ASMC_MP31_TEMPS { "TA0P", \ + "TC0C", "TC0D", "TC0P", \ + "TC1C", "TC1D", \ + "TC2C", "TC2D", \ + "TC3C", "TC3D", \ + "TCAG", "TCAH", "TCBG", "TCBH", \ + "TH0P", "TH1P", "TH2P", "TH3P", \ + "TM0P", "TM0S", "TM1P", "TM1S", \ + "TM2P", "TM2S", "TM3S", \ + "TM8P", "TM8S", "TM9P", "TM9S", \ + "TMAP", "TMAS", "TMBS", \ + "TN0C", "TN0D", "TN0H", \ + "TS0C", \ + "Tp0C", "Tp1C", \ + "Tv0S", "Tv1S", NULL } + +#define ASMC_MP31_TEMPNAMES { "ambient", \ + "cpu_core0", "cpu_diode0", "cpu_a_proximity", \ + "cpu_core1", "cpu_diode1", \ + "cpu_core2", "cpu_diode2", \ + "cpu_core3", "cpu_diode3", \ + "cpu_a_pkg", "cpu_a_heatsink", \ + "cpu_b_pkg", "cpu_b_heatsink", \ + "hdd_bay0", "hdd_bay1", \ + "hdd_bay2", "hdd_bay3", \ + "mem_riser_a_prox0", "mem_riser_a_slot0", \ + "mem_riser_a_prox1", "mem_riser_a_slot1", \ + "mem_riser_a_prox2", "mem_riser_a_slot2", \ + "mem_riser_a_slot3", \ + "mem_riser_b_prox0", "mem_riser_b_slot0", \ + "mem_riser_b_prox1", "mem_riser_b_slot1", \ + "mem_riser_b_prox2", "mem_riser_b_slot2", \ + "mem_riser_b_slot3", \ + "northbridge_core", "northbridge_diode", \ + "northbridge_heatsink", \ + "expansion_slots", \ + "power_supply0", "power_supply1", \ + "vrm0", "vrm1", } + +#define ASMC_MP31_TEMPDESCS { "Ambient Air", \ + "CPU Core 1", "CPU Diode 1", \ + "CPU A Proximity", \ + "CPU Core 2", "CPU Diode 2", \ + "CPU Core 3", "CPU Diode 3", \ + "CPU Core 4", "CPU Diode 4", \ + "CPU A Package", "CPU A Heatsink", \ + "CPU B Package", "CPU B Heatsink", \ + "Hard Drive Bay 1", "Hard Drive Bay 2", \ + "Hard Drive Bay 3", "Hard Drive Bay 4", \ + "Memory Riser A, Proximity 1", \ + "Memory Riser A, Slot 1", \ + "Memory Riser A, Proximity 2", \ + "Memory Riser A, Slot 2", \ + "Memory Riser A, Proximity 3", \ + "Memory Riser A, Slot 3", \ + "Memory Riser A, Slot 4", \ + "Memory Riser B, Proximity 1", \ + "Memory Riser B, Slot 1", \ + "Memory Riser B, Proximity 2", \ + "Memory Riser B, Slot 2", \ + "Memory Riser B, Proximity 3", \ + "Memory Riser B, Slot 3", \ + "Memory Riser B, Slot 4", \ + "Northbridge Core", "Northbridge Diode", \ + "Northbridge Heatsink", \ + "Expansion Slots", \ + "Power Supply 1", "Power Supply 2", \ + "VRM 1", "VRM 2", } + #define ASMC_MP2_TEMPS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \