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

Commit 0d44b2ba authored by Rafa Bilski's avatar Rafa Bilski Committed by Dave Jones
Browse files

[CPUFREQ] Longhaul - Remove duplicate tables 



Now there is no need to depend on -1 in Nehemiah tables. After
previous change code is eliminating multipliers lower then 5.0
by minmult for Nehemiah A and B.

Signed-off-by: default avatarRafa³ Bilski <rafalbilski@interia.pl>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 980342a7

arch/i386/kernel/cpu/cpufreq/longhaul.c

+5 −7
Original line number Diff line number Diff line
@@ -617,24 +617,22 @@ static int __init longhaul_cpu_init(struct cpufreq_policy *policy) 
	case 9:

		longhaul_version = TYPE_POWERSAVER;

		numscales = 32;

		memcpy(clock_ratio,

		       nehemiah_clock_ratio,

		       sizeof(nehemiah_clock_ratio));

		memcpy(eblcr_table, nehemiah_eblcr, sizeof(nehemiah_eblcr));

		switch (c->x86_mask) {

		case 0 ... 1:

			cpu_model = CPU_NEHEMIAH;

			cpuname = "C3 'Nehemiah A' [C5N]";

			memcpy (clock_ratio, nehemiah_a_clock_ratio, sizeof(nehemiah_a_clock_ratio));

			memcpy (eblcr_table, nehemiah_a_eblcr, sizeof(nehemiah_a_eblcr));

			break;

		case 2 ... 4:

			cpu_model = CPU_NEHEMIAH;

			cpuname = "C3 'Nehemiah B' [C5N]";

			memcpy (clock_ratio, nehemiah_b_clock_ratio, sizeof(nehemiah_b_clock_ratio));

			memcpy (eblcr_table, nehemiah_b_eblcr, sizeof(nehemiah_b_eblcr));

			break;

		case 5 ... 15:

			cpu_model = CPU_NEHEMIAH_C;

			cpuname = "C3 'Nehemiah C' [C5N]";

			memcpy (clock_ratio, nehemiah_c_clock_ratio, sizeof(nehemiah_c_clock_ratio));

			memcpy (eblcr_table, nehemiah_c_eblcr, sizeof(nehemiah_c_eblcr));

			break;

		}

		break;

arch/i386/kernel/cpu/cpufreq/longhaul.h

