From patchwork Wed Feb 24 10:51:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 62790 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2327299lbl; Wed, 24 Feb 2016 02:51:11 -0800 (PST) X-Received: by 10.98.34.84 with SMTP id i81mr52989924pfi.160.1456311065692; Wed, 24 Feb 2016 02:51:05 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q5si4260963pap.42.2016.02.24.02.51.05; Wed, 24 Feb 2016 02:51:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752653AbcBXKvA (ORCPT + 3 others); Wed, 24 Feb 2016 05:51:00 -0500 Received: from foss.arm.com ([217.140.101.70]:42760 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753267AbcBXKu4 (ORCPT ); Wed, 24 Feb 2016 05:50:56 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A69F746B; Wed, 24 Feb 2016 02:50:03 -0800 (PST) Received: from arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7491A3F21A; Wed, 24 Feb 2016 02:50:55 -0800 (PST) Date: Wed, 24 Feb 2016 10:51:05 +0000 From: Will Deacon To: gregkh@linuxfoundation.org Cc: dann.frazier@canonical.com, ard.biesheuvel@linaro.org, christophe.lyon@linaro.org, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] arm64: errata: Add -mpc-relative-literal-loads to build flags" failed to apply to 4.4-stable tree Message-ID: <20160224105104.GD28310@arm.com> References: <145627855616510@kroah.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <145627855616510@kroah.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Tue, Feb 23, 2016 at 05:49:16PM -0800, gregkh@linuxfoundation.org wrote: > The patch below does not apply to the 4.4-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to . Updated backport below. Will --->8 >From d88e3c8e9ad271359db7b3ab5bdeebb6f65e7ff6 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Mon, 25 Jan 2016 16:52:16 -0700 Subject: [PATCH] arm64: errata: Add -mpc-relative-literal-loads to build flags Commit 67dfa1751ce7 upstream. GCC6 (and Linaro's 2015.12 snapshot of GCC5) has a new default that uses adrp/ldr or adrp/add to address literal pools. When CONFIG_ARM64_ERRATUM_843419 is enabled, modules built with this toolchain fail to load: module libahci: unsupported RELA relocation: 275 This patch fixes the problem by passing '-mpc-relative-literal-loads' to the compiler. Cc: stable@vger.kernel.org Fixes: df057cc7b4fa ("arm64: errata: add module build workaround for erratum #843419") BugLink: http://bugs.launchpad.net/bugs/1533009 Acked-by: Ard Biesheuvel Suggested-by: Christophe Lyon Signed-off-by: Dann Frazier [will: backport to 4.4-stable] Signed-off-by: Will Deacon --- arch/arm64/Makefile | 1 + 1 file changed, 1 insertion(+) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index cd822d8454c0..b6c90e5006e4 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -27,6 +27,7 @@ $(warning LSE atomics not supported by binutils) endif KBUILD_CFLAGS += -mgeneral-regs-only $(lseinstr) +KBUILD_CFLAGS += $(call cc-option, -mpc-relative-literal-loads) KBUILD_AFLAGS += $(lseinstr) ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)