View | Details | Raw Unified | Return to bug 6124
Collapse All | Expand All

(-)a/arch/i386/kernel/powernow-k8.c~ (-23 / +22 lines)
Lines 203-231 Link Here
203
	return 0;
203
	return 0;
204
}
204
}
205
205
206
/* Change the fid and vid, by the 3 phases. */
207
static inline int transition_fid_vid(u32 reqfid, u32 reqvid)
208
{
209
	if (core_voltage_pre_transition(reqvid))
210
		return 1;
211
	if (core_frequency_transition(reqfid))
212
		return 1;
213
	if (core_voltage_post_transition(reqvid))
214
		return 1;
215
	if (query_current_values_with_pending_wait())
216
		return 1;
217
218
	if ((reqfid != currfid) || (reqvid != currvid)) {
219
		printk(KERN_ERR PFX "failed: req %x %x, curr %x %x\n",
220
		       reqfid, reqvid, currfid, currvid);
221
		return 1;
222
	}
223
224
	dprintk(KERN_INFO PFX
225
		"transitioned: new fid %x, vid %x\n", currfid, currvid);
226
	return 0;
227
}
228
229
/* Phase 1 - core voltage transition ... setup voltage */
206
/* Phase 1 - core voltage transition ... setup voltage */
230
static inline int core_voltage_pre_transition(u32 reqvid)
207
static inline int core_voltage_pre_transition(u32 reqvid)
231
{
208
{
Lines 390-395 Link Here
390
		currfid, currvid);
367
		currfid, currvid);
391
	return 0;
368
	return 0;
392
}
369
}
370
/* Change the fid and vid, by the 3 phases. */
371
static inline int transition_fid_vid(u32 reqfid, u32 reqvid)
372
{
373
	if (core_voltage_pre_transition(reqvid))
374
		return 1;
375
	if (core_frequency_transition(reqfid))
376
		return 1;
377
	if (core_voltage_post_transition(reqvid))
378
		return 1;
379
	if (query_current_values_with_pending_wait())
380
		return 1;
381
382
	if ((reqfid != currfid) || (reqvid != currvid)) {
383
		printk(KERN_ERR PFX "failed: req %x %x, curr %x %x\n",
384
		       reqfid, reqvid, currfid, currvid);
385
		return 1;
386
	}
387
388
	dprintk(KERN_INFO PFX
389
		"transitioned: new fid %x, vid %x\n", currfid, currvid);
390
	return 0;
391
}
393
392
394
static inline int check_supported_cpu(void)
393
static inline int check_supported_cpu(void)
395
{
394
{

Return to bug 6124