Commit e47ca403 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:

 - Enable Cortex-A510 erratum 2051678 by default as we do with other
   errata.

 - arm64 IORT: Check the node revision for PMCG resources to cope with
   old firmware based on a broken revision of the spec that had no way
   to describe the second register page (when an implementation is using
   the recommended RELOC_CTRS feature).

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  ACPI/IORT: Check node revision for PMCG resources
  arm64: Enable Cortex-A510 erratum 2051678 by default
parents 883fd0ab da5fb9e1

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -672,6 +672,7 @@ config ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE 


config ARM64_ERRATUM_2051678

	bool "Cortex-A510: 2051678: disable Hardware Update of the page table dirty bit"

	default y

	help

	  This options adds the workaround for ARM Cortex-A510 erratum ARM64_ERRATUM_2051678.

	  Affected Coretex-A510 might not respect the ordering rules for

drivers/acpi/arm64/iort.c

+11 −3
Original line number Diff line number Diff line
@@ -1361,9 +1361,17 @@ static void __init arm_smmu_v3_pmcg_init_resources(struct resource *res, 
	res[0].start = pmcg->page0_base_address;

	res[0].end = pmcg->page0_base_address + SZ_4K - 1;

	res[0].flags = IORESOURCE_MEM;

	/*

	 * The initial version in DEN0049C lacked a way to describe register

	 * page 1, which makes it broken for most PMCG implementations; in

	 * that case, just let the driver fail gracefully if it expects to

	 * find a second memory resource.

	 */

	if (node->revision > 0) {

		res[1].start = pmcg->page1_base_address;

		res[1].end = pmcg->page1_base_address + SZ_4K - 1;

		res[1].flags = IORESOURCE_MEM;

	}



	if (pmcg->overflow_gsiv)

		acpi_iort_register_irq(pmcg->overflow_gsiv, "overflow",