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

Commit b939c514 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:
 "ACPI-related fixes for arm64:

   - GICC MADT entry validity check fix

   - Skip IRQ registration with pmu=off in an ACPI guest

   - struct acpi_pci_root_ops freeing on error path"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  ARM64/ACPI: Fix BAD_MADT_GICC_ENTRY() macro implementation
  drivers/perf: arm_pmu_acpi: avoid perf IRQ init when guest PMU is off
  ARM64: PCI: Fix struct acpi_pci_root_ops allocation failure path
parents 65d03328 cb7cf772

arch/arm64/include/asm/acpi.h

+3 −3
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
	(acpi_gbl_FADT.header.revision < 6 ? 76 : 80)



#define BAD_MADT_GICC_ENTRY(entry, end)					\

	(!(entry) || (unsigned long)(entry) + sizeof(*(entry)) > (end) ||	\

	 (entry)->header.length != ACPI_MADT_GICC_LENGTH)

	(!(entry) || (entry)->header.length != ACPI_MADT_GICC_LENGTH ||	\

	(unsigned long)(entry) + ACPI_MADT_GICC_LENGTH > (end))



/* Basic configuration for ACPI */

#ifdef	CONFIG_ACPI

arch/arm64/kernel/pci.c

+3 −1
Original line number Diff line number Diff line
@@ -191,8 +191,10 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
		return NULL;



	root_ops = kzalloc_node(sizeof(*root_ops), GFP_KERNEL, node);

	if (!root_ops)

	if (!root_ops) {

		kfree(ri);

		return NULL;

	}



	ri->cfg = pci_acpi_setup_ecam_mapping(root);

	if (!ri->cfg) {

drivers/perf/arm_pmu_acpi.c

+11 −0
Original line number Diff line number Diff line
@@ -29,6 +29,17 @@ static int arm_pmu_acpi_register_irq(int cpu) 
		return -EINVAL;



	gsi = gicc->performance_interrupt;



	/*

	 * Per the ACPI spec, the MADT cannot describe a PMU that doesn't

	 * have an interrupt. QEMU advertises this by using a GSI of zero,

	 * which is not known to be valid on any hardware despite being

	 * valid per the spec. Take the pragmatic approach and reject a

	 * GSI of zero for now.

	 */

	if (!gsi)

		return 0;



	if (gicc->flags & ACPI_MADT_PERFORMANCE_IRQ_MODE)

		trigger = ACPI_EDGE_SENSITIVE;

	else