svn commit: r340426 - head/sys/dev/amdtemp

[Rodney W. Grimes]

> 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 at freebsd.org