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

Commit dc6ca5e4 authored by Suravee Suthikulpanit's avatar Suravee Suthikulpanit Committed by Ingo Molnar
Browse files

x86/events/amd/iommu: Clean up perf_iommu_read() 



Fix coding style and use GENMASK_ULL().

Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Jörg Rödel <joro@8bytes.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: iommu@lists.linux-foundation.org
Link: http://lkml.kernel.org/r/1487926102-13073-4-git-send-email-Suravee.Suthikulpanit@amd.com


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

arch/x86/events/amd/iommu.c

+6 −10
Original line number Diff line number Diff line
@@ -320,9 +320,7 @@ static void perf_iommu_start(struct perf_event *event, int flags) 


static void perf_iommu_read(struct perf_event *event)

{

	u64 count = 0ULL;

	u64 prev_raw_count = 0ULL;

	u64 delta = 0ULL;

	u64 count, prev, delta;

	struct hw_perf_event *hwc = &event->hw;



	amd_iommu_pc_get_set_reg_val(_GET_DEVID(event),
@@ -330,18 +328,16 @@ static void perf_iommu_read(struct perf_event *event) 
				IOMMU_PC_COUNTER_REG, &count, false);



	/* IOMMU pc counter register is only 48 bits */

	count &= 0xFFFFFFFFFFFFULL;

	count &= GENMASK_ULL(47, 0);



	prev_raw_count =  local64_read(&hwc->prev_count);

	if (local64_cmpxchg(&hwc->prev_count, prev_raw_count,

					count) != prev_raw_count)

	prev = local64_read(&hwc->prev_count);

	if (local64_cmpxchg(&hwc->prev_count, prev, count) != prev)

		return;



	/* Handling 48-bit counter overflowing */

	delta = (count << COUNTER_SHIFT) - (prev_raw_count << COUNTER_SHIFT);

	/* Handle 48-bit counter overflow */

	delta = (count << COUNTER_SHIFT) - (prev << COUNTER_SHIFT);

	delta >>= COUNTER_SHIFT;

	local64_add(delta, &event->count);



}



static void perf_iommu_stop(struct perf_event *event, int flags)