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

Commit 2f1d5005 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "perf: Change PMCR write to read-modify-write" into msm-4.8

parents bce6fd2f fda5fed7

arch/arm/kernel/perf_event_v7.c

+1 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ static void armv7pmu_reset(void *info) 
	}



	/* Initialize & Reset PMNC: C and P bits */

	armv7_pmnc_write(ARMV7_PMNC_P | ARMV7_PMNC_C);

	armv7_pmnc_write(armv7_pmnc_read() | ARMV7_PMNC_P | ARMV7_PMNC_C);

}



static int armv7_a8_map_event(struct perf_event *event)

arch/arm64/kernel/perf_event.c

+2 −2
Original line number Diff line number Diff line
@@ -899,8 +899,8 @@ static void armv8pmu_reset(void *info) 
	 * Initialize & Reset PMNC. Request overflow interrupt for

	 * 64 bit cycle counter but cheat in armv8pmu_write_counter().

	 */

	armv8pmu_pmcr_write(ARMV8_PMU_PMCR_P | ARMV8_PMU_PMCR_C |

			    ARMV8_PMU_PMCR_LC);

	armv8pmu_pmcr_write(armv8pmu_pmcr_read() | ARMV8_PMU_PMCR_P |

			ARMV8_PMU_PMCR_C | ARMV8_PMU_PMCR_LC);

}



static int armv8_pmuv3_map_event(struct perf_event *event)