Commit 50ee4a6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Catalin Marinas:

 - Deselect ARCH_CORRECT_STACKTRACE_ON_KRETPROBE so that tests depending
   on it don't run (and fail) on arm64

 - Fix lockdep assert in the Arm SMMUv3 PMU driver

 - Fix the port and device ID bits setting in the Arm CMN perf driver

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  perf/arm-cmn: Ensure port and device id bits are set properly
  perf/arm-smmuv3: Fix lockdep assert in ->event_init()
  arm64: disable ARCH_CORRECT_STACKTRACE_ON_KRETPROBE tests
parents 6a34dfa1 dfdf714f

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ config ARM64 
	select ARCH_HAS_DEBUG_WX

	select ARCH_BINFMT_ELF_EXTRA_PHDRS

	select ARCH_BINFMT_ELF_STATE

	select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE

	select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION

	select ARCH_ENABLE_MEMORY_HOTPLUG

	select ARCH_ENABLE_MEMORY_HOTREMOVE

drivers/perf/arm-cmn.c

+2 −2
Original line number Diff line number Diff line
@@ -2178,8 +2178,6 @@ static int arm_cmn_init_dtcs(struct arm_cmn *cmn) 
			continue;



		xp = arm_cmn_node_to_xp(cmn, dn);

		dn->portid_bits = xp->portid_bits;

		dn->deviceid_bits = xp->deviceid_bits;

		dn->dtc = xp->dtc;

		dn->dtm = xp->dtm;

		if (cmn->multi_dtm)
@@ -2420,6 +2418,8 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset) 
			}



			arm_cmn_init_node_info(cmn, reg & CMN_CHILD_NODE_ADDR, dn);

			dn->portid_bits = xp->portid_bits;

			dn->deviceid_bits = xp->deviceid_bits;



			switch (dn->type) {

			case CMN_TYPE_DTC:

drivers/perf/arm_smmuv3_pmu.c

+11 −8
Original line number Diff line number Diff line
@@ -431,6 +431,17 @@ static int smmu_pmu_event_init(struct perf_event *event) 
			return -EINVAL;

	}



	/*

	 * Ensure all events are on the same cpu so all events are in the

	 * same cpu context, to avoid races on pmu_enable etc.

	 */

	event->cpu = smmu_pmu->on_cpu;



	hwc->idx = -1;



	if (event->group_leader == event)

		return 0;



	for_each_sibling_event(sibling, event->group_leader) {

		if (is_software_event(sibling))

			continue;
@@ -442,14 +453,6 @@ static int smmu_pmu_event_init(struct perf_event *event) 
			return -EINVAL;

	}



	hwc->idx = -1;



	/*

	 * Ensure all events are on the same cpu so all events are in the

	 * same cpu context, to avoid races on pmu_enable etc.

	 */

	event->cpu = smmu_pmu->on_cpu;



	return 0;

}