From patchwork Thu Jul 4 14:45:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Jensen X-Patchwork-Id: 2823844 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F403C9F9D2 for ; Thu, 4 Jul 2013 14:48:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1CEFB20170 for ; Thu, 4 Jul 2013 14:48:59 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AB2122015E for ; Thu, 4 Jul 2013 14:48:56 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uukny-0003Ox-JQ; Thu, 04 Jul 2013 14:46:44 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UuknY-0002ds-0n; Thu, 04 Jul 2013 14:46:16 +0000 Received: from mail-la0-x231.google.com ([2a00:1450:4010:c03::231]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UuknV-0002bv-OP for linux-arm-kernel@lists.infradead.org; Thu, 04 Jul 2013 14:46:14 +0000 Received: by mail-la0-f49.google.com with SMTP id ea20so1296482lab.36 for ; Thu, 04 Jul 2013 07:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=446WpXXFExYoC+LIu7du6tGEqNPJXoW//8dJXqe1kLg=; b=DplIqcXAj+q4b2LUGNhgQq4eNcf9jFpvJ/tuB0vf2ZPcNryQtgi3bk0tMTe8xSQod2 rlGhdmyE/YfCe2ijW0BKWJullVtebl+tuGxaRqLUzfzTxceVx3QowEHVmYCZKGcdugtQ v4czynsyDQ4K9TThn7FXDi0BD/zhilum7JlwCDGCjv4rPnfctRl4xwCGfx20sZTwvSdr sFhs126hm23XmyXgafgbUtz06s8RZ1cBnpsnuOsOm/2sXxCMUKLF/fckEAVk5XHP1BtQ 3SK/1tV909cXpoDJel8vdXgceq76Oc+M8VpVSjAvdjvHZ0/VpP5UHjdspr+ddn1D9dPl LRCw== X-Received: by 10.112.146.33 with SMTP id sz1mr3792403lbb.47.1372949152069; Thu, 04 Jul 2013 07:45:52 -0700 (PDT) Received: from Ildjarn.ildjarn.botech.se (static-213-115-41-10.sme.bredbandsbolaget.se. [213.115.41.10]) by mx.google.com with ESMTPSA id i9sm1262005lai.4.2013.07.04.07.45.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 04 Jul 2013 07:45:51 -0700 (PDT) From: Jonas Jensen To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 4/4] ARM: reinsert ARCH_MULTI_V4 Kconfig option Date: Thu, 4 Jul 2013 16:45:42 +0200 Message-Id: <1372949142-8260-1-git-send-email-jonas.jensen@gmail.com> X-Mailer: git-send-email 1.8.2.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130704_104613_939842_D307DBCE X-CRM114-Status: UNSURE ( 9.47 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: linux@arm.linux.org.uk, arnd@arndb.de, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, Jonas Jensen , arm@kernel.org, olof@lixom.net X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP CPU_FA526 is thumbless and adding under e.g. ARCH_MULTI_V4T instead means inclusion of CPU_ARM920T which in turn selects CPU_ABRT_EV4T, CPU_CACHE_V4WT, CPU_COPY_V4WB, CPU_TLB_V4WBI, which in turn can mean trouble when the kernel eventually tries to exec init: [ 2.580000] Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000004 [ 2.580000] [ 2.580000] CPU: 0 PID: 1 Comm: init Not tainted 3.10.0-next-20130703+ #3 [ 2.580000] [] (unwind_backtrace+0x0/0xf0) from [] (show_stack+0x10/0x14) [ 2.580000] [] (show_stack+0x10/0x14) from [] (panic+0x90/0x1e0) [ 2.580000] [] (panic+0x90/0x1e0) from [] (do_exit+0x724/0x834) [ 2.580000] [] (do_exit+0x724/0x834) from [] (do_group_exit+0x3c/0xb0) [ 2.580000] [] (do_group_exit+0x3c/0xb0) from [] (get_signal_to_deliver+0x2ec/0x598) [ 2.580000] [] (get_signal_to_deliver+0x2ec/0x598) from [] (do_signal+0x9c/0x3cc) [ 2.580000] [] (do_signal+0x9c/0x3cc) from [] (do_work_pending+0xc4/0xe0) [ 2.580000] [] (do_work_pending+0xc4/0xe0) from [] (work_pending+0xc/0x20) Signed-off-by: Jonas Jensen --- arch/arm/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d84161c..87e93ab 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -878,6 +878,11 @@ menu "Multiple platform selection" comment "CPU Core family selection" +config ARCH_MULTI_V4 + bool "ARMv4 based platforms (FA526, StrongARM)" + depends on !ARCH_MULTI_V6_V7 + select ARCH_MULTI_V4_V5 + config ARCH_MULTI_V4T bool "ARMv4T based platforms (ARM720T, ARM920T, ...)" depends on !ARCH_MULTI_V6_V7