From: Greg Kroah-Hartman Date: Mon, 23 Sep 2019 10:15:50 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.3.2~57 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d6428a58ba63a5ff301cd047359b374b3ead097;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: objtool-query-pkg-config-for-libelf-location.patch powerpc-xive-fix-bogus-error-code-returned-by-opal.patch --- diff --git a/queue-4.14/objtool-query-pkg-config-for-libelf-location.patch b/queue-4.14/objtool-query-pkg-config-for-libelf-location.patch new file mode 100644 index 00000000000..629f153135b --- /dev/null +++ b/queue-4.14/objtool-query-pkg-config-for-libelf-location.patch @@ -0,0 +1,60 @@ +From 056d28d135bca0b1d0908990338e00e9dadaf057 Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer +Date: Tue, 26 Mar 2019 12:48:39 -0500 +Subject: objtool: Query pkg-config for libelf location + +From: Rolf Eike Beer + +commit 056d28d135bca0b1d0908990338e00e9dadaf057 upstream. + +If it is not in the default location, compilation fails at several points. + +Signed-off-by: Rolf Eike Beer +Signed-off-by: Josh Poimboeuf +Signed-off-by: Thomas Gleixner +Cc: stable@vger.kernel.org +Link: https://lkml.kernel.org/r/91a25e992566a7968fedc89ec80e7f4c83ad0548.1553622500.git.jpoimboe@redhat.com +Signed-off-by: Greg Kroah-Hartman + +--- + Makefile | 4 +++- + tools/objtool/Makefile | 7 +++++-- + 2 files changed, 8 insertions(+), 3 deletions(-) + +--- a/Makefile ++++ b/Makefile +@@ -949,9 +949,11 @@ mod_sign_cmd = true + endif + export mod_sign_cmd + ++HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf) ++ + ifdef CONFIG_STACK_VALIDATION + has_libelf := $(call try-run,\ +- echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0) ++ echo "int main() {}" | $(HOSTCC) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0) + ifeq ($(has_libelf),1) + objtool_target := tools/objtool FORCE + else +--- a/tools/objtool/Makefile ++++ b/tools/objtool/Makefile +@@ -26,14 +26,17 @@ LIBSUBCMD = $(LIBSUBCMD_OUTPUT)libsubcm + OBJTOOL := $(OUTPUT)objtool + OBJTOOL_IN := $(OBJTOOL)-in.o + ++LIBELF_FLAGS := $(shell pkg-config libelf --cflags 2>/dev/null) ++LIBELF_LIBS := $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf) ++ + all: $(OBJTOOL) + + INCLUDES := -I$(srctree)/tools/include \ + -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \ + -I$(srctree)/tools/objtool/arch/$(ARCH)/include + WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed +-CFLAGS += -Wall -Werror $(WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES) +-LDFLAGS += -lelf $(LIBSUBCMD) ++CFLAGS += -Wall -Werror $(WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES) $(LIBELF_FLAGS) ++LDFLAGS += $(LIBELF_LIBS) $(LIBSUBCMD) + + # Allow old libelf to be used: + elfshdr := $(shell echo '$(pound)include ' | $(CC) $(CFLAGS) -x c -E - | grep elf_getshdr) diff --git a/queue-4.14/powerpc-xive-fix-bogus-error-code-returned-by-opal.patch b/queue-4.14/powerpc-xive-fix-bogus-error-code-returned-by-opal.patch new file mode 100644 index 00000000000..6f4edfa22c8 --- /dev/null +++ b/queue-4.14/powerpc-xive-fix-bogus-error-code-returned-by-opal.patch @@ -0,0 +1,87 @@ +From 6ccb4ac2bf8a35c694ead92f8ac5530a16e8f2c8 Mon Sep 17 00:00:00 2001 +From: Greg Kurz +Date: Wed, 11 Sep 2019 17:52:18 +0200 +Subject: powerpc/xive: Fix bogus error code returned by OPAL +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Greg Kurz + +commit 6ccb4ac2bf8a35c694ead92f8ac5530a16e8f2c8 upstream. + +There's a bug in skiboot that causes the OPAL_XIVE_ALLOCATE_IRQ call +to return the 32-bit value 0xffffffff when OPAL has run out of IRQs. +Unfortunatelty, OPAL return values are signed 64-bit entities and +errors are supposed to be negative. If that happens, the linux code +confusingly treats 0xffffffff as a valid IRQ number and panics at some +point. + +A fix was recently merged in skiboot: + +e97391ae2bb5 ("xive: fix return value of opal_xive_allocate_irq()") + +but we need a workaround anyway to support older skiboots already +in the field. + +Internally convert 0xffffffff to OPAL_RESOURCE which is the usual error +returned upon resource exhaustion. + +Cc: stable@vger.kernel.org # v4.12+ +Signed-off-by: Greg Kurz +Reviewed-by: Cédric Le Goater +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/156821713818.1985334.14123187368108582810.stgit@bahia.lan +(groug: fix arch/powerpc/platforms/powernv/opal-wrappers.S instead of + non-existing arch/powerpc/platforms/powernv/opal-call.c) +Signed-off-by: Greg Kurz +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/include/asm/opal.h | 2 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +- + arch/powerpc/sysdev/xive/native.c | 11 +++++++++++ + 3 files changed, 13 insertions(+), 2 deletions(-) + +--- a/arch/powerpc/include/asm/opal.h ++++ b/arch/powerpc/include/asm/opal.h +@@ -266,7 +266,7 @@ int64_t opal_xive_get_vp_info(uint64_t v + int64_t opal_xive_set_vp_info(uint64_t vp, + uint64_t flags, + uint64_t report_cl_pair); +-int64_t opal_xive_allocate_irq(uint32_t chip_id); ++int64_t opal_xive_allocate_irq_raw(uint32_t chip_id); + int64_t opal_xive_free_irq(uint32_t girq); + int64_t opal_xive_sync(uint32_t type, uint32_t id); + int64_t opal_xive_dump(uint32_t type, uint32_t id); +--- a/arch/powerpc/platforms/powernv/opal-wrappers.S ++++ b/arch/powerpc/platforms/powernv/opal-wrappers.S +@@ -301,7 +301,7 @@ OPAL_CALL(opal_xive_set_queue_info, OPA + OPAL_CALL(opal_xive_donate_page, OPAL_XIVE_DONATE_PAGE); + OPAL_CALL(opal_xive_alloc_vp_block, OPAL_XIVE_ALLOCATE_VP_BLOCK); + OPAL_CALL(opal_xive_free_vp_block, OPAL_XIVE_FREE_VP_BLOCK); +-OPAL_CALL(opal_xive_allocate_irq, OPAL_XIVE_ALLOCATE_IRQ); ++OPAL_CALL(opal_xive_allocate_irq_raw, OPAL_XIVE_ALLOCATE_IRQ); + OPAL_CALL(opal_xive_free_irq, OPAL_XIVE_FREE_IRQ); + OPAL_CALL(opal_xive_get_vp_info, OPAL_XIVE_GET_VP_INFO); + OPAL_CALL(opal_xive_set_vp_info, OPAL_XIVE_SET_VP_INFO); +--- a/arch/powerpc/sysdev/xive/native.c ++++ b/arch/powerpc/sysdev/xive/native.c +@@ -234,6 +234,17 @@ static bool xive_native_match(struct dev + return of_device_is_compatible(node, "ibm,opal-xive-vc"); + } + ++static s64 opal_xive_allocate_irq(u32 chip_id) ++{ ++ s64 irq = opal_xive_allocate_irq_raw(chip_id); ++ ++ /* ++ * Old versions of skiboot can incorrectly return 0xffffffff to ++ * indicate no space, fix it up here. ++ */ ++ return irq == 0xffffffff ? OPAL_RESOURCE : irq; ++} ++ + #ifdef CONFIG_SMP + static int xive_native_get_ipi(unsigned int cpu, struct xive_cpu *xc) + { diff --git a/queue-4.14/series b/queue-4.14/series index 13deb4519d2..1c1476d4d85 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1 +1,3 @@ revert-bluetooth-validate-ble-connection-interval-up.patch +powerpc-xive-fix-bogus-error-code-returned-by-opal.patch +objtool-query-pkg-config-for-libelf-location.patch