diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-05-21 00:59:06 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-05-21 00:59:06 -0400 |
commit | 6829b5dea439498825b4f63d8cc4b0ee6f42a64e (patch) | |
tree | 0e47f836254fdea5bf9af6c548fad812b28703a4 | |
parent | 157a28c94c1380fedd232fe63fb666d76f0d5c32 (diff) | |
download | longterm-queue-4.8-6829b5dea439498825b4f63d8cc4b0ee6f42a64e.tar.gz |
arm64: remove BSP errata patch not applicable to 4.8.x baseline
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r-- | queue/irqchip-gicv3-its-Add-workaround-for-QDF2400-ITS-err.patch | 90 | ||||
-rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 91 deletions
diff --git a/queue/irqchip-gicv3-its-Add-workaround-for-QDF2400-ITS-err.patch b/queue/irqchip-gicv3-its-Add-workaround-for-QDF2400-ITS-err.patch deleted file mode 100644 index 25e92c0..0000000 --- a/queue/irqchip-gicv3-its-Add-workaround-for-QDF2400-ITS-err.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 90922a2d03d84de36bf8a9979d62580102f31a92 Mon Sep 17 00:00:00 2001 -From: Shanker Donthineni <shankerd@codeaurora.org> -Date: Tue, 7 Mar 2017 08:20:38 -0600 -Subject: [PATCH] irqchip/gicv3-its: Add workaround for QDF2400 ITS erratum - 0065 - -commit 90922a2d03d84de36bf8a9979d62580102f31a92 upstream. - -On Qualcomm Datacenter Technologies QDF2400 SoCs, the ITS hardware -implementation uses 16Bytes for Interrupt Translation Entry (ITE), -but reports an incorrect value of 8Bytes in GITS_TYPER.ITTE_size. - -It might cause kernel memory corruption depending on the number -of MSI(x) that are configured and the amount of memory that has -been allocated for ITEs in its_create_device(). - -This patch fixes the potential memory corruption by setting the -correct ITE size to 16Bytes. - -Cc: stable@vger.kernel.org -Signed-off-by: Shanker Donthineni <shankerd@codeaurora.org> -Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> - -diff --git a/Documentation/arm64/silicon-errata.txt b/Documentation/arm64/silicon-errata.txt -index a71b8095dbd8..2f66683500b8 100644 ---- a/Documentation/arm64/silicon-errata.txt -+++ b/Documentation/arm64/silicon-errata.txt -@@ -68,3 +68,4 @@ stable kernels. - | | | | | - | Qualcomm Tech. | Falkor v1 | E1003 | QCOM_FALKOR_ERRATUM_1003 | - | Qualcomm Tech. | Falkor v1 | E1009 | QCOM_FALKOR_ERRATUM_1009 | -+| Qualcomm Tech. | QDF2400 ITS | E0065 | QCOM_QDF2400_ERRATUM_0065 | -diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index a39029b5414e..8c7c244247b6 100644 ---- a/arch/arm64/Kconfig -+++ b/arch/arm64/Kconfig -@@ -508,6 +508,16 @@ config QCOM_FALKOR_ERRATUM_1009 - - If unsure, say Y. - -+config QCOM_QDF2400_ERRATUM_0065 -+ bool "QDF2400 E0065: Incorrect GITS_TYPER.ITT_Entry_size" -+ default y -+ help -+ On Qualcomm Datacenter Technologies QDF2400 SoC, ITS hardware reports -+ ITE size incorrectly. The GITS_TYPER.ITT_Entry_size field should have -+ been indicated as 16Bytes (0xf), not 8Bytes (0x7). -+ -+ If unsure, say Y. -+ - endmenu - - -diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c -index 23201004fd7a..f77f840d2b5f 100644 ---- a/drivers/irqchip/irq-gic-v3-its.c -+++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -1601,6 +1601,14 @@ static void __maybe_unused its_enable_quirk_cavium_23144(void *data) - its->flags |= ITS_FLAGS_WORKAROUND_CAVIUM_23144; - } - -+static void __maybe_unused its_enable_quirk_qdf2400_e0065(void *data) -+{ -+ struct its_node *its = data; -+ -+ /* On QDF2400, the size of the ITE is 16Bytes */ -+ its->ite_size = 16; -+} -+ - static const struct gic_quirk its_quirks[] = { - #ifdef CONFIG_CAVIUM_ERRATUM_22375 - { -@@ -1618,6 +1626,14 @@ static const struct gic_quirk its_quirks[] = { - .init = its_enable_quirk_cavium_23144, - }, - #endif -+#ifdef CONFIG_QCOM_QDF2400_ERRATUM_0065 -+ { -+ .desc = "ITS: QDF2400 erratum 0065", -+ .iidr = 0x00001070, /* QDF2400 ITS rev 1.x */ -+ .mask = 0xffffffff, -+ .init = its_enable_quirk_qdf2400_e0065, -+ }, -+#endif - { - } - }; --- -2.12.0 - diff --git a/queue/series b/queue/series index 907a442..00a28a2 100644 --- a/queue/series +++ b/queue/series @@ -156,7 +156,6 @@ usb-gadget-udc-atmel-remove-memory-leak.patch clk-bcm2835-Fix-fixed_divider-of-pllh_aux.patch drm-vc4-Fix-race-between-page-flip-completion-event-.patch drm-vc4-Fix-clock_select-setting-for-the-VEC-encoder.patch -irqchip-gicv3-its-Add-workaround-for-QDF2400-ITS-err.patch x86-tsc-Fix-ART-for-TSC_KNOWN_FREQ.patch x86-kasan-Fix-boot-with-KASAN-y-and-PROFILE_ANNOTATE.patch x86-perf-Fix-CR4.PCE-propagation-to-use-active_mm-in.patch |