aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/processor_throttling.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/processor_throttling.c')
-rw-r--r--drivers/acpi/processor_throttling.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 1c5d7a8b2fdf..7ded7542fc9d 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -660,7 +660,7 @@ static int acpi_processor_get_throttling_fadt(struct acpi_processor *pr)
660 660
661#ifdef CONFIG_X86 661#ifdef CONFIG_X86
662static int acpi_throttling_rdmsr(struct acpi_processor *pr, 662static int acpi_throttling_rdmsr(struct acpi_processor *pr,
663 acpi_integer * value) 663 u64 *value)
664{ 664{
665 struct cpuinfo_x86 *c; 665 struct cpuinfo_x86 *c;
666 u64 msr_high, msr_low; 666 u64 msr_high, msr_low;
@@ -681,13 +681,13 @@ static int acpi_throttling_rdmsr(struct acpi_processor *pr,
681 rdmsr_safe(MSR_IA32_THERM_CONTROL, 681 rdmsr_safe(MSR_IA32_THERM_CONTROL,
682 (u32 *)&msr_low , (u32 *) &msr_high); 682 (u32 *)&msr_low , (u32 *) &msr_high);
683 msr = (msr_high << 32) | msr_low; 683 msr = (msr_high << 32) | msr_low;
684 *value = (acpi_integer) msr; 684 *value = (u64) msr;
685 ret = 0; 685 ret = 0;
686 } 686 }
687 return ret; 687 return ret;
688} 688}
689 689
690static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value) 690static int acpi_throttling_wrmsr(struct acpi_processor *pr, u64 value)
691{ 691{
692 struct cpuinfo_x86 *c; 692 struct cpuinfo_x86 *c;
693 unsigned int cpu; 693 unsigned int cpu;
@@ -711,14 +711,14 @@ static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
711} 711}
712#else 712#else
713static int acpi_throttling_rdmsr(struct acpi_processor *pr, 713static int acpi_throttling_rdmsr(struct acpi_processor *pr,
714 acpi_integer * value) 714 u64 *value)
715{ 715{
716 printk(KERN_ERR PREFIX 716 printk(KERN_ERR PREFIX
717 "HARDWARE addr space,NOT supported yet\n"); 717 "HARDWARE addr space,NOT supported yet\n");
718 return -1; 718 return -1;
719} 719}
720 720
721static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value) 721static int acpi_throttling_wrmsr(struct acpi_processor *pr, u64 value)
722{ 722{
723 printk(KERN_ERR PREFIX 723 printk(KERN_ERR PREFIX
724 "HARDWARE addr space,NOT supported yet\n"); 724 "HARDWARE addr space,NOT supported yet\n");
@@ -727,7 +727,7 @@ static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
727#endif 727#endif
728 728
729static int acpi_read_throttling_status(struct acpi_processor *pr, 729static int acpi_read_throttling_status(struct acpi_processor *pr,
730 acpi_integer *value) 730 u64 *value)
731{ 731{
732 u32 bit_width, bit_offset; 732 u32 bit_width, bit_offset;
733 u64 ptc_value; 733 u64 ptc_value;
@@ -746,7 +746,7 @@ static int acpi_read_throttling_status(struct acpi_processor *pr,
746 address, (u32 *) &ptc_value, 746 address, (u32 *) &ptc_value,
747 (u32) (bit_width + bit_offset)); 747 (u32) (bit_width + bit_offset));
748 ptc_mask = (1 << bit_width) - 1; 748 ptc_mask = (1 << bit_width) - 1;
749 *value = (acpi_integer) ((ptc_value >> bit_offset) & ptc_mask); 749 *value = (u64) ((ptc_value >> bit_offset) & ptc_mask);
750 ret = 0; 750 ret = 0;
751 break; 751 break;
752 case ACPI_ADR_SPACE_FIXED_HARDWARE: 752 case ACPI_ADR_SPACE_FIXED_HARDWARE:
@@ -760,7 +760,7 @@ static int acpi_read_throttling_status(struct acpi_processor *pr,
760} 760}
761 761
762static int acpi_write_throttling_state(struct acpi_processor *pr, 762static int acpi_write_throttling_state(struct acpi_processor *pr,
763 acpi_integer value) 763 u64 value)
764{ 764{
765 u32 bit_width, bit_offset; 765 u32 bit_width, bit_offset;
766 u64 ptc_value; 766 u64 ptc_value;
@@ -793,7 +793,7 @@ static int acpi_write_throttling_state(struct acpi_processor *pr,
793} 793}
794 794
795static int acpi_get_throttling_state(struct acpi_processor *pr, 795static int acpi_get_throttling_state(struct acpi_processor *pr,
796 acpi_integer value) 796 u64 value)
797{ 797{
798 int i; 798 int i;
799 799
@@ -808,7 +808,7 @@ static int acpi_get_throttling_state(struct acpi_processor *pr,
808} 808}
809 809
810static int acpi_get_throttling_value(struct acpi_processor *pr, 810static int acpi_get_throttling_value(struct acpi_processor *pr,
811 int state, acpi_integer *value) 811 int state, u64 *value)
812{ 812{
813 int ret = -1; 813 int ret = -1;
814 814
@@ -826,7 +826,7 @@ static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr)
826{ 826{
827 int state = 0; 827 int state = 0;
828 int ret; 828 int ret;
829 acpi_integer value; 829 u64 value;
830 830
831 if (!pr) 831 if (!pr)
832 return -EINVAL; 832 return -EINVAL;
@@ -993,7 +993,7 @@ static int acpi_processor_set_throttling_ptc(struct acpi_processor *pr,
993 int state, bool force) 993 int state, bool force)
994{ 994{
995 int ret; 995 int ret;
996 acpi_integer value; 996 u64 value;
997 997
998 if (!pr) 998 if (!pr)
999 return -EINVAL; 999 return -EINVAL;