From owner-svn-src-head@freebsd.org Wed Nov 14 16:33:32 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5EAA112D874; Wed, 14 Nov 2018 16:33:31 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 091637E6DF; Wed, 14 Nov 2018 16:33:30 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wAEGXSJI036706; Wed, 14 Nov 2018 08:33:28 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wAEGXSsn036705; Wed, 14 Nov 2018 08:33:28 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201811141633.wAEGXSsn036705@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340426 - head/sys/dev/amdtemp In-Reply-To: <201811140450.wAE4oUWW043645@repo.freebsd.org> To: Conrad Meyer Date: Wed, 14 Nov 2018 08:33:28 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 091637E6DF X-Spamd-Result: default: False [0.22 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; NEURAL_HAM_MEDIUM(-0.28)[-0.277,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-0.24)[-0.242,0]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-0.02)[country: US(-0.10)]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; NEURAL_HAM_SHORT(-0.13)[-0.131,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Nov 2018 16:33:32 -0000 > Author: cem > Date: Wed Nov 14 04:50:29 2018 > New Revision: 340426 > URL: https://svnweb.freebsd.org/changeset/base/340426 > > Log: > amdtemp(4): Fix temperature reporting on AMD 2990WX > > Update the AMD family 17h temperature reporting based on AMD Tech Doc 56255 > OSRR, section 4.2.1. > > For CPUS w/CUR_TEMP_RANGE_SEL set, scale the reported temperature into the > range -49..206; i.e., subtract 49?C. > > Submitted by: gallatin@ > Reported by: bcran@ > Reviewed by: me (long ago) As per recent discussion on @developers, me@ is actually a valid committers name and should not be used to describe one self in commit messages. > MFC after: 22.57 seconds > Relnotes: yea I do not believe the relnotes processor understands slang. > Differential Revision: https://reviews.freebsd.org/D16855 > > Modified: > head/sys/dev/amdtemp/amdtemp.c > > Modified: head/sys/dev/amdtemp/amdtemp.c > ============================================================================== > --- head/sys/dev/amdtemp/amdtemp.c Wed Nov 14 03:42:39 2018 (r340425) > +++ head/sys/dev/amdtemp/amdtemp.c Wed Nov 14 04:50:29 2018 (r340426) > @@ -115,8 +115,15 @@ static struct amdtemp_product { > > /* > * Reported Temperature, Family 17h > + * > + * According to AMD OSRR for 17H, section 4.2.1, bits 31-21 of this register > + * provide the current temp. bit 19, when clear, means the temp is reported in > + * a range 0.."225C" (probable typo for 255C), and when set changes the range > + * to -49..206C. > */ > -#define AMDTEMP_17H_CUR_TMP 0x59800 > +#define AMDTEMP_17H_CUR_TMP 0x59800 > +#define AMDTEMP_17H_CUR_TMP_RANGE_SEL (1 << 19) > +#define AMDTEMP_17H_CUR_TMP_RANGE_OFF 490 > > /* > * Thermaltrip Status Register (Family 0Fh only) > @@ -595,13 +602,15 @@ static int32_t > amdtemp_gettemp17h(device_t dev, amdsensor_t sensor) > { > struct amdtemp_softc *sc = device_get_softc(dev); > - uint32_t temp; > + uint32_t temp, val; > int error; > > - error = amdsmn_read(sc->sc_smn, AMDTEMP_17H_CUR_TMP, &temp); > + error = amdsmn_read(sc->sc_smn, AMDTEMP_17H_CUR_TMP, &val); > KASSERT(error == 0, ("amdsmn_read")); > > - temp = ((temp >> 21) & 0x7ff) * 5 / 4; > + temp = ((val >> 21) & 0x7ff) * 5 / 4; > + if ((val & AMDTEMP_17H_CUR_TMP_RANGE_SEL) != 0) > + temp -= AMDTEMP_17H_CUR_TMP_RANGE_OFF; > temp += AMDTEMP_ZERO_C_TO_K + sc->sc_offset * 10; > > return (temp); > > -- Rod Grimes rgrimes@freebsd.org