Merge 4.9.310 into android-4.9-q

Changes in 4.9.310
	arm64: errata: Provide macro for major and minor cpu revisions
	arm64: Remove useless UAO IPI and describe how this gets enabled
	arm64: Add MIDR encoding for Arm Cortex-A55 and Cortex-A35
	arm64: capabilities: Update prototype for enable call back
	arm64: capabilities: Move errata work around check on boot CPU
	arm64: capabilities: Move errata processing code
	arm64: capabilities: Prepare for fine grained capabilities
	arm64: capabilities: Add flags to handle the conflicts on late CPU
	arm64: capabilities: Clean up midr range helpers
	arm64: Add helpers for checking CPU MIDR against a range
	arm64: capabilities: Add support for checks based on a list of MIDRs
	clocksource/drivers/arm_arch_timer: Remove fsl-a008585 parameter
	clocksource/drivers/arm_arch_timer: Introduce generic errata handling infrastructure
	arm64: arch_timer: Add infrastructure for multiple erratum detection methods
	arm64: arch_timer: Add erratum handler for CPU-specific capability
	arm64: arch_timer: Add workaround for ARM erratum 1188873
	arm64: arch_timer: avoid unused function warning
	arm64: Add silicon-errata.txt entry for ARM erratum 1188873
	arm64: Make ARM64_ERRATUM_1188873 depend on COMPAT
	arm64: Add part number for Neoverse N1
	arm64: Add part number for Arm Cortex-A77
	arm64: Add Neoverse-N2, Cortex-A710 CPU part definition
	arm64: Add Cortex-X2 CPU part definition
	arm64: Add helper to decode register from instruction
	arm64: entry.S: Add ventry overflow sanity checks
	arm64: entry: Make the trampoline cleanup optional
	arm64: entry: Free up another register on kpti's tramp_exit path
	arm64: entry: Move the trampoline data page before the text page
	arm64: entry: Allow tramp_alias to access symbols after the 4K boundary
	arm64: entry: Don't assume tramp_vectors is the start of the vectors
	arm64: entry: Move trampoline macros out of ifdef'd section
	arm64: entry: Make the kpti trampoline's kpti sequence optional
	arm64: entry: Allow the trampoline text to occupy multiple pages
	arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations
	arm64: Move arm64_update_smccc_conduit() out of SSBD ifdef
	arm64: entry: Add vectors that have the bhb mitigation sequences
	arm64: entry: Add macro for reading symbol addresses from the trampoline
	arm64: Add percpu vectors for EL1
	KVM: arm64: Add templates for BHB mitigation sequences
	arm64: Mitigate spectre style branch history side channels
	KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated
	arm64: add ID_AA64ISAR2_EL1 sys register
	arm64: Use the clearbhb instruction in mitigations
	Linux 4.9.310

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I689d7634aebe9d9ffba8d72d1d76bb237ca228a4