Commit 56ec8e4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arm64 updates from Catalin Marinas:
 "No major architecture features this time around, just some new HWCAP
  definitions, support for the Ampere SoC PMUs and a few fixes/cleanups.

  The bulk of the changes is reworking of the CPU capability checking
  code (cpus_have_cap() etc).

   - Major refactoring of the CPU capability detection logic resulting
     in the removal of the cpus_have_const_cap() function and migrating
     the code to "alternative" branches where possible

   - Backtrace/kgdb: use IPIs and pseudo-NMI

   - Perf and PMU:

      - Add support for Ampere SoC PMUs

      - Multi-DTC improvements for larger CMN configurations with
        multiple Debug & Trace Controllers

      - Rework the Arm CoreSight PMU driver to allow separate
        registration of vendor backend modules

      - Fixes: add missing MODULE_DEVICE_TABLE to the amlogic perf
        driver; use device_get_match_data() in the xgene driver; fix
        NULL pointer dereference in the hisi driver caused by calling
        cpuhp_state_remove_instance(); use-after-free in the hisi driver

   - HWCAP updates:

      - FEAT_SVE_B16B16 (BFloat16)

      - FEAT_LRCPC3 (release consistency model)

      - FEAT_LSE128 (128-bit atomic instructions)

   - SVE: remove a couple of pseudo registers from the cpufeature code.
     There is logic in place already to detect mismatched SVE features

   - Miscellaneous:

      - Reduce the default swiotlb size (currently 64MB) if no ZONE_DMA
        bouncing is needed. The buffer is still required for small
        kmalloc() buffers

      - Fix module PLT counting with !RANDOMIZE_BASE

      - Restrict CPU_BIG_ENDIAN to LLVM IAS 15.x or newer move
        synchronisation code out of the set_ptes() loop

      - More compact cpufeature displaying enabled cores

      - Kselftest updates for the new CPU features"

 * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (83 commits)
  arm64: Restrict CPU_BIG_ENDIAN to GNU as or LLVM IAS 15.x or newer
  arm64: module: Fix PLT counting when CONFIG_RANDOMIZE_BASE=n
  arm64, irqchip/gic-v3, ACPI: Move MADT GICC enabled check into a helper
  perf: hisi: Fix use-after-free when register pmu fails
  drivers/perf: hisi_pcie: Initialize event->cpu only on success
  drivers/perf: hisi_pcie: Check the type first in pmu::event_init()
  arm64: cpufeature: Change DBM to display enabled cores
  arm64: cpufeature: Display the set of cores with a feature
  perf/arm-cmn: Enable per-DTC counter allocation
  perf/arm-cmn: Rework DTC counters (again)
  perf/arm-cmn: Fix DTC domain detection
  drivers: perf: arm_pmuv3: Drop some unused arguments from armv8_pmu_init()
  drivers: perf: arm_pmuv3: Read PMMIR_EL1 unconditionally
  drivers/perf: hisi: use cpuhp_state_remove_instance_nocalls() for hisi_hns3_pmu uninit process
  clocksource/drivers/arm_arch_timer: limit XGene-1 workaround
  arm64: Remove system_uses_lse_atomics()
  arm64: Mark the 'addr' argument to set_ptes() and __set_pte_at() as unused
  drivers/perf: xgene: Use device_get_match_data()
  perf/amlogic: add missing MODULE_DEVICE_TABLE
  arm64/mm: Hoist synchronization out of set_ptes() loop
  ...
parents 7d461b29 14dcf78a

Documentation/admin-guide/perf/ampere_cspmu.rst

0 → 100644
+29 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



============================================

Ampere SoC Performance Monitoring Unit (PMU)

============================================



Ampere SoC PMU is a generic PMU IP that follows Arm CoreSight PMU architecture.

Therefore, the driver is implemented as a submodule of arm_cspmu driver. At the

first phase it's used for counting MCU events on AmpereOne.





MCU PMU events

--------------



The PMU driver supports setting filters for "rank", "bank", and "threshold".

Note, that the filters are per PMU instance rather than per event.





Example for perf tool use::



  / # perf list ampere



    ampere_mcu_pmu_0/act_sent/                         [Kernel PMU event]

    <...>

    ampere_mcu_pmu_1/rd_sent/                          [Kernel PMU event]

    <...>



  / # perf stat -a -e ampere_mcu_pmu_0/act_sent,bank=5,rank=3,threshold=2/,ampere_mcu_pmu_1/rd_sent/ \

        sleep 1

Documentation/admin-guide/perf/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -22,3 +22,4 @@ Performance monitor support 
   nvidia-pmu

   meson-ddr-pmu

   cxl

   ampere_cspmu

Documentation/arch/arm64/cpu-feature-registers.rst

+2 −0
Original line number Diff line number Diff line
@@ -268,6 +268,8 @@ infrastructure: 
     +------------------------------+---------+---------+

     | SHA3                         | [35-32] |    y    |

     +------------------------------+---------+---------+

     | B16B16                       | [27-24] |    y    |

     +------------------------------+---------+---------+

     | BF16                         | [23-20] |    y    |

     +------------------------------+---------+---------+

     | BitPerm                      | [19-16] |    y    |

Documentation/arch/arm64/elf_hwcaps.rst

+9 −0
Original line number Diff line number Diff line
@@ -308,6 +308,15 @@ HWCAP2_MOPS 
HWCAP2_HBC

    Functionality implied by ID_AA64ISAR2_EL1.BC == 0b0001.



HWCAP2_SVE_B16B16

    Functionality implied by ID_AA64ZFR0_EL1.B16B16 == 0b0001.



HWCAP2_LRCPC3

    Functionality implied by ID_AA64ISAR1_EL1.LRCPC == 0b0011.



HWCAP2_LSE128

    Functionality implied by ID_AA64ISAR0_EL1.Atomic == 0b0011.



4. Unused AT_HWCAP bits

-----------------------

arch/arm/xen/enlighten.c

+16 −9
Original line number Diff line number Diff line
@@ -164,9 +164,6 @@ static int xen_starting_cpu(unsigned int cpu) 
	BUG_ON(err);

	per_cpu(xen_vcpu, cpu) = vcpup;



	if (!xen_kernel_unmapped_at_usr())

		xen_setup_runstate_info(cpu);



after_register_vcpu_info:

	enable_percpu_irq(xen_events_irq, 0);

	return 0;
@@ -523,9 +520,6 @@ static int __init xen_guest_init(void) 
		return -EINVAL;

	}



	if (!xen_kernel_unmapped_at_usr())

		xen_time_setup_guest();



	if (xen_initial_domain())

		pvclock_gtod_register_notifier(&xen_pvclock_gtod_notifier);
@@ -535,7 +529,13 @@ static int __init xen_guest_init(void) 
}

early_initcall(xen_guest_init);



static int __init xen_pm_init(void)

static int xen_starting_runstate_cpu(unsigned int cpu)

{

	xen_setup_runstate_info(cpu);

	return 0;

}



static int __init xen_late_init(void)

{

	if (!xen_domain())

		return -ENODEV;
@@ -548,9 +548,16 @@ static int __init xen_pm_init(void) 
		do_settimeofday64(&ts);

	}



	if (xen_kernel_unmapped_at_usr())

		return 0;



	xen_time_setup_guest();



	return cpuhp_setup_state(CPUHP_AP_ARM_XEN_RUNSTATE_STARTING,

				 "arm/xen_runstate:starting",

				 xen_starting_runstate_cpu, NULL);

}

late_initcall(xen_pm_init);

late_initcall(xen_late_init);





/* empty stubs */