Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 116d0486 authored by Frank Myhr's avatar Frank Myhr Committed by Jean Delvare
Browse files

hwmon: (hwmon-vid) Add 6-bit vid codes for AMD NPT 0Fh cpus 

AMD NPT 0Fh cpus use 6 bit VID codes. Successive codes with msb 0
describe 25mV decrements, while those with msb 1 describe 12.5mV
decrements. Existing hwmon-vid.c is correct only for codes with msb 0;
add support for the codes with msb 1.

Ref:
p 309, Table 71
AMD Publication 32559, BIOS and Kernel Developer's Guide for AMD NPT Family 0Fh Processors
http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf



Signed-off-by: default avatarFrank Myhr <fmyhr@fhmtech.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 15872212

drivers/hwmon/hwmon-vid.c

+8 −10
Original line number Diff line number Diff line
@@ -37,18 +37,14 @@ 
 * For VRD 10.0 and up, "VRD x.y Design Guide",

 * available at http://developer.intel.com/.

 *

 * AMD NPT 0Fh (Athlon64 & Opteron), AMD Publication 32559,

 * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf

 * Table 71. VID Code Voltages

 * AMD Opteron processors don't follow the Intel specifications.

 * I'm going to "make up" 2.4 as the spec number for the Opterons.

 * No good reason just a mnemonic for the 24x Opteron processor

 * series.

 *

 * Opteron VID encoding is:

 *    00000  =  1.550 V

 *    00001  =  1.525 V

 *     . . . .

 *    11110  =  0.800 V

 *    11111  =  0.000 V (off)

 *

 * The 17 specification is in fact Intel Mobile Voltage Positioning -

 * (IMVP-II). You can find more information in the datasheet of Max1718

 * http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2452
@@ -98,9 +94,11 @@ int vid_from_reg(int val, u8 vrm) 
		if (val < 0x02 || val > 0xb2)

			return 0;

		return((1600000 - (val - 2) * 6250 + 500) / 1000);

	case 24:                /* Opteron processor */

		val &= 0x1f;

		return(val == 0x1f ? 0 : 1550 - val * 25);



	case 24:		/* AMD NPT 0Fh (Athlon64 & Opteron) */

		val &= 0x3f;

		return (val < 32) ? 1550 - 25 * val

			: 775 - (25 * (val - 31)) / 2;



	case 91:		/* VRM 9.1 */

	case 90:		/* VRM 9.0 */