From patchwork Tue Jun 23 21:19:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Osmialowski X-Patchwork-Id: 487829 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E9CE014030B for ; Wed, 24 Jun 2015 07:50:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934068AbbFWVuk (ORCPT ); Tue, 23 Jun 2015 17:50:40 -0400 Received: from fish.king.net.pl ([79.190.246.46]:37007 "EHLO king.net.pl" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934066AbbFWVue (ORCPT ); Tue, 23 Jun 2015 17:50:34 -0400 Received: from localhost.localdomain (fish [127.0.0.1]) by king.net.pl (8.14.9/8.14.0) with ESMTP id t5NLKD28020236 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 23 Jun 2015 23:20:14 +0200 Received: (from newchief@localhost) by localhost.localdomain (8.14.9/8.14.9/Submit) id t5NLKDgj020235; Tue, 23 Jun 2015 23:20:13 +0200 From: Paul Osmialowski To: Andrew Morton , Anson Huang , Ard Biesheuvel , Arnd Bergmann , Bhupesh Sharma , Daniel Lezcano , Frank Li , Geert Uytterhoeven , Greg Kroah-Hartman , Guenter Roeck , Haojian Zhuang , Ian Campbell , Jingchang Lu , Jiri Slaby , Kees Cook , Kumar Gala , Laurent Pinchart , Linus Walleij , Magnus Damm , Michael Turquette , Nathan Lynch , Nicolas Pitre , Maxime Coquelin stm32 , Olof Johansson , Paul Bolle , Rob Herring , Rob Herring , Russell King , Sergey Senozhatsky , Shawn Guo , Simon Horman , Stefan Agner , Stephen Boyd , Thomas Gleixner , Uwe Kleine-Koenig , Catalin Marinas , Dave Martin , Mark Rutland , Pawel Moll , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-gpio@vger.kernel.org, linux-serial@vger.kernel.org, devicetree@vger.kernel.org, dmaengine@vger.kernel.org Cc: Paul Osmialowski , Yuri Tikhonov , Sergei Poselenov , Dmitry Cherkassov , Alexander Potashev Subject: [PATCH 1/9] arm: select different compiler flags for ARM CortexM3 Date: Tue, 23 Jun 2015 23:19:39 +0200 Message-Id: <1435094387-20146-2-git-send-email-pawelo@king.net.pl> X-Mailer: git-send-email 2.3.6 In-Reply-To: <1435094387-20146-1-git-send-email-pawelo@king.net.pl> References: <1435094387-20146-1-git-send-email-pawelo@king.net.pl> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org This one is inspired by two commits published on Emcraft git repo: https://github.com/EmcraftSystems/linux-emcraft.git 1) 6302b692f570ff9d5645a6e72c11f87b0c1aa409 RT #62654. Fixed kernel crashes while running httpd by enabling "-mfix-cortex-m3-ldrd" compiler option, which prevents compiler from generating code like 'ldrd Ra, Rb, [Ra, #Imm]' - according to the 602117 Cortex-M3 Errata it may result in incorrect base register when interrupted or faulted. by: Yuri Tikhonov 2) 359d3cda84c01c0f3fae1a519b97a31f318f57ab RT #62654. Removed "--march=..." leaving only "-mcpu=cortex-m3" to make sure only the correct instructions will be generated. by: Sergei Poselenov I reworked these patches to make them less intrusive. Signed-off-by: Paul Osmialowski --- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 1 + arch/arm/mm/Kconfig | 11 ++++++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a750c14..8e3a833 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -32,7 +32,7 @@ config ARM select HANDLE_DOMAIN_IRQ select HARDIRQS_SW_RESEND select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT) - select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6 + select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7M3 || CPU_32v7) && !CPU_32v6 select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 07ab3d2..a7e1007 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -58,6 +58,7 @@ endif # Note that GCC does not numerically define an architecture version # macro, but instead defines a whole series of macros which makes # testing for a specific architecture or later rather impossible. +arch-$(CONFIG_CPU_32v7M3) =-D__LINUX_ARM_ARCH__=7 -mcpu=cortex-m3 -Wa,-mcpu=cortex-m3 arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a) arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6) diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 7c6b976..d19cb4d 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -401,12 +401,18 @@ config CPU_V7 # ARMv7M config CPU_V7M bool - select CPU_32v7M + select CPU_32v7M if !CPU_CORTEXM3 + select CPU_32v7M3 if CPU_CORTEXM3 select CPU_ABRT_NOMMU select CPU_CACHE_NOP select CPU_PABRT_LEGACY select CPU_THUMBONLY +# ARM CortexM3 +config CPU_CORTEXM3 + bool + select CPU_V7M + config CPU_THUMBONLY bool # There are no CPUs available with MMU that don't implement an ARM ISA: @@ -457,6 +463,9 @@ config CPU_32v7 config CPU_32v7M bool +config CPU_32v7M3 + bool + # The abort model config CPU_ABRT_NOMMU bool