From patchwork Thu Mar 28 21:04:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 2359571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id E147FDF2A1 for ; Thu, 28 Mar 2013 21:06:55 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ULJzr-00015J-Aj; Thu, 28 Mar 2013 21:04:31 +0000 Received: from [2002:4e20:1eda::1] (helo=caramon.arm.linux.org.uk) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ULJzm-00013L-M7 for linux-arm-kernel@lists.infradead.org; Thu, 28 Mar 2013 21:04:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Sender:In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=XRqEAUNWAYomzodJFPH6QygyCGwyfX+Qxb9N3crsKx0=; b=DtjQ0rhfsufes+5M7Hmm/JNlhgT5oLS5HiXuADQlYtM/2vaKZCwmE7F91RPfavYY78EbJBQhDo/OmtGj5fMZoUDUMEyap/SzlKarPYghCtPfDKxujALr29Iq7zR2x4sE45JlZdhDJKGDTfqtqSGYfN1vy/akkrjgb/JFXWwrJdA=; Received: from n2100.arm.linux.org.uk ([2002:4e20:1eda:1:214:fdff:fe10:4f86]:44570) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1ULJza-0000ut-MZ; Thu, 28 Mar 2013 21:04:15 +0000 Received: from linux by n2100.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1ULJzZ-0006UV-5Y; Thu, 28 Mar 2013 21:04:13 +0000 Date: Thu, 28 Mar 2013 21:04:12 +0000 From: Russell King - ARM Linux To: Sebastian Hesselbarth Subject: Re: [PATCH] ARM: dove: fix Dove cpu type from V7 to PJ4 Message-ID: <20130328210412.GG3368@n2100.arm.linux.org.uk> References: <1364051211-24414-1-git-send-email-sebastian.hesselbarth@gmail.com> <20130328170654.GX13280@titan.lakedaemon.net> <20130328181425.GE3368@n2100.arm.linux.org.uk> <5154A5B5.7@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5154A5B5.7@gmail.com> User-Agent: Mutt/1.5.19 (2009-01-05) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130328_170427_061541_F2F3D279 X-CRM114-Status: GOOD ( 19.94 ) X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.8 RDNS_NONE Delivered to internal network by a host with no rDNS Cc: Andrew Lunn , Jason Cooper , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Thu, Mar 28, 2013 at 09:19:01PM +0100, Sebastian Hesselbarth wrote: > On 03/28/2013 07:14 PM, Russell King - ARM Linux wrote: >> On Thu, Mar 28, 2013 at 01:06:54PM -0400, Jason Cooper wrote: >>> On Sat, Mar 23, 2013 at 04:06:51PM +0100, Sebastian Hesselbarth wrote: >>>> The CPU used in Marvell Dove SoCs is a PJ4 Sheeva core. Using >>>> CONFIG_CPU_PJ4 instead of CONFIG_CPU_V7 will also allow to enable >>>> iWMMXt extensions on Dove. >>>> >>>> Signed-off-by: Sebastian Hesselbarth >>>> --- >>>> Cc: Russell King >>>> Cc: Jason Cooper >>>> Cc: Andrew Lunn >>>> Cc: linux-arm-kernel@lists.infradead.org >>>> Cc: linux-kernel@vger.kernel.org >>>> --- >>>> arch/arm/Kconfig | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> Hmmm, I'm getting (with dove_defconfig): >>> >>> arch/arm/kernel/built-in.o: In function `iwmmxt_do': >>> /.../arch/arm/kernel/pj4-cp0.c:36: undefined reference to `iwmmxt_task_release' >>> /.../arch/arm/kernel/pj4-cp0.c:40: undefined reference to `iwmmxt_task_switch' >>> make: *** [vmlinux] Error 1 >> >> Looks to me like PJ4 IWMMXT support wasn't properly tested out when it >> was submitted - it's possible to end up with pj4-cp0.c built without >> the IWMMXT code that it depends on being built... > > Russel, Jason, > > do we force iWMMXt on CPU_PJ4 or should there be some #ifdef'ery if > IWMMXT is not selected? From what I could see, there's not much point to pj4-cp0.c without iwmmxt.S also being built. So, what I'd suggest is this, which will ensure IWMMXT is enabled when PJ4 is set, otherwise giving people the choice as it used to be. diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 67874b8..ef6733a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1171,9 +1171,9 @@ config ARM_NR_BANKS default 8 config IWMMXT - bool "Enable iWMMXt support" + bool "Enable iWMMXt support" if !CPU_PJ4 depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4 - default y if PXA27x || PXA3xx || ARCH_MMP + default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4 help Enable support for iWMMXt context switching at run time if running on a CPU that supports it.