Date: Tue, 24 Jan 2023 09:22:30 -0800 From: Adrian Chadd <adrian@freebsd.org> To: jrtc27@freebsd.org Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: ffc58e2ca365 - main - asmc: Add MacbookAir6,2 Message-ID: <CAJ-VmonRQcOntvy3OudTc3n%2BYyf7NqimLXEB-uhuX3jjjYNz7w@mail.gmail.com> In-Reply-To: <B3B9337C-9E8A-4EFB-8133-5F75CA5C7163@freebsd.org> References: <202301210443.30L4hnw4015211@gitrepo.freebsd.org> <B3B9337C-9E8A-4EFB-8133-5F75CA5C7163@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000620ac005f305c38e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable yeah i meant markj, but i was sick and tired and somehow my brain crossed streams. sorry! -a On Fri, 20 Jan 2023 at 21:55, Jessica Clarke <jrtc27@freebsd.org> wrote: > On 21 Jan 2023, at 04:43, Adrian Chadd <adrian@FreeBSD.org> wrote: > > > > The branch main has been updated by adrian: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dffc58e2ca36546d866bb6bd36a3aa8f= 762a01663 > > > > commit ffc58e2ca36546d866bb6bd36a3aa8f762a01663 > > Author: Adrian Chadd <adrian@FreeBSD.org> > > AuthorDate: 2023-01-21 04:34:31 +0000 > > Commit: Adrian Chadd <adrian@FreeBSD.org> > > CommitDate: 2023-01-21 04:34:31 +0000 > > > > asmc: Add MacbookAir6,2 > > > > Add in the zones for my MacbookAir6,2, a 2013 Macbook Air. > > > > Tested - said Macbook Air 2013. Thermal Zones and keyboard backligh= t > > control works fine. > > > > Differential Revision: https://reviews.freebsd.org/D38073 > > Approved by: jrtc27 > > Uh this is the first I=E2=80=99m hearing of this patch? > > Jess > > > --- > > sys/dev/asmc/asmc.c | 9 +++++++-- > > sys/dev/asmc/asmcvar.h | 25 +++++++++++++++++++++++++ > > 2 files changed, 32 insertions(+), 2 deletions(-) > > > > diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c > > index bec0054e2dd7..337f641e4513 100644 > > --- a/sys/dev/asmc/asmc.c > > +++ b/sys/dev/asmc/asmc.c > > @@ -427,7 +427,13 @@ static const struct asmc_model asmc_models[] =3D { > > ASMC_LIGHT_FUNCS, > > ASMC_MBA5_TEMPS, ASMC_MBA5_TEMPNAMES, ASMC_MBA5_TEMPDESCS > > }, > > - > > + { > > + "MacBookAir6,2", "Apple SMC MacBook Air 13-inch (Early 2013)", > > + ASMC_SMS_FUNCS_DISABLED, > > + ASMC_FAN_FUNCS2, > > + ASMC_LIGHT_FUNCS, > > + ASMC_MBA6_TEMPS, ASMC_MBA6_TEMPNAMES, ASMC_MBA6_TEMPDESCS > > + }, > > { > > "MacBookAir7,1", "Apple SMC MacBook Air 11-inch (Early 2015)", > > ASMC_SMS_FUNCS_DISABLED, > > @@ -435,7 +441,6 @@ static const struct asmc_model asmc_models[] =3D { > > ASMC_LIGHT_FUNCS, > > ASMC_MBA7_TEMPS, ASMC_MBA7_TEMPNAMES, ASMC_MBA7_TEMPDESCS > > }, > > - > > { > > "MacBookAir7,2", "Apple SMC MacBook Air 13-inch (Early 2015)", > > ASMC_SMS_FUNCS_DISABLED, > > diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h > > index a594710f1cbe..9db544a1450d 100644 > > --- a/sys/dev/asmc/asmcvar.h > > +++ b/sys/dev/asmc/asmcvar.h > > @@ -773,6 +773,31 @@ struct asmc_softc { > > "Ta0P", "Heatpipe", "Mainboard Proximit= y > 1", "Mainboard Proximity 2", \ > > "Palm Rest", "Memory Proximity" } > > > > +/* > > + * TODO: validate the temp zones for MBA 6.x ! > > + */ > > +#define ASMC_MBA6_TEMPS { "TB0T", "TB1T", "TB2T", \ > > + "TC0E", "TC0F", "TC0P", \ > > + "TC1C", "TC2C", "TCGC", "TCSA", \ > > + "TCXC", "THSP", "TM0P", "TPCD", \ > > + "Ta0P", "Th1H", "Tm0P", \ > > + "Ts0P", "Ts0S", NULL } > > + > > +#define ASMC_MBA6_TEMPNAMES { "enclosure1", "enclosure2", > "enclosure3", \ > > + "cputemp1", "cputemp2", "cpuproximity",= \ > > + "cpucore1", "cpucore2", "cpupeci", > "pecisa", \ > > + "TCXC", "THSP", "memorybank", "pchdie",= \ > > + "Ta0P", "heatpipe", > "mainboardproximity1", \ > > + "palmrest", "memoryproximity" } > > + > > +#define ASMC_MBA6_TEMPDESCS { "Enclosure Bottom 1", "Enclosur= e > Bottom 2", "Enclosure Bottom 3", \ > > + "CPU Temp 1", "CPU Temp 2", "CPU > Proximity", \ > > + "CPU Core 1", "CPU Core 2", "CPU Peci > Core", "PECI SA", \ > > + "TCXC", "THSP", "Memory Bank A", "PCH > Die", \ > > + "Ta0P", "Heatpipe", "Mainboard Proximit= y > 1", \ > > + "Palm Rest", "Memory Proximity" } > > + > > + > > #define ASMC_MBA7_TEMPS { "TB0T", "TB1T", "TB2T", \ > > "TC0E", "TC0F", "TC0P", \ > > "TC1C", "TC2C", \ > > --000000000000620ac005f305c38e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr">yeah i meant markj, but i was sick and tired and somehow m= y brain crossed streams.<div><br></div><div>sorry!</div><div><br></div><div= ><br></div><div>-a</div><div><br></div></div><br><div class=3D"gmail_quote"= ><div dir=3D"ltr" class=3D"gmail_attr">On Fri, 20 Jan 2023 at 21:55, Jessic= a Clarke <<a href=3D"mailto:jrtc27@freebsd.org">jrtc27@freebsd.org</a>&g= t; wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0p= x 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On 21 = Jan 2023, at 04:43, Adrian Chadd <adrian@FreeBSD.org> wrote:<br> > <br> > The branch main has been updated by adrian:<br> > <br> > URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3Dffc58e2ca365= 46d866bb6bd36a3aa8f762a01663" rel=3D"noreferrer" target=3D"_blank">https://= cgit.FreeBSD.org/src/commit/?id=3Dffc58e2ca36546d866bb6bd36a3aa8f762a01663<= /a><br> > <br> > commit ffc58e2ca36546d866bb6bd36a3aa8f762a01663<br> > Author:=C2=A0 =C2=A0 =C2=A0Adrian Chadd <adrian@FreeBSD.org><br> > AuthorDate: 2023-01-21 04:34:31 +0000<br> > Commit:=C2=A0 =C2=A0 =C2=A0Adrian Chadd <adrian@FreeBSD.org><br> > CommitDate: 2023-01-21 04:34:31 +0000<br> > <br> >=C2=A0 =C2=A0 asmc: Add MacbookAir6,2<br> > <br> >=C2=A0 =C2=A0 Add in the zones for my MacbookAir6,2, a 2013 Macbook Air= .<br> > <br> >=C2=A0 =C2=A0 Tested - said Macbook Air 2013.=C2=A0 Thermal Zones and k= eyboard backlight<br> >=C2=A0 =C2=A0 control works fine.<br> > <br> >=C2=A0 =C2=A0 Differential Revision: <a href=3D"https://reviews.freebsd= .org/D38073" rel=3D"noreferrer" target=3D"_blank">https://reviews.freebsd.o= rg/D38073</a><br> >=C2=A0 =C2=A0 Approved by: jrtc27<br> <br> Uh this is the first I=E2=80=99m hearing of this patch?<br> <br> Jess<br> <br> > ---<br> > sys/dev/asmc/asmc.c=C2=A0 =C2=A0 |=C2=A0 9 +++++++--<br> > sys/dev/asmc/asmcvar.h | 25 +++++++++++++++++++++++++<br> > 2 files changed, 32 insertions(+), 2 deletions(-)<br> > <br> > diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c<br> > index bec0054e2dd7..337f641e4513 100644<br> > --- a/sys/dev/asmc/asmc.c<br> > +++ b/sys/dev/asmc/asmc.c<br> > @@ -427,7 +427,13 @@ static const struct asmc_model asmc_models[] =3D = {<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ASMC_LIGHT_FUNCS,<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ASMC_MBA5_TEMPS, ASMC_MBA5_TEMPNAMES,= ASMC_MBA5_TEMPDESCS<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0},<br> > -<br> > +=C2=A0 =C2=A0 =C2=A0{<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0"MacBookAir6,2", "Apple SMC= MacBook Air 13-inch (Early 2013)",<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0ASMC_SMS_FUNCS_DISABLED,<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0ASMC_FAN_FUNCS2,<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0ASMC_LIGHT_FUNCS,<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0ASMC_MBA6_TEMPS, ASMC_MBA6_TEMPNAMES, ASMC= _MBA6_TEMPDESCS<br> > +=C2=A0 =C2=A0 =C2=A0},<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0{<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"MacBookAir7,1", "Appl= e SMC MacBook Air 11-inch (Early 2015)",<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ASMC_SMS_FUNCS_DISABLED,<br> > @@ -435,7 +441,6 @@ static const struct asmc_model asmc_models[] =3D {= <br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ASMC_LIGHT_FUNCS,<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ASMC_MBA7_TEMPS, ASMC_MBA7_TEMPNAMES,= ASMC_MBA7_TEMPDESCS<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0},<br> > -<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0{<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"MacBookAir7,2", "Appl= e SMC MacBook Air 13-inch (Early 2015)",<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ASMC_SMS_FUNCS_DISABLED,<br> > diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h<br> > index a594710f1cbe..9db544a1450d 100644<br> > --- a/sys/dev/asmc/asmcvar.h<br> > +++ b/sys/dev/asmc/asmcvar.h<br> > @@ -773,6 +773,31 @@ struct asmc_softc {<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"Ta0P", "Hea= tpipe", "Mainboard Proximity 1", "Mainboard Proximity 2= ", \<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"Palm Rest", &quo= t;Memory Proximity" }<br> > <br> > +/*<br> > + * TODO: validate the temp zones for MBA 6.x !<br> > + */<br> > +#define=C2=A0 =C2=A0 =C2=A0 ASMC_MBA6_TEMPS=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0{ "TB0T", "TB1T", "TB2T", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"TC0E", "TC0F"= ;, "TC0P", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"TC1C", "TC2C"= ;, "TCGC", "TCSA", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"TCXC", "THSP"= ;, "TM0P", "TPCD", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"Ta0P", "Th1H"= ;, "Tm0P", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"Ts0P", "Ts0S"= ;, NULL }<br> > +<br> > +#define=C2=A0 =C2=A0 =C2=A0 ASMC_MBA6_TEMPNAMES=C2=A0 =C2=A0 =C2=A0{ = "enclosure1", "enclosure2", "enclosure3", \<b= r> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"cputemp1", "cpute= mp2", "cpuproximity", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"cpucore1", "cpuco= re2", "cpupeci", "pecisa", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"TCXC", "THSP"= ;, "memorybank", "pchdie", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"Ta0P", "heatpipe&= quot;, "mainboardproximity1", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"palmrest", "memor= yproximity" }<br> > +<br> > +#define=C2=A0 =C2=A0 =C2=A0 ASMC_MBA6_TEMPDESCS=C2=A0 =C2=A0 =C2=A0{ = "Enclosure Bottom 1", "Enclosure Bottom 2", "Enclo= sure Bottom 3", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"CPU Temp 1", "CPU= Temp 2", "CPU Proximity", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"CPU Core 1", "CPU= Core 2", "CPU Peci Core", "PECI SA", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"TCXC", "THSP"= ;, "Memory Bank A", "PCH Die", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"Ta0P", "Heatpipe&= quot;, "Mainboard Proximity 1", \<br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"Palm Rest", "Memo= ry Proximity" }<br> > +<br> > +<br> > #define=C2=A0 =C2=A0 =C2=A0 =C2=A0ASMC_MBA7_TEMPS=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0{ "TB0T", "TB1T", "TB2T", \<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"TC0E", "TC0= F", "TC0P", \<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"TC1C", "TC2= C", \<br> <br> </blockquote></div> --000000000000620ac005f305c38e--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ-VmonRQcOntvy3OudTc3n%2BYyf7NqimLXEB-uhuX3jjjYNz7w>