Unverified Commit 356eda93 authored by Ilpo Järvinen's avatar Ilpo Järvinen
Browse files

Merge remote-tracking branch 'intel-speed-select/intel-sst' into review-ilpo 

Summary of change:
- Fix setting of TRL MSR after SST-TF is disabled in auto mode. Use
  correct units.
parents 4dea807f d8d4f57e

tools/power/x86/intel-speed-select/isst-config.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct process_cmd_struct { 
	int arg;

};



static const char *version_str = "v1.19";

static const char *version_str = "v1.20";



static const int supported_api_ver = 3;

static struct isst_if_platform_info isst_platform_info;

tools/power/x86/intel-speed-select/isst-core.c

+6 −0
Original line number Diff line number Diff line
@@ -283,6 +283,8 @@ int isst_set_trl(struct isst_id *id, unsigned long long trl) 
	return 0;

}



#define MSR_TRL_FREQ_MULTIPLIER		100



int isst_set_trl_from_current_tdp(struct isst_id *id, unsigned long long trl)

{

	unsigned long long msr_trl;
@@ -310,6 +312,10 @@ int isst_set_trl_from_current_tdp(struct isst_id *id, unsigned long long trl) 
		for (i = 0; i < 8; ++i) {

			unsigned long long _trl = trl[i];



			/* MSR is always in 100 MHz unit */

			if (isst_get_disp_freq_multiplier() == 1)

				_trl /= MSR_TRL_FREQ_MULTIPLIER;



			msr_trl |= (_trl << (i * 8));

		}

	}