From 7d6230b79fdf8c5d091ce13a5079768b8a847058 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Tue, 17 Dec 2019 17:09:43 -0500 Subject: Linux v5.3.17 --- kernel.spec | 8 +- ...p-ioremap-of-ESB-pages-for-LSI-interrupts.patch | 175 --------------------- sources | 2 +- 3 files changed, 5 insertions(+), 180 deletions(-) delete mode 100644 powerpc-xive-skip-ioremap-of-ESB-pages-for-LSI-interrupts.patch diff --git a/kernel.spec b/kernel.spec index 3ab3e1f09..5aa2598bd 100644 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 16 +%define stable_update 17 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -671,9 +671,6 @@ Patch534: 0001-ASoC-SOF-Fix-memory-leak-in-sof_dfsentry_write.patch # CVE-2019-16232 rhbz 1760351 1760352 Patch535: 0001-libertas-fix-a-potential-NULL-pointer-dereference.patch -# rhbz 1769600 -Patch536: powerpc-xive-skip-ioremap-of-ESB-pages-for-LSI-interrupts.patch - # END OF PATCH DEFINITIONS %endif @@ -1911,6 +1908,9 @@ fi # # %changelog +* Tue Dec 17 2019 Laura Abbott - 5.3.17-200 +- Linux v5.3.17 + * Fri Dec 13 2019 Laura Abbott - 5.3.16-200 - Linux v5.3.16 diff --git a/powerpc-xive-skip-ioremap-of-ESB-pages-for-LSI-interrupts.patch b/powerpc-xive-skip-ioremap-of-ESB-pages-for-LSI-interrupts.patch deleted file mode 100644 index a9d5c1a85..000000000 --- a/powerpc-xive-skip-ioremap-of-ESB-pages-for-LSI-interrupts.patch +++ /dev/null @@ -1,175 +0,0 @@ -From patchwork Tue Dec 3 16:36:42 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= -X-Patchwork-Id: 1203830 -Return-Path: -X-Original-To: patchwork-incoming@ozlabs.org -Delivered-To: patchwork-incoming@ozlabs.org -Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) - (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) - key-exchange X25519 server-signature RSA-PSS (4096 bits)) - (No client certificate requested) - by ozlabs.org (Postfix) with ESMTPS id 47SCtY48Djz9sPL - for ; - Wed, 4 Dec 2019 07:16:37 +1100 (AEDT) -Authentication-Results: ozlabs.org; - dmarc=none (p=none dis=none) header.from=kaod.org -Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) - by lists.ozlabs.org (Postfix) with ESMTP id 47SCtY23XJzDqSJ - for ; - Wed, 4 Dec 2019 07:16:37 +1100 (AEDT) -X-Original-To: linuxppc-dev@lists.ozlabs.org -Delivered-To: linuxppc-dev@lists.ozlabs.org -Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) - smtp.mailfrom=kaod.org (client-ip=46.105.49.171; - helo=4.mo178.mail-out.ovh.net; - envelope-from=clg@kaod.org; receiver=) -Authentication-Results: lists.ozlabs.org; - dmarc=none (p=none dis=none) header.from=kaod.org -X-Greylist: delayed 4198 seconds by postgrey-1.36 at bilbo; - Wed, 04 Dec 2019 07:14:39 AEDT -Received: from 4.mo178.mail-out.ovh.net (4.mo178.mail-out.ovh.net - [46.105.49.171]) - (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 - bits)) (No client certificate requested) - by lists.ozlabs.org (Postfix) with ESMTPS id 47SCrH1QlDzDqMp - for ; - Wed, 4 Dec 2019 07:14:34 +1100 (AEDT) -Received: from player758.ha.ovh.net (unknown [10.109.146.122]) - by mo178.mail-out.ovh.net (Postfix) with ESMTP id AD61B84296 - for ; - Tue, 3 Dec 2019 17:37:07 +0100 (CET) -Received: from kaod.org (lfbn-1-2229-223.w90-76.abo.wanadoo.fr - [90.76.50.223]) (Authenticated sender: clg@kaod.org) - by player758.ha.ovh.net (Postfix) with ESMTPSA id 011DDCE34EE3; - Tue, 3 Dec 2019 16:36:58 +0000 (UTC) -From: =?utf-8?q?C=C3=A9dric_Le_Goater?= -To: Michael Ellerman -Subject: [PATCH] powerpc/xive: skip ioremap() of ESB pages for LSI interrupts -Date: Tue, 3 Dec 2019 17:36:42 +0100 -Message-Id: <20191203163642.2428-1-clg@kaod.org> -X-Mailer: git-send-email 2.21.0 -MIME-Version: 1.0 -X-Ovh-Tracer-Id: 10318591172321971121 -X-VR-SPAMSTATE: OK -X-VR-SPAMSCORE: -100 -X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrudejjedgledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdqfffguegfifdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffogggtgfesthekredtredtjeenucfhrhhomhepveorughrihgtucfnvgcuifhorghtvghruceotghlgheskhgrohgurdhorhhgqeenucfkpheptddrtddrtddrtddpledtrdejiedrhedtrddvvdefnecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehplhgrhigvrhejheekrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomheptghlgheskhgrohgurdhorhhgpdhrtghpthhtoheplhhinhhugihpphgtqdguvghvsehlihhsthhsrdhoiihlrggsshdrohhrghenucevlhhushhtvghrufhiiigvpedt -X-BeenThere: linuxppc-dev@lists.ozlabs.org -X-Mailman-Version: 2.1.29 -Precedence: list -List-Id: Linux on PowerPC Developers Mail List -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Cc: lvivier@redhat.com, Greg Kurz , stable@vger.kernel.org, - =?utf-8?q?C=C3=A9dric_Le_Goater?= , - linuxppc-dev@lists.ozlabs.org, David Gibson -Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org -Sender: "Linuxppc-dev" - - -The PCI INTx interrupts and other LSI interrupts are handled differently -under a sPAPR platform. When the interrupt source characteristics are -queried, the hypervisor returns an H_INT_ESB flag to inform the OS -that it should be using the H_INT_ESB hcall for interrupt management -and not loads and stores on the interrupt ESB pages. - -A default -1 value is returned for the addresses of the ESB pages. The -driver ignores this condition today and performs a bogus IO mapping. -Recent changes and the DEBUG_VM configuration option make the bug -visible with : - -[ 0.015518] kernel BUG at arch/powerpc/include/asm/book3s/64/pgtable.h:612! -[ 0.015578] Oops: Exception in kernel mode, sig: 5 [#1] -[ 0.015627] LE PAGE_SIZE=64K MMU=Radix MMU=Hash SMP NR_CPUS=1024 NUMA pSeries -[ 0.015697] Modules linked in: -[ 0.015739] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.4.0-0.rc6.git0.1.fc32.ppc64le #1 -[ 0.015812] NIP: c000000000f63294 LR: c000000000f62e44 CTR: 0000000000000000 -[ 0.015889] REGS: c0000000fa45f0d0 TRAP: 0700 Not tainted (5.4.0-0.rc6.git0.1.fc32.ppc64le) -[ 0.015971] MSR: 8000000002029033 CR: 44000424 XER: 00000000 -[ 0.016050] CFAR: c000000000f63128 IRQMASK: 0 -[ 0.016050] GPR00: c000000000f62e44 c0000000fa45f360 c000000001be5400 0000000000000000 -[ 0.016050] GPR04: c0000000019c7d38 c0000000fa340030 00000000fa330009 c000000001c15e18 -[ 0.016050] GPR08: 0000000000000040 ffe0000000000000 0000000000000000 8418dd352dbd190f -[ 0.016050] GPR12: 0000000000000000 c000000001e00000 c00a000080060000 c00a000080060000 -[ 0.016050] GPR16: 0000ffffffffffff 80000000000001ae c000000001c24d98 ffffffffffff0000 -[ 0.016050] GPR20: c00a00008007ffff c000000001cafca0 c00a00008007ffff ffffffffffff0000 -[ 0.016050] GPR24: c00a000080080000 c00a000080080000 c000000001cafca8 c00a000080080000 -[ 0.016050] GPR28: c0000000fa32e010 c00a000080060000 ffffffffffff0000 c0000000fa330000 -[ 0.016711] NIP [c000000000f63294] ioremap_page_range+0x4c4/0x6e0 -[ 0.016778] LR [c000000000f62e44] ioremap_page_range+0x74/0x6e0 -[ 0.016846] Call Trace: -[ 0.016876] [c0000000fa45f360] [c000000000f62e44] ioremap_page_range+0x74/0x6e0 (unreliable) -[ 0.016969] [c0000000fa45f460] [c0000000000934bc] do_ioremap+0x8c/0x120 -[ 0.017037] [c0000000fa45f4b0] [c0000000000938e8] __ioremap_caller+0x128/0x140 -[ 0.017116] [c0000000fa45f500] [c0000000000931a0] ioremap+0x30/0x50 -[ 0.017184] [c0000000fa45f520] [c0000000000d1380] xive_spapr_populate_irq_data+0x170/0x260 -[ 0.017263] [c0000000fa45f5c0] [c0000000000cc90c] xive_irq_domain_map+0x8c/0x170 -[ 0.017344] [c0000000fa45f600] [c000000000219124] irq_domain_associate+0xb4/0x2d0 -[ 0.017424] [c0000000fa45f690] [c000000000219fe0] irq_create_mapping+0x1e0/0x3b0 -[ 0.017506] [c0000000fa45f730] [c00000000021ad6c] irq_create_fwspec_mapping+0x27c/0x3e0 -[ 0.017586] [c0000000fa45f7c0] [c00000000021af68] irq_create_of_mapping+0x98/0xb0 -[ 0.017666] [c0000000fa45f830] [c0000000008d4e48] of_irq_parse_and_map_pci+0x168/0x230 -[ 0.017746] [c0000000fa45f910] [c000000000075428] pcibios_setup_device+0x88/0x250 -[ 0.017826] [c0000000fa45f9a0] [c000000000077b84] pcibios_setup_bus_devices+0x54/0x100 -[ 0.017906] [c0000000fa45fa10] [c0000000000793f0] __of_scan_bus+0x160/0x310 -[ 0.017973] [c0000000fa45faf0] [c000000000075fc0] pcibios_scan_phb+0x330/0x390 -[ 0.018054] [c0000000fa45fba0] [c00000000139217c] pcibios_init+0x8c/0x128 -[ 0.018121] [c0000000fa45fc20] [c0000000000107b0] do_one_initcall+0x60/0x2c0 -[ 0.018201] [c0000000fa45fcf0] [c000000001384624] kernel_init_freeable+0x290/0x378 -[ 0.018280] [c0000000fa45fdb0] [c000000000010d24] kernel_init+0x2c/0x148 -[ 0.018348] [c0000000fa45fe20] [c00000000000bdbc] ret_from_kernel_thread+0x5c/0x80 -[ 0.018427] Instruction dump: -[ 0.018468] 41820014 3920fe7f 7d494838 7d290074 7929d182 f8e10038 69290001 0b090000 -[ 0.018552] 7a098420 0b090000 7bc95960 7929a802 <0b090000> 7fc68b78 e8610048 7dc47378 - -Cc: stable@vger.kernel.org # v4.14+ -Fixes: bed81ee181dd ("powerpc/xive: introduce H_INT_ESB hcall") -Signed-off-by: Cédric Le Goater -Tested-by: Daniel Axtens -Reviewed-by: Greg Kurz ---- - arch/powerpc/sysdev/xive/spapr.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c -index 33c10749edec..55dc61cb4867 100644 ---- a/arch/powerpc/sysdev/xive/spapr.c -+++ b/arch/powerpc/sysdev/xive/spapr.c -@@ -392,20 +392,28 @@ static int xive_spapr_populate_irq_data(u32 hw_irq, struct xive_irq_data *data) - data->esb_shift = esb_shift; - data->trig_page = trig_page; - -+ data->hw_irq = hw_irq; -+ - /* - * No chip-id for the sPAPR backend. This has an impact how we - * pick a target. See xive_pick_irq_target(). - */ - data->src_chip = XIVE_INVALID_CHIP_ID; - -+ /* -+ * When the H_INT_ESB flag is set, the H_INT_ESB hcall should -+ * be used for interrupt management. Skip the remapping of the -+ * ESB pages which are not available. -+ */ -+ if (data->flags & XIVE_IRQ_FLAG_H_INT_ESB) -+ return 0; -+ - data->eoi_mmio = ioremap(data->eoi_page, 1u << data->esb_shift); - if (!data->eoi_mmio) { - pr_err("Failed to map EOI page for irq 0x%x\n", hw_irq); - return -ENOMEM; - } - -- data->hw_irq = hw_irq; -- - /* Full function page supports trigger */ - if (flags & XIVE_SRC_TRIGGER) { - data->trig_mmio = data->eoi_mmio; diff --git a/sources b/sources index 3e4340384..111683122 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d -SHA512 (patch-5.3.16.xz) = f9f2047009b540a40dbea9048f030eba54bec162c8132e1347c0039fbbb0b381a31c01a2deae26014b5a72c13c3032ea20c598ae7262975e2df406046a2f2ba8 +SHA512 (patch-5.3.17.xz) = 43ef381bc85fb2b8ae1be62b1a6f0b1a680f7c1381692f50745e0c4caec8311d294914916dcaaffb5f1921af9d11475750863ff650f1f6c5ae46d514b556d140 -- cgit