From nobody Mon Aug 08 13:55:40 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 4M1d583nlWz4Y3H7; Mon, 8 Aug 2022 13:55:40 +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 4M1d583LhFz3sJw; Mon, 8 Aug 2022 13:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659966940; 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=Fgd+50AWlWnGZAIokh8Re9lIcdynHot6szqD9WENnrc=; b=Z4YLPXdqaQKVKTdtT6wXD6woEM3wFmCY+4GUUXM1nW8zbYYnLjYLOOdJyWJne8uZC7KjQx 1iWL27gunSEAWSYEcuQK/eRoZt/zPq28PPJ4e/Hb8/LmBhvwHCBttKBxbP03ndusjD0nSw R/ObHM3tBfaZ3ARN9qfHi6y/pzweK7L4LHVCOpYUMot54eMDb7Nxzkp3tak3wEc91hVx3j 07jvaMsr1jqp0dg4mbjvLgE5ZqkNmNbCJIk5LGKlVkWnEZq97Jy3Cc8eqPYCtIF7kchtf9 wrkht0CDPhhLyY7mitH8IkwL4lAygKBHLQl4flwtiabx8wOJhO7v7v1+8yQLSQ== 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 4M1d582J5nztrm; Mon, 8 Aug 2022 13:55:40 +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 278DteHp074559; Mon, 8 Aug 2022 13:55:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 278Dtepn074558; Mon, 8 Aug 2022 13:55:40 GMT (envelope-from git) Date: Mon, 8 Aug 2022 13:55:40 GMT Message-Id: <202208081355.278Dtepn074558@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: 00a59bf122d9 - stable/13 - asmc: Add support for MacBookPro6,2 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: 00a59bf122d9ceb0d5847be9b465a9e684624e77 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659966940; 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=Fgd+50AWlWnGZAIokh8Re9lIcdynHot6szqD9WENnrc=; b=r8Cv8xcjCKGLNql4Qe7HuzFMVKApO1gaqi93RhAUEsyGFp6RMWFU+0xkTnDNKWPnwfHAIe FkrffDX6NvBZaajFzfUzvRAK0GtvyInoMDyzs7IaxBI5eo1IOCFiWE9OuACKcCFjH7YCIB vxTPOstpiTf8jwGSbQGNsE5wr28F6/XaxZd9I3icvmW8c7mgzZx1sXhVG4SGGZVrwJY3gd +dC0nQWDTGrxqAeLbbIZ2UPEnpDYR3xMpsITbkfMtxl2vndNws5IEYk0gqYSUgECTYM4Zt okwGuCtEsntqJq1hB84C5uFDkio9TKTWLGqSLRA345yuO+6+1cu/JJhEzprzSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659966940; a=rsa-sha256; cv=none; b=v7rgcfM6HsKdQD6AGSQgKY9bE0Gg5Awtd2+zG2F8AuoKFjldrJNlTUgx8jRrokZheEOWRZ zvy3UQKrGmT+JmaoPf8wJ6tIVD0SS8GslquLpb5ZIxP3cGBAbrCzzCiz0py2ynhyfZ42t8 20KGdtn4tReYZEZsdH0yLbWb1Ln26i0wYrJRafuG/j18VCzrjMEKyeqGso4juC10LsEx88 drViLj7rOaBXA9BJtZueoBt5v8PC2Iq3CFEEx704BeeVUI05FBgjfQDsAYw7lsbHZUCN2r pGXFO2o0un7Z1Jt3jknC6lDkJwPxMi/jZh9RJSXL/gFSKAVNmBt7oAoDISYFWQ== 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=00a59bf122d9ceb0d5847be9b465a9e684624e77 commit 00a59bf122d9ceb0d5847be9b465a9e684624e77 Author: ed crowe AuthorDate: 2022-07-25 15:35:46 +0000 Commit: Mark Johnston CommitDate: 2022-08-08 13:52:13 +0000 asmc: Add support for MacBookPro6,2 Modify asmc_sms_printintr() to be silent when the ambient light sensor interrupt fires on this model, since the messages can otherwise fill up the dmesg. PR: 265005 Reviewed by: markj (cherry picked from commit 3416f5cde7a7e01b25b5f5fd240ae8aa12fd70bf) --- sys/dev/asmc/asmc.c | 18 +++++++++++++++++- sys/dev/asmc/asmcvar.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 2e824602b98c..6b4030215605 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -226,6 +226,12 @@ static const struct asmc_model asmc_models[] = { ASMC_MBP5_TEMPS, ASMC_MBP5_TEMPNAMES, ASMC_MBP5_TEMPDESCS }, + { + "MacBookPro6,2", "Apple SMC MacBook Pro (Mid 2010, 15-inch)", + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, + ASMC_MBP62_TEMPS, ASMC_MBP62_TEMPNAMES, ASMC_MBP62_TEMPDESCS + }, + { "MacBookPro8,1", "Apple SMC MacBook Pro (early 2011, 13-inch)", ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS, @@ -1374,6 +1380,7 @@ asmc_sms_intrfast(void *arg) static void asmc_sms_printintr(device_t dev, uint8_t type) { + struct asmc_softc *sc = device_get_softc(dev); switch (type) { case ASMC_SMS_INTFF: @@ -1385,8 +1392,17 @@ asmc_sms_printintr(device_t dev, uint8_t type) case ASMC_SMS_INTSH: device_printf(dev, "WARNING: possible shock!\n"); break; + case ASMC_ALSL_INT2A: + /* + * This suppresses console and log messages for the ambient + * light sensor for the only model known to generate this + * interrupt. + */ + if (strcmp(sc->sc_model->smc_model, "MacBookPro6,2") == 0) + break; + /* FALLTHROUGH */ default: - device_printf(dev, "%s unknown interrupt\n", __func__); + device_printf(dev, "unknown interrupt: 0x%x\n", type); } } diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 533686d0c56b..769903701a99 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -109,6 +109,11 @@ struct asmc_softc { #define ASMC_SMS_INTHA 0x6f /* High Acceleration Interrupt */ #define ASMC_SMS_INTSH 0x80 /* Shock Interrupt */ +/* + * Light Sensor. + */ +#define ASMC_ALSL_INT2A 0x2a /* Ambient Light related Interrupt */ + /* * Keyboard backlight. */ @@ -232,6 +237,33 @@ struct asmc_softc { "Heatsink 2", "Memory Controller", \ "PCI Express Slot Pin", "PCI Express Slot (unk)" } +#define ASMC_MBP62_TEMPS { "TB0T", "TB1T", "TB2T", \ + "TC0C", "TC0D", "TC0P", \ + "TC1C", "TG0D", "TG0P", \ + "TG0T", "TMCD", "TP0P", \ + "TPCD", "Th1H", "Th2H", \ + "Tm0P", "Ts0P", "Ts0S" } + +#define ASMC_MBP62_TEMPNAMES { "enclosure_bottom_0", "enclosure_bottom_1", \ + "enclosure_bottom_2", "cpu0", \ + "cpu_diode", "cpu_proximity", \ + "cpu1", "gpu_diode", \ + "gpu_pin", "gpu_transistor", \ + "TMCD", "pch_controller_proximity", \ + "pch_die", "heatsink1", \ + "heatsink2", "memory-controller", \ + "palmrest", "memoryproximity" } + +#define ASMC_MBP62_TEMPDESCS { "Enclosure Bottom 0", "Enclosure Bottom 1", \ + "Enclosure Bottom 2", "CPU 0", \ + "CPU Diode", "CPU Proximity", \ + "CPU 1", "GPU Diode", \ + "GPU Pin", "GPU Transistor", \ + "TMCD", "PCH Controller Proximity", \ + "PCH Die", "Heat Sink 1", \ + "Heat Sink 2", "Memory Controller", \ + "Palm Rest", "Memory Proximity" } + #define ASMC_MBP81_TEMPS { "TB0T", "TB1T", "TB2T", "TC0C", "TC0D", \ "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \ "TCFC", "TCGC", "TCSA", "TM0S", "TMBS", \