Attachment #173900 for bug #212020

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




	hwpstate_set = sc->hwpstate_settings;
	for (i = 0; i < sc->cfnum; i++) {
		msr = rdmsr(MSR_AMD_10H_11H_CONFIG + i);
		if ((msr & ((uint64_t)1 << 63)) == 0) {
			HWPSTATE_DEBUG(dev, "msr is not valid.\n");
			return (ENXIO);
		}
		did = AMD_10H_11H_CUR_DID(msr);
		fid = AMD_10H_11H_CUR_FID(msr);
		/* fid/did to frequency */
		switch(family) {
		case 0x11:
			hwpstate_set[i].freq = (100 * (fid + 0x08)) >> did;
			hwpstate_set[i].freq = 100 * (fid + 0x08) / (1 << did);
			break;
		case 0x10:
		case 0x12:
		case 0x14:
		case 0x15:
		case 0x16:
			hwpstate_set[i].freq = (100 * (fid + 0x10)) >> did;
			break;
		default:
			HWPSTATE_DEBUG(dev, "get_info_from_msr: AMD family 0x%02x CPU's are not implemented yet. sorry.\n", family);
			return (ENXIO);
			break;
		}
		hwpstate_set[i].pstate_id = i;
		/* There was volts calculation, but deleted it. */




pn_identify(driver_t *driver, device_t parent)
{

	if ((amd_pminfo & AMDPM_FID) == 0 || (amd_pminfo & AMDPM_VID) == 0) {
		printf("powernow: pn_identify: amd_pminfo=0x%04x .\n", amd_pminfo);
		return;
	}
	switch (cpu_id & 0xf00) {
	case 0x600:
	case 0xf00:
		break;
	default:
		printf("powernow: pn_identify: cpu_id=0x%04x.\n", cpu_id);
		return;
	}
	if (device_find_child(parent, "powernow", -1) != NULL) {
		printf("powernow: pn_identify: No \"powernow\"device found.\n");
		return;
	}
	if (BUS_ADD_CHILD(parent, 10, "powernow", -1) == NULL)
		device_printf(parent, "powernow: add child failed\n");
}

	status = rdmsr(MSR_AMDK7_FIDVID_STATUS);

	pc = cpu_get_pcpu(dev);
	if (pc == NULL) {
		printf("powernow: cpu_get_pcpu() returned NULL.\n");
		return (ENODEV);
	}

	cpu_est_clockrate(pc->pc_cpuid, &rate);


			device_set_desc(dev, "Cool`n'Quiet K8");
		break;
	default:
		printf("powernow: cpuid 0x%04x & 0xf00 not matched.\n", cpu_id);
		return (ENODEV);
	}


Return to bug 212020

Lines 408-432 hwpstate_get_info_from_msr(device_t dev) Link Here

