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

Commit 564b733c authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

macintosh/rack-meter: Convert cputime64_t use to u64 



cputime_t is going to be removed and replaced by nsecs units,
so convert the drivers/macintosh/rack-meter.c use to u64..

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Link: http://lkml.kernel.org/r/1485832191-26889-5-git-send-email-fweisbec@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 7fb1327e

drivers/macintosh/rack-meter.c

+15 −15
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ struct rackmeter_dma { 
struct rackmeter_cpu {

	struct delayed_work	sniffer;

	struct rackmeter	*rm;

	cputime64_t		prev_wall;

	cputime64_t		prev_idle;

	u64			prev_wall;

	u64			prev_idle;

	int			zero;

} ____cacheline_aligned;
@@ -81,7 +81,7 @@ static int rackmeter_ignore_nice; 
/* This is copied from cpufreq_ondemand, maybe we should put it in

 * a common header somewhere

 */

static inline cputime64_t get_cpu_idle_time(unsigned int cpu)

static inline u64 get_cpu_idle_time(unsigned int cpu)

{

	u64 retval;
@@ -91,7 +91,7 @@ static inline cputime64_t get_cpu_idle_time(unsigned int cpu) 
	if (rackmeter_ignore_nice)

		retval += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE];



	return nsecs_to_cputime64(retval);

	return retval;

}



static void rackmeter_setup_i2s(struct rackmeter *rm)
@@ -217,23 +217,23 @@ static void rackmeter_do_timer(struct work_struct *work) 
		container_of(work, struct rackmeter_cpu, sniffer.work);

	struct rackmeter *rm = rcpu->rm;

	unsigned int cpu = smp_processor_id();

	cputime64_t cur_jiffies, total_idle_ticks;

	unsigned int total_ticks, idle_ticks;

	u64 cur_nsecs, total_idle_nsecs;

	u64 total_nsecs, idle_nsecs;

	int i, offset, load, cumm, pause;



	cur_jiffies = jiffies64_to_cputime64(get_jiffies_64());

	total_ticks = (unsigned int) (cur_jiffies - rcpu->prev_wall);

	rcpu->prev_wall = cur_jiffies;

	cur_nsecs = jiffies64_to_nsecs(get_jiffies_64());

	total_nsecs = cur_nsecs - rcpu->prev_wall;

	rcpu->prev_wall = cur_nsecs;



	total_idle_ticks = get_cpu_idle_time(cpu);

	idle_ticks = (unsigned int) (total_idle_ticks - rcpu->prev_idle);

	idle_ticks = min(idle_ticks, total_ticks);

	rcpu->prev_idle = total_idle_ticks;

	total_idle_nsecs = get_cpu_idle_time(cpu);

	idle_nsecs = total_idle_nsecs - rcpu->prev_idle;

	idle_nsecs = min(idle_nsecs, total_nsecs);

	rcpu->prev_idle = total_idle_nsecs;



	/* We do a very dumb calculation to update the LEDs for now,

	 * we'll do better once we have actual PWM implemented

	 */

	load = (9 * (total_ticks - idle_ticks)) / total_ticks;

	load = div64_u64(9 * (total_nsecs - idle_nsecs), total_nsecs);



	offset = cpu << 3;

	cumm = 0;
@@ -278,7 +278,7 @@ static void rackmeter_init_cpu_sniffer(struct rackmeter *rm) 
			continue;

		rcpu = &rm->cpu[cpu];

		rcpu->prev_idle = get_cpu_idle_time(cpu);

		rcpu->prev_wall = jiffies64_to_cputime64(get_jiffies_64());

		rcpu->prev_wall = jiffies64_to_nsecs(get_jiffies_64());

		schedule_delayed_work_on(cpu, &rm->cpu[cpu].sniffer,

					 msecs_to_jiffies(CPU_SAMPLING_RATE));

	}