+6 −147
Original line number Diff line number Diff line
@@ -235,84 +235,14 @@ static int __initdata ezrat_eblcr[32] = { 
/*

 * VIA C3 Nehemiah */



static int __initdata nehemiah_a_clock_ratio[32] = {

static int __initdata  nehemiah_clock_ratio[32] = {

	100, /* 0000 -> 10.0x */

	160, /* 0001 -> 16.0x */

	-1,  /* 0010 ->  RESERVED */

	90,  /* 0011 ->  9.0x */

	95,  /* 0100 ->  9.5x */

	-1,  /* 0101 ->  RESERVED */

	-1,  /* 0110 ->  RESERVED */

	55,  /* 0111 ->  5.5x */

	60,  /* 1000 ->  6.0x */

	70,  /* 1001 ->  7.0x */

	80,  /* 1010 ->  8.0x */

	50,  /* 1011 ->  5.0x */

	65,  /* 1100 ->  6.5x */

	75,  /* 1101 ->  7.5x */

	85,  /* 1110 ->  8.5x */

	120, /* 1111 -> 12.0x */

	100, /* 0000 -> 10.0x */

	-1,  /* 0001 -> RESERVED */

	120, /* 0010 -> 12.0x */

	90,  /* 0011 ->  9.0x */

	105, /* 0100 -> 10.5x */

	115, /* 0101 -> 11.5x */

	125, /* 0110 -> 12.5x */

	135, /* 0111 -> 13.5x */

	140, /* 1000 -> 14.0x */

	150, /* 1001 -> 15.0x */

	160, /* 1010 -> 16.0x */

	130, /* 1011 -> 13.0x */

	145, /* 1100 -> 14.5x */

	155, /* 1101 -> 15.5x */

	-1,  /* 1110 -> RESERVED (13.0x) */

	120, /* 1111 -> 12.0x */

};



static int __initdata  nehemiah_b_clock_ratio[32] = {

	100, /* 0000 -> 10.0x */

	160, /* 0001 -> 16.0x */

	-1,  /* 0010 ->  RESERVED */

	90,  /* 0011 ->  9.0x */

	95,  /* 0100 ->  9.5x */

	-1,  /* 0101 ->  RESERVED */

	-1,  /* 0110 ->  RESERVED */

	55,  /* 0111 ->  5.5x */

	60,  /* 1000 ->  6.0x */

	70,  /* 1001 ->  7.0x */

	80,  /* 1010 ->  8.0x */

	50,  /* 1011 ->  5.0x */

	65,  /* 1100 ->  6.5x */

	75,  /* 1101 ->  7.5x */

	85,  /* 1110 ->  8.5x */

	120, /* 1111 -> 12.0x */

	100, /* 0000 -> 10.0x */

	110, /* 0001 -> 11.0x */

	120, /* 0010 -> 12.0x */

	90,  /* 0011 ->  9.0x */

	105, /* 0100 -> 10.5x */

	115, /* 0101 -> 11.5x */

	125, /* 0110 -> 12.5x */

	135, /* 0111 -> 13.5x */

	140, /* 1000 -> 14.0x */

	150, /* 1001 -> 15.0x */

	160, /* 1010 -> 16.0x */

	130, /* 1011 -> 13.0x */

	145, /* 1100 -> 14.5x */

	155, /* 1101 -> 15.5x */

	-1,  /* 1110 -> RESERVED (13.0x) */

	120, /* 1111 -> 12.0x */

};



static int __initdata  nehemiah_c_clock_ratio[32] = {

	100, /* 0000 -> 10.0x */

	160, /* 0001 -> 16.0x */

	40,  /* 0010 ->  RESERVED */

	40,  /* 0010 ->  4.0x */

	90,  /* 0011 ->  9.0x */

	95,  /* 0100 ->  9.5x */

	-1,  /* 0101 ->  RESERVED */

	45,  /* 0110 ->  RESERVED */

	45,  /* 0110 ->  4.5x */

	55,  /* 0111 ->  5.5x */

	60,  /* 1000 ->  6.0x */

	70,  /* 1001 ->  7.0x */
@@ -340,84 +270,14 @@ static int __initdata nehemiah_c_clock_ratio[32] = { 
	120, /* 1111 -> 12.0x */

};



static int __initdata nehemiah_a_eblcr[32] = {

	50,  /* 0000 ->  5.0x */

	160, /* 0001 -> 16.0x */

	-1,  /* 0010 ->  RESERVED */

	100, /* 0011 -> 10.0x */

	55,  /* 0100 ->  5.5x */

	-1,  /* 0101 ->  RESERVED */

	-1,  /* 0110 ->  RESERVED */

	95,  /* 0111 ->  9.5x */

	90,  /* 1000 ->  9.0x */

	70,  /* 1001 ->  7.0x */

	80,  /* 1010 ->  8.0x */

	60,  /* 1011 ->  6.0x */

	120, /* 1100 -> 12.0x */

	75,  /* 1101 ->  7.5x */

	85,  /* 1110 ->  8.5x */

	65,  /* 1111 ->  6.5x */

	90,  /* 0000 ->  9.0x */

	-1,  /* 0001 -> RESERVED */

	120, /* 0010 -> 12.0x */

	100, /* 0011 -> 10.0x */

	135, /* 0100 -> 13.5x */

	115, /* 0101 -> 11.5x */

	125, /* 0110 -> 12.5x */

	105, /* 0111 -> 10.5x */

	130, /* 1000 -> 13.0x */

	150, /* 1001 -> 15.0x */

	160, /* 1010 -> 16.0x */

	140, /* 1011 -> 14.0x */

	120, /* 1100 -> 12.0x */

	155, /* 1101 -> 15.5x */

	-1,  /* 1110 -> RESERVED (13.0x) */

	145 /* 1111 -> 14.5x */

   /* end of table  */

};

static int __initdata nehemiah_b_eblcr[32] = {

	50,  /* 0000 ->  5.0x */

	160, /* 0001 -> 16.0x */

	-1,  /* 0010 ->  RESERVED */

	100, /* 0011 -> 10.0x */

	55,  /* 0100 ->  5.5x */

	-1,  /* 0101 ->  RESERVED */

	-1,  /* 0110 ->  RESERVED */

	95,  /* 0111 ->  9.5x */

	90,  /* 1000 ->  9.0x */

	70,  /* 1001 ->  7.0x */

	80,  /* 1010 ->  8.0x */

	60,  /* 1011 ->  6.0x */

	120, /* 1100 -> 12.0x */

	75,  /* 1101 ->  7.5x */

	85,  /* 1110 ->  8.5x */

	65,  /* 1111 ->  6.5x */

	90,  /* 0000 ->  9.0x */

	110, /* 0001 -> 11.0x */

	120, /* 0010 -> 12.0x */

	100, /* 0011 -> 10.0x */

	135, /* 0100 -> 13.5x */

	115, /* 0101 -> 11.5x */

	125, /* 0110 -> 12.5x */

	105, /* 0111 -> 10.5x */

	130, /* 1000 -> 13.0x */

	150, /* 1001 -> 15.0x */

	160, /* 1010 -> 16.0x */

	140, /* 1011 -> 14.0x */

	120, /* 1100 -> 12.0x */

	155, /* 1101 -> 15.5x */

	-1,  /* 1110 -> RESERVED (13.0x) */

	145 /* 1111 -> 14.5x */

	   /* end of table  */

};

static int __initdata nehemiah_c_eblcr[32] = {

static int __initdata nehemiah_eblcr[32] = {

	50,  /* 0000 ->  5.0x */

	160, /* 0001 -> 16.0x */

	40,  /* 0010 ->  RESERVED */

	40,  /* 0010 ->  4.0x */

	100, /* 0011 -> 10.0x */

	55,  /* 0100 ->  5.5x */

	-1,  /* 0101 ->  RESERVED */

	45,  /* 0110 ->  RESERVED */

	45,  /* 0110 ->  4.5x */

	95,  /* 0111 ->  9.5x */

	90,  /* 1000 ->  9.0x */

	70,  /* 1001 ->  7.0x */
@@ -443,7 +303,6 @@ static int __initdata nehemiah_c_eblcr[32] = { 
	155, /* 1101 -> 15.5x */

	-1,  /* 1110 -> RESERVED (13.0x) */

	145 /* 1111 -> 14.5x */

	  /* end of table  */

};



/*