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

Commit ad0b7c0c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "perf: Change PMCR write to read-modify-write"

parents 46f87f1d f26fb34b

arch/arm/kernel/perf_event_v7.c

+1 −1
Original line number Diff line number Diff line
@@ -929,7 +929,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

+1 −1
Original line number Diff line number Diff line
@@ -1292,7 +1292,7 @@ static void armv8pmu_reset(void *info) 
		armv8pmu_disable_event(NULL, idx);



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

	armv8pmu_pmcr_write(ARMV8_PMCR_P | ARMV8_PMCR_C);

	armv8pmu_pmcr_write(armv8pmu_pmcr_read() | ARMV8_PMCR_P | ARMV8_PMCR_C);



	armv8pmu_init_usermode();

}