(-)b/sys/x86/cpufreq/hwpstate.c (-7 / +9 lines)
408	hwpstate_set = sc->hwpstate_settings;	408	hwpstate_set = sc->hwpstate_settings;
409	for (i = 0; i < sc->cfnum; i++) {	409	for (i = 0; i < sc->cfnum; i++) {
410	msr = rdmsr(MSR_AMD_10H_11H_CONFIG + i);	410	msr = rdmsr(MSR_AMD_10H_11H_CONFIG + i);
411	if ((msr & ((uint64_t)1 << 63)) != ((uint64_t)1 << 63)) {	411	if ((msr & ((uint64_t)1 << 63)) == 0) {
412	HWPSTATE_DEBUG(dev, "msr is not valid.\n");	412	HWPSTATE_DEBUG(dev, "msr is not valid.\n");
413	return (ENXIO);	413	return (ENXIO);
414	}	414	}
415	did = AMD_10H_11H_CUR_DID(msr);	415	did = AMD_10H_11H_CUR_DID(msr);
416	fid = AMD_10H_11H_CUR_FID(msr);	416	fid = AMD_10H_11H_CUR_FID(msr);
		417	/* fid/did to frequency */
417	switch(family) {	418	switch(family) {
418	case 0x11:	419	case 0x11:
419	/* fid/did to frequency */	420	hwpstate_set[i].freq = (100 * (fid + 0x08)) >> did;
420	hwpstate_set[i].freq = 100 * (fid + 0x08) / (1 << did);
421	break;	421	break;
422	case 0x10:	422	case 0x10:
423	/* fid/did to frequency */	423	case 0x12:
424	hwpstate_set[i].freq = 100 * (fid + 0x10) / (1 << did);	424	case 0x14:
		425	case 0x15:
		426	case 0x16:
		427	hwpstate_set[i].freq = (100 * (fid + 0x10)) >> did;
425	break;	428	break;
426	default:	429	default:
427	HWPSTATE_DEBUG(dev, "get_info_from_msr: AMD family %d CPU's are not implemented yet. sorry.\n", family);	430	HWPSTATE_DEBUG(dev, "get_info_from_msr: AMD family 0x%02x CPU's are not implemented yet. sorry.\n", family);
428	return (ENXIO);	431	return (ENXIO);
429	break;
430	}	432	}
431	hwpstate_set[i].pstate_id = i;	433	hwpstate_set[i].pstate_id = i;
432	/* There was volts calculation, but deleted it. */	434	/* There was volts calculation, but deleted it. */

Lines 866-882 static void Link Here

(-)b/sys/x86/cpufreq/powernow.c (-3 / +11 lines)
866	pn_identify(driver_t *driver, device_t parent)	866	pn_identify(driver_t *driver, device_t parent)
867	{	867	{
868		868
869	if ((amd_pminfo & AMDPM_FID) == 0 \|\| (amd_pminfo & AMDPM_VID) == 0)	869	if ((amd_pminfo & AMDPM_FID) == 0 \|\| (amd_pminfo & AMDPM_VID) == 0) {
		870	printf("powernow: pn_identify: amd_pminfo=0x%04x .\n", amd_pminfo);
870	return;	871	return;
		872	}
871	switch (cpu_id & 0xf00) {	873	switch (cpu_id & 0xf00) {
872	case 0x600:	874	case 0x600:
873	case 0xf00:	875	case 0xf00:
874	break;	876	break;
875	default:	877	default:
		878	printf("powernow: pn_identify: cpu_id=0x%04x.\n", cpu_id);
876	return;	879	return;
877	}	880	}
878	if (device_find_child(parent, "powernow", -1) != NULL)	881	if (device_find_child(parent, "powernow", -1) != NULL) {
		882	printf("powernow: pn_identify: No \"powernow\"device found.\n");
879	return;	883	return;
		884	}
880	if (BUS_ADD_CHILD(parent, 10, "powernow", -1) == NULL)	885	if (BUS_ADD_CHILD(parent, 10, "powernow", -1) == NULL)
881	device_printf(parent, "powernow: add child failed\n");	886	device_printf(parent, "powernow: add child failed\n");
882	}	887	}
Lines 895-902 pn_probe(device_t dev) Link Here
895	status = rdmsr(MSR_AMDK7_FIDVID_STATUS);	900	status = rdmsr(MSR_AMDK7_FIDVID_STATUS);
896		901
897	pc = cpu_get_pcpu(dev);	902	pc = cpu_get_pcpu(dev);
898	if (pc == NULL)	903	if (pc == NULL) {
		904	printf("powernow: cpu_get_pcpu() returned NULL.\n");
899	return (ENODEV);	905	return (ENODEV);
		906	}
900		907
901	cpu_est_clockrate(pc->pc_cpuid, &rate);	908	cpu_est_clockrate(pc->pc_cpuid, &rate);
902		909
Lines 936-941 pn_probe(device_t dev) Link Here
936	device_set_desc(dev, "Cool`n'Quiet K8");	943	device_set_desc(dev, "Cool`n'Quiet K8");
937	break;	944	break;
938	default:	945	default:
		946	printf("powernow: cpuid 0x%04x & 0xf00 not matched.\n", cpu_id);
939	return (ENODEV);	947	return (ENODEV);
940	}	948	}
941